From f0f4f30fb3bb6bb0d51fac29ea6a00ff45a97ed4 Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 9 Dec 2003 22:33:08 +0000 Subject: Correct help file resolution in certain cases. Obtained from: FreeBSD ports tree git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1436 df743ca5-7f9a-e211-a948-0013205c9059 --- x11/libgnome/files/patch-libgnome_gnome-program.c | 25 +++++------------------ 1 file changed, 5 insertions(+), 20 deletions(-) (limited to 'x11/libgnome/files') diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c index eddd1f28d..c480676d5 100644 --- a/x11/libgnome/files/patch-libgnome_gnome-program.c +++ b/x11/libgnome/files/patch-libgnome_gnome-program.c @@ -1,6 +1,6 @@ ---- libgnome/gnome-program.c.orig Fri Mar 22 11:02:45 2002 -+++ libgnome/gnome-program.c Mon May 20 18:28:24 2002 -@@ -882,12 +882,12 @@ +--- libgnome/gnome-program.c.orig Wed Jul 23 05:35:30 2003 ++++ libgnome/gnome-program.c Tue Dec 9 17:25:38 2003 +@@ -899,12 +899,12 @@ attr_rel = ""; break; case GNOME_FILE_DOMAIN_SOUND: @@ -15,7 +15,7 @@ attr_name = GNOME_PARAM_GNOME_DATADIR; attr_rel = "/pixmaps"; break; -@@ -899,7 +899,7 @@ +@@ -916,7 +916,7 @@ case GNOME_FILE_DOMAIN_HELP: prefix_rel = "/share/gnome/help"; attr_name = GNOME_PARAM_GNOME_DATADIR; @@ -24,7 +24,7 @@ break; case GNOME_FILE_DOMAIN_APP_LIBDIR: prefix_rel = "/lib"; -@@ -914,13 +914,13 @@ +@@ -931,13 +931,13 @@ search_path = FALSE; break; case GNOME_FILE_DOMAIN_APP_SOUND: @@ -40,18 +40,3 @@ attr_name = GNOME_PARAM_APP_DATADIR; attr_rel = "/pixmaps"; search_path = FALSE; -@@ -941,12 +941,12 @@ - - attr_name = GNOME_PARAM_APP_DATADIR; - -- len = strlen ("/gnome/help/") + -+ len = strlen ("/help/") + - strlen (program->_priv->app_id) + 1; - attr_rel = g_alloca (len); - if (attr_rel == NULL /* bad things */) - return NULL; -- g_snprintf (attr_rel, len, "/gnome/help/%s", program->_priv->app_id); -+ g_snprintf (attr_rel, len, "/help/%s", program->_priv->app_id); - - search_path = FALSE; - break; -- cgit v1.2.3