2007-07-14 [paul] 2.10.0cvs20

	* src/toolbar.c
		make homogeneous FALSE always

diff --git a/ChangeLog b/ChangeLog
index deb1a650b6d15cc53c5b2675016a6f11873036e4..37ecaedb7abcd24beeccb279d74c6665e782c9bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-14 [paul]      2.10.0cvs20
+
+       * src/toolbar.c
+               make homogeneous FALSE always
+

 2007-07-13 [colin]     2.10.0cvs19
 
        * src/toolbar.c
 2007-07-13 [colin]     2.10.0cvs19
 
        * src/toolbar.c

diff --git a/PATCHSETS b/PATCHSETS
index c5bcc2ed020d5afe5c75a31f970479a6f9ba1ec8..f33eab14b1c2e5d515e09b90ee634f8f82dcfed3 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2673,3 +2673,4 @@
 ( cvs diff -u -r 1.395.2.309 -r 1.395.2.310 src/summaryview.c;  ) > 2.10.0cvs17.patchset
 ( cvs diff -u -r 1.2.2.20 -r 1.2.2.21 src/gtk/colorlabel.c;  ) > 2.10.0cvs18.patchset
 ( cvs diff -u -r 1.382.2.394 -r 1.382.2.395 src/compose.c;  cvs diff -u -r 1.207.2.167 -r 1.207.2.168 src/folderview.c;  cvs diff -u -r 1.274.2.195 -r 1.274.2.196 src/mainwindow.c;  cvs diff -u -r 1.94.2.137 -r 1.94.2.138 src/messageview.c;  cvs diff -u -r 1.395.2.310 -r 1.395.2.311 src/summaryview.c;  cvs diff -u -r 1.43.2.67 -r 1.43.2.68 src/toolbar.c;  cvs diff -u -r 1.19.2.18 -r 1.19.2.19 src/toolbar.h;  ) > 2.10.0cvs19.patchset
 ( cvs diff -u -r 1.395.2.309 -r 1.395.2.310 src/summaryview.c;  ) > 2.10.0cvs17.patchset
 ( cvs diff -u -r 1.2.2.20 -r 1.2.2.21 src/gtk/colorlabel.c;  ) > 2.10.0cvs18.patchset
 ( cvs diff -u -r 1.382.2.394 -r 1.382.2.395 src/compose.c;  cvs diff -u -r 1.207.2.167 -r 1.207.2.168 src/folderview.c;  cvs diff -u -r 1.274.2.195 -r 1.274.2.196 src/mainwindow.c;  cvs diff -u -r 1.94.2.137 -r 1.94.2.138 src/messageview.c;  cvs diff -u -r 1.395.2.310 -r 1.395.2.311 src/summaryview.c;  cvs diff -u -r 1.43.2.67 -r 1.43.2.68 src/toolbar.c;  cvs diff -u -r 1.19.2.18 -r 1.19.2.19 src/toolbar.h;  ) > 2.10.0cvs19.patchset

+( cvs diff -u -r 1.43.2.68 -r 1.43.2.69 src/toolbar.c;  ) > 2.10.0cvs20.patchset

diff --git a/configure.ac b/configure.ac
index efcead86dee8c105bb338270070e44f6a5cd6dcc..fe6a0d530c80b182476381a2b869107ab3ef7100 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=19
+EXTRA_VERSION=20

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/toolbar.c b/src/toolbar.c
index 3f01b77284cfbdde73a4e69257fbbc05130e6eae..499cf89fe8fdd869782c63265702ec7ef715f9d9 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -1561,14 +1561,9 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
        }
 }
 
        }
 }
 

-#ifndef MAEMO
-#define HOMOGENEOUS TRUE
-#else
-#define HOMOGENEOUS FALSE
-#endif

 #define TOOLBAR_ITEM(item,icon,text,tooltip) {                                                         \
        item = GTK_WIDGET(gtk_tool_button_new(icon, text));                                             \
 #define TOOLBAR_ITEM(item,icon,text,tooltip) {                                                         \
        item = GTK_WIDGET(gtk_tool_button_new(icon, text));                                             \

-       gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), HOMOGENEOUS);                                \
+       gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE);                              \

        gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE);                                      \
        g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item);     \
        gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1);                              \
        gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE);                                      \
        g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item);     \
        gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1);                              \


@@ -1578,7 +1573,7 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
 
 #define TOOLBAR_MENUITEM(item,icon,text,tooltip,menutip) {                                             \
        item = GTK_WIDGET(gtk_menu_tool_button_new(icon, text));                                        \
 
 #define TOOLBAR_MENUITEM(item,icon,text,tooltip,menutip) {                                             \
        item = GTK_WIDGET(gtk_menu_tool_button_new(icon, text));                                        \

-       gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), HOMOGENEOUS);                                \
+       gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE);                              \

        gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE);                                      \
        g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item);     \
        gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1);                              \
        gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE);                                      \
        g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item);     \
        gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1);                              \