buddy: John Sullivan <sullivan@eazel.com>

	* libnautilus-extensions/Makefile.am:
	* libnautilus-extensions/nautilus-mime-actions.c:
	* libnautilus-extensions/nautilus-wait-until-ready.h:
	Removed the last vestiges of the wait calls.

	* libnautilus-extensions/nautilus-program-choosing.h:
	Add declarations for cancel calls (not yet implemented).

	* libnautilus-extensions/nautilus-program-choosing.c:
	(choose_application_hash), (choose_application_equal),
	(choose_application_destroy), (choose_component_hash),
	(choose_component_equal), (choose_component_destroy),
	(choose_component_callback), (nautilus_choose_component_for_file),
	(choose_application_callback),
	(nautilus_choose_application_for_file): Change the
	implementation to use call_when_ready instead of
	wait_until_ready.

	* src/file-manager/fm-directory-view.c:
	Formatting tweaks.

1 files changed, 0 insertions, 33 deletions

diff --git a/libnautilus-private/nautilus-mime-actions.c b/libnautilus-private/nautilus-mime-actions.c
index ec14e603c..e855df9ac 100644
--- a/libnautilus-private/nautilus-mime-actions.c
+++ b/libnautilus-private/nautilus-mime-actions.c
@@ -1626,36 +1626,3 @@ strv_concat (char **a,
 
 	return result;
 }
-
-/* FIXME bugzilla.eazel.com 4539: Eliminate this soon. */
-#include "nautilus-wait-until-ready.h"
-#include <gtk/gtkmain.h>
-
-static void
-wait_until_ready_callback (NautilusFile *file,
-			   gpointer callback_data)
-{
-	gboolean *data;
-	
-	data = callback_data; 
-	*data = TRUE;
-}
-
-void
-nautilus_mime_actions_wait_for_full_file_attributes (NautilusFile *file)
-{
-	GList *attributes;
-	gboolean callback_done;
-
-	callback_done = FALSE;
-
-	
-	attributes = nautilus_mime_actions_get_full_file_attributes ();
-	nautilus_file_call_when_ready
-		(file, attributes,
-		 wait_until_ready_callback, &callback_done);
-	g_list_free (attributes);
-	while (!callback_done) {
-		gtk_main_iteration ();
-	}
-}