r17227 - in /desktop/unstable/gnome-session/debian: changelog patches/04_at-spi_startup.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Oct  7 12:48:12 2008
New Revision: 17227

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17227
Log:
04_at-spi_startup.patch: new patch. Do not try to start at-spi if it 
is not installed. Closes: #501407.

Added:
    desktop/unstable/gnome-session/debian/patches/04_at-spi_startup.patch
Modified:
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/patches/series

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=17227&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog (original)
+++ desktop/unstable/gnome-session/debian/changelog Tue Oct  7 12:48:12 2008
@@ -2,6 +2,8 @@
 
   * Recommend dbus-x11 instead of dbus for the availability of 
     dbus-launch.
+  * 04_at-spi_startup.patch: new patch. Do not try to start at-spi if it 
+    is not installed. Closes: #501407.
 
  -- Josselin Mouette <joss at debian.org>  Wed, 16 Jul 2008 11:30:09 +0200
 

Added: desktop/unstable/gnome-session/debian/patches/04_at-spi_startup.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/04_at-spi_startup.patch?rev=17227&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/04_at-spi_startup.patch (added)
+++ desktop/unstable/gnome-session/debian/patches/04_at-spi_startup.patch Tue Oct  7 12:48:12 2008
@@ -1,0 +1,30 @@
+Debian #501407
+
+Index: gnome-session-2.22.2/gnome-session/gsm-at-startup.c
+===================================================================
+--- gnome-session-2.22.2.orig/gnome-session/gsm-at-startup.c	2008-10-07 14:45:59.511335588 +0200
++++ gnome-session-2.22.2/gnome-session/gsm-at-startup.c	2008-10-07 14:48:45.351331313 +0200
+@@ -63,15 +63,16 @@ gsm_assistive_registry_start (void)
+ 
+      command = g_strdup (AT_SPI_REGISTRYD_DIR "/at-spi-registryd");
+ 
+-     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);    
++     if (g_file_test (command, G_FILE_TEST_IS_EXECUTABLE)) {
++         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);
+ 
+-     gtk_main ();
+-
+-     gdk_window_remove_filter (w, gsm_assistive_filter_watch, &tid);
++         gtk_main ();
+ 
++         gdk_window_remove_filter (w, gsm_assistive_filter_watch, &tid);
++     }
+      g_free (command);
+ }
+ 

Modified: desktop/unstable/gnome-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/series?rev=17227&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/series (original)
+++ desktop/unstable/gnome-session/debian/patches/series Tue Oct  7 12:48:12 2008
@@ -1,6 +1,7 @@
 01_ignore-gdm-lang.patch
 02_gsd-spawn.patch
 03_powermanagement.patch
+04_at-spi_startup.patch
 09_splash_hide.patch
 10_update_notifier.patch
 90_autoconf-autoheader.patch