2006-07-12 [paul] 2.3.1cvs81

	* AUTHORS
	* src/mainwindow.c
	* src/gtk/authors.h
		check online state before resetting
		mailcheck timer. Useful if some program
		verifies connection state and updates
		Claws.
		Patch by  Leonid Evdokimov <darkk@users.sf.net>

diff --git a/AUTHORS b/AUTHORS
index f076a3dc56bbfc25c168d99475dd078d8aa53810..fb6942e45b3bbf676d4958a302efef24c5bc005a 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -230,4 +230,5 @@ contributors (in addition to the above; based on Changelog)
        Joshua M. Kwan
        Ralgh Young
        Alexey Illarionov
        Joshua M. Kwan
        Ralgh Young
        Alexey Illarionov

+       Leonid Evdokimov

 
 

diff --git a/ChangeLog b/ChangeLog
index 10383c9900e81b05c9633c30b8adbda57582bb6f..e38a1ed43c87d47b055d809d4321846cd87a2c1e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-07-12 [paul]      2.3.1cvs81
+
+       * AUTHORS
+       * src/mainwindow.c
+       * src/gtk/authors.h
+               check online state before resetting
+               mailcheck timer. Useful if some program
+               verifies connection state and updates
+               Claws.
+               Patch by  Leonid Evdokimov <darkk@users.sf.net>
+

 2006-07-12 [paul]      2.3.1cvs80
 
        * sylpheed-claws-128x128.png
 2006-07-12 [paul]      2.3.1cvs80
 
        * sylpheed-claws-128x128.png

diff --git a/PATCHSETS b/PATCHSETS
index 7a23453e05ec3742173ec833db707acd4201aaf1..9d336e371a73e2d62a876484df2d471942165ec4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1681,3 +1681,4 @@
 ( cvs diff -u -r 1.96.2.126 -r 1.96.2.127 src/textview.c;  ) > 2.3.1cvs78.patchset
 ( cvs diff -u -r 1.115.2.95 -r 1.115.2.96 src/main.c;  ) > 2.3.1cvs79.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 sylpheed-claws-128x128.png;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 sylpheed-claws-64x64.png;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 sylpheed-claws.png;  cvs diff -u -r 1.155.2.38 -r 1.155.2.39 src/Makefile.am;  cvs diff -u -r 1.115.2.96 -r 1.115.2.97 src/main.c;  cvs diff -u -r 1.30.2.27 -r 1.30.2.28 src/prefs_toolbar.c;  cvs diff -u -r 1.25.2.23 -r 1.25.2.24 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.16 -r 1.18.2.17 src/stock_pixmap.h;  cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/wizard.c;  cvs diff -u -r 1.4.2.33 -r 1.4.2.34 src/gtk/about.c;  cvs diff -u -r 1.5.2.34 -r 1.5.2.35 src/gtk/gtkutils.c;  diff -u /dev/null src/pixmaps/sylpheed-claws.xpm;  diff -u /dev/null src/pixmaps/sylpheed-claws_icon.xpm;  diff -u /dev/null src/pixmaps/sylpheed-claws_logo.xpm;  cvs diff -u -r -1.1 -r -1.2 src/pixmaps/sylpheed.xpm;  cvs diff -u -r -1.1.2.2 -r -1.1.2.3 src/pixmaps/sylpheed_icon.xpm;  cvs diff -u -r -1.1.14.2 -r -1.1.14.3 src/pixmaps/sylpheed_logo.xpm;  ) > 2.3.1cvs80.patchset
 ( cvs diff -u -r 1.96.2.126 -r 1.96.2.127 src/textview.c;  ) > 2.3.1cvs78.patchset
 ( cvs diff -u -r 1.115.2.95 -r 1.115.2.96 src/main.c;  ) > 2.3.1cvs79.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 sylpheed-claws-128x128.png;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 sylpheed-claws-64x64.png;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 sylpheed-claws.png;  cvs diff -u -r 1.155.2.38 -r 1.155.2.39 src/Makefile.am;  cvs diff -u -r 1.115.2.96 -r 1.115.2.97 src/main.c;  cvs diff -u -r 1.30.2.27 -r 1.30.2.28 src/prefs_toolbar.c;  cvs diff -u -r 1.25.2.23 -r 1.25.2.24 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.16 -r 1.18.2.17 src/stock_pixmap.h;  cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/wizard.c;  cvs diff -u -r 1.4.2.33 -r 1.4.2.34 src/gtk/about.c;  cvs diff -u -r 1.5.2.34 -r 1.5.2.35 src/gtk/gtkutils.c;  diff -u /dev/null src/pixmaps/sylpheed-claws.xpm;  diff -u /dev/null src/pixmaps/sylpheed-claws_icon.xpm;  diff -u /dev/null src/pixmaps/sylpheed-claws_logo.xpm;  cvs diff -u -r -1.1 -r -1.2 src/pixmaps/sylpheed.xpm;  cvs diff -u -r -1.1.2.2 -r -1.1.2.3 src/pixmaps/sylpheed_icon.xpm;  cvs diff -u -r -1.1.14.2 -r -1.1.14.3 src/pixmaps/sylpheed_logo.xpm;  ) > 2.3.1cvs80.patchset

