[gtk+/gtk-2-24-quartz] gtkquartz: don't free the string returned by get_bundle_path()

[John Ralls <jralls src gnome org>]

commit df1f9cdb1ff7508668c0b4ed9951a714f51e0c90
Author: Michael Natterer <mitch gimp org>
Date:   Sat Oct 22 23:08:32 2011 +0200

    gtkquartz: don't free the string returned by get_bundle_path()
    
    It's statically allocated.

 gtk/gtkquartz.c |   43 +++++++++++++++++++------------------------
 1 files changed, 19 insertions(+), 24 deletions(-)
---
diff --git a/gtk/gtkquartz.c b/gtk/gtkquartz.c
index 0af494e..fa48e45 100644
--- a/gtk/gtkquartz.c
+++ b/gtk/gtkquartz.c
@@ -332,24 +332,28 @@ _gtk_quartz_set_selection_data_for_pasteboard (NSPasteboard     *pasteboard,
  * to test for that and remove the last element.
  */
 
-static gchar *
-get_bundle_path ()
+static const gchar *
+get_bundle_path (void)
 {
   static gchar *path = NULL;
+
   if (path == NULL)
     {
-      gchar *base;
       NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
       gchar *resource_path = g_strdup ([[[NSBundle mainBundle] resourcePath] UTF8String]);
+      gchar *base;
       [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;
 }
 
@@ -357,12 +361,10 @@ const gchar *
 _gtk_get_datadir (void)
 {
   static gchar *path = NULL;
+
   if (path == NULL)
-    {
-      gchar *resource_dir = get_bundle_path ();
-      path = g_build_filename (resource_dir, "share", NULL);
-      g_free (resource_dir);
-    }
+    path = g_build_filename (get_bundle_path (), "share", NULL);
+
   return path;
 }
 
@@ -370,12 +372,10 @@ const gchar *
 _gtk_get_libdir (void)
 {
   static gchar *path = NULL;
+
   if (path == NULL)
-    {
-      gchar *resource_dir = get_bundle_path ();
-      path = g_build_filename (resource_dir, "lib", NULL);
-      g_free (resource_dir);
-    }
+    path = g_build_filename (get_bundle_path (), "lib", NULL);
+
   return path;
 }
 
@@ -383,12 +383,10 @@ const gchar *
 _gtk_get_localedir (void)
 {
   static gchar *path = NULL;
+
   if (path == NULL)
-    {
-      gchar *resource_dir = get_bundle_path ();
-      path = g_build_filename (resource_dir, "share", "locale", NULL);
-      g_free (resource_dir);
-    }
+    path = g_build_filename (get_bundle_path (), "share", "locale", NULL);
+
   return path;
 }
 
@@ -396,12 +394,10 @@ const gchar *
 _gtk_get_sysconfdir (void)
 {
   static gchar *path = NULL;
+
   if (path == NULL)
-    {
-      gchar *resource_dir = get_bundle_path ();
-      path = g_build_filename (resource_dir, "etc", NULL);
-      g_free (resource_dir);
-    }
+    path = g_build_filename (get_bundle_path (), "etc", NULL);
+
   return path;
 }
 
@@ -410,4 +406,3 @@ _gtk_get_data_prefix (void)
 {
   return get_bundle_path ();
 }
-