X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-accounts-window.c;fp=src%2Fhildon2%2Fmodest-accounts-window.c;h=29d3f8be3e46d0e21c8a4e8cbd205f82e25a7152;hp=afc5c2c52bbb0a720489e577378d2040ad44f054;hb=5878864a5f2633b5f41fbc7e6de72ab1250d3196;hpb=3b0f24b35dfbc87b91c669f4b6132931d593a130

diff --git a/src/hildon2/modest-accounts-window.c b/src/hildon2/modest-accounts-window.c
index afc5c2c..29d3f8b 100644
--- 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);
 }