aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-02-19 08:35:59 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:41:36 +0800
commit3b6c8972a51d635309b789b1aef9034ca23dc737 (patch)
tree3e2843b8f664df4c022b6cf755828a1296fd5718 /shell
parent333ccc8abf033453996e4a7e16712f2fc3b9e05a (diff)
downloadgsoc2013-evolution-3b6c8972a51d635309b789b1aef9034ca23dc737.tar
gsoc2013-evolution-3b6c8972a51d635309b789b1aef9034ca23dc737.tar.gz
gsoc2013-evolution-3b6c8972a51d635309b789b1aef9034ca23dc737.tar.bz2
gsoc2013-evolution-3b6c8972a51d635309b789b1aef9034ca23dc737.tar.lz
gsoc2013-evolution-3b6c8972a51d635309b789b1aef9034ca23dc737.tar.xz
gsoc2013-evolution-3b6c8972a51d635309b789b1aef9034ca23dc737.tar.zst
gsoc2013-evolution-3b6c8972a51d635309b789b1aef9034ca23dc737.zip
Coding style and whitespace cleanup.
Diffstat (limited to 'shell')
-rw-r--r--shell/e-shell-utils.c6
-rw-r--r--shell/e-shell-window-private.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index 327033d514..b1de7119a8 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -65,6 +65,9 @@ void
e_shell_configure_web_view (EShell *shell,
EWebView *web_view)
{
+#if 0 /* XXX Lockdown keys have moved to gsettings-desktop-scheams,
+ * so disable lockdown integration until we're ready for
+ * GSettings. */
EShellSettings *shell_settings;
g_return_if_fail (E_IS_SHELL (shell));
@@ -72,9 +75,6 @@ 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",
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c
index 6dcba975bc..db2bf069a9 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -261,7 +261,9 @@ void
e_shell_window_private_constructed (EShellWindow *shell_window)
{
EShellWindowPrivate *priv = shell_window->priv;
+#if 0
EShellSettings *shell_settings;
+#endif
EShell *shell;
GConfBridge *bridge;
GtkAction *action;
@@ -282,7 +284,9 @@ e_shell_window_private_constructed (EShellWindow *shell_window)
window = GTK_WINDOW (shell_window);
shell = e_shell_window_get_shell (shell_window);
+#if 0
shell_settings = e_shell_get_shell_settings (shell);
+#endif
ui_manager = e_shell_window_get_ui_manager (shell_window);
e_shell_configure_ui_manager (shell, E_UI_MANAGER (ui_manager));