Remove some deprecated GTK+ symbols

[modest] / src / modest-ui-actions.c

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index d76ff13..4933688 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -265,7 +265,7 @@ modest_ui_actions_on_about (GtkAction *action, ModestWindow *win)
                NULL
        };
        about = gtk_about_dialog_new ();
-       gtk_about_dialog_set_name (GTK_ABOUT_DIALOG(about), PACKAGE_NAME);
+       gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG(about), PACKAGE_NAME);
        gtk_about_dialog_set_version (GTK_ABOUT_DIALOG(about),PACKAGE_VERSION);
        gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG(about),
                                        _("Copyright (c) 2006, Nokia Corporation\n"
@@ -1299,7 +1299,8 @@ open_msg_performer(gboolean canceled,
        gboolean can_open;
        gchar *account_name = get_info_from_header (helper->header, &is_draft, &can_open);
 
-       if (!g_strcmp0 (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
+       if (!g_strcmp0 (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) ||
+           !g_strcmp0 (account_name, MODEST_MMC_ACCOUNT_ID)) {
                g_free (account_name);
                account_name = g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_window)));
        }
@@ -5156,8 +5157,8 @@ modest_ui_actions_on_edit_mode_move_to (ModestWindow *win)
        }
 
        /* Create and run the dialog */
+       dialog = create_move_to_dialog (win, NULL, list_to_move);
        toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
-       dialog = create_move_to_dialog (toplevel, NULL, list_to_move);
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
                                     GTK_WINDOW (dialog),
                                     toplevel);