DBus Menu

Merge lp:~jhodapp/libdbusmenu/enable-childless-menus into lp:libdbusmenu/12.10

  1. enable-childless-menus
  2. Merge into trunk.12.10
Proposed by Jim Hodapp
Status: Rejected
Rejected by: Ted Gould
Proposed branch: lp:~jhodapp/libdbusmenu/enable-childless-menus
Merge into: lp:libdbusmenu/12.10
Diff against target: 18 lines (+2/-6)
1 file modified
libdbusmenu-glib/menuitem.c (+2/-6)
To merge this branch: bzr merge lp:~jhodapp/libdbusmenu/enable-childless-menus
Reviewer Review Type Date Requested Status
Ted Gould (community) Disapprove
Review via email: mp+128976@code.launchpad.net

Commit message

Adds childless menu support to the Unity menu panel. (Bug: 773101)

Description of the change

Adds childless menu support to the Unity menu panel. (Bug: 773101)

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

It looks like you have to fix the indentation... :P

Revision history for this message
Jim Hodapp (jhodapp) wrote :

Ah, I hate tab characters! It looked just fine in my editor. :)

lp:~jhodapp/libdbusmenu/enable-childless-menus updated
430. By Jim Hodapp

Fixed indentation.

431. By Jim Hodapp

Make sure not to break non-Gtk toolkits.

Revision history for this message
Ted Gould (ted) wrote :

So I think the indicator-appmenu patch now does everything, so this is unneeded. Rejecting it.

review: Disapprove

Unmerged revisions

431. By Jim Hodapp

Make sure not to break non-Gtk toolkits.

430. By Jim Hodapp

Fixed indentation.

429. By Jim Hodapp

Adds childless menu support to the Unity menu panel. (Bug: 773101)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libdbusmenu-glib/menuitem.c'
--- libdbusmenu-glib/menuitem.c 2012-04-25 15:38:49 +0000
+++ libdbusmenu-glib/menuitem.c 2012-10-11 21:42:22 +0000
@@ -446,12 +446,8 @@
446{446{
447 g_return_if_fail(DBUSMENU_IS_MENUITEM(mi));447 g_return_if_fail(DBUSMENU_IS_MENUITEM(mi));
448448
449 if (dbusmenu_menuitem_get_children(mi) == NULL && g_strcmp0(DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU, dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY)) != 0) {449 gboolean dummy;
450 g_warning("About to Show called on an item wihtout submenus. We're ignoring it.");450 g_signal_emit(G_OBJECT(mi), signals[ABOUT_TO_SHOW], 0, &dummy);
451 } else {
452 gboolean dummy;
453 g_signal_emit(G_OBJECT(mi), signals[ABOUT_TO_SHOW], 0, &dummy);
454 }
455451
456 if (cb != NULL) {452 if (cb != NULL) {
457 cb(mi, cb_data);453 cb(mi, cb_data);

Subscribers

People subscribed via source and target branches

to all changes: