diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-01-27 02:25:47 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-01-27 02:25:47 +0800 |
| commit | 461d7387ea5271036bafda9ef863a4b8a02ad58e (patch) | |
| tree | a6f6525a086ba82849e6f9180f3fc39b30895413 /x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c | |
| parent | be1cd87e1e164be47c3b1f923259db111322cc3a (diff) | |
| download | marcuscom-ports-461d7387ea5271036bafda9ef863a4b8a02ad58e.tar marcuscom-ports-461d7387ea5271036bafda9ef863a4b8a02ad58e.tar.gz marcuscom-ports-461d7387ea5271036bafda9ef863a4b8a02ad58e.tar.bz2 marcuscom-ports-461d7387ea5271036bafda9ef863a4b8a02ad58e.tar.lz marcuscom-ports-461d7387ea5271036bafda9ef863a4b8a02ad58e.tar.xz marcuscom-ports-461d7387ea5271036bafda9ef863a4b8a02ad58e.tar.zst marcuscom-ports-461d7387ea5271036bafda9ef863a4b8a02ad58e.zip | |
Fix libbonoboui build with the new libgnome* components.
Obtained from: GNOME CVS
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3534 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c')
| -rw-r--r-- | x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c b/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c new file mode 100644 index 000000000..f0c6cd1b9 --- /dev/null +++ b/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c @@ -0,0 +1,31 @@ +--- bonobo/bonobo-ui-util.c.orig Fri May 14 06:49:07 2004 ++++ bonobo/bonobo-ui-util.c Wed Jan 26 13:24:13 2005 +@@ -400,7 +400,8 @@ + g_warning ("Could not find GNOME pixmap file %s", text); + else { + int w, h; +- if (gtk_icon_size_lookup (icon_size, &w, &h)) ++ GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (image)); ++ if (gtk_icon_size_lookup_for_settings (settings, icon_size, &w, &h)) + pixbuf = gdk_pixbuf_new_from_file_at_size (name, w, h, NULL); + else + pixbuf = gdk_pixbuf_new_from_file (name, NULL); +@@ -564,14 +565,11 @@ + else + prefix = NULL; + +- if (prefix) ++ datadir = NULL; ++ g_object_get (G_OBJECT (gnome_program_get ()), ++ GNOME_PARAM_APP_DATADIR, &datadir, NULL); ++ if (!datadir && prefix) + datadir = g_strdup_printf ("%s/share", prefix); +- +- else { +- datadir = NULL; +- g_object_get (G_OBJECT (gnome_program_get ()), +- GNOME_PARAM_APP_DATADIR, &datadir, NULL); +- } + + if (!datadir) /* desparate fallback */ + datadir = g_strdup (BONOBO_DATADIR); |