GTK+

Merge lp://staging/~larsu/gtk/custom-menu-items-v2 into lp://staging/~ubuntu-desktop/gtk/ubuntugtk3

custom-menu-items-v2
Merge into ubuntugtk3

Proposed by Lars Karlitski on 2013-05-24

Status:

Merged

Merged at revision:

269

Proposed branch:

lp://staging/~larsu/gtk/custom-menu-items-v2

Merge into:

lp://staging/~ubuntu-desktop/gtk/ubuntugtk3

Diff against target:

439 lines (+335/-62)

1 file modified

debian/patches/ubuntu_gtk_custom_menu_items.patch (+335/-62)

To merge this branch:

bzr merge lp://staging/~larsu/gtk/custom-menu-items-v2

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Sebastien Bacher		2013-05-24	Approve on 2013-05-30
Review via email: mp+165597@code.staging.launchpad.net

Description of the change

Update custom menu items patch

The previous version simply interpreted the value of the "x-canonical-type"
attribute on a menu item as a GType string and instantiated an instance of
that. We need something more sophisticated now, because GMenuModel is used by
things that don't integrate with glib's type system. (In particular, the next
unity will be a consumer of the indicator services.)

This new patch adds an extension point to gtk. Libraries or programs can
register to implement this extension point and supply an object with the
GtkMenuItemFactory interface. Gtk will ask those factories to create menu items
whenever it stumbles on a "x-canonical-type" attribute.

lp://staging/~larsu/gtk/custom-menu-items-v2 updated on 2013-05-24

269. By Lars Karlitski on 2013-05-24

GtkMenuItemFactory -> UbuntuMenuItemFactory

Also moves the header from gtk.h to ubuntu-private.h, to make more explicit
that this should not be used from anyone except unity.

Revision history for this message

William Hua (attente) wrote on 2013-05-27:

The patch also needs to update gtk/gtk.symbols with the new functions in order to build the packaging properly.

See:

5935 --- expected-abi 2013-05-27 11:42:17.616520780 -0400
5936 +++ actual-abi 2013-05-27 11:42:17.652520780 -0400
5937 @@ -4022,6 +4022,8 @@
5938 gtk_wrap_mode_get_type
5939 ubuntu_gtk_menu_shell_activate_first
5940 ubuntu_gtk_menu_shell_activate_mnemonic
5941 +ubuntu_menu_item_factory_create_menu_item
5942 +ubuntu_menu_item_factory_get_type
5943 ubuntu_menu_proxy_activate_menu
5944 ubuntu_menu_proxy_get
5945 ubuntu_menu_proxy_get_type
5946 FAIL: abicheck.sh