From a8a90555de087915762224eaab219874b1e161d6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 9 Feb 2010 10:57:49 -0600 Subject: Adding some additional checks. --- libdbusmenu-glib/client.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index efae0ee..40ab182 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -561,6 +561,7 @@ get_properties_helper (gpointer key, gpointer value, gpointer data) static void menuitem_get_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError * error, gpointer data) { + g_return_if_fail(DBUSMENU_IS_MENUITEM(data)); if (error != NULL) { g_warning("Error getting properties on a menuitem: %s", error->message); return; @@ -646,10 +647,13 @@ menuitem_get_properties_new_cb (DBusGProxy * proxy, GHashTable * properties, GEr return; } +/* Respond to the call function to make sure that the other side + got it, or print a warning. */ static void menuitem_call_cb (DBusGProxy * proxy, GError * error, gpointer userdata) { - DbusmenuMenuitem * mi = (DbusmenuMenuitem *)userdata; + g_return_if_fail(DBUSMENU_IS_MENUITEM(userdata)); + DbusmenuMenuitem * mi = DBUSMENU_MENUITEM(userdata); if (error != NULL) { g_warning("Unable to call menu item %d: %s", dbusmenu_menuitem_get_id(mi), error->message); -- cgit v1.2.3