2008-04-22 [colin] 3.4.0cvs6
authorColin Leroy <colin@colino.net>
Tue, 22 Apr 2008 06:59:20 +0000 (06:59 +0000)
committerColin Leroy <colin@colino.net>
Tue, 22 Apr 2008 06:59:20 +0000 (06:59 +0000)
* src/inc.c
Fix missing inc_unlock()
* src/prefs_matcher.c
* src/send_message.c
Fix my last commit

ChangeLog
PATCHSETS
configure.ac
src/inc.c
src/prefs_matcher.c
src/send_message.c

index 8268ecf39d21f1fa6a64df69b7031e5d8f5ca703..7d946cb0de575c51ce5646d2d091a39beb431e9f 100644 (file)
--- 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
index 1ec4f8d01385a5ca126f7aa3da2dc65e3c317ad2..713e0a1d47287ad39bf6a0e4c33542f1179bd614 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 6bd965c6505bd7424b942636be6d1e3ed52cde57..9898b1cf3df52b6fe9cef328733f3ba146a70ef7 100644 (file)
@@ -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=
 
index 2205c429b70e7227f9940c6b0049ff3cd883984d..846fcb30c9d22b8ec8b374051003d3a3e8a263f8 100644 (file)
--- 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;
index 1737f7edb5f288fda9b0250992a2dcd8fdf62e93..017872dde85f1c5a67dff96fdc379563605508e3 100644 (file)
@@ -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();
 }
 
 /*!
index 93f0dc5a9ea92b81a7bbb596be40780cf840b29a..96ef37af65962bea2b5043f87c44edd3e05c755c 100644 (file)
@@ -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;