Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.5643
diff -u -r1.5643 ChangeLog
--- ChangeLog	7 Jan 2003 03:23:51 -0000	1.5643
+++ ChangeLog	7 Jan 2003 05:18:36 -0000
@@ -1,4 +1,14 @@
 2003-01-06  Alex Duggan  <aldug@gnome.org>
+	
+	* src/nautilus-window.c:
+	* src/nautilus-window.h:
+	Removed statusbar timeout
+	
+	* libnautilus-private/nautilus-global-preferences.c:
+	Removed unnecessary include.  Patch from 
+	Dave Bordoley <bordoley@msu.edu>
+
+2003-01-06  Alex Duggan  <aldug@gnome.org>
 
 	* src/nautilus-shell-ui.xml: remove control-f keybinding leftover
 	from nautilus-1.0.x.  Partially fixes #85230
Index: libnautilus-private/nautilus-global-preferences.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-global-preferences.c,v
retrieving revision 1.205
diff -u -r1.205 nautilus-global-preferences.c
--- libnautilus-private/nautilus-global-preferences.c	5 Nov 2002 18:34:24 -0000	1.205
+++ libnautilus-private/nautilus-global-preferences.c	7 Jan 2003 05:18:38 -0000
@@ -29,7 +29,6 @@
 #include "nautilus-file-utilities.h"
 #include "nautilus-file.h"
 #include "nautilus-icon-factory.h"
-#include "nautilus-sidebar-functions.h"
 #include <eel/eel-enumeration.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gtk-extensions.h>
Index: src/nautilus-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window.c,v
retrieving revision 1.402
diff -u -r1.402 nautilus-window.c
--- src/nautilus-window.c	5 Dec 2002 02:42:53 -0000	1.402
+++ src/nautilus-window.c	7 Jan 2003 05:18:40 -0000
@@ -87,7 +87,6 @@
  */
 #include "nautilus-desktop-window.h"
 
-#define STATUS_BAR_CLEAR_TIMEOUT 10000	/* milliseconds */
 #define MAX_HISTORY_ITEMS 50
 
 /* FIXME bugzilla.gnome.org 41245: hardwired sizes */
@@ -338,7 +337,6 @@
 	window = NAUTILUS_WINDOW (callback_data);
 
 	bonobo_ui_component_set_status (window->details->status_ui, NULL, NULL);
-	window->status_bar_clear_id = 0;
 
 	return FALSE;
 }
@@ -346,17 +344,10 @@
 void
 nautilus_window_set_status (NautilusWindow *window, const char *text)
 {
-	if (window->status_bar_clear_id != 0) {
-		g_source_remove (window->status_bar_clear_id);
-	}
-
 	if (text != NULL && text[0] != '\0') {
 		bonobo_ui_component_set_status (window->details->status_ui, text, NULL);
-		window->status_bar_clear_id = g_timeout_add
-			(STATUS_BAR_CLEAR_TIMEOUT, nautilus_window_clear_status, window);
 	} else {
 		nautilus_window_clear_status (window);
-		window->status_bar_clear_id = 0;
 	}
 }
 
@@ -969,10 +960,6 @@
 	}
 	if (window->last_location_bookmark != NULL) {
 		g_object_unref (window->last_location_bookmark);
-	}
-
-	if (window->status_bar_clear_id != 0) {
-		g_source_remove (window->status_bar_clear_id);
 	}
 
 	bonobo_object_unref (window->details->ui_container);
Index: src/nautilus-window.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window.h,v
retrieving revision 1.104
diff -u -r1.104 nautilus-window.h
--- src/nautilus-window.h	21 Sep 2002 16:31:23 -0000	1.104
+++ src/nautilus-window.h	7 Jan 2003 05:18:40 -0000
@@ -85,8 +85,7 @@
         
 	char *last_geometry;
 	
-        guint status_bar_clear_id;
-        guint save_geometry_timeout_id;
+       guint save_geometry_timeout_id;
 	  
         /** CORBA-related elements **/
         NautilusApplication *application;