Merge lp:~3v1n0/libunity/desktop-use-snap-namespace-x into lp:libunity/xenial

[Marco Trevisan (Treviño)]

UnityLauncher: Prepend snap namespace to desktop file or desktop-id

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

[lp:~3v1n0/libunity/desktop-use-snap-namespace-x]

326. By Marco Trevisan (Treviño) on 2018-02-09

launcher: fix a typo, don't double-check for same var

=== modified file 'Makefile.decl'
--- Makefile.decl	2013-01-10 11:20:42 +0000
+++ Makefile.decl	2018-02-09 14:37:54 +0000
@@ -74,7 +74,7 @@
 LOG_PATH = headless-logs
 test-headless:
 	set -e; \
-	$(XVFB) -a make test-nonrecursive; \
+	$(DBUS_LAUNCH) $(XVFB) -a make test-nonrecursive; \
         sleep 1;
 else
 check-local: test-nonrecursive
 
=== modified file 'configure.ac'
--- configure.ac	2014-02-04 21:38:14 +0000
+++ configure.ac	2018-02-09 14:37:54 +0000
@@ -210,7 +210,7 @@
 
 if test "x$enable_headless_tests" = "xyes"; then
   AC_PATH_PROG([XVFB],[xvfb-run])
-  AC_PATH_PROG([DBUS_LAUNCH],[dbus-launch])
+  AC_PATH_PROG([DBUS_LAUNCH],[dbus-run-session])
 fi
 
 ###########################
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-07-01 10:44:10 +0000
+++ debian/changelog	2018-02-09 14:37:54 +0000
@@ -1,3 +1,10 @@
+libunity (7.1.4+16.04.20160701-0ubuntu2) UNRELEASED; urgency=medium
+
+  * UnityLauncher: Prepend snap namespace to desktop file or desktop-id
+    (LP: #1747814)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Wed, 07 Feb 2018 15:48:55 +0100
+
 libunity (7.1.4+16.04.20160701-0ubuntu1) xenial; urgency=medium
 
   [ Andrea Azzarone ]
 
=== modified file 'examples/Makefile.am'
--- examples/Makefile.am	2013-06-25 08:09:45 +0000
+++ examples/Makefile.am	2018-02-09 14:37:54 +0000
@@ -13,6 +13,7 @@
 unitylibdir = $(libdir)/unity
 
 noinst_LTLIBRARIES = scope1.la scope2.la
+noinst_PROGRAMS = launcher
 
 scope1_la_VALASOURCES = scope1.vala
 scope1_la_SOURCES = $(scope1_la_VALASOURCES:.vala=.c)
@@ -28,9 +29,17 @@
   $(top_builddir)/src/libunity.la \
   $(LIBUNITY_LIBS)
 
+launcher_VALASOURCES = launcher.vala
+launcher_SOURCES = $(launcher_VALASOURCES:.vala=.c)
+launcher_LDFLAGS = -shared -module -no-undefined -rpath $(unitylibdir)
+launcher_LDADD = \
+  $(top_builddir)/src/libunity.la \
+  $(LIBUNITY_LIBS)
+
 BUILT_SOURCES = \
   scope1.vala.stamp \
-  scope2.vala.stamp
+  scope2.vala.stamp \
+  launcher.vala.stamp
 
 scope1.vala.stamp: $(scope1_la_VALASOURCES)
 	$(AM_V_GEN)$(VALAC) -C $(AM_VALAFLAGS) $(VALAFLAGS) $^
@@ -40,11 +49,15 @@
 	$(AM_V_GEN)$(VALAC) -C $(AM_VALAFLAGS) $(VALAFLAGS) $^
 	@touch $@
 
+launcher.vala.stamp: $(launcher_VALASOURCES)
+	$(AM_V_GEN)$(VALAC) -C $(AM_VALAFLAGS) $(VALAFLAGS) $^
+	@touch $@
+
 EXTRA_DIST = \
   $(scope1_la_VALASOURCES) \
   $(scope2_la_VALASOURCES) \
-  launcher.py \
-  launcher.vala
+  $(launcher_VALASOURCES) \
+  launcher.py
 
 CLEANFILES = $(scope1_la_SOURCES) $(scope2_la_SOURCES) $(BUILT_SOURCES)
 
 
=== modified file 'examples/launcher.py'
--- examples/launcher.py	2011-04-07 08:05:31 +0000
+++ examples/launcher.py	2018-02-09 14:37:54 +0000
@@ -3,7 +3,7 @@
 loop = GObject.MainLoop()
 
 # Pretend to be evolution for the sake of the example 
-launcher = Unity.LauncherEntry.get_for_desktop_id ("evolution.desktop")
+launcher = Unity.LauncherEntry.get_for_desktop_id ("firefox.desktop")
 
 # Show a count of 124 on the icon
 launcher.set_property("count", 124)
 
=== modified file 'examples/launcher.vala'
--- examples/launcher.vala	2011-04-07 08:05:31 +0000
+++ examples/launcher.vala	2018-02-09 14:37:54 +0000
@@ -4,7 +4,7 @@
   public static void main ()
   {
     /* Pretend to be evolution for the sake of the example */
-    var l = Unity.LauncherEntry.get_for_desktop_id ("evolution.desktop");
+    var l = Unity.LauncherEntry.get_for_desktop_id ("firefox.desktop");
 
     /* Show a count of 124 on the icon */
     l.count = 124;
@@ -16,7 +16,7 @@
 
     /* Set us as urgent. Quickly! Go! Go! Go! Now! Now! */
     l.urgent = true;
-    
+
     /* We also want a quicklist */
     var ql = new Dbusmenu.Menuitem ();
     var item1 = new Dbusmenu.Menuitem ();
@@ -29,5 +29,4 @@
 
     new MainLoop().run();
   }
-  
 }
 
