diff options
| author | Xan Lopez <xan@igalia.com> | 2012-12-12 00:43:10 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@igalia.com> | 2012-12-12 19:22:39 +0800 |
| commit | 8b97d6e32fbe2e56a7012d731b5e864a86720504 (patch) | |
| tree | e54a84f5554b8474049bde978734302b5fc37de7 /src | |
| parent | 6ede0c3ebcbc129ea1112ee9f43427231ab50e07 (diff) | |
| download | gsoc2013-epiphany-8b97d6e32fbe2e56a7012d731b5e864a86720504.tar gsoc2013-epiphany-8b97d6e32fbe2e56a7012d731b5e864a86720504.tar.gz gsoc2013-epiphany-8b97d6e32fbe2e56a7012d731b5e864a86720504.tar.bz2 gsoc2013-epiphany-8b97d6e32fbe2e56a7012d731b5e864a86720504.tar.lz gsoc2013-epiphany-8b97d6e32fbe2e56a7012d731b5e864a86720504.tar.xz gsoc2013-epiphany-8b97d6e32fbe2e56a7012d731b5e864a86720504.tar.zst gsoc2013-epiphany-8b97d6e32fbe2e56a7012d731b5e864a86720504.zip | |
Remove UUID hacks to prevent self-launch
Now we can get rid of them.
https://bugzilla.gnome.org/show_bug.cgi?id=690050
Diffstat (limited to 'src')
| -rw-r--r-- | src/ephy-window.c | 10 | ||||
| -rw-r--r-- | src/window-commands.c | 5 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c index d1c0170d1..6858b47f8 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -2530,10 +2530,7 @@ decide_policy_cb (WebKitWebView *web_view, GError *error = NULL; return_value = TRUE; - /* A gross hack to be able to launch epiphany from within - * Epiphany. Might be a good idea to figure out a better - * solution... */ - g_unsetenv (EPHY_UUID_ENVVAR); + command_line = g_strdup_printf ("gvfs-open %s", uri); g_spawn_command_line_async (command_line, &error); @@ -2668,10 +2665,7 @@ policy_decision_required_cb (WebKitWebView *web_view, GError *error = NULL; return_value = TRUE; - /* A gross hack to be able to launch epiphany from within - * Epiphany. Might be a good idea to figure out a better - * solution... */ - g_unsetenv (EPHY_UUID_ENVVAR); + command_line = g_strdup_printf ("gvfs-open %s", uri); g_spawn_command_line_async (command_line, &error); diff --git a/src/window-commands.c b/src/window-commands.c index a0e013fa0..17f334a7e 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -534,10 +534,7 @@ notify_launch_cb (NotifyNotification *notification, gpointer user_data) { char * desktop_file = user_data; - /* A gross hack to be able to launch epiphany from within - * Epiphany. Might be a good idea to figure out a better - * solution... */ - g_unsetenv (EPHY_UUID_ENVVAR); + ephy_file_launch_desktop_file (desktop_file, NULL, 0, NULL); g_free (desktop_file); } |