diff options
| author | Michael Catanzaro <mcatanzaro@igalia.com> | 2017-08-14 10:30:29 -0500 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@igalia.com> | 2017-08-15 17:10:39 -0500 |
| commit | 4a9588f5812c7e5cd56fde2844fa29a4e33304fb (patch) | |
| tree | 90416dfbf7d406f760abf61996dee4f75513610b | |
| parent | 27b9f188058cf90552813a37327be0a5f884d29b (diff) | |
| download | epiphany-4a9588f5812c7e5cd56fde2844fa29a4e33304fb.tar.gz | |
embed-shell: Fix protection against recursive launching
It needs to use the new desktop file name.
I don't think g_application_get_id() is the best way to handle this.
Best just hardcode the desktop file name.
| -rw-r--r-- | embed/ephy-embed-shell.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c index eb5f0a990..5b30e3927 100644 --- a/embed/ephy-embed-shell.c +++ b/embed/ephy-embed-shell.c @@ -1392,11 +1392,7 @@ ephy_embed_shell_launch_handler (EphyEmbedShell *shell, /* Do not allow recursive calls into the browser, they can lead to * infinite loops and they should never happen anyway. */ - - /* FIXME: Should use g_application_get_application_id() here instead of - * hardcoding epiphany.desktop. But first, we have to rename the desktop file. - */ - if (!app || g_strcmp0 (g_app_info_get_id (app), "epiphany.desktop") == 0) + if (!app || g_strcmp0 (g_app_info_get_id (app), "org.gnome.Epiphany.desktop") == 0) return ret; list = g_list_append (list, file); |