Fixes the Diablo build

pmo-trunk-r7084

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index 9f8b4b1..28fc3ab 100644 (file)
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -759,7 +759,7 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
                        else
                                real_suggested_name = g_strdup_printf (_("mcen_ia_default_folder_name_s"),
                                                                       num_str);
                        else
                                real_suggested_name = g_strdup_printf (_("mcen_ia_default_folder_name_s"),
                                                                       num_str);

-                       exists = modest_tny_folder_has_subfolder_with_name (parent_folder,
+                       exists = modest_tny_folder_has_subfolder_with_name (suggested_parent,

                                                                            real_suggested_name,
                                                                            TRUE);
 
                                                                            real_suggested_name,
                                                                            TRUE);
 

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index a752915..098aa41 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -177,10 +177,12 @@ static void modest_ui_actions_on_main_window_move_to (GtkAction *action,
                                                      GtkWidget *folder_view,
                                                      TnyFolderStore *dst_folder,
                                                      ModestMainWindow *win);
                                                      GtkWidget *folder_view,
                                                      TnyFolderStore *dst_folder,
                                                      ModestMainWindow *win);

+#ifdef MODEST_TOOLKIT_HILDON2

 static void modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view,
                                                        TnyFolderStore *dst_folder,
                                                        TnyList *selection,
                                                        GtkWindow *win);
 static void modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view,
                                                        TnyFolderStore *dst_folder,
                                                        TnyList *selection,
                                                        GtkWindow *win);

+#endif

 
 static void modest_ui_actions_on_window_move_to (GtkAction *action,
                                                 TnyList *list_to_move,
 
 static void modest_ui_actions_on_window_move_to (GtkAction *action,
                                                 TnyList *list_to_move,

diff --git a/src/widgets/modest-validating-entry.c b/src/widgets/modest-validating-entry.c
index a7af0b6..879e1da 100644 (file)
--- a/src/widgets/modest-validating-entry.c
+++ b/src/widgets/modest-validating-entry.c
@@ -213,7 +213,7 @@ modest_validating_entry_new (void)
        
        entry = g_object_new (MODEST_TYPE_VALIDATING_ENTRY, NULL);
 
        
        entry = g_object_new (MODEST_TYPE_VALIDATING_ENTRY, NULL);
 

-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_TOOLKIT_HILDON2

        hildon_gtk_widget_set_theme_size (GTK_WIDGET (entry), MODEST_EDITABLE_SIZE);
 #endif
 
        hildon_gtk_widget_set_theme_size (GTK_WIDGET (entry), MODEST_EDITABLE_SIZE);
 #endif