diff options
| author | Ted Gould <ted@gould.cx> | 2010-11-29 14:21:03 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-11-29 14:21:03 -0600 |
| commit | 611103533121afca614b2e531c5e113a1a6122f4 (patch) | |
| tree | f99549fe8d3e10c24d29b5de5a7ff618d5fc7c99 | |
| parent | de467d6d1231f6490b79ddc5a4966b9521fe8536 (diff) | |
| download | libdbusmenu-611103533121afca614b2e531c5e113a1a6122f4.tar.gz libdbusmenu-611103533121afca614b2e531c5e113a1a6122f4.tar.bz2 libdbusmenu-611103533121afca614b2e531c5e113a1a6122f4.zip | |
Protect against NULL variants to remove warnings
| -rw-r--r-- | libdbusmenu-gtk/client.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 9dd18df..77935c5 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -374,7 +374,7 @@ static void menu_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * variant, GtkMenuItem * gmi) { if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_LABEL)) { - gtk_menu_item_set_label(gmi, g_variant_get_string(variant, NULL)); + gtk_menu_item_set_label(gmi, variant == NULL ? NULL : g_variant_get_string(variant, NULL)); } else if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_VISIBLE)) { process_visible(mi, gmi, variant); } else if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_ENABLED)) { @@ -742,7 +742,9 @@ image_property_handle (DbusmenuMenuitem * item, const gchar * property, GVariant } const gchar * value = NULL; - value = g_variant_get_string(variant, NULL); + if (variant != NULL) { + value = g_variant_get_string(variant, NULL); + } if (value == NULL || value[0] == '\0') { /* This means that we're unsetting a value. */ |