nautilus r13982 - in trunk: . src/file-manager

[cneumair svn gnome org]

Author: cneumair
Date: Mon Mar 24 21:19:57 2008
New Revision: 13982
URL: http://svn.gnome.org/viewvc/nautilus?rev=13982&view=rev

Log:
2008-03-24  Christian Neumair  <cneumair gnome org>

	* src/file-manager/fm-directory-view.c
	(delayed_rename_file_hack_callback),
	(delayed_rename_file_hack_removed), (rename_file):
	Ensure that the rename file callback data is destroyed. We leaked it
	in case of cancellation.


Modified:
   trunk/ChangeLog
   trunk/src/file-manager/fm-directory-view.c

Modified: trunk/src/file-manager/fm-directory-view.c
==============================================================================
--- trunk/src/file-manager/fm-directory-view.c	(original)
+++ trunk/src/file-manager/fm-directory-view.c	Mon Mar 24 21:19:57 2008
@@ -3662,14 +3662,19 @@
 		EEL_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, start_renaming_file, (view, new_file, FALSE));
 		fm_directory_view_reveal_selection (view);
 	}
-	
+
+	return FALSE;
+}
+
+static void
+delayed_rename_file_hack_removed (RenameData *data)
+{
 	g_object_unref (data->view);
 	nautilus_file_unref (data->new_file);
 	g_free (data);
-
-	return FALSE;
 }
 
+
 static void
 rename_file (FMDirectoryView *view, NautilusFile *new_file)
 {
@@ -3695,8 +3700,9 @@
 			g_source_remove (view->details->delayed_rename_file_id);
 		}
 		view->details->delayed_rename_file_id = 
-			g_timeout_add (100, (GSourceFunc)delayed_rename_file_hack_callback,
-				       data);
+			g_timeout_add_full (G_PRIORITY_DEFAULT,
+					    100, (GSourceFunc)delayed_rename_file_hack_callback,
+					    data, (GDestroyNotify) delayed_rename_file_hack_removed);
 		
 		return;
 	}