Merge lp:~kalikiana/midori/wk2feedpanelwarn into lp:midori

[Cris Dywan]

Move #ifndef HAVE_WEBKIT2 to fix feed panel warnings

[gue5t gue5t (gue5t)]

review: Approve

=== modified file 'extensions/feed-panel/katze-net.c'
--- extensions/feed-panel/katze-net.c	2013-07-27 12:35:55 +0000
+++ extensions/feed-panel/katze-net.c	2013-08-02 18:05:31 +0000
@@ -66,6 +66,7 @@
     KatzeNetRequest* request;
 } KatzeNetPriv;
 
+#ifndef HAVE_WEBKIT2
 static void
 katze_net_priv_free (KatzeNetPriv* priv)
 {
@@ -85,7 +86,6 @@
 katze_net_got_headers_cb (SoupMessage*  msg,
                           KatzeNetPriv* priv)
 {
-#ifndef HAVE_WEBKIT2
     KatzeNetRequest* request = priv->request;
 
     switch (msg->status_code)
@@ -106,7 +106,6 @@
         g_signal_handlers_disconnect_by_func (msg, katze_net_got_body_cb, priv);
         soup_session_cancel_message (webkit_get_default_session (), msg, 1);
     }
-#endif
 }
 
 static void
@@ -144,6 +143,7 @@
     katze_net_priv_free (priv);
     return FALSE;
 }
+#endif
 
 /**
  * katze_net_load_uri: