Back out GLib/ libSoup source work-around

Re-opened https://bugs.launchpad.net/midori/+bug/780133

diff --git a/midori/midori-view.c b/midori/midori-view.c
index d782482049be9b89422aa21fc952c6b768df5050..9561be772f378f2d6c897a7aed309c6c0c021052 100644 (file)
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -2912,43 +2912,6 @@ webkit_web_view_mime_type_decision_cb (GtkWidget*               web_view,
     return TRUE;
 }
 
-#if HAVE_LIBSOUP_2_33_4 && !GLIB_CHECK_VERSION (2, 33, 1)
-#define WORKAROUND_GLIB_MAINLOOP_HANG
-#endif
-
-#ifdef WORKAROUND_GLIB_MAINLOOP_HANG
-
-#define GSOURCE_PREV(s) (s->prev)
-#define GSOURCE_NEXT(s) (s->next)
-
-static GSource*
-midori_workaround_g_source_unlink (GSource* source)
-{
-    GSource* prev = GSOURCE_PREV (source);
-    GSource* next = GSOURCE_NEXT (source);
-    if (next)
-        GSOURCE_NEXT (prev) = next;
-    if (prev)
-        GSOURCE_PREV (next) = prev;
-
-    return prev ? prev : next;
-}
-
-static GSource*
-midori_workaround_g_source_relink (GSource* source,
-                                   GSource* prev)
-{
-    GSource* next = GSOURCE_NEXT (prev);
-
-    GSOURCE_NEXT (source) = next;
-    GSOURCE_PREV (source) = prev;
-    GSOURCE_NEXT (prev) = source;
-    GSOURCE_PREV (next) = source;
-
-    return prev;
-}
-#endif
-
 static gboolean
 webkit_web_view_download_requested_cb (GtkWidget*      web_view,
                                        WebKitDownload* download,
@@ -2977,13 +2940,6 @@ webkit_web_view_download_requested_cb (GtkWidget*      web_view,
     GtkIconTheme* icon_theme;
     gint response;
     gboolean handled;
-    #ifdef WORKAROUND_GLIB_MAINLOOP_HANG
-    GSource* last;
-    GSource* source;
-    GSource* prev = NULL;
-    GSource** sources = NULL;
-    guint n_sources = 0, i;
-    #endif
 
     dialog = gtk_message_dialog_new (
         NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
@@ -3060,44 +3016,8 @@ webkit_web_view_download_requested_cb (GtkWidget*      web_view,
         GTK_STOCK_OPEN, DOWNLOAD_OPEN,
         NULL);
 
-    #ifdef WORKAROUND_GLIB_MAINLOOP_HANG
-    {
-        GSource* new_source = g_idle_source_new ();
-        g_source_attach (new_source, NULL);
-        last = GSOURCE_PREV (new_source);
-        g_source_destroy (new_source);
-    }
-
-    for (source = last; source; source = GSOURCE_PREV (source))
-    {
-        const char* name;
-        if (source && (name = g_source_get_name (source)))
-        {
-            if(!strcmp (name, "GPollableSource") || !strcmp (name, "GSocket"))
-            {
-                sources = realloc (sources, (++n_sources) * sizeof (GSource*));
-                sources[n_sources - 1] = source;
-            }
-        }
-    }
-    i = n_sources;
-    while (i > 0)
-    {
-        prev = midori_workaround_g_source_unlink (sources[--i]);
-    }
-    #endif
-
     response = gtk_dialog_run (GTK_DIALOG (dialog));
 
-    #ifdef WORKAROUND_GLIB_MAINLOOP_HANG
-    i = n_sources;
-    while (i > 0)
-    {
-        prev = midori_workaround_g_source_relink (sources[--i], prev);
-    }
-    g_free (sources);
-    #endif
-
     gtk_widget_destroy (dialog);
     switch (response)
     {