+( cvs diff -u -r 1.100.2.39 -r 1.100.2.40 AUTHORS;  cvs diff -u -r 1.274.2.124 -r 1.274.2.125 src/mainwindow.c;  cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/gtk/authors.h;  ) > 2.3.1cvs81.patchset

diff --git a/configure.ac b/configure.ac
index 4ba3c0e516f5d681b3ae92d304fc3a68840733de..d7f6aa650ce0eaddab0d09486bfc44595b8d4105 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=80
+EXTRA_VERSION=81

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index bb09b8074771693d4782ae4f4aacafec25287442..19ac8b4cd697358b6b855e14ea77e145756a0392 100644 (file)
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -101,6 +101,7 @@ static char *CONTRIBS_LIST[] = {
 "Stefaan Eeckels",
 "Willem van Engen",
 "Paul Evans",
 "Stefaan Eeckels",
 "Willem van Engen",
 "Paul Evans",

+"Leonid Evdokimov",

 "Xavier FACQ",
 "Bob Forsman",
 "Matthias Förste",
 "Xavier FACQ",
 "Bob Forsman",
 "Matthias Förste",

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 2b5a47a50bcc2ba536d58b6767ac824647c01606..b9b28ff831551a7051765759da0402023129fa51 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -3137,6 +3137,8 @@ static void online_switch_clicked (GtkButton *btn, gpointer data)
        
        if (btn == GTK_BUTTON(mainwin->online_switch)) {
                /* go offline */
        
        if (btn == GTK_BUTTON(mainwin->online_switch)) {
                /* go offline */

+               if (prefs_common.work_offline)
+                       return;

                mainwindow_check_synchronise(mainwin, TRUE);
                gtk_widget_hide (mainwin->online_switch);
                gtk_widget_show (mainwin->offline_switch);
                mainwindow_check_synchronise(mainwin, TRUE);
                gtk_widget_hide (mainwin->online_switch);
                gtk_widget_show (mainwin->offline_switch);


@@ -3146,6 +3148,8 @@ static void online_switch_clicked (GtkButton *btn, gpointer data)
                imap_disconnect_all();
        } else {
                /*go online */
                imap_disconnect_all();
        } else {
                /*go online */

+               if (!prefs_common.work_offline)
+                       return;

                gtk_widget_hide (mainwin->offline_switch);
                gtk_widget_show (mainwin->online_switch);
                menuitem->active = FALSE;
                gtk_widget_hide (mainwin->offline_switch);
                gtk_widget_show (mainwin->online_switch);
                menuitem->active = FALSE;