rpms/at-spi/devel at-spi.spec, 1.95, 1.96 liyuan-greeter-crash.patch, 1.1, 1.2

[Matthias Clasen]

Author: mclasen

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

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



Index: at-spi.spec
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- at-spi.spec	5 Sep 2008 14:07:24 -0000	1.95
+++ at-spi.spec	5 Sep 2008 16:50:40 -0000	1.96
@@ -10,7 +10,7 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.23.91
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://download.gnome.org/sources/at-spi/1.23/%{name}-%{version}.tar.bz2
 
@@ -77,7 +77,7 @@
 %prep
 %setup -q
 %patch2 -p1 -b .spew
-%patch3 -p0 -b .greeter-crash
+%patch3 -p1 -b .greeter-crash
 
 
 %build
@@ -124,6 +124,9 @@
 
 
 %changelog
+* Fri Sep  5 2008 Matthias Clasen <mclasen at redhat.com> - 1.23.91-3
+- Fix an evo crash caused by the greeter crash fix
+
 * Fri Sep  5 2008 Matthias Clasen <mclasen at redhat.com> - 1.23.91-2
 - Fix a greeter crash
 

liyuan-greeter-crash.patch:

Index: liyuan-greeter-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/at-spi/devel/liyuan-greeter-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- liyuan-greeter-crash.patch	5 Sep 2008 14:07:24 -0000	1.1
+++ liyuan-greeter-crash.patch	5 Sep 2008 16:50:40 -0000	1.2
@@ -1,6 +1,7 @@
---- atk-bridge/bridge.c.orig	2008-09-05 15:37:54.046098231 +0800
-+++ atk-bridge/bridge.c	2008-09-05 15:59:55.399017901 +0800
-@@ -1101,7 +1101,7 @@
+diff -up at-spi-1.23.91/atk-bridge/bridge.c.greeter-crash at-spi-1.23.91/atk-bridge/bridge.c
+--- at-spi-1.23.91/atk-bridge/bridge.c.greeter-crash	2008-09-05 09:54:27.000000000 -0400
++++ at-spi-1.23.91/atk-bridge/bridge.c	2008-09-05 12:38:34.000000000 -0400
+@@ -1101,7 +1101,7 @@ spi_atk_bridge_signal_listener (GSignalI
    CORBA_any any;
    CORBA_Object c_obj;
    char *sp = NULL;
@@ -9,12 +10,12 @@
    gint detail1 = 0, detail2 = 0;
    SpiAccessible *s_ao = NULL;
  #ifdef SPI_BRIDGE_DEBUG
-@@ -1162,7 +1162,7 @@
+@@ -1162,7 +1162,7 @@ spi_atk_bridge_signal_listener (GSignalI
            ao = ATK_OBJECT (child);
            g_object_ref (ao);
          }
 -      else
-+      else if (strcmp (detail, "add") == 0)
++      else if (detail != NULL && strcmp (detail, "add") == 0)
          {
            ao = atk_object_ref_accessible_child (ATK_OBJECT (gobject), 
                                                  detail1);