Merge lp://staging/~fossfreedom/ubiquity/lp1659280 into lp://staging/ubiquity
| Status: | Merged |
|---|---|
| Merge reported by: | Mathieu Trudel-Lapierre |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~fossfreedom/ubiquity/lp1659280 |
| Merge into: | lp://staging/ubiquity |
| Diff against target: |
96 lines (+25/-19) 3 files modified
bin/ubiquity-dm (+13/-19) debian/changelog (+9/-0) src/panel/panel.c (+3/-0) |
| To merge this branch: | bzr merge lp://staging/~fossfreedom/ubiquity/lp1659280 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Installer Team | Pending | ||
|
Review via email:
|
|||
Description of the change
This merge proposal fixes #1659280 for Ubuntu Budgie.
The GTK_MODULES change I think stops our window manager from starting up correctly. This is the first change in ubiquity-dm - to set up the session-type for budgie-wm.
A previous comment made by cjwatson recommended that ubiquity-panel is the norm. Thus I have switched to ubiquity-panel. This removes the need for the previous Ubuntu Budgie change to display budgie-panel and the special nm-applet --no-indicator section of code in ubiquity-dm. To ensure the panel icons are correctly themed we ensure ubuntu-mono icon theme is used rather than the default in Ubuntu Budgie which would be "pocillo"
The ubiquity-panel color itself should match the theme used in Ubuntu Budgie. Thus the last change is to test for a png which will be installed separately through the budgie-
