[evolution] [win32] Be consistent in disabling the lockdown options.
- From: Fridrich Strba <strba src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] [win32] Be consistent in disabling the lockdown options.
- Date: Sat, 20 Mar 2010 23:23:12 +0000 (UTC)
commit 11cd3fda1a54523ffa450b90f7ac859198d49fbe
Author: Fridrich Strba <fridrich strba bluewin ch>
Date: Sun Mar 21 00:12:01 2010 +0100
[win32] Be consistent in disabling the lockdown options.
mail/e-mail-reader.c | 4 ++++
modules/mail/em-composer-prefs.c | 2 ++
shell/e-shell-utils.c | 2 ++
shell/e-shell-window-private.c | 2 ++
widgets/misc/e-web-view.c | 2 ++
5 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 9fe438f..7a8d7a9 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 3d1cf2e..3fbb1da 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));
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index a584289..c7b2969 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 c4389ab..faccac8 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 ce41c32..e9fc71d 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,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]