diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-02-13 02:40:33 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:41:34 +0800 |
| commit | f03d5a9023edf176667d3164583e5ee5f7c089ab (patch) | |
| tree | 0ba14557c88b3e6f0575135b7ef763b8969adea1 /shell | |
| parent | 274697623e2a6749a3b173c28f4832d9e88019e3 (diff) | |
| download | gsoc2013-evolution-f03d5a9023edf176667d3164583e5ee5f7c089ab.tar.gz gsoc2013-evolution-f03d5a9023edf176667d3164583e5ee5f7c089ab.tar.zst gsoc2013-evolution-f03d5a9023edf176667d3164583e5ee5f7c089ab.zip | |
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.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/e-shell-utils.c | 4 | ||||
| -rw-r--r-- | shell/e-shell-window-private.c | 4 | ||||
| -rw-r--r-- | shell/e-shell.c | 4 |
3 files changed, 12 insertions, 0 deletions
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 ***/ |