Midori Web Browser

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

  1. fix1201130
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6267
Merged at revision: 6267
Proposed branch: lp:~kalikiana/midori/fix1201130
Merge into: lp:midori
Diff against target: 55 lines (+12/-7)
1 file modified
midori/midori-browser.c (+12/-7)
To merge this branch: bzr merge lp:~kalikiana/midori/fix1201130
Reviewer Review Type Date Requested Status
gue5t gue5t Approve
Review via email: mp+174624@code.launchpad.net

Commit message

Consider where (tab/ window) for externally opening URLs

To post a comment you must log in.
Revision history for this message
gue5t gue5t (gue5t) wrote :

Looks good, works for me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-browser.c'
2--- midori/midori-browser.c 2013-07-13 20:01:15 +0000
3+++ midori/midori-browser.c 2013-07-14 17:10:31 +0000
4@@ -1331,15 +1331,19 @@
5 }
6
7 static bool
8-midori_view_forward_external (GtkWidget* view,
9- const gchar* uri)
10+midori_view_forward_external (GtkWidget* view,
11+ const gchar* uri,
12+ MidoriNewView where)
13 {
14 if (midori_paths_get_runtime_mode () == MIDORI_RUNTIME_MODE_APP)
15 return sokoke_show_uri (gtk_widget_get_screen (view), uri, 0, NULL);
16 else if (midori_paths_get_runtime_mode () == MIDORI_RUNTIME_MODE_PRIVATE)
17 {
18- sokoke_spawn_app (uri, TRUE);
19- return TRUE;
20+ if (where == MIDORI_NEW_VIEW_WINDOW)
21+ {
22+ sokoke_spawn_app (uri, TRUE);
23+ return TRUE;
24+ }
25 }
26 return FALSE;
27 }
28@@ -1350,7 +1354,7 @@
29 gboolean background,
30 MidoriBrowser* browser)
31 {
32- if (midori_view_forward_external (view, uri))
33+ if (midori_view_forward_external (view, uri, MIDORI_NEW_VIEW_TAB))
34 return;
35
36 GtkWidget* new_view = midori_browser_add_uri (browser, uri);
37@@ -1367,7 +1371,7 @@
38 const gchar* uri,
39 MidoriBrowser* browser)
40 {
41- if (midori_view_forward_external (view, uri))
42+ if (midori_view_forward_external (view, uri, MIDORI_NEW_VIEW_WINDOW))
43 return;
44
45 MidoriBrowser* new_browser;
46@@ -1384,7 +1388,8 @@
47 MidoriBrowser* browser)
48 {
49 if (midori_view_forward_external (new_view,
50- katze_item_get_uri (midori_view_get_proxy_item (MIDORI_VIEW (new_view)))))
51+ katze_item_get_uri (midori_view_get_proxy_item (MIDORI_VIEW (new_view))),
52+ where))
53 return;
54
55 midori_browser_view_copy_history (new_view, view, TRUE);

Subscribers

People subscribed via source and target branches

to all changes: