* Fixed a segmentation fault when creating combo boxes

* Delete unused commented code
* Added an if to not return the local account when asking for transport accounts

pmo-trunk-r731

diff --git a/src/gtk/modest-edit-msg-window.c b/src/gtk/modest-edit-msg-window.c
index 54b0a16..b31f8e2 100644 (file)
--- a/src/gtk/modest-edit-msg-window.c
+++ b/src/gtk/modest-edit-msg-window.c
@@ -353,7 +353,7 @@ modest_edit_msg_window_get_msg_data (ModestEditMsgWindow *edit_window)
        priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE (edit_window);
        
        account_data = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->from_field));
-       buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));        
+       buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
        gtk_text_buffer_get_bounds (buf, &b, &e);
 
        /* don't free these (except from) */
@@ -362,7 +362,7 @@ modest_edit_msg_window_get_msg_data (ModestEditMsgWindow *edit_window)
        data->to      =  (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->to_field));
        data->cc      =  (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->cc_field));
        data->bcc     =  (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->bcc_field));
-       data->subject =  (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->subject_field));  
+       data->subject =  (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->subject_field));
        data->body    =  gtk_text_buffer_get_text (buf, &b, &e, FALSE);
 
        return data;

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index e4ba8ee..b48ce12 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -649,12 +649,13 @@ modest_tny_account_store_get_accounts  (TnyAccountStore *account_store, TnyList
        g_slist_free (accounts);
 
        /* also, add the local folder pseudo-account */
-       local_folder_account = get_local_folder_account (MODEST_TNY_ACCOUNT_STORE(self));
-       if (!local_folder_account)
-               g_printerr ("modest: failed to add local folders account\n");
-       else
-               tny_list_prepend (list, G_OBJECT(local_folder_account));
-       
+       if (type != TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS) {
+               local_folder_account = get_local_folder_account (MODEST_TNY_ACCOUNT_STORE(self));
+               if (!local_folder_account)
+                       g_printerr ("modest: failed to add local folders account\n");
+               else
+                       tny_list_prepend (list, G_OBJECT(local_folder_account));
+       }
        tny_session_camel_set_account_store (priv->tny_session_camel, account_store);
 }
 

diff --git a/src/modest-ui.c b/src/modest-ui.c
index e2d15e2..f877ed9 100644 (file)
--- a/src/modest-ui.c
+++ b/src/modest-ui.c
@@ -908,6 +908,16 @@ _modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
 }
 
 
+/****************************************************/
+/*
+ * below some stuff to clearup statusbar messages after 1,5 seconds....
+ */
+typedef struct {
+       GtkWidget *status_bar;
+       GtkWidget *progress_bar;
+       guint     msg_id;
+} StatusRemoveData;
+
 
 static gboolean
 progress_bar_clean (GtkWidget *bar)
@@ -918,6 +928,7 @@ progress_bar_clean (GtkWidget *bar)
        }
        return FALSE;
 }
+
 static gboolean
 statusbar_clean (GtkWidget *bar)
 {

diff --git a/src/modest-widget-factory.c b/src/modest-widget-factory.c
index cfac9b9..c066feb 100644 (file)
--- a/src/modest-widget-factory.c
+++ b/src/modest-widget-factory.c
@@ -293,10 +293,11 @@ get_transports (ModestWidgetFactory *self)
 
                data = modest_account_mgr_get_account_data (account_mgr, account_name);
                if (data && data->transport_account) {
+                       ModestPair *pair;
                        gchar *display_name = g_strdup_printf ("%s (%s)", data->email, account_name);
-                       ModestPair *pair = modest_pair_new ((gpointer) data,
-                                                           (gpointer) display_name , TRUE);
-                       transports = g_slist_append (transports, pair);
+                       pair = modest_pair_new ((gpointer) data,
+                                               (gpointer) display_name , TRUE);
+                       transports = g_slist_prepend (transports, pair);
                }
                /* don't free account name; it's freed when the transports list is freed */
                cursor = cursor->next;
@@ -385,7 +386,7 @@ modest_widget_factory_get_combo_box (ModestWidgetFactory *self, ModestComboBoxTy
        }
 
        combo_box = modest_combo_box_new (protos);
-       modest_pair_list_free (protos);
+       g_slist_free (protos);
        
        gtk_combo_box_set_active (GTK_COMBO_BOX(combo_box), 0);
        
@@ -409,42 +410,3 @@ modest_widget_factory_get_folder_info_label (ModestWidgetFactory *self)
        g_return_val_if_fail (self, NULL);
        return MODEST_WIDGET_FACTORY_GET_PRIVATE(self)->folder_info_label;
 }
-
-
-/*********************** Test code ********************/
-/* static void */
-/* on_folder_key_press_event (ModestFolderView *folder_view, GdkEventKey *event, gpointer user_data) */
-/* { */
-/*     GtkTreeSelection *selection; */
-/*     GtkTreeModel *model; */
-/*     GtkTreeIter iter; */
-/*     TnyFolderStore *folder; */
-/*     gint type; */
-/*     ModestMailOperation *mail_op; */
-
-/*     selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view)); */
-/*     gtk_tree_selection_get_selected (selection, &model, &iter); */
-       
-/*     gtk_tree_model_get (model, &iter,  */
-/*                         TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,  */
-/*                         TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,  */
-/*                         -1); */
-
-/*     mail_op = modest_mail_operation_new (); */
-
-/*     if (event->keyval == GDK_C || event->keyval == GDK_c) { */
-/*             if (type != TNY_FOLDER_TYPE_ROOT) */
-/*                     modest_mail_operation_create_folder (mail_op, folder, "New"); */
-/*     } else if (event->keyval == GDK_D || event->keyval == GDK_d) { */
-/*             if (type != TNY_FOLDER_TYPE_ROOT) */
-/*                     modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (folder), FALSE); */
-/*     } else if (event->keyval == GDK_N || event->keyval == GDK_n) { */
-/*             if (type != TNY_FOLDER_TYPE_ROOT) */
-/*                     modest_mail_operation_rename_folder (mail_op, TNY_FOLDER (folder), "New Name"); */
-/*     } else if (event->keyval == GDK_T || event->keyval == GDK_t) { */
-/*             if (type != TNY_FOLDER_TYPE_ROOT) */
-/*                     modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (folder), TRUE); */
-/*     } */
-
-/*     g_object_unref (G_OBJECT (mail_op)); */
-/* } */