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 /widgets | |
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 'widgets')
-rw-r--r-- | widgets/misc/e-web-view.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c index d245437e84..beb865b98b 100644 --- a/widgets/misc/e-web-view.c +++ b/widgets/misc/e-web-view.c @@ -1122,6 +1122,7 @@ e_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, @@ -1143,6 +1144,7 @@ e_web_view_class_init (EWebViewClass *class) FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); +#endif g_object_class_install_property ( object_class, |