Merge lp:~3v1n0/appmenu-qt5/xenial-sru2 into lp:appmenu-qt5

[Marco Trevisan (Treviño)]

Releasing Xenial SRU2

[lp:~3v1n0/appmenu-qt5/xenial-sru2]

43. By Marco Trevisan (Treviño) on 2017-02-16

IconCache: use $XDG_RUNTIME_DIR as preferred place where to save icons

Now that supports it, we can safely use it.

44. By Marco Trevisan (Treviño) on 2017-02-16

AppMenuPlatformMenuBar: Don't initialize X11 related functions in other environments

Unmerged revisions

44. By Marco Trevisan (Treviño) on 2017-02-16

AppMenuPlatformMenuBar: Don't initialize X11 related functions in other environments

43. By Marco Trevisan (Treviño) on 2017-02-16

IconCache: use $XDG_RUNTIME_DIR as preferred place where to save icons

Now that supports it, we can safely use it.

42. By Marco Trevisan (Treviño) on 2016-11-24

IconCache: get the proper theme path based on the fact we're using a themed icon or not

If an app uses QIcon::fromTheme then we only have the icon name of it,
and thus we need to return a valid icon theme path. Now, it's not possible
to return the whole list of dirs, so we just fallback to the home icons
older, so that users might in case add icons there.

In world, when using desktop-launcher ~/.local/share/icons also
contains all the themes in from /usr/share/icons and potentially more
(depending on the wrapper used for launching) so, we can be quite flexible
with it.

Also when running in a snap, save icons in or in the user
cache, but still in an indicator readable location

41. By Marco Trevisan (Treviño) on 2017-02-13

Fix for creating two or more system tray icons.

=== modified file 'debian/changelog'
--- debian/changelog	2017-01-12 17:13:05 +0000
+++ debian/changelog	2017-02-13 18:39:54 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 appmenu-qt5 (0.3.0+17.04.20170112-0ubuntu1) zesty; urgency=medium
 
   * IconCache: use $XDG_RUNTIME_DIR as preferred place where to save
@@ -35,6 +36,28 @@
 
  -- Dmitry Shachnev <[e-mail]>  Tue, 28 Jun 2016 10:48:58 +0000
 
+=======
+appmenu-qt5 (0.3.0+16.04.20151130-0ubuntu3) UNRELEASED; urgency=medium
+
+  * AppMenuPlatformSystemTrayIcon: reset app usertime on activation to
+    ensure compiz will raise it (LP: #627195)
+  * AppMenuPlatformMenuBar: Don't initialize X11 related functions in
+    other environments (LP: #1606246)
+  * IconCache: get the proper theme path based on the fact we're using a
+    themed icon or not (LP: #1600136)
+  * IconCache: use $XDG_RUNTIME_DIR as preferred place where to save
+    icons
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Mon, 13 Feb 2017 19:39:29 +0100
+
+appmenu-qt5 (0.3.0+16.04.20151130-0ubuntu2) xenial; urgency=medium
+
+  * Fix for creating two or more system tray icons. (LP: #1573639, LP:
+    #1574699)
+
+ -- Dmitry Shachnev <[e-mail]>  Wed, 25 Jan 2017 22:52:49 +0300
+
+>>>>>>> MERGE-SOURCE
 appmenu-qt5 (0.3.0+16.04.20151130-0ubuntu1) xenial; urgency=medium
 
   * No-change rebuild.