From ba6a2343869f6be82f44261f183cd6925659d5ee Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 27 Mar 2011 15:16:39 -0400 Subject: 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. --- modules/mail/em-composer-prefs.c | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'modules/mail') diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index 3added6de1..18f12e8c9e 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -563,18 +563,6 @@ 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", - widget, "allow-scripts", - G_BINDING_SYNC_CREATE | - G_BINDING_INVERT_BOOLEAN); -#endif -#endif - signature_tree_view = e_signature_manager_get_tree_view ( E_SIGNATURE_MANAGER (widget)); @@ -584,18 +572,6 @@ 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", - widget, "allow-scripts", - G_BINDING_SYNC_CREATE | - G_BINDING_INVERT_BOOLEAN); -#endif -#endif - g_object_bind_property ( signature_tree_view, "selected", widget, "signature", -- cgit v1.2.3