gnome-session r4722 - in branches/gnome-2-22: . gnome-session

[lucasr svn gnome org]

Author: lucasr
Date: Thu Jun  5 22:22:06 2008
New Revision: 4722
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4722&view=rev

Log:
2008-06-06  Lucas Rocha  <lucasr gnome org>

	* gnome-session/gsm-at-startup.c: remove dialog shown after a timeout 
	in at-spi wrapper program in order to avoid false-positive at-spi
	errors. Fix bug #524263.


Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/gnome-session/gsm-at-startup.c

Modified: branches/gnome-2-22/gnome-session/gsm-at-startup.c
==============================================================================
--- branches/gnome-2-22/gnome-session/gsm-at-startup.c	(original)
+++ branches/gnome-2-22/gnome-session/gsm-at-startup.c	Thu Jun  5 22:22:06 2008
@@ -15,12 +15,10 @@
 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;
@@ -41,22 +39,11 @@
      gtk_widget_destroy (dialog);     
 }
 
-static gboolean
-gsm_assistive_filter_timeout (gpointer data)
-{
-  gsm_assistive_error_dialog ();
-
-  gtk_main_quit ();
-
-  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); 
@@ -65,12 +52,11 @@
 
      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);
+     gdk_window_remove_filter (w, gsm_assistive_filter_watch, NULL);
 
      g_free (command);
 }