Commit 4611348e authored by Alberts Muktupāvels's avatar Alberts Muktupāvels

panel: don't use org.gnome.nautilus.desktop schema

It was removed from Nautilus in 3.28.
parent 9717ce80
...@@ -69,7 +69,6 @@ G_DEFINE_TYPE (PanelDesktopMenuItem, panel_desktop_menu_item, PANEL_TYPE_IMAGE_M ...@@ -69,7 +69,6 @@ G_DEFINE_TYPE (PanelDesktopMenuItem, panel_desktop_menu_item, PANEL_TYPE_IMAGE_M
struct _PanelPlaceMenuItemPrivate { struct _PanelPlaceMenuItemPrivate {
GtkWidget *menu; GtkWidget *menu;
GSettings *settings;
GtkRecentManager *recent_manager; GtkRecentManager *recent_manager;
...@@ -1137,12 +1136,6 @@ panel_place_menu_item_recreate_menu (GtkWidget *widget) ...@@ -1137,12 +1136,6 @@ panel_place_menu_item_recreate_menu (GtkWidget *widget)
} }
} }
static void
panel_place_menu_item_key_changed (GSettings *settings, const gchar *key, GtkWidget *place_item)
{
panel_place_menu_item_recreate_menu (place_item);
}
static void static void
panel_place_menu_item_gtk_bookmarks_changed (GFileMonitor *handle, panel_place_menu_item_gtk_bookmarks_changed (GFileMonitor *handle,
GFile *file, GFile *file,
...@@ -1203,8 +1196,6 @@ panel_place_menu_item_dispose (GObject *object) ...@@ -1203,8 +1196,6 @@ panel_place_menu_item_dispose (GObject *object)
{ {
PanelPlaceMenuItem *menuitem = (PanelPlaceMenuItem *) object; PanelPlaceMenuItem *menuitem = (PanelPlaceMenuItem *) object;
g_clear_object (&menuitem->priv->settings);
if (menuitem->priv->bookmarks_monitor != NULL) if (menuitem->priv->bookmarks_monitor != NULL)
{ {
g_file_monitor_cancel (menuitem->priv->bookmarks_monitor); g_file_monitor_cancel (menuitem->priv->bookmarks_monitor);
...@@ -1268,17 +1259,9 @@ panel_place_menu_item_init (PanelPlaceMenuItem *menuitem) ...@@ -1268,17 +1259,9 @@ panel_place_menu_item_init (PanelPlaceMenuItem *menuitem)
GFile *bookmark; GFile *bookmark;
char *bookmarks_filename; char *bookmarks_filename;
GError *error; GError *error;
GSettings *settings;
menuitem->priv = PANEL_PLACE_MENU_ITEM_GET_PRIVATE (menuitem); menuitem->priv = PANEL_PLACE_MENU_ITEM_GET_PRIVATE (menuitem);
settings = g_settings_new (GNOME_NAUTILUS_DESKTOP_SCHEMA);
menuitem->priv->settings = settings;
g_signal_connect (settings, "changed::" GNOME_NAUTILUS_DESKTOP_HOME_ICON_NAME_KEY,
G_CALLBACK (panel_place_menu_item_key_changed), menuitem);
menuitem->priv->recent_manager = gtk_recent_manager_get_default (); menuitem->priv->recent_manager = gtk_recent_manager_get_default ();
bookmarks_filename = panel_gtk_get_bookmark_file (); bookmarks_filename = panel_gtk_get_bookmark_file ();
......
...@@ -67,9 +67,6 @@ ...@@ -67,9 +67,6 @@
#define PANEL_MENU_BUTTON_CUSTOM_ICON_KEY "custom-icon" #define PANEL_MENU_BUTTON_CUSTOM_ICON_KEY "custom-icon"
#define PANEL_MENU_BUTTON_MENU_PATH_KEY "menu-path" #define PANEL_MENU_BUTTON_MENU_PATH_KEY "menu-path"
#define GNOME_NAUTILUS_DESKTOP_SCHEMA "org.gnome.nautilus.desktop"
#define GNOME_NAUTILUS_DESKTOP_HOME_ICON_NAME_KEY "home-icon-name"
#define GNOME_DESKTOP_WM_KEYBINDINGS_SCHEMA "org.gnome.desktop.wm.keybindings" #define GNOME_DESKTOP_WM_KEYBINDINGS_SCHEMA "org.gnome.desktop.wm.keybindings"
#define GNOME_DESKTOP_WM_KEYBINDINGS_ACTIVATE_WINDOW_MENU_KEY "activate-window-menu" #define GNOME_DESKTOP_WM_KEYBINDINGS_ACTIVATE_WINDOW_MENU_KEY "activate-window-menu"
#define GNOME_DESKTOP_WM_KEYBINDINGS_TOGGLE_MAXIMIZED_KEY "toggle-maximized" #define GNOME_DESKTOP_WM_KEYBINDINGS_TOGGLE_MAXIMIZED_KEY "toggle-maximized"
......
...@@ -719,18 +719,8 @@ panel_util_get_file_display_for_common_files (GFile *file) ...@@ -719,18 +719,8 @@ panel_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)) {
GSettings *settings = g_settings_new (GNOME_NAUTILUS_DESKTOP_SCHEMA);
char *home_foler_name = g_settings_get_string (settings, GNOME_NAUTILUS_DESKTOP_HOME_ICON_NAME_KEY);
g_object_unref (compare); g_object_unref (compare);
g_object_unref (settings); return g_strdup (_("Home"));
if (PANEL_GLIB_STR_EMPTY (home_foler_name)) {
g_free (home_foler_name);
return g_strdup (_("Home Folder"));
} else {
return home_foler_name;
}
} }
g_object_unref (compare); g_object_unref (compare);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment