** 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

1 files changed, 63 insertions, 26 deletions

diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index caa69f015a..050cf0df89 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -28,9 +28,7 @@
 #include <stdlib.h>
 
 #include <glib.h>
-
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include <libgnomevfs/gnome-vfs-mime.h>
+#include <gio/gio.h>
 
 #include "e-cal-popup.h"
 #include <libedataserver/e-data-server-util.h>
@@ -91,7 +89,7 @@ static char *
 temp_save_part(CamelMimePart *part, char *path, gboolean file)
 {
 	const char *filename;
-	char *tmpdir, *utf8_mfilename = NULL, *mfilename = NULL;
+	char *tmpdir, *utf8_mfilename = NULL, *mfilename = NULL, *usepath;
 	CamelStream *stream;
 	CamelDataWrapper *wrapper;
 
@@ -134,8 +132,16 @@ temp_save_part(CamelMimePart *part, char *path, gboolean file)
 		g_free(mfilename);
 	}
 
+	if (strstr (path, "://"))
+		usepath = path;
+	else
+		usepath = g_strjoin (NULL, "file://", path, NULL);
+
 	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	stream = camel_stream_vfs_new_with_uri (path, O_WRONLY|O_CREAT|O_TRUNC, 0600);
+	stream = camel_stream_vfs_new_with_uri (path, CAMEL_STREAM_VFS_CREATE);
+
+	if (usepath != path)
+		g_free (usepath);
 
 	if (!stream) {
 		/* TODO handle error conditions */
@@ -293,18 +299,33 @@ ecalp_apps_open_in(EPopup *ep, EPopupItem *item, void *data)
 
 	path = temp_save_part(part, NULL, FALSE);
 	if (path) {
-		GnomeVFSMimeApplication *app = item->user_data;
-		char *uri;
+		GAppInfo *app = item->user_data;
 		GList *uris = NULL;
+		GError *error = NULL;
+
+		if (g_app_info_supports_files (app)) {
+			GFile *file = g_file_new_for_path (path);
 
-		uri = gnome_vfs_get_uri_from_local_path(path);
-		uris = g_list_append(uris, uri);
+			uris = g_list_append (uris, file);
+			g_app_info_launch (app, uris, NULL, &error);
+			g_object_unref (file);
+		} else {
+			char *uri;
 
-		gnome_vfs_mime_application_launch(app, uris);
+			uri = e_util_filename_to_uri (path);
+			uris = g_list_append (uris, uri);
 
-		g_free(uri);
-		g_list_free(uris);
-		g_free(path);
+			g_app_info_launch_uris (app, uris, NULL, &error);
+			g_free (uri);
+		}
+
+		if (error) {
+			g_warning ("%s", error->message);
+			g_error_free (error);
+		}
+
+		g_list_free (uris);
+		g_free (path);
 	}
 }
 
@@ -315,6 +336,9 @@ ecalp_apps_popup_free(EPopup *ep, GSList *free_list, void *data)
 		GSList *n = free_list->next;
 		EPopupItem *item = free_list->data;
 
+		if (item->user_data && item->activate == ecalp_apps_open_in)
+			g_object_unref (item->user_data);
+
 		g_free(item->path);
 		g_free(item->label);
 		g_free(item);
@@ -366,19 +390,29 @@ ecalp_standard_menu_factory (EPopup *ecalp, void *data)
 	}
 
 	if (mime_type) {
-		apps = gnome_vfs_mime_get_all_applications(mime_type);
+                gchar *cp;
 
-		if (apps == NULL && strcmp(mime_type, "application/octet-stream") == 0) {
-			const char *name_type;
+                /* does gvfs expect lowercase MIME types? */
+                for (cp = mime_type; *cp != '\0'; cp++)
+                        *cp = g_ascii_tolower (*cp);
+
+		/* TODO: g_app_info_get_all_for_type expects content_type, not a mime_type, thus it will work fine
+		    on Linux/Unix systems, but not on Win32. They will add hopefully some function to convert between
+		    these two soon. */
+		apps = g_app_info_get_all_for_type (mime_type);
 
+		if (apps == NULL && strcmp(mime_type, "application/octet-stream") == 0) {
 			if (filename) {
-				/* GNOME-VFS will misidentify TNEF attachments as MPEG */
+				/* will gvfs misidentify TNEF attachments as MPEG? */
 				if (!strcmp (filename, "winmail.dat"))
-					name_type = "application/vnd.ms-tnef";
-				else
-					name_type = gnome_vfs_mime_type_from_name(filename);
-				if (name_type)
-					apps = gnome_vfs_mime_get_all_applications(name_type);
+					apps = g_app_info_get_all_for_type ("application/vnd.ms-tnef");
+				else {
+					char *name_type = e_util_guess_mime_type (filename);
+
+					apps = g_app_info_get_all_for_type (name_type);
+
+					g_free (name_type);
+				}
 			}
 		}
 		g_free (mime_type);
@@ -390,16 +424,19 @@ ecalp_standard_menu_factory (EPopup *ecalp, void *data)
 			menus = g_slist_prepend(menus, (void *)&ecalp_standard_part_apps_bar);
 
 			for (l = apps, i = 0; l; l = l->next, i++) {
-				GnomeVFSMimeApplication *app = l->data;
+				GAppInfo *app = l->data;
 				EPopupItem *item;
 
-				if (app->requires_terminal)
+				if (!g_app_info_should_show (app)) {
+					g_object_unref (app);
+					l->data = NULL;
 					continue;
+				}
 
 				item = g_malloc0(sizeof(*item));
 				item->type = E_POPUP_ITEM;
 				item->path = g_strdup_printf("99.object.%02d", i);
-				item->label = g_strdup_printf(_("Open in %s..."), app->name);
+				item->label = g_strdup_printf(_("Open in %s..."), g_app_info_get_name (app));
 				item->activate = ecalp_apps_open_in;
 				item->user_data = app;
 
@@ -409,7 +446,7 @@ ecalp_standard_menu_factory (EPopup *ecalp, void *data)
 			if (open_menus)
 				e_popup_add_items(ecalp, open_menus, NULL, ecalp_apps_popup_free, NULL);
 
-			g_list_free(apps);
+			g_list_free (apps);
 		}
 	}