From e25c9ca256a20c3a00ff3108fb660ba91a4c6c86 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Mon, 5 Feb 2007 18:41:14 +0000 Subject: [PATCH] 2007-02-05 [colin] 2.7.2cvs23 * src/folderview.c Add debug to try to solve bug 1104 --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/folderview.c | 13 ++++++++++--- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44e71c730..21316ddf6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-02-05 [colin] 2.7.2cvs23 + + * src/folderview.c + Add debug to try to solve bug 1104 + 2007-02-05 [paul] 2.7.2cvs22 * src/mainwindow.c diff --git a/PATCHSETS b/PATCHSETS index a4c590bc6..5c99eb1fc 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2340,3 +2340,4 @@ ( cvs diff -u -r 1.61.2.58 -r 1.61.2.59 src/account.c; cvs diff -u -r 1.9.2.12 -r 1.9.2.13 src/addressadd.c; cvs diff -u -r 1.60.2.79 -r 1.60.2.80 src/addressbook.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/addressbook_foldersel.c; cvs diff -u -r 1.5.10.16 -r 1.5.10.17 src/addrgather.c; cvs diff -u -r 1.382.2.356 -r 1.382.2.357 src/compose.c; cvs diff -u -r 1.50.2.31 -r 1.50.2.32 src/compose.h; cvs diff -u -r 1.23.2.21 -r 1.23.2.22 src/crash.c; cvs diff -u -r 1.14.2.22 -r 1.14.2.23 src/editaddress.c; cvs diff -u -r 1.5.12.9 -r 1.5.12.10 src/editbook.c; cvs diff -u -r 1.11.2.15 -r 1.11.2.16 src/editgroup.c; cvs diff -u -r 1.5.12.12 -r 1.5.12.13 src/editjpilot.c; cvs diff -u -r 1.8.2.19 -r 1.8.2.20 src/editldap.c; cvs diff -u -r 1.10.2.10 -r 1.10.2.11 src/editldap_basedn.c; cvs diff -u -r 1.5.12.11 -r 1.5.12.12 src/editvcard.c; cvs diff -u -r 1.3.2.20 -r 1.3.2.21 src/exphtmldlg.c; cvs diff -u -r 1.1.4.24 -r 1.1.4.25 src/expldifdlg.c; cvs diff -u -r 1.8.2.23 -r 1.8.2.24 src/export.c; cvs diff -u -r 1.26.2.31 -r 1.26.2.32 src/foldersel.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gedit-print.c; cvs diff -u -r 1.13.2.21 -r 1.13.2.22 src/import.c; cvs diff -u -r 1.14.2.12 -r 1.14.2.13 src/importldif.c; cvs diff -u -r 1.4.12.15 -r 1.4.12.16 src/importmutt.c; cvs diff -u -r 1.1.14.15 -r 1.1.14.16 src/importpine.c; cvs diff -u -r 1.115.2.134 -r 1.115.2.135 src/main.c; cvs diff -u -r 1.274.2.170 -r 1.274.2.171 src/mainwindow.c; cvs diff -u -r 1.3.12.23 -r 1.3.12.24 src/message_search.c; cvs diff -u -r 1.94.2.122 -r 1.94.2.123 src/messageview.c; cvs diff -u -r 1.60.2.44 -r 1.60.2.45 src/prefs_actions.c; cvs diff -u -r 1.16.2.25 -r 1.16.2.26 src/prefs_customheader.c; cvs diff -u -r 1.16.2.23 -r 1.16.2.24 src/prefs_display_header.c; cvs diff -u -r 1.59.2.52 -r 1.59.2.53 src/prefs_filtering.c; cvs diff -u -r 1.1.4.32 -r 1.1.4.33 src/prefs_filtering_action.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_folder_column.c; cvs diff -u -r 1.10.2.28 -r 1.10.2.29 src/prefs_gtk.c; cvs diff -u -r 1.43.2.52 -r 1.43.2.53 src/prefs_matcher.c; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/prefs_other.c; cvs diff -u -r 1.1.2.36 -r 1.1.2.37 src/prefs_summaries.c; cvs diff -u -r 1.10.2.16 -r 1.10.2.17 src/prefs_summary_column.c; cvs diff -u -r 1.12.2.39 -r 1.12.2.40 src/prefs_template.c; cvs diff -u -r 1.9.2.19 -r 1.9.2.20 src/sourcewindow.c; cvs diff -u -r 1.3.2.27 -r 1.3.2.28 src/ssl_manager.c; cvs diff -u -r 1.15.2.43 -r 1.15.2.44 src/summary_search.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/uri_opener.c; cvs diff -u -r 1.4.2.48 -r 1.4.2.49 src/gtk/about.c; cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/gtk/description_window.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/gtk/foldersort.c; cvs diff -u -r 1.5.2.51 -r 1.5.2.52 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.31 -r 1.4.2.32 src/gtk/gtkutils.h; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/icon_legend.c; cvs diff -u -r 1.1.4.25 -r 1.1.4.26 src/gtk/logwindow.c; cvs diff -u -r 1.5.2.43 -r 1.5.2.44 src/gtk/pluginwindow.c; cvs diff -u -r 1.12.2.31 -r 1.12.2.32 src/gtk/prefswindow.c; ) > 2.7.2cvs20.patchset ( cvs diff -u -r 1.382.2.357 -r 1.382.2.358 src/compose.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/plugins/pgpcore/passphrase.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/plugins/pgpcore/select-keys.c; ) > 2.7.2cvs21.patchset ( cvs diff -u -r 1.274.2.171 -r 1.274.2.172 src/mainwindow.c; ) > 2.7.2cvs22.patchset +( cvs diff -u -r 1.207.2.146 -r 1.207.2.147 src/folderview.c; ) > 2.7.2cvs23.patchset diff --git a/configure.ac b/configure.ac index 971d33fd4..a606576a0 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=7 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=22 +EXTRA_VERSION=23 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/folderview.c b/src/folderview.c index e11e673d5..ad60403c1 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -2777,11 +2777,13 @@ void folderview_finish_dnd(const gchar *data, GdkDragContext *drag_context, if (!(item && item->folder && folder_item_parent(item) != NULL && FOLDER_CLASS(item->folder)->add_msg != NULL)) { - gtk_drag_finish(drag_context, FALSE, FALSE, time); + gtk_drag_finish(drag_context, FALSE, FALSE, time); + debug_print("item doesn't fit\n"); return; } if (!list) { - gtk_drag_finish(drag_context, FALSE, FALSE, time); + gtk_drag_finish(drag_context, FALSE, FALSE, time); + debug_print("list is empty\n"); return; } for (tmp = list; tmp != NULL; tmp = tmp->next) { @@ -2792,6 +2794,9 @@ void folderview_finish_dnd(const gchar *data, GdkDragContext *drag_context, info->msginfo = NULL; info->file = (gchar *)tmp->data; msglist = g_slist_prepend(msglist, info); + debug_print("file is a mail\n"); + } else { + debug_print("file isn't a mail\n"); } } if (msglist) { @@ -2895,12 +2900,14 @@ static void folderview_drag_received_cb(GtkWidget *widget, node = gtk_ctree_node_nth(GTK_CTREE(widget), row); if (!node) { - gtk_drag_finish(drag_context, FALSE, FALSE, time); + gtk_drag_finish(drag_context, FALSE, FALSE, time); + debug_print("no node\n"); return; } item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node); if (!item) { gtk_drag_finish(drag_context, FALSE, FALSE, time); + debug_print("no item\n"); return; } folderview_finish_dnd(data->data, drag_context, time, item); -- 2.25.1