Merge lp://staging/~pitti/libdbusmenu/fix-annotations into lp://staging/libdbusmenu/0.5
Status: | Merged |
---|---|
Merged at revision: | 216 |
Proposed branch: | lp://staging/~pitti/libdbusmenu/fix-annotations |
Merge into: | lp://staging/libdbusmenu/0.5 |
Diff against target: |
2031 lines (+757/-656) 17 files modified
libdbusmenu-glib/Makefile.am (+3/-3) libdbusmenu-glib/client.c (+68/-68) libdbusmenu-glib/client.h (+1/-1) libdbusmenu-glib/menuitem-proxy.c (+17/-17) libdbusmenu-glib/menuitem.c (+363/-360) libdbusmenu-glib/menuitem.h (+2/-2) libdbusmenu-gtk/Makefile.am (+3/-3) libdbusmenu-gtk/client.c (+55/-55) libdbusmenu-gtk/genericmenuitem.c (+26/-26) libdbusmenu-gtk/menu.c (+17/-17) libdbusmenu-gtk/menuitem.c (+60/-60) libdbusmenu-gtk/menuitem.h (+1/-1) libdbusmenu-gtk/parser.c (+10/-10) libdbusmenu-gtk/serializablemenuitem.c (+31/-31) tests/Makefile.am (+13/-2) tests/test-glib-simple-items.py (+35/-0) tests/test-gtk-shortcut-client.py (+52/-0) |
To merge this branch: | bzr merge lp://staging/~pitti/libdbusmenu/fix-annotations |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ted Gould (community) | Approve | ||
Review via email:
|
Description of the change
This branch fixes the GI/gtk-doc annotations. They need to be reformatted to be recognized by g-ir-scanner/
Now DbusmenuGtk-0.4.gir is fully introspectable. The two functions in Dbusmenu-0.4.gir which aren't are dbusmenu_
I also started working on a Python port of the "test-gtk-shortcut" test case [1]. This runs, but once the server comes alive, I get an error:
(test-gtk-
and the menu with the shortcut isn't visible. I currently have no idea why this happens, this doesn't seem to be immediately related to the Python bits. Does that ring a bell for you?
[1] http://
I now merged to the new version from trunk. It seems the xml -> variant change magically fixed this, and the test-gtk- shortcut- client. py test case now works perfectly; so I pushed this as well.