at-spi r1124 - in trunk: . atk-bridge cspi

[liyuan svn gnome org]

Author: liyuan
Date: Tue Nov 18 03:07:26 2008
New Revision: 1124
URL: http://svn.gnome.org/viewvc/at-spi?rev=1124&view=rev

Log:
2008-11-18  Li Yuan  <li yuan sun com>

        * atk-bridge/bridge.c: (spi_atk_bridge_toplevel_removed):
        Bug #446574. Don't reinit vars too early. Can cause crash.
        * cspi/spi_accessible.c: (Accessible_getHostApplication):
        Bug #532907. Return application with reference 1.


Modified:
   trunk/ChangeLog
   trunk/atk-bridge/bridge.c
   trunk/cspi/spi_accessible.c

Modified: trunk/atk-bridge/bridge.c
==============================================================================
--- trunk/atk-bridge/bridge.c	(original)
+++ trunk/atk-bridge/bridge.c	Tue Nov 18 03:07:26 2008
@@ -135,7 +135,6 @@
 							gpointer               data);
 static void     spi_atk_tidy_windows                   (void);
 static void     deregister_application                 (BonoboObject          *app);
-static void     reinit_register_vars                   (void);
 
 /* For automatic libgnome init */
 extern void gnome_accessibility_module_init     (void);
@@ -315,7 +314,6 @@
   if (toplevels == 0)
     {
       deregister_application (app);
-      reinit_register_vars ();
     }
   if (toplevels < 0)
     {
@@ -1338,14 +1336,6 @@
 }
 
 static void
-reinit_register_vars (void)
-{
-  registry = CORBA_OBJECT_NIL;
-  device_event_controller = CORBA_OBJECT_NIL;
-  this_app = NULL;
-}
-
-static void
 spi_atk_bridge_init_base (CORBA_any *any, AtkObject *obj, 
 			  Accessibility_Application *app, Accessibility_Role *role,
 			  CORBA_string *name)

Modified: trunk/cspi/spi_accessible.c
==============================================================================
--- trunk/cspi/spi_accessible.c	(original)
+++ trunk/cspi/spi_accessible.c	Tue Nov 18 03:07:26 2008
@@ -651,6 +651,7 @@
     retval = Accessible_getApplication (cspi_object_add (
 					    Accessibility_Accessible_getApplication (CSPI_OBJREF (obj),
 										     cspi_ev ())));
+    AccessibleApplication_unref (retval);
     cspi_return_val_if_ev ("getApplication", NULL);
 
     return retval;