From 487a947c3e82f65b4b1e7b9191b55c7c3fb3d5bb Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Fri, 17 Aug 2007 16:31:44 +0000 Subject: [PATCH] 2007-08-17 [colin] 2.10.0cvs128 * src/folder.c Set batching after getting flags - maybe fixes bug 1292, 'CM crashes on writing mail' --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/folder.c | 4 ++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 888b9e17f..2281e51e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-08-17 [colin] 2.10.0cvs128 + + * src/folder.c + Set batching after getting flags - maybe fixes + bug 1292, 'CM crashes on writing mail' + 2007-08-16 [ticho] 2.10.0cvs127 * src/prefs_send.c diff --git a/PATCHSETS b/PATCHSETS index beeefa4d9..4bcb28f93 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2782,3 +2782,4 @@ ( cvs diff -u -r 1.14.2.16 -r 1.14.2.17 src/importldif.c; ) > 2.10.0cvs125.patchset ( cvs diff -u -r 1.14.2.55 -r 1.14.2.56 src/plugins/trayicon/trayicon.c; ) > 2.10.0cvs126.patchset ( cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/prefs_send.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/combobox.h; cvs diff -u -r 1.5.2.65 -r 1.5.2.66 src/gtk/gtkutils.c; ) > 2.10.0cvs127.patchset +( cvs diff -u -r 1.213.2.155 -r 1.213.2.156 src/folder.c; ) > 2.10.0cvs128.patchset diff --git a/configure.ac b/configure.ac index 0bd8717c8..6837c381d 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=10 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=127 +EXTRA_VERSION=128 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/folder.c b/src/folder.c index 8e06c7a6a..85eb5654a 100644 --- a/src/folder.c +++ b/src/folder.c @@ -1788,7 +1788,6 @@ static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist) relation = g_relation_new(2); g_relation_index(relation, 0, g_direct_hash, g_direct_equal); - folder_item_set_batch(item, TRUE); if ((ret = item->folder->klass->get_flags( item->folder, item, msglist, relation)) == 0) { GTuples *tuples; @@ -1797,6 +1796,7 @@ static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist) gboolean skip; folder_item_update_freeze(); + folder_item_set_batch(item, TRUE); for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) { msginfo = (MsgInfo *) cur->data; @@ -1814,9 +1814,9 @@ static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist) ~permflags & msginfo->flags.perm_flags, 0); } } + folder_item_set_batch(item, FALSE); folder_item_update_thaw(); } - folder_item_set_batch(item, FALSE); g_relation_destroy(relation); return ret; -- 2.25.1