From: Thorsten Maerz <torte@netztorte.de>
Date: Sun, 7 Dec 2003 10:56:28 +0000 (+0000)
Subject: uninitialized filter list when deleting a folder; debug_print some warning if destfol... 
X-Git-Tag: rel_0_9_8~31
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=ba1aea9aaf87bc0cfd62af055add5b8728dfefc8

uninitialized filter list when deleting a folder; debug_print some warning if destfolder missing
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index f0330130f..98486f265 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2003-12-07 [thorsten]	0.9.7claws29
+
+	* src/filtering.c
+		debug_print some warning if destfolder missing
+	* src/prefs_filtering.c
+		uninitialized filter list when deleting a folder
+
 2003-12-06 [paul]	0.9.7claws28
 
 	* src/procheader.c
diff --git a/configure.ac b/configure.ac
index f7c79da00..10f146658 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=29
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
diff --git a/src/filtering.c b/src/filtering.c
index 40290ad63..bac28cedd 100644
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -173,8 +173,11 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info)
 	case MATCHACTION_MOVE:
 		dest_folder =
 			folder_find_item_from_identifier(action->destination);
-		if (!dest_folder)
+		if (!dest_folder) {
+			debug_print("*** folder not found '%s'\n",
+				action->destination ?action->destination :"");
 			return FALSE;
+		}
 		
 		if (folder_item_move_msg(dest_folder, info) == -1) {
 			debug_print("*** could not move message\n");
@@ -187,8 +190,11 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info)
 		dest_folder =
 			folder_find_item_from_identifier(action->destination);
 
-		if (!dest_folder)
+		if (!dest_folder) {
+			debug_print("*** folder not found '%s'\n",
+				action->destination ?action->destination :"");
 			return FALSE;
+		}
 
 		if (folder_item_copy_msg(dest_folder, info) == -1)
 			return FALSE;
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index 46e757f9f..9a9225085 100644
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -64,6 +64,8 @@ static struct Filtering {
 	GtkWidget *cond_clist;
 } filtering;
 
+static GSList ** p_processing_list = NULL;
+
 /* widget creating functions */
 static void prefs_filtering_create		(void);
 
@@ -101,7 +103,7 @@ static void prefs_filtering_reset_dialog	(void);
 static gboolean prefs_filtering_rename_path_func(GNode *node, gpointer data);
 static gboolean prefs_filtering_delete_path_func(GNode *node, gpointer data);
 
-static GSList ** p_processing_list = NULL;
+static void delete_path(GSList ** p_filters, const gchar * path);
 
 void prefs_filtering_open(GSList ** p_processing,
 			  const gchar * title,
@@ -496,8 +498,6 @@ static gboolean prefs_filtering_rename_path_func(GNode *node, gpointer data)
 	return FALSE;
 }
 
-static void delete_path(GSList ** p_filters, const gchar * path);
-
 void prefs_filtering_delete_path(const gchar *path)
 {
 	GList * cur;
@@ -526,6 +526,7 @@ static void delete_path(GSList ** p_filters, const gchar * path)
         GSList * action_cur;
 	GSList * cur;
         
+	filters = *p_filters;
 	pathlen = strlen(path);
 	duplist = g_slist_copy(filters);
 	for (cur = duplist ; cur != NULL; cur = g_slist_next(cur)) {