rpms/at-spi/devel evo-crash.patch,NONE,1.1 at-spi.spec,1.100,1.101

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/at-spi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9517

Modified Files:
	at-spi.spec 
Added Files:
	evo-crash.patch 
Log Message:
fix an evo crash


evo-crash.patch:

--- NEW FILE evo-crash.patch ---
diff -up at-spi-1.24.0/atk-bridge/bridge.c.evo-crash at-spi-1.24.0/atk-bridge/bridge.c
--- at-spi-1.24.0/atk-bridge/bridge.c.evo-crash	2008-10-21 01:01:28.000000000 -0400
+++ at-spi-1.24.0/atk-bridge/bridge.c	2008-10-21 01:01:36.000000000 -0400
@@ -1156,17 +1155,20 @@ spi_atk_bridge_signal_listener (GSignalI
     }
   else if ((signal_query.signal_id == atk_signal_children_changed) && gobject)
     {
-      detail1 = g_value_get_uint (param_values + 1);
-      gpointer child = g_value_get_pointer (param_values + 2);
-      if (ATK_IS_OBJECT (child))
+      if (detail != NULL)
         {
-          ao = ATK_OBJECT (child);
-          g_object_ref (ao);
-        }
-      else if ((detail != NULL) && (strcmp (detail, "add") == 0))
-        {
-          ao = atk_object_ref_accessible_child (ATK_OBJECT (gobject), 
-                                                detail1);
+          detail1 = g_value_get_uint (param_values + 1);
+          gpointer child = g_value_get_pointer (param_values + 2);
+          if (ATK_IS_OBJECT (child))
+            {
+              ao = ATK_OBJECT (child);
+              g_object_ref (ao);
+            }
+          else if (strcmp (detail, "add") == 0)
+            {
+              ao = atk_object_ref_accessible_child (ATK_OBJECT (gobject), 
+                                                    detail1);
+            }
         }
       if (ao)
         {


Index: at-spi.spec
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- at-spi.spec	4 Oct 2008 03:25:54 -0000	1.100
+++ at-spi.spec	21 Oct 2008 05:04:45 -0000	1.101
@@ -10,7 +10,7 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.24.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://download.gnome.org/sources/at-spi/1.24/%{name}-%{version}.tar.bz2
 
@@ -49,6 +49,8 @@
 Patch2: at-spi-silence-no-event-spew.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=554953
 Patch3: atk-bridge-make-resident.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=548782
+Patch4: evo-crash.patch
 
 %description
 at-spi allows assistive technologies to access GTK-based
@@ -86,6 +88,7 @@
 %setup -q
 %patch2 -p1 -b .spew
 %patch3 -p1 -b .atk-bridge-make-resident
+%patch4 -p1 -b .evo-crash
 
 autoconf
 
@@ -150,6 +153,9 @@
 
 
 %changelog
+* Tue Oct 21 2008 Matthias Clasen <mclasen at redhat.com> - 1.24.0-5
+- Prevent a crash in evo when changing components
+
 * Fri Oct  3 2008 Matthias Clasen <mclasen at redhat.com> - 1.24.0-4
 - Prevent at-spi module from being unloaded