2008-11-14 [colin] 3.6.1cvs28

	* src/prefs_actions.c
		Comment out bogus (IMO) warning

diff --git a/ChangeLog b/ChangeLog
index 738af06c69d3484fbb9877a0fc1bb67629518036..f3d15c263a5a751f7da555ec8d7d109855b98712 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-14 [colin]     3.6.1cvs28
+
+       * src/prefs_actions.c
+               Comment out bogus (IMO) warning
+
 2008-11-14 [colin]     3.6.1cvs27
 
        * src/mainwindow.c

diff --git a/PATCHSETS b/PATCHSETS
index 52118bcf12900bd73464d7f783ebde27a5bfd8f4..df042fb18f815890b6e6d5e19005193e09deef1b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3609,3 +3609,4 @@
 ( cvs diff -u -r 1.61.2.90 -r 1.61.2.91 src/account.c;  cvs diff -u -r 1.60.2.47 -r 1.60.2.48 src/filtering.c;  ) > 3.6.1cvs25.patchset
 ( cvs diff -u -r 1.1.2.54 -r 1.1.2.55 src/plugins/pgpcore/sgpgme.c;  ) > 3.6.1cvs26.patchset
 ( cvs diff -u -r 1.274.2.290 -r 1.274.2.291 src/mainwindow.c;  cvs diff -u -r 1.395.2.399 -r 1.395.2.400 src/summaryview.c;  cvs diff -u -r 1.68.2.49 -r 1.68.2.50 src/summaryview.h;  cvs diff -u -r 1.5.2.37 -r 1.5.2.38 src/gtk/menu.c;  cvs diff -u -r 1.4.2.20 -r 1.4.2.21 src/gtk/menu.h;  ) > 3.6.1cvs27.patchset
+( cvs diff -u -r 1.60.2.63 -r 1.60.2.64 src/prefs_actions.c;  ) > 3.6.1cvs28.patchset

diff --git a/configure.ac b/configure.ac
index abe091d85bab52cc70930af1f629258bdb11bc27..6bbdb2b874e4e046c0bb8862a26912a6e9878996 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=27
+EXTRA_VERSION=28
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index 1f6ab7f0c4faae4defe72bdd9028ed7e6345ffe2..7c2a6d4ddd57480e304ac1f85758b71b0bb5d887 100644 (file)
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -1280,12 +1280,15 @@ static void prefs_action_filterbtn_cb(GtkWidget *widget, gpointer data)
        gchar *action_str, **tokens;
        GSList *action_list = NULL, *cur;
 
+/* I think this warning is useless - it's logical to clear the field when
+   changing its type.
+
        if(modified && alertpanel(_("Entry was modified"),
                        _("Opening the filter action dialog will clear current modifications "
                        "of the command line."),
                        GTK_STOCK_CANCEL, _("+_Continue editing"), NULL) == G_ALERTDEFAULT)
                return;
-
+*/
        action_str = gtk_editable_get_chars(GTK_EDITABLE(actions.cmd_entry), 0, -1);
        tokens = g_strsplit_set(action_str, "{}", 5);