Merge lp:~midori/midori/tabsignals into lp:midori

[Cris Dywan]

Move new-tab/window/view and download_requested to Midori.Tab

This is required to allow the browser connect signals on any Tab which may not be a View.

[gue5t gue5t (gue5t)]

review: Approve

[André Stösel (ivaldi)]

This breaks the external download manager extension.
(The file is downloaded twice.)

review: Needs Fixing

[André Stösel (ivaldi)]

I think there is no signal accumulator support in vala right now.

Unmerged revisions

6437. By Cris Dywan on 2013-10-16

Move new-tab/window/view and download_requested to Midori.Tab

=== modified file 'extensions/external-download-manager.vala'
--- extensions/external-download-manager.vala	2013-05-26 18:18:40 +0000
+++ extensions/external-download-manager.vala	2013-10-16 21:54:02 +0000
@@ -36,7 +36,7 @@
         private CookieJar cookie_jar;
         private GLib.PtrArray download_managers =  new GLib.PtrArray ();
 
-        public bool download_requested (Midori.View view, WebKit.Download download) {
+        public bool download_requested (WebKit.Download download) {
             Midori.DownloadType download_type = download.get_data<Midori.DownloadType> ("midori-download-type");
 
             if (download_type == Midori.DownloadType.SAVE) {
 
=== modified file 'midori/midori-tab.vala'
--- midori/midori-tab.vala	2013-08-31 09:18:21 +0000
+++ midori/midori-tab.vala	2013-10-16 21:54:02 +0000
@@ -92,6 +92,17 @@
        /* Since: 0.5.5 */
         public signal void context_menu (WebKit.HitTestResult hit_test_result, ContextAction menu);
 
+        public signal void new_tab (string uri, bool background);
+        public signal void new_window (string uri);
+        /* Since: 0.1.2
+           Since: 0.3.4 a bool argument was added. */
+        public signal void new_view (Tab view, NewView where, bool user_initiated);
+        /* Emitted when a new download is requested, if a file cannot be shown
+           or a download was initiated from the context menu.
+           Returning @true causes the download to start otherwise it's cancelled.
+           Since: 0.1.5 */
+        public signal bool download_requested (WebKit.Download download);
+
         /* A dialog tab has a fixed size, limited GUI and is transient.
            Since: 0.5.6 */
         public bool is_dialog { get; protected set; }
 
=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-09-17 15:41:00 +0000
+++ midori/midori-view.c	2013-10-16 21:54:02 +0000
@@ -155,10 +155,6 @@
 };
 
 enum {
-    NEW_TAB,
-    NEW_WINDOW,
-    NEW_VIEW,
-    DOWNLOAD_REQUESTED,
     ADD_BOOKMARK,
     ABOUT_CONTENT,
 
@@ -203,87 +199,6 @@
     GtkWidgetClass* gtkwidget_class;
     GParamFlags flags;
 
-    signals[NEW_TAB] = g_signal_new (
-        "new-tab",
-        G_TYPE_FROM_CLASS (class),
-        (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
-        0,
-        0,
-        NULL,
-        midori_cclosure_marshal_VOID__STRING_BOOLEAN,
-        G_TYPE_NONE, 2,
-        G_TYPE_STRING,
-        G_TYPE_BOOLEAN);
-
-    signals[NEW_WINDOW] = g_signal_new (
-        "new-window",
-        G_TYPE_FROM_CLASS (class),
-        (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
-        0,
-        0,
-        NULL,
-        g_cclosure_marshal_VOID__STRING,
-        G_TYPE_NONE, 1,
-        G_TYPE_STRING);
-
-    /**
-     * MidoriView::new-view:
-     * @view: the object on which the signal is emitted
-     * @new_view: a newly created view
-     * @where: where to open the view
-     * @user_initiated: %TRUE if the user actively opened the new view
-     *
-     * Emitted when a new view is created. The value of
-     * @where determines where to open the view according
-     * to how it was opened and user preferences.
-     *
-     * Since: 0.1.2
-     *
-     * Since 0.3.4 a boolean argument was added.
-     */
-    signals[NEW_VIEW] = g_signal_new (
-        "new-view",
-        G_TYPE_FROM_CLASS (class),
-        (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
-        0,
-        0,
-        NULL,
-        midori_cclosure_marshal_VOID__OBJECT_ENUM_BOOLEAN,
-        G_TYPE_NONE, 3,
-        MIDORI_TYPE_VIEW,
-        MIDORI_TYPE_NEW_VIEW,
-        G_TYPE_BOOLEAN);
-
-    /**
-     * MidoriView::download-requested:
-     * @view: the object on which the signal is emitted
-     * @download: a new download
-     *
-     * Emitted when a new download is requested, if a
-     * file cannot be displayed or a download was started
-     * from the context menu.
-     *
-     * If the download should be accepted, a callback
-     * has to return %TRUE, and the download will also
-     * be started automatically.
-     *
-     * Note: This requires WebKitGTK 1.1.3.
-     *
-     * Return value: %TRUE if the download was handled
-     *
-     * Since: 0.1.5
-     */
-    signals[DOWNLOAD_REQUESTED] = g_signal_new (
-        "download-requested",
-        G_TYPE_FROM_CLASS (class),
-        (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION),
-        0,
-        g_signal_accumulator_true_handled,
-        NULL,
-        midori_cclosure_marshal_BOOLEAN__OBJECT,
-        G_TYPE_BOOLEAN, 1,
-        G_TYPE_OBJECT);
-
     /**
      * MidoriView::add-bookmark:
      * @view: the object on which the signal is emitted
@@ -1646,14 +1561,14 @@
             background = view->open_tabs_in_the_background;
             if (MIDORI_MOD_BACKGROUND (event->state))
                 background = !background;
-            g_signal_emit (view, signals[NEW_TAB], 0, link_uri, background);
+            g_signal_emit_by_name (view, "new-tab", link_uri, background);
             view->button_press_handled = TRUE;
             return TRUE;
         }
         else if (MIDORI_MOD_NEW_WINDOW (event->state))
         {
             /* Open link in new window */
-            g_signal_emit (view, signals[NEW_WINDOW], 0, link_uri);
+            g_signal_emit_by_name (view, "new-window", link_uri);
             view->button_press_handled = TRUE;
             return TRUE;
         }
@@ -1668,7 +1583,7 @@
             background = view->open_tabs_in_the_background;
             if (MIDORI_MOD_BACKGROUND (event->state))
                 background = !background;
-            g_signal_emit (view, signals[NEW_TAB], 0, link_uri, background);
+            g_signal_emit_by_name (view, "new-tab", link_uri, background);
             view->button_press_handled = TRUE;
             return TRUE;
         }
@@ -1716,7 +1631,7 @@
                             background = view->open_tabs_in_the_background;
                             if (MIDORI_MOD_BACKGROUND (event->state))
                                 background = !background;
-                            g_signal_emit (view, signals[NEW_TAB], 0, uri, background);
+                            g_signal_emit_by_name (view, "new-tab", uri, background);
                         }
                         else
                         {
@@ -1935,7 +1850,7 @@
             gboolean background = view->open_tabs_in_the_background;
             if (MIDORI_MOD_BACKGROUND (event->state))
                 background = !background;
-            g_signal_emit (view, signals[NEW_TAB], 0, result, background);
+            g_signal_emit_by_name (view, "new-tab", result, background);
         }
         else
             midori_view_set_uri (view, result);
@@ -2029,7 +1944,7 @@
                                              gpointer   user_data)
 {
     MidoriView* view = user_data;
-    g_signal_emit (view, signals[NEW_WINDOW], 0, view->link_uri);
+    g_signal_emit_by_name (view, "new-window", view->link_uri);
 }
 
 static void
@@ -2057,7 +1972,7 @@
 #endif
     gboolean handled;
     midori_download_set_type (download, type);
-    g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled);
+    g_signal_emit_by_name (view, "download-requested", download, &handled);
 }
 
 static void
