X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=da8e834b9d1da5583f2f90f2f1d972f9a57cfe3c;hp=4dba8fcd71effe55ca1b498fc5a5caad947127da;hb=537099bbfb23c90bd7770f0fc3cbcedaf1c54faa;hpb=87d578230a89243214175a0245da9f73ca93e1a5 diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index 4dba8fc..da8e834 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -76,7 +76,8 @@ static void tny_account_store_view_init (gpointer g, static void modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore *account_store); -static void on_selection_changed (GtkTreeSelection *sel, gpointer data); +static void on_selection_changed (GtkTreeSelection *sel, + gpointer data); static void on_account_removed (TnyAccountStore *self, TnyAccount *account, @@ -240,7 +241,9 @@ static void modest_folder_view_class_init (ModestFolderViewClass *klass) { GObjectClass *gobject_class; + GtkTreeViewClass *treeview_class; gobject_class = (GObjectClass*) klass; + treeview_class = (GtkTreeViewClass*) klass; parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_folder_view_finalize; @@ -274,6 +277,9 @@ modest_folder_view_class_init (ModestFolderViewClass *klass) NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); + + treeview_class->select_cursor_parent = NULL; + } /* Simplify checks for NULLs: */ @@ -359,36 +365,25 @@ on_get_mmc_account_name (TnyStoreAccount* account, gpointer user_data) } static void -text_cell_data (GtkTreeViewColumn *column, +text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, - GtkTreeModel *tree_model, - GtkTreeIter *iter, + GtkTreeModel *tree_model, + GtkTreeIter *iter, gpointer data) { ModestFolderViewPrivate *priv; - GObject *rendobj; + GObject *rendobj = (GObject *) renderer; gchar *fname = NULL; TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; GObject *instance = NULL; - g_return_if_fail (column); - g_return_if_fail (tree_model); - g_return_if_fail (iter != NULL); - gtk_tree_model_get (tree_model, iter, TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &fname, TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance, -1); - rendobj = G_OBJECT(renderer); - - if (!fname) - return; - - if (!instance) { - g_free (fname); - return; - } + if (!fname || !instance) + goto end; ModestFolderView *self = MODEST_FOLDER_VIEW (data); priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); @@ -421,10 +416,16 @@ text_cell_data (GtkTreeViewColumn *column, /* Use bold font style if there are unread or unset messages */ if (number > 0) { - item_name = g_strdup_printf ("%s (%d)", fname, number); + if (type == TNY_FOLDER_TYPE_INBOX) + item_name = g_strdup_printf ("%s (%d)", _("mcen_me_folder_inbox"), number); + else + item_name = g_strdup_printf ("%s (%d)", fname, number); item_weight = 800; } else { - item_name = g_strdup (fname); + if (type == TNY_FOLDER_TYPE_INBOX) + item_name = g_strdup (_("mcen_me_folder_inbox")); + else + item_name = g_strdup (fname); item_weight = 400; } @@ -455,7 +456,7 @@ text_cell_data (GtkTreeViewColumn *column, /* Notify display name observers */ /* TODO: What listens for this signal, and how can it use only the new name? */ - if (G_OBJECT (priv->cur_folder_store) == instance) { + if (((GObject *) priv->cur_folder_store) == instance) { g_signal_emit (G_OBJECT(self), signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0, item_name); @@ -481,121 +482,232 @@ text_cell_data (GtkTreeViewColumn *column, modest_tny_account_get_mmc_account_name (TNY_STORE_ACCOUNT (instance), on_get_mmc_account_name, callback_data); } - - g_object_unref (G_OBJECT (instance)); - g_free (fname); + end: + if (instance) + g_object_unref (G_OBJECT (instance)); + if (fname) + g_free (fname); } -static void -icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, - GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) + +typedef struct { + GdkPixbuf *pixbuf; + GdkPixbuf *pixbuf_open; + GdkPixbuf *pixbuf_close; +} ThreePixbufs; + + +static inline GdkPixbuf * +get_composite_pixbuf (const gchar *icon_name, + const gint size, + GdkPixbuf *base_pixbuf) { - GObject *rendobj = NULL, *instance = NULL; - GdkPixbuf *pixbuf = NULL; - TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; - const gchar *account_id = NULL; - gboolean has_children; + GdkPixbuf *emblem, *retval = NULL; + + emblem = modest_platform_get_icon (icon_name, size); + if (emblem) { + retval = gdk_pixbuf_copy (base_pixbuf); + gdk_pixbuf_composite (emblem, retval, 0, 0, + MIN (gdk_pixbuf_get_width (emblem), + gdk_pixbuf_get_width (retval)), + MIN (gdk_pixbuf_get_height (emblem), + gdk_pixbuf_get_height (retval)), + 0, 0, 1, 1, GDK_INTERP_NEAREST, 255); + g_object_unref (emblem); + } + return retval; +} - rendobj = G_OBJECT(renderer); - gtk_tree_model_get (tree_model, iter, - TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type, - TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance, - -1); - has_children = gtk_tree_model_iter_has_child (tree_model, iter); +static inline ThreePixbufs * +get_composite_icons (const gchar *icon_code, + GdkPixbuf **pixbuf, + GdkPixbuf **pixbuf_open, + GdkPixbuf **pixbuf_close) +{ + ThreePixbufs *retval; - if (!instance) - return; + if (!*pixbuf) + *pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (icon_code, MODEST_ICON_SIZE_SMALL)); + + if (!*pixbuf_open) + *pixbuf_open = get_composite_pixbuf ("qgn_list_gene_fldr_exp", + MODEST_ICON_SIZE_SMALL, + *pixbuf); + + if (!*pixbuf_close) + *pixbuf_close = get_composite_pixbuf ("qgn_list_gene_fldr_clp", + MODEST_ICON_SIZE_SMALL, + *pixbuf); + + retval = g_slice_new0 (ThreePixbufs); + if (*pixbuf) + retval->pixbuf = g_object_ref (*pixbuf); + if (*pixbuf_open) + retval->pixbuf_open = g_object_ref (*pixbuf_open); + if (*pixbuf_close) + retval->pixbuf_close = g_object_ref (*pixbuf_close); + + return retval; +} + +static ThreePixbufs* +get_folder_icons (TnyFolderType type, GObject *instance) +{ + static GdkPixbuf *inbox_pixbuf = NULL, *outbox_pixbuf = NULL, + *junk_pixbuf = NULL, *sent_pixbuf = NULL, + *trash_pixbuf = NULL, *draft_pixbuf = NULL, + *normal_pixbuf = NULL, *anorm_pixbuf = NULL, + *ammc_pixbuf = NULL, *avirt_pixbuf = NULL; + + static GdkPixbuf *inbox_pixbuf_open = NULL, *outbox_pixbuf_open = NULL, + *junk_pixbuf_open = NULL, *sent_pixbuf_open = NULL, + *trash_pixbuf_open = NULL, *draft_pixbuf_open = NULL, + *normal_pixbuf_open = NULL, *anorm_pixbuf_open = NULL, + *ammc_pixbuf_open = NULL, *avirt_pixbuf_open = NULL; + + static GdkPixbuf *inbox_pixbuf_close = NULL, *outbox_pixbuf_close = NULL, + *junk_pixbuf_close = NULL, *sent_pixbuf_close = NULL, + *trash_pixbuf_close = NULL, *draft_pixbuf_close = NULL, + *normal_pixbuf_close = NULL, *anorm_pixbuf_close = NULL, + *ammc_pixbuf_close = NULL, *avirt_pixbuf_close = NULL; + + ThreePixbufs *retval = NULL; /* MERGE is not needed anymore as the folder now has the correct type jschmid */ /* We include the MERGE type here because it's used to create the local OUTBOX folder */ if (type == TNY_FOLDER_TYPE_NORMAL || type == TNY_FOLDER_TYPE_UNKNOWN) { - type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance)); + type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance)); } switch (type) { + case TNY_FOLDER_TYPE_INVALID: + g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); + break; + case TNY_FOLDER_TYPE_ROOT: if (TNY_IS_ACCOUNT (instance)) { - if (modest_tny_account_is_virtual_local_folders ( - TNY_ACCOUNT (instance))) { - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_LOCAL_FOLDERS); - } - else { - account_id = tny_account_get_id (TNY_ACCOUNT (instance)); + if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (instance))) { + retval = get_composite_icons (MODEST_FOLDER_ICON_LOCAL_FOLDERS, + &avirt_pixbuf, + &avirt_pixbuf_open, + &avirt_pixbuf_close); + } else { + const gchar *account_id = tny_account_get_id (TNY_ACCOUNT (instance)); - if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_MMC); - else - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_ACCOUNT); + if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) { + retval = get_composite_icons (MODEST_FOLDER_ICON_MMC, + &ammc_pixbuf, + &ammc_pixbuf_open, + &ammc_pixbuf_close); + } else { + retval = get_composite_icons (MODEST_FOLDER_ICON_ACCOUNT, + &anorm_pixbuf, + &anorm_pixbuf_open, + &anorm_pixbuf_close); + } } } break; case TNY_FOLDER_TYPE_INBOX: - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_INBOX); - break; + retval = get_composite_icons (MODEST_FOLDER_ICON_INBOX, + &inbox_pixbuf, + &inbox_pixbuf_open, + &inbox_pixbuf_close); + break; case TNY_FOLDER_TYPE_OUTBOX: - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_OUTBOX); + retval = get_composite_icons (MODEST_FOLDER_ICON_OUTBOX, + &outbox_pixbuf, + &outbox_pixbuf_open, + &outbox_pixbuf_close); break; case TNY_FOLDER_TYPE_JUNK: - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_JUNK); + retval = get_composite_icons (MODEST_FOLDER_ICON_JUNK, + &junk_pixbuf, + &junk_pixbuf_open, + &junk_pixbuf_close); break; case TNY_FOLDER_TYPE_SENT: - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_SENT); + retval = get_composite_icons (MODEST_FOLDER_ICON_SENT, + &sent_pixbuf, + &sent_pixbuf_open, + &sent_pixbuf_close); break; case TNY_FOLDER_TYPE_TRASH: - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_TRASH); + retval = get_composite_icons (MODEST_FOLDER_ICON_TRASH, + &trash_pixbuf, + &trash_pixbuf_open, + &trash_pixbuf_close); break; case TNY_FOLDER_TYPE_DRAFTS: - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_DRAFTS); - break; + retval = get_composite_icons (MODEST_FOLDER_ICON_DRAFTS, + &draft_pixbuf, + &draft_pixbuf_open, + &draft_pixbuf_close); + break; case TNY_FOLDER_TYPE_NORMAL: default: - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_NORMAL); - break; + retval = get_composite_icons (MODEST_FOLDER_ICON_NORMAL, + &normal_pixbuf, + &normal_pixbuf_open, + &normal_pixbuf_close); + break; } - - g_object_unref (G_OBJECT (instance)); + + return retval; +} + +static void +free_pixbufs (ThreePixbufs *pixbufs) +{ + if (pixbufs->pixbuf) + g_object_unref (pixbufs->pixbuf); + if (pixbufs->pixbuf_open) + g_object_unref (pixbufs->pixbuf_open); + if (pixbufs->pixbuf_close) + g_object_unref (pixbufs->pixbuf_close); + g_slice_free (ThreePixbufs, pixbufs); +} + +static void +icon_cell_data (GtkTreeViewColumn *column, + GtkCellRenderer *renderer, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gpointer data) +{ + GObject *rendobj = NULL, *instance = NULL; + TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; + gboolean has_children; + ThreePixbufs *pixbufs; + + rendobj = (GObject *) renderer; + + gtk_tree_model_get (tree_model, iter, + TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type, + TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance, + -1); + + if (!instance) + return; + + has_children = gtk_tree_model_iter_has_child (tree_model, iter); + pixbufs = get_folder_icons (type, instance); + g_object_unref (instance); /* Set pixbuf */ - g_object_set (rendobj, "pixbuf", pixbuf, NULL); - if (has_children && (pixbuf != NULL)) { - GdkPixbuf *open_pixbuf, *closed_pixbuf; - GdkPixbuf *open_emblem, *closed_emblem; - open_pixbuf = gdk_pixbuf_copy (pixbuf); - closed_pixbuf = gdk_pixbuf_copy (pixbuf); - open_emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp"); - closed_emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp"); - - if (open_emblem) { - gdk_pixbuf_composite (open_emblem, open_pixbuf, 0, 0, - MIN (gdk_pixbuf_get_width (open_emblem), - gdk_pixbuf_get_width (open_pixbuf)), - MIN (gdk_pixbuf_get_height (open_emblem), - gdk_pixbuf_get_height (open_pixbuf)), - 0, 0, 1, 1, GDK_INTERP_NEAREST, 255); - g_object_set (rendobj, "pixbuf-expander-open", open_pixbuf, NULL); - g_object_unref (open_emblem); - } - if (closed_emblem) { - gdk_pixbuf_composite (closed_emblem, closed_pixbuf, 0, 0, - MIN (gdk_pixbuf_get_width (closed_emblem), - gdk_pixbuf_get_width (closed_pixbuf)), - MIN (gdk_pixbuf_get_height (closed_emblem), - gdk_pixbuf_get_height (closed_pixbuf)), - 0, 0, 1, 1, GDK_INTERP_NEAREST, 255); - g_object_set (rendobj, "pixbuf-expander-closed", closed_pixbuf, NULL); - g_object_unref (closed_emblem); - } - if (closed_pixbuf) - g_object_unref (closed_pixbuf); - if (open_pixbuf) - g_object_unref (open_pixbuf); + g_object_set (rendobj, "pixbuf", pixbufs->pixbuf, NULL); + + if (has_children) { + g_object_set (rendobj, "pixbuf-expander-open", pixbufs->pixbuf_open, NULL); + g_object_set (rendobj, "pixbuf-expander-closed", pixbufs->pixbuf_close, NULL); } - if (pixbuf != NULL) - g_object_unref (pixbuf); + free_pixbufs (pixbufs); + + return; } static void @@ -615,7 +727,9 @@ add_columns (GtkWidget *treeview) icon_cell_data, treeview, NULL); renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_column_pack_start (column, renderer, FALSE); + g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, + "ellipsize-set", TRUE, NULL); + gtk_tree_view_column_pack_start (column, renderer, TRUE); gtk_tree_view_column_set_cell_data_func(column, renderer, text_cell_data, treeview, NULL); @@ -695,9 +809,7 @@ tny_account_store_view_init (gpointer g, gpointer iface_data) { TnyAccountStoreViewIface *klass = (TnyAccountStoreViewIface *)g; - klass->set_account_store_func = modest_folder_view_set_account_store; - - return; + klass->set_account_store = modest_folder_view_set_account_store; } static void @@ -731,7 +843,6 @@ modest_folder_view_finalize (GObject *obj) priv->query = NULL; } -/* modest_folder_view_disable_next_folder_selection (MODEST_FOLDER_VIEW(obj)); */ if (priv->folder_to_select) { g_object_unref (G_OBJECT(priv->folder_to_select)); priv->folder_to_select = NULL; @@ -751,10 +862,6 @@ modest_folder_view_finalize (GObject *obj) } if (priv->cur_folder_store) { - if (TNY_IS_FOLDER(priv->cur_folder_store)) - tny_folder_sync (TNY_FOLDER(priv->cur_folder_store), FALSE, NULL); - /* FALSE --> expunge the message */ - g_object_unref (priv->cur_folder_store); priv->cur_folder_store = NULL; } @@ -810,27 +917,13 @@ modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore G_CALLBACK (on_account_changed), self); modest_folder_view_update_model (MODEST_FOLDER_VIEW (self), account_store); + priv->reselect = FALSE; + modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (self)); g_object_unref (G_OBJECT (device)); } static void -on_connection_status_changed (TnyAccount *self, - TnyConnectionStatus status, - gpointer user_data) -{ - /* If the account becomes online then refresh it */ - if (status == TNY_CONNECTION_STATUS_CONNECTED) { - const gchar *acc_name; - GtkWidget *my_window; - - my_window = gtk_widget_get_ancestor (GTK_WIDGET (user_data), MODEST_TYPE_WINDOW); - acc_name = modest_tny_account_get_parent_modest_account_name_for_server_account (self); - modest_ui_actions_do_send_receive (acc_name, MODEST_WINDOW (my_window)); - } -} - -static void on_account_inserted (TnyAccountStore *account_store, TnyAccount *account, gpointer user_data) @@ -845,6 +938,7 @@ on_account_inserted (TnyAccountStore *account_store, priv = MODEST_FOLDER_VIEW_GET_PRIVATE (user_data); + /* If we're adding a new account, and there is no previous one, we need to select the visible server account */ if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE && @@ -853,52 +947,142 @@ on_account_inserted (TnyAccountStore *account_store, G_OBJECT (user_data), MODEST_CONF_FOLDER_VIEW_KEY); + if (!GTK_IS_TREE_VIEW(user_data)) { + g_warning ("BUG: %s: not a valid tree view", __FUNCTION__); + return; + } + /* Get the inner model */ + /* check, is some rare cases, we did not get the right thing here, + * NB#84097 */ filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data)); + if (!GTK_IS_TREE_MODEL_FILTER(filter_model)) { + g_warning ("BUG: %s: not a valid filter model", __FUNCTION__); + return; + } + + /* check, is some rare cases, we did not get the right thing here, + * NB#84097 */ sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); + if (!GTK_IS_TREE_MODEL_SORT(sort_model)) { + g_warning ("BUG: %s: not a valid sort model", __FUNCTION__); + return; + } /* Insert the account in the model */ tny_list_append (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))), G_OBJECT (account)); + + /* Refilter the model */ + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model)); +} + + +static gboolean +same_account_selected (ModestFolderView *self, + TnyAccount *account) +{ + ModestFolderViewPrivate *priv; + gboolean same_account = FALSE; + + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + + if (priv->cur_folder_store) { + TnyAccount *selected_folder_account = NULL; + + if (TNY_IS_FOLDER (priv->cur_folder_store)) { + selected_folder_account = + tny_folder_get_account (TNY_FOLDER (priv->cur_folder_store)); + } else { + selected_folder_account = + TNY_ACCOUNT (g_object_ref (priv->cur_folder_store)); + } + if (selected_folder_account == account) + same_account = TRUE; - /* When the store account gets online refresh it */ - g_signal_connect (account, "connection_status_changed", - G_CALLBACK (on_connection_status_changed), - MODEST_FOLDER_VIEW (user_data)); + g_object_unref (selected_folder_account); + } + return same_account; } +/** + * + * Selects the first inbox or the local account in an idle + */ +static gboolean +on_idle_select_first_inbox_or_local (gpointer user_data) +{ + ModestFolderView *self = MODEST_FOLDER_VIEW (user_data); + + gdk_threads_enter (); + modest_folder_view_select_first_inbox_or_local (self); + gdk_threads_leave (); + + return FALSE; +} static void on_account_changed (TnyAccountStore *account_store, TnyAccount *tny_account, gpointer user_data) { - /* do nothing */ + ModestFolderView *self; ModestFolderViewPrivate *priv; GtkTreeModel *sort_model, *filter_model; + GtkTreeSelection *sel; + gboolean same_account; /* Ignore transport account insertions, we're not showing them in the folder view */ if (TNY_IS_TRANSPORT_ACCOUNT (tny_account)) return; + if (!MODEST_IS_FOLDER_VIEW(user_data)) { + g_warning ("BUG: %s: not a valid folder view", __FUNCTION__); + return; + } + + self = MODEST_FOLDER_VIEW (user_data); priv = MODEST_FOLDER_VIEW_GET_PRIVATE (user_data); /* Get the inner model */ filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data)); + if (!GTK_IS_TREE_MODEL_FILTER(filter_model)) { + g_warning ("BUG: %s: not a valid filter model", __FUNCTION__); + return; + } + sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); - + if (!GTK_IS_TREE_MODEL_SORT(sort_model)) { + g_warning ("BUG: %s: not a valid sort model", __FUNCTION__); + return; + } + + /* Invalidate the cur_folder_store only if the selected folder + belongs to the account that is being removed */ + same_account = same_account_selected (self, tny_account); + if (same_account) { + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); + gtk_tree_selection_unselect_all (sel); + } + /* Remove the account from the model */ tny_list_remove (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))), G_OBJECT (tny_account)); - + /* Insert the account in the model */ tny_list_append (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))), G_OBJECT (tny_account)); -} + /* Refilter the model */ + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model)); + /* Select the first INBOX if the currently selected folder + belongs to the account that is being deleted */ + if (same_account) + g_idle_add (on_idle_select_first_inbox_or_local, self); +} static void on_account_removed (TnyAccountStore *account_store, @@ -909,34 +1093,27 @@ on_account_removed (TnyAccountStore *account_store, ModestFolderViewPrivate *priv; GtkTreeModel *sort_model, *filter_model; GtkTreeSelection *sel = NULL; - TnyAccount *folder_selected_account; + gboolean same_account = FALSE; /* Ignore transport account removals, we're not showing them in the folder view */ if (TNY_IS_TRANSPORT_ACCOUNT (account)) return; + if (!MODEST_IS_FOLDER_VIEW(user_data)) { + g_warning ("BUG: %s: not a valid folder view", __FUNCTION__); + return; + } + self = MODEST_FOLDER_VIEW (user_data); priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); /* Invalidate the cur_folder_store only if the selected folder belongs to the account that is being removed */ - if (priv->cur_folder_store) { - TnyAccount *selected_folder_account = NULL; - - if (TNY_IS_FOLDER (priv->cur_folder_store)) { - selected_folder_account = - tny_folder_get_account (TNY_FOLDER (priv->cur_folder_store)); - } else { - selected_folder_account = - TNY_ACCOUNT (g_object_ref (priv->cur_folder_store)); - } - - if (selected_folder_account == account) { - sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); - gtk_tree_selection_unselect_all (sel); - } - g_object_unref (selected_folder_account); + same_account = same_account_selected (self, account); + if (same_account) { + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); + gtk_tree_selection_unselect_all (sel); } /* Invalidate row to select only if the folder to select @@ -946,7 +1123,7 @@ on_account_removed (TnyAccountStore *account_store, folder_to_select_account = tny_folder_get_account (priv->folder_to_select); if (folder_to_select_account == account) { -/* modest_folder_view_disable_next_folder_selection (self); */ + modest_folder_view_disable_next_folder_selection (self); g_object_unref (priv->folder_to_select); priv->folder_to_select = NULL; } @@ -955,7 +1132,17 @@ on_account_removed (TnyAccountStore *account_store, /* Remove the account from the model */ filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + if (!GTK_IS_TREE_MODEL_FILTER(filter_model)) { + g_warning ("BUG: %s: not a valid filter model", __FUNCTION__); + return; + } + sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); + if (!GTK_IS_TREE_MODEL_SORT(sort_model)) { + g_warning ("BUG: %s: not a valid sort model", __FUNCTION__); + return; + } + tny_list_remove (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))), G_OBJECT (account)); @@ -972,14 +1159,13 @@ on_account_removed (TnyAccountStore *account_store, MODEST_CONF_FOLDER_VIEW_KEY); } + /* Refilter the model */ + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model)); + /* Select the first INBOX if the currently selected folder belongs to the account that is being deleted */ - folder_selected_account = (TNY_IS_FOLDER (priv->cur_folder_store)) ? - modest_tny_folder_get_account (TNY_FOLDER (priv->cur_folder_store)) : - TNY_ACCOUNT (g_object_ref (priv->cur_folder_store)); - if (account == folder_selected_account) - modest_folder_view_select_first_inbox_or_local (self); - g_object_unref (folder_selected_account); + if (same_account) + g_idle_add (on_idle_select_first_inbox_or_local, self); } void @@ -987,7 +1173,7 @@ modest_folder_view_set_title (ModestFolderView *self, const gchar *title) { GtkTreeViewColumn *col; - g_return_if_fail (self); + g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self)); col = gtk_tree_view_get_column (GTK_TREE_VIEW(self), 0); if (!col) { @@ -1083,9 +1269,7 @@ expand_root_items (ModestFolderView *self) * account in this case, and the local folders. */ static gboolean -filter_row (GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data) +filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) { ModestFolderViewPrivate *priv; gboolean retval = TRUE; @@ -1165,6 +1349,9 @@ filter_row (GtkTreeModel *model, case TNY_FOLDER_TYPE_UNKNOWN: case TNY_FOLDER_TYPE_NORMAL: type = modest_tny_folder_guess_folder_type(TNY_FOLDER(instance)); + if (type == TNY_FOLDER_TYPE_INVALID) + g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); + if (type == TNY_FOLDER_TYPE_OUTBOX || type == TNY_FOLDER_TYPE_SENT || type == TNY_FOLDER_TYPE_DRAFTS) @@ -1187,17 +1374,17 @@ modest_folder_view_update_model (ModestFolderView *self, TnyAccountStore *account_store) { ModestFolderViewPrivate *priv; - GtkTreeModel *model /* , *old_model */; - /* TnyAccount *local_account; */ - TnyList *model_as_list; - - g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE); - g_return_val_if_fail (account_store, FALSE); + GtkTreeModel *model /* , *old_model */; + GtkTreeModel *filter_model = NULL, *sortable = NULL; + g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW (self), FALSE); + g_return_val_if_fail (account_store && MODEST_IS_TNY_ACCOUNT_STORE(account_store), + FALSE); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); /* Notify that there is no folder selected */ - g_signal_emit (G_OBJECT(self), + g_signal_emit (G_OBJECT(self), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, NULL, FALSE); if (priv->cur_folder_store) { @@ -1206,22 +1393,13 @@ modest_folder_view_update_model (ModestFolderView *self, } /* FIXME: the local accounts are not shown when the query - selects only the subscribed folders. */ -/* model = tny_gtk_folder_store_tree_model_new (TRUE, priv->query); */ - model = tny_gtk_folder_store_tree_model_new (NULL); - - /* Deal with the model via its TnyList Interface, - * filling the TnyList via a get_accounts() call: */ - model_as_list = TNY_LIST(model); + selects only the subscribed folders */ + model = tny_gtk_folder_store_tree_model_new (NULL); /* Get the accounts: */ tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store), - model_as_list, + TNY_LIST (model), TNY_ACCOUNT_STORE_STORE_ACCOUNTS); - g_object_unref (model_as_list); - model_as_list = NULL; - - GtkTreeModel *filter_model = NULL, *sortable = NULL; sortable = gtk_tree_model_sort_new_with_model (model); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable), @@ -1243,7 +1421,6 @@ modest_folder_view_update_model (ModestFolderView *self, g_signal_connect (G_OBJECT(filter_model), "row-inserted", (GCallback) on_row_inserted_maybe_select_folder, self); - g_object_unref (model); g_object_unref (filter_model); g_object_unref (sortable); @@ -1272,11 +1449,6 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) selected = gtk_tree_selection_get_selected (sel, &model, &iter); - /* Notify the display name observers */ - g_signal_emit (G_OBJECT(user_data), - signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0, - NULL); - tree_view = MODEST_FOLDER_VIEW (user_data); if (selected) { @@ -1293,14 +1465,18 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) /* Current folder was unselected */ if (priv->cur_folder_store) { - g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, - priv->cur_folder_store, FALSE); - + /* We must do this firstly because a libtinymail-camel + implementation detail. If we issue the signal + before doing the sync_async, then that signal could + cause (and it actually does it) a free of the + summary of the folder (because the main window will + clear the headers view */ if (TNY_IS_FOLDER(priv->cur_folder_store)) tny_folder_sync_async (TNY_FOLDER(priv->cur_folder_store), FALSE, NULL, NULL, NULL); - /* FALSE --> don't expunge the messages */ + g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, + priv->cur_folder_store, FALSE); g_object_unref (priv->cur_folder_store); priv->cur_folder_store = NULL; @@ -1309,18 +1485,21 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) /* New current references */ priv->cur_folder_store = folder; - /* New folder has been selected */ - g_signal_emit (G_OBJECT(tree_view), - signals[FOLDER_SELECTION_CHANGED_SIGNAL], - 0, priv->cur_folder_store, TRUE); + /* New folder has been selected. Do not notify if there is + nothing new selected */ + if (selected) { + g_signal_emit (G_OBJECT(tree_view), + signals[FOLDER_SELECTION_CHANGED_SIGNAL], + 0, priv->cur_folder_store, TRUE); + } } TnyFolderStore * modest_folder_view_get_selected (ModestFolderView *self) { ModestFolderViewPrivate *priv; - - g_return_val_if_fail (self, NULL); + + g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW(self), NULL); priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); if (priv->cur_folder_store) @@ -1465,14 +1644,25 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &parent_folder, -1); if ((parent_type == TNY_FOLDER_TYPE_ROOT) && - TNY_IS_ACCOUNT (parent_folder) && - modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (parent_folder))) { - cmp1 = get_cmp_subfolder_type_pos (modest_tny_folder_get_local_or_mmc_folder_type (TNY_FOLDER (folder1))); - cmp2 = get_cmp_subfolder_type_pos (modest_tny_folder_get_local_or_mmc_folder_type (TNY_FOLDER (folder2))); + TNY_IS_ACCOUNT (parent_folder)) { + if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (parent_folder))) { + cmp1 = get_cmp_subfolder_type_pos (modest_tny_folder_get_local_or_mmc_folder_type + (TNY_FOLDER (folder1))); + cmp2 = get_cmp_subfolder_type_pos (modest_tny_folder_get_local_or_mmc_folder_type + (TNY_FOLDER (folder2))); + } else if (modest_tny_account_is_memory_card_account (TNY_ACCOUNT (parent_folder))) { + if (modest_local_folder_info_get_type (tny_folder_get_name (TNY_FOLDER (folder1))) == TNY_FOLDER_TYPE_ARCHIVE) { + cmp1 = 0; + cmp2 = 1; + } else if (modest_local_folder_info_get_type (tny_folder_get_name (TNY_FOLDER (folder2))) == TNY_FOLDER_TYPE_ARCHIVE) { + cmp1 = 1; + cmp2 = 0; + } + } } g_object_unref (parent_folder); } - + /* if they are not local folders */ if (cmp1 == cmp2) { cmp1 = get_cmp_subfolder_type_pos (tny_folder_get_folder_type (TNY_FOLDER (folder1))); @@ -1506,78 +1696,60 @@ finish: * source for dnd after the event drop happened */ static void -on_drag_data_get (GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *selection_data, - guint info, - guint time, - gpointer data) +on_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, + guint info, guint time, gpointer data) { GtkTreeSelection *selection; GtkTreeModel *model; GtkTreeIter iter; GtkTreePath *source_row; - + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)); - gtk_tree_selection_get_selected (selection, &model, &iter); - source_row = gtk_tree_model_get_path (model, &iter); - - gtk_tree_set_row_drag_data (selection_data, - model, - source_row); + if (gtk_tree_selection_get_selected (selection, &model, &iter)) { - gtk_tree_path_free (source_row); + source_row = gtk_tree_model_get_path (model, &iter); + gtk_tree_set_row_drag_data (selection_data, + model, + source_row); + + gtk_tree_path_free (source_row); + } } typedef struct _DndHelper { + ModestFolderView *folder_view; gboolean delete_source; GtkTreePath *source_row; - GdkDragContext *context; - guint time; } DndHelper; - -/* - * This function is the callback of the - * modest_mail_operation_xfer_msgs () and - * modest_mail_operation_xfer_folder() calls. We check here if the - * message/folder was correctly asynchronously transferred. The reason - * to use the same callback is that the code is the same, it only has - * to check that the operation went fine and then finalize the drag - * and drop action - */ static void -xfer_cb (ModestMailOperation *mail_op, - gpointer user_data) +dnd_helper_destroyer (DndHelper *helper) { - gboolean success; - DndHelper *helper; - - helper = (DndHelper *) user_data; - - if (modest_mail_operation_get_status (mail_op) == - MODEST_MAIL_OPERATION_STATUS_SUCCESS) { - success = TRUE; - } else { - success = FALSE; - } - - /* Notify the drag source. Never call delete, the monitor will - do the job if needed */ - gtk_drag_finish (helper->context, success, FALSE, helper->time); - /* Free the helper */ gtk_tree_path_free (helper->source_row); g_slice_free (DndHelper, helper); } +static void +xfer_folder_cb (ModestMailOperation *mail_op, + TnyFolder *new_folder, + gpointer user_data) +{ + if (new_folder) { + /* Select the folder */ + modest_folder_view_select_folder (MODEST_FOLDER_VIEW (user_data), + new_folder, FALSE); + } +} + + /* get the folder for the row the treepath refers to. */ /* folder must be unref'd */ -static TnyFolder* +static TnyFolderStore * tree_path_to_folder (GtkTreeModel *model, GtkTreePath *path) { GtkTreeIter iter; - TnyFolder *folder = NULL; + TnyFolderStore *folder = NULL; if (gtk_tree_model_get_iter (model,&iter, path)) gtk_tree_model_get (model, &iter, @@ -1586,6 +1758,7 @@ tree_path_to_folder (GtkTreeModel *model, GtkTreePath *path) return folder; } + /* * This function is used by drag_data_received_cb to manage drag and * drop of a header, i.e, and drag from the header view to the folder @@ -1595,18 +1768,16 @@ static void drag_and_drop_from_header_view (GtkTreeModel *source_model, GtkTreeModel *dest_model, GtkTreePath *dest_row, - GtkSelectionData *selection_data, - DndHelper *helper) + GtkSelectionData *selection_data) { TnyList *headers = NULL; - TnyFolder *folder = NULL; - ModestMailOperation *mail_op = NULL; + TnyFolder *folder = NULL, *src_folder = NULL; + TnyFolderType folder_type; GtkTreeIter source_iter, dest_iter; ModestWindowMgr *mgr = NULL; ModestWindow *main_win = NULL; gchar **uris, **tmp; - gint response; - + /* Build the list of headers */ mgr = modest_runtime_get_window_mgr (); headers = tny_simple_list_new (); @@ -1616,6 +1787,7 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model, while (*tmp != NULL) { TnyHeader *header; GtkTreePath *path; + gboolean first = TRUE; /* Get header */ path = gtk_tree_path_new_from_string (*tmp); @@ -1628,6 +1800,11 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model, if (!modest_window_mgr_find_registered_header(mgr, header, NULL)) tny_list_append (headers, G_OBJECT (header)); + if (G_UNLIKELY (first)) { + src_folder = tny_header_get_folder (header); + first = FALSE; + } + /* Free and go on */ gtk_tree_path_free (path); g_object_unref (header); @@ -1640,38 +1817,137 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model, gtk_tree_model_get (dest_model, &dest_iter, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder, -1); - + + if (!folder || !TNY_IS_FOLDER(folder)) { +/* g_warning ("%s: not a valid target folder (%p)", __FUNCTION__, folder); */ + goto cleanup; + } + + folder_type = modest_tny_folder_guess_folder_type (folder); + if (folder_type == TNY_FOLDER_TYPE_INVALID) { +/* g_warning ("%s: invalid target folder", __FUNCTION__); */ + goto cleanup; /* cannot move messages there */ + } + + if (modest_tny_folder_get_rules((TNY_FOLDER(folder))) & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) { +/* g_warning ("folder not writable"); */ + goto cleanup; /* verboten! */ + } + /* Ask for confirmation to move */ - main_win = modest_window_mgr_get_main_window(mgr); - response = modest_ui_actions_msgs_move_to_confirmation (GTK_WINDOW(main_win), folder, - TRUE, headers); - if (response == GTK_RESPONSE_CANCEL) + main_win = modest_window_mgr_get_main_window (mgr, FALSE); /* don't create */ + if (!main_win) { + g_warning ("%s: BUG: no main window found", __FUNCTION__); goto cleanup; + } /* Transfer messages */ - mail_op = modest_mail_operation_new_with_error_handling (NULL, - modest_ui_actions_move_folder_error_handler, - NULL); - - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), - mail_op); - - modest_mail_operation_xfer_msgs (mail_op, - headers, - folder, - helper->delete_source, - xfer_cb, helper); + modest_ui_actions_transfer_messages_helper (GTK_WINDOW (main_win), src_folder, + headers, folder); /* Frees */ cleanup: - if (G_IS_OBJECT(mail_op)) - g_object_unref (G_OBJECT (mail_op)); + if (G_IS_OBJECT (src_folder)) + g_object_unref (src_folder); if (G_IS_OBJECT(folder)) g_object_unref (G_OBJECT (folder)); if (G_IS_OBJECT(headers)) g_object_unref (headers); } +typedef struct { + TnyFolderStore *src_folder; + TnyFolderStore *dst_folder; + ModestFolderView *folder_view; + DndHelper *helper; +} DndFolderInfo; + +static void +dnd_folder_info_destroyer (DndFolderInfo *info) +{ + if (info->src_folder) + g_object_unref (info->src_folder); + if (info->dst_folder) + g_object_unref (info->dst_folder); + g_slice_free (DndFolderInfo, info); +} + +static void +dnd_on_connection_failed_destroyer (DndFolderInfo *info, + GtkWindow *parent_window, + TnyAccount *account) +{ + /* Show error */ + modest_ui_actions_on_account_connection_error (parent_window, account); + + /* Free the helper & info */ + dnd_helper_destroyer (info->helper); + dnd_folder_info_destroyer (info); +} + +static void +drag_and_drop_from_folder_view_src_folder_performer (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) +{ + DndFolderInfo *info = NULL; + ModestMailOperation *mail_op; + + info = (DndFolderInfo *) user_data; + + if (err || canceled) { + dnd_on_connection_failed_destroyer (info, parent_window, account); + return; + } + + /* Do the mail operation */ + mail_op = modest_mail_operation_new_with_error_handling ((GObject *) parent_window, + modest_ui_actions_move_folder_error_handler, + info->src_folder, NULL); + + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + + /* Transfer the folder */ + modest_mail_operation_xfer_folder (mail_op, + TNY_FOLDER (info->src_folder), + info->dst_folder, + info->helper->delete_source, + xfer_folder_cb, + info->helper->folder_view); + + /* Frees */ + g_object_unref (G_OBJECT (mail_op)); + dnd_helper_destroyer (info->helper); + dnd_folder_info_destroyer (info); +} + + +static void +drag_and_drop_from_folder_view_dst_folder_performer (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) +{ + DndFolderInfo *info = NULL; + + info = (DndFolderInfo *) user_data; + + if (err || canceled) { + dnd_on_connection_failed_destroyer (info, parent_window, account); + return; + } + + /* Connect to source folder and perform the copy/move */ + modest_platform_connect_if_remote_and_perform (NULL, TRUE, + info->src_folder, + drag_and_drop_from_folder_view_src_folder_performer, + info); +} + /* * This function is used by drag_data_received_cb to manage drag and * drop of a folder, i.e, and drag from the folder view to the same @@ -1684,23 +1960,31 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, GtkSelectionData *selection_data, DndHelper *helper) { - ModestMailOperation *mail_op = NULL; GtkTreeIter dest_iter, iter; TnyFolderStore *dest_folder = NULL; - TnyFolder *folder = NULL; + TnyFolderStore *folder = NULL; gboolean forbidden = FALSE; + ModestWindow *win; + DndFolderInfo *info = NULL; + win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE); /* don't create */ + if (!win) { + g_warning ("%s: BUG: no main window", __FUNCTION__); + dnd_helper_destroyer (helper); + return; + } + if (!forbidden) { /* check the folder rules for the destination */ folder = tree_path_to_folder (dest_model, dest_row); if (TNY_IS_FOLDER(folder)) { ModestTnyFolderRules rules = - modest_tny_folder_get_rules (folder); + modest_tny_folder_get_rules (TNY_FOLDER (folder)); forbidden = rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE; } else if (TNY_IS_FOLDER_STORE(folder)) { /* enable local root as destination for folders */ - if (!MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (folder) - && TNY_IS_ACCOUNT (folder)) + if (!MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (folder) && + !modest_tny_account_is_memory_card_account (TNY_ACCOUNT (folder))) forbidden = TRUE; } g_object_unref (folder); @@ -1710,7 +1994,7 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, folder = tree_path_to_folder (source_model, helper->source_row); if (TNY_IS_FOLDER(folder)) { ModestTnyFolderRules rules = - modest_tny_folder_get_rules (folder); + modest_tny_folder_get_rules (TNY_FOLDER (folder)); forbidden = rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE; } else forbidden = TRUE; @@ -1720,9 +2004,7 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, /* Check if the drag is possible */ if (forbidden || !gtk_tree_path_compare (helper->source_row, dest_row)) { - gtk_drag_finish (helper->context, FALSE, FALSE, helper->time); - gtk_tree_path_free (helper->source_row); - g_slice_free (DndHelper, helper); + dnd_helper_destroyer (helper); return; } @@ -1736,33 +2018,21 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder, -1); - /* Offer the connection dialog if necessary, for the destination parent folder and source folder: */ - if (modest_platform_connect_and_wait_if_network_folderstore (NULL, dest_folder) && - modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (folder))) { - ModestWindowMgr *mgr = modest_runtime_get_window_mgr (); - - /* Do the mail operation */ - mail_op = - modest_mail_operation_new_with_error_handling (G_OBJECT (modest_window_mgr_get_main_window (mgr)), - modest_ui_actions_move_folder_error_handler, - folder); - - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), - mail_op); - - modest_mail_operation_xfer_folder (mail_op, - folder, - dest_folder, - helper->delete_source, - xfer_cb, - helper); - - g_object_unref (G_OBJECT (mail_op)); - } + /* Create the info for the performer */ + info = g_slice_new0 (DndFolderInfo); + info->src_folder = g_object_ref (folder); + info->dst_folder = g_object_ref (dest_folder); + info->helper = helper; + + /* Connect to the destination folder and perform the copy/move */ + modest_platform_connect_if_remote_and_perform (GTK_WINDOW (win), TRUE, + dest_folder, + drag_and_drop_from_folder_view_dst_folder_performer, + info); /* Frees */ - g_object_unref (G_OBJECT (dest_folder)); - g_object_unref (G_OBJECT (folder)); + g_object_unref (dest_folder); + g_object_unref (folder); } /* @@ -1785,8 +2055,8 @@ on_drag_data_received (GtkWidget *widget, GtkTreeModel *dest_model, *source_model; GtkTreePath *source_row, *dest_row; GtkTreeViewDropPosition pos; - gboolean success = FALSE, delete_source = FALSE; - DndHelper *helper = NULL; + gboolean delete_source = FALSE; + gboolean success = FALSE; /* Do not allow further process */ g_signal_stop_emission_by_name (widget, "drag-data-received"); @@ -1810,10 +2080,10 @@ on_drag_data_received (GtkWidget *widget, /* Check if the get_data failed */ if (selection_data == NULL || selection_data->length < 0) - gtk_drag_finish (context, success, FALSE, time); + goto end; /* Select the destination model */ - dest_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); + dest_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); /* Get the path to the destination row. Can not call gtk_tree_view_get_drag_dest_row() because the source row @@ -1825,14 +2095,9 @@ on_drag_data_received (GtkWidget *widget, if (!dest_row || pos == GTK_TREE_VIEW_DROP_BEFORE || pos == GTK_TREE_VIEW_DROP_AFTER) - gtk_drag_finish (context, success, FALSE, time); - - /* Create the helper */ - helper = g_slice_new0 (DndHelper); - helper->delete_source = delete_source; - helper->context = context; - helper->time = time; + goto end; + success = TRUE; /* Drags from the header view */ if (source_widget != widget) { source_model = gtk_tree_view_get_model (GTK_TREE_VIEW (source_widget)); @@ -1840,14 +2105,20 @@ on_drag_data_received (GtkWidget *widget, drag_and_drop_from_header_view (source_model, dest_model, dest_row, - selection_data, - helper); + selection_data); } else { + DndHelper *helper = NULL; + /* Get the source model and row */ gtk_tree_get_row_drag_data (selection_data, &source_model, &source_row); + + /* Create the helper */ + helper = g_slice_new0 (DndHelper); + helper->delete_source = delete_source; helper->source_row = gtk_tree_path_copy (source_row); + helper->folder_view = MODEST_FOLDER_VIEW (widget); drag_and_drop_from_folder_view (source_model, dest_model, @@ -1860,6 +2131,10 @@ on_drag_data_received (GtkWidget *widget, /* Frees */ gtk_tree_path_free (dest_row); + + end: + /* Finish the drag and drop */ + gtk_drag_finish (context, success, FALSE, time); } /* @@ -1904,7 +2179,7 @@ expand_row_timeout (gpointer data) GtkTreeViewDropPosition pos; gboolean result = FALSE; - GDK_THREADS_ENTER (); + gdk_threads_enter (); gtk_tree_view_get_drag_dest_row (tree_view, &dest_path, @@ -1923,7 +2198,7 @@ expand_row_timeout (gpointer data) result = TRUE; } - GDK_THREADS_LEAVE (); + gdk_threads_leave (); return result; } @@ -1950,7 +2225,7 @@ on_drag_motion (GtkWidget *widget, ModestFolderViewPrivate *priv; GdkDragAction suggested_action; gboolean valid_location = FALSE; - TnyFolder *folder; + TnyFolderStore *folder = NULL; priv = MODEST_FOLDER_VIEW_GET_PRIVATE (widget); @@ -1979,21 +2254,20 @@ on_drag_motion (GtkWidget *widget, /* Check that the destination folder is writable */ dest_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); folder = tree_path_to_folder (dest_model, dest_row); - if (folder) { - ModestTnyFolderRules rules = modest_tny_folder_get_rules(folder); + if (folder && TNY_IS_FOLDER (folder)) { + ModestTnyFolderRules rules = modest_tny_folder_get_rules(TNY_FOLDER (folder)); if (rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) { valid_location = FALSE; goto out; } - g_object_unref (folder); } /* Expand the selected row after 1/2 second */ if (!gtk_tree_view_row_expanded (GTK_TREE_VIEW (widget), dest_row)) { - gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget), dest_row, pos); priv->timer_expander = g_timeout_add (500, expand_row_timeout, widget); } + gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget), dest_row, pos); /* Select the desired action. By default we pick MOVE */ suggested_action = GDK_ACTION_MOVE; @@ -2008,8 +2282,11 @@ on_drag_motion (GtkWidget *widget, gdk_drag_status(context, GDK_ACTION_DEFAULT, time); out: - if (dest_row) + if (folder) + g_object_unref (folder); + if (dest_row) { gtk_tree_path_free (dest_row); + } g_signal_stop_emission_by_name (widget, "drag-motion"); return valid_location; @@ -2145,10 +2422,13 @@ modest_folder_view_set_style (ModestFolderView *self, { ModestFolderViewPrivate *priv; - g_return_if_fail (self); + g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self)); + g_return_if_fail (style == MODEST_FOLDER_VIEW_STYLE_SHOW_ALL || + style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE); priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); + priv->style = style; } @@ -2159,7 +2439,7 @@ modest_folder_view_set_account_id_of_visible_server_account (ModestFolderView *s ModestFolderViewPrivate *priv; GtkTreeModel *model; - g_return_if_fail (self); + g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self)); priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); @@ -2187,7 +2467,7 @@ modest_folder_view_get_account_id_of_visible_server_account (ModestFolderView *s { ModestFolderViewPrivate *priv; - g_return_val_if_fail (self, NULL); + g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW(self), NULL); priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); @@ -2235,6 +2515,8 @@ modest_folder_view_select_first_inbox_or_local (ModestFolderView *self) GtkTreeSelection *sel; GtkTreePath *path = NULL; + g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self)); + model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); if (!model) return; @@ -2242,7 +2524,10 @@ modest_folder_view_select_first_inbox_or_local (ModestFolderView *self) expand_root_items (self); sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); - gtk_tree_model_get_iter_first (model, &iter); + if (!gtk_tree_model_get_iter_first (model, &iter)) { + g_warning ("%s: model is empty", __FUNCTION__); + return; + } if (find_inbox_iter (model, &iter, &inbox_iter)) path = gtk_tree_model_get_path (model, &inbox_iter); @@ -2296,7 +2581,9 @@ find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_it static void -on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath *path, GtkTreeIter *iter, +on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model, + GtkTreePath *path, + GtkTreeIter *iter, ModestFolderView *self) { ModestFolderViewPrivate *priv = NULL; @@ -2319,7 +2606,6 @@ on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath *pat priv->folder_to_select = g_object_ref (instance); } g_object_unref (instance); - if (priv->folder_to_select) { @@ -2334,14 +2620,14 @@ on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath *pat gtk_tree_selection_select_iter (sel, iter); gtk_tree_view_set_cursor (GTK_TREE_VIEW(self), path, NULL, FALSE); - gtk_tree_path_free (path); - + gtk_tree_path_free (path); } /* Disable next */ modest_folder_view_disable_next_folder_selection (self); -/* g_object_unref (priv->folder_to_select); */ -/* priv->folder_to_select = NULL; */ + + /* Refilter the model */ + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (tree_model)); } } @@ -2349,9 +2635,10 @@ on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath *pat void modest_folder_view_disable_next_folder_selection (ModestFolderView *self) { - ModestFolderViewPrivate *priv = NULL; + ModestFolderViewPrivate *priv; + + g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self)); - g_return_if_fail (MODEST_IS_FOLDER_VIEW (self)); priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); if (priv->folder_to_select) @@ -2369,13 +2656,12 @@ modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder, GtkTreeSelection *sel; ModestFolderViewPrivate *priv = NULL; - g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE); - g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE); + g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW (self), FALSE); + g_return_val_if_fail (folder && TNY_IS_FOLDER (folder), FALSE); priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); if (after_change) { - sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); gtk_tree_selection_unselect_all (sel); @@ -2389,8 +2675,15 @@ modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder, if (!model) return FALSE; - - gtk_tree_model_get_iter_first (model, &iter); + + /* Refilter the model, before selecting the folder */ + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model)); + + if (!gtk_tree_model_get_iter_first (model, &iter)) { + g_warning ("%s: model is empty", __FUNCTION__); + return FALSE; + } + if (find_folder_iter (model, &iter, &folder_iter, folder)) { GtkTreePath *path; @@ -2409,10 +2702,12 @@ modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder, void -modest_folder_view_copy_selection (ModestFolderView *folder_view) +modest_folder_view_copy_selection (ModestFolderView *self) { + g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self)); + /* Copy selection */ - _clipboard_set_selected_data (folder_view, FALSE); + _clipboard_set_selected_data (self, FALSE); } void @@ -2423,7 +2718,7 @@ modest_folder_view_cut_selection (ModestFolderView *folder_view) const gchar **hidding = NULL; guint i, n_selected; - g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view)); + g_return_if_fail (folder_view && MODEST_IS_FOLDER_VIEW (folder_view)); priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view); /* Copy selection */ @@ -2455,9 +2750,9 @@ modest_folder_view_copy_model (ModestFolderView *folder_view_src, GtkTreeModel *model = NULL; GtkTreeModel *new_filter_model = NULL; - g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view_src)); - g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view_dst)); - + g_return_if_fail (folder_view_src && MODEST_IS_FOLDER_VIEW (folder_view_src)); + g_return_if_fail (folder_view_dst && MODEST_IS_FOLDER_VIEW (folder_view_dst)); + /* Get src model*/ filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view_src)); model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(filter_model)); @@ -2482,7 +2777,11 @@ modest_folder_view_show_non_move_folders (ModestFolderView *folder_view, gboolean show) { GtkTreeModel *model = NULL; - ModestFolderViewPrivate* priv = MODEST_FOLDER_VIEW_GET_PRIVATE(folder_view); + ModestFolderViewPrivate* priv; + + g_return_if_fail (folder_view && MODEST_IS_FOLDER_VIEW (folder_view)); + + priv = MODEST_FOLDER_VIEW_GET_PRIVATE(folder_view); priv->show_non_move = show; /* modest_folder_view_update_model(folder_view, */ /* TNY_ACCOUNT_STORE(modest_runtime_get_account_store())); */