From: padraigo <padraigo@e2bd861d-eb25-0410-b326-f6ed22b6b98c>
Date: Thu, 25 Sep 2003 07:13:23 +0000 (+0000)
Subject: 2003-09-25  Padraig O'Briain <padraig.obriain@sun.com>
X-Git-Tag: AT_SPI2_ATK_0_1_3~678
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4a41fd5865acddfcb7c8d0f0860dbc0a092c9268;p=platform%2Fupstream%2Fat-spi2-atk.git

2003-09-25  Padraig O'Briain <padraig.obriain@sun.com>

	* atk-bridge/bridge.c:
	(atk_bridge_init): Register event listeners always even for
	out-of-process applet.
	(spi_atk_bridge_toplevel_added): Remove call to
	spi_atk_bridge_event_type_consts as it is now called in atk_bridge_init
	(spi_atk_bridge_toplevelk_removed): Remove call to
	spi_atk_deregister_event_listenersa as the listeners are now always
	registered
	(spi_atk_bridge_register_application): Remove call to
	spi_atk_register_event_listeners as it is not done in atk_bridge_init

	This fixes bug #120991.

	* libspi/table.c (impl_getColumnDescription): Correct typo,
	pointed out by Bolian.Yin@sun.com.


git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@552 e2bd861d-eb25-0410-b326-f6ed22b6b98c
---

diff --git a/ChangeLog b/ChangeLog
index 9752178..b4b2d09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2003-09-25  Padraig O'Briain <padraig.obriain@sun.com>
+
+	* atk-bridge/bridge.c:
+	(atk_bridge_init): Register event listeners always even for 
+	out-of-process applet.
+	(spi_atk_bridge_toplevel_added): Remove call to 
+	spi_atk_bridge_event_type_consts as it is now called in atk_bridge_init
+	(spi_atk_bridge_toplevelk_removed): Remove call to 
+	spi_atk_deregister_event_listenersa as the listeners are now always
+	registered
+	(spi_atk_bridge_register_application): Remove call to
+	spi_atk_register_event_listeners as it is not done in atk_bridge_init
+
+	This fixes bug #120991.
+
+	* libspi/table.c (impl_getColumnDescription): Correct typo,
+	pointed out by Bolian.Yin@sun.com.
+
 2003-09-21  Åsmund Skjæveland  <aasmunds@fys.uio.no>
 
 	* configure.in: Added nn to ALL_LINGUAS (which is commented out).
diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c
index 411022b..2adbe98 100644
--- a/atk-bridge/bridge.c
+++ b/atk-bridge/bridge.c
@@ -77,7 +77,6 @@ static void     spi_atk_bridge_toplevel_removed        (AtkObject             *o
 
 static void     spi_atk_bridge_exit_func               (void);
 static void     spi_atk_register_event_listeners       (void);
-static void     spi_atk_deregister_event_listeners     (void);
 static void     spi_atk_bridge_focus_tracker           (AtkObject             *object);
 static void     spi_atk_bridge_register_application    (Accessibility_Registry registry);
 static gboolean spi_atk_bridge_property_event_listener (GSignalInvocationHint *signal_hint,
@@ -182,8 +181,9 @@ atk_bridge_init (gint *argc, gchar **argv[])
   else
     {
       spi_atk_bridge_do_registration ();
-      spi_atk_bridge_init_event_type_consts ();
     }
+  spi_atk_register_event_listeners ();
+  spi_atk_bridge_init_event_type_consts ();
  
   return 0;
 }
@@ -225,7 +225,6 @@ spi_atk_bridge_toplevel_added (AtkObject *object,
   if (toplevels == 0)
     {
       spi_atk_bridge_do_registration ();
-      spi_atk_bridge_init_event_type_consts ();
     }
   toplevels++;
 }
@@ -241,7 +240,6 @@ spi_atk_bridge_toplevel_removed (AtkObject *object,
   if (toplevels == 0)
     {
       deregister_application (app);
-      spi_atk_deregister_event_listeners ();
       reinit_register_vars ();
     }
   if (toplevels < 0)
@@ -257,7 +255,6 @@ spi_atk_bridge_register_application (Accessibility_Registry registry)
   Accessibility_Registry_registerApplication (spi_atk_bridge_get_registry (),
                                               BONOBO_OBJREF (this_app),
                                               &ev);
-  spi_atk_register_event_listeners ();
 }
 
 static Accessibility_Registry
@@ -412,32 +409,6 @@ spi_atk_register_event_listeners (void)
 }
 
 static void
-spi_atk_deregister_event_listeners (void)
-{
-  gint i;
-  guint id;
-
-  if (!atk_listeners_registered)
-    return;
-
-  atk_listeners_registered = FALSE;
-
-  for (i = 0; i < listener_ids->len; i++)
-    {
-      id = g_array_index (listener_ids, guint, i);
-      atk_remove_global_event_listener (id);   
-    }
-  g_array_free (listener_ids, TRUE);
-  listener_ids = NULL;
-
-  atk_remove_focus_tracker (atk_bridge_focus_tracker_id);
-  atk_bridge_focus_tracker_id = 0;
-
-  atk_remove_key_event_listener (atk_bridge_key_event_listener_id);
-  atk_bridge_key_event_listener_id = 0;
-}
-
-static void
 deregister_application (BonoboObject *app)
 {
   Accessibility_Registry registry = spi_atk_bridge_get_registry ();	
diff --git a/libspi/table.c b/libspi/table.c
index 75d3cec..d982b68 100644
--- a/libspi/table.c
+++ b/libspi/table.c
@@ -197,7 +197,7 @@ impl_getColumnDescription (PortableServer_Servant servant,
 
   g_return_val_if_fail (table != NULL, CORBA_string_dup (""));
   
-  rv = atk_table_get_row_description (table, column);
+  rv = atk_table_get_column_description (table, column);
 
   if (rv)
     {