From f03d5a9023edf176667d3164583e5ee5f7c089ab Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 12 Feb 2011 13:40:33 -0500 Subject: 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. --- shell/e-shell-utils.c | 4 ++++ shell/e-shell-window-private.c | 4 ++++ shell/e-shell.c | 4 ++++ 3 files changed, 12 insertions(+) (limited to 'shell') 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 ***/ -- cgit v1.2.3