2007-10-09 [paul] 3.0.2cvs42

	* src/prefs_toolbar.c
		fix icon selector window on maemo

diff --git a/ChangeLog b/ChangeLog
index 5021add1ddafbd05cab9a0574826f3d76ad13c92..b3884aae0406e412225139a03c8e20194ed92c60 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-09 [paul]      3.0.2cvs42
+
+       * src/prefs_toolbar.c
+               fix icon selector window on maemo
+
 2007-10-09 [paul]      3.0.2cvs41
 
        * src/messageview.c

diff --git a/PATCHSETS b/PATCHSETS
index 9a53cfda58c08f673bd83380c03142dbb939bedc..d60fe64250511f1dd358936e8b9d77dd4d0c5f11 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2954,3 +2954,4 @@
 ( cvs diff -u -r 1.60.2.100 -r 1.60.2.101 src/addressbook.c;  cvs diff -u -r 1.13.2.13 -r 1.13.2.14 src/addritem.c;  cvs diff -u -r 1.12.2.11 -r 1.12.2.12 src/addritem.h;  cvs diff -u -r 1.14.2.29 -r 1.14.2.30 src/editaddress.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/editaddress_other_attributes_ldap.h;  cvs diff -u -r 1.22.2.17 -r 1.22.2.18 src/addrbook.c;  cvs diff -u -r 1.155.2.77 -r 1.155.2.78 src/Makefile.am;  ) > 3.0.2cvs39.patchset
 ( cvs diff -u -r 1.9.2.42 -r 1.9.2.43 src/common/defs.h;  ) > 3.0.2cvs40.patchset
 ( cvs diff -u -r 1.94.2.154 -r 1.94.2.155 src/messageview.c;  ) > 3.0.2cvs41.patchset
+( cvs diff -u -r 1.30.2.44 -r 1.30.2.45 src/prefs_toolbar.c;  ) > 3.0.2cvs42.patchset

diff --git a/configure.ac b/configure.ac
index 62b12b7a4ac5deb0e814c08bcfcbdc3efe032c85..eb01455b9e0a91b7241e2112d6511f5ef68b0e29 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=41
+EXTRA_VERSION=42
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index 0389737c4b4847619a315d5613dd3ac9bb8b4661..e203f05ca4b58eca5375ca94edd0de787e3a83f4 100644 (file)
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -1414,7 +1414,9 @@ static void icon_chooser_create(GtkButton *button, ToolbarPage *prefs_toolbar)
        
        icon_chooser_win = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_toolbar");
        gtk_window_set_title(GTK_WINDOW(icon_chooser_win), _("Toolbar item icon"));
+#ifndef MAEMO
        gtk_window_set_decorated(GTK_WINDOW(icon_chooser_win), FALSE);
+#endif
        gdk_window_get_origin(GTK_WIDGET(prefs_toolbar->icon_button)->window, 
                        &x, &y);
        x += GTK_WIDGET(prefs_toolbar->icon_button)->allocation.x;