* all:

  - compile fixes for maemo

pmo-trunk-r823

diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c
index 7374430..2332b23 100644 (file)
--- a/src/maemo/modest-account-view-window.c
+++ b/src/maemo/modest-account-view-window.c
@@ -165,7 +165,6 @@ on_remove_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 
        if (account_name) {
                gboolean removed;
-               GError *err = NULL;
                GtkWidget *dialog;
                gchar *txt;
 
@@ -188,14 +187,11 @@ on_remove_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
                           the account from the ModestAccountView */
                        removed = modest_account_mgr_remove_account (account_mgr,
                                                                     account_name,
-                                                                    FALSE,
-                                                                    &err);
+                                                                    FALSE);                                             
                        if (removed) {
                                /* Show confirmation dialog ??? */
                        } else {
                                /* Show error dialog ??? */
-                               if (err)
-                                       g_error_free (err);
                        }
                }
                gtk_widget_destroy (dialog);

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 6ab35cb..28bd4bb 100644 (file)
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -155,7 +155,7 @@ get_transports (void)
        GSList *cursor, *accounts;
        
        account_mgr = modest_runtime_get_account_mgr();
-/*     cursor = accounts = modest_account_mgr_account_names (account_mgr, NULL); */
+       cursor = accounts = modest_account_mgr_account_names (account_mgr); 
        while (cursor) {
                gchar *account_name = (gchar*)cursor->data;
                gchar *from_string  = modest_account_mgr_get_from_string (account_mgr,

diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c
index 08e0630..de54a58 100644 (file)
--- a/src/widgets/modest-header-view.c
+++ b/src/widgets/modest-header-view.c
@@ -467,6 +467,8 @@ modest_header_view_get_selected_headers (ModestHeaderView *self)
 static void
 scroll_to_selected (ModestHeaderView *self, GtkTreeIter *iter, gboolean up)
 {
+#if MODEST_PLATFORM_ID==1  /* MODES_PLATFORM_ID: 1 ==> gtk, 2==> maemo */ 
+
        GtkTreePath *selected_path;
        GtkTreePath *start, *end;
        
@@ -489,6 +491,8 @@ scroll_to_selected (ModestHeaderView *self, GtkTreeIter *iter, gboolean up)
        gtk_tree_path_free (selected_path);
        gtk_tree_path_free (start);
        gtk_tree_path_free (end);
+
+#endif /* MODEST_PLATFORM_ID */
 }