X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=9618ab2d530c523be493edaca953c359f8876384;hb=eb49b917dec41a5b9a260b1ba9f1f8758683aa6c;hp=abefb52f5ba2271fec2dc67c4c1911c92399de35;hpb=ddfcc16b2ffd869a83ef512d7fd1579f18b9d4d7;p=modest diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index abefb52..9618ab2 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -241,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; @@ -275,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: */ @@ -360,10 +365,10 @@ 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; @@ -377,13 +382,8 @@ text_cell_data (GtkTreeViewColumn *column, TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance, -1); - 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); @@ -416,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; } @@ -476,9 +482,11 @@ 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); } @@ -1069,9 +1077,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 @@ -1125,8 +1131,15 @@ 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); + if (TNY_IS_FOLDER(priv->cur_folder_store)) { + ModestMailOperation *mail_op; + + mail_op = modest_mail_operation_new (NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + modest_mail_operation_sync_folder (mail_op, TNY_FOLDER (priv->cur_folder_store), FALSE); + g_object_unref (mail_op); + } g_object_unref (priv->cur_folder_store); priv->cur_folder_store = NULL; @@ -1188,22 +1201,6 @@ 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) @@ -1218,6 +1215,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 && @@ -1226,20 +1224,32 @@ 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)); - - - /* 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)); } @@ -1252,22 +1262,43 @@ on_account_changed (TnyAccountStore *account_store, { ModestFolderViewPrivate *priv; GtkTreeModel *sort_model, *filter_model; + GtkTreeSelection *sel; /* 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; + } + + 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; + } + + /* Unselect the folder, clear the header list */ + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (user_data)); + 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)); @@ -1285,7 +1316,9 @@ 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; } @@ -1307,6 +1340,11 @@ on_account_removed (TnyAccountStore *account_store, 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); @@ -1347,7 +1385,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)); @@ -1589,7 +1637,7 @@ modest_folder_view_update_model (ModestFolderView *self, 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) { @@ -1626,7 +1674,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); @@ -1655,13 +1702,6 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) selected = gtk_tree_selection_get_selected (sel, &model, &iter); - /* Notify the display name observers */ - /* TODO: this is redundant, and it's only required because we sometimes lose the focus of the folder - view */ - g_signal_emit (G_OBJECT(user_data), - signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0, - NULL); - tree_view = MODEST_FOLDER_VIEW (user_data); if (selected) { @@ -1853,12 +1893,21 @@ 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); } @@ -1920,67 +1969,26 @@ typedef struct _DndHelper { ModestFolderView *folder_view; gboolean delete_source; GtkTreePath *source_row; - GdkDragContext *context; - guint time; } DndHelper; static void dnd_helper_destroyer (DndHelper *helper) { /* Free the helper */ - g_object_unref (helper->folder_view); gtk_tree_path_free (helper->source_row); g_slice_free (DndHelper, helper); } static void -xfer_cb (ModestMailOperation *mail_op, - gpointer user_data) -{ - 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 */ - dnd_helper_destroyer (helper); -} - -static void -xfer_msgs_cb (ModestMailOperation *mail_op, - gpointer user_data) -{ - /* Common part */ - xfer_cb (mail_op, user_data); -} - -static void xfer_folder_cb (ModestMailOperation *mail_op, TnyFolder *new_folder, gpointer user_data) { - DndHelper *helper; - - helper = (DndHelper *) user_data; - - /* Common part */ - xfer_cb (mail_op, user_data); - - /* Select the folder */ - if (new_folder) - modest_folder_view_select_folder (MODEST_FOLDER_VIEW (helper->folder_view), - new_folder, FALSE); + if (new_folder) { + /* Select the folder */ + modest_folder_view_select_folder (MODEST_FOLDER_VIEW (user_data), + new_folder, TRUE); + } } @@ -1999,6 +2007,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 @@ -2008,19 +2017,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; + TnyFolder *folder = NULL, *src_folder = NULL; TnyFolderType folder_type; - ModestMailOperation *mail_op = NULL; 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 (); @@ -2030,6 +2036,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); @@ -2042,6 +2049,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); @@ -2078,29 +2090,14 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model, 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 ((GObject *) main_win, - modest_ui_actions_move_folder_error_handler, - NULL, 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_msgs_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)) @@ -2121,8 +2118,6 @@ dnd_folder_info_destroyer (DndFolderInfo *info) g_object_unref (info->src_folder); if (info->dst_folder) g_object_unref (info->dst_folder); - if (info->folder_view) - g_object_unref (info->folder_view); g_slice_free (DndFolderInfo, info); } @@ -2131,20 +2126,12 @@ dnd_on_connection_failed_destroyer (DndFolderInfo *info, GtkWindow *parent_window, TnyAccount *account) { - time_t dnd_time = info->helper->time; - GdkDragContext *context = info->helper->context; - /* 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); - - /* Notify the drag source. Never call delete, the monitor will - do the job if needed */ - gtk_drag_finish (context, FALSE, FALSE, dnd_time); - return; } static void @@ -2178,12 +2165,12 @@ drag_and_drop_from_folder_view_src_folder_performer (gboolean canceled, info->dst_folder, info->helper->delete_source, xfer_folder_cb, - info->helper); - -/* modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view), */ -/* TNY_FOLDER (info->dst_folder), TRUE); */ + info->helper->folder_view); + /* Frees */ g_object_unref (G_OBJECT (mail_op)); + dnd_helper_destroyer (info->helper); + dnd_folder_info_destroyer (info); } @@ -2204,7 +2191,7 @@ drag_and_drop_from_folder_view_dst_folder_performer (gboolean canceled, } /* Connect to source folder and perform the copy/move */ - modest_platform_connect_if_remote_and_perform (NULL, + modest_platform_connect_if_remote_and_perform (NULL, TRUE, info->src_folder, drag_and_drop_from_folder_view_src_folder_performer, info); @@ -2232,6 +2219,7 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, 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; } @@ -2244,8 +2232,8 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, 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); @@ -2265,9 +2253,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; } @@ -2285,11 +2271,10 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, info = g_slice_new (DndFolderInfo); info->src_folder = g_object_ref (folder); info->dst_folder = g_object_ref (dest_folder); - info->folder_view = g_object_ref (helper->folder_view); info->helper = helper; /* Connect to the destination folder and perform the copy/move */ - modest_platform_connect_if_remote_and_perform (GTK_WINDOW (win), + modest_platform_connect_if_remote_and_perform (GTK_WINDOW (win), TRUE, dest_folder, drag_and_drop_from_folder_view_dst_folder_performer, info); @@ -2319,8 +2304,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"); @@ -2344,10 +2329,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 @@ -2359,15 +2344,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; - helper->folder_view = g_object_ref (widget); + 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)); @@ -2375,14 +2354,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, @@ -2395,6 +2380,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); } /* @@ -2525,9 +2514,9 @@ on_drag_motion (GtkWidget *widget, /* 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; @@ -2544,8 +2533,9 @@ on_drag_motion (GtkWidget *widget, out: if (folder) g_object_unref (folder); - if (dest_row) + if (dest_row) { gtk_tree_path_free (dest_row); + } g_signal_stop_emission_by_name (widget, "drag-motion"); return valid_location; @@ -2865,7 +2855,6 @@ on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model, priv->folder_to_select = g_object_ref (instance); } g_object_unref (instance); - if (priv->folder_to_select) { @@ -2880,8 +2869,7 @@ on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model, 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 */