diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | NEWS | 13 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | src/prefs_common_dialog.c | 16 |
4 files changed, 37 insertions, 7 deletions
@@ -1,3 +1,12 @@ +2011-11-29 + + * version 3.2.0beta4 + +2011-11-29 + + * src/prefs_common_dialog.c: sylfilter command was added as a preset + of junk filter program. + 2011-11-17 * src/mainwindow.c: main_window_create(): force visibility of the @@ -9,7 +18,7 @@ 2011-10-14 * src/summaryview.c: show both filtered and original numbers of - messages on the status iabel. + messages on the status label. Show the numbers of moved/copied/deleted marks on filtered mode. 2011-10-04 @@ -1,5 +1,18 @@ Changes of Sylpheed +* 3.2.0beta4 (development) + + * Multiple keywords search of the quick search was implemented. + * Sylfilter command was added as a preset of junk filter program. + * MIME debug output was modified. + * On browsing IMAP folder, the error "imap_cmd_gen_send: cannot send + command because another command is already running." was fixed. + * The focus on quick search entry is not stolen by the refresh of summary. + * Both filtered and original numbers of messages are displayed on the + status label now. + * Always show the message view on startup (fixes wrong view size on + vertical-view mode). + * 3.2.0beta3 (development) * The translation was updated. diff --git a/configure.in b/configure.in index 655a57ec..72d41066 100644 --- a/configure.in +++ b/configure.in @@ -9,8 +9,8 @@ MINOR_VERSION=2 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=beta3 -BUILD_REVISION=1122 +EXTRA_VERSION=beta4 +BUILD_REVISION=1129 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl define if this is a development release diff --git a/src/prefs_common_dialog.c b/src/prefs_common_dialog.c index 50c7a0df..c8b2c2b9 100644 --- a/src/prefs_common_dialog.c +++ b/src/prefs_common_dialog.c @@ -2033,10 +2033,12 @@ static const struct { } junk_presets[] = { #ifdef G_OS_WIN32 {"bogofilter -N -s -I", "bogofilter -n -S -I", "bogofilter -I"}, - {"bsfilterw -C -s -u", "bsfilterw -c -S -u", "bsfilterw"} + {"bsfilterw -C -s -u", "bsfilterw -c -S -u", "bsfilterw"}, + {"sylfilter -j", "sylfilter -c", "sylfilter"} #else {"bogofilter -N -s -I", "bogofilter -n -S -I", "bogofilter -I"}, - {"bsfilter -C -s -u", "bsfilter -c -S -u", "bsfilter"} + {"bsfilter -C -s -u", "bsfilter -c -S -u", "bsfilter"}, + {"sylfilter -j", "sylfilter -c", "sylfilter"} #endif }; @@ -2044,7 +2046,10 @@ enum { JUNK_NONE, JUNK_BOGOFILTER, - JUNK_BSFILTER + JUNK_BSFILTER, + JUNK_SYLFILTER, + + N_JUNK_ITEMS }; static void prefs_junk_preset_activated(GtkMenuItem *menuitem, gpointer data) @@ -2052,7 +2057,7 @@ static void prefs_junk_preset_activated(GtkMenuItem *menuitem, gpointer data) gint i; i = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID)); - if (i > 0) { + if (i > JUNK_NONE && i < N_JUNK_ITEMS) { i--; gtk_entry_set_text(GTK_ENTRY(junk.entry_junk_learncmd), junk_presets[i].junk_cmd); @@ -2119,6 +2124,9 @@ static void prefs_junk_create(void) MENUITEM_ADD (menu, menuitem, "bsfilter", JUNK_BSFILTER); g_signal_connect (G_OBJECT (menuitem), "activate", G_CALLBACK (prefs_junk_preset_activated), NULL); + MENUITEM_ADD (menu, menuitem, "sylfilter", JUNK_SYLFILTER); + g_signal_connect (G_OBJECT (menuitem), "activate", + G_CALLBACK (prefs_junk_preset_activated), NULL); gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_preset), menu); hbox = gtk_hbox_new (FALSE, 8); |