at-spi r1137 - in trunk: . cspi

[liyuan svn gnome org]

Author: liyuan
Date: Fri Dec 12 08:01:21 2008
New Revision: 1137
URL: http://svn.gnome.org/viewvc/at-spi?rev=1137&view=rev

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

        * cspi/spi_main.c: (cspi_object_get_ref), (cspi_object_unref):
        Revert change to Bug #563313 for it causes crash on another machine.
        Also change g_assert to g_return_val_if_fail.


Modified:
   trunk/ChangeLog
   trunk/cspi/spi_main.c

Modified: trunk/cspi/spi_main.c
==============================================================================
--- trunk/cspi/spi_main.c	(original)
+++ trunk/cspi/spi_main.c	Fri Dec 12 08:01:21 2008
@@ -220,7 +220,7 @@
     {
       if ((ref = g_hash_table_lookup (cspi_get_live_refs (), corba_object)))
         {
-          g_assert (ref->ref_count > 0);
+          g_return_val_if_fail (ref->ref_count > 0, NULL);
 	  ref->ref_count++;
 	  if (!on_loan)
 	    {
@@ -331,10 +331,9 @@
     }
 
   g_return_if_fail (accessible->ref_count > 0);
-  if (accessible->ref_count == 1)
+  if (--accessible->ref_count == 0)
     {
       g_hash_table_remove (cspi_get_live_refs (), accessible->objref);
-      accessible->ref_count--;
     }
 }