diff options
| author | Federico Mena Quintero <federico@novell.com> | 2010-04-10 01:21:32 +0800 |
|---|---|---|
| committer | Federico Mena Quintero <federico@novell.com> | 2010-04-10 01:21:32 +0800 |
| commit | a16f08974d6955f843dddce3b9423c5349873488 (patch) | |
| tree | 864c537265450b65c47cb4b801817cd9eede5787 /shell | |
| parent | 5b397348258994539b452006e988be78a43a2fae (diff) | |
| parent | ad1de0aa0889edaa0ad9bc41c170fa84ec5536f2 (diff) | |
| download | gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar.gz gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar.bz2 gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar.lz gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar.xz gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar.zst gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.zip | |
Merge gnome-2-30 into express2 to get bugfixes
Note that express2 got some documentation for EExtensible and friends,
and that documentation is not in gnome-2-30 yet. We need to cherry-pick
those commits into gnome-2-30 and elsewhere.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/e-shell-utils.c | 2 | ||||
| -rw-r--r-- | shell/e-shell-window-private.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c index 1b80378277..4bc9c480cb 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. */ |