ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Ted Gould (ted)
Related merge proposals:
  https://code.launchpad.net/~ted/dbusmenu/annoying-image-error/+merge/17926
  proposed by: Ted Gould (ted)
  review: Approve - Cody Russell (bratsche)
------------------------------------------------------------
revno: 58 [merge]
committer: Ted Gould <ted@xxxxxxxx>
branch nick: trunk
timestamp: Sun 2010-01-24 14:09:10 -0600
message:
  Fix an annoying warning that isn't really useful on image menuitems.
modified:
  libdbusmenu-gtk/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-gtk/client.c'
--- libdbusmenu-gtk/client.c	2010-01-22 20:18:46 +0000
+++ libdbusmenu-gtk/client.c	2010-01-24 20:09:10 +0000
@@ -468,7 +468,10 @@
 image_property_handle (DbusmenuMenuitem * item, const gchar * property, const GValue * invalue, gpointer userdata)
 {
 	/* We're only looking at these two properties here */
-	g_return_if_fail(!g_strcmp0(property, DBUSMENU_MENUITEM_PROP_ICON) || !g_strcmp0(property, DBUSMENU_MENUITEM_PROP_ICON_DATA));
+	if (g_strcmp0(property, DBUSMENU_MENUITEM_PROP_ICON) != 0 &&
+			g_strcmp0(property, DBUSMENU_MENUITEM_PROP_ICON_DATA) != 0) {
+		return;
+	}
 
 	const gchar * value = NULL;