[gtk-mac-integration] [Introspection] Rename the bundle functions from quartz_application to gtkosx_application so that in

[John Ralls <jralls src gnome org>]

commit d21048dbad22a97cb5ef9206f0d9cad750585e2d
Author: John Ralls <jralls ceridwen us>
Date:   Fri Nov 25 17:02:00 2011 -0800

    [Introspection] Rename the bundle functions from quartz_application to gtkosx_application so that introspection can find them.

 src/gtkosxapplication.h        |   10 +++++-----
 src/gtkosxapplication_quartz.c |   27 +++++++++++----------------
 src/test-integration.c         |    2 +-
 3 files changed, 17 insertions(+), 22 deletions(-)
---
diff --git a/src/gtkosxapplication.h b/src/gtkosxapplication.h
index 6a8a327..684e68b 100644
--- a/src/gtkosxapplication.h
+++ b/src/gtkosxapplication.h
@@ -136,11 +136,11 @@ void gtkosx_application_cancel_attention_request(GtkosxApplication *self, gint i
  * them "free" functions will often save one from having to call
  * g_object_new(GTKOSX_TYPE_APPLICATION) just to get it. */
 
-gchar *quartz_application_get_bundle_path(void);
-gchar *quartz_application_get_resource_path(void);
-gchar *quartz_application_get_executable_path(void);
-gchar *quartz_application_get_bundle_id(void);
-gchar *quartz_application_get_bundle_info(const gchar *key);
+gchar *gtkosx_application_get_bundle_path(void);
+gchar *gtkosx_application_get_resource_path(void);
+gchar *gtkosx_application_get_executable_path(void);
+gchar *gtkosx_application_get_bundle_id(void);
+gchar *gtkosx_application_get_bundle_info(const gchar *key);
 
 G_END_DECLS
 
diff --git a/src/gtkosxapplication_quartz.c b/src/gtkosxapplication_quartz.c
index 74aba87..bfde43d 100644
--- a/src/gtkosxapplication_quartz.c
+++ b/src/gtkosxapplication_quartz.c
@@ -997,8 +997,7 @@ gtkosx_application_cancel_attention_request(GtkosxApplication *self, gint id)
 }
 
 /**
- * quartz_application_get_bundle_path:
- * @self: The GtkosxApplication. Not Used.
+ * gtkosx_application_get_bundle_path:
  *
  * Return the root path of the bundle or the directory containing the
  *  executable if it isn't actually a bundle.
@@ -1006,7 +1005,7 @@ gtkosx_application_cancel_attention_request(GtkosxApplication *self, gint id)
  * Returns: path The bundle's absolute path or %NULL on error. g_free() it when done.
  */
 gchar*
-quartz_application_get_bundle_path(void)
+gtkosx_application_get_bundle_path(void)
 {
   NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
   gchar *str = NULL;
@@ -1019,8 +1018,7 @@ quartz_application_get_bundle_path(void)
 }
 
 /**
- * quartz_application_get_bundle_id:
- * @self: The GtkosxApplication. Not Used.
+ * gtkosx_application_get_bundle_id:
  *
  *Return the value of the CFBundleIdentifier key from the bundle's Info.plist
  *
@@ -1032,7 +1030,7 @@ quartz_application_get_bundle_path(void)
  * Returns: The string value of CFBundleIdentifier, or %NULL if there is none. g_free() it when done.
  */
 gchar*
-quartz_application_get_bundle_id(void)
+gtkosx_application_get_bundle_id(void)
 {
   NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
   gchar *str = NULL;
@@ -1045,16 +1043,15 @@ quartz_application_get_bundle_id(void)
 }
 
 /**
- * quartz_application_get_resource_path:
- * @self: The GtkosxApplication. Not Used.
+ * gtkosx_application_get_resource_path:
  *
  * Return the Resource path for the bundle or the directory containing the
- *  executable if it isn't actually a bundle. Use quartz_application_get_bundle_id() to check (it will return %NULL if it's not a bundle).
+ *  executable if it isn't actually a bundle. Use gtkosx_application_get_bundle_id() to check (it will return %NULL if it's not a bundle).
  *
  * Returns: path The absolute resource path. or %NULL on error. g_free() it when done.
  */
 gchar*
-quartz_application_get_resource_path(void)
+gtkosx_application_get_resource_path(void)
 {
   NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
   gchar *str = NULL;
@@ -1068,15 +1065,14 @@ quartz_application_get_resource_path(void)
 
 
 /**
- * quartz_application_get_executable_path:
- * @self: The GtkosxApplication. Not Used.
+ * gtkosx_application_get_executable_path:
  *
  * Return the executable path, including file name
  *
  * Returns: The path to the primary executable, or %NULL if it can't find one. g_free() it when done
  */
 gchar*
-quartz_application_get_executable_path(void)
+gtkosx_application_get_executable_path(void)
 {
   NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
   gchar *str = NULL;
@@ -1089,8 +1085,7 @@ quartz_application_get_executable_path(void)
 }
 
 /**
- * quartz_application_get_bundle_info:
- * @self: The GtkosxApplication. Not Used.
+ * gtkosx_application_get_bundle_info:
  * @key: The key, as a normal UTF8 string.
  *
  * Queries the bundle's Info.plist with key. If the returned object is
@@ -1099,7 +1094,7 @@ quartz_application_get_executable_path(void)
  * Returns: A UTF8-encoded string. g_free() it when done.
  */
 gchar*
-quartz_application_get_bundle_info(const gchar *key)
+gtkosx_application_get_bundle_info(const gchar *key)
 {
   NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
   NSObject *id = [[NSBundle mainBundle] objectForInfoDictionaryKey:
diff --git a/src/test-integration.c b/src/test-integration.c
index d040774..a7db28f 100644
--- a/src/test-integration.c
+++ b/src/test-integration.c
@@ -749,7 +749,7 @@ main (int argc, char **argv)
 #endif //QUARTZ_HANDLERS
   gtkosx_application_ready(theApp);
   {
-    const gchar *id = quartz_application_get_bundle_id();
+    const gchar *id = gtkosx_application_get_bundle_id();
     if (id != NULL) {
       g_print ("TestIntegration Error! Bundle Has ID %s\n", id);
     }