From aa54162916f067b67f899927eb1287b5c18e5e1b Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 18 Mar 2006 08:56:52 +0000 Subject: [PATCH] 2006-03-18 [colin] 2.0.0cvs150 * src/folder.c Change wrong asserts to simple tests --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/folder.c | 60 +++++++++++++++++++++++++++++++++++----------------- 4 files changed, 48 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 14d6bf7c1..3e767c2f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-03-18 [colin] 2.0.0cvs150 + + * src/folder.c + Change wrong asserts to simple tests + 2006-03-17 [colin] 2.0.0cvs149 * src/mainwindow.c diff --git a/PATCHSETS b/PATCHSETS index 5bbd1d42b..578431561 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1335,3 +1335,4 @@ ( cvs diff -u -r 1.382.2.252 -r 1.382.2.253 src/compose.c; ) > 2.0.0cvs147.patchset ( cvs diff -u -r 1.382.2.253 -r 1.382.2.254 src/compose.c; ) > 2.0.0cvs148.patchset ( cvs diff -u -r 1.274.2.102 -r 1.274.2.103 src/mainwindow.c; cvs diff -u -r 1.39.2.14 -r 1.39.2.15 src/mainwindow.h; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/prefs_msg_colors.c; cvs diff -u -r 1.395.2.182 -r 1.395.2.183 src/summaryview.c; cvs diff -u -r 1.68.2.19 -r 1.68.2.20 src/summaryview.h; cvs diff -u -r 1.2.2.11 -r 1.2.2.12 src/gtk/colorlabel.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/colorlabel.h; ) > 2.0.0cvs149.patchset +( cvs diff -u -r 1.213.2.86 -r 1.213.2.87 src/folder.c; ) > 2.0.0cvs150.patchset diff --git a/configure.ac b/configure.ac index 9b6b3d335..65d513cf1 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=149 +EXTRA_VERSION=150 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/folder.c b/src/folder.c index 47985fc48..766d47b7e 100644 --- a/src/folder.c +++ b/src/folder.c @@ -1527,7 +1527,8 @@ void folder_item_process_open (FolderItem *item, gint folder_item_open(FolderItem *item) { - g_return_val_if_fail(item->no_select == FALSE, -1); + if (item->no_select) + return -1; item->processing_pending = TRUE; folder_item_process_open (item, NULL, NULL, NULL); @@ -1543,7 +1544,9 @@ gint folder_item_close(FolderItem *item) Folder *folder; g_return_val_if_fail(item != NULL, -1); - g_return_val_if_fail(item->no_select == FALSE, -1); + + if (item->no_select) + return -1; if (item->new_msgs) { folder_item_update_freeze(); @@ -1577,7 +1580,8 @@ static MsgInfoList *get_msginfos(FolderItem *item, MsgNumberList *numlist) { MsgInfoList *msglist = NULL; Folder *folder = item->folder; - g_return_val_if_fail(item->no_select == FALSE, NULL); + if (item->no_select) + return NULL; if (folder->klass->get_msginfos != NULL) msglist = folder->klass->get_msginfos(folder, item, numlist); @@ -1624,7 +1628,8 @@ static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist) return 0; if(item->folder->klass->get_flags == NULL) return 0; - g_return_val_if_fail(item->no_select == FALSE, 0); + if (item->no_select) + return 0; relation = g_relation_new(2); g_relation_index(relation, 0, g_direct_hash, g_direct_equal); @@ -1981,7 +1986,8 @@ gint folder_item_syncronize_flags(FolderItem *item) g_return_val_if_fail(item != NULL, -1); g_return_val_if_fail(item->folder != NULL, -1); g_return_val_if_fail(item->folder->klass != NULL, -1); - g_return_val_if_fail(item->no_select == FALSE, -1); + if (item->no_select) + return -1; if (item->cache == NULL) folder_item_read_cache(item); @@ -2168,7 +2174,8 @@ MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num) MsgInfo *msginfo = NULL; g_return_val_if_fail(item != NULL, NULL); - g_return_val_if_fail(item->no_select == FALSE, NULL); + if (item->no_select) + return NULL; folder = item->folder; if (!item->cache) folder_item_read_cache(item); @@ -2192,7 +2199,8 @@ MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid) g_return_val_if_fail(item != NULL, NULL); g_return_val_if_fail(msgid != NULL, NULL); - g_return_val_if_fail(item->no_select == FALSE, FALSE); + if (item->no_select) + return FALSE; folder = item->folder; if (!item->cache) @@ -2207,7 +2215,8 @@ MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid) GSList *folder_item_get_msg_list(FolderItem *item) { g_return_val_if_fail(item != NULL, NULL); - g_return_val_if_fail(item->no_select == FALSE, FALSE); + if (item->no_select) + return FALSE; if (item->cache == 0) folder_item_read_cache(item); @@ -2260,7 +2269,8 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num) folder = item->folder; g_return_val_if_fail(folder->klass->fetch_msg != NULL, NULL); - g_return_val_if_fail(item->no_select == FALSE, NULL); + if (item->no_select) + return NULL; msgfile = folder->klass->fetch_msg(folder, item, num); @@ -2295,7 +2305,8 @@ gchar *folder_item_fetch_msg_full(FolderItem *item, gint num, gboolean headers, MsgInfo *msginfo; g_return_val_if_fail(item != NULL, NULL); - g_return_val_if_fail(item->no_select == FALSE, NULL); + if (item->no_select) + return NULL; folder = item->folder; @@ -2339,7 +2350,8 @@ gint folder_item_fetch_all_msg(FolderItem *item) gint total = 0; g_return_val_if_fail(item != NULL, -1); - g_return_val_if_fail(item->no_select == FALSE, -1); + if (item->no_select) + return -1; debug_print("fetching all messages in %s ...\n", item->path ? item->path : "(null)"); statusbar_print_all(_("Fetching all messages in %s ...\n"), item->path ? item->path : "(null)"); @@ -2538,7 +2550,8 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list, g_return_val_if_fail(dest != NULL, -1); g_return_val_if_fail(file_list != NULL, -1); g_return_val_if_fail(dest->folder != NULL, -1); - g_return_val_if_fail(dest->no_select == FALSE, -1); + if (dest->no_select) + return -1; folder = dest->folder; @@ -2762,7 +2775,8 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour folder = dest->folder; g_return_val_if_fail(folder->klass->copy_msg != NULL, -1); - g_return_val_if_fail(dest->no_select == FALSE, -1); + if (dest->no_select) + return -1; relation = g_relation_new(2); g_relation_index(relation, 0, g_direct_hash, g_direct_equal); @@ -2998,7 +3012,8 @@ gint folder_item_remove_msg(FolderItem *item, gint num) g_return_val_if_fail(item != NULL, -1); folder = item->folder; g_return_val_if_fail(folder->klass->remove_msg != NULL, -1); - g_return_val_if_fail(item->no_select == FALSE, -1); + if (item->no_select) + return -1; if (!item->cache) folder_item_read_cache(item); @@ -3021,7 +3036,8 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist) g_return_val_if_fail(item != NULL, -1); folder = item->folder; g_return_val_if_fail(folder != NULL, -1); - g_return_val_if_fail(item->no_select == FALSE, -1); + if (item->no_select) + return -1; inc_lock(); if (!item->cache) folder_item_read_cache(item); @@ -3056,7 +3072,8 @@ gint folder_item_remove_all_msg(FolderItem *item) gint result; g_return_val_if_fail(item != NULL, -1); - g_return_val_if_fail(item->no_select == FALSE, -1); + if (item->no_select) + return -1; folder = item->folder; @@ -3093,7 +3110,8 @@ void folder_item_change_msg_flags(FolderItem *item, MsgInfo *msginfo, MsgPermFla { g_return_if_fail(item != NULL); g_return_if_fail(msginfo != NULL); - g_return_if_fail(item->no_select == FALSE); + if (item->no_select) + return; if (item->folder->klass->change_flags != NULL) { item->folder->klass->change_flags(item->folder, item, msginfo, newflags); @@ -3107,7 +3125,8 @@ gboolean folder_item_is_msg_changed(FolderItem *item, MsgInfo *msginfo) Folder *folder; g_return_val_if_fail(item != NULL, FALSE); - g_return_val_if_fail(item->no_select == FALSE, FALSE); + if (item->no_select) + return FALSE; folder = item->folder; @@ -3536,7 +3555,10 @@ void folder_item_apply_processing(FolderItem *item) guint total = 0, curmsg = 0; g_return_if_fail(item != NULL); - g_return_if_fail(item->no_select == FALSE); + + if (item->no_select) + return; + processing_list = item->prefs->processing; if (!pre_global_processing && !processing_list -- 2.25.1