=== modified file 'src/unity-launcher.vala'
--- src/unity-launcher.vala	2015-09-21 17:53:48 +0000
+++ src/unity-launcher.vala	2018-02-09 14:37:54 +0000
@@ -28,7 +28,10 @@
  
 using GLib;
 
-namespace Unity {  
+namespace Unity {
+
+  private const string APP_PREFIX = "application://";
+  private const string FILE_PREFIX = "file://";
 
   /* Private class to wire up the DBus stuff. Private so that we don't
    * leak DBus implementation details into the public API */
@@ -170,27 +173,56 @@
     {
       Object (app_uri : app_uri);
     }
-    
+
     public static LauncherEntry get_for_app_uri (string app_uri)
     {
       if (global_entries_map == null)
         global_entries_map =
                 new HashTable<string, LauncherEntry> (str_hash, str_equal);
-      
-      LauncherEntry? entry = global_entries_map.lookup (app_uri);
+
+      string real_app_uri = app_uri;
+      unowned string snap_path = Environment.get_variable ("SNAP");
+      unowned string snap_name = Environment.get_variable ("SNAP_NAME");
+
+      if (snap_path != null && snap_name != null)
+        {
+          debug (@"App is running into a snap container ($snap_name)");
+          string app = app_uri.substring (APP_PREFIX.length);
+
+          if (app[0] == '/')
+            {
+              if (!FileUtils.test (app, FileTest.IS_REGULAR))
+                {
+                  real_app_uri = APP_PREFIX + snap_path + app;
+                  debug (@"Impossible to read file $app, trying with snap namespace: $real_app_uri");
+                }
+            }
+          else
+            {
+              string snap_app_prefix = snap_name + "_";
+
+              if (!app.has_prefix (snap_app_prefix))
+                {
+                  real_app_uri = APP_PREFIX + snap_app_prefix + app;
+                  debug (@"App uri does not contain the snap prefix, fixed: '$real_app_uri'");
+                }
+            }
+        }
+
+      LauncherEntry? entry = global_entries_map.lookup (real_app_uri);
       if (entry != null)
         {
           return entry;
         }
-      
-      entry = new LauncherEntry (app_uri);
-      global_entries_map.insert (app_uri, entry);
+
+      entry = new LauncherEntry (real_app_uri);
+      global_entries_map.insert (real_app_uri, entry);
       return entry;
     }
-    
+
     public static LauncherEntry get_for_desktop_id (string desktop_id)
     {
-      return LauncherEntry.get_for_app_uri ("application://" + desktop_id);
+      return LauncherEntry.get_for_app_uri (APP_PREFIX + desktop_id);
     }
     
     public static LauncherEntry get_for_desktop_file (string desktop_file)
@@ -381,9 +413,6 @@
       fav_cache.remove_all ();
       fav_list = {};
 
-      const string APP_PREFIX = "application://";
-      const string FILE_PREFIX = "file://";
-
       foreach (string id in settings.get_strv ("favorites"))
       {
         if (id.has_prefix (APP_PREFIX))