Move spi_object_append_null_reference and adjust its usage

This prevents a compilation failure on OpenSolaris

diff --git a/atk-adaptor/object.c b/atk-adaptor/object.c
index 090ee6a..ebaf4e5 100644 (file)
--- a/atk-adaptor/object.c
+++ b/atk-adaptor/object.c
@@ -74,14 +74,32 @@ maybe_lease (AtkObject *obj)
  */
 
 void
+spi_object_append_null_reference (DBusMessageIter * iter)
+{
+  DBusMessageIter iter_struct;
+  const char *name;
+  const char *path = "/org/at_spi/null";
+
+  name = dbus_bus_get_unique_name (spi_global_app_data->bus);
+
+  dbus_message_iter_open_container (iter, DBUS_TYPE_STRUCT, NULL,
+                                    &iter_struct);
+  dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &name);
+  dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path);
+  dbus_message_iter_close_container (iter, &iter_struct);
+}
+
+void
 spi_object_append_reference (DBusMessageIter * iter, AtkObject * obj)
 {
   DBusMessageIter iter_struct;
   const gchar *name;
   gchar *path;
 
-  if (!obj)
-    return spi_object_append_null_reference (iter);
+  if (!obj) {
+    spi_object_append_null_reference (iter);
+    return;
+  }
 
   maybe_lease (obj);
 
@@ -125,22 +143,6 @@ spi_object_append_desktop_reference (DBusMessageIter * iter)
   dbus_message_iter_close_container (iter, &iter_struct);
 }
 
-void
-spi_object_append_null_reference (DBusMessageIter * iter)
-{
-  DBusMessageIter iter_struct;
-  const char *name;
-  const char *path = "/org/at_spi/null";
-
-  name = dbus_bus_get_unique_name (spi_global_app_data->bus);
-
-  dbus_message_iter_open_container (iter, DBUS_TYPE_STRUCT, NULL,
-                                    &iter_struct);
-  dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &name);
-  dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path);
-  dbus_message_iter_close_container (iter, &iter_struct);
-}
-
 DBusMessage *
 spi_object_return_reference (DBusMessage * msg, AtkObject * obj)
 {