From: Christian Dywan <christian@twotoasts.de>
Date: Mon, 16 Mar 2009 01:20:58 +0000 (+0100)
Subject: Drop libSoup guards in KatzeHTTPAuth and Katze HTTPCookies
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6ac02daf3afcefb2588fbcf0264a08a87d65887;p=midori

Drop libSoup guards in KatzeHTTPAuth and Katze HTTPCookies
---

diff --git a/katze/katze-http-auth.c b/katze/katze-http-auth.c
index 4e4cd8a1..ae7b2382 100644
--- a/katze/katze-http-auth.c
+++ b/katze/katze-http-auth.c
@@ -15,10 +15,7 @@
 
 #include "katze-http-auth.h"
 
-#if HAVE_LIBSOUP
-    #include <libsoup/soup.h>
-#endif
-
+#include <libsoup/soup.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
@@ -32,7 +29,6 @@ struct _KatzeHttpAuthClass
     GObjectClass parent_class;
 };
 
-#if HAVE_LIBSOUP
 static void
 katze_http_auth_session_feature_iface_init (SoupSessionFeatureInterface *iface,
                                             gpointer                     data);
@@ -202,9 +198,6 @@ katze_http_auth_session_feature_iface_init (SoupSessionFeatureInterface *iface,
     iface->attach = katze_http_auth_attach;
     iface->detach = katze_http_auth_detach;
 }
-#else
-G_DEFINE_TYPE (KatzeHttpAuth, katze_http_auth, G_TYPE_OBJECT)
-#endif
 
 static void
 katze_http_auth_class_init (KatzeHttpAuthClass* class)
diff --git a/katze/katze-http-cookies.c b/katze/katze-http-cookies.c
index f2b39733..e6d29d30 100644
--- a/katze/katze-http-cookies.c
+++ b/katze/katze-http-cookies.c
@@ -15,13 +15,10 @@
 
 #include "katze-http-cookies.h"
 
-#if HAVE_LIBSOUP
-    #include <libsoup/soup.h>
-#endif
-
 #include <stdlib.h>
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
+#include <libsoup/soup.h>
+#include <gtk/gtk.h>
 
 struct _KatzeHttpCookies
 {
@@ -33,7 +30,6 @@ struct _KatzeHttpCookiesClass
     GObjectClass parent_class;
 };
 
-#if HAVE_LIBSOUP
 static void
 katze_http_cookies_session_feature_iface_init (SoupSessionFeatureInterface *iface,
                                                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,
                          katze_http_cookies_session_feature_iface_init));
 
-#if HAVE_LIBSOUP_2_25_2
-
 /* Cookie jar saving to Mozilla format
    Copyright (C) 2008 Xan Lopez <xan@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,
         katze_http_cookies_session_request_queued_cb, feature);
 }
-#endif
 
 static void
 katze_http_cookies_session_feature_iface_init (SoupSessionFeatureInterface *iface,
                                                gpointer                     data)
 {
-    #if HAVE_LIBSOUP_2_25_2
     iface->attach = katze_http_cookies_attach;
     iface->detach = katze_http_cookies_detach;
-    #endif
 }
-#else
-G_DEFINE_TYPE (KatzeHttpCookies, katze_http_cookies, G_TYPE_OBJECT)
-#endif
 
 static void
 katze_http_cookies_class_init (KatzeHttpCookiesClass* class)