aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-02-13 02:40:33 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-02-13 02:40:33 +0800
commit1afbba4a8b49c9911337f42d040608a8e35e6577 (patch)
tree40639ca43ec38615a49c7242dc9d238e9fa048d0 /modules
parent7a1677520d439aee68c5ab0268a951d0b411e3a0 (diff)
downloadgsoc2013-evolution-1afbba4a8b49c9911337f42d040608a8e35e6577.tar
gsoc2013-evolution-1afbba4a8b49c9911337f42d040608a8e35e6577.tar.gz
gsoc2013-evolution-1afbba4a8b49c9911337f42d040608a8e35e6577.tar.bz2
gsoc2013-evolution-1afbba4a8b49c9911337f42d040608a8e35e6577.tar.lz
gsoc2013-evolution-1afbba4a8b49c9911337f42d040608a8e35e6577.tar.xz
gsoc2013-evolution-1afbba4a8b49c9911337f42d040608a8e35e6577.tar.zst
gsoc2013-evolution-1afbba4a8b49c9911337f42d040608a8e35e6577.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 'modules')
-rw-r--r--modules/mail/em-composer-prefs.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 0c28c24297..3added6de1 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -563,6 +563,9 @@ 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",
@@ -570,6 +573,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
G_BINDING_SYNC_CREATE |
G_BINDING_INVERT_BOOLEAN);
#endif
+#endif
signature_tree_view = e_signature_manager_get_tree_view (
E_SIGNATURE_MANAGER (widget));
@@ -580,6 +584,9 @@ 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",
@@ -587,6 +594,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
G_BINDING_SYNC_CREATE |
G_BINDING_INVERT_BOOLEAN);
#endif
+#endif
g_object_bind_property (
signature_tree_view, "selected",