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

[Cris Dywan]

Consistently open windows/ tabs in external browser/ new process

Consistently open windows/ tabs in external browser/ new process

[André Stösel (ivaldi)]

The private mode part looks good and does work as I would expect, but the app mode part is kind of misleading.

If I'm using a none default profile, start some app and choose to open a link in a new window (in app mode), I woudln't expect midori do use my default profile to show this link.

Possible solutions:
 - detect which profiles are running and ask which one to use (especially when midori would start a new one)

PS: During testing there was a bug which causes midori to run the default profile twice, but I can't reproduce it -> I guess it was some kind of race condition in some lib

[Cris Dywan (kalikiana)]

My expectation was to always launch the default browser which doesn't strictly even have to be Midori. Further more we have no concept of an "active" profile, the default is - as of yet - always the original in ~/.config/midori .

[Cris Dywan (kalikiana)]

In fact I would consider this as a new feature if you want something like a profile dialog or switching - not to say those are bad ideas but I don't see that as a requirement for what I want to solve here.

[André Stösel (ivaldi)]

Hm... the caption is still misleading. We could change the text from "Open Link in New Window" to "Open Link" in app mode!?

[lp:~kalikiana/midori/externally]

6227. By Cris Dywan on 2013-06-26

Only show "Open Link in New Tab" in app mode

[André Stösel (ivaldi)]

The "in New Tab" part of the label is still confusing and we should change it to "Open Link".
(Same text as in the xfce terminal.)

review: Needs Fixing

[lp:~kalikiana/midori/externally]

6228. By Cris Dywan on 2013-07-04

Rename menu item to Open Link in app mode

[André Stösel (ivaldi)]

Looks good.

review: Approve

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-07-01 20:20:53 +0000
+++ midori/midori-browser.c	2013-07-04 20:33:29 +0000
@@ -1318,12 +1318,29 @@
     }
 }
 
+static bool
+midori_view_forward_external (GtkWidget*   view,
+                              const gchar* uri)
+{
+    if (midori_paths_get_runtime_mode () == MIDORI_RUNTIME_MODE_APP)
+        return sokoke_show_uri (gtk_widget_get_screen (view), uri, 0, NULL);
+    else if (midori_paths_get_runtime_mode () == MIDORI_RUNTIME_MODE_PRIVATE)
+    {
+        sokoke_spawn_app (uri, TRUE);
+        return TRUE;
+    }
+    return FALSE;
+}
+
 static void
 midori_view_new_tab_cb (GtkWidget*     view,
                         const gchar*   uri,
                         gboolean       background,
                         MidoriBrowser* browser)
 {
+    if (midori_view_forward_external (view, uri))
+        return;
+
     GtkWidget* new_view = midori_browser_add_uri (browser, uri);
     midori_browser_view_copy_history (new_view, view, FALSE);
 
@@ -1338,12 +1355,13 @@
                            const gchar*   uri,
                            MidoriBrowser* browser)
 {
+    if (midori_view_forward_external (view, uri))
+        return;
+
     MidoriBrowser* new_browser;
     g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser);
-    if (new_browser)
-        midori_browser_add_uri (new_browser, uri);
-    else /* No MidoriApp, so this is app or private mode */
-        sokoke_spawn_app (uri, TRUE);
+    g_assert (new_browser != NULL);
+    midori_view_new_tab_cb (view, uri, FALSE, new_browser);
 }
 
 static void
@@ -1353,11 +1371,16 @@
                          gboolean       user_initiated,
                          MidoriBrowser* browser)
 {
+    if (midori_view_forward_external (new_view,
+        katze_item_get_uri (midori_view_get_proxy_item (MIDORI_VIEW (new_view)))))
+        return;
+
     midori_browser_view_copy_history (new_view, view, TRUE);
     if (where == MIDORI_NEW_VIEW_WINDOW)
     {
         MidoriBrowser* new_browser;
         g_signal_emit (browser, signals[NEW_WINDOW], 0, NULL, &new_browser);
+        g_assert (new_browser != NULL);
         midori_browser_add_tab (new_browser, new_view);
         midori_browser_set_current_tab (new_browser, new_view);
     }

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-07-01 20:20:33 +0000
+++ midori/midori-view.c	2013-07-04 20:33:29 +0000
@@ -2471,19 +2471,25 @@
     }
     if (view->link_uri)
     {
-        if (!midori_view_always_same_tab (view->link_uri))
-        {
-        midori_view_insert_menu_item (menu_shell, -1,
-            _("Open Link in New _Tab"), STOCK_TAB_NEW,
-            G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), widget);
-        midori_view_insert_menu_item (menu_shell, -1,
-            view->open_tabs_in_the_background
-            ? _("Open Link in _Foreground Tab")
-            : _("Open Link in _Background Tab"), NULL,
-            G_CALLBACK (midori_web_view_menu_background_tab_activate_cb), widget);
-        midori_view_insert_menu_item (menu_shell, -1,
-            _("Open Link in New _Window"), STOCK_WINDOW_NEW,
-            G_CALLBACK (midori_web_view_menu_new_window_activate_cb), widget);
+        if (midori_paths_get_runtime_mode () == MIDORI_RUNTIME_MODE_APP)
+        {
+            midori_view_insert_menu_item (menu_shell, -1,
+                _("Open _Link"), STOCK_TAB_NEW,
+                G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), widget);
+        }
+        else if (!midori_view_always_same_tab (view->link_uri))
+        {
+            midori_view_insert_menu_item (menu_shell, -1,
+                _("Open Link in New _Tab"), STOCK_TAB_NEW,
+                G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), widget);
+            midori_view_insert_menu_item (menu_shell, -1,
+                view->open_tabs_in_the_background
+                ? _("Open Link in _Foreground Tab")
+                : _("Open Link in _Background Tab"), NULL,
+                G_CALLBACK (midori_web_view_menu_background_tab_activate_cb), widget);
+            midori_view_insert_menu_item (menu_shell, -1,
+                _("Open Link in New _Window"), STOCK_WINDOW_NEW,
+                G_CALLBACK (midori_web_view_menu_new_window_activate_cb), widget);
         }
 
         midori_view_insert_menu_item (menu_shell, -1,
@@ -2789,7 +2795,9 @@
         new_view = view;
     else
     {
-        new_view = (MidoriView*)midori_view_new_with_item (NULL, view->settings);
+        KatzeItem* item = katze_item_new ();
+        item->uri = g_strdup (webkit_web_frame_get_uri (web_frame));
+        new_view = (MidoriView*)midori_view_new_with_item (item, view->settings);
         g_signal_connect (new_view->web_view, "web-view-ready",
                           G_CALLBACK (webkit_web_view_web_view_ready_cb), view);
     }