aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFridrich Strba <fridrich.strba@bluewin.ch>2010-03-21 07:12:01 +0800
committerFridrich Štrba <fridrich.strba@bluewin.ch>2010-04-08 05:49:18 +0800
commit3dfd9aa7c4b24f8971382dcc5278714956066ff8 (patch)
tree5de9c4c39898f1edc9e2ef7372e43039e49119eb
parentf07352c5b344cb7f254a41695909622a759efe86 (diff)
downloadgsoc2013-evolution-3dfd9aa7c4b24f8971382dcc5278714956066ff8.tar
gsoc2013-evolution-3dfd9aa7c4b24f8971382dcc5278714956066ff8.tar.gz
gsoc2013-evolution-3dfd9aa7c4b24f8971382dcc5278714956066ff8.tar.bz2
gsoc2013-evolution-3dfd9aa7c4b24f8971382dcc5278714956066ff8.tar.lz
gsoc2013-evolution-3dfd9aa7c4b24f8971382dcc5278714956066ff8.tar.xz
gsoc2013-evolution-3dfd9aa7c4b24f8971382dcc5278714956066ff8.tar.zst
gsoc2013-evolution-3dfd9aa7c4b24f8971382dcc5278714956066ff8.zip
[win32] Be consistent in disabling the lockdown options.
-rw-r--r--mail/e-mail-reader.c4
-rw-r--r--modules/mail/em-composer-prefs.c4
-rw-r--r--shell/e-shell-utils.c2
-rw-r--r--shell/e-shell-window-private.c2
-rw-r--r--widgets/misc/e-web-view.c2
5 files changed, 14 insertions, 0 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index ad60195b58..d238d500a9 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -2159,8 +2159,12 @@ mail_reader_update_actions (EMailReader *reader)
shell = e_shell_backend_get_shell (shell_backend);
shell_settings = e_shell_get_shell_settings (shell);
+#ifndef G_OS_WIN32
disable_printing = e_shell_settings_get_boolean (
shell_settings, "disable-printing");
+#else
+ disable_printing = FALSE;
+#endif
have_an_account =
(state & E_MAIL_READER_HAVE_ACCOUNT);
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 3d1cf2ed08..574657806e 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -521,9 +521,11 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
shell_settings, "composer-format-html",
widget, "prefer-html");
+#ifndef G_OS_WIN32
e_binding_new_with_negation (
shell_settings, "disable-command-line",
widget, "allow-scripts");
+#endif
signature_tree_view = e_signature_manager_get_tree_view (
E_SIGNATURE_MANAGER (widget));
@@ -533,9 +535,11 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
gtk_container_add (GTK_CONTAINER (container), widget);
gtk_widget_show (widget);
+#ifndef G_OS_WIN32
e_binding_new_with_negation (
shell_settings, "disable-command-line",
widget, "allow-scripts");
+#endif
e_binding_new (
signature_tree_view, "selected",
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index a584289d20..c7b296931c 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -70,6 +70,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");
@@ -77,6 +78,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 c4389ab3bc..faccac8052 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -359,6 +359,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);
@@ -378,6 +379,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. */
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index ce41c32d4c..e9fc71d7ca 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -1063,6 +1063,7 @@ web_view_class_init (EWebViewClass *class)
PROP_COPY_TARGET_LIST,
"copy-target-list");
+#ifndef G_OS_WIN32
g_object_class_install_property (
object_class,
PROP_DISABLE_PRINTING,
@@ -1082,6 +1083,7 @@ web_view_class_init (EWebViewClass *class)
NULL,
FALSE,
G_PARAM_READWRITE));
+#endif
g_object_class_install_property (
object_class,