From e9a0cfe1a901f41456575a2cd07158f1947b873c Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Thu, 17 Apr 2008 16:59:08 +0000
Subject: ** 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
---
e-util/e-dialog-utils.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
(limited to 'e-util/e-dialog-utils.c')
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index 1c75dc83e5..8207e18181 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -49,8 +49,6 @@
#include <glib/gi18n.h>
#include <libgnome/gnome-util.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-
#include "e-util/e-util.h"
#include "e-util/e-error.h"
@@ -408,7 +406,7 @@ e_file_can_save(GtkWindow *parent, const char *uri)
if (!e_file_check_local(uri))
return TRUE;
- path = gnome_vfs_get_local_path_from_uri(uri);
+ path = e_util_uri_to_filename (uri);
if (!path)
return FALSE;
@@ -438,7 +436,7 @@ e_file_check_local (const char *name)
{
char *uri;
- uri = gnome_vfs_get_local_path_from_uri(name);
+ uri = e_util_uri_to_filename (name);
if (uri) {
g_free(uri);
return TRUE;
--
cgit