aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-02-13 02:40:33 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:41:34 +0800
commitf03d5a9023edf176667d3164583e5ee5f7c089ab (patch)
tree0ba14557c88b3e6f0575135b7ef763b8969adea1 /mail
parent274697623e2a6749a3b173c28f4832d9e88019e3 (diff)
downloadgsoc2013-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 'mail')
-rw-r--r--mail/e-mail-reader.c5
1 files changed, 5 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);