[gtk+/quartz-integration] Implement relocatable paths for quartz, similar to those in Win32.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration] Implement relocatable paths for quartz, similar to those in Win32.
- Date: Mon, 29 Nov 2010 01:01:17 +0000 (UTC)
commit 5cf4efa7789e6f3d01f5bf3d112fa17f0bd5c4cb
Author: John Ralls <jralls ceridwen us>
Date: Sun Nov 28 17:01:01 2010 -0800
Implement relocatable paths for quartz, similar to those in Win32.
The motivation was a complaint in the Gtk OSX forum that GTK didn't seem to be able to find its translations when bundled.
gtk/gtkprivate.h | 22 +++++++++++++++++
gtk/gtkquartz.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 90 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h
index d5d7c3e..378479a 100644
--- a/gtk/gtkprivate.h
+++ b/gtk/gtkprivate.h
@@ -56,6 +56,28 @@ const gchar *_gtk_get_data_prefix ();
#define GTK_PARAM_WRITABLE G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+/* Likewise for quartz */
+#ifdef GDK_WINDOWING_QUARTZ
+
+const gchar *_gtk_quartz_get_datadir ();
+const gchar *_gtk_quartz_get_libdir ();
+const gchar *_gtk_quartz_get_sysconfdir ();
+const gchar *_gtk_quartz_get_localedir ();
+const gchar *_gtk_quartz_get_data_prefix ();
+
+#undef GTK_DATADIR
+#define GTK_DATADIR _gtk_quartz_get_datadir ()
+#undef GTK_LIBDIR
+#define GTK_LIBDIR _gtk_quartz_get_libdir ()
+#undef GTK_LOCALEDIR
+#define GTK_LOCALEDIR _gtk_quartz_get_localedir ()
+#undef GTK_SYSCONFDIR
+#define GTK_SYSCONFDIR _gtk_quartz_get_sysconfdir ()
+#undef GTK_DATA_PREFIX
+#define GTK_DATA_PREFIX _gtk_quartz_get_data_prefix ()
+
+#endif /* GDK_WINDOWING_QUARTZ */
+
/* Many keyboard shortcuts for Mac are the same as for X
* except they use Command key instead of Control (e.g. Cut,
* Copy, Paste). This symbol is for those simple cases. */
diff --git a/gtk/gtkquartz.c b/gtk/gtkquartz.c
index e894559..89b9dca 100644
--- a/gtk/gtkquartz.c
+++ b/gtk/gtkquartz.c
@@ -321,3 +321,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_quartz_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_quartz_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_quartz_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_quartz_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_quartz_get_data_prefix (void)
+{
+ return get_bundle_path();
+}
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]