2008-07-21 Mark Doffman <mark.doffman@codethink.co.uk>

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

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index ab045a8..4476c6d 100644 (file)
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -685,7 +685,11 @@ static void emit(AtkObject *object, const char *name, const char *detail, dbus_i
     type_as_string = "o";
     if (!val) val = "";
   }
-  else if (type == DBUS_TYPE_STRING) type_as_string = "s";
+  else if (type == DBUS_TYPE_STRING)
+  {
+    type_as_string = "s";
+    if (!val) val = "";
+  }
   else if (type == DBUS_TYPE_INT32) type_as_string = "i";
   else if (type == DBUS_TYPE_UINT32) type_as_string = "u";
   else if (type == DBUS_TYPE_INVALID)
@@ -707,7 +711,6 @@ static void emit(AtkObject *object, const char *name, const char *detail, dbus_i
   dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT, type_as_string, &sub);
   dbus_message_iter_append_basic(&sub, type, &val);
   dbus_message_iter_close_container(&iter, &sub);
-printf("emit: %s %s\n", name, detail);
   dbus_connection_send(this_app->droute.bus, sig, NULL);
   g_free(path);
   dbus_message_unref(sig);
@@ -1189,11 +1192,11 @@ spi_atk_tidy_windows (void)
       name = atk_object_get_name (child);
       if (atk_state_set_contains_state (stateset, ATK_STATE_ACTIVE))
         {
-         emit(child, "window:deactivate", NULL, 0, 0, DBUS_TYPE_STRING, name);
+         emit(child, "window_deactivate", NULL, 0, 0, DBUS_TYPE_STRING, name);
         }
       g_object_unref (stateset);
 
-      emit(child, "window:destroy", NULL, 0, 0, DBUS_TYPE_STRING, name);
+      emit(child, "window_destroy", NULL, 0, 0, DBUS_TYPE_STRING, name);
       g_object_unref (child);
     }
 }