callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Corrected formatting to match coding standards; introduced local statics
to prevent leaking returned strings.
This commit is contained in:
John Ralls
2011-10-14 16:39:37 -07:00
parent a95c4c1bb4
commit 1db5b34b97
1 changed files with 49 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
gtk/gtkquartz.c
View File

@ -319,62 +319,81 @@ _gtk_quartz_set_selection_data_for_pasteboard (NSPasteboard *pasteboard,
*/
static gchar *
get_bundle_path()
get_bundle_path ()
{
gchar *base, *path;
static gchar *path = NULL;
if (path == NULL)
{
gchar *base;
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
gchar *resource_path = g_strdup([[[NSBundle mainBundle] resourcePath] UTF8String]);
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);
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);
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;
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);
}
return path;
}
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;
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);
}
return path;
}
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;
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);
}
return path;
}
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;
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);
}
return path;
}
const gchar *
_gtk_get_data_prefix (void)
{
return get_bundle_path();
return get_bundle_path ();
}