debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Drop libSoup guards in KatzeHTTPAuth and Katze HTTPCookies

Browse source
This commit is contained in:
Christian Dywan 2009-03-16 02:20:58 +01:00
parent d30c2aa62d
commit a6ac02daf3
2 changed files with 3 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
katze/katze-http-auth.c
View file

@ -15,10 +15,7 @@
#include "katze-http-auth.h" #include "katze-http-auth.h"
#if HAVE_LIBSOUP
#include <libsoup/soup.h> #include <libsoup/soup.h>
#endif
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
@ -32,7 +29,6 @@ struct _KatzeHttpAuthClass
GObjectClass parent_class; GObjectClass parent_class;
}; };
#if HAVE_LIBSOUP
static void static void
katze_http_auth_session_feature_iface_init (SoupSessionFeatureInterface *iface, katze_http_auth_session_feature_iface_init (SoupSessionFeatureInterface *iface,
gpointer data); gpointer data);
@ -202,9 +198,6 @@ katze_http_auth_session_feature_iface_init (SoupSessionFeatureInterface *iface,
iface->attach = katze_http_auth_attach; iface->attach = katze_http_auth_attach;
iface->detach = katze_http_auth_detach; iface->detach = katze_http_auth_detach;
} }
#else
G_DEFINE_TYPE (KatzeHttpAuth, katze_http_auth, G_TYPE_OBJECT)
#endif
static void static void
katze_http_auth_class_init (KatzeHttpAuthClass* class) katze_http_auth_class_init (KatzeHttpAuthClass* class)

16
katze/katze-http-cookies.c
View file

@ -15,13 +15,10 @@
#include "katze-http-cookies.h" #include "katze-http-cookies.h"
#if HAVE_LIBSOUP
#include <libsoup/soup.h>
#endif
#include <stdlib.h> #include <stdlib.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <libsoup/soup.h>
#include <gtk/gtk.h>
struct _KatzeHttpCookies struct _KatzeHttpCookies
{ {
@ -33,7 +30,6 @@ struct _KatzeHttpCookiesClass
GObjectClass parent_class; GObjectClass parent_class;
}; };
#if HAVE_LIBSOUP
static void static void
katze_http_cookies_session_feature_iface_init (SoupSessionFeatureInterface *iface, katze_http_cookies_session_feature_iface_init (SoupSessionFeatureInterface *iface,
gpointer data); gpointer data);
@ -42,8 +38,6 @@ G_DEFINE_TYPE_WITH_CODE (KatzeHttpCookies, katze_http_cookies, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE, G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE,
katze_http_cookies_session_feature_iface_init)); katze_http_cookies_session_feature_iface_init));
#if HAVE_LIBSOUP_2_25_2
/* Cookie jar saving to Mozilla format /* Cookie jar saving to Mozilla format
Copyright (C) 2008 Xan Lopez <xan@gnome.org> Copyright (C) 2008 Xan Lopez <xan@gnome.org>
Copyright (C) 2008 Dan Winship <danw@gnome.org> Copyright (C) 2008 Dan Winship <danw@gnome.org>
@ -305,20 +299,14 @@ katze_http_cookies_detach (SoupSessionFeature* feature,
g_signal_handlers_disconnect_by_func (session, g_signal_handlers_disconnect_by_func (session,
katze_http_cookies_session_request_queued_cb, feature); katze_http_cookies_session_request_queued_cb, feature);
} }
#endif
static void static void
katze_http_cookies_session_feature_iface_init (SoupSessionFeatureInterface *iface, katze_http_cookies_session_feature_iface_init (SoupSessionFeatureInterface *iface,
gpointer data) gpointer data)
{ {
#if HAVE_LIBSOUP_2_25_2
iface->attach = katze_http_cookies_attach; iface->attach = katze_http_cookies_attach;
iface->detach = katze_http_cookies_detach; iface->detach = katze_http_cookies_detach;
#endif
} }
#else
G_DEFINE_TYPE (KatzeHttpCookies, katze_http_cookies, G_TYPE_OBJECT)
#endif
static void static void
katze_http_cookies_class_init (KatzeHttpCookiesClass* class) katze_http_cookies_class_init (KatzeHttpCookiesClass* class)