Bug 642171 - Implicit libgnome dependency for lockdown GConf keys

Lockdown keys have moved to gsettings-desktop-schemas, so disable
lockdown integration until we're ready for GSettings.

5 files changed, 25 insertions, 0 deletions

diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index b9948ae240..d7942d0985 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -2974,12 +2974,17 @@ mail_reader_update_actions (EMailReader *reader,
 	shell = e_shell_backend_get_shell (shell_backend);
 	shell_settings = e_shell_get_shell_settings (shell);
 
+#if 0  /* XXX Lockdown keys have moved to gsettings-desktop-schemas,
+	*     so disable lockdown integration until we're ready for
+	*     GSettings. */
 #ifndef G_OS_WIN32
 	disable_printing = e_shell_settings_get_boolean (
 		shell_settings, "disable-printing");
 #else
 	disable_printing = FALSE;
 #endif
+#endif
+	disable_printing = FALSE;
 
 	have_enabled_account =
 		(state & E_MAIL_READER_HAVE_ENABLED_ACCOUNT);
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 0c28c24297..3added6de1 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -563,6 +563,9 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 			widget, "prefer-html",
 			G_BINDING_SYNC_CREATE);
 
+#if 0  /* XXX Lockdown keys have moved to gsettings-desktop-schemas,
+	*     so disable lockdown integration until we're ready for
+	*     GSettings. */
 #ifndef G_OS_WIN32
 	g_object_bind_property (
 		shell_settings, "disable-command-line",
@@ -570,6 +573,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 		G_BINDING_SYNC_CREATE |
 		G_BINDING_INVERT_BOOLEAN);
 #endif
+#endif
 
 	signature_tree_view = e_signature_manager_get_tree_view (
 		E_SIGNATURE_MANAGER (widget));
@@ -580,6 +584,9 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
 
+#if 0  /* XXX Lockdown keys have moved to gsettings-desktop-schemas,
+	*     so disable lockdown integration until we're ready for
+	*     GSettings. */
 #ifndef G_OS_WIN32
 	g_object_bind_property (
 		shell_settings, "disable-command-line",
@@ -587,6 +594,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 		G_BINDING_SYNC_CREATE |
 		G_BINDING_INVERT_BOOLEAN);
 #endif
+#endif
 
 	g_object_bind_property (
 		signature_tree_view, "selected",
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index e5cd6c5546..327033d514 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -72,6 +72,9 @@ e_shell_configure_web_view (EShell *shell,
 
 	shell_settings = e_shell_get_shell_settings (shell);
 
+#if 0  /* XXX Lockdown keys have moved to gsettings-desktop-scheams,
+	*     so disable lockdown integration until we're ready for
+	*     GSettings. */
 #ifndef G_OS_WIN32
 	g_object_bind_property (
 		shell_settings, "disable-printing",
@@ -83,6 +86,7 @@ e_shell_configure_web_view (EShell *shell,
 		web_view, "disable-save-to-disk",
 		G_BINDING_SYNC_CREATE);
 #endif
+#endif
 }
 
 /**
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c
index 6ad1875bd0..1f12c9c41e 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -356,6 +356,9 @@ e_shell_window_private_constructed (EShellWindow *shell_window)
 		shell_window, "notify::active-view",
 		G_CALLBACK (e_shell_window_update_search_menu), NULL);
 
+#if 0  /* XXX Lockdown keys have moved to gsettings-desktop-schemas,
+	*     so disable lockdown integration until we're ready for
+	*     GSettings. */
 #ifndef G_OS_WIN32
 	/* Support lockdown. */
 
@@ -382,6 +385,7 @@ e_shell_window_private_constructed (EShellWindow *shell_window)
 		action_group, "visible",
 		G_BINDING_SYNC_CREATE |
 		G_BINDING_INVERT_BOOLEAN);
+#endif /* G_OS_WIN32 */
 #endif
 
 	/* Bind GObject properties to GObject properties. */
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 82ccf6df9e..6e37e7e533 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -1213,6 +1213,9 @@ e_shell_init (EShell *shell)
 		"start-offline",
 		"/apps/evolution/shell/start_offline");
 
+#if 0  /* XXX Lockdown keys have moved to gsettings-desktop-schemas,
+	*     so disable lockdown integration until we're ready for
+	*     GSettings. */
 #ifndef G_OS_WIN32
 	e_shell_settings_install_property_for_key (
 		"disable-application-handlers",
@@ -1234,6 +1237,7 @@ e_shell_init (EShell *shell)
 		"disable-save-to-disk",
 		"/desktop/gnome/lockdown/disable_save_to_disk");
 #endif /* G_OS_WIN32 */
+#endif
 
 	/*** Session Management ***/