@@ -2075,9 +1990,9 @@
     MidoriView* view = user_data;
     gchar* uri = katze_object_get_string (view->hit_test, "image-uri");
     if (view->open_new_pages_in == MIDORI_NEW_PAGE_WINDOW)
-        g_signal_emit (view, signals[NEW_WINDOW], 0, uri);
+        g_signal_emit_by_name (view, "new-window", uri);
     else
-        g_signal_emit (view, signals[NEW_TAB], 0, uri,
+        g_signal_emit_by_name (view, "new-tab", uri,
             view->open_tabs_in_the_background);
     g_free (uri);
 }
@@ -2232,7 +2147,7 @@
     gchar* uri = sokoke_magic_uri (data, TRUE, FALSE);
     if (!uri)
         uri = g_strdup (data);
-    g_signal_emit (view, signals[NEW_TAB], 0, uri,
+    g_signal_emit_by_name (view, "new-tab", uri,
                    view->open_tabs_in_the_background);
     g_free (uri);
 }
@@ -2242,7 +2157,7 @@
                                                  gpointer   user_data)
 {
     MidoriView* view = user_data;
-    g_signal_emit (view, signals[NEW_TAB], 0, view->link_uri,
+    g_signal_emit_by_name (view, "new-tab", view->link_uri,
                    !view->open_tabs_in_the_background);
 }
 
@@ -2258,12 +2173,12 @@
     gchar* uri = midori_uri_for_search (search, view->selected_text);
 
     if (view->open_new_pages_in == MIDORI_NEW_PAGE_WINDOW)
-        g_signal_emit (view, signals[NEW_WINDOW], 0, uri);
+        g_signal_emit_by_name (view, "new-window", uri);
     /* FIXME: need a way to override behavior (middle click)
     else if (view->open_new_pages_in == MIDORI_NEW_PAGE_CURRENT)
         midori_view_set_uri (view, uri); */
     else
-        g_signal_emit (view, signals[NEW_TAB], 0, uri,
+        g_signal_emit_by_name (view, "new-tab", uri,
             view->open_tabs_in_the_background);
 
     g_free (uri);
@@ -2275,7 +2190,7 @@
                                           gpointer   user_data)
 {
     MidoriView* view = user_data;
-    g_signal_emit (view, signals[NEW_WINDOW], 0,
+    g_signal_emit_by_name (view, "new-window",
         midori_view_get_display_uri (MIDORI_VIEW (view)));
 }
 
@@ -2286,7 +2201,7 @@
 {
     MidoriView* view = user_data;
     WebKitWebFrame* web_frame = webkit_web_view_get_focused_frame (WEBKIT_WEB_VIEW (view->web_view));
-    g_signal_emit (view, signals[NEW_TAB], 0,
+    g_signal_emit_by_name (view, "new-tab",
         webkit_web_frame_get_uri (web_frame), view->open_tabs_in_the_background);
 }
 #endif
@@ -2675,7 +2590,7 @@
         where = MIDORI_NEW_VIEW_WINDOW;
 
     gtk_widget_show (new_view);
-    g_signal_emit (view, signals[NEW_VIEW], 0, new_view, where, FALSE);
+    g_signal_emit_by_name (view, "new-view", new_view, where, FALSE);
 
     if (midori_tab_get_is_dialog (MIDORI_TAB (view)))
     {
@@ -2892,7 +2807,7 @@
         "signal::failed", download_failed_cb, view,
         NULL);
     */
-    g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled);
+    g_signal_emit_by_name (view, "download-requested", download, &handled);
 #ifndef HAVE_WEBKIT2
     return handled;
 #endif
@@ -4400,7 +4315,7 @@
 
     MidoriNewView where = MIDORI_NEW_VIEW_TAB;
     GtkWidget* new_view = midori_view_new_with_item (view->item, view->settings);
-    g_signal_emit (view, signals[NEW_VIEW], 0, new_view, where, TRUE);
+    g_signal_emit_by_name (view, "new-view", new_view, where, TRUE);
     midori_view_set_uri (MIDORI_VIEW (new_view), midori_tab_get_uri (MIDORI_TAB (view)));
     return new_view;
 }
 
=== modified file 'midori/midori.vapi'
--- midori/midori.vapi	2013-10-09 20:05:29 +0000
+++ midori/midori.vapi	2013-10-16 21:54:02 +0000
@@ -205,7 +205,6 @@
         public GLib.Object net { get; }
 
         [HasEmitter]
-        public signal bool download_requested (WebKit.Download download);
         public signal bool about_content (string uri);
 
     }