Merge lp://staging/~3v1n0/appmenu-qt5/xenial-sru2 into lp://staging/appmenu-qt5
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~3v1n0/appmenu-qt5/xenial-sru2 |
| Merge into: | lp://staging/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://staging/~3v1n0/appmenu-qt5/xenial-sru2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Indicator Applet Developers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2017-02-13.
Commit message
Releasing Xenial SRU2
Unmerged revisions
- 44. By Marco Trevisan (Treviño)
-
AppMenuPlatform
MenuBar: Don't initialize X11 related functions in other environments - 43. By Marco Trevisan (Treviño)
-
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)
-
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)
-
Fix for creating two or more system tray icons.
