2007-09-05 [colin] 3.0.0cvs8

	* src/inc.c
		Fix statusbar/window mismatch on Maemo

diff --git a/ChangeLog b/ChangeLog
index 1ffd47de7bbacd34ef7e8d407b485c264eeca106..1b74f3a6a759dad71b76cead2314a9e4c731457e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-05 [colin]     3.0.0cvs8
+
+       * src/inc.c
+               Fix statusbar/window mismatch on Maemo
+

 2007-09-05 [colin]     3.0.0cvs7
 
        * src/ldaputil.c
 2007-09-05 [colin]     3.0.0cvs7
 
        * src/ldaputil.c

diff --git a/PATCHSETS b/PATCHSETS
index 9561ce46364ab0809c70f53f6e665d5ce621b6c7..7eeee02d196c02a825f171079586c3c95a114af1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2853,3 +2853,4 @@
 ( cvs diff -u -r 1.61.2.67 -r 1.61.2.68 src/account.c;  ) > 3.0.0cvs5.patchset
 ( cvs diff -u -r 1.213.2.158 -r 1.213.2.159 src/folder.c;  cvs diff -u -r 1.179.2.186 -r 1.179.2.187 src/imap.c;  cvs diff -u -r 1.149.2.80 -r 1.149.2.81 src/inc.c;  cvs diff -u -r 1.28.2.37 -r 1.28.2.38 src/mbox.c;  cvs diff -u -r 1.17.2.43 -r 1.17.2.44 src/send_message.c;  cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/statusbar.c;  cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/statusbar.h;  ) > 3.0.0cvs6.patchset
 ( cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/ldaputil.c;  ) > 3.0.0cvs7.patchset
 ( cvs diff -u -r 1.61.2.67 -r 1.61.2.68 src/account.c;  ) > 3.0.0cvs5.patchset
 ( cvs diff -u -r 1.213.2.158 -r 1.213.2.159 src/folder.c;  cvs diff -u -r 1.179.2.186 -r 1.179.2.187 src/imap.c;  cvs diff -u -r 1.149.2.80 -r 1.149.2.81 src/inc.c;  cvs diff -u -r 1.28.2.37 -r 1.28.2.38 src/mbox.c;  cvs diff -u -r 1.17.2.43 -r 1.17.2.44 src/send_message.c;  cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/statusbar.c;  cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/statusbar.h;  ) > 3.0.0cvs6.patchset
 ( cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/ldaputil.c;  ) > 3.0.0cvs7.patchset

+( cvs diff -u -r 1.149.2.81 -r 1.149.2.82 src/inc.c;  ) > 3.0.0cvs8.patchset

diff --git a/configure.ac b/configure.ac
index 86e3c0cf3d48840f21a7b33a553274b45b25ec82..fbbf03d3f42f3aafd90b8183cb252c380cf4ea0d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=7
+EXTRA_VERSION=8

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/inc.c b/src/inc.c
index 2a43e294fae805a98e2f67279dd59a7328eea172..02258f77de06c43a10107f91d38a72b6af8dcc53 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -873,7 +873,7 @@ static IncState inc_pop3_session_do(IncSession *session)
        }
 
        session_disconnect(SESSION(pop3_session));
        }
 
        session_disconnect(SESSION(pop3_session));

-       statuswindow_pop_all();
+       statusbar_pop_all();

 
        return session->inc_state;
 }
 
        return session->inc_state;
 }


@@ -902,7 +902,7 @@ static void inc_progress_dialog_set_label(IncProgressDialog *inc_dialog,
        case POP3_GETAUTH_PASS:
        case POP3_GETAUTH_APOP:
                progress_dialog_set_label(dialog, _("Authenticating..."));
        case POP3_GETAUTH_PASS:
        case POP3_GETAUTH_APOP:
                progress_dialog_set_label(dialog, _("Authenticating..."));

-               statusbar_pop_all();
+               statuswindow_pop_all();

                statusbar_print_all(_("Retrieving messages from %s (%s) ..."),
                                    SESSION(session)->server,
                                    session->ac_prefs->account_name);
                statusbar_print_all(_("Retrieving messages from %s (%s) ..."),
                                    SESSION(session)->server,
                                    session->ac_prefs->account_name);