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

Proposed by Marco Trevisan (Treviño) on 2017-02-13
Status: Superseded
Proposed branch: lp:~3v1n0/appmenu-qt5/xenial-sru2
Merge into: lp:appmenu-qt5
Diff against target: 37 lines (+23/-0) (has conflicts)
1 file modified
debian/changelog (+23/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~3v1n0/appmenu-qt5/xenial-sru2
Reviewer Review Type Date Requested Status
Indicator Applet Developers 2017-02-13 Pending
Review via email: mp+317135@code.launchpad.net

This proposal has been superseded by a proposal from 2017-02-13.

Commit message

Releasing Xenial SRU2

To post a comment you must log in.
lp:~3v1n0/appmenu-qt5/xenial-sru2 updated on 2017-02-16
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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-01-12 17:13:05 +0000
3+++ debian/changelog 2017-02-13 18:39:54 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 appmenu-qt5 (0.3.0+17.04.20170112-0ubuntu1) zesty; urgency=medium
7
8 * IconCache: use $XDG_RUNTIME_DIR as preferred place where to save
9@@ -35,6 +36,28 @@
10
11 -- Dmitry Shachnev <mitya57@ubuntu.com> Tue, 28 Jun 2016 10:48:58 +0000
12
13+=======
14+appmenu-qt5 (0.3.0+16.04.20151130-0ubuntu3) UNRELEASED; urgency=medium
15+
16+ * AppMenuPlatformSystemTrayIcon: reset app usertime on activation to
17+ ensure compiz will raise it (LP: #627195)
18+ * AppMenuPlatformMenuBar: Don't initialize X11 related functions in
19+ other environments (LP: #1606246)
20+ * IconCache: get the proper theme path based on the fact we're using a
21+ themed icon or not (LP: #1600136)
22+ * IconCache: use $XDG_RUNTIME_DIR as preferred place where to save
23+ icons
24+
25+ -- Marco Trevisan (Treviño) <mail@3v1n0.net> Mon, 13 Feb 2017 19:39:29 +0100
26+
27+appmenu-qt5 (0.3.0+16.04.20151130-0ubuntu2) xenial; urgency=medium
28+
29+ * Fix for creating two or more system tray icons. (LP: #1573639, LP:
30+ #1574699)
31+
32+ -- Dmitry Shachnev <mitya57@ubuntu.com> Wed, 25 Jan 2017 22:52:49 +0300
33+
34+>>>>>>> MERGE-SOURCE
35 appmenu-qt5 (0.3.0+16.04.20151130-0ubuntu1) xenial; urgency=medium
36
37 * No-change rebuild.

Subscribers

People subscribed via source and target branches