+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
( 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
MICRO_VERSION=15
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=98
+EXTRA_VERSION=99
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
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);
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,
{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},
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);
{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},
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);
#include <glib/gi18n.h>
#include <stdio.h>
#include <errno.h>
+#if HAVE_LOCALE_H
+# include <locale.h>
+#endif
#include "sgpgme.h"
#include "privacy.h"