Only add the Auth feature if WebKit didn't already

This commit is contained in:
Christian Dywan 2009-02-17 18:34:27 +01:00
parent 3763990c3a
commit 5aaff908cb
2 changed files with 10 additions and 7 deletions

View file

@ -1,5 +1,5 @@
/* /*
Copyright (C) 2009 Christian Dywan <christian@twotoasts.de> Copyright (C) 2008-2009 Christian Dywan <christian@twotoasts.de>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Lesser General Public
@ -39,7 +39,7 @@ katze_http_auth_session_feature_iface_init (SoupSessionFeatureInterface *iface,
G_DEFINE_TYPE_WITH_CODE (KatzeHttpAuth, katze_http_auth, G_TYPE_OBJECT, G_DEFINE_TYPE_WITH_CODE (KatzeHttpAuth, katze_http_auth, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE, G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE,
katze_http_auth_session_feature_iface_init)) katze_http_auth_session_feature_iface_init));
static void static void
authentication_dialog_response_cb (GtkWidget* dialog, authentication_dialog_response_cb (GtkWidget* dialog,

View file

@ -1409,6 +1409,9 @@ soup_session_constructed_cb (GObject* object)
g_signal_connect (settings, "notify::ident-string", g_signal_connect (settings, "notify::ident-string",
G_CALLBACK (soup_session_settings_notify_ident_string_cb), object); G_CALLBACK (soup_session_settings_notify_ident_string_cb), object);
/* Only add the Auth feature if WebKit didn't already */
if (!g_signal_has_handler_pending (session,
g_signal_lookup ("authenticate", SOUP_TYPE_SESSION), 0, FALSE))
soup_session_add_feature_by_type (session, KATZE_TYPE_HTTP_AUTH); soup_session_add_feature_by_type (session, KATZE_TYPE_HTTP_AUTH);
midori_soup_session_debug (session); midori_soup_session_debug (session);