ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Ted Gould (ted)
Related merge proposals:
  https://code.launchpad.net/~ted/indicator-messages/extra-separator/+merge/12868
  proposed by: Ted Gould (ted)
  review: Approve - Cody Russell (bratsche)
------------------------------------------------------------
revno: 151 [merge]
committer: Ted Gould <ted@xxxxxxxxxxxxx>
branch nick: trunk
timestamp: Mon 2009-10-05 09:40:20 -0400
message:
  Making sure that the menu is calculated after it is determined after the black list is checked.
modified:
  src/messages-service.c


--
lp:indicator-messages
https://code.launchpad.net/~indicator-applet-developers/indicator-messages/trunk

Your team ayatana-commits is subscribed to branch lp:indicator-messages.
To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-messages/trunk/+edit-subscription.

=== modified file 'src/messages-service.c'
--- src/messages-service.c	2009-09-29 21:04:25 +0000
+++ src/messages-service.c	2009-10-04 20:30:48 +0000
@@ -1147,7 +1147,6 @@
 		/* Add it to the menu */
 		dbusmenu_menuitem_child_append(root_menuitem, DBUSMENU_MENUITEM(ll->menuitem));
 		dbusmenu_menuitem_child_append(root_menuitem, DBUSMENU_MENUITEM(ll->separator));
-		resort_menu(root_menuitem);
 
 		/* If we're in the black list or we've gotten eclipsed
 		   by something else, hide the item and the separator. */
@@ -1157,6 +1156,7 @@
 			dbusmenu_menuitem_property_set(ll->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "false");
 		}
 
+		resort_menu(root_menuitem);
 		check_hidden();
 	} else {
 		/* If so add ourselves */