[java-atk-wrapper] Fixed bug that window events are not emitted(bug 591665, 591670)

[Ke Wang <kewang src gnome org>]

commit 4b7a06778dac2eb690c03ca8d9cd1f52f3cd39ce
Author: Ke Wang <ke wang sun com>
Date:   Sun Aug 16 17:58:31 2009 +0800

    Fixed bug that window events are not emitted(bug 591665,591670)

 jni/src/AtkWrapper.c |   14 +++++++-------
 jni/src/jawobject.c  |   18 +++++++++---------
 jni/src/jawutil.c    |    4 +---
 3 files changed, 17 insertions(+), 19 deletions(-)
---
diff --git a/jni/src/AtkWrapper.c b/jni/src/AtkWrapper.c
index bb220e0..88aa70c 100644
--- a/jni/src/AtkWrapper.c
+++ b/jni/src/AtkWrapper.c
@@ -271,7 +271,7 @@ window_open_handler (gpointer p)
 		
 		g_signal_emit_by_name(ATK_OBJECT(atk_get_root()),
 				"children-changed::add", n, atk_obj, NULL);
-		g_signal_emit(atk_obj, g_signal_lookup("window_create", JAW_TYPE_OBJECT), 0);
+		g_signal_emit(atk_obj, g_signal_lookup("create", JAW_TYPE_OBJECT), 0);
 	}
 
 	free_callback_para(para);
@@ -323,7 +323,7 @@ window_close_handler (gpointer p)
 
 		g_signal_emit_by_name(ATK_OBJECT(atk_get_root()),
 				"children-changed::remove", n, atk_obj, NULL);
-		g_signal_emit(atk_obj, g_signal_lookup("window_destroy", JAW_TYPE_OBJECT), 0);
+		g_signal_emit(atk_obj, g_signal_lookup("destroy", JAW_TYPE_OBJECT), 0);
 	}
 
 	free_callback_para(para);
@@ -356,7 +356,7 @@ window_minimize_handler (gpointer p)
 	}
 
 	AtkObject* atk_obj = ATK_OBJECT(jaw_impl);
-	g_signal_emit(atk_obj, g_signal_lookup("window_minimize", JAW_TYPE_OBJECT), 0);
+	g_signal_emit(atk_obj, g_signal_lookup("minimize", JAW_TYPE_OBJECT), 0);
 
 	free_callback_para(para);
 
@@ -386,7 +386,7 @@ window_maximize_handler (gpointer p)
 	}
 
 	AtkObject* atk_obj = ATK_OBJECT(jaw_impl);
-	g_signal_emit(atk_obj, g_signal_lookup("window_maximize", JAW_TYPE_OBJECT), 0);
+	g_signal_emit(atk_obj, g_signal_lookup("maximize", JAW_TYPE_OBJECT), 0);
 
 	free_callback_para(para);
 
@@ -417,7 +417,7 @@ window_restore_handler (gpointer p)
 	}
 
 	AtkObject* atk_obj = ATK_OBJECT(jaw_impl);
-	g_signal_emit(atk_obj, g_signal_lookup("window_restore", JAW_TYPE_OBJECT), 0);
+	g_signal_emit(atk_obj, g_signal_lookup("restore", JAW_TYPE_OBJECT), 0);
 
 	free_callback_para(para);
 
@@ -448,7 +448,7 @@ window_activate_handler (gpointer p)
 	}
 
 	AtkObject* atk_obj = ATK_OBJECT(jaw_impl);
-	g_signal_emit(atk_obj, g_signal_lookup("window_activate", JAW_TYPE_OBJECT), 0);
+	g_signal_emit(atk_obj, g_signal_lookup("activate", JAW_TYPE_OBJECT), 0);
 
 	free_callback_para(para);
 
@@ -479,7 +479,7 @@ window_deactivate_handler (gpointer p)
 	}
 
 	AtkObject* atk_obj = ATK_OBJECT(jaw_impl);
-	g_signal_emit(atk_obj, g_signal_lookup("window_deactivate", JAW_TYPE_OBJECT), 0);
+	g_signal_emit(atk_obj, g_signal_lookup("deactivate", JAW_TYPE_OBJECT), 0);
 
 	free_callback_para(para);
 
diff --git a/jni/src/jawobject.c b/jni/src/jawobject.c
index be27145..2649b69 100644
--- a/jni/src/jawobject.c
+++ b/jni/src/jawobject.c
@@ -85,7 +85,7 @@ jaw_object_class_init (JawObjectClass *klass)
 	klass->get_interface_data = NULL;
 
 	jaw_window_signals [ACTIVATE] =
-		g_signal_new ("window_activate",
+		g_signal_new ("activate",
 			G_TYPE_FROM_CLASS (klass),
 			G_SIGNAL_RUN_LAST,
 			0, /* default signal handler */
@@ -93,7 +93,7 @@ jaw_object_class_init (JawObjectClass *klass)
 			g_cclosure_marshal_VOID__VOID,
 			G_TYPE_NONE, 0);
 	jaw_window_signals [CREATE] =
-		g_signal_new ("window_create",
+		g_signal_new ("create",
 			G_TYPE_FROM_CLASS (klass),
 			G_SIGNAL_RUN_LAST,
 			0, /* default signal handler */
@@ -101,7 +101,7 @@ jaw_object_class_init (JawObjectClass *klass)
 			g_cclosure_marshal_VOID__VOID,
 			G_TYPE_NONE, 0);
 	jaw_window_signals [DEACTIVATE] =
-		g_signal_new ("window_deactivate",
+		g_signal_new ("deactivate",
 			G_TYPE_FROM_CLASS (klass),
 			G_SIGNAL_RUN_LAST,
 			0, /* default signal handler */
@@ -109,7 +109,7 @@ jaw_object_class_init (JawObjectClass *klass)
 			g_cclosure_marshal_VOID__VOID,
 			G_TYPE_NONE, 0);
 	jaw_window_signals [DESTROY] =
-		g_signal_new ("window_destroy",
+		g_signal_new ("destroy",
 			G_TYPE_FROM_CLASS (klass),
 			G_SIGNAL_RUN_LAST,
 			0, /* default signal handler */
@@ -117,7 +117,7 @@ jaw_object_class_init (JawObjectClass *klass)
 			g_cclosure_marshal_VOID__VOID,
 			G_TYPE_NONE, 0);
 	jaw_window_signals [MAXIMIZE] =
-		g_signal_new ("window_maximize",
+		g_signal_new ("maximize",
 			G_TYPE_FROM_CLASS (klass),
 			G_SIGNAL_RUN_LAST,
 			0, /* default signal handler */
@@ -125,7 +125,7 @@ jaw_object_class_init (JawObjectClass *klass)
 			g_cclosure_marshal_VOID__VOID,
 			G_TYPE_NONE, 0);
 	jaw_window_signals [MINIMIZE] =
-		g_signal_new ("window_minimize",
+		g_signal_new ("minimize",
 			G_TYPE_FROM_CLASS (klass),
 			G_SIGNAL_RUN_LAST,
 			0, /* default signal handler */
@@ -133,7 +133,7 @@ jaw_object_class_init (JawObjectClass *klass)
 			g_cclosure_marshal_VOID__VOID,
 			G_TYPE_NONE, 0);
 	jaw_window_signals [MOVE] =
-		g_signal_new ("window_move",
+		g_signal_new ("move",
 			G_TYPE_FROM_CLASS (klass),
 			G_SIGNAL_RUN_LAST,
 			0, /* default signal handler */
@@ -141,7 +141,7 @@ jaw_object_class_init (JawObjectClass *klass)
 			g_cclosure_marshal_VOID__VOID,
 			G_TYPE_NONE, 0);
 	jaw_window_signals [RESIZE] =
-		g_signal_new ("window_resize",
+		g_signal_new ("resize",
 			G_TYPE_FROM_CLASS (klass),
 			G_SIGNAL_RUN_LAST,
 			0, /* default signal handler */
@@ -149,7 +149,7 @@ jaw_object_class_init (JawObjectClass *klass)
 			g_cclosure_marshal_VOID__VOID,
 			G_TYPE_NONE, 0);
 	jaw_window_signals [RESTORE] =
-		g_signal_new ("window_restore",
+		g_signal_new ("restore",
 			G_TYPE_FROM_CLASS (klass),
 			G_SIGNAL_RUN_LAST,
 			0, /* default signal handler */
diff --git a/jni/src/jawutil.c b/jni/src/jawutil.c
index 1739a21..e2047b2 100644
--- a/jni/src/jawutil.c
+++ b/jni/src/jawutil.c
@@ -136,9 +136,7 @@ jaw_util_add_global_event_listener (GSignalEmissionHook listener,
 
 	if (split_string) {
 		if (!strcmp ("window", split_string[0])) {
-			gchar* signal_name = g_strconcat("window_", split_string[1], NULL);
-			rc = add_listener (listener, "JawObject", signal_name, event_type);
-			g_free(signal_name);
+			rc = add_listener (listener, "JawObject", split_string[1], event_type);
 		} else {
 			rc = add_listener (listener, split_string[1], split_string[2], event_type);
 		}