From 8dc75510426566d5eb8d01059b69cfb54e113e93 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Dec 02 2008 15:37:20 +0000
Subject: update patches


---

diff --git a/at-spi.spec b/at-spi.spec
index 0c18bca..a91c610 100644
--- a/at-spi.spec
+++ b/at-spi.spec
@@ -10,7 +10,7 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.25.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://download.gnome.org/sources/at-spi/1.25/%{name}-%{version}.tar.bz2
 
@@ -148,7 +148,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Dec  2 2008 Matthias Clasen <mclasen@redhat.com> - 1.25.2-1
+* Tue Dec  2 2008 Matthias Clasen <mclasen@redhat.com> - 1.25.2-2
 - Update to 1.25.2
 
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 1.25.1-3
diff --git a/evo-crash.patch b/evo-crash.patch
index e5c5654..f5ad633 100644
--- a/evo-crash.patch
+++ b/evo-crash.patch
@@ -1,30 +1,34 @@
-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
+diff -up at-spi-1.25.2/atk-bridge/bridge.c.evo-crash at-spi-1.25.2/atk-bridge/bridge.c
+--- at-spi-1.25.2/atk-bridge/bridge.c.evo-crash	2008-11-24 01:39:41.000000000 -0500
++++ at-spi-1.25.2/atk-bridge/bridge.c	2008-12-02 10:34:11.000000000 -0500
+@@ -1153,20 +1153,23 @@ spi_atk_bridge_signal_listener (GSignalI
+       spi_atk_bridge_init_rect (&any, ATK_OBJECT (gobject), atk_rect);
      }
    else if ((signal_query.signal_id == atk_signal_children_changed) && gobject)
-     {
+-    {
++    {      
+       gpointer child;
+ 
 -      detail1 = g_value_get_uint (param_values + 1);
--      gpointer child = g_value_get_pointer (param_values + 2);
+-      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))
--        {
++      if (detail != NULL)
+         {
 -          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);
++          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)
++          else if ((detail != NULL) && (strcmp (detail, "add") == 0))
 +            {
 +              ao = atk_object_ref_accessible_child (ATK_OBJECT (gobject), 
 +                                                    detail1);