[gnome-software/gnome-3-20] Load the new-style epiphany web-app location

[Kalev Lember <klember src gnome org>]

commit b5de410de512dee655a5c030b05cb7634ffae486
Author: Richard Hughes <richard hughsie com>
Date:   Mon Jun 27 14:49:01 2016 +0100

    Load the new-style epiphany web-app location
    
    Sometime in the last few months epiphany appears to have started including the
    name hash in the symlink source name.
    
    Support both old and new ways of doing this so manually created web-apps work.

 src/plugins/gs-plugin-epiphany.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/src/plugins/gs-plugin-epiphany.c b/src/plugins/gs-plugin-epiphany.c
index b4690cb..d29600b 100644
--- a/src/plugins/gs-plugin-epiphany.c
+++ b/src/plugins/gs-plugin-epiphany.c
@@ -291,6 +291,13 @@ gs_plugin_refine_app (GsPlugin *plugin,
                              hash,
                              id_nonfull,
                              hash);
+       /* try the new-style location */
+       if (!g_file_test (fn, G_FILE_TEST_EXISTS)) {
+               g_free (fn);
+               fn = g_strdup_printf ("%s/epiphany/app-%s/%s.desktop",
+                                     g_get_user_config_dir (),
+                                     id_nonfull, id_nonfull);
+       }
        if (g_file_test (fn, G_FILE_TEST_EXISTS)) {
                gs_app_set_state (app, AS_APP_STATE_INSTALLED);
                gs_app_add_source_id (app, fn);