talons

commit f9259e9578b3f7cfdf66f119d2df744a39b0da3c
parent 778610555ad276b2571db46ce6cc03db3732ad56
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 25 Aug 2010 06:26:53 +0000

2010-08-25 [colin]	3.7.6cvs30

	* src/main.c
		Fix bug #2241, "Empty trash on exit fails on scripted exit"

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/main.c
 | 
3
+++

4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-25 [colin]	3.7.6cvs30
+
+	* src/main.c
+		Fix bug #2241, "Empty trash on exit fails on scripted exit"
+
 2010-08-23 [pawel]	3.7.6cvs29
 
 	* src/inc.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4025,3 +4025,4 @@
 ( cvs diff -u -r 1.115.2.226 -r 1.115.2.227 src/main.c;  ) > 3.7.6cvs27.patchset
 ( cvs diff -u -r 1.115.2.227 -r 1.115.2.228 src/main.c;  ) > 3.7.6cvs28.patchset
 ( cvs diff -u -r 1.149.2.100 -r 1.149.2.101 src/inc.c;  cvs diff -u -r 1.17.2.56 -r 1.17.2.57 src/send_message.c;  cvs diff -u -r 1.5.2.26 -r 1.5.2.27 src/statusbar.c;  cvs diff -u -r 1.43.2.116 -r 1.43.2.117 src/toolbar.c;  ) > 3.7.6cvs29.patchset
+( cvs diff -u -r 1.115.2.228 -r 1.115.2.229 src/main.c;  ) > 3.7.6cvs30.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=29
+EXTRA_VERSION=30
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/main.c b/src/main.c
@@ -2386,6 +2386,9 @@ static void lock_socket_input_cb(gpointer data,
 		const gchar *target = buf+7;
 		mainwindow_jump_to(target, TRUE);
 	} else if (!strncmp(buf, "exit", 4)) {
+		if (prefs_common.clean_on_exit && !prefs_common.ask_on_clean) {
+			procmsg_empty_all_trash();
+                }
 		app_will_exit(NULL, mainwin);
 	}