DBus Menu

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

Proposed by Jim Hodapp on 2012-10-10

Status:

Rejected

Rejected by:

Ted Gould on 2012-10-12

Proposed branch:

Merge into:

Diff against target:

1 file modified

libdbusmenu-glib/menuitem.c (+2/-6)

To merge this branch:

bzr merge lp:~jhodapp/libdbusmenu/enable-childless-menus

Medium

Invalid

Link a bug report

Reviewer	Review Type	Date Requested	Status
Ted Gould (community)		2012-10-10	Disapprove on 2012-10-12
Review via email: mp+128976@code.launchpad.net

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

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

Revision history for this message

Marco Trevisan (Treviño) (3v1n0) wrote on 2012-10-10:

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

Revision history for this message

Jim Hodapp (jhodapp) wrote on 2012-10-10:

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

Revision history for this message

Ted Gould (ted) wrote on 2012-10-12:

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

review: Disapprove

431. By Jim Hodapp on 2012-10-11: Make sure not to break non-Gtk toolkits.
430. By Jim Hodapp on 2012-10-10: Fixed indentation.
429. By Jim Hodapp on 2012-10-09: Adds childless menu support to the Unity menu panel. (Bug: 773101)

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

 === 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 @@
+ {
  	g_return_if_fail(DBUSMENU_IS_MENUITEM(mi));
--	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) {
--		g_warning("About to Show called on an item wihtout submenus.  We're ignoring it.");
--	} else {
--		gboolean dummy;
--		g_signal_emit(G_OBJECT(mi), signals[ABOUT_TO_SHOW], 0, &dummy);
--	}
++	gboolean dummy;
++	g_signal_emit(G_OBJECT(mi), signals[ABOUT_TO_SHOW], 0, &dummy);
  	if (cb != NULL) {
  		cb(mi, cb_data);