Remove spacing in headers view calendar, as it was causing a very bad

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

diff --git a/src/gtk/modest-shell-window.c b/src/gtk/modest-shell-window.c
index 15adc1e..04501a5 100644 (file)
--- a/src/gtk/modest-shell-window.c
+++ b/src/gtk/modest-shell-window.c
@@ -139,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;
@@ -181,7 +191,8 @@ modest_shell_window_instance_init (GTypeInstance *instance, gpointer g_class)
        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 ();
 
@@ -200,35 +211,36 @@ on_zoom_minus_plus_not_implemented (ModestWindow *window)
 {
        g_return_val_if_fail (MODEST_IS_SHELL_WINDOW (window), FALSE);
 
-       modest_platform_information_banner (NULL, NULL, _CS("ckct_ib_cannot_zoom_here"));
+       modest_platform_information_banner (NULL, NULL, _CS_CANNOT_ZOOM_HERE);
        return FALSE;
 }
-void 
+
+void
 modest_shell_window_add_item_to_menu (ModestWindow *self,
-                                       GtkWidget *button,
+                                       GtkWidget *item,
                                        ModestDimmingCallback dimming_callback)
 {
        ModestShellWindowPrivate *priv;
 
        g_return_if_fail (MODEST_IS_SHELL_WINDOW(self));
-       g_return_if_fail (GTK_IS_BUTTON (button));
+       g_return_if_fail (GTK_IS_MENU_ITEM (item));
        priv = MODEST_SHELL_WINDOW_GET_PRIVATE (self);
 
-       modest_ui_dimming_manager_set_widget_dimming_mode (GTK_WIDGET (button),
+       modest_ui_dimming_manager_set_widget_dimming_mode (item,
                                                           MODEST_UI_DIMMING_MODE_HIDE);
 
        if (dimming_callback)
                modest_dimming_rules_group_add_widget_rule (priv->app_menu_dimming_group,
-                                                           GTK_WIDGET (button),
+                                                           item,
                                                            (GCallback) dimming_callback,
                                                            MODEST_WINDOW (self));
        if (priv->menu) {
-               gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), button);
+               gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), item);
        } else {
-               gtk_widget_destroy (button);
+               gtk_widget_destroy (item);
        }
 
-       gtk_widget_show (GTK_WIDGET (button));
+       gtk_widget_show (item);
 }
 
 static void
@@ -256,16 +268,11 @@ modest_shell_window_add_to_menu (ModestWindow *self,
                GdkModifierType accel_mods;
 
                gtk_accelerator_parse (accelerator, &accel_key, &accel_mods);
-               gtk_widget_add_accelerator (menu_item, "clicked", priv->accel_group,
+               gtk_widget_add_accelerator (menu_item, "activate", priv->accel_group,
                                            accel_key, accel_mods, 0);
        }
 
-       if (priv->menu) {
-               gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), menu_item);
-       } else {
-               gtk_widget_destroy (menu_item);
-       }
-       gtk_widget_show (menu_item);
+       modest_window_add_item_to_menu (MODEST_WINDOW (self), menu_item, dimming_callback);
 }
 
 static void
@@ -321,6 +328,9 @@ 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);
        }
@@ -329,6 +339,8 @@ modest_shell_window_set_shell (ModestShellWindow *self,
        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 *