From: "J.A. Magallon" <jamagallon@able.es> I need this to make gconfig work under gtk-2.4. Without this, it just coredumps. There is some problem with pixmap creation/usage from XPM in the way it is done in gconf, so I just added some stock icons. It is even prettier..;) Could someone test this still works on gtk-2.0 or 2.2 ? Changes: - change the wiget class 'button' in glade files to something known to glade (GtkToolButton) - use 'stock-id' property for toolbar buttons instead of "stock_pixmap" - change unknown signal "pressed" to "clicked" - removed unused xpms - remove manual setting of icons in gconf.c Signed-off-by: Andrew Morton <akpm@osdl.org> --- 25-akpm/scripts/kconfig/gconf.c | 32 ---- 25-akpm/scripts/kconfig/gconf.glade | 40 ++--- 25-akpm/scripts/kconfig/images.c | 288 ------------------------------------ 3 files changed, 21 insertions(+), 339 deletions(-) diff -puN scripts/kconfig/gconf.c~make-gconfig-work-with-gtk-24 scripts/kconfig/gconf.c --- 25/scripts/kconfig/gconf.c~make-gconfig-work-with-gtk-24 2004-12-01 23:43:14.688079848 -0800 +++ 25-akpm/scripts/kconfig/gconf.c 2004-12-01 23:43:14.698078328 -0800 @@ -187,8 +187,6 @@ void init_main_window(const gchar * glad GtkWidget *widget; GtkTextBuffer *txtbuf; char title[256]; - GdkPixmap *pixmap; - GdkBitmap *mask; GtkStyle *style; xml = glade_xml_new(glade_file, "window1", NULL); @@ -221,36 +219,6 @@ void init_main_window(const gchar * glad style = gtk_widget_get_style(main_wnd); widget = glade_xml_get_widget(xml, "toolbar1"); - pixmap = gdk_pixmap_create_from_xpm_d(main_wnd->window, &mask, - &style->bg[GTK_STATE_NORMAL], - (gchar **) xpm_single_view); - gtk_image_set_from_pixmap(GTK_IMAGE - (((GtkToolbarChild - *) (g_list_nth(GTK_TOOLBAR(widget)-> - children, - 5)->data))->icon), - pixmap, mask); - pixmap = - gdk_pixmap_create_from_xpm_d(main_wnd->window, &mask, - &style->bg[GTK_STATE_NORMAL], - (gchar **) xpm_split_view); - gtk_image_set_from_pixmap(GTK_IMAGE - (((GtkToolbarChild - *) (g_list_nth(GTK_TOOLBAR(widget)-> - children, - 6)->data))->icon), - pixmap, mask); - pixmap = - gdk_pixmap_create_from_xpm_d(main_wnd->window, &mask, - &style->bg[GTK_STATE_NORMAL], - (gchar **) xpm_tree_view); - gtk_image_set_from_pixmap(GTK_IMAGE - (((GtkToolbarChild - *) (g_list_nth(GTK_TOOLBAR(widget)-> - children, - 7)->data))->icon), - pixmap, mask); - switch (view_mode) { case SINGLE_VIEW: widget = glade_xml_get_widget(xml, "button4"); diff -puN scripts/kconfig/gconf.glade~make-gconfig-work-with-gtk-24 scripts/kconfig/gconf.glade --- 25/scripts/kconfig/gconf.glade~make-gconfig-work-with-gtk-24 2004-12-01 23:43:14.690079544 -0800 +++ 25-akpm/scripts/kconfig/gconf.glade 2004-12-01 23:43:14.696078632 -0800 @@ -310,13 +310,13 @@ <property name="tooltips">True</property> <child> - <widget class="button" id="button1"> + <widget class="GtkToolButton" id="button1"> <property name="visible">True</property> <property name="tooltip" translatable="yes">Goes up of one level (single view)</property> <property name="label" translatable="yes">Back</property> <property name="use_underline">True</property> - <property name="stock_pixmap">gtk-undo</property> - <signal name="pressed" handler="on_back_pressed"/> + <property name="stock-id">gtk-undo</property> + <signal name="clicked" handler="on_back_pressed"/> </widget> </child> @@ -327,24 +327,24 @@ </child> <child> - <widget class="button" id="button2"> + <widget class="GtkToolButton" id="button2"> <property name="visible">True</property> <property name="tooltip" translatable="yes">Load a config file</property> <property name="label" translatable="yes">Load</property> <property name="use_underline">True</property> - <property name="stock_pixmap">gtk-open</property> - <signal name="pressed" handler="on_load_pressed"/> + <property name="stock-id">gtk-open</property> + <signal name="clicked" handler="on_load_pressed"/> </widget> </child> <child> - <widget class="button" id="button3"> + <widget class="GtkToolButton" id="button3"> <property name="visible">True</property> <property name="tooltip" translatable="yes">Save a config file</property> <property name="label" translatable="yes">Save</property> <property name="use_underline">True</property> - <property name="stock_pixmap">gtk-save</property> - <signal name="pressed" handler="on_save_pressed"/> + <property name="stock-id">gtk-save</property> + <signal name="clicked" handler="on_save_pressed"/> </widget> </child> @@ -355,34 +355,34 @@ </child> <child> - <widget class="button" id="button4"> + <widget class="GtkToolButton" id="button4"> <property name="visible">True</property> <property name="tooltip" translatable="yes">Single view</property> <property name="label" translatable="yes">Single</property> <property name="use_underline">True</property> - <property name="stock_pixmap">gtk-missing-image</property> + <property name="stock-id">gtk-indent</property> <signal name="clicked" handler="on_single_clicked" last_modification_time="Sun, 12 Jan 2003 14:28:39 GMT"/> </widget> </child> <child> - <widget class="button" id="button5"> + <widget class="GtkToolButton" id="button5"> <property name="visible">True</property> <property name="tooltip" translatable="yes">Split view</property> <property name="label" translatable="yes">Split</property> <property name="use_underline">True</property> - <property name="stock_pixmap">gtk-missing-image</property> + <property name="stock-id">gtk-copy</property> <signal name="clicked" handler="on_split_clicked" last_modification_time="Sun, 12 Jan 2003 14:28:45 GMT"/> </widget> </child> <child> - <widget class="button" id="button6"> + <widget class="GtkToolButton" id="button6"> <property name="visible">True</property> <property name="tooltip" translatable="yes">Full view</property> <property name="label" translatable="yes">Full</property> <property name="use_underline">True</property> - <property name="stock_pixmap">gtk-missing-image</property> + <property name="stock-id">gtk-justify-left</property> <signal name="clicked" handler="on_full_clicked" last_modification_time="Sun, 12 Jan 2003 14:28:50 GMT"/> </widget> </child> @@ -394,22 +394,24 @@ </child> <child> - <widget class="button" id="button7"> + <widget class="GtkToolButton" id="button7"> <property name="visible">True</property> <property name="tooltip" translatable="yes">Collapse the whole tree in the right frame</property> <property name="label" translatable="yes">Collapse</property> <property name="use_underline">True</property> - <signal name="pressed" handler="on_collapse_pressed"/> + <property name="stock-id">gtk-zoom-out</property> + <signal name="clicked" handler="on_collapse_pressed"/> </widget> </child> <child> - <widget class="button" id="button8"> + <widget class="GtkToolButton" id="button8"> <property name="visible">True</property> <property name="tooltip" translatable="yes">Expand the whole tree in the right frame</property> <property name="label" translatable="yes">Expand</property> <property name="use_underline">True</property> - <signal name="pressed" handler="on_expand_pressed"/> + <property name="stock-id">gtk-zoom-in</property> + <signal name="clicked" handler="on_expand_pressed"/> </widget> </child> </widget>