2005-04-13 [holger] 1.0.4cvs6

	* src/prefs_filtering.c
		Fix a crash when changes to the filtering
		dialog were not added and no filter rules
		are defined. Also fix a memleak.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 34f2c9875a3b7742f61956642b81e019404b4c7e..7465eb379813ce93d3db55fd637098013682e01a 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2005-04-13 [holger]    1.0.4cvs6
+
+       * src/prefs_filtering.c
+               Fix a crash when changes to the filtering
+               dialog were not added and no filter rules
+               are defined. Also fix a memleak.
+

 2005-04-12 [paul]      1.0.4cvs5
        
        backported from GTK2...
 2005-04-12 [paul]      1.0.4cvs5
        
        backported from GTK2...

diff --git a/PATCHSETS b/PATCHSETS
index 506cfe72b16ea175e60efeb4d570b881446fa12b..7752bdb6d71cf9e8246b8f3101d7600c556ed96c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -273,3 +273,4 @@
 ( cvs diff -u -r 1.88 -r 1.89 src/mh.c; ) > 1.0.4cvs3.patchset
 ( cvs diff -u -r 1.460 -r 1.461 ChangeLog; cvs diff -u -r 1.455 -r 1.456 ChangeLog.jp; cvs diff -u -r 1.20 -r 1.21 src/send_message.c; cvs diff -u -r 1.17 -r 1.18 src/common/socket.c; ) > 1.0.4cvs4.patchset
 ( cvs diff -u -r 1.78 -r 1.79 src/account.c; cvs diff -u -r 1.482 -r 1.483 src/compose.c; cvs diff -u -r 1.72 -r 1.73 src/filtering.c; cvs diff -u -r 1.179 -r 1.180 src/inc.c; cvs diff -u -r 1.124 -r 1.125 src/prefs_account.c; cvs diff -u -r 1.57 -r 1.58 src/prefs_account.h; ) > 1.0.4cvs5.patchset
 ( cvs diff -u -r 1.88 -r 1.89 src/mh.c; ) > 1.0.4cvs3.patchset
 ( cvs diff -u -r 1.460 -r 1.461 ChangeLog; cvs diff -u -r 1.455 -r 1.456 ChangeLog.jp; cvs diff -u -r 1.20 -r 1.21 src/send_message.c; cvs diff -u -r 1.17 -r 1.18 src/common/socket.c; ) > 1.0.4cvs4.patchset
 ( cvs diff -u -r 1.78 -r 1.79 src/account.c; cvs diff -u -r 1.482 -r 1.483 src/compose.c; cvs diff -u -r 1.72 -r 1.73 src/filtering.c; cvs diff -u -r 1.179 -r 1.180 src/inc.c; cvs diff -u -r 1.124 -r 1.125 src/prefs_account.c; cvs diff -u -r 1.57 -r 1.58 src/prefs_account.h; ) > 1.0.4cvs5.patchset

+( cvs diff -u -r 1.65 -r 1.66 src/prefs_filtering.c; ) > 1.0.4cvs6.patchset

diff --git a/configure.ac b/configure.ac
index 2a19f998e48612b9f668b4aa0c146d17c9f7d6cc..c770c0e6d581a5d8f416f96afb36902312f3dcc5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=5
+EXTRA_VERSION=6

 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index 79d333002741399e22e3853eac7f3541080f6eef..499dc0239bc0b12e3c5ab1f1d0c8138835b683c0 100644 (file)
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -995,16 +995,18 @@ static void prefs_filtering_ok(void)
                        if (strcmp(filtering_str, str) == 0) break;
                        row++;
                }
                        if (strcmp(filtering_str, str) == 0) break;
                        row++;
                }

-               if (strcmp(filtering_str, str) != 0) {
+               if (!filtering_str || strcmp(filtering_str, str) != 0) {

                        val = alertpanel(_("Entry not saved"),
                                 _("The entry was not saved. Close anyway?"),
                                 _("Yes"), _("No"), NULL);
                        if (G_ALERTDEFAULT != val) {
                                g_free(str);
                        val = alertpanel(_("Entry not saved"),
                                 _("The entry was not saved. Close anyway?"),
                                 _("Yes"), _("No"), NULL);
                        if (G_ALERTDEFAULT != val) {
                                g_free(str);

+                               filteringprop_free(prop);

                                return;
                        }
                }
                g_free(str);
                                return;
                        }
                }
                g_free(str);

+               filteringprop_free(prop);

        }
        prefs_filtering_set_list();
        prefs_matcher_write_config();
        }
        prefs_filtering_set_list();
        prefs_matcher_write_config();