From: Jose Dapena Paz <jdapena@igalia.com>
Date: Thu, 26 Nov 2009 18:48:41 +0000 (+0100)
Subject: Properly handle title in shell window
X-Git-Tag: jdapena-ppa-3.90.4-modest0~184
X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=b91b667690a0ba256baf4c68965f4f8a86e7ee80;p=modest

Properly handle title in shell window
---

diff --git a/src/gtk/modest-shell-window.c b/src/gtk/modest-shell-window.c
index 23cb285..8c69358 100644
--- a/src/gtk/modest-shell-window.c
+++ b/src/gtk/modest-shell-window.c
@@ -41,6 +41,7 @@
 static void modest_shell_window_class_init  (gpointer klass, gpointer class_data);
 static void modest_shell_window_instance_init (GTypeInstance *instance, gpointer g_class);
 static void modest_shell_window_dispose     (GObject *obj);
+static void modest_shell_window_finalize     (GObject *obj);
 
 static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window);
 static void modest_shell_window_show_progress (ModestWindow *window,
@@ -68,6 +69,7 @@ struct _ModestShellWindowPrivate {
 	GtkAccelGroup *accel_group;
 
 	GtkWidget *menu;
+	gchar *title;
 
 };
 #define MODEST_SHELL_WINDOW_GET_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -115,6 +117,7 @@ modest_shell_window_class_init (gpointer klass, gpointer class_data)
 
 	parent_class            = g_type_class_peek_parent (klass);
 	gobject_class->dispose  = modest_shell_window_dispose;
+	gobject_class->finalize  = modest_shell_window_finalize;
 
 	g_type_class_add_private (gobject_class, sizeof(ModestShellWindowPrivate));
 	
@@ -150,6 +153,19 @@ modest_shell_window_dispose (GObject *obj)
 }
 
 static void
+modest_shell_window_finalize (GObject *obj)
+{
+	ModestShellWindowPrivate *priv;
+
+	priv = MODEST_SHELL_WINDOW_GET_PRIVATE(obj);
+
+	if (priv->title)
+		g_free (priv->title);
+
+	G_OBJECT_CLASS(parent_class)->finalize (obj);
+}
+
+static void
 modest_shell_window_instance_init (GTypeInstance *instance, gpointer g_class)
 {
 	ModestShellWindow *self = NULL;	
@@ -160,6 +176,8 @@ modest_shell_window_instance_init (GTypeInstance *instance, gpointer g_class)
 	parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
 	priv = MODEST_SHELL_WINDOW_GET_PRIVATE (self);
 
+	priv->title = NULL;
+
 	priv->accel_group = gtk_accel_group_new ();
 
 	priv->app_menu_dimming_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_MENU, FALSE);
@@ -271,9 +289,14 @@ modest_shell_window_set_title (ModestWindow *self,
 	ModestShellWindowPrivate *priv = NULL;
 
 	priv = MODEST_SHELL_WINDOW_GET_PRIVATE (self);
-	modest_shell_set_title (MODEST_SHELL (priv->shell),
-				MODEST_WINDOW (self),
-				title);
+	if (priv->title)
+		g_free (priv->title);
+	priv->title = g_strdup (title);
+	if (priv->shell) {
+		modest_shell_set_title (MODEST_SHELL (priv->shell),
+					MODEST_WINDOW (self),
+					title);
+	}
 }
 
 static void
@@ -302,6 +325,9 @@ modest_shell_window_set_shell (ModestShellWindow *self,
 	}
 
 	priv->shell = g_object_ref (shell);
+	modest_shell_set_title (MODEST_SHELL (priv->shell),
+				MODEST_WINDOW (self),
+				priv->title);
 }
 
 GtkWidget *
diff --git a/src/gtk/modest-shell.c b/src/gtk/modest-shell.c
index 581a3b8..907ec2f 100644
--- a/src/gtk/modest-shell.c
+++ b/src/gtk/modest-shell.c
@@ -190,6 +190,7 @@ modest_shell_add_window (ModestShell *shell, ModestWindow *window)
 
 	priv = MODEST_SHELL_GET_PRIVATE (shell);
 	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), GTK_WIDGET (window), NULL);
+	modest_shell_window_set_shell (MODEST_SHELL_WINDOW (window), shell);
 	update_title (shell);
 }