Fix a bug where bonobo applications could have a bogus datadir path

registered.  This came about when testing that the Help feature worked
in Gnumeric 2.  This fix looks correct, and I tested numerous bonobo apps
to very they still worked.  However, if people run into problems where
application components suddenly can't be found, let me know.
This commit is contained in:
Joe Marcus Clarke 2002-11-16 22:03:24 +00:00
parent bb44018f99
commit 18fb470c66
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=70264
2 changed files with 19 additions and 0 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= libbonoboui
PORTVERSION= 2.0.3.2
PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0

View File

@ -0,0 +1,18 @@
--- bonobo/bonobo-ui-util.c.orig Mon Sep 2 11:24:00 2002
+++ bonobo/bonobo-ui-util.c Sat Nov 16 16:38:54 2002
@@ -539,11 +539,10 @@
GNOME_PARAM_GNOME_PREFIX, &prefix, NULL);
}
- /* sub-optimal, but what can you do */
- if (prefix)
- datadir = g_strdup_printf ("%s/share", prefix);
- else
- datadir = g_strdup (BONOBO_DATADIR);
+ g_object_get (G_OBJECT (gnome_program_get ()),
+ GNOME_PARAM_APP_DATADIR, &datadir, NULL);
+ if (!datadir)
+ datadir = g_strdup (BONOBO_DATADIR);
cl->program = gnome_program_init (
doc_id, "2.1",