r17335 - /desktop/unstable/gnome-session/debian/patches/04_at-spi_startup.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Oct 24 19:18:14 2008
New Revision: 17335

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17335
Log:
Make patch apply correctly

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

Modified: 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=17335&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/04_at-spi_startup.patch (original)
+++ desktop/unstable/gnome-session/debian/patches/04_at-spi_startup.patch Fri Oct 24 19:18:14 2008
@@ -1,30 +1,27 @@
 Debian #501407
 
-Index: gnome-session-2.22.2/gnome-session/gsm-at-startup.c
+Index: gnome-session-2.22.3/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)
+--- gnome-session-2.22.3.orig/gnome-session/gsm-at-startup.c	2008-06-30 10:01:07.000000000 +0200
++++ gnome-session-2.22.3/gnome-session/gsm-at-startup.c	2008-10-24 21:16:41.439826988 +0200
+@@ -50,13 +50,15 @@ 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);    
+-     gdk_window_add_filter (w, gsm_assistive_filter_watch, 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);
++         gdk_window_add_filter (w, gsm_assistive_filter_watch, 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);
+-     gdk_window_remove_filter (w, gsm_assistive_filter_watch, NULL);
++         gdk_window_remove_filter (w, gsm_assistive_filter_watch, NULL);
 +     }
+ 
       g_free (command);
  }
-