Merge lp://staging/~ted/indicator-appmenu/local-menus-single-menu into lp://staging/indicator-appmenu/0.4
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~ted/indicator-appmenu/local-menus-single-menu |
| Merge into: | lp://staging/indicator-appmenu/0.4 |
| Prerequisite: | lp://staging/~ted/indicator-appmenu/dbusmenu590 |
| Diff against target: |
2553 lines (+840/-1177) (has conflicts) 7 files modified
configure.ac (+1/-1) data/Makefile.am (+13/-0) data/indicator-appmenu-menu-panel.svg (+121/-0) src/indicator-appmenu-marshal.list (+2/-1) src/indicator-appmenu.c (+521/-667) src/window-menus.c (+175/-494) src/window-menus.h (+7/-14) Text conflict in data/Makefile.am Text conflict in src/indicator-appmenu.c |
| To merge this branch: | bzr merge lp://staging/~ted/indicator-appmenu/local-menus-single-menu |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Indicator Applet Developers | Pending | ||
|
Review via email:
|
|||
Description of the change
This branch is aimed at building single menus in the situation where the setting is set so that there are locally integrated menus. So we go down to one item, and have a vertical menu.
Some notes:
* There's a bit of a refactoring here. We're changing the WindowMenu's object so that it is GtkMenu based instead of IndicatorObject
* This branch doesn't work well with XUL apps. The XUL apps were ignoring Dbusmenu signals because it thought we were sending too many. We're not sending those now, but that means that the first set gets ignored. We're ending the arms race, but we need XUL global menus to back down as well. Treaty negotiations are ongoing.
* There's an #if 0 to switch to a label instead of an icon. This is mostly for testing as the icon isn't installed and that makes it impossible to see the menu. So we have a label there for now. This should get removed for release.
* One of the functions used in the gsettings code ends up in a util function when we merge to trunk. To make the branch inheritance simpler we just left it here and will optimize on merge.
Unmerged revisions
- 169. By Ted Gould
-
Ensure that we're getting the show menu signal on focus switch as well
- 168. By Ted Gould
-
Catching up with trunk
- 167. By Ted Gould
-
We don't need to sync the menus to NULL everytime, only on the switch.
- 166. By Ted Gould
-
Updating to trunk
- 165. By Ted Gould
-
Fixing directory for icons
- 164. By Ted Gould
-
We should be able to use an icon now
- 163. By Ted Gould
-
Ensuring we have a signal on the show menu action
- 162. By Ted Gould
-
Make sure to step through the list of children
- 161. By Ted Gould
-
Dbusmenu's version of get_children is transfer none, probably a bad idea :-/ But this fixes it
- 160. By Ted Gould
-
Fixing merge. Not sure how I messed this up.
