Fix menus after a bad commit.

diff --git a/src/hildon2/modest-accounts-window.c b/src/hildon2/modest-accounts-window.c
index afc5c2c..29d3f8b 100644 (file)
--- a/src/hildon2/modest-accounts-window.c
+++ b/src/hildon2/modest-accounts-window.c
@@ -404,29 +404,29 @@ setup_menu (ModestAccountsWindow *self)
        g_return_if_fail (MODEST_IS_ACCOUNTS_WINDOW(self));
 
        /* Settings menu buttons */
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_account"), NULL, 
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_new_account), 
-                                          NULL);
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_send_receive),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive_all));
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self),
-                                          dngettext(GETTEXT_PACKAGE,
-                                                    "mcen_me_edit_account",
-                                                    "mcen_me_edit_accounts",
-                                                    2),
-                                          NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_accounts), 
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_edit_accounts));
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_globalsmtpservers"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_smtp_servers),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_tools_smtp_servers));
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_cancel_send),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_options"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_settings), 
-                                          NULL);
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_new_account"), NULL, 
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_new_account), 
+                                  NULL);
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_send_receive),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive_all));
+       modest_window_add_to_menu (MODEST_WINDOW (self),
+                                  dngettext(GETTEXT_PACKAGE,
+                                            "mcen_me_edit_account",
+                                            "mcen_me_edit_accounts",
+                                            2),
+                                  NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_accounts), 
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_edit_accounts));
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_globalsmtpservers"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_smtp_servers),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_tools_smtp_servers));
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_cancel_send),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_options"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_settings), 
+                                  NULL);
 }
 
 

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index a754bb6..0969905 100644 (file)
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -546,25 +546,25 @@ setup_menu (ModestFolderWindow *self)
        g_return_if_fail (MODEST_IS_FOLDER_WINDOW(self));
 
        /* folders actions */
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_folder"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_new_folder),
-                                          NULL);
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_send_receive),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive));
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_rename_folder"), NULL,
-                                          APP_MENU_CALLBACK (set_rename_edit_mode),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_rename_folder));
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_move_folder"), NULL,
-                                          APP_MENU_CALLBACK (set_moveto_edit_mode),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_folder_window_move_to));
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_delete_folder"), NULL,
-                                          APP_MENU_CALLBACK (set_delete_edit_mode),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_folder_window_delete));
-
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_cancel_send),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_new_folder"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_new_folder),
+                                  NULL);
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_send_receive),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive));
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_rename_folder"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (set_rename_edit_mode),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_rename_folder));
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_move_folder"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (set_moveto_edit_mode),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_folder_window_move_to));
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_delete_folder"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (set_delete_edit_mode),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_folder_window_delete));
+
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_cancel_send),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
 
        modest_window_add_to_menu (MODEST_WINDOW (self),
                                   dngettext(GETTEXT_PACKAGE,

diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c
index b731895..5c121aa 100644 (file)
--- a/src/hildon2/modest-header-window.c
+++ b/src/hildon2/modest-header-window.c
@@ -68,6 +68,7 @@ struct _ModestHeaderWindowPrivate {
        GtkWidget *contents_view;
        GtkWidget *top_vbox;
        GtkWidget *new_message_button;
+       GtkWidget *show_more_button;
 
        /* state bar */
        ContentsState contents_state;
@@ -870,49 +871,41 @@ static void setup_menu (ModestHeaderWindow *self)
        g_return_if_fail (MODEST_IS_HEADER_WINDOW(self));
        priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
 
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "<Control>n",
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg));
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_send_receive),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive));
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self),
-                                          dngettext(GETTEXT_PACKAGE,
-                                                    "mcen_me_move_message",
-                                                    "mcen_me_move_messages",
-                                                    2),
-                                          NULL,
-                                          APP_MENU_CALLBACK (set_moveto_edit_mode),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_move_to));
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_delete_messages"), NULL,
-                                          APP_MENU_CALLBACK (set_delete_edit_mode),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_delete));
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_folder_details"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_details),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_details));
-       priv->sort_button = hildon_button_new (MODEST_EDITABLE_SIZE,
-                                              HILDON_BUTTON_ARRANGEMENT_VERTICAL);
-       hildon_button_set_title (HILDON_BUTTON (priv->sort_button), _("mcen_me_sort"));
-       g_signal_connect_after (G_OBJECT (priv->sort_button), "clicked",
-                               G_CALLBACK (modest_ui_actions_on_sort), (gpointer) self);
-       hildon_button_set_style(HILDON_BUTTON (priv->sort_button), HILDON_BUTTON_STYLE_PICKER);
-       hildon_button_set_title_alignment (HILDON_BUTTON (priv->sort_button), 0.5, 0.5);
-       hildon_button_set_value_alignment (HILDON_BUTTON (priv->sort_button), 0.5, 0.5);
-       modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->sort_button),
-                                                 modest_ui_dimming_rules_on_sort);
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_new_message"), "<Control>n",
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_new_msg),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg));
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_send_receive),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive));
+       modest_window_add_to_menu (MODEST_WINDOW (self),
+                                  dngettext(GETTEXT_PACKAGE,
+                                            "mcen_me_move_message",
+                                            "mcen_me_move_messages",
+                                            2),
+                                  NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (set_moveto_edit_mode),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_move_to));
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_delete_messages"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (set_delete_edit_mode),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_delete));
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_folder_details"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_details),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_details));
 
+#ifdef MODEST_TOOLKIT_HILDON2
        priv->show_more_button = hildon_button_new (MODEST_EDITABLE_SIZE, HILDON_BUTTON_ARRANGEMENT_VERTICAL);
        hildon_button_set_title (HILDON_BUTTON (priv->show_more_button), _("mcen_va_more"));
        hildon_button_set_alignment (HILDON_BUTTON (priv->show_more_button), 0.5, 0.5, 1.0, 1.0);
        hildon_button_set_title_alignment (HILDON_BUTTON (priv->show_more_button), 0.5, 0.5);
        hildon_button_set_value_alignment (HILDON_BUTTON (priv->show_more_button), 0.5, 0.5);
-       modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->show_more_button),
-                                                 NULL);
+       modest_window_add_item_to_menu (MODEST_WINDOW (self), GTK_BUTTON (priv->show_more_button),
+                                       NULL);
        gtk_widget_hide_all (priv->show_more_button);
+#endif
 
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_cancel_send),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_cancel_send),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
 }
 
 static void