From b7a3070681865266efc00a1ae464714ca088e771 Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 16 Nov 2002 22:03:24 +0000 Subject: 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. --- x11-toolkits/libbonoboui/Makefile | 1 + .../libbonoboui/files/patch-bonobo_bonobo-ui-util.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c (limited to 'x11-toolkits/libbonoboui') diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile index 9b67935..1571487 100644 --- a/x11-toolkits/libbonoboui/Makefile +++ b/x11-toolkits/libbonoboui/Makefile @@ -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 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 0000000..7d93d25 --- /dev/null +++ b/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c @@ -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", -- cgit v1.1