** 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, 41 insertions, 12 deletions

diff --git a/mail/em-utils.c b/mail/em-utils.c
index ee77391e97..53e2fff906 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -52,11 +52,10 @@
 #include <bonobo/bonobo-widget.h>
 #include <bonobo/bonobo-event-source.h>
 
-#include <libgnomevfs/gnome-vfs-mime.h>
-#include <libgnomevfs/gnome-vfs-mime-utils.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
 #include <glib/gi18n.h>
 
+#include <gio/gio.h>
+
 #include "mail-component.h"
 #include "mail-mt.h"
 #include "mail-ops.h"
@@ -2199,30 +2198,40 @@ em_utils_contact_photo (struct _CamelInternetAddress *cia, gboolean local)
 const char *
 em_utils_snoop_type(CamelMimePart *part)
 {
-	const char *filename, *name_type = NULL, *magic_type = NULL;
+	/* cache is here only to be able still return const char * */
+	static GHashTable *types_cache = NULL;
+
+	const char *filename;
+	char *name_type = NULL, *magic_type = NULL, *res, *tmp;
 	CamelDataWrapper *dw;
 
 	filename = camel_mime_part_get_filename (part);
 	if (filename) {
-		/* GNOME-VFS will misidentify TNEF attachments as MPEG */
+		/* will GVFS misidentify TNEF attachments as MPEG? */
 		if (!strcmp (filename, "winmail.dat"))
 			return "application/vnd.ms-tnef";
 
-		name_type = gnome_vfs_mime_type_from_name(filename);
+		name_type = e_util_guess_mime_type (filename);
 	}
 
 	dw = camel_medium_get_content_object((CamelMedium *)part);
 	if (!camel_data_wrapper_is_offline(dw)) {
 		CamelStreamMem *mem = (CamelStreamMem *)camel_stream_mem_new();
 
-		if (camel_data_wrapper_decode_to_stream(dw, (CamelStream *)mem) > 0)
-			magic_type = gnome_vfs_get_mime_type_for_data(mem->buffer->data, mem->buffer->len);
+		if (camel_data_wrapper_decode_to_stream(dw, (CamelStream *)mem) > 0) {
+			char *ct = g_content_type_guess (filename, mem->buffer->data, mem->buffer->len, NULL);
+
+			if (ct)
+				magic_type = g_content_type_get_mime_type (ct);
+
+			g_free (ct);
+		}
 		camel_object_unref(mem);
 	}
 
 	d(printf("snooped part, magic_type '%s' name_type '%s'\n", magic_type, name_type));
 
-	/* If GNOME-VFS doesn't recognize the data by magic, but it
+	/* If gvfs doesn't recognize the data by magic, but it
 	 * contains English words, it will call it text/plain. If the
 	 * filename-based check came up with something different, use
 	 * that instead and if it returns "application/octet-stream"
@@ -2233,11 +2242,31 @@ em_utils_snoop_type(CamelMimePart *part)
 		if (name_type
 		    && (!strcmp(magic_type, "text/plain")
 			|| !strcmp(magic_type, "application/octet-stream")))
-			return name_type;
+			res = name_type;
 		else
-			return magic_type;
+			res = magic_type;
 	} else
-		return name_type;
+		res = name_type;
+
+
+	if (res != name_type)
+		g_free (name_type);
+
+	if (res != magic_type)
+		g_free (magic_type);
+
+	if (!types_cache)
+		types_cache = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, (GDestroyNotify) NULL);
+
+	tmp = g_hash_table_lookup (types_cache, res);
+	if (tmp) {
+		g_free (res);
+		res = tmp;
+	} else {
+		g_hash_table_insert (types_cache, res, res);
+	}
+
+	return res;
 
 	/* We used to load parts to check their type, we dont anymore,
 	   see bug #11778 for some discussion */