From 52e64f0119104a875173498474b2704f890d4a60 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sun, 26 Jun 2005 20:33:13 +0000 Subject: [PATCH] 2005-06-26 [colin] 1.9.11cvs105 * src/folder.c * src/imap.c Fix problems with folder operations in no_select imap folders. it applies only to mails, and creation/deletion/move/renaming of folders should be possible --- ChangeLog-gtk2.claws | 9 +++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/folder.c | 10 ---------- src/imap.c | 1 - 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 425ec8600..1da984151 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,12 @@ +2005-06-26 [colin] 1.9.11cvs105 + + * src/folder.c + * src/imap.c + Fix problems with folder operations in no_select + imap folders. it applies only to mails, and + creation/deletion/move/renaming of folders + should be possible + 2005-06-26 [paul] 1.9.11cvs104 * src/prefs_filtering.c diff --git a/PATCHSETS b/PATCHSETS index 3ee1aa982..a2002a323 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -593,3 +593,4 @@ ( cvs diff -u -r 1.79.2.14 -r 1.79.2.15 src/mh.c; ) > 1.9.11cvs102.patchset ( cvs diff -u -r 1.179.2.40 -r 1.179.2.41 src/imap.c; ) > 1.9.11cvs103.patchset ( cvs diff -u -r 1.59.2.20 -r 1.59.2.21 src/prefs_filtering.c; ) > 1.9.11cvs104.patchset +( cvs diff -u -r 1.213.2.37 -r 1.213.2.38 src/folder.c; cvs diff -u -r 1.179.2.41 -r 1.179.2.42 src/imap.c; ) > 1.9.11cvs105.patchset diff --git a/configure.ac b/configure.ac index bd877f5a8..19b17a4f5 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=11 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=104 +EXTRA_VERSION=105 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/folder.c b/src/folder.c index 29039f2c5..adac5d01c 100644 --- a/src/folder.c +++ b/src/folder.c @@ -333,7 +333,6 @@ void folder_item_remove(FolderItem *item) g_return_if_fail(item != NULL); g_return_if_fail(item->folder != NULL); g_return_if_fail(item->node != NULL); - g_return_if_fail(item->no_select == FALSE); node = item->node; if (item->folder->node == node) @@ -781,8 +780,6 @@ FolderItem *folder_create_folder(FolderItem *parent, const gchar *name) { FolderItem *new_item; - g_return_val_if_fail(parent->no_select == FALSE, NULL); - new_item = parent->folder->klass->create_folder(parent->folder, parent, name); if (new_item) { FolderUpdateData hookdata; @@ -804,7 +801,6 @@ gint folder_item_rename(FolderItem *item, gchar *newname) g_return_val_if_fail(item != NULL, -1); g_return_val_if_fail(newname != NULL, -1); - g_return_val_if_fail(item->no_select == FALSE, -1); retval = item->folder->klass->rename_folder(item->folder, item, newname); @@ -1599,7 +1595,6 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering) g_return_val_if_fail(item != NULL, -1); if (item->path == NULL) return -1; - g_return_val_if_fail(item->no_select == FALSE, -1); folder = item->folder; @@ -2502,8 +2497,6 @@ FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest) mlist = folder_item_get_msg_list(src); - g_return_val_if_fail(dest->no_select == FALSE, NULL); - /* move messages */ debug_print("Moving %s to %s\n", src->path, dest->path); new_item = folder_create_folder(dest, src->name); @@ -2593,9 +2586,6 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite return F_MOVE_FAILED_DEST_OUTSIDE_MAILBOX; } - if (dest->no_select) - return F_MOVE_FAILED; - phys_srcpath = folder_item_get_path(src); phys_dstpath = g_strconcat(folder_item_get_path(dest), G_DIR_SEPARATOR_S, diff --git a/src/imap.c b/src/imap.c index bbf86e501..da901dc4a 100644 --- a/src/imap.c +++ b/src/imap.c @@ -2118,7 +2118,6 @@ static gint imap_remove_folder(Folder *folder, 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->node != NULL, -1); - g_return_val_if_fail(item->no_select == FALSE, -1); node = item->node->children; while (node != NULL) { -- 2.25.1