* Fixed build error in the GNOME UI

pmo-trunk-r1821

diff --git a/src/gnome/modest-gnome-global-settings-dialog.c b/src/gnome/modest-gnome-global-settings-dialog.c
index 21ac609..ba50f27 100644 (file)
--- a/src/gnome/modest-gnome-global-settings-dialog.c
+++ b/src/gnome/modest-gnome-global-settings-dialog.c
@@ -38,10 +38,12 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtkcheckbutton.h>
 #include <gtk/gtkhseparator.h>
+#include <gtk/gtktable.h>
+#include <gtk/gtkspinbutton.h>
 #include "widgets/modest-global-settings-dialog-priv.h"
 #include "widgets/modest-combo-box.h"
 #include "gnome/modest-gnome-global-settings-dialog.h"
-#include "modest-ui-constants.h"
+#include "widgets/modest-ui-constants.h"
 
 
 /* include other impl specific header files */
@@ -214,14 +216,14 @@ create_updating_page (ModestGnomeGlobalSettingsDialog *self)
 
        /* Connected via */
        label = create_label (_("mcen_fi_options_connectiontype"));
-       list = get_connected_via ();
+       list = _modest_global_settings_dialog_get_connected_via ();
        combo = modest_combo_box_new (list, g_int_equal);
        modest_pair_list_free (list);
        add_to_table (GTK_TABLE (table_update), label, combo);
 
        /* Update interval */
        label = create_label (_("mcen_fi_options_updateinterval"));
-       list = get_update_interval ();
+       list = _modest_global_settings_dialog_get_update_interval ();
        combo = modest_combo_box_new (list, g_int_equal);
        modest_pair_list_free (list);
        add_to_table (GTK_TABLE (table_update), label, combo);
@@ -266,7 +268,7 @@ create_composing_page (ModestGnomeGlobalSettingsDialog *self)
 
        /* Update interval */
        label = create_label (_("mcen_fi_options_messageformat"));
-       list = get_msg_formats ();
+       list = _modest_global_settings_dialog_get_msg_formats ();
        combo = modest_combo_box_new (list, g_int_equal);
        modest_pair_list_free (list);
        add_to_table (GTK_TABLE (table), label, combo);

diff --git a/src/gnome/modest-main-window.c b/src/gnome/modest-main-window.c
index 1214d95..c15c39c 100644 (file)
--- a/src/gnome/modest-main-window.c
+++ b/src/gnome/modest-main-window.c
@@ -720,6 +720,7 @@ modest_main_window_set_contents_style (ModestMainWindow *self,
 
 static void
 get_msg_callback (TnyFolder *folder, 
+                 gboolean cancelled,
                  TnyMsg *msg, 
                  GError **err, 
                  gpointer user_data)

diff --git a/src/gnome/modest-msg-edit-window.c b/src/gnome/modest-msg-edit-window.c
index 6625f7a..052f2c5 100644 (file)
--- a/src/gnome/modest-msg-edit-window.c
+++ b/src/gnome/modest-msg-edit-window.c
@@ -521,7 +521,8 @@ modest_msg_edit_window_attach_file (ModestMsgEditWindow *window)
 }
 
 void
-modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window)
+modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window,
+                                          GList *att_list)
 {
        g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
 

diff --git a/src/gnome/modest-platform.c b/src/gnome/modest-platform.c
index f7a35e3..4dc60c0 100644 (file)
--- a/src/gnome/modest-platform.c
+++ b/src/gnome/modest-platform.c
@@ -34,6 +34,7 @@
 #include "modest-platform.h"
 #include "modest-mail-operation-queue.h"
 #include "modest-runtime.h"
+#include "gnome/modest-gnome-global-settings-dialog.h"
 
 gboolean
 modest_platform_init (void)
@@ -135,10 +136,7 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
                                       gchar **folder_name)
 {
        GtkWidget *dialog, *entry;
-       gboolean finished = FALSE;
        gint result;
-       TnyFolder *new_folder;
-       ModestMailOperation *mail_op;
 
        /* Ask the user for the folder name */
        dialog = gtk_dialog_new_with_buttons (_("New Folder Name"),
@@ -202,6 +200,7 @@ gboolean modest_platform_connect_and_wait (GtkWindow *parent_window)
 gboolean modest_platform_set_update_interval (guint minutes)
 {
        /* TODO. */
+       return FALSE;
 }
 
 void
@@ -211,8 +210,8 @@ modest_platform_run_sort_dialog (GtkWindow *parent_window,
        /* TODO */
 }
 
-GtkWidget
+GtkWidget *
 modest_platform_get_global_settings_dialog ()
 {
-       /* TODO */
+       return modest_gnome_global_settings_dialog_new ();
 }

diff --git a/src/widgets/modest-attachments-view.c b/src/widgets/modest-attachments-view.c
index 056b733..9f07cab 100644 (file)
--- a/src/widgets/modest-attachments-view.c
+++ b/src/widgets/modest-attachments-view.c
@@ -33,7 +33,7 @@
 
 #include <string.h>
 #include <gtk/gtk.h>
-
+#include <gdk/gdkkeysyms.h>
 #include <tny-list.h>
 #include <tny-simple-list.h>