Merge lp:~ted/libdbusmenu/743661 into lp:libdbusmenu/0.5

[Ted Gould]

Protect the about-to-show from the client

[Andrea Cimitan (cimi)]

same comment for https://code.launchpad.net/~ted/dbusmenu/lp757569/+merge/76799

review: Approve

=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c	2011-04-19 17:54:37 +0000
+++ libdbusmenu-glib/client.c	2011-09-23 20:44:24 +0000
@@ -1604,7 +1604,11 @@
 void
 dbusmenu_client_send_about_to_show(DbusmenuClient * client, gint id, void (*cb)(gpointer data), gpointer cb_data)
 {
+	g_return_if_fail(DBUSMENU_CLIENT(client));
+	g_return_if_fail(id > 0);
+
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
+	g_return_if_fail(priv != NULL);
 
 	about_to_show_t * data = g_new0(about_to_show_t, 1);
 	data->client = client;