Refactor part of ModestWindow and ModestHildon2Window

[modest] / src / hildon2 / modest-platform.c

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index 68272c6..29e96b5 100644 (file)
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -1001,12 +1001,12 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window,
        GtkSizeGroup *sizegroup;
        ModestFolderView *folder_view;
        ModestWindow *folder_window;
-       ModestHildon2WindowMgr *window_mgr;
+       ModestWindowMgr *window_mgr;
        FolderPickerHelper *helper = NULL;
        GtkWidget *top_vbox, *top_align;
 
-       window_mgr = (ModestHildon2WindowMgr *) modest_runtime_get_window_mgr ();
-       folder_window = modest_hildon2_window_mgr_get_folder_window (window_mgr);
+       window_mgr = modest_runtime_get_window_mgr ();
+       folder_window = modest_window_mgr_get_folder_window (window_mgr);
        g_return_val_if_fail (MODEST_IS_FOLDER_WINDOW (folder_window), GTK_RESPONSE_NONE);
        
        folder_view = modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (folder_window));
@@ -1031,7 +1031,7 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window,
 
        if (show_name) {
                label_entry = gtk_label_new (label_text);
-               entry = hildon_entry_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
+               entry = modest_toolkit_factory_create_entry (modest_runtime_get_toolkit_factory ());
                gtk_entry_set_max_length (GTK_ENTRY (entry), 20);
 
                gtk_misc_set_alignment (GTK_MISC (label_entry), 0.0, 0.5);
@@ -3026,7 +3026,8 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window,
                                              GTK_WINDOW (parent_window),
                                              GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR |
                                              GTK_DIALOG_DESTROY_WITH_PARENT,
-                                             _HL("wdgt_bd_new"), MODEST_GTK_RESPONSE_NEW_FOLDER,
+                                             _FM ("ckdg_bd_change_folder_new_folder"),
+                                             MODEST_GTK_RESPONSE_NEW_FOLDER,
                                              NULL);
 
        align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);