[gtk+/gtk-2-24-quartz: 25/27] Quartz Bug 658772: Instead of declaring/defining gtk_quartz_get_foo, use the gtk_get_foo names that

[John Ralls <jralls src gnome org>]

commit 305a824cf475eec56b8cec1c786ce3845abcd67d
Author: John Ralls <jralls ceridwen us>
Date:   Sat Sep 24 11:49:17 2011 -0700

    Quartz Bug 658772: Instead of declaring/defining gtk_quartz_get_foo, use the gtk_get_foo names that Win32 uses.

 gtk/gtkprivate.h |   25 ++-----------------------
 gtk/gtkquartz.c  |   10 +++++-----
 2 files changed, 7 insertions(+), 28 deletions(-)
---
diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h
index 5975d09..27aaf1f 100644
--- a/gtk/gtkprivate.h
+++ b/gtk/gtkprivate.h
@@ -74,7 +74,7 @@ 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
 
 const gchar *_gtk_get_datadir ();
 const gchar *_gtk_get_libdir ();
@@ -93,29 +93,8 @@ const gchar *_gtk_get_data_prefix ();
 #undef GTK_DATA_PREFIX
 #define GTK_DATA_PREFIX _gtk_get_data_prefix ()
 
-#endif /* G_OS_WIN32 */
+#endif /* G_OS_WIN32 || GDK_WINDOWING_QUARTZ */
 
-/* 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 */
 gboolean _gtk_fnmatch (const char *pattern,
 		       const char *string,
 		       gboolean    no_leading_period);
diff --git a/gtk/gtkquartz.c b/gtk/gtkquartz.c
index 52d854c..a675d8a 100644
--- a/gtk/gtkquartz.c
+++ b/gtk/gtkquartz.c
@@ -350,7 +350,7 @@ get_bundle_path()
 }
 
 const gchar *
-_gtk_quartz_get_datadir (void)
+_gtk_get_datadir (void)
 {
   gchar *resource_dir = get_bundle_path();
   gchar *retval = g_build_filename(resource_dir, "share", NULL);
@@ -359,7 +359,7 @@ _gtk_quartz_get_datadir (void)
 }
 
 const gchar *
-_gtk_quartz_get_libdir (void)
+_gtk_get_libdir (void)
 {
   gchar *resource_dir = get_bundle_path();
   gchar *retval = g_build_filename(resource_dir, "lib", NULL);
@@ -368,7 +368,7 @@ _gtk_quartz_get_libdir (void)
 }
 
 const gchar *
-_gtk_quartz_get_localedir (void)
+_gtk_get_localedir (void)
 {
 
   gchar *resource_dir = get_bundle_path();
@@ -378,7 +378,7 @@ _gtk_quartz_get_localedir (void)
 }
 
 const gchar *
-_gtk_quartz_get_sysconfdir (void)
+_gtk_get_sysconfdir (void)
 {
   gchar *resource_dir = get_bundle_path();
   gchar *retval = g_build_filename(resource_dir, "etc", NULL);
@@ -387,7 +387,7 @@ _gtk_quartz_get_sysconfdir (void)
 }
 
 const gchar *
-_gtk_quartz_get_data_prefix (void)
+_gtk_get_data_prefix (void)
 {
   return get_bundle_path();
 }