2007-07-23 [colin] 2.10.0cvs54

	* src/statusbar.c
		Maemo: Fix sticking statusbars

diff --git a/ChangeLog b/ChangeLog
index d612a6fad172ba17a43a55abb991e253491d30a3..9568f35b522e647435a04118e422d853e2937457 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-23 [colin]     2.10.0cvs54
+
+       * src/statusbar.c
+               Maemo: Fix sticking statusbars
+

 2007-07-22 [colin]     2.10.0cvs53
 
        * src/main.c
 2007-07-22 [colin]     2.10.0cvs53
 
        * src/main.c

diff --git a/PATCHSETS b/PATCHSETS
index 846c12c6219316c3e36f1c281b716c12996c3fc5..71fa318ccbda3acc3432970f2d958f61efb5c8d5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2707,3 +2707,4 @@
 ( cvs diff -u -r 1.213.2.150 -r 1.213.2.151 src/folder.c;  cvs diff -u -r 1.87.2.44 -r 1.87.2.45 src/folder.h;  cvs diff -u -r 1.2.2.21 -r 1.2.2.22 src/folder_item_prefs.c;  cvs diff -u -r 1.2.2.10 -r 1.2.2.11 src/folder_item_prefs.h;  cvs diff -u -r 1.207.2.168 -r 1.207.2.169 src/folderview.c;  cvs diff -u -r 1.179.2.176 -r 1.179.2.177 src/imap.c;  cvs diff -u -r 1.1.2.47 -r 1.1.2.48 src/imap_gtk.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/imap_gtk.h;  cvs diff -u -r 1.101.2.39 -r 1.101.2.40 src/news.c;  cvs diff -u -r 1.2.2.23 -r 1.2.2.24 src/news_gtk.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/news_gtk.h;  cvs diff -u -r 1.52.2.41 -r 1.52.2.42 src/prefs_folder_item.c;  cvs diff -u -r 1.43.2.77 -r 1.43.2.78 src/toolbar.c;  cvs diff -u -r 1.19.2.20 -r 1.19.2.21 src/toolbar.h;  cvs diff -u -r 1.12.2.22 -r 1.12.2.23 src/plugins/dillo_viewer/dillo_viewer.c;  ) > 2.10.0cvs51.patchset
 ( cvs diff -u -r 1.2.2.24 -r 1.2.2.25 src/news_gtk.c;  ) > 2.10.0cvs52.patchset
 ( cvs diff -u -r 1.115.2.160 -r 1.115.2.161 src/main.c;  ) > 2.10.0cvs53.patchset
 ( cvs diff -u -r 1.213.2.150 -r 1.213.2.151 src/folder.c;  cvs diff -u -r 1.87.2.44 -r 1.87.2.45 src/folder.h;  cvs diff -u -r 1.2.2.21 -r 1.2.2.22 src/folder_item_prefs.c;  cvs diff -u -r 1.2.2.10 -r 1.2.2.11 src/folder_item_prefs.h;  cvs diff -u -r 1.207.2.168 -r 1.207.2.169 src/folderview.c;  cvs diff -u -r 1.179.2.176 -r 1.179.2.177 src/imap.c;  cvs diff -u -r 1.1.2.47 -r 1.1.2.48 src/imap_gtk.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/imap_gtk.h;  cvs diff -u -r 1.101.2.39 -r 1.101.2.40 src/news.c;  cvs diff -u -r 1.2.2.23 -r 1.2.2.24 src/news_gtk.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/news_gtk.h;  cvs diff -u -r 1.52.2.41 -r 1.52.2.42 src/prefs_folder_item.c;  cvs diff -u -r 1.43.2.77 -r 1.43.2.78 src/toolbar.c;  cvs diff -u -r 1.19.2.20 -r 1.19.2.21 src/toolbar.h;  cvs diff -u -r 1.12.2.22 -r 1.12.2.23 src/plugins/dillo_viewer/dillo_viewer.c;  ) > 2.10.0cvs51.patchset
 ( cvs diff -u -r 1.2.2.24 -r 1.2.2.25 src/news_gtk.c;  ) > 2.10.0cvs52.patchset
 ( cvs diff -u -r 1.115.2.160 -r 1.115.2.161 src/main.c;  ) > 2.10.0cvs53.patchset

+( cvs diff -u -r 1.5.2.18 -r 1.5.2.19 src/statusbar.c;  ) > 2.10.0cvs54.patchset

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

-EXTRA_VERSION=53
+EXTRA_VERSION=54

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/statusbar.c b/src/statusbar.c
index 365a073fe3a90e837c8db1600b12c8cffb741895..2a0f89bc6a7d8a7e9a91e949608ae0672ed7cde7 100644 (file)
--- a/src/statusbar.c
+++ b/src/statusbar.c
@@ -127,6 +127,12 @@ void statusbar_print_all(const gchar *format, ...)
                statusbar_puts(GTK_STATUSBAR(cur->data), buf);
 #ifdef MAEMO
        if (mainwindow_get_mainwindow()) {
                statusbar_puts(GTK_STATUSBAR(cur->data), buf);
 #ifdef MAEMO
        if (mainwindow_get_mainwindow()) {

+               if (banner != NULL) {
+                       gchar *last_text = (gchar *)banner_texts->data;
+                       if (!strcmp2(last_text, buf))
+                               return;
+               }
+               statusbar_pop_all();

                if (banner == NULL) {
                        banner = hildon_banner_show_animation(
                                mainwindow_get_mainwindow()->window,
                if (banner == NULL) {
                        banner = hildon_banner_show_animation(
                                mainwindow_get_mainwindow()->window,