debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Spawn new apps with the original executable name

Browse source 
Opening a web app or private mode should open Midori from the
same executable it was originally opened with.
This commit is contained in:
Christian Dywan 2010-03-21 23:53:59 +01:00
parent e9a5857b31
commit 9587fde97b
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
midori/midori-browser.c
View file

@ -2213,6 +2213,15 @@ _action_tab_new_activate (GtkAction* action,
midori_browser_set_current_page (browser, n); midori_browser_set_current_page (browser, n);
} }
static void
midori_browser_spawn_app (const gchar* uri)
{
const gchar* executable = sokoke_get_argv (NULL)[0];
gchar* command = g_strconcat (executable, " -a", NULL);
sokoke_spawn_program (command, uri, FALSE);
g_free (command);
}
static void static void
_action_private_browsing_activate (GtkAction* action, _action_private_browsing_activate (GtkAction* action,
MidoriBrowser* browser) MidoriBrowser* browser)
@ -2222,9 +2231,9 @@ _action_private_browsing_activate (GtkAction* action,
{ {
/* FIXME: Use the same binary that is running right now */ /* FIXME: Use the same binary that is running right now */
if (*uri != '\0') if (*uri != '\0')
sokoke_spawn_program ("midori -a", uri, FALSE); midori_browser_spawn_app (uri);
else else
sokoke_spawn_program ("midori -a", "about:blank", FALSE); midori_browser_spawn_app ("about:blank");
} }
} }
@ -3036,7 +3045,7 @@ midori_browser_open_bookmark (MidoriBrowser* browser,
/* FIXME: Use the same binary that is running right now */ /* FIXME: Use the same binary that is running right now */
if (katze_item_get_meta_integer (item, "app") != -1) if (katze_item_get_meta_integer (item, "app") != -1)
sokoke_spawn_program ("midori -a", uri_fixed, FALSE); midori_browser_spawn_app (uri_fixed);
else else
{ {
midori_browser_set_current_uri (browser, uri_fixed); midori_browser_set_current_uri (browser, uri_fixed);