From: Colin Leroy Date: Thu, 2 Jun 2005 03:53:15 +0000 (+0000) Subject: 2005-06-02 [colin] 1.9.11cvs33 X-Git-Tag: rel_1_9_12~75 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=a1cfb1ab71b2cf587a1ab57467c3c0e87a07deae 2005-06-02 [colin] 1.9.11cvs33 * src/prefs_account.c Fix bug #245 (filtering rules broken when renaming a remote account (imap4 or nntp) --- diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index cfec3f0c0..0090a262e 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,9 @@ +2005-06-02 [colin] 1.9.11cvs33 + + * src/prefs_account.c + Fix bug #245 (filtering rules broken when + renaming a remote account (imap4 or nntp) + 2005-06-02 [colin] 1.9.11cvs32 * src/imap.c diff --git a/PATCHSETS b/PATCHSETS index 70310bec2..148a2728c 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -521,3 +521,4 @@ ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 po/fi.po; cvs diff -u -r 1.49.2.44 -r 1.49.2.45 src/procmime.c; ) > 1.9.11cvs30.patchset ( cvs diff -u -r 1.6.10.5 -r 1.6.10.6 src/addrharvest.c; cvs diff -u -r 1.382.2.125 -r 1.382.2.126 src/compose.c; cvs diff -u -r 1.28.2.4 -r 1.28.2.5 src/mbox.c; cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/mbox.h; cvs diff -u -r 1.79.2.10 -r 1.79.2.11 src/mh.c; cvs diff -u -r 1.16.2.18 -r 1.16.2.19 src/msgcache.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/prefs_compose_writing.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_compose_writing.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_message.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_message.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_other.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_other.h; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/prefs_quote.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_quote.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_receive.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_receive.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_send.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_send.h; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/prefs_summaries.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_summaries.h; cvs diff -u -r 1.17.2.11 -r 1.17.2.12 src/send_message.c; cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/setup.c; cvs diff -u -r 1.395.2.72 -r 1.395.2.73 src/summaryview.c; cvs diff -u -r 1.13.2.2 -r 1.13.2.3 src/undo.c; cvs diff -u -r 1.24.2.6 -r 1.24.2.7 src/common/Makefile.am; cvs diff -u -r 1.10 -r 1.11 src/common/hooks.c; cvs diff -u -r 1.5 -r 1.6 src/common/prefs.c; cvs diff -u -r 1.2.4.7 -r 1.2.4.8 src/common/template.c; diff -u /dev/null src/common/timing.h; cvs diff -u -r 1.36.2.31 -r 1.36.2.32 src/common/utils.c; cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/gtk/gtkutils.c; cvs diff -u -r 1.2.2.7 -r 1.2.2.8 src/gtk/inputdialog.c; cvs diff -u -r 1.5.2.14 -r 1.5.2.15 src/gtk/menu.c; cvs diff -u -r 1.5.2.14 -r 1.5.2.15 src/gtk/pluginwindow.c; cvs diff -u -r 1.12.2.19 -r 1.12.2.20 src/gtk/prefswindow.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpmime/passphrase.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpmime/prefs_gpg.c; ) > 1.9.11cvs31.patchset ( cvs diff -u -r 1.179.2.17 -r 1.179.2.18 src/imap.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/imap_gtk.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/imap_gtk.h; cvs diff -u -r 1.47.2.19 -r 1.47.2.20 src/procheader.c; ) > 1.9.11cvs32.patchset +( cvs diff -u -r 1.105.2.24 -r 1.105.2.25 src/prefs_account.c; ) > 1.9.11cvs33.patchset diff --git a/configure.ac b/configure.ac index 805d256b8..476509faa 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=32 +EXTRA_VERSION=33 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_account.c b/src/prefs_account.c index 4b92777fa..8f2293f13 100644 --- a/src/prefs_account.c +++ b/src/prefs_account.c @@ -2349,7 +2349,9 @@ static gint prefs_account_apply(void) RecvProtocol protocol; GtkWidget *menu; GtkWidget *menuitem; - + gchar *old_id = NULL; + gchar *new_id = NULL; + menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(basic.protocol_optmenu)); menuitem = gtk_menu_get_active(GTK_MENU(menu)); protocol = GPOINTER_TO_INT @@ -2402,8 +2404,23 @@ static gint prefs_account_apply(void) alertpanel_error(_("mail command is not entered.")); return -1; } - + + if (protocol == A_IMAP4 || protocol == A_NNTP) + old_id = g_strdup_printf("#%s/%s", + protocol == A_IMAP4 ? "imap":"nntp", + tmp_ac_prefs.account_name); + prefs_set_data_from_dialog(param); + + if (protocol == A_IMAP4 || protocol == A_NNTP) { + new_id = g_strdup_printf("#%s/%s", + protocol == A_IMAP4 ? "imap":"nntp", + tmp_ac_prefs.account_name); + if (old_id != NULL && new_id != NULL) + prefs_filtering_rename_path(old_id, new_id); + g_free(old_id); + g_free(new_id); + } return 0; }