Merge branch 'upstream' into tizen

[platform/upstream/at-spi2-atk.git] / atk-adaptor / event.c

diff --git a/atk-adaptor/event.c b/atk-adaptor/event.c
index bd38eef..280973f 100644 (file)
--- a/atk-adaptor/event.c
+++ b/atk-adaptor/event.c
@@ -972,7 +972,7 @@ text_insert_event_listener (GSignalInvocationHint * signal_hint,
   guint text_changed_signal_id;
   GSignalQuery signal_query;
   const gchar *name;
-  const gchar *minor_raw, *text;
+  const gchar *minor_raw, *text = NULL;
   gchar *minor;
   gint detail1 = 0, detail2 = 0;
 
@@ -1003,8 +1003,9 @@ text_insert_event_listener (GSignalInvocationHint * signal_hint,
   else
     text = "";
 
-  emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
-              DBUS_TYPE_STRING_AS_STRING, text, append_basic);
+  if (text != NULL)
+    emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
+                DBUS_TYPE_STRING_AS_STRING, text, append_basic);
   g_free (minor);
   return TRUE;
 }
@@ -1023,7 +1024,7 @@ text_remove_event_listener (GSignalInvocationHint * signal_hint,
   guint text_changed_signal_id;
   GSignalQuery signal_query;
   const gchar *name;
-  const gchar *minor_raw, *text;
+  const gchar *minor_raw, *text = NULL;
   gchar *minor;
   gint detail1 = 0, detail2 = 0;
 
@@ -1054,8 +1055,9 @@ text_remove_event_listener (GSignalInvocationHint * signal_hint,
   else
     text = "";
 
-  emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
-              DBUS_TYPE_STRING_AS_STRING, text, append_basic);
+  if (text != NULL)
+    emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
+                DBUS_TYPE_STRING_AS_STRING, text, append_basic);
   g_free (minor);
   return TRUE;
 }