Progress animation in ModestShell

[modest] / src / gtk / modest-shell-window.c

diff --git a/src/gtk/modest-shell-window.c b/src/gtk/modest-shell-window.c
index 23cb285..2920f7e 100644 (file)
--- 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));
        
@@ -136,6 +139,16 @@ modest_shell_window_dispose (GObject *obj)
 
        priv = MODEST_SHELL_WINDOW_GET_PRIVATE(obj);
 
+       if (priv->shell && priv->app_menu_dimming_group) {
+               gtk_window_remove_accel_group (GTK_WINDOW (priv->shell),
+                                              priv->accel_group);
+       }
+
+       if (priv->accel_group) {
+               g_object_unref (priv->accel_group);
+               priv->accel_group = NULL;
+       }
+
        if (priv->app_menu_dimming_group) {
                g_object_unref (priv->app_menu_dimming_group);
                priv->app_menu_dimming_group = NULL;
@@ -150,6 +163,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,10 +186,13 @@ 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);
-       gtk_window_add_accel_group (GTK_WINDOW (self), priv->accel_group);
+       if (priv->shell)
+               gtk_window_add_accel_group (GTK_WINDOW (priv->shell), priv->accel_group);
 
        priv->menu = gtk_menu_new ();
 
@@ -230,8 +259,8 @@ modest_shell_window_add_to_menu (ModestWindow *self,
        priv = MODEST_SHELL_WINDOW_GET_PRIVATE (self);
 
        menu_item = gtk_menu_item_new_with_label (label);
-       g_signal_connect_after (G_OBJECT (menu_item), "activate-item",
-                               G_CALLBACK (callback), (gpointer) self);
+       g_signal_connect (G_OBJECT (menu_item), "activate",
+                         G_CALLBACK (callback), (gpointer) self);
 
        if (accelerator != NULL) {
                guint accel_key;
@@ -247,6 +276,7 @@ modest_shell_window_add_to_menu (ModestWindow *self,
        } else {
                gtk_widget_destroy (menu_item);
        }
+       gtk_widget_show (menu_item);
 }
 
 static void
@@ -271,9 +301,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
@@ -297,11 +332,19 @@ modest_shell_window_set_shell (ModestShellWindow *self,
        priv = MODEST_SHELL_WINDOW_GET_PRIVATE (self);
 
        if (priv->shell) {
+               if (priv->accel_group) {
+                       gtk_window_remove_accel_group (GTK_WINDOW (priv->shell), priv->accel_group);
+               }
                modest_shell_delete_window (MODEST_SHELL (shell), MODEST_WINDOW (self));
                g_object_unref (priv->shell);
        }
 
        priv->shell = g_object_ref (shell);
+       modest_shell_set_title (MODEST_SHELL (priv->shell),
+                               MODEST_WINDOW (self),
+                               priv->title);
+       if (priv->accel_group)
+               gtk_window_add_accel_group (GTK_WINDOW (priv->shell), priv->accel_group);
 }
 
 GtkWidget *