aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@novell.com>2010-04-10 04:09:46 +0800
committerFederico Mena Quintero <federico@novell.com>2010-04-10 04:09:46 +0800
commitb360395495a273356355959c1067c00abf18e2d4 (patch)
tree8316320e8e3c2078fafa9ced6a503197b5e6d6cd /shell
parent5b5ac7a174676bf665b627b25d25ae9a9de689f4 (diff)
parenta16f08974d6955f843dddce3b9423c5349873488 (diff)
downloadgsoc2013-evolution-b360395495a273356355959c1067c00abf18e2d4.tar
gsoc2013-evolution-b360395495a273356355959c1067c00abf18e2d4.tar.gz
gsoc2013-evolution-b360395495a273356355959c1067c00abf18e2d4.tar.bz2
gsoc2013-evolution-b360395495a273356355959c1067c00abf18e2d4.tar.lz
gsoc2013-evolution-b360395495a273356355959c1067c00abf18e2d4.tar.xz
gsoc2013-evolution-b360395495a273356355959c1067c00abf18e2d4.tar.zst
gsoc2013-evolution-b360395495a273356355959c1067c00abf18e2d4.zip
Merge branch 'express2' into express2-reduced-preferences
Diffstat (limited to 'shell')
-rw-r--r--shell/e-shell-utils.c2
-rw-r--r--shell/e-shell-window-private.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index 81380d4d0a..12283b185c 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -76,6 +76,7 @@ e_shell_configure_web_view (EShell *shell,
shell_settings = e_shell_get_shell_settings (shell);
+#ifndef G_OS_WIN32
e_binding_new (
shell_settings, "disable-printing",
web_view, "disable-printing");
@@ -83,6 +84,7 @@ e_shell_configure_web_view (EShell *shell,
e_binding_new (
shell_settings, "disable-save-to-disk",
web_view, "disable-save-to-disk");
+#endif
}
/**
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c
index 0b44aa866e..eda1d9106b 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -358,6 +358,7 @@ e_shell_window_private_constructed (EShellWindow *shell_window)
shell_window, "notify::active-view",
G_CALLBACK (e_shell_window_update_search_menu), NULL);
+#ifndef G_OS_WIN32
/* Support lockdown. */
action_group = ACTION_GROUP (LOCKDOWN_PRINTING);
@@ -377,6 +378,7 @@ e_shell_window_private_constructed (EShellWindow *shell_window)
e_binding_new_with_negation (
shell_settings, "disable-save-to-disk",
action_group, "visible");
+#endif
/* Bind GObject properties to GObject properties. */