ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/dbusmenu/annoying-image-error into lp:dbusmenu.

    Requested reviews:
    DBus Menu Team (dbusmenu-team)


Changes a g_return_if_fail to be a traditional check.  The message that
is printed isn't useful and unnecessarily scary.

-- 
https://code.launchpad.net/~ted/dbusmenu/annoying-image-error/+merge/17926
Your team ayatana-commits is subscribed to branch lp:dbusmenu.

=== modified file 'libdbusmenu-gtk/client.c'
--- libdbusmenu-gtk/client.c	2010-01-11 18:42:55 +0000
+++ libdbusmenu-gtk/client.c	2010-01-22 21:15:22 +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;