talons

commit 4ebd2f6f38698522947d2ac3dfb741bacbf4a166
parent e2770d273b65df12f1686082eedf75ca20646f80
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 22 Apr 2008 06:59:20 +0000

2008-04-22 [colin]	3.4.0cvs6

	* src/inc.c
		Fix missing inc_unlock()
	* src/prefs_matcher.c
	* src/send_message.c
		Fix my last commit

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/inc.c
 | 
3
++-
M
src/prefs_matcher.c
 | 
2
+-
M
src/send_message.c
 | 
2
+-

6 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-22 [colin]	3.4.0cvs6
+
+	* src/inc.c
+		Fix missing inc_unlock()
+	* src/prefs_matcher.c
+	* src/send_message.c
+		Fix my last commit
+
 2008-04-22 [colin]	3.4.0cvs5
 
 	* src/etpan/imap-thread.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3301,3 +3301,4 @@
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_newmail.offline.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_newmail.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_newmarkedmail.offline.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_newmarkedmail.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_nomail.offline.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_nomail.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_unreadmail.offline.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_unreadmail.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_unreadmarkedmail.offline.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_unreadmarkedmail.xpm;  ) > 3.4.0cvs3.patchset
 ( cvs diff -u -r 1.149.2.87 -r 1.149.2.88 src/inc.c;  cvs diff -u -r 1.204.2.164 -r 1.204.2.165 src/prefs_common.c;  cvs diff -u -r 1.17.2.45 -r 1.17.2.46 src/send_message.c;  ) > 3.4.0cvs4.patchset
 ( cvs diff -u -r 1.1.4.99 -r 1.1.4.100 src/etpan/imap-thread.c;  ) > 3.4.0cvs5.patchset
+( cvs diff -u -r 1.149.2.88 -r 1.149.2.89 src/inc.c;  cvs diff -u -r 1.43.2.70 -r 1.43.2.71 src/prefs_matcher.c;  cvs diff -u -r 1.17.2.46 -r 1.17.2.47 src/send_message.c;  ) > 3.4.0cvs6.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=5
+EXTRA_VERSION=6
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/inc.c b/src/inc.c
@@ -205,6 +205,7 @@ void inc_mail(MainWindow *mainwin, gboolean notify)
 		if (execute_command_line(prefs_common.extinc_cmd, FALSE) < 0) {
 			main_window_unlock(mainwin);
 			inc_autocheck_timer_set();
+			inc_unlock();
 			return;
 		}
 	} else {
@@ -1213,7 +1214,7 @@ static void inc_put_error(IncState istate, Pop3Session *session)
 		break;
 	case INC_TIMEOUT:
 		log_msg = _("Session timed out. You may be able to "
-			    "recover by increasing the timeout value in 
+			    "recover by increasing the timeout value in "
 			    "Preferences/Other.");
 		if (prefs_common.no_recv_err_panel)
 			break;
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
@@ -1951,11 +1951,11 @@ static void prefs_matcher_ok(void)
 		}
                 g_free(str);
 		gtk_widget_hide(matcher.window);
-		inc_unlock();
 		if (matchers_callback != NULL)
 			matchers_callback(matchers);
 		matcherlist_free(matchers);
 	}
+	inc_unlock();
 }
 
 /*!
diff --git a/src/send_message.c b/src/send_message.c
@@ -650,7 +650,7 @@ static void send_put_error(Session *session)
 			break;
 		case SESSION_TIMEOUT:
 			log_msg = _("Session timed out. You may be able to "
-				    "recover by increasing the timeout value in 
+				    "recover by increasing the timeout value in "
 				    "Preferences/Other.");
 			err_msg = g_strdup(log_msg);
 			break;