2006-05-26 [colin] 2.2.0cvs61
authorColin Leroy <colin@colino.net>
Fri, 26 May 2006 16:43:21 +0000 (16:43 +0000)
committerColin Leroy <colin@colino.net>
Fri, 26 May 2006 16:43:21 +0000 (16:43 +0000)
* src/summaryview.c
Unplug MSGINFO_UPDATE callback on delete too.

ChangeLog
PATCHSETS
configure.ac
src/summaryview.c

index 7a3b867..c165556 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-26 [colin]     2.2.0cvs61
+
+       * src/summaryview.c
+               Unplug MSGINFO_UPDATE callback on delete too.
+
 2006-05-26 [colin]     2.2.0cvs60
 
        * src/foldersel.c
index cb47cf9..f7f919b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.395.2.208 -r 1.395.2.209 src/summaryview.c;  cvs diff -u -r 1.5.2.27 -r 1.5.2.28 src/gtk/gtkutils.c;  ) > 2.2.0cvs58.patchset
 ( cvs diff -u -r 1.47.2.29 -r 1.47.2.30 src/procheader.c;  cvs diff -u -r 1.395.2.209 -r 1.395.2.210 src/summaryview.c;  ) > 2.2.0cvs59.patchset
 ( cvs diff -u -r 1.26.2.25 -r 1.26.2.26 src/foldersel.c;  ) > 2.2.0cvs60.patchset
+( cvs diff -u -r 1.395.2.210 -r 1.395.2.211 src/summaryview.c;  ) > 2.2.0cvs61.patchset
index 996fb23..ddc6626 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=60
+EXTRA_VERSION=61
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 0fd0e03..40a560c 100644 (file)
@@ -3981,7 +3981,7 @@ gboolean summary_execute(SummaryView *summaryview)
                        if (GTK_CTREE_ROW(node)->sibling) {
                                next = GTK_CTREE_ROW(node)->sibling;
                        } else {
-                               GtkCTreeRow *parent = NULL;
+                               GtkCTreeNode *parent = NULL;
                                for (parent = GTK_CTREE_ROW(node)->parent; parent != NULL;
                                     parent = GTK_CTREE_ROW(parent)->parent) {
                                        if (GTK_CTREE_ROW(parent)->sibling) {
@@ -4148,9 +4148,15 @@ static void summary_execute_delete(SummaryView *summaryview)
 
        if (!summaryview->mlist) return;
 
+       hooks_unregister_hook(MSGINFO_UPDATE_HOOKLIST,
+               summaryview->msginfo_update_callback_id);
+
        folder_item_remove_msgs(summaryview->folder_item,
                                summaryview->mlist);
 
+       summaryview->msginfo_update_callback_id =
+               hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, 
+                       summary_update_msg, (gpointer) summaryview);
        for (cur = summaryview->mlist; cur != NULL && cur->data != NULL; cur = cur->next)
                procmsg_msginfo_free((MsgInfo *)cur->data);
 
@@ -4235,7 +4241,7 @@ void summary_thread_build(SummaryView *summaryview)
                                 msginfo->subject);
                }
 
-               if (parent && parent != node) {
+               if (parent && parent != node && parent != GTK_CTREE_ROW(node)->parent) {
                        gtk_ctree_move(ctree, node, parent, NULL);
                }