Merge lp:~tuxator/midori/katze-net into lp:midori

[Paweł Forysiuk]

Move katze-net to feed-extension cause it is the last user of it

[Cris Dywan (kalikiana)]

Makes sense. And nice to see an unused code path go. Runs fine from a bit of testing.

review: Approve

=== renamed file 'katze/katze-net.c' => 'extensions/feed-panel/katze-net.c'
--- katze/katze-net.c	2013-06-17 20:27:52 +0000
+++ extensions/feed-panel/katze-net.c	2013-07-27 12:43:27 +0000
@@ -133,42 +133,6 @@
 }
 
 static gboolean
-katze_net_local_cb (KatzeNetPriv* priv)
-{
-    KatzeNetRequest* request = priv->request;
-    gchar* filename = g_filename_from_uri (request->uri, NULL, NULL);
-
-    if (!filename || g_access (filename, F_OK) != 0)
-    {
-        request->status = KATZE_NET_NOT_FOUND;
-        if (priv->status_cb)
-            priv->status_cb (request, priv->user_data);
-    }
-    else if (!(priv->status_cb && !priv->status_cb (request, priv->user_data))
-           &&  priv->transfer_cb)
-    {
-        gchar* contents = NULL;
-        gsize length;
-
-        request->status = KATZE_NET_VERIFIED;
-        if (!g_file_get_contents (filename, &contents, &length, NULL))
-        {
-            request->status = KATZE_NET_FAILED;
-        }
-        else
-        {
-            request->status = KATZE_NET_DONE;
-            request->data = contents;
-            request->length = length;
-        }
-        priv->transfer_cb (request, priv->user_data);
-    }
-    g_free (filename);
-    katze_net_priv_free (priv);
-    return FALSE;
-}
-
-static gboolean
 katze_net_default_cb (KatzeNetPriv* priv)
 {
     KatzeNetRequest* request;
@@ -244,10 +208,7 @@
         return;
     }
 
-    if (g_str_has_prefix (uri, "file://"))
-        g_idle_add ((GSourceFunc)katze_net_local_cb, priv);
-    else
-        g_idle_add ((GSourceFunc)katze_net_default_cb, priv);
+    g_idle_add ((GSourceFunc)katze_net_default_cb, priv);
 #endif
 }
 

=== renamed file 'katze/katze-net.h' => 'extensions/feed-panel/katze-net.h'
--- katze/katze-net.h	2013-06-17 20:27:52 +0000
+++ extensions/feed-panel/katze-net.h	2013-07-27 12:43:27 +0000
@@ -12,11 +12,6 @@
 #ifndef __KATZE_NET_H__
 #define __KATZE_NET_H__
 
-#ifndef HAVE_WEBKIT2
-    #include <webkit/webkit.h>
-#else
-    #include <webkit2/webkit2.h>
-#endif
 #include "katze-utils.h"
 
 G_BEGIN_DECLS

=== modified file 'extensions/feed-panel/main.c'
--- extensions/feed-panel/main.c	2013-04-20 00:59:18 +0000
+++ extensions/feed-panel/main.c	2013-07-27 12:43:27 +0000
@@ -13,6 +13,7 @@
 #include "feed-atom.h"
 #include "feed-rss.h"
 
+#include "katze-net.h"
 #include <midori/midori.h>
 
 #define EXTENSION_NAME "Feed Panel"

=== modified file 'katze/katze-item.c'
--- katze/katze-item.c	2013-07-16 14:20:37 +0000
+++ katze/katze-item.c	2013-07-27 12:43:27 +0000
@@ -15,8 +15,6 @@
 
 #include <glib/gi18n.h>
 
-#include "katze/katze.h"
-
 /**
  * SECTION:katze-item
  * @short_description: A useful item

=== modified file 'katze/katze.h'
--- katze/katze.h	2013-03-23 01:38:17 +0000
+++ katze/katze.h	2013-07-27 12:43:27 +0000
@@ -20,7 +20,12 @@
 #include "katze-item.h"
 #include "katze-array.h"
 #include "katze-arrayaction.h"
-#include "katze-net.h"
 #include "katze-preferences.h"
 
+#ifndef HAVE_WEBKIT2
+    #include <webkit/webkit.h>
+#else
+    #include <webkit2/webkit2.h>
+#endif
+
 #endif /* __KATZE_H__ */

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-07-17 17:33:31 +0000
+++ midori/midori-view.c	2013-07-27 12:43:27 +0000
@@ -3143,10 +3143,6 @@
     view->find_links = -1;
     view->alerts = 0;
 
-    /* Force the compiler to not optimize out katze_net_load_uri */
-    if (!g_strcmp0 (view->icon_uri, ""))
-        katze_net_load_uri (NULL, NULL, (KatzeNetStatusCb)NULL, (KatzeNetTransferCb)NULL, view);
-
     view->item = katze_item_new ();
 
     view->scrollh = view->scrollv = -2;