2005-10-24 [colin] 1.9.15cvs99
authorColin Leroy <colin@colino.net>
Mon, 24 Oct 2005 17:38:29 +0000 (17:38 +0000)
committerColin Leroy <colin@colino.net>
Mon, 24 Oct 2005 17:38:29 +0000 (17:38 +0000)
* src/imap.c
Fix bug when moving a folder
* src/imap_gtk.c
* src/mh_gtk.c
"Delete folder" pops up a window, so it
should be suffixed with "..."
* src/plugins/pgpcore/sgpgme.c
Include locale.h

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/imap.c
src/imap_gtk.c
src/mh_gtk.c
src/plugins/pgpcore/sgpgme.c

index 6914ca8..bbe8800 100644 (file)
@@ -1,3 +1,14 @@
+2005-10-24 [colin]     1.9.15cvs99
+
+       * src/imap.c
+               Fix bug when moving a folder
+       * src/imap_gtk.c
+       * src/mh_gtk.c
+               "Delete folder" pops up a window, so it 
+               should be suffixed with "..."
+       * src/plugins/pgpcore/sgpgme.c
+               Include locale.h
+
 2005-10-24 [mones]     1.9.15cvs98
 
        * manual/Makefile
index bcaacd4..79e716c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.4.2.19 -r 1.4.2.20 src/gtk/about.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/authors.h;  ) > 1.9.15cvs96.patchset
 ( cvs diff -u -r 1.4.2.20 -r 1.4.2.21 src/gtk/about.c;  ) > 1.9.15cvs97.patchset
 ( diff -u /dev/null manual/Makefile;  diff -u /dev/null manual/account.xml;  diff -u /dev/null manual/ack.xml;  diff -u /dev/null manual/addrbook.xml;  diff -u /dev/null manual/advanced.xml;  diff -u /dev/null manual/faq.xml;  diff -u /dev/null manual/glossary.xml;  diff -u /dev/null manual/gpl.xml;  diff -u /dev/null manual/handling.xml;  diff -u /dev/null manual/intro.xml;  diff -u /dev/null manual/keyboard.xml;  diff -u /dev/null manual/manual.xml;  diff -u /dev/null manual/plugins.xml;  diff -u /dev/null manual/starting.xml;  diff -u /dev/null manual/dtd/sdocbook.dtd;  ) > 1.9.15cvs98.patchset
+( cvs diff -u -r 1.179.2.81 -r 1.179.2.82 src/imap.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/imap_gtk.c;  cvs diff -u -r 1.2.2.13 -r 1.2.2.14 src/mh_gtk.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpcore/sgpgme.c;  ) > 1.9.15cvs99.patchset
index d1f7886..15a2ef5 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=98
+EXTRA_VERSION=99
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 1052c63..11c7e46 100644 (file)
@@ -1828,17 +1828,19 @@ static gint imap_rename_folder(Folder *folder, FolderItem *item,
        g_return_val_if_fail(item->path != NULL, -1);
        g_return_val_if_fail(name != NULL, -1);
 
+       session = imap_session_get(folder);
+       if (!session) {
+               return -1;
+       }
+       lock_session();
+
        if (strchr(name, imap_get_path_separator(IMAP_FOLDER(folder), item->path)) != NULL) {
                g_warning(_("New folder name must not contain the namespace "
                            "path separator"));
+               unlock_session();
                return -1;
        }
 
-       session = imap_session_get(folder);
-       if (!session) {
-               return -1;
-       }
-       lock_session();
        real_oldpath = imap_get_real_path(IMAP_FOLDER(folder), item->path);
 
        g_free(session->mbox);
@@ -1920,14 +1922,6 @@ static gint imap_remove_folder_real(Folder *folder, FolderItem *item)
        lock_session();
        path = imap_get_real_path(IMAP_FOLDER(folder), item->path);
 
-       ok = imap_cmd_examine(session, "INBOX",
-                             &exists, &recent, &unseen, &uid_validity, FALSE);
-       if (ok != IMAP_SUCCESS) {
-               g_free(path);
-               unlock_session();
-               return -1;
-       }
-
        ok = imap_cmd_delete(session, path);
        if (ok != IMAP_SUCCESS) {
                gchar *tmp = g_strdup_printf("%s%c", path, 
index 1693191..6361832 100644 (file)
@@ -57,7 +57,7 @@ static GtkItemFactoryEntry imap_popup_entries[] =
        {N_("/Create _new folder..."),   NULL, new_folder_cb,    0, NULL},
        {N_("/_Rename folder..."),       NULL, rename_folder_cb, 0, NULL},
        {N_("/M_ove folder..."),         NULL, move_folder_cb,   0, NULL},
-       {N_("/_Delete folder"),          NULL, delete_folder_cb, 0, NULL},
+       {N_("/_Delete folder..."),       NULL, delete_folder_cb, 0, NULL},
        {N_("/---"),                     NULL, NULL,             0, "<Separator>"},
        {N_("/Synchronise"),             NULL, sync_cb,         0, NULL},
        {N_("/Down_load messages"),      NULL, download_cb,      0, NULL},
@@ -108,7 +108,7 @@ static void set_sensitivity(GtkItemFactory *factory, FolderItem *item)
        SET_SENS("/Create new folder...",   item->no_sub == FALSE);
        SET_SENS("/Rename folder...",       item->stype == F_NORMAL && folder_item_parent(item) != NULL);
        SET_SENS("/Move folder...",         folder_is_normal && folder_item_parent(item) != NULL);
-       SET_SENS("/Delete folder",          item->stype == F_NORMAL && folder_item_parent(item) != NULL);
+       SET_SENS("/Delete folder...",       item->stype == F_NORMAL && folder_item_parent(item) != NULL);
 
        SET_SENS("/Check for new messages", folder_item_parent(item) == NULL);
        SET_SENS("/Check for new folders",  folder_item_parent(item) == NULL);
index bcc8723..6fcefc3 100644 (file)
@@ -50,7 +50,7 @@ static GtkItemFactoryEntry mh_popup_entries[] =
        {N_("/Create _new folder..."),   NULL, new_folder_cb,     0, NULL},
        {N_("/_Rename folder..."),       NULL, rename_folder_cb,  0, NULL},
        {N_("/M_ove folder..."),         NULL, move_folder_cb,    0, NULL},
-       {N_("/_Delete folder"),          NULL, delete_folder_cb,  0, NULL},
+       {N_("/_Delete folder..."),       NULL, delete_folder_cb,  0, NULL},
        {N_("/---"),                     NULL, NULL,              0, "<Separator>"},
        {N_("/_Check for new messages"), NULL, update_tree_cb,    0, NULL},
        {N_("/C_heck for new folders"),  NULL, update_tree_cb,    1, NULL},
@@ -97,7 +97,7 @@ static void set_sensitivity(GtkItemFactory *factory, FolderItem *item)
        SET_SENS("/Create new folder...",   TRUE);
        SET_SENS("/Rename folder...",       item->stype == F_NORMAL && folder_item_parent(item) != NULL);
        SET_SENS("/Move folder...",         folder_is_normal && folder_item_parent(item) != NULL);
-       SET_SENS("/Delete folder",          item->stype == F_NORMAL && folder_item_parent(item) != NULL);
+       SET_SENS("/Delete folder...",       item->stype == F_NORMAL && folder_item_parent(item) != NULL);
 
        SET_SENS("/Check for new messages", folder_item_parent(item) == NULL);
        SET_SENS("/Check for new folders",  folder_item_parent(item) == NULL);
index 6bb6039..c9377ff 100644 (file)
@@ -30,6 +30,9 @@
 #include <glib/gi18n.h>
 #include <stdio.h>
 #include <errno.h>
+#if HAVE_LOCALE_H
+#  include <locale.h>
+#endif
 
 #include "sgpgme.h"
 #include "privacy.h"