Make windows inherit from ModestShellWindow in gtk

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

diff --git a/src/gtk/modest-shell-window.c b/src/gtk/modest-shell-window.c
index 4d053da..23cb285 100644 (file)
--- a/src/gtk/modest-shell-window.c
+++ b/src/gtk/modest-shell-window.c
@@ -45,8 +45,6 @@ static void modest_shell_window_dispose     (GObject *obj);
 static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window);
 static void modest_shell_window_show_progress (ModestWindow *window,
                                                 gboolean show);
-static void setup_menu (ModestShellWindow *self);
-
 static void modest_shell_window_show_toolbar (ModestWindow *self,
                                                 gboolean show_toolbar);
 static void modest_shell_window_add_toolbar (ModestWindow *self,
@@ -69,6 +67,8 @@ struct _ModestShellWindowPrivate {
        ModestDimmingRulesGroup *app_menu_dimming_group;
        GtkAccelGroup *accel_group;
 
+       GtkWidget *menu;
+
 };
 #define MODEST_SHELL_WINDOW_GET_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                                            MODEST_TYPE_SHELL_WINDOW, \
@@ -78,7 +78,7 @@ struct _ModestShellWindowPrivate {
 static GtkWindowClass *parent_class = NULL;
 
 /* uncomment the following if you have defined any signals */
-static guint signals[LAST_SIGNAL] = {0};
+/* static guint signals[LAST_SIGNAL] = {0}; */
 
 /************************************************************************/
 
@@ -112,7 +112,6 @@ modest_shell_window_class_init (gpointer klass, gpointer class_data)
        GObjectClass *gobject_class;
        gobject_class = (GObjectClass*) klass;
        ModestWindowClass *modest_window_class = (ModestWindowClass *) klass;
-       HildonWindowClass *hildon_window_class = (HildonWindowClass *) klass;
 
        parent_class            = g_type_class_peek_parent (klass);
        gobject_class->dispose  = modest_shell_window_dispose;
@@ -142,6 +141,11 @@ modest_shell_window_dispose (GObject *obj)
                priv->app_menu_dimming_group = NULL;
        }
 
+       if (priv->menu) {
+               gtk_widget_destroy (priv->menu);
+               priv->menu = NULL;
+       }
+
        G_OBJECT_CLASS(parent_class)->dispose (obj);
 }
 
@@ -161,7 +165,7 @@ modest_shell_window_instance_init (GTypeInstance *instance, gpointer g_class)
        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);
 
-       setup_menu (self);
+       priv->menu = gtk_menu_new ();
 
        modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, 
                                                      priv->app_menu_dimming_group);
@@ -187,7 +191,6 @@ modest_shell_window_add_item_to_menu (ModestWindow *self,
                                        ModestDimmingCallback dimming_callback)
 {
        ModestShellWindowPrivate *priv;
-       GtkWidget *menu;
 
        g_return_if_fail (MODEST_IS_SHELL_WINDOW(self));
        g_return_if_fail (GTK_IS_BUTTON (button));
@@ -201,8 +204,11 @@ modest_shell_window_add_item_to_menu (ModestWindow *self,
                                                            GTK_WIDGET (button),
                                                            (GCallback) dimming_callback,
                                                            MODEST_WINDOW (self));
-       menu = modest_shell_get_menu (MODEST_SHELL (priv->shell), self);
-       gtk_menu_shell_append (GTK_MENU_SHELL (menu), button);
+       if (priv->menu) {
+               gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), button);
+       } else {
+               gtk_widget_destroy (button);
+       }
 
        gtk_widget_show (GTK_WIDGET (button));
 }
@@ -216,7 +222,6 @@ modest_shell_window_add_to_menu (ModestWindow *self,
 {
        ModestShellWindowPrivate *priv = NULL;
        GtkWidget *menu_item;
-       GtkWidget *menu;
 
        g_return_if_fail (MODEST_IS_SHELL_WINDOW(self));
        g_return_if_fail (label && label[0] != '\0');
@@ -225,7 +230,7 @@ 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 (button), "activate-item",
+       g_signal_connect_after (G_OBJECT (menu_item), "activate-item",
                                G_CALLBACK (callback), (gpointer) self);
 
        if (accelerator != NULL) {
@@ -237,8 +242,11 @@ modest_shell_window_add_to_menu (ModestWindow *self,
                                            accel_key, accel_mods, 0);
        }
 
-       menu = modest_shell_get_menu (MODEST_SHELL (priv->shell), MODEST_WINDOW (self));
-       gtk_menu_shell_append (GTK_MENU (menu), menu_item);
+       if (priv->menu) {
+               gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), menu_item);
+       } else {
+               gtk_widget_destroy (menu_item);
+       }
 }
 
 static void
@@ -251,9 +259,9 @@ modest_shell_window_show_toolbar (ModestWindow *self,
 
 static void
 modest_shell_window_add_toolbar (ModestWindow *self,
-                                  GtkToolbar *toolbar)
+                                GtkToolbar *toolbar)
 {
-       gtk_box_pack_end (GTK_BOX (self), toolbar, FALSE, FALSE, 0);
+       gtk_box_pack_end (GTK_BOX (self), GTK_WIDGET (toolbar), FALSE, FALSE, 0);
 }
 
 static void
@@ -272,6 +280,9 @@ static void
 modest_shell_window_show_progress (ModestWindow *self,
                                     gboolean show)
 {
+       ModestShellWindowPrivate *priv = NULL;
+
+       priv = MODEST_SHELL_WINDOW_GET_PRIVATE (self);
        modest_shell_show_progress (MODEST_SHELL (priv->shell),
                                    self,
                                    show);
@@ -292,3 +303,13 @@ modest_shell_window_set_shell (ModestShellWindow *self,
 
        priv->shell = g_object_ref (shell);
 }
+
+GtkWidget *
+modest_shell_window_get_menu (ModestShellWindow *self)
+{
+       ModestShellWindowPrivate *priv = NULL;
+
+       priv = MODEST_SHELL_WINDOW_GET_PRIVATE (self);
+
+       return priv->menu;
+}