ayatana-commits team mailing list archive

Thread
Date

[Branch ~dbusmenu-team/dbusmenu/trunk] Rev 192: Fixing a critical message being printed

To: ayatana-commits <ayatana-commits@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Tue, 25 Jan 2011 20:46:28 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Merge authors:
  Michael Terry (mterry)
Related merge proposals:
  https://code.launchpad.net/~mterry/dbusmenu/tiny-crit-fix/+merge/47415
  proposed by: Michael Terry (mterry)
  review: Approve - Ted Gould (ted)
------------------------------------------------------------
revno: 192 [merge]
committer: Ted Gould <ted@xxxxxxxx>
branch nick: trunk
timestamp: Tue 2011-01-25 14:44:18 -0600
message:
  Fixing a critical message being printed
modified:
  libdbusmenu-glib/client.c


--
lp:dbusmenu
https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk

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

=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c	2011-01-19 14:55:37 +0000
+++ libdbusmenu-glib/client.c	2011-01-25 18:18:05 +0000
@@ -1441,7 +1441,7 @@
 	/* We've got everything built up at this node and reconcilled */
 
 	/* Flush the properties requests if this is the first level */
-	if (dbusmenu_menuitem_get_id(parent) == 0) {
+	if (parent != NULL && dbusmenu_menuitem_get_id(parent) == 0) {
 		get_properties_flush(client);
 	}