From b329a61d561198cd405721372580d05476c2240a Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Mon, 03 May 2010 12:37:30 +0000
Subject: [shell] Port override_restrictions gconf key to GSettings

---
(limited to 'shell/main.c')

diff --git a/shell/main.c b/shell/main.c
index dfe6a20..d7d6e15 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -216,6 +216,11 @@ main (int argc, char *argv[])
 	GOptionContext *context;
 	GError         *error = NULL;
 
+#ifdef WITH_GCONF
+	/* Remove when porting is done */
+	g_setenv ("GSETTINGS_BACKEND", "gconf", FALSE);
+#endif
+
 #ifdef G_OS_WIN32
 
     if (fileno (stdout) != -1 &&
--
cgit v0.9.1