[gnome-terminal] nautilus: The desktop-is-home-dir key has been removed from nautilus



commit 33dba6401333116f4aaf861931c00095ae98790a
Author: Christian Persch <chpe gnome org>
Date:   Wed Jan 16 15:36:02 2013 +0100

    nautilus: The desktop-is-home-dir key has been removed from nautilus

 src/terminal-nautilus.c |   18 ++----------------
 1 files changed, 2 insertions(+), 16 deletions(-)
---
diff --git a/src/terminal-nautilus.c b/src/terminal-nautilus.c
index d696ba1..13cb92e 100644
--- a/src/terminal-nautilus.c
+++ b/src/terminal-nautilus.c
@@ -46,7 +46,6 @@ typedef struct _TerminalNautilusClass TerminalNautilusClass;
 struct _TerminalNautilus {
         GObject parent_instance;
 
-        GSettings *nautilus_prefs;
         GSettings *lockdown_prefs;
         gboolean have_mc;
 };
@@ -159,8 +158,7 @@ display_mc_item (TerminalNautilus *nautilus)
 static inline gboolean
 desktop_is_home_dir (TerminalNautilus *nautilus)
 {
-  return g_settings_get_boolean (nautilus->nautilus_prefs,
-                                 "desktop-is-home-dir");
+  return FALSE;
 }
 
 /* a very simple URI parsing routine from Launchpad #333462, until GLib supports URI parsing (GNOME #489862) */
@@ -720,13 +718,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (TerminalNautilus, terminal_nautilus, G_TYPE_OBJE
 static void 
 terminal_nautilus_init (TerminalNautilus *nautilus)
 {
-  GSettings *settings;
   char *path;
 
-  settings = g_settings_new (NAUTILUS_SETTINGS_SCHEMA);
-  nautilus->nautilus_prefs = g_settings_get_child (settings, "preferences");
-  g_object_unref (settings);
-
   nautilus->lockdown_prefs = g_settings_new (GNOME_DESKTOP_LOCKDOWN_SETTINGS_SCHEMA);
 
   path = g_find_program_in_path ("mc");
@@ -739,14 +732,7 @@ terminal_nautilus_dispose (GObject *object)
 {
   TerminalNautilus *nautilus = TERMINAL_NAUTILUS (object);
 
-  if (nautilus->nautilus_prefs != NULL) {
-    g_object_unref (nautilus->nautilus_prefs);
-    nautilus->nautilus_prefs = NULL;
-  }
-  if (nautilus->lockdown_prefs != NULL) {
-    g_object_unref (nautilus->lockdown_prefs);
-    nautilus->lockdown_prefs = NULL;
-  }
+  g_clear_object (&nautilus->lockdown_prefs);
 
   G_OBJECT_CLASS (terminal_nautilus_parent_class)->dispose (object);
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]