rpms/at-spi/F-12 at-spi-fixed-sm.patch, 1.1, 1.2 at-spi.spec, 1.123, 1.124

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/at-spi/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20082

Modified Files:
	at-spi-fixed-sm.patch at-spi.spec 
Log Message:
fix slow logout


at-spi-fixed-sm.patch:
 registry-main.c |  377 +++++++++++++++++++-------------------------------------
 1 file changed, 131 insertions(+), 246 deletions(-)

Index: at-spi-fixed-sm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/F-12/at-spi-fixed-sm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- at-spi-fixed-sm.patch	27 Sep 2009 21:45:17 -0000	1.1
+++ at-spi-fixed-sm.patch	2 Oct 2009 23:11:57 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up at-spi-1.28.0/registryd/registry-main.c.fixed-sm at-spi-1.28.0/registryd/registry-main.c
 --- at-spi-1.28.0/registryd/registry-main.c.fixed-sm	2009-09-22 02:50:10.000000000 -0400
-+++ at-spi-1.28.0/registryd/registry-main.c	2009-09-27 16:36:17.805030309 -0400
++++ at-spi-1.28.0/registryd/registry-main.c	2009-10-02 18:46:50.543192819 -0400
 @@ -33,28 +33,133 @@
  #include "registry.h"
  #include <dbus/dbus-glib.h>
@@ -65,7 +65,7 @@ diff -up at-spi-1.28.0/registryd/registr
 +static void
 +stop_cb (gpointer data)
 +{
-+        gtk_main_quit ();
++        bonobo_main_quit ();
 +}
 +
 +static gboolean
@@ -99,7 +99,7 @@ diff -up at-spi-1.28.0/registryd/registr
 +end_session_cb (guint flags, gpointer data)
 +{
 +        end_session_response (TRUE, NULL);
-+        gtk_main_quit ();
++        bonobo_main_quit ();
 +}
 +static gboolean
 +register_client (void)


Index: at-spi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/at-spi/F-12/at-spi.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- at-spi.spec	27 Sep 2009 21:45:17 -0000	1.123
+++ at-spi.spec	2 Oct 2009 23:11:57 -0000	1.124
@@ -10,7 +10,7 @@
 Summary: Assistive Technology Service Provider Interface
 Name: at-spi
 Version: 1.28.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://download.gnome.org/sources/at-spi/1.28/%{name}-%{version}.tar.bz2
 
@@ -157,6 +157,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct  2 2009 Matthias Clasen <mclasen at redhat.com> - 1.28.0-3
+- Fix an oversight in the previous patch that caused
+  registryd to slow down logout by ~10 seconds
+
 * Sun Sep 27 2009 Matthias Clasen <mclasen at redhat.com> - 1.28.0-2
 - Use dbus sm api instead of xsmp, avoid segfault at logout (#519239)