aboutsummaryrefslogtreecommitdiffstats
path: root/embed/ephy-embed-single.c
diff options
context:
space:
mode:
authorXan Lopez <xan@gnome.org>2009-09-07 23:13:39 +0800
committerXan Lopez <xan@gnome.org>2009-09-07 23:13:39 +0800
commitc1689576e6435878324322321e246f1676bf467c (patch)
tree8d05643b560ea326399467580d06ba0941ea8736 /embed/ephy-embed-single.c
parent7d58850eb100ff84bb2fe3f48658e01f64bb088c (diff)
downloadgsoc2013-epiphany-c1689576e6435878324322321e246f1676bf467c.tar
gsoc2013-epiphany-c1689576e6435878324322321e246f1676bf467c.tar.gz
gsoc2013-epiphany-c1689576e6435878324322321e246f1676bf467c.tar.bz2
gsoc2013-epiphany-c1689576e6435878324322321e246f1676bf467c.tar.lz
gsoc2013-epiphany-c1689576e6435878324322321e246f1676bf467c.tar.xz
gsoc2013-epiphany-c1689576e6435878324322321e246f1676bf467c.tar.zst
gsoc2013-epiphany-c1689576e6435878324322321e246f1676bf467c.zip
ephy-embed-single: protect against SoupPasswordManager going away
It might go away for 2.30, so protect against that.
Diffstat (limited to 'embed/ephy-embed-single.c')
-rw-r--r--embed/ephy-embed-single.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c
index 8ae2ad3df..4930f8e7b 100644
--- a/embed/ephy-embed-single.c
+++ b/embed/ephy-embed-single.c
@@ -20,6 +20,8 @@
#include "config.h"
+#define LIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY
+
#include "ephy-embed-single.h"
#include "ephy-embed-prefs.h"
#include "ephy-embed-type-builtins.h"
@@ -346,12 +348,14 @@ ephy_embed_single_initialize (EphyEmbedSingle *single)
/* Use GNOME proxy settings through libproxy */
soup_session_add_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
+#ifdef SOUP_TYPE_PASSWORD_MANAGER
/* Use GNOME keyring to store passwords. Only add the manager if we
are not using a private session, otherwise we want any new
password to expire when we exit *and* we don't want to use any
existing password in the keyring */
if (ephy_has_private_profile () == FALSE)
soup_session_add_feature_by_type (session, SOUP_TYPE_PASSWORD_MANAGER_GNOME);
+#endif
return TRUE;
}