AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 658772: Directory paths for resource directories are hard coded.

Browse Source 
Provide dynamic path discovery functions as are provided for win32.
This commit is contained in:
John Ralls 2011-10-08 18:08:29 -07:00
parent b3314acd97
commit 0d0412bcc9
3 changed files with 79 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.in
View File

@ -1253,9 +1253,18 @@ else
AM_CONDITIONAL(USE_WIN32, false)
fi
AC_ARG_ENABLE(quartz-relocation,
[AS_HELP_STRING([--enable-quartz-relocation],
[enable bundle-based relocation functions])],
[quartz_relocation=yes])
if test "x$gdktarget" = "xquartz"; then
GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
AM_CONDITIONAL(USE_QUARTZ, true)
if test "x$quartz_relocation" = xyes; then
AC_DEFINE([QUARTZ_RELOCATION], [1], [Use NSBundle functions to determine load paths for libraries, translations, etc.])
fi
else
AM_CONDITIONAL(USE_QUARTZ, false)
fi

3
gtk/gtkprivate.h
View File

@ -74,7 +74,8 @@ typedef enum
#define GTK_PRIVATE_SET_FLAG(wid,flag) G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) |= (PRIVATE_ ## flag)); }G_STMT_END
#define GTK_PRIVATE_UNSET_FLAG(wid,flag) G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) &= ~(PRIVATE_ ## flag)); }G_STMT_END
#ifdef G_OS_WIN32
#if defined G_OS_WIN32 \
|| (defined GDK_WINDOWING_QUARTZ && defined QUARTZ_RELOCATION)
const gchar *_gtk_get_datadir ();
const gchar *_gtk_get_libdir ();

68
gtk/gtkquartz.c
View File

@ -323,3 +323,71 @@ _gtk_quartz_set_selection_data_for_pasteboard (NSPasteboard *pasteboard,
freeWhenDone:NO]
forType:type];
}
/*
* Bundle-based functions for various directories. These almost work
* even when the application isn't in a bundle, becuase mainBundle
* paths point to the bin directory in that case. It's a simple matter
* to test for that and remove the last element.
*/
static gchar *
get_bundle_path()
{
gchar *base, *path;
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
gchar *resource_path = g_strdup([[[NSBundle mainBundle] resourcePath] UTF8String]);
[pool drain];
base = g_path_get_basename(resource_path);
if (strcmp(base, "bin") == 0)
path = g_path_get_dirname(resource_path);
else
path = strdup(resource_path);
g_free(resource_path);
g_free(base);
return path;
}
const gchar *
_gtk_get_datadir (void)
{
gchar *resource_dir = get_bundle_path();
gchar *retval = g_build_filename(resource_dir, "share", NULL);
g_free(resource_dir);
return retval;
}
const gchar *
_gtk_get_libdir (void)
{
gchar *resource_dir = get_bundle_path();
gchar *retval = g_build_filename(resource_dir, "lib", NULL);
g_free(resource_dir);
return retval;
}
const gchar *
_gtk_get_localedir (void)
{
gchar *resource_dir = get_bundle_path();
gchar *retval = g_build_filename(resource_dir, "share", "locale", NULL);
g_free(resource_dir);
return retval;
}
const gchar *
_gtk_get_sysconfdir (void)
{
gchar *resource_dir = get_bundle_path();
gchar *retval = g_build_filename(resource_dir, "etc", NULL);
g_free(resource_dir);
return retval;
}
const gchar *
_gtk_get_data_prefix (void)
{
return get_bundle_path();
}