X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=81201edd9d9db555c3788ab539dba160e336baff;hp=b810e84c9b76cfa3767afc721a8dd20c2fe201cd;hb=92714909f98f61fbb69feb32e02f50afc4594561;hpb=2a339303ed38a11e27fe0beeea58a444996a39fc diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index b810e84..81201ed 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -56,6 +56,7 @@ #include #include #include "modest-dnd.h" +#include "widgets/modest-window.h" /* Folder view drag types */ const GtkTargetEntry folder_view_drag_types[] = @@ -148,6 +149,10 @@ static void on_row_inserted_maybe_select_folder (GtkTreeModel *tree_ GtkTreeIter *iter, ModestFolderView *self); +static void on_display_name_changed (ModestAccountMgr *self, + const gchar *account, + gpointer user_data); + enum { FOLDER_SELECTION_CHANGED_SIGNAL, FOLDER_DISPLAY_NAME_CHANGED_SIGNAL, @@ -161,13 +166,12 @@ struct _ModestFolderViewPrivate { TnyFolder *folder_to_select; /* folder to select after the next update */ - ModestConfNotificationId notification_id; - gulong changed_signal; gulong account_inserted_signal; gulong account_removed_signal; gulong account_changed_signal; gulong conf_key_signal; + gulong display_name_changed_signal; /* not unref this object, its a singlenton */ ModestEmailClipboard *clipboard; @@ -355,8 +359,11 @@ on_get_mmc_account_name (TnyStoreAccount* account, gpointer user_data) } static void -text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, - GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) +text_cell_data (GtkTreeViewColumn *column, + GtkCellRenderer *renderer, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gpointer data) { ModestFolderViewPrivate *priv; GObject *rendobj; @@ -397,7 +404,7 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, type = modest_tny_folder_get_local_or_mmc_folder_type (TNY_FOLDER (instance)); if (type != TNY_FOLDER_TYPE_UNKNOWN) { g_free (fname); - fname = g_strdup(modest_local_folder_info_get_type_display_name (type)); + fname = g_strdup (modest_local_folder_info_get_type_display_name (type)); } } @@ -423,12 +430,10 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, } else if (TNY_IS_ACCOUNT (instance)) { /* If it's a server account */ - if (modest_tny_account_is_virtual_local_folders ( - TNY_ACCOUNT (instance))) { + if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (instance))) { item_name = g_strdup (priv->local_account_name); item_weight = 800; - } else if (modest_tny_account_is_memory_card_account ( - TNY_ACCOUNT (instance))) { + } else if (modest_tny_account_is_memory_card_account (TNY_ACCOUNT (instance))) { /* fname is only correct when the items are first * added to the model, not when the account is * changed later, so get the name from the account @@ -506,10 +511,14 @@ icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, 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)) { @@ -610,7 +619,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); @@ -669,12 +680,16 @@ modest_folder_view_init (ModestFolderView *obj) "key-press-event", G_CALLBACK (on_key_pressed), NULL); + priv->display_name_changed_signal = + g_signal_connect (modest_runtime_get_account_mgr (), + "display_name_changed", + G_CALLBACK (on_display_name_changed), + obj); + /* * Track changes in the local account name (in the device it * will be the device name) */ - priv->notification_id = modest_conf_listen_to_namespace (conf, - MODEST_CONF_NAMESPACE); priv->conf_key_signal = g_signal_connect (G_OBJECT(conf), "key_changed", G_CALLBACK(on_configuration_key_changed), @@ -701,12 +716,6 @@ modest_folder_view_finalize (GObject *obj) priv = MODEST_FOLDER_VIEW_GET_PRIVATE(obj); - if (priv->notification_id) { - modest_conf_forget_namespace (modest_runtime_get_conf (), - MODEST_CONF_NAMESPACE, - priv->notification_id); - } - if (priv->timer_expander != 0) { g_source_remove (priv->timer_expander); priv->timer_expander = 0; @@ -812,6 +821,22 @@ modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore } 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) @@ -842,6 +867,14 @@ on_account_inserted (TnyAccountStore *account_store, tny_list_append (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))), G_OBJECT (account)); + + /* 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)); + + /* Refilter the model */ + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model)); } @@ -872,6 +905,9 @@ on_account_changed (TnyAccountStore *account_store, /* 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)); } @@ -947,8 +983,21 @@ on_account_removed (TnyAccountStore *account_store, MODEST_CONF_FOLDER_VIEW_KEY); } - /* Select the INBOX */ - modest_folder_view_select_first_inbox_or_local (self); + /* 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 (priv->cur_folder_store) { + TnyAccount *folder_selected_account; + + 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); + } } void @@ -1124,10 +1173,8 @@ filter_row (GtkTreeModel *model, /* If this is a move to dialog, hide Sent, Outbox and Drafts folder as no message can be move there according to UI specs */ - if (!priv->show_non_move) - { - switch (type) - { + if (!priv->show_non_move) { + switch (type) { case TNY_FOLDER_TYPE_OUTBOX: case TNY_FOLDER_TYPE_SENT: case TNY_FOLDER_TYPE_DRAFTS: @@ -1136,15 +1183,17 @@ 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_OUTBOX || type == TNY_FOLDER_TYPE_SENT - || type == TNY_FOLDER_TYPE_DRAFTS) - { + 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) retval = FALSE; - } break; default: - break; - } + break; + } } /* Free */ @@ -1159,9 +1208,8 @@ modest_folder_view_update_model (ModestFolderView *self, TnyAccountStore *account_store) { ModestFolderViewPrivate *priv; - GtkTreeModel *model /* , *old_model */; - /* TnyAccount *local_account; */ - TnyList *model_as_list; + GtkTreeModel *model /* , *old_model */; + GtkTreeModel *filter_model = NULL, *sortable = NULL; g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE); g_return_val_if_fail (account_store, FALSE); @@ -1178,22 +1226,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); */ + selects only the subscribed folders */ 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); /* 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), @@ -1439,12 +1478,14 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, 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))); + 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))); } 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))); @@ -1491,14 +1532,15 @@ on_drag_data_get (GtkWidget *widget, 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 { @@ -1545,11 +1587,11 @@ xfer_cb (ModestMailOperation *mail_op, /* 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, @@ -1572,6 +1614,7 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model, { TnyList *headers = NULL; TnyFolder *folder = NULL; + TnyFolderType folder_type; ModestMailOperation *mail_op = NULL; GtkTreeIter source_iter, dest_iter; ModestWindowMgr *mgr = NULL; @@ -1612,19 +1655,39 @@ 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, + 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; + } + + response = modest_ui_actions_msgs_move_to_confirmation (main_win, folder, TRUE, headers); if (response == GTK_RESPONSE_CANCEL) goto cleanup; /* Transfer messages */ - mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - NULL, + mail_op = modest_mail_operation_new_with_error_handling ((GObject *) main_win, modest_ui_actions_move_folder_error_handler, - NULL); + NULL, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -1660,15 +1723,22 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, ModestMailOperation *mail_op = NULL; GtkTreeIter dest_iter, iter; TnyFolderStore *dest_folder = NULL; - TnyFolder *folder = NULL; + TnyFolderStore *folder = NULL; gboolean forbidden = FALSE; + ModestWindow *win; + 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__); + 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 */ @@ -1683,7 +1753,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; @@ -1712,20 +1782,17 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, /* 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 (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT (modest_window_mgr_get_main_window (mgr)), - modest_ui_actions_move_folder_error_handler, - folder); + mail_op = modest_mail_operation_new_with_error_handling ((GObject *) win, + modest_ui_actions_move_folder_error_handler, + folder, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); modest_mail_operation_xfer_folder (mail_op, - folder, + TNY_FOLDER (folder), dest_folder, helper->delete_source, xfer_cb, @@ -1924,7 +1991,7 @@ on_drag_motion (GtkWidget *widget, ModestFolderViewPrivate *priv; GdkDragAction suggested_action; gboolean valid_location = FALSE; - TnyFolder *folder; + TnyFolderStore *folder; priv = MODEST_FOLDER_VIEW_GET_PRIVATE (widget); @@ -1953,15 +2020,15 @@ 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); } + g_object_unref (folder); /* Expand the selected row after 1/2 second */ if (!gtk_tree_view_row_expanded (GTK_TREE_VIEW (widget), dest_row)) { @@ -2091,10 +2158,6 @@ on_configuration_key_changed (ModestConf* conf, g_return_if_fail (MODEST_IS_FOLDER_VIEW (self)); priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); - /* Do not listen for changes in other namespaces */ - if (priv->notification_id != id) - return; - if (!strcmp (key, MODEST_CONF_DEVICE_NAME)) { g_free (priv->local_account_name); @@ -2220,7 +2283,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); @@ -2367,8 +2433,11 @@ modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder, if (!model) return FALSE; - - 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 FALSE; + } + if (find_folder_iter (model, &iter, &folder_iter, folder)) { GtkTreePath *path; @@ -2448,6 +2517,8 @@ modest_folder_view_copy_model (ModestFolderView *folder_view_src, NULL); /* Set copied model */ gtk_tree_view_set_model (GTK_TREE_VIEW (folder_view_dst), new_filter_model); + g_signal_connect (G_OBJECT(new_filter_model), "row-inserted", + (GCallback) on_row_inserted_maybe_select_folder, folder_view_dst); /* Free */ g_object_unref (new_filter_model); @@ -2515,3 +2586,23 @@ _clear_hidding_filter (ModestFolderView *folder_view) } +static void +on_display_name_changed (ModestAccountMgr *mgr, + const gchar *account, + gpointer user_data) +{ + ModestFolderView *self; + + self = MODEST_FOLDER_VIEW (user_data); + + /* Force a redraw */ +#if GTK_CHECK_VERSION(2, 8, 0) + GtkTreeViewColumn * tree_column; + + tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (self), + TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN); + gtk_tree_view_column_queue_resize (tree_column); +#else + gtk_widget_queue_draw (GTK_WIDGET (self)); +#endif +}