** Fix for bug #526741 (gnome-vfs to gio/gvfs port)

2008-04-17  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #526741 (gnome-vfs to gio/gvfs port)

	* configure.in: Drop dependency on gnome-vfs, depend on gio instead.

	* addressbook/gui/contact-editor/e-contact-editor.c: Do not include gnome-vfs.

	* calendar/gui/e-meeting-store.c: (start_async_read), (freebusy_async),
	(async_read): Read data with gio, not with gnome-vfs.
	* calendar/gui/e-meeting-store.c: (async_close): Function removed.
	* calendar/gui/migration.c:
	* calendar/gui/e-memos.c:
	* calendar/gui/alarm-notify/notify-main.c:
	* calendar/gui/e-tasks.c:
	* calendar/gui/main.c:
	* calendar/gui/e-meeting-list-view.c:
	Do not include gnome-vfs.
	* calendar/gui/dialogs/comp-editor.c: (set_attachment_list):
	* calendar/gui/dialogs/comp-editor.c: (attachment_guess_mime_type):
	Function removed, use e-util function instead.
	* calendar/gui/e-cal-popup.c: (temp_save_part):
	Reflect changes in CamelStreamVFS.
	* calendar/gui/e-cal-popup.c: (ecalp_apps_open_in), (ecalp_apps_popup_free),
	(ecalp_standard_menu_factory): Use gio to fill popup and launch app.
	* calendar/gui/e-cal-component-preview.h: (e_cal_comp_preview_url_requested_cb):
	* calendar/gui/e-cal-component-preview.c: (e_cal_comp_preview_url_requested_cb):
	New helper function to manage file:// urls for GtkHTML component.
	* calendar/gui/e-cal-component-preview.c: (e_cal_component_preview_init):
	* calendar/gui/e-cal-component-memo-preview.c:
	(e_cal_comp_preview_url_requested_cb):
	Use above helper function.
	* calendar/gui/e-cal-component-memo-preview.c: (url_requested_cb):
	* calendar/gui/e-cal-component-preview.c: (url_requested_cb): Function removed.

	* composer/e-msg-composer.h: (e_msg_composer_guess_mime_type):
	* composer/e-msg-composer.c: (e_msg_composer_guess_mime_type), (handle_uri),
	(e_msg_composer_add_inline_image_from_file):
	Use shared e_util_guess_mime_type instead of its own.

	* e-util/e-gui-utils.c: Do not include gnome-vfs.
	* e-util/e-util.c: (e_write_file_uri), (e_file_get_save_path):
	* e-util/e-dialog-utils.c: (e_file_can_save), (e_file_check_local):
	Use gio instead of gnome-vfs.
	* e-util/e-util.h:
	* e-util/e-util.c: (e_util_guess_mime_type), (e_util_filename_to_uri),
	(e_util_uri_to_filename), (e_util_read_file): New helper functions.

	* mail/Makefile.am:
	* mail/em-vfs-stream.h:
	* mail/em-vfs-stream.c: Removed from project, not used anywhere.
	* mail/em-menu.c:
	* mail/em-config.c: Do not include gnome-vfs.
	* mail/mail-ops.c: (save_messages_exec), (save_part_exec):
	Changes related to Data Server change of CamelStreamVFS.
	* mail/em-format.c: (em_format_describe_part):
	* mail/em-format-html-display.c: (efhd_bonobo_object), (efhd_find_handler),
	(efhd_use_component), (efhd_bonobo_unknown), (efhd_check_server_prop),
	(efhd_format_attachment): Drop use of deprecated gnome-vfs functions.
	* mail/em-utils.c: (em_utils_snoop_type): Use gio to guess the mime_type.
	* mail/em-popup.c: (emp_apps_open_in), (emp_apps_popup_free),
	(emp_standard_menu_factory): Use gio to fill popup and launch app.

	* plugins/import-ics-attachments/icsimporter.c: Do not include gnome-vfs.

	* plugins/ipod-sync/ical-format.c: (do_save_calendar_ical):
	* plugins/ipod-sync/ipod-sync.c: (destination_save_addressbook):
	Write to gio GOutputStream instead of gnome-vfs handle.
	* plugins/ipod-sync/format-handler.h: (open_for_writing):
	* plugins/ipod-sync/ipod-sync.c: (open_for_writing): New helper function.

	* plugins/publish-calendar/publish-format-fb.h: (publish_calendar_as_fb):
	* plugins/publish-calendar/publish-format-fb.c: (write_calendar), (publish_calendar_as_fb):
	* plugins/publish-calendar/publish-format-ical.h: (publish_calendar_as_ical):
	* plugins/publish-calendar/publish-format-ical.c: (write_calendar), (publish_calendar_as_ical):
	Use gio GOutputStream instead of gnome-vfs handle.
	* plugins/publish-calendar/url-editor-dialog.c: (create_uri): Use glib function to escape URI.
	* plugins/publish-calendar/publish-location.c: (migrateURI): Use EUri to parse URI.
	* plugins/publish-calendar/publish-calendar.c: (publish_online), (unmount_done_cb),
	(struct mnt_struct), (mount_ready_cb), (ask_password), (ask_question),
	(mount_first), (publish):
	Use gio instead of gnome-vfs for opening (remote) files.

	* plugins/save-calendar/ical-format.c: (do_save_calendar_ical):
	* plugins/save-calendar/csv-format.c: (do_save_calendar_csv):
	* plugins/save-calendar/rdf-format.c: (do_save_calendar_rdf):
	Use gio GOutpuStream instead of gnome-vfs handle.
	* plugins/save-calendar/format-handler.h: (open_for_writing):
	* plugins/save-calendar/save-calendar.c: (open_for_writing): New helper function.

	* shell/e-shell-window-commands.c: (command_quick_reference):
	Use gio instead of gnome-vfs.

	* widgets/misc/e-attachment.h: (struct _EAttachment):
	* widgets/misc/e-attachment.c: (finalise), (init), (attachment_guess_mime_type),
	(e_attachment_new), (struct DownloadInfo), (download_info_free),
	(data_ready_cb), (download_to_local_path),
	(e_attachment_new_remote_file):
	Use gio instead of gnome-vfs to download remote files.
	* widgets/misc/e-image-chooser.c: (image_drag_data_received_cb):
	Use new util function to read file.
	* widgets/misc/e-attachment-bar.c: (size_to_string): Stolen from gnome-vfs.


svn path=/trunk/; revision=35378

4 files changed, 109 insertions, 57 deletions

diff --git a/plugins/ipod-sync/ChangeLog b/plugins/ipod-sync/ChangeLog
index 804f29b157..d6f2a15aef 100644
--- a/plugins/ipod-sync/ChangeLog
+++ b/plugins/ipod-sync/ChangeLog
@@ -1,3 +1,13 @@
+2008-04-17  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #526739
+
+	* ical-format.c: (do_save_calendar_ical):
+	* ipod-sync.c: (destination_save_addressbook):
+	Write to gio GOutputStream instead of gnome-vfs handle.
+	* format-handler.h: (open_for_writing):
+	* ipod-sync.c: (open_for_writing): New helper function.
+
 2008-01-07  João Vale  <jpvale@gmail.com>
 
 	** Fix for bug #375580
diff --git a/plugins/ipod-sync/format-handler.h b/plugins/ipod-sync/format-handler.h
index 7b53efeb2e..badafd7965 100644
--- a/plugins/ipod-sync/format-handler.h
+++ b/plugins/ipod-sync/format-handler.h
@@ -25,6 +25,7 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
+#include <gio/gio.h>
 #include <libedataserver/e-source.h>
 #include <libedataserverui/e-source-selector.h>
 #include <libecal/e-cal.h>
@@ -45,3 +46,5 @@ struct _FormatHandler
 };
 
 FormatHandler *ical_format_handler_new (void);
+
+GOutputStream *open_for_writing (GtkWindow *parent, const char *uri, GError **error);
diff --git a/plugins/ipod-sync/ical-format.c b/plugins/ipod-sync/ical-format.c
index 76dc433c69..f5005c1bda 100644
--- a/plugins/ipod-sync/ical-format.c
+++ b/plugins/ipod-sync/ical-format.c
@@ -27,7 +27,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtkfilechooser.h>
 #include <gtk/gtkfilechooserdialog.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
 #include <gtk/gtkmessagedialog.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtk.h>
@@ -37,7 +36,6 @@
 #include <libecal/e-cal-util.h>
 #include <calendar/gui/e-cal-popup.h>
 #include <calendar/common/authentication.h>
-#include <libgnomevfs/gnome-vfs.h>
 #include <string.h>
 
 #include "format-handler.h"
@@ -80,8 +78,7 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc
 
 	error = NULL;
 	if (e_cal_get_object_list (source_client, "#t", &objects, &error)) {
-		GnomeVFSResult result;
-		GnomeVFSHandle *handle;
+		GOutputStream *stream;
 
 		while (objects != NULL) {
 			icalcomponent *icalcomp = objects->data;
@@ -93,29 +90,22 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc
 		}
 
 		/* save the file */
-		result = gnome_vfs_open (&handle, dest_uri, GNOME_VFS_OPEN_WRITE);
-		if (result != GNOME_VFS_OK) {
-			if ((result = gnome_vfs_create (&handle, dest_uri, GNOME_VFS_OPEN_WRITE,
-							TRUE, GNOME_VFS_PERM_USER_ALL)) != GNOME_VFS_OK) {
-				display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (target->selector)),
-					       gnome_vfs_result_to_string (result));
-			}
-		}
+		stream = open_for_writing (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (target->selector))), dest_uri, &error);
 
-		if (result == GNOME_VFS_OK) {
-			char *ical_str;
-			GnomeVFSFileSize bytes_written;
+		if (stream && !error) {
+			char *ical_str = icalcomponent_as_ical_string (top_level);
 
-			ical_str = icalcomponent_as_ical_string (top_level);
-			if ((result = gnome_vfs_write (handle, (gconstpointer) ical_str, strlen (ical_str), &bytes_written))
-			    != GNOME_VFS_OK) {
-				display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (target->selector)),
-						       gnome_vfs_result_to_string (result));
-			}
+			g_output_stream_write_all (stream, ical_str, strlen (ical_str), NULL, NULL, &error);
+			g_output_stream_close (stream);
 
-			gnome_vfs_close (handle);
+			g_free (ical_str);
 		}
-	} else {
+
+		if (stream)
+			g_object_unref (stream);
+	} 
+
+	if (error) {
 		display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (target->selector)), error->message);
 		g_error_free (error);
 	}
diff --git a/plugins/ipod-sync/ipod-sync.c b/plugins/ipod-sync/ipod-sync.c
index bca4242810..c60d19c818 100644
--- a/plugins/ipod-sync/ipod-sync.c
+++ b/plugins/ipod-sync/ipod-sync.c
@@ -40,7 +40,6 @@
 #include <libecal/e-cal.h>
 #include <calendar/gui/e-cal-popup.h>
 #include <addressbook/gui/widgets/eab-popup.h>
-#include <libgnomevfs/gnome-vfs.h>
 #include <string.h>
 
 #include "format-handler.h"
@@ -62,6 +61,56 @@ display_error_message (GtkWidget *parent, const char *message)
 	gtk_widget_destroy (dialog);
 }
 
+/* Returns output stream for the uri, or NULL on any error.
+   When done with the stream, just g_output_stream_close and g_object_unref it.
+   It will ask for overwrite if file already exists.
+*/
+GOutputStream *
+open_for_writing (GtkWindow *parent, const char *uri, GError **error)
+{
+	GFile *file;
+	GFileOutputStream *fostream;
+	GError *err = NULL;
+
+	g_return_val_if_fail (uri != NULL, NULL);
+
+	file = g_file_new_for_uri (uri);
+
+	g_return_val_if_fail (file != NULL, NULL);
+
+	fostream = g_file_create (file, G_FILE_CREATE_NONE, NULL, &err);
+
+	if (err && err->code == G_IO_ERROR_EXISTS) {
+		g_error_clear (&err);
+
+		if (e_error_run (parent, E_ERROR_ASK_FILE_EXISTS_OVERWRITE, uri, NULL) == GTK_RESPONSE_OK) {
+			fostream = g_file_replace (file, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &err);
+
+			if (err && fostream) {
+				g_object_unref (fostream);
+				fostream = NULL;
+			}
+		} else if (fostream) {
+			g_object_unref (fostream);
+			fostream = NULL;
+		}
+	}
+
+	g_object_unref (file);
+
+	if (error && err)
+		*error = err;
+	else if (err)
+		g_error_free (err);
+
+	if (fostream)
+		return G_OUTPUT_STREAM (fostream);
+
+	return NULL;
+}
+
+
+
 static void
 destination_save_addressbook  (EPlugin *ep, EABPopupTargetSource *target)
 {
@@ -70,9 +119,9 @@ destination_save_addressbook  (EPlugin *ep, EABPopupTargetSource *target)
 	GList *contacts, *tmp;
 	ESource *primary_source;
 	gchar *uri;
+	GOutputSream *stream;
+	GError *error = NULL;
 	char *dest_uri = NULL;
-	GnomeVFSResult result;
-	GnomeVFSHandle *handle;
 	char *mount = ipod_get_mount();
 
 	primary_source = e_source_selector_peek_primary_selection (target->selector);
@@ -96,50 +145,50 @@ destination_save_addressbook  (EPlugin *ep, EABPopupTargetSource *target)
 	e_book_get_contacts (book, query, &contacts, NULL);
 	e_book_query_unref (query);
 
-	result = gnome_vfs_open (&handle, dest_uri, GNOME_VFS_OPEN_WRITE);
-
-	if (result != GNOME_VFS_OK) {
-		if ((result = gnome_vfs_create (&handle, dest_uri, GNOME_VFS_OPEN_WRITE,
-						TRUE, GNOME_VFS_PERM_USER_ALL)) != GNOME_VFS_OK) {
-			display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (target->selector)),
-				       gnome_vfs_result_to_string (result));
-		}
-	}
-
-	if (result == GNOME_VFS_OK) {
-		GnomeVFSFileSize bytes_written;
+	stream = open_for_writing (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (target->selector))), dest_uri, &error);
 
+	if (stream && !error) {
 		for (tmp = contacts; tmp; tmp=tmp->next) {
-				EContact *contact = tmp->data;
-				gchar *temp = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
-				gchar *vcard;
-				gchar *converted_vcard;
-				gsize vcard_latin1_length;
-
-				vcard = g_strconcat(temp, "\r\n", NULL);
-				converted_vcard = g_convert(vcard, -1, "ISO-8859-1", "UTF-8", NULL, &vcard_latin1_length, NULL);
-				if ((result = gnome_vfs_write (handle, (gconstpointer) converted_vcard, vcard_latin1_length, &bytes_written))
-				    != GNOME_VFS_OK) {
-					display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (target->selector)),
-							       gnome_vfs_result_to_string (result));
-				}
-
-				g_object_unref (contact);
-				g_free (temp);
-				g_free (vcard);
-				g_free (converted_vcard);
+			EContact *contact = tmp->data;
+			gchar *temp = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
+			gchar *vcard;
+			gchar *converted_vcard;
+			gsize vcard_latin1_length;
+
+			vcard = g_strconcat (temp, "\r\n", NULL);
+			converted_vcard = g_convert (vcard, -1, "ISO-8859-1", "UTF-8", NULL, &vcard_latin1_length, NULL);
+			g_output_stream_write_all (stream, converted_vcard, vcard_latin1_length, NULL, NULL, &error);
+
+			if (error) {
+				display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (target->selector)), error->message);
+				g_error_clear (&error);
+			}
+
+			g_object_unref (contact);
+			g_free (temp);
+			g_free (vcard);
+			g_free (converted_vcard);
 		}
+
+		g_output_stream_close (stream);
 	}
 
+	if (stream)
+		g_object_unref (stream);
+
 	sync();
 
 	if (contacts != NULL)
 		g_list_free (contacts);
 
-	gnome_vfs_close (handle);
 	g_object_unref (book);
 	g_free (dest_uri);
 	g_free (uri);
+
+	if (error) {
+		display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (target->selector)), error->message);
+		g_error_free (error);
+	}
 }
 
 static void