From df245c93197d70f1d0a58c262fc219bfbe46c00a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Oct 02 2009 23:11:57 +0000 Subject: fix slow logout --- diff --git a/at-spi-fixed-sm.patch b/at-spi-fixed-sm.patch index 08fea66..8815aac 100644 --- a/at-spi-fixed-sm.patch +++ b/at-spi-fixed-sm.patch @@ -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 @@ -65,7 +65,7 @@ diff -up at-spi-1.28.0/registryd/registry-main.c.fixed-sm at-spi-1.28.0/registry +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/registry-main.c.fixed-sm at-spi-1.28.0/registry +end_session_cb (guint flags, gpointer data) +{ + end_session_response (TRUE, NULL); -+ gtk_main_quit (); ++ bonobo_main_quit (); +} +static gboolean +register_client (void) diff --git a/at-spi.spec b/at-spi.spec index 145c2e3..c562f3c 100644 --- a/at-spi.spec +++ b/at-spi.spec @@ -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 - 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 - 1.28.0-2 - Use dbus sm api instead of xsmp, avoid segfault at logout (#519239)