diff options
| author | Ted Gould <ted@gould.cx> | 2010-12-07 09:45:41 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-12-07 09:45:41 -0600 |
| commit | 663a072630eb71cf8ea246eb218934df1911ee1a (patch) | |
| tree | 20e1a5bb1b7a8e865b7975bfb52d94bbac044b0e /tests/test-glib-events-client.c | |
| parent | bdb286fb7bdbf81d63c0c592beb5bbb94e1a82ae (diff) | |
| parent | 9b53f1fd5c2452f40ac079ece4d673b4b4d1bb57 (diff) | |
| download | libdbusmenu-663a072630eb71cf8ea246eb218934df1911ee1a.tar.gz libdbusmenu-663a072630eb71cf8ea246eb218934df1911ee1a.tar.bz2 libdbusmenu-663a072630eb71cf8ea246eb218934df1911ee1a.zip | |
* Upstream Merge
* Porting from dbus-glib to GDBus
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..2cc5439 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(g_variant_get_child_value(data, 0))); passed = FALSE; g_main_loop_quit(mainloop); return; @@ -96,11 +96,8 @@ 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_int32(DATA_VALUE); + dbusmenu_menuitem_handle_event(menuroot, "clicked", data, TIMESTAMP_VALUE); return; } @@ -128,6 +125,7 @@ main (int argc, char ** argv) mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); + g_debug("Main loop complete"); g_object_unref(G_OBJECT(client)); if (passed) { |