Bug#292601: kernel: Updated .glade files
On Mon, Jan 31, 2005 at 12:27:35PM +0100, Joachim Nilsson wrote:
> Mon 2005-01-31 at 13:30 +0300 Simon Horman wrote:
> > On Fri, Jan 28, 2005 at 04:41:31PM +0100, Joachim Nilsson wrote:
> > > [1] - http://lists.debian.org/debian-kernel/2005/01/msg00171.html
> > Is gconfig even maintained upstream?
>
> Dunno, but 2.6.10-ac5 has the following changelog entry that might
> be worth taking a closer look at:
>
> * Make gconfig work with current gtk 2.4 (J Magallon)
That is interesting indeed. I have attached the associated patch.
Could you take a moment to see if it resolves the problem
as well as your patch does.
> > Generally the kernel team doesn't really like putting stuff in that
> > isn't going upstream. But in this case I am of the mind that as
> > it can't possibly break the kernel, and given that gconfig is broken,
> > it can't make is work less, we might as well put something like this
> > if someone is willing to put the effort in to get it working.
>
> OK. It's really not that much work to keep it (the .glade file) in
> sync, so if the 2.6.10-ac5 fix isn't applicable then I could keep an
> eye at it. Unless somebody else has a more dire urge to do so.
Thanks
--
Horms
# origin: jamagallon (BitKeeper)
# cset: 1.1966.3.122 (2.6) key=41db7bbaYVNZP4o6Hq4ALW6iB1oDvw
# URL: http://linux.bkbits.net:8080/linux-2.6/gnupatch@41db7bbaYVNZP4o6Hq4ALW6iB1oDvw
# inclusion: upstream
# descrition: [PATCH] make gconfig work with gtk-2.4
# revision date: Thu, 03 Feb 2005 11:16:27 +0900
#
# S rset: ChangeSet|1.1966.3.121..1.1966.3.122
# I rset: scripts/kconfig/gconf.glade|1.1..1.2
# I rset: scripts/kconfig/gconf.c|1.12..1.13
#
# Key:
# S: Skipped ChangeSet file only
# O: Original Followed by Updated
# U: Updated Included with updated range of versions
# I: Included Included verbatim
# E: Excluded Excluded on request from user
# D: Deleted Manually deleted by subsequent user edit
# R: Revised Manually revised by subsequent user edit
#
#
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2005/01/04 21:31:38-08:00 jamagallon@able.es
# [PATCH] make gconfig work with gtk-2.4
#
# 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"
# - remove manual setting of icons in gconf.c
#
# Signed-off-by: Andrew Morton <akpm@osdl.org>
# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
#
# scripts/kconfig/gconf.glade
# 2005/01/04 18:48:16-08:00 jamagallon@able.es +21 -19
# make gconfig work with gtk-2.4
#
# scripts/kconfig/gconf.c
# 2005/01/04 18:48:16-08:00 jamagallon@able.es +0 -32
# make gconfig work with gtk-2.4
#
#
===== scripts/kconfig/gconf.glade 1.1 vs 1.2 =====
--- 1.1/scripts/kconfig/gconf.glade 2003-03-16 02:25:55 +09:00
+++ 1.2/scripts/kconfig/gconf.glade 2005-01-05 11:48:16 +09:00
@@ -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>
===== scripts/kconfig/gconf.c 1.12 vs 1.13 =====
--- 1.12/scripts/kconfig/gconf.c 2004-09-04 07:36:18 +09:00
+++ 1.13/scripts/kconfig/gconf.c 2005-01-05 11:48:16 +09:00
@@ -187,8 +187,6 @@
GtkWidget *widget;
GtkTextBuffer *txtbuf;
char title[256];
- GdkPixmap *pixmap;
- GdkBitmap *mask;
GtkStyle *style;
xml = glade_xml_new(glade_file, "window1", NULL);
@@ -220,36 +218,6 @@
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:
Reply to: