X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fgnome%2Fmodest-msg-view-window.c;h=9d2a7887351bc2e30b55cbd293ce73bac39de27d;hb=8376cf7ef539a483f17fc1e4d88a5ac91acaa24a;hp=c7a0bc69903a351b31ef840b4de764122b68b68a;hpb=64a3cb5e8f9865d3923a638837ef76570429d31c;p=modest

diff --git a/src/gnome/modest-msg-view-window.c b/src/gnome/modest-msg-view-window.c
index c7a0bc6..9d2a788 100644
--- a/src/gnome/modest-msg-view-window.c
+++ b/src/gnome/modest-msg-view-window.c
@@ -57,6 +57,8 @@ struct _ModestMsgViewWindowPrivate {
 	GtkWidget   *toolbar;
 	GtkWidget   *menubar;
 	GtkWidget   *msg_view;
+
+	gchar *msg_uid;
 };
 
 #define MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -160,9 +162,10 @@ modest_msg_view_window_init (ModestMsgViewWindow *obj)
 	ModestMsgViewWindowPrivate *priv;
 	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj);
 
-	priv->toolbar       = NULL;
-	priv->menubar       = NULL;
-	priv->msg_view      = NULL;
+	priv->toolbar  = NULL;
+	priv->menubar  = NULL;
+	priv->msg_view = NULL;
+	priv->msg_uid  = NULL;
 }
 
 
@@ -195,7 +198,16 @@ init_window (ModestMsgViewWindow *obj, TnyMsg *msg)
 
 static void
 modest_msg_view_window_finalize (GObject *obj)
-{	
+{
+	ModestMsgViewWindowPrivate *priv;
+
+	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj);
+
+	if (priv->msg_uid) {
+		g_free (priv->msg_uid);
+		msg_uid = NULL;
+	}
+
 	G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -210,7 +222,9 @@ on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMsgViewWindow *self)
 
 
 ModestWindow *
-modest_msg_view_window_new (TnyMsg *msg, const gchar *account)
+modest_msg_view_window_new (TnyMsg *msg, 
+			    const gchar *modest_account_name, 
+			    const gchar *msg_uid)
 {
 	GObject *obj;
 	ModestMsgViewWindowPrivate *priv;
@@ -226,6 +240,8 @@ modest_msg_view_window_new (TnyMsg *msg, const gchar *account)
 	priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj);
 	parent_priv = MODEST_WINDOW_GET_PRIVATE(obj);
 
+	priv->msg_uid = g_strdup (msg_uid);
+
 	modest_window_set_active_account (MODEST_WINDOW(obj), account);
 	
 	parent_priv->ui_manager = gtk_ui_manager_new();
@@ -313,12 +329,15 @@ modest_msg_view_window_get_message_uid (ModestMsgViewWindow *self)
 		retval = tny_header_get_uid (header);
 		g_object_unref (header);
 	}
+	g_object_unref (msg);
+
 	return retval;
 }
 
 ModestWindow*   
 modest_msg_view_window_new_with_header_model (TnyMsg *msg, 
-					      const gchar *account, 
+					      const gchar *modest_account_name, 
+					      const gchar *msg_uid,
 					      GtkTreeModel *model, 
 					      GtkTreeRowReference *row_reference)
 {