2008-11-19 [wwp] 3.6.1cvs37

	* src/prefs_actions.c
		Fixed wrong behaviour when pressing Escape (was not cancelling
		the action).

diff --git a/ChangeLog b/ChangeLog
index 4a087375008c7c04c276918dcb9caaf77b3cf984..7bbd84d3b0c7885e4114811b880a0b720bde730c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-19 [wwp]       3.6.1cvs37
+
+       * src/prefs_actions.c
+               Fixed wrong behaviour when pressing Escape (was not cancelling
+               the action).
+
 2008-11-19 [wwp]       3.6.1cvs36
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index d3f683fd6d551a1c75586254ce11db6d191d266e..9ca4a57d40af968bc356e0e96970b8fbfda49b80 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3618,3 +3618,4 @@
 ( cvs diff -u -r 1.207.2.206 -r 1.207.2.207 src/folderview.c;  ) > 3.6.1cvs34.patchset
 ( cvs diff -u -r 1.382.2.484 -r 1.382.2.485 src/compose.c;  cvs diff -u -r 1.204.2.182 -r 1.204.2.183 src/prefs_common.c;  cvs diff -u -r 1.103.2.117 -r 1.103.2.118 src/prefs_common.h;  ) > 3.6.1cvs35.patchset
 ( cvs diff -u -r 1.382.2.485 -r 1.382.2.486 src/compose.c;  cvs diff -u -r 1.75.2.61 -r 1.75.2.62 src/matcher.c;  cvs diff -u -r 1.94.2.191 -r 1.94.2.192 src/messageview.c;  cvs diff -u -r 1.83.2.147 -r 1.83.2.148 src/mimeview.c;  cvs diff -u -r 1.60.2.64 -r 1.60.2.65 src/prefs_actions.c;  cvs diff -u -r 1.1.4.57 -r 1.1.4.58 src/prefs_filtering_action.c;  cvs diff -u -r 1.150.2.109 -r 1.150.2.110 src/procmsg.c;  cvs diff -u -r 1.395.2.400 -r 1.395.2.401 src/summaryview.c;  cvs diff -u -r 1.96.2.210 -r 1.96.2.211 src/textview.c;  cvs diff -u -r 1.36.2.154 -r 1.36.2.155 src/common/utils.c;  ) > 3.6.1cvs36.patchset
+( cvs diff -u -r 1.60.2.65 -r 1.60.2.66 src/prefs_actions.c;  ) > 3.6.1cvs37.patchset

diff --git a/configure.ac b/configure.ac
index 7a1426d3cb07c8e81d2ab0dfc19ea5404980a29d..1e055a67ba8887387760275ba30b8a7ddcdafe0d 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=36
+EXTRA_VERSION=37
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index c685cca933b633d73e47fa96d99196c39013bc01..a8d5747e3443675fd99a83c60c531d25d1356ee3 100644 (file)
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -736,7 +736,7 @@ static void prefs_actions_delete_all_cb(gpointer gtk_action, gpointer data)
 
        if (alertpanel(_("Delete all actions"),
                          _("Do you really want to delete all the actions?"),
-                         GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL) == G_ALERTDEFAULT)
+                         GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL) != G_ALERTDEFAULT)
           return;
 
        list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(actions.actions_list_view)));
@@ -1287,7 +1287,7 @@ static void prefs_action_filterbtn_cb(GtkWidget *widget, gpointer data)
        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)
+                       GTK_STOCK_CANCEL, _("+_Continue editing"), NULL) != G_ALERTDEFAULT)
                return;
 */
        action_str = gtk_editable_get_chars(GTK_EDITABLE(actions.cmd_entry), 0, -1);
@@ -1314,7 +1314,7 @@ static void prefs_action_define_filter_done(GSList * action_list)
 {
        gchar *str;
 
-       if(action_list == NULL)
+       if (action_list == NULL)
                return;
 
        str = filteringaction_list_to_string(action_list);