[epiphany] embed-shell: Fix protection against recursive launching



commit f20510761df1fbe5c3e445023a22f25e50b70d19
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Mon Aug 14 10:30:29 2017 -0500

    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.

 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 d83cfdf..798ffd9 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -1445,11 +1445,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);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]