aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-gtk/client.c
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-10-01 15:51:03 -0500
committerTed Gould <ted@canonical.com>2009-10-01 15:51:03 -0500
commit05fd37315eddb4f9e986ac75fd018549a6c4ea88 (patch)
treeac186183d49a1c5d849be59412420b30a53f1cc9 /libdbusmenu-gtk/client.c
parente4892eaa338107114cf9e7ba7d2fd29a15b821e4 (diff)
parentd0e28d7c6e98d91fc14398ea863bb378eb9cc9c7 (diff)
downloadlibdbusmenu-05fd37315eddb4f9e986ac75fd018549a6c4ea88.tar.gz
libdbusmenu-05fd37315eddb4f9e986ac75fd018549a6c4ea88.tar.bz2
libdbusmenu-05fd37315eddb4f9e986ac75fd018549a6c4ea88.zip
Killing some bad looking warnings that are stupid
Diffstat (limited to 'libdbusmenu-gtk/client.c')
-rw-r--r--libdbusmenu-gtk/client.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c
index 35f5e61..21da38e 100644
--- a/libdbusmenu-gtk/client.c
+++ b/libdbusmenu-gtk/client.c
@@ -324,14 +324,13 @@ dbusmenu_gtkclient_menuitem_get (DbusmenuGtkClient * client, DbusmenuMenuitem *
g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), NULL);
g_return_val_if_fail(DBUSMENU_IS_MENUITEM(item), NULL);
- GtkMenuItem * mi = GTK_MENU_ITEM(g_object_get_data(G_OBJECT(item), data_menuitem));
- if (mi == NULL) {
- // new_menuitem(DBUSMENU_CLIENT(client), item, NULL);
+ gpointer data = g_object_get_data(G_OBJECT(item), data_menuitem);
+ if (data == NULL) {
g_warning("GTK not updated");
- mi = GTK_MENU_ITEM(g_object_get_data(G_OBJECT(item), data_menuitem));
+ return NULL;
}
- return mi;
+ return GTK_MENU_ITEM(data);
}
/* The base type handler that builds a plain ol'