aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shell.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-03-28 03:16:39 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:41:50 +0800
commit392973975c3e4a4e8fe17731b5e397ae10a91517 (patch)
tree40d5e138d9d116af9da0fbc58b304b2e4ffad774 /shell/e-shell.c
parent6e996d8023dc195cb07290a729d7d8a3ccb76e65 (diff)
downloadgsoc2013-evolution-392973975c3e4a4e8fe17731b5e397ae10a91517.tar.gz
gsoc2013-evolution-392973975c3e4a4e8fe17731b5e397ae10a91517.tar.zst
gsoc2013-evolution-392973975c3e4a4e8fe17731b5e397ae10a91517.zip
Restore lockdown integration.
With lockdown settings available through GSettings, widgets can handle lockdown integration themselves without having to use EShellSettings. Also fixed a few places where printing or save-to-disk actions were either not properly wired up or not responding to lockdown settings, but much more work needs done. Attachments, for example, are not honoring the disable-save-to-disk setting at all. This too requires the recently-added gsettings-desktop-schemas dependency.
Diffstat (limited to 'shell/e-shell.c')
-rw-r--r--shell/e-shell.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c
index d7ecf69d8c..d9c3508161 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -1244,32 +1244,6 @@ 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",
- "/desktop/gnome/lockdown/disable_application_handlers");
-
- e_shell_settings_install_property_for_key (
- "disable-command-line",
- "/desktop/gnome/lockdown/disable_command_line");
-
- e_shell_settings_install_property_for_key (
- "disable-printing",
- "/desktop/gnome/lockdown/disable_printing");
-
- e_shell_settings_install_property_for_key (
- "disable-print-setup",
- "/desktop/gnome/lockdown/disable_print_setup");
-
- e_shell_settings_install_property_for_key (
- "disable-save-to-disk",
- "/desktop/gnome/lockdown/disable_save_to_disk");
-#endif /* G_OS_WIN32 */
-#endif
-
/*** Session Management ***/
sm_client = egg_sm_client_get ();