2009-08-28 Mike Gorse <mgorse@novell.com>

[platform/core/uifw/at-spi2-atk.git] / atk-adaptor / selection-adaptor.c

diff --git a/atk-adaptor/selection-adaptor.c b/atk-adaptor/selection-adaptor.c
index c348655..1fee235 100644 (file)
--- a/atk-adaptor/selection-adaptor.c
+++ b/atk-adaptor/selection-adaptor.c
@@ -25,7 +25,8 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "spi-common/spi-dbus.h"
+#include "common/spi-dbus.h"
+#include "accessible-marshaller.h"
 
 static dbus_bool_t
 impl_get_nSelectedChildren (DBusMessageIter * iter,
@@ -41,7 +42,7 @@ impl_get_nSelectedChildren (DBusMessageIter * iter,
 /*static char *
 impl_get_nSelectedChildren_str (void *datum)
 {
-  g_assert (ATK_IS_HYPERLINK (datum));
+  g_return_val_if_fail (ATK_IS_SELECTION (user_data), FALSE);
   return g_strdup_printf ("%d",
                           atk_selection_get_selection_count ((AtkSelection *)
                                                              datum));
@@ -66,7 +67,7 @@ impl_getSelectedChild (DBusConnection * bus, DBusMessage * message,
       return droute_invalid_arguments_error (message);
     }
   atk_object = atk_selection_ref_selection (selection, selectedChildIndex);
-  return spi_dbus_return_object (message, atk_object, TRUE);
+  return spi_dbus_return_object (message, atk_object, TRUE, TRUE);
 }
 
 static DBusMessage *