* remove some annoying debug warnings

* remember the parent-uid for messages (needed to check if a reply to a message
  is already ongoing)

pmo-trunk-r3163

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 2ff2417..e42cfee 100644 (file)
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -894,7 +894,6 @@ get_url_matches (GString *txt)
                                match->offset = offset + rm.rm_so;
                                match->len    = rm.rm_eo - rm.rm_so;
                                match->prefix = patterns[i].prefix;
-                               g_warning ("<%d, %d, %s>",  match->offset, match->len, match->prefix);
                                match_list = g_slist_prepend (match_list, match);
                        }
                                

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index 523f143..8de5a03 100644 (file)
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -39,6 +39,7 @@
 #include <camel/camel-stream-buffer.h>
 #include <camel/camel-stream-mem.h>
 #include <glib/gprintf.h>
+#include <modest-tny-folder.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -397,6 +398,8 @@ modest_tny_msg_find_body_part (TnyMsg *msg, gboolean want_html)
 }
 
 
+#define MODEST_TNY_MSG_PARENT_UID "parent-uid"
+
 static TnyMsg *
 create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, const gchar *signature, 
                           gboolean is_reply, guint type, GList *attachments)
@@ -407,7 +410,7 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, co
        TnyMimePart *body = NULL;
        ModestFormatter *formatter;
        gchar *subject_prefix;
-
+       
        /* Get body from original msg. Always look for the text/plain
           part of the message to create the reply/forwarded mail */
        if (header)
@@ -470,13 +473,30 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, co
        tny_header_set_subject (new_header, (const gchar *) new_subject);
        g_free (new_subject);
 
+
+       /* get the parent uid, and set it as a gobject property on the new msg */
+       if (new_msg) {
+               gchar* parent_uid = modest_tny_folder_get_header_unique_id (header);
+               g_object_set_data_full (G_OBJECT(new_msg), MODEST_TNY_MSG_PARENT_UID,
+                                       parent_uid, g_free);
+       }
+       
        /* Clean */
        g_object_unref (G_OBJECT (new_header));
-       g_object_unref (G_OBJECT (header));
+       g_object_unref (G_OBJECT (header)); /* ugly to unref it here instead of in the calling func */
 
        return new_msg;
 }
 
+const gchar*
+modest_tny_msg_get_parent_uid (TnyMsg *msg)
+{
+       g_return_val_if_fail (msg, NULL);
+       return g_object_get_data (G_OBJECT(msg), MODEST_TNY_MSG_PARENT_UID);
+}
+
+
+
 static void
 add_if_attachment (gpointer data, gpointer user_data)
 {
@@ -507,7 +527,8 @@ modest_tny_msg_create_forward_msg (TnyMsg *msg,
        tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
        tny_list_foreach (parts, add_if_attachment, &attachments_list);
 
-       new_msg = create_reply_forward_mail (msg, NULL, from, signature, FALSE, forward_type, attachments_list);
+       new_msg = create_reply_forward_mail (msg, NULL, from, signature, FALSE, forward_type,
+                                            attachments_list);
        add_attachments (new_msg, attachments_list);
 
        /* Clean */
@@ -542,7 +563,8 @@ modest_tny_msg_create_reply_msg (TnyMsg *msg,
                tny_list_foreach (parts, add_if_attachment, &attachments_list);
        }
 
-       new_msg = create_reply_forward_mail (msg, header, from, signature, TRUE, reply_type, attachments_list);
+       new_msg = create_reply_forward_mail (msg, header, from, signature, TRUE, reply_type,
+                                            attachments_list);
        if (attachments_list) {
                g_list_foreach (attachments_list, (GFunc) g_object_unref, NULL);
                g_list_free (attachments_list);

diff --git a/src/modest-tny-msg.h b/src/modest-tny-msg.h
index 5bf4276..e3da25d 100644 (file)
--- a/src/modest-tny-msg.h
+++ b/src/modest-tny-msg.h
@@ -164,4 +164,17 @@ TnyMsg*       modest_tny_msg_create_reply_msg     (TnyMsg *msg,
                                                   ModestTnyMsgReplyMode reply_mode);
 
 
+/**
+ * modest_tny_msg_get_parent_unique_id
+ * @msg: a valid #TnyMsg instance, or %NULL
+ * 
+ * gets the unique ID of the 'parent' (the original msg replied to or forward)
+ * 
+ * Returns: Returns: a the parent uid, or NULL if there is none.
+ **/
+const gchar*  modest_tny_msg_get_parent_uid (TnyMsg *msg);
+
+
+
+
 #endif /* __MODEST_TNY_MSG_H__ */

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index c497e5e..3653d3a 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2006, Nokia Corporation
- * All rights reserved.
+ * All rights reserved. 
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -1109,9 +1109,7 @@ free_reply_forward_helper (gpointer data)
 }
 
 static void
-reply_forward_cb (ModestMailOperation *mail_op, 
-                 TnyHeader *header, 
-                 TnyMsg *msg,
+reply_forward_cb (ModestMailOperation *mail_op,  TnyHeader *header, TnyMsg *msg,
                  gpointer user_data)
 {
        TnyMsg *new_msg;
@@ -1854,15 +1852,9 @@ folder_refreshed_cb (ModestMailOperation *mail_op,
        /* Check if folder is empty and set headers view contents style */
        folder_empty = (tny_folder_get_all_count (folder) == 0);
        all_marked_as_deleted = modest_header_view_is_empty (MODEST_HEADER_VIEW(header_view));
-       folder_empty = folder_empty || all_marked_as_deleted ;
-       if (folder_empty) {
-
-               printf ("DEBUG: %s: tny_folder_get_all_count() returned 0.\n", __FUNCTION__);
+       if (folder_empty || all_marked_as_deleted)
                modest_main_window_set_contents_style (win,
                                                       MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY);
-       } else {
-               printf ("DEBUG: %s: tny_folder_get_all_count() returned >0.\n", __FUNCTION__);
-       }
 }
 
 void