nautilus r14298 - in trunk: . src

[cosimoc svn gnome org]

Author: cosimoc
Date: Sun Jun 29 11:03:44 2008
New Revision: 14298
URL: http://svn.gnome.org/viewvc/nautilus?rev=14298&view=rev

Log:
2008-06-29  Cosimo Cecchi  <cosimoc gnome org>

	* src/nautilus-window.c: (nautilus_window_set_status):
	Fix a huge leak as messages were pushed in the statusbar but almost
	never popped. Patch by Vincent Untz. (#536968).


Modified:
   trunk/ChangeLog
   trunk/src/nautilus-window.c

Modified: trunk/src/nautilus-window.c
==============================================================================
--- trunk/src/nautilus-window.c	(original)
+++ trunk/src/nautilus-window.c	Sun Jun 29 11:03:44 2008
@@ -201,27 +201,16 @@
 	gtk_ui_manager_ensure_update (window->details->ui_manager);
 }
 
-static gboolean
-nautilus_window_clear_status (gpointer callback_data)
-{
-	NautilusWindow *window;
-
-	window = NAUTILUS_WINDOW (callback_data);
-
-	gtk_statusbar_pop (GTK_STATUSBAR (window->details->statusbar), 0); /* clear any previous message, underflow is allowed */
-
-	return FALSE;
-}
-
 void
 nautilus_window_set_status (NautilusWindow *window, const char *text)
 {
 	g_return_if_fail (NAUTILUS_IS_WINDOW (window));
 
+	/* clear any previous message, underflow is allowed */
+	gtk_statusbar_pop (GTK_STATUSBAR (window->details->statusbar), 0);
+
 	if (text != NULL && text[0] != '\0') {
 		gtk_statusbar_push (GTK_STATUSBAR (window->details->statusbar), 0, text);
-	} else {
-		nautilus_window_clear_status (window);
 	}
 }