Set proper logical id for "Invitation" string to mail_fi_invitation.

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

diff --git a/src/gtk/modest-shell.c b/src/gtk/modest-shell.c
index de1f043..c506ec6 100644 (file)
--- a/src/gtk/modest-shell.c
+++ b/src/gtk/modest-shell.c
@@ -169,12 +169,6 @@ modest_shell_instance_init (ModestShell *obj)
        gtk_widget_show (GTK_WIDGET (priv->new_message_button));
        g_signal_connect (G_OBJECT (priv->new_message_button), "clicked", G_CALLBACK (on_new_msg_button_clicked), obj);
 
-       priv->back_button = gtk_tool_button_new_from_stock (GTK_STOCK_GO_BACK);
-       g_object_set (priv->back_button, "is-important", TRUE, NULL);
-       gtk_toolbar_insert (GTK_TOOLBAR (priv->top_toolbar), priv->back_button, -1);
-       gtk_widget_show (GTK_WIDGET (priv->back_button));
-       g_signal_connect (G_OBJECT (priv->back_button), "clicked", G_CALLBACK (on_back_button_clicked), obj);
-
        separator_toolitem = gtk_separator_tool_item_new ();
        gtk_toolbar_insert (GTK_TOOLBAR (priv->top_toolbar), separator_toolitem, -1);
        gtk_widget_show (GTK_WIDGET (separator_toolitem));
@@ -203,6 +197,12 @@ modest_shell_instance_init (ModestShell *obj)
        g_object_set (priv->title_button, "is-important", TRUE, NULL);
        g_signal_connect (G_OBJECT (priv->title_button), "clicked", G_CALLBACK (on_title_button_clicked), obj);
 
+       priv->back_button = gtk_tool_button_new_from_stock (GTK_STOCK_GO_BACK);
+       g_object_set (priv->back_button, "is-important", TRUE, NULL);
+       gtk_toolbar_insert (GTK_TOOLBAR (priv->top_toolbar), priv->back_button, -1);
+       gtk_widget_show (GTK_WIDGET (priv->back_button));
+       g_signal_connect (G_OBJECT (priv->back_button), "clicked", G_CALLBACK (on_back_button_clicked), obj);
+
        priv->notebook = gtk_notebook_new ();
        gtk_notebook_set_show_tabs ((GtkNotebook *)priv->notebook, FALSE);
        gtk_notebook_set_show_border ((GtkNotebook *)priv->notebook, FALSE);
@@ -511,7 +511,11 @@ on_title_button_clicked (GtkToolButton *button, ModestShell *self)
        menu = modest_shell_window_get_menu (MODEST_SHELL_WINDOW (child));
 
        if (menu) {
-               gtk_menu_popup (GTK_MENU (menu), NULL, NULL, 
+               /* Run dimming rules */
+               ModestWindow *window = modest_shell_peek_window (self);
+               modest_ui_actions_check_menu_dimming_rules (window);
+
+               gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
                                (GtkMenuPositionFunc) menu_position_cb, (gpointer) self,
                                1, gtk_get_current_event_time ());
        }