2007-07-14 [colin] 2.10.0cvs23
authorColin Leroy <colin@colino.net>
Sat, 14 Jul 2007 10:39:42 +0000 (10:39 +0000)
committerColin Leroy <colin@colino.net>
Sat, 14 Jul 2007 10:39:42 +0000 (10:39 +0000)
* src/toolbar.c
Don't set homogeneous finally

ChangeLog
PATCHSETS
configure.ac
src/toolbar.c

index d2cd9cdfe2286d1d31885124ac555d8124461623..6210b4ed39265da19077e2cfbbf007364ece93ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-14 [colin]     2.10.0cvs23
+
+       * src/toolbar.c
+               Don't set homogeneous finally
+
 2007-07-14 [colin]     2.10.0cvs22
 
        * src/toolbar.c
index b9edbd5543c8a21d959afb16a5b58010aacb7ba6..75e2f8daad4c2a9d9d9e8aa8b1658eeb1d3cc80e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.43.2.68 -r 1.43.2.69 src/toolbar.c;  ) > 2.10.0cvs20.patchset
 ( cvs diff -u -r 1.43.2.69 -r 1.43.2.70 src/toolbar.c;  ) > 2.10.0cvs21.patchset
 ( cvs diff -u -r 1.43.2.70 -r 1.43.2.71 src/toolbar.c;  ) > 2.10.0cvs22.patchset
+( cvs diff -u -r 1.43.2.71 -r 1.43.2.72 src/toolbar.c;  ) > 2.10.0cvs23.patchset
index a560edfb908ed1456a63fdb05173ad417d9af612..aa721e97aa680ef17e26c41dbd2ead7ab39255dc 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=22
+EXTRA_VERSION=23
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index bc435a8679db97d1382c30066c0e6e21a62de990..c27a2291157e950bd720270e66226afad9178215 100644 (file)
@@ -1566,14 +1566,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));                                             \
-       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);                              \
@@ -1585,7 +1580,7 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
        GtkWidget *child = NULL, *btn = NULL, *arr = NULL;                                              \
        GList *gchild = NULL;                                                                           \
        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);                              \