talons

commit e6df950fe72f525ffd5f1836f4a6c290349a65fb
parent 244f493ae4962e5851809c3049da2886caaa619c
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 14 Mar 2008 07:40:12 +0000

2008-03-14 [colin]	3.3.1cvs24

	* src/prefs_filtering_action.c
		Fix buglet on setting recipient when
		reediting forward rules.

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/prefs_filtering_action.c
 | 
9
++++-----

4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-14 [colin]	3.3.1cvs24
+
+	* src/prefs_filtering_action.c
+		Fix buglet on setting recipient when
+		reediting forward rules.
+
 2008-03-12 [colin]	3.3.1cvs23
 
 	* src/summaryview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3258,3 +3258,4 @@
 ( cvs diff -u -r 1.213.2.178 -r 1.213.2.179 src/folder.c;  cvs diff -u -r 1.87.2.56 -r 1.87.2.57 src/folder.h;  cvs diff -u -r 1.274.2.236 -r 1.274.2.237 src/mainwindow.c;  cvs diff -u -r 1.150.2.107 -r 1.150.2.108 src/procmsg.c;  cvs diff -u -r 1.395.2.358 -r 1.395.2.359 src/summaryview.c;  cvs diff -u -r 1.14.2.60 -r 1.14.2.61 src/plugins/trayicon/trayicon.c;  ) > 3.3.1cvs21.patchset
 ( cvs diff -u -r 1.207.2.198 -r 1.207.2.199 src/folderview.c;  cvs diff -u -r 1.395.2.359 -r 1.395.2.360 src/summaryview.c;  ) > 3.3.1cvs22.patchset
 ( cvs diff -u -r 1.395.2.360 -r 1.395.2.361 src/summaryview.c;  cvs diff -u -r 1.14.2.61 -r 1.14.2.62 src/plugins/trayicon/trayicon.c;  ) > 3.3.1cvs23.patchset
+( cvs diff -u -r 1.1.4.49 -r 1.1.4.50 src/prefs_filtering_action.c;  ) > 3.3.1cvs24.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=23
+EXTRA_VERSION=24
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
@@ -1488,11 +1488,6 @@ static gboolean prefs_filtering_actions_selected
         action = action_list->data;
         g_slist_free(action_list);
 
-	if (action->destination)
-		gtk_entry_set_text(GTK_ENTRY(filtering_action.dest_entry), action->destination);
-	else
-		gtk_entry_set_text(GTK_ENTRY(filtering_action.dest_entry), "");
-
 	switch(action->type) {
 	case MATCHACTION_MOVE:
 		combobox_select_by_data(GTK_COMBO_BOX(filtering_action.action_combo),
@@ -1605,6 +1600,10 @@ static gboolean prefs_filtering_actions_selected
 		combobox_select_by_data(GTK_COMBO_BOX(filtering_action.action_combo),
 				     ACTION_ADD_TO_ADDRESSBOOK);
 	}
+	if (action->destination)
+		gtk_entry_set_text(GTK_ENTRY(filtering_action.dest_entry), action->destination);
+	else
+		gtk_entry_set_text(GTK_ENTRY(filtering_action.dest_entry), "");
 
 	filteringaction_free(action); /* XXX: memleak */
 	return TRUE;