Merge "Revert "tizen: Add additional unit for "unified" user session"" into tizen

[platform/upstream/at-spi2-core.git] / test / memory.c

diff --git a/test/memory.c b/test/memory.c
index 75cdd93..2db9871 100644 (file)
--- a/test/memory.c
+++ b/test/memory.c
@@ -13,18 +13,17 @@ basic (AtspiAccessible *obj)
   gint count;
   gint i;
   AtspiAccessible *accessible;
-  GError *error = NULL;
 
-  str = atspi_accessible_get_name (obj, &error);
+  str = atspi_accessible_get_name (obj, NULL);
   if (str)
     g_free (str);
   accessible = atspi_accessible_get_parent (obj, NULL);
   if (accessible)
     g_object_unref (accessible);
-  count = atspi_accessible_get_child_count (obj, &error);
+  count = atspi_accessible_get_child_count (obj, NULL);
   for (i = 0; i < count; i++)
   {
-    accessible = atspi_accessible_get_child_at_index (obj, i, &error);
+    accessible = atspi_accessible_get_child_at_index (obj, i, NULL);
     if (accessible)
       g_object_unref (accessible);
   }
@@ -53,13 +52,17 @@ on_event (AtspiEvent *event, void *data)
     if (strstr (event->type, "add"))
     {
       AtspiAccessible *desktop = atspi_get_desktop (0);
+      guint id;
       basic (desktop);
       g_object_unref (desktop);
-      g_timeout_add (3000, kill_child, NULL);
+      id = g_timeout_add (3000, kill_child, NULL);
+      g_source_set_name_by_id (id, "[at-spi2-core] kill_child");
     }
     else
     {
-      g_idle_add (end, NULL);
+      guint id;
+      id = g_idle_add (end, NULL);
+      g_source_set_name_by_id (id, "[at-spi2-core] end");
     }
   }
   g_boxed_free (ATSPI_TYPE_EVENT, event);