diff options
| author | Ted Gould <ted@gould.cx> | 2010-11-17 21:23:27 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-11-17 21:23:27 -0600 |
| commit | aabdcffea6b311cda25ad2937466d65fc4e36381 (patch) | |
| tree | f86b33a60c4eb780057adcd4293b2b36d7fd19f2 /tests/test-glib-events-client.c | |
| parent | 0dea1bb0779b8cddbf631ee80f76d13aa8920ec5 (diff) | |
| download | libdbusmenu-aabdcffea6b311cda25ad2937466d65fc4e36381.tar.gz libdbusmenu-aabdcffea6b311cda25ad2937466d65fc4e36381.tar.bz2 libdbusmenu-aabdcffea6b311cda25ad2937466d65fc4e36381.zip | |
Moving the GValues over to GVariant
Diffstat (limited to 'tests/test-glib-events-client.c')
| -rw-r--r-- | tests/test-glib-events-client.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/tests/test-glib-events-client.c b/tests/test-glib-events-client.c index 97d5caf..ee0b821 100644 --- a/tests/test-glib-events-client.c +++ b/tests/test-glib-events-client.c @@ -35,7 +35,7 @@ static gboolean passed = TRUE; static gboolean first = TRUE; static void -event_status (DbusmenuClient * client, DbusmenuMenuitem * item, gchar * name, GValue * data, guint timestamp, GError * error, gpointer user_data) +event_status (DbusmenuClient * client, DbusmenuMenuitem * item, gchar * name, GVariant * data, guint timestamp, GError * error, gpointer user_data) { g_debug("Event status: %s", error == NULL ? "Sent" : "Error"); @@ -46,8 +46,8 @@ event_status (DbusmenuClient * client, DbusmenuMenuitem * item, gchar * name, GV return; } - if (g_value_get_int(data) != DATA_VALUE) { - g_debug("Data value pass fail got: %d", g_value_get_int(data)); + if (g_variant_get_int32(data) != DATA_VALUE) { + g_debug("Data value pass fail got: %d", g_variant_get_int32(data)); passed = FALSE; g_main_loop_quit(mainloop); return; @@ -96,11 +96,9 @@ layout_updated (DbusmenuClient * client, gpointer user_data) return; } - GValue data = {0}; - g_value_init(&data, G_TYPE_INT); - g_value_set_int(&data, DATA_VALUE); - - dbusmenu_menuitem_handle_event(menuroot, "clicked", &data, TIMESTAMP_VALUE); + GVariant * data = g_variant_new("i", DATA_VALUE); + dbusmenu_menuitem_handle_event(menuroot, "clicked", data, TIMESTAMP_VALUE); + g_variant_unref(data); return; } |