Move reset constant into header.

	* libnautilus-private/nautilus-dnd.h:
	Move reset constant into header.

	* libnautilus-private/nautilus-file.c:
	(nautilus_file_get_display_name): Use g_locale_to_utf8, so this
	works even when G_BROKEN_FILENAMES is not set.

	* libnautilus-private/nautilus-icon-dnd.c:
	Rearrange and clean up code a bit.

	* src/nautilus-property-browser.c:
	(nautilus_property_browser_destroy), (add_new_pattern),
	(show_color_selection_window), (add_new_color), (add_new_emblem):

	* src/nautilus-sidebar-title.c: (update_icon): Get rid of dead
	code that gets uri and doesn't use it. It's been showing up in bug
	reports too, so this is especially nice.

	* src/nautilus-window-manage-views.h:
	* src/nautilus-window-manage-views.c:
	(nautilus_window_manage_views_destroy),
	(nautilus_window_manage_views_finalize): Break this up into two
	functions again.

	* src/nautilus-window.c: (nautilus_window_destroy): Re-add this,
	because some of the cleanup has to be done at destroy time.
	(nautilus_window_finalize): Move some of this out.
	(nautilus_window_class_init): Set up both.

	* components/text/nautilus-text-view.c:
	* components/tree/nautilus-tree-model.c:
	* libnautilus-private/nautilus-file-operations.c:
	* libnautilus-private/nautilus-program-choosing.c:
	* src/file-manager/fm-directory-view.c:
	* src/nautilus-bookmark-list.c:
	Miscellaneous porting to new names of functions, getting off
	less-desirable functions.

1 files changed, 4 insertions, 4 deletions

diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 2011d508c..61f64b32c 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -88,7 +88,7 @@ transfer_info_new (GtkWidget *parent_view)
 	result = g_new0 (TransferInfo, 1);
 	result->parent_view = parent_view;
 	
-	eel_nullify_when_destroyed (&result->parent_view);
+	eel_add_weak_pointer (&result->parent_view);
 	
 	return result;
 }
@@ -96,7 +96,7 @@ transfer_info_new (GtkWidget *parent_view)
 static void
 transfer_info_destroy (TransferInfo *transfer_info)
 {
-	eel_nullify_cancel (&transfer_info->parent_view);
+	eel_remove_weak_pointer (&transfer_info->parent_view);
 	
 	if (transfer_info->progress_dialog != NULL) {
 		nautilus_file_operations_progress_done (transfer_info->progress_dialog);
@@ -2048,7 +2048,7 @@ new_folder_transfer_callback (GnomeVFSAsyncHandle *handle,
 	switch (progress_info->phase) {
 
 	case GNOME_VFS_XFER_PHASE_COMPLETED:
-		eel_nullify_cancel (&state->parent_view);
+		eel_remove_weak_pointer (&state->parent_view);
 		g_free (state);
 		return 0;
 
@@ -2109,7 +2109,7 @@ nautilus_file_operations_new_folder (GtkWidget *parent_view,
 	state->done_callback = done_callback;
 	state->data = data;
 	state->parent_view = parent_view;
-	eel_nullify_when_destroyed (&state->parent_view);
+	eel_add_weak_pointer (&state->parent_view);
 
 	/* pass in the target directory and the new folder name as a destination URI */
 	parent_uri = gnome_vfs_uri_new (parent_dir);