brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell-util: Adapt to nautilus' switch to GSettings

Browse Source 
shell_util_get_file_display_name_if_mount() uses a nautilus setting
to use a name for $HOME which is consistent with the file manager.
But while nautilus was ported to GSettings a while ago, we are still
trying to access the old GConf setting.

https://bugzilla.gnome.org/show_bug.cgi?id=653511
This commit is contained in:
Florian Müllner 2011-06-27 04:16:28 +02:00
parent 6222796b6a
commit 1ebca2e6d5
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/shell-util.c
View File

@ -4,7 +4,6 @@
#include "shell-util.h" #include "shell-util.h"
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
#include <gconf/gconf-client.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <libxml/parser.h> #include <libxml/parser.h>
@ -72,7 +71,8 @@ shell_util_get_file_display_name_if_mount (GFile *file)
return ret; return ret;
} }
#define HOME_NAME_KEY "/apps/nautilus/desktop/home_icon_name" #define HOME_NAME_SCHEMA "org.gnome.nautilus.desktop"
#define HOME_NAME_KEY "home-icon-name"
static char * static char *
shell_util_get_file_display_for_common_files (GFile *file) shell_util_get_file_display_for_common_files (GFile *file)
{ {
@ -81,20 +81,23 @@ shell_util_get_file_display_for_common_files (GFile *file)
compare = g_file_new_for_path (g_get_home_dir ()); compare = g_file_new_for_path (g_get_home_dir ());
if (g_file_equal (file, compare)) if (g_file_equal (file, compare))
{ {
char *gconf_name; GSettings *settings;
char *name;
g_object_unref (compare); g_object_unref (compare);
gconf_name = gconf_client_get_string (gconf_client_get_default (), settings = g_settings_new (HOME_NAME_SCHEMA);
HOME_NAME_KEY, NULL); name = g_settings_get_string (settings, HOME_NAME_KEY);
if (!(gconf_name && gconf_name[0])) g_object_unref (settings);
if (!(name && name[0]))
{ {
g_free (gconf_name); g_free (name);
return g_strdup (_("Home Folder")); return g_strdup (_("Home Folder"));
} }
else else
{ {
return gconf_name; return name;
} }
} }
g_object_unref (compare); g_object_unref (compare);