From bfaf9aff112072d06fdccacf15da4fff58d88652 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Sat, 9 Sep 2006 18:27:48 +0000 Subject: [PATCH] 2006-09-09 [wwp] 2.4.0cvs168 * src/prefs_filtering.c better place for this fix. --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/prefs_filtering.c | 5 +++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1433f1c1..fbc1518c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-09-09 [wwp] 2.4.0cvs168 + + * src/prefs_filtering.c + better place for this fix. + 2006-09-09 [wwp] 2.4.0cvs167 * src/prefs_filtering.c diff --git a/PATCHSETS b/PATCHSETS index c0dfba2a5..056715e94 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1859,3 +1859,4 @@ ( cvs diff -u -r 1.59.2.45 -r 1.59.2.46 src/prefs_filtering.c; ) > 2.4.0cvs165.patchset ( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 manual/glossary.xml; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/gpl.xml; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 manual/plugins.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/es/ack.xml; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/es/advanced.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/es/faq.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/es/glossary.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/es/gpl.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/es/handling.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/es/plugins.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/es/starting.xml; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/fr/ack.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/pl/ack.xml; cvs diff -u -r 1.60.2.33 -r 1.60.2.34 po/es.po; ) > 2.4.0cvs166.patchset ( cvs diff -u -r 1.59.2.46 -r 1.59.2.47 src/prefs_filtering.c; ) > 2.4.0cvs167.patchset +( cvs diff -u -r 1.59.2.47 -r 1.59.2.48 src/prefs_filtering.c; ) > 2.4.0cvs168.patchset diff --git a/configure.ac b/configure.ac index 7ad63bd9a..96f55ff4a 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=4 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=167 +EXTRA_VERSION=168 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c index 9b1769f65..7179dd27c 100644 --- a/src/prefs_filtering.c +++ b/src/prefs_filtering.c @@ -1061,6 +1061,9 @@ static void prefs_filtering_substitute_cb(void) prop = prefs_filtering_dialog_to_filtering(TRUE); + if (prop == NULL) + return; + /* prop->emabled is always TRUE here, re-use the value from the selected row as we don't substitute this value from dialog */ prefs_filtering_list_view_get_rule_info( @@ -1068,8 +1071,6 @@ static void prefs_filtering_substitute_cb(void) &enabled, &name, &account_id); prop->enabled = enabled; - if (prop == NULL) - return; prefs_filtering_list_view_set_row(selected_row, prop); filteringprop_free(prop); -- 2.25.1