rpms/gnome-session/devel gnome-session-2.19.4-atspi-timeout.patch, 1.1, 1.2 gnome-session.spec, 1.126, 1.127
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Tue Jun 19 18:35:37 UTC 2007
Author: mclasen
Update of /cvs/extras/rpms/gnome-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16840
Modified Files:
gnome-session-2.19.4-atspi-timeout.patch gnome-session.spec
Log Message:
Fix a hang at login
gnome-session-2.19.4-atspi-timeout.patch:
Index: gnome-session-2.19.4-atspi-timeout.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session-2.19.4-atspi-timeout.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-session-2.19.4-atspi-timeout.patch 17 Jun 2007 23:09:23 -0000 1.1
+++ gnome-session-2.19.4-atspi-timeout.patch 19 Jun 2007 18:35:31 -0000 1.2
@@ -1,20 +1,70 @@
--- gnome-session-2.19.4/gnome-session/gsm-at-startup.c.timeout 2007-06-17 18:21:51.000000000 -0400
-+++ gnome-session-2.19.4/gnome-session/gsm-at-startup.c 2007-06-17 19:00:54.000000000 -0400
-@@ -65,13 +65,15 @@ gsm_assistive_registry_start (void)
++++ gnome-session-2.19.4/gnome-session/gsm-at-startup.c 2007-06-19 14:21:30.000000000 -0400
+@@ -10,67 +10,14 @@
+ #include <gdk/gdkx.h>
+ #include <gconf/gconf-client.h>
- gdk_window_set_events (w, GDK_PROPERTY_CHANGE_MASK);
- gsm_exec_command_line_async (command, NULL);
-+#if 0
- gdk_window_add_filter (w, gsm_assistive_filter_watch, &tid);
- tid = g_timeout_add_seconds (5, gsm_assistive_filter_timeout, NULL);
+-static Atom AT_SPI_IOR;
+-
+-static GdkFilterReturn
+-gsm_assistive_filter_watch (GdkXEvent *xevent, GdkEvent *event, gpointer data){
+- XEvent *xev = (XEvent *)xevent;
+- gint tid = *(gint *)data;
+-
+- if (xev->xany.type == PropertyNotify &&
+- xev->xproperty.atom == AT_SPI_IOR)
+- {
+- g_source_remove (tid);
+- gtk_main_quit ();
+-
+- return GDK_FILTER_REMOVE;
+- }
+-
+- return GDK_FILTER_CONTINUE;
+-}
+-
+-static void
+-gsm_assistive_error_dialog (void)
+-{
+- GtkWidget *dialog = gtk_message_dialog_new (NULL,
+- GTK_DIALOG_MODAL,
+- GTK_MESSAGE_ERROR,
+- GTK_BUTTONS_OK,
+- _("Assistive technology support has been requested for this session, but the accessibility registry was not found. Please ensure that the AT-SPI package is installed. Your session has been started without assistive technology support."));
+- gtk_dialog_run (GTK_DIALOG (dialog));
+- gtk_widget_destroy (dialog);
+-}
+-
+-static gboolean
+-gsm_assistive_filter_timeout (gpointer data)
+-{
+- gsm_assistive_error_dialog ();
+-
+- gtk_main_quit ();
-
-+#endif
- gtk_main ();
+- return FALSE;
+-}
+-
+ void
+ gsm_assistive_registry_start (void)
+ {
+- GdkWindow *w = gdk_get_default_root_window ();
+ gchar *command;
+- guint tid;
+
+- if (!AT_SPI_IOR)
+- AT_SPI_IOR = XInternAtom (GDK_DISPLAY (), "AT_SPI_IOR", False);
+-
+ command = g_strdup (AT_SPI_REGISTRYD_DIR "/at-spi-registryd");
-+#if 0
- gdk_window_remove_filter (w, gsm_assistive_filter_watch, &tid);
+- gdk_window_set_events (w, GDK_PROPERTY_CHANGE_MASK);
+ gsm_exec_command_line_async (command, NULL);
+- gdk_window_add_filter (w, gsm_assistive_filter_watch, &tid);
+- tid = g_timeout_add_seconds (5, gsm_assistive_filter_timeout, NULL);
-
-+#endif
+- gtk_main ();
+-
+- gdk_window_remove_filter (w, gsm_assistive_filter_watch, &tid);
+
g_free (command);
}
-
Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- gnome-session.spec 17 Jun 2007 23:23:04 -0000 1.126
+++ gnome-session.spec 19 Jun 2007 18:35:31 -0000 1.127
@@ -12,7 +12,7 @@
Summary: GNOME session manager
Name: gnome-session
Version: 2.19.4
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-session/2.19/%{name}-%{version}.tar.bz2
Source1: redhat-default-session
@@ -188,6 +188,9 @@
%{_datadir}/icons/hicolor/scalable/apps/session-properties.svg
%changelog
+* Tue Jun 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.4-2
+- Fix a hang on login with a11y
+
* Sun Jun 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.4-1
- Update to 2.19.4
More information about the fedora-extras-commits
mailing list