* fix some logical ids

* leave 'X-OSSO-Service' empty in the desktop file (temp fix),
  to stop from being killed (this can be reenabled once dbus-support is added)

pmo-trunk-r1602

diff --git a/src/maemo/modest-main-window-ui.h b/src/maemo/modest-main-window-ui.h
index 93dfaa4..e4a55b1 100644 (file)
--- a/src/maemo/modest-main-window-ui.h
+++ b/src/maemo/modest-main-window-ui.h
@@ -71,7 +71,7 @@ static const GtkActionEntry modest_action_entries [] = {
        { "EditCut",         NULL,      N_("mcen_me_inbox_cut"),          "<CTRL>X",    NULL, G_CALLBACK (modest_ui_actions_on_cut) },
        { "EditCopy",        NULL,      N_("mcen_me_inbox_copy"),         "<CTRL>C",    NULL, G_CALLBACK (modest_ui_actions_on_copy) },
        { "EditPaste",       NULL,      N_("mcen_me_inbox_paste"),        "<CTRL>V",    NULL, G_CALLBACK (modest_ui_actions_on_paste) },
-       { "EditSelectAll",   NULL,      N_("mcen_me_inbox_selectall"),    NULL,        NULL, G_CALLBACK (modest_ui_actions_on_select_all) },
+       { "EditSelectAll",   NULL,      N_("mcen_me_viewer_selectall"),    NULL,        NULL, G_CALLBACK (modest_ui_actions_on_select_all) },
        { "EditMarkAsRead", NULL,      N_("mcen_me_inbox_mark_as_read"),       NULL,      NULL, NULL },
        { "EditMarkAsUnread", NULL,      N_("mcen_me_inbox_mark_as_unread"),       NULL,          NULL, NULL },
        { "EditMoveTo",      NULL,      N_("mcen_me_inbox_moveto"),    NULL,      NULL, NULL },
@@ -88,7 +88,7 @@ static const GtkActionEntry modest_action_entries [] = {
        { "ToolsSMTPServers",     NULL,      N_("mcen_me_inbox_globalsmtpservers"),                NULL, NULL,  NULL },
        { "ToolsSendReceive", NULL, N_("mcen_me_inbox_sendandreceive") }, /* submenu */
        { "ToolsSendReceiveAll",    NULL,      N_("mcen_me_inbox_sendandreceive_all"),          NULL, NULL,  NULL },
-       { "ToolsSendReceiveCancelSending",  NULL,      N_("mcen_me_inbox_cancelsend"),        NULL, NULL,  NULL },
+       { "ToolsSendReceiveCancelSending",  NULL,      N_("mcen_me_outbox_cancelsend"),        NULL, NULL,  NULL },
        { "ToolsContacts",            NULL,      N_("mcen_me_inbox_open_addressbook"),                      NULL, NULL,  NULL },
        { "ToolsAddToContacts",            NULL,      N_("mcen_me_viewer_addtocontacts"),                      NULL, NULL,  G_CALLBACK (modest_ui_actions_on_add_to_contacts) },
        { "ToolsSearchMessages",            NULL,      N_("mcen_me_inbox_search"),                      NULL, NULL,  NULL },

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 54b0437..383528e 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -448,8 +448,8 @@ modest_main_window_close_all (ModestMainWindow *self)
        /* Create the confirmation dialog MSG-NOT308 */
        note = hildon_note_new_confirmation_add_buttons (GTK_WINDOW (self),
                                                         _("emev_nc_close_windows"),
-                                                        _("mcen_db_yes"), GTK_RESPONSE_YES,
-                                                        _("mcen_db_no"), GTK_RESPONSE_NO,
+                                                        _("mcen_bd_yes"), GTK_RESPONSE_YES,
+                                                        _("mcen_bd_no"), GTK_RESPONSE_NO,
                                                         NULL);
 
        response = gtk_dialog_run (GTK_DIALOG (note));

diff --git a/src/maemo/modest.desktop.in b/src/maemo/modest.desktop.in
index 0bca91a..ddd652e 100644 (file)
--- a/src/maemo/modest.desktop.in
+++ b/src/maemo/modest.desktop.in
@@ -6,7 +6,8 @@ Name=modest
 Comment=modest e-mail client
 Exec=@prefix@/bin/modest
 
-X-Osso-Service=org.maemo.modest
+#don't kill our app
+#X-Osso-Service=org.maemo.modest
 X-Osso-Type=application/x-executable
 
 Icon=qgn_list_messagin