Stub out all gnome-vfs using operations with a dialog saying this isn't

2007-11-01  Alexander Larsson  <alexl@redhat.com>

        * libnautilus-private/nautilus-file-operations.[ch]:
	Stub out all gnome-vfs using operations with a
	dialog saying this isn't supported yet.
	
        * src/Makefile.am:
        * src/file-manager/fm-directory-view.c:
        * src/nautilus-shell-ui.xml:
        * src/nautilus-window-menus.c:
	Remove all connect to server use for now
	Not sure what to do with it in the gvfs world
	
        * src/file-manager/fm-error-reporting.c:
        * src/nautilus-main.c:
	Remove gnome_vfs uses


svn path=/branches/gio-branch/; revision=13397

9 files changed, 143 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index ec3d530ab..44a3d56a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2007-11-01  Alexander Larsson  <alexl@redhat.com>
+
+        * libnautilus-private/nautilus-file-operations.[ch]:
+	Stub out all gnome-vfs using operations with a
+	dialog saying this isn't supported yet.
+	
+        * src/Makefile.am:
+        * src/file-manager/fm-directory-view.c:
+        * src/nautilus-shell-ui.xml:
+        * src/nautilus-window-menus.c:
+	Remove all connect to server use for now
+	Not sure what to do with it in the gvfs world
+	
+        * src/file-manager/fm-error-reporting.c:
+        * src/nautilus-main.c:
+	Remove gnome_vfs uses
+
 2007-11-01  Paolo Borelli  <pborelli@katamail.com>
 
         * src/file-manager/fm-directory-view.c: do not use the deprecated
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 2cdbc7cf2..aa7a3155e 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -70,6 +70,8 @@
 
 static gboolean confirm_trash_auto_value;
 
+#ifdef GIO_CONVERSION_DONE
+
 typedef enum   TransferKind         TransferKind;
 typedef struct TransferInfo         TransferInfo;
 typedef struct IconPositionIterator IconPositionIterator;
@@ -133,6 +135,8 @@ transfer_info_destroy (TransferInfo *transfer_info)
 	g_free (transfer_info);
 }
 
+#endif /* GIO_CONVERSION_DONE */
+
 static void
 setup_autos (void)
 {
@@ -144,6 +148,8 @@ setup_autos (void)
 	}
 }
 
+#ifdef GIO_CONVERSION_DONE
+
 /* Struct used to control applying icon positions to 
  * top level items during a copy, drag, new folder creation and
  * link creation
@@ -2847,6 +2853,9 @@ nautilus_file_operations_new_file (GtkWidget *parent_view,
 	g_free (target_filename);
 }
 
+#endif /* GIO_CONVERSION_DONE */
+
+
 typedef struct {
 	GList *files;
 	GtkWindow *parent_window;
@@ -3365,6 +3374,8 @@ nautilus_file_operations_delete (GList                  *files,
 				  done_callback,  done_callback_data);
 }
 
+#ifdef GIO_CONVERSION_DONE
+
 static void
 do_empty_trash (GtkWidget *parent_view)
 {
@@ -3486,8 +3497,6 @@ nautilus_file_operations_empty_trash (GtkWidget *parent_view)
 	}
 }
 
-#ifdef GIO_CONVERSION_DONE
-
 static gchar* 
 get_trash_uri_for_volume (GnomeVFSVolume *volume)
 {
@@ -3684,28 +3693,30 @@ nautilus_file_operations_unmount_volume (GtkWindow                      *parent_
 			  data);
 }
 
+#ifdef GIO_CONVERSION_DONE
+
 struct RecursivePermissionsInfo {
 	GnomeVFSAsyncHandle *handle;
 	GnomeVFSURI *current_dir;
 	GnomeVFSURI *current_file;
 	GList *files;
 	GList *directories;
-	GnomeVFSFilePermissions file_permissions;
-	GnomeVFSFilePermissions file_mask;
-	GnomeVFSFilePermissions dir_permissions;
-	GnomeVFSFilePermissions dir_mask;
+	guint32 file_permissions;
+	guint32 file_mask;
+	guint32 dir_permissions;
+	guint32 dir_mask;
 	NautilusSetPermissionsCallback callback;
 	gpointer callback_data;
 };
 
 struct FileInfo {
 	char *name;
-	GnomeVFSFilePermissions permissions;
+	guint32 permissions;
 };
 
 struct DirInfo {
 	GnomeVFSURI *uri;
-	GnomeVFSFilePermissions permissions;
+	guint32 permissions;
 };
 
 static void set_permissions_run (struct RecursivePermissionsInfo *info);
@@ -3885,10 +3896,10 @@ set_permissions_run (struct RecursivePermissionsInfo *info)
 	
 void
 nautilus_file_set_permissions_recursive (const char                     *directory,
-					 GnomeVFSFilePermissions         file_permissions,
-					 GnomeVFSFilePermissions         file_mask,
-					 GnomeVFSFilePermissions         dir_permissions,
-					 GnomeVFSFilePermissions         dir_mask,
+					 guint32         file_permissions,
+					 guint32         file_mask,
+					 guint32         dir_permissions,
+					 guint32         dir_mask,
 					 NautilusSetPermissionsCallback  callback,
 					 gpointer                        callback_data)
 {
@@ -3916,6 +3927,87 @@ nautilus_file_set_permissions_recursive (const char                     *directo
 	set_permissions_load_dir (NULL, GNOME_VFS_OK, NULL, info);
 }
 
+#endif /* GIO_CONVERSION_DONE */
+
+
+static void
+not_supported_yet (void)
+{
+	eel_show_warning_dialog ("This operation isn't supported with the gio-based nautilus",
+				 "This is work in progress. Please be patient",
+				 NULL);
+}
+
+void
+nautilus_file_set_permissions_recursive (const char                     *directory,
+					 guint32         file_permissions,
+					 guint32         file_mask,
+					 guint32         dir_permissions,
+					 guint32         dir_mask,
+					 NautilusSetPermissionsCallback  callback,
+					 gpointer                        callback_data)
+{
+	/* TODO-gio: Implement */
+	not_supported_yet ();
+}
+
+void
+nautilus_file_operations_copy_move (const GList *item_uris,
+				    GArray *relative_item_points,
+				    const char *target_dir,
+				    GdkDragAction copy_action,
+				    GtkWidget *parent_view,
+				    void (*done_callback) (GHashTable *debuting_uris, gpointer data),
+				    gpointer done_callback_data)
+{
+	/* TODO-gio: Implement */
+	not_supported_yet ();
+}
+
+void 
+nautilus_file_operations_new_folder (GtkWidget *parent_view, 
+				     GdkPoint *target_point,
+				     const char *parent_dir,
+				     NautilusNewFolderCallback done_callback,
+				     gpointer data)
+{
+	/* TODO-gio: Implement */
+	not_supported_yet ();
+}
+
+void 
+nautilus_file_operations_new_file_from_template (GtkWidget *parent_view, 
+						 GdkPoint *target_point,
+						 const char *parent_dir,
+						 const char *target_filename,
+						 const char *template_uri,
+						 NautilusNewFileCallback done_callback,
+						 gpointer data)
+{
+	/* TODO-gio: Implement */
+	not_supported_yet ();
+}
+
+void 
+nautilus_file_operations_new_file (GtkWidget *parent_view, 
+				   GdkPoint *target_point,
+				   const char *parent_dir,
+				   const char *initial_contents,
+				   NautilusNewFileCallback done_callback,
+				   gpointer data)
+{
+	/* TODO-gio: Implement */
+	not_supported_yet ();
+}
+
+
+void 
+nautilus_file_operations_empty_trash (GtkWidget *parent_view)
+{
+	/* TODO-gio: Implement */
+	not_supported_yet ();
+}
+
 
 #if !defined (NAUTILUS_OMIT_SELF_CHECK)
 
@@ -3924,6 +4016,8 @@ nautilus_self_check_file_operations (void)
 {
 	setlocale (LC_MESSAGES, "C");
 
+#ifdef GIO_CONVERSION_DONE
+	
 	/* test the next duplicate name generator */
 	EEL_CHECK_STRING_RESULT (get_duplicate_name (" (copy)", 1), " (another copy)");
 	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo", 1), "foo (copy)");
@@ -3967,6 +4061,8 @@ nautilus_self_check_file_operations (void)
 	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (123rd copy)", 1), "foo (124th copy)");
 	EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo (123rd copy).txt", 1), "foo (124th copy).txt");
 
+#endif /* GIO_CONVERSION_DONE */
+	
 	setlocale (LC_MESSAGES, "");
 }
 
diff --git a/libnautilus-private/nautilus-file-operations.h b/libnautilus-private/nautilus-file-operations.h
index fee3c2b05..fa4932057 100644
--- a/libnautilus-private/nautilus-file-operations.h
+++ b/libnautilus-private/nautilus-file-operations.h
@@ -30,9 +30,6 @@
 #include <gdk/gdkdnd.h>
 #include <gtk/gtkwidget.h>
 #include <gio/gvolume.h>
-#include <libgnomevfs/gnome-vfs-types.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomevfs/gnome-vfs-volume-monitor.h>
 
 typedef void (* NautilusCopyCallback)      (GHashTable *debuting_uris,
 					    gpointer    callback_data);
@@ -85,10 +82,10 @@ void nautilus_file_operations_trash_or_delete (GList                  *files,
 					       gpointer                done_callback_data);
 
 void nautilus_file_set_permissions_recursive (const char                     *directory,
-					      GnomeVFSFilePermissions         file_permissions,
-					      GnomeVFSFilePermissions         file_mask,
-					      GnomeVFSFilePermissions         folder_permissions,
-					      GnomeVFSFilePermissions         folder_mask,
+					      guint32                         file_permissions,
+					      guint32                         file_mask,
+					      guint32                         folder_permissions,
+					      guint32                         folder_mask,
 					      NautilusSetPermissionsCallback  callback,
 					      gpointer                        callback_data);
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 63a3c8b55..20fed8b01 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,9 +65,6 @@ nautilus_SOURCES = \
 	nautilus-bookmark-list.h		\
 	nautilus-bookmarks-window.c		\
 	nautilus-bookmarks-window.h		\
-	nautilus-connect-server-dialog.c	\
-	nautilus-connect-server-dialog.h	\
-	nautilus-connect-server-dialog-nonmain.c\
 	nautilus-desktop-window.c		\
 	nautilus-desktop-window.h		\
 	nautilus-emblem-sidebar.c		\
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 12cedff96..635f6028d 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -6002,7 +6002,9 @@ connect_to_server_response_callback (GtkDialog *dialog,
 		uri = g_object_get_data (G_OBJECT (dialog), "link-uri");
 		icon = g_object_get_data (G_OBJECT (dialog), "link-icon");
 		name = gtk_entry_get_text (entry);
+#ifdef GIO_CONVERSION_DONE
 		gnome_vfs_connect_to_server (uri, (char *)name, icon);
+#endif
 		gtk_widget_destroy (GTK_WIDGET (dialog));
 		break;
 	case GTK_RESPONSE_NONE:
diff --git a/src/file-manager/fm-error-reporting.c b/src/file-manager/fm-error-reporting.c
index 37b9f7e4f..906d3a6b7 100644
--- a/src/file-manager/fm-error-reporting.c
+++ b/src/file-manager/fm-error-reporting.c
@@ -68,8 +68,8 @@ fm_report_error_loading_directory (NautilusFile *file,
 			break;
 		default:
 			/* We should invent decent error messages for every case we actually experience. */
-			g_warning ("Hit unhandled case %d (%s) in fm_report_error_loading_directory", 
-				   error->code, gnome_vfs_result_to_string (error->code));
+			g_warning ("Hit unhandled case %d in fm_report_error_loading_directory", 
+				   error->code);
 			message = g_strdup_printf (_("Sorry, couldn't display all the contents of \"%s\"."), file_name);
 		}
 	} else {
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index ea462b431..bff94afbf 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -85,7 +85,7 @@ quit_if_in_main_loop (gpointer callback_data)
 
 	level = gtk_main_level ();
 
-	/* We can be called even outside the main loop by gnome_vfs_shutdown,
+	/* We can be called even outside the main loop,
 	 * so check that we are in a loop before calling quit.
 	 */
 	if (level != 0) {
@@ -558,17 +558,8 @@ main (int argc, char *argv[])
 		gtk_main ();
 	}
 
-	/* This has to be done before gnome_vfs_shutdown, because
- 	 * it might call nautilus_file_get_uri() which might call
- 	 * gnome_vfs_uri_append_string()
- 	 */
  	eel_debug_shut_down ();
 
-	gnome_vfs_shutdown ();
-
-	/* This has to be done after gnome_vfs_shutdown, because shutdown
-	 * can call pending completion callbacks which reference application.
-	 */
 	if (application != NULL) {
 		bonobo_object_unref (application);
 	}
diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml
index 343f7b59d..835784ab4 100644
--- a/src/nautilus-shell-ui.xml
+++ b/src/nautilus-shell-ui.xml
@@ -9,7 +9,7 @@
 		<placeholder name="Open Placeholder"/>
 		<separator/>
 		<placeholder name="Location Placeholder"/>
-		<menuitem name="Connect to Server" action="Connect to Server"/>
+<!--		<menuitem name="Connect to Server" action="Connect to Server"/> -->
 		<separator/>
 		<placeholder name="File Items Placeholder"/>
 		<separator/>
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index f9c5fdc91..63b04c72e 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -31,7 +31,9 @@
 
 #include "nautilus-actions.h"
 #include "nautilus-application.h"
+#ifdef GIO_CONVERSION_DONE
 #include "nautilus-connect-server-dialog.h"
+#endif
 #include "nautilus-file-management-properties.h"
 #include "nautilus-property-browser.h"
 #include "nautilus-window-manage-views.h"
@@ -193,6 +195,8 @@ action_close_window_callback (GtkAction *action,
 	nautilus_window_close (NAUTILUS_WINDOW (user_data));
 }
 
+#ifdef GIO_CONVERSION_DONE
+
 static void
 action_connect_to_server_callback (GtkAction *action, 
 				   gpointer user_data)
@@ -207,6 +211,8 @@ action_connect_to_server_callback (GtkAction *action,
 	gtk_widget_show (dialog);
 }
 
+#endif
+
 static gboolean
 have_burn_uri (void)
 {
@@ -653,10 +659,12 @@ static const GtkActionEntry main_entries[] = {
     N_("Normal Si_ze"), "<control>0",           /* label, accelerator */
     N_("Show the contents at the normal size"),                                      /* tooltip */ 
     G_CALLBACK (action_zoom_normal_callback) },
+#ifdef GIO_CONVERSION_DONE
   { "Connect to Server", NULL,                        /* name, stock id */
     N_("Connect to _Server..."), NULL,           /* label, accelerator */
     N_("Connect to a remote computer or shared disk"),                                      /* tooltip */ 
     G_CALLBACK (action_connect_to_server_callback) },
+#endif
   { "Home", "gnome-fs-home",                        /* name, stock id */
     N_("_Home Folder"), "<alt>Home",           /* label, accelerator */
     N_("Open your personal folder"),                                  /* tooltip */