aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog31
-rw-r--r--calendar/gui/alarm-notify/notify-main.c1
-rw-r--r--calendar/gui/dialogs/comp-editor.c24
-rw-r--r--calendar/gui/e-cal-component-memo-preview.c30
-rw-r--r--calendar/gui/e-cal-component-preview.c51
-rw-r--r--calendar/gui/e-cal-component-preview.h6
-rw-r--r--calendar/gui/e-cal-popup.c89
-rw-r--r--calendar/gui/e-meeting-list-view.c1
-rw-r--r--calendar/gui/e-meeting-store.c93
-rw-r--r--calendar/gui/e-memos.c1
-rw-r--r--calendar/gui/e-tasks.c1
-rw-r--r--calendar/gui/main.c1
-rw-r--r--calendar/gui/migration.c2
13 files changed, 186 insertions, 145 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 59bfb8a5df..98618e0bbf 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,36 @@
2008-04-17 Milan Crha <mcrha@redhat.com>
+ ** Part of fix for bug #526739
+
+ * gui/e-meeting-store.c: (start_async_read), (freebusy_async),
+ (async_read): Read data with gio, not with gnome-vfs.
+ * gui/e-meeting-store.c: (async_close): Function removed.
+ * gui/migration.c:
+ * gui/e-memos.c:
+ * gui/alarm-notify/notify-main.c:
+ * gui/e-tasks.c:
+ * gui/main.c:
+ * gui/e-meeting-list-view.c:
+ Do not include gnome-vfs.
+ * gui/dialogs/comp-editor.c: (set_attachment_list):
+ * gui/dialogs/comp-editor.c: (attachment_guess_mime_type):
+ Function removed, use e-util function instead.
+ * gui/e-cal-popup.c: (temp_save_part):
+ Reflect changes in CamelStreamVFS.
+ * 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.
+ * gui/e-cal-component-preview.h: (e_cal_comp_preview_url_requested_cb):
+ * gui/e-cal-component-preview.c: (e_cal_comp_preview_url_requested_cb):
+ New helper function to manage file:// urls for GtkHTML component.
+ * gui/e-cal-component-preview.c: (e_cal_component_preview_init):
+ * gui/e-cal-component-memo-preview.c:
+ (e_cal_comp_preview_url_requested_cb):
+ Use above helper function.
+ * gui/e-cal-component-memo-preview.c: (url_requested_cb):
+ * gui/e-cal-component-preview.c: (url_requested_cb): Function removed.
+
+2008-04-17 Milan Crha <mcrha@redhat.com>
+
** Fix for bug #523402
* gui/e-calendar-view.c: (e_calendar_view_add_event):
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index 83c2421d38..b68f28c568 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -32,7 +32,6 @@
#include <libgnome/gnome-sound.h>
#include <libgnomeui/gnome-client.h>
#include <libgnomeui/gnome-ui-init.h>
-#include <libgnomevfs/gnome-vfs-init.h>
#include <glade/glade.h>
#include <bonobo/bonobo-main.h>
#include <bonobo/bonobo-generic-factory.h>
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index f1308365cf..201a321a87 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -35,8 +35,6 @@
#include <bonobo/bonobo-widget.h>
#include <libgnome/libgnome.h>
#include <glib/gi18n.h>
-#include <libgnomevfs/gnome-vfs-mime.h>
-#include <libgnomevfs/gnome-vfs.h>
#include <libgnomeui/gnome-uidefs.h>
#include <libgnomeui/gnome-dialog.h>
#include <libgnomeui/gnome-dialog-util.h>
@@ -2366,26 +2364,6 @@ set_icon_from_comp (CompEditor *editor)
}
}
-static char *
-attachment_guess_mime_type (const char *file_name)
-{
- GnomeVFSFileInfo *info;
- GnomeVFSResult result;
- char *type = NULL;
-
- info = gnome_vfs_file_info_new ();
- result = gnome_vfs_get_file_info (file_name, info,
- GNOME_VFS_FILE_INFO_GET_MIME_TYPE |
- GNOME_VFS_FILE_INFO_FORCE_SLOW_MIME_TYPE |
- GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
- if (result == GNOME_VFS_OK)
- type = g_strdup (gnome_vfs_file_info_get_mime_type (info));
-
- gnome_vfs_file_info_unref (info);
-
- return type;
-}
-
static void
set_attachment_list (CompEditor *editor, GSList *attach_list)
{
@@ -2441,7 +2419,7 @@ set_attachment_list (CompEditor *editor, GSList *attach_list)
return;
}
- mime_type = attachment_guess_mime_type (file_name);
+ mime_type = e_util_guess_mime_type (file_name);
if (mime_type) {
if (!g_ascii_strcasecmp (mime_type, "message/rfc822")) {
wrapper = (CamelDataWrapper *) camel_mime_message_new ();
diff --git a/calendar/gui/e-cal-component-memo-preview.c b/calendar/gui/e-cal-component-memo-preview.c
index dd5131eb92..90eeae71a7 100644
--- a/calendar/gui/e-cal-component-memo-preview.c
+++ b/calendar/gui/e-cal-component-memo-preview.c
@@ -31,7 +31,6 @@
#include <gnome.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
#include <libecal/e-cal-time-util.h>
#include <libedataserver/e-categories.h>
#include <gtkhtml/gtkhtml.h>
@@ -40,6 +39,7 @@
#include <e-util/e-categories-config.h>
#include "calendar-config.h"
#include "e-cal-component-memo-preview.h"
+#include "e-cal-component-preview.h"
struct _ECalComponentMemoPreviewPrivate {
GtkWidget *html;
@@ -79,32 +79,6 @@ on_url_cb (GtkHTML *html, const char *url, gpointer data)
#endif
}
-/* Callback used when the user selects a URL in the HTML widget */
-static void
-url_requested_cb (GtkHTML *html, const char *url, GtkHTMLStream *stream, gpointer data)
-{
- if (!strncmp ("file:///", url, strlen ("file:///"))) {
- GnomeVFSHandle *handle;
- GnomeVFSResult result;
- char buffer[4096];
-
- if (gnome_vfs_open (&handle, url, GNOME_VFS_OPEN_READ) == GNOME_VFS_OK) {
- do {
- GnomeVFSFileSize bread;
-
- result = gnome_vfs_read (handle, buffer, sizeof (buffer), &bread);
- if (result == GNOME_VFS_OK)
- gtk_html_stream_write (stream, buffer, bread);
- } while (result == GNOME_VFS_OK);
-
- gnome_vfs_close (handle);
-
- if (result == GNOME_VFS_ERROR_EOF)
- gtk_html_stream_close (stream, GTK_HTML_STREAM_OK);
- }
- }
-}
-
/* Converts a time_t to a string, relative to the specified timezone */
static char *
timet_to_str_with_zone (ECalComponentDateTime *dt, ECal *ecal, icaltimezone *default_zone)
@@ -282,7 +256,7 @@ e_cal_component_memo_preview_init (ECalComponentMemoPreview *preview)
gtk_html_load_empty (GTK_HTML (priv->html));
g_signal_connect (G_OBJECT (priv->html), "url_requested",
- G_CALLBACK (url_requested_cb), NULL);
+ G_CALLBACK (e_cal_comp_preview_url_requested_cb), NULL);
g_signal_connect (G_OBJECT (priv->html), "link_clicked",
G_CALLBACK (on_link_clicked), preview);
g_signal_connect (G_OBJECT (priv->html), "on_url",
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index a73c10ef66..2ee0ca336f 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -30,7 +30,6 @@
#include <gnome.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
#include <libedataserver/e-categories.h>
#include <libecal/e-cal-time-util.h>
#include <gtkhtml/gtkhtml.h>
@@ -78,27 +77,43 @@ on_url_cb (GtkHTML *html, const char *url, gpointer data)
}
/* Callback used when the user selects a URL in the HTML widget */
-static void
-url_requested_cb (GtkHTML *html, const char *url, GtkHTMLStream *stream, gpointer data)
+void
+e_cal_comp_preview_url_requested_cb (GtkHTML *html, const char *url, GtkHTMLStream *html_stream, gpointer data)
{
- if (!strncmp ("file:///", url, strlen ("file:///"))) {
- GnomeVFSHandle *handle;
- GnomeVFSResult result;
- char buffer[4096];
+ int len = strlen ("file:///");
+
+ if (!strncmp ("file:///", url, len)) {
+ GFile *file;
+ const char *path = url + len - 1;
+
+ g_return_if_fail (html_stream != NULL);
+ g_return_if_fail (path != NULL);
- if (gnome_vfs_open (&handle, url, GNOME_VFS_OPEN_READ) == GNOME_VFS_OK) {
- do {
- GnomeVFSFileSize bread;
+ file = g_file_new_for_path (path);
+ if (file) {
+ char buffer[4096];
+ GInputStream *stream;
- result = gnome_vfs_read (handle, buffer, sizeof (buffer), &bread);
- if (result == GNOME_VFS_OK)
- gtk_html_stream_write (stream, buffer, bread);
- } while (result == GNOME_VFS_OK);
+ /* ignore errors here */
+ stream = G_INPUT_STREAM (g_file_read (file, NULL, NULL));
- gnome_vfs_close (handle);
+ if (stream) {
+ gssize bread;
+
+ do {
+ /* ignore errors here as well */
+ bread = g_input_stream_read (stream, buffer, sizeof (buffer), NULL, NULL);
+ if (bread > 0)
+ gtk_html_stream_write (html_stream, buffer, bread);
+ } while (bread > 0);
+
+ g_input_stream_close (stream, NULL, NULL);
+ g_object_unref (stream);
+
+ gtk_html_stream_close (html_stream, GTK_HTML_STREAM_OK);
+ }
- if (result == GNOME_VFS_ERROR_EOF)
- gtk_html_stream_close (stream, GTK_HTML_STREAM_OK);
+ g_object_unref (file);
}
}
}
@@ -328,7 +343,7 @@ e_cal_component_preview_init (ECalComponentPreview *preview)
gtk_html_load_empty (GTK_HTML (priv->html));
g_signal_connect (G_OBJECT (priv->html), "url_requested",
- G_CALLBACK (url_requested_cb), NULL);
+ G_CALLBACK (e_cal_comp_preview_url_requested_cb), NULL);
g_signal_connect (G_OBJECT (priv->html), "link_clicked",
G_CALLBACK (on_link_clicked), preview);
g_signal_connect (G_OBJECT (priv->html), "on_url",
diff --git a/calendar/gui/e-cal-component-preview.h b/calendar/gui/e-cal-component-preview.h
index 93b16cb7c0..1bfb0c2f2e 100644
--- a/calendar/gui/e-cal-component-preview.h
+++ b/calendar/gui/e-cal-component-preview.h
@@ -26,6 +26,8 @@
#include <gtk/gtktable.h>
#include <libecal/e-cal.h>
+#include <gtkhtml/gtkhtml.h>
+#include <gtkhtml/gtkhtml-stream.h>
#define E_TYPE_CAL_COMPONENT_PREVIEW (e_cal_component_preview_get_type ())
#define E_CAL_COMPONENT_PREVIEW(obj) (GTK_CHECK_CAST ((obj), E_TYPE_CAL_COMPONENT_PREVIEW, ECalComponentPreview))
@@ -62,4 +64,8 @@ void e_cal_component_preview_set_default_timezone (ECalComponentPreview *preview
void e_cal_component_preview_display (ECalComponentPreview *preview, ECal *ecal, ECalComponent *comp);
void e_cal_component_preview_clear (ECalComponentPreview *preview);
+/* Callback used when GtkHTML widget requests URL */
+void e_cal_comp_preview_url_requested_cb (GtkHTML *html, const char *url, GtkHTMLStream *html_stream, gpointer data);
+
+
#endif /* _E_CAL_COMPONENT_PREVIEW_H_ */
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);
}
}
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index 760df5628b..3b18036841 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -33,7 +33,6 @@
#include <bonobo/bonobo-exception.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-util.h>
-#include <libgnomevfs/gnome-vfs.h>
#include <libebook/e-book.h>
#include <libebook/e-vcard.h>
#include <libecal/e-cal-component.h>
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index 88b83233e0..cc9498c5b0 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -28,7 +28,7 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-util.h>
-#include <libgnomevfs/gnome-vfs.h>
+#include <gio/gio.h>
#include <libecal/e-cal-component.h>
#include <libecal/e-cal-util.h>
#include <libecal/e-cal-time-util.h>
@@ -81,8 +81,6 @@ struct _EMeetingStoreQueueData {
static GObjectClass *parent_class = NULL;
-static void start_async_read (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gpointer data);
-
static icalparameter_cutype
text_to_type (const char *type)
{
@@ -1114,6 +1112,8 @@ replace_string (gchar *string, gchar *from_value, gchar *to_value)
return replaced;
}
+static void start_async_read (const char *uri, gpointer data);
+
typedef struct {
ECal *client;
time_t startt;
@@ -1139,7 +1139,6 @@ freebusy_async (gpointer data)
char *fburi = NULL;
static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
EMeetingStorePrivate *priv = fbd->store->priv;
- GnomeVFSAsyncHandle *handle;
if (fbd->client) {
/* FIXME this a work around for getting all th free busy information for the users
@@ -1177,9 +1176,7 @@ freebusy_async (gpointer data)
if (fburi) {
priv->num_queries++;
- gnome_vfs_async_open (&handle, fburi, GNOME_VFS_OPEN_READ,
- GNOME_VFS_PRIORITY_DEFAULT, start_async_read,
- fbd->qdata);
+ start_async_read (fburi, fbd->qdata);
g_free (fburi);
} else if (default_fb_uri != NULL && !g_str_equal (default_fb_uri, "")) {
gchar *tmp_fb_uri;
@@ -1192,10 +1189,7 @@ freebusy_async (gpointer data)
default_fb_uri = replace_string (tmp_fb_uri, DOMAIN_SUB, split_email[1]);
priv->num_queries++;
- gnome_vfs_async_open (&handle, default_fb_uri, GNOME_VFS_OPEN_READ,
- GNOME_VFS_PRIORITY_DEFAULT, start_async_read,
- fbd->qdata);
-
+ start_async_read (default_fb_uri, fbd->qdata);
g_free (tmp_fb_uri);
g_strfreev (split_email);
g_free (default_fb_uri);
@@ -1375,59 +1369,72 @@ refresh_queue_add (EMeetingStore *store, int row,
}
static void
-async_close (GnomeVFSAsyncHandle *handle,
- GnomeVFSResult result,
- gpointer data)
+async_read (GObject *source_object, GAsyncResult *res, gpointer data)
{
EMeetingStoreQueueData *qdata = data;
+ GError *error = NULL;
+ GInputStream *istream;
+ gssize read;
- process_free_busy (qdata, qdata->string->str);
-}
+ g_return_if_fail (source_object != NULL);
+ g_return_if_fail (G_IS_INPUT_STREAM (source_object));
-static void
-async_read (GnomeVFSAsyncHandle *handle,
- GnomeVFSResult result,
- gpointer buffer,
- GnomeVFSFileSize requested,
- GnomeVFSFileSize read,
- gpointer data)
-{
- EMeetingStoreQueueData *qdata = data;
- GnomeVFSFileSize buf_size = BUF_SIZE - 1;
+ istream = G_INPUT_STREAM (source_object);
- if (result != GNOME_VFS_OK && result != GNOME_VFS_ERROR_EOF) {
- gnome_vfs_async_close (handle, async_close, qdata);
- return;
- }
+ read = g_input_stream_read_finish (istream, res, &error);
- ((char *)buffer)[read] = '\0';
- qdata->string = g_string_append (qdata->string, buffer);
+ if (error || read < 0) {
+ g_warning ("Read finish failed: %s", error ? error->message : "Unknown error");
+ if (error)
+ g_error_free (error);
- if (result == GNOME_VFS_ERROR_EOF) {
- gnome_vfs_async_close (handle, async_close, qdata);
+ g_input_stream_close (istream, NULL, NULL);
+ g_object_unref (istream);
+ process_free_busy (qdata, qdata->string->str);
return;
}
- gnome_vfs_async_read (handle, qdata->buffer, buf_size, async_read, qdata);
+ if (read == 0) {
+ g_input_stream_close (istream, NULL, NULL);
+ g_object_unref (istream);
+ process_free_busy (qdata, qdata->string->str);
+ } else {
+ qdata->buffer[read] = '\0';
+ qdata->string = g_string_append (qdata->string, qdata->buffer);
+
+ g_input_stream_read_async (istream, qdata->buffer, BUF_SIZE - 1, G_PRIORITY_DEFAULT, NULL, async_read, qdata);
+ }
}
static void
-start_async_read (GnomeVFSAsyncHandle *handle,
- GnomeVFSResult result,
- gpointer data)
+start_async_read (const char *uri, gpointer data)
{
EMeetingStoreQueueData *qdata = data;
- GnomeVFSFileSize buf_size = BUF_SIZE - 1;
+ GError *error = NULL;
+ GFile *file;
+ GInputStream *istream;
+
+ g_return_if_fail (uri != NULL);
+ g_return_if_fail (data != NULL);
qdata->store->priv->num_queries--;
- if (result != GNOME_VFS_OK) {
- g_warning ("Unable to access free/busy url: %s",
- gnome_vfs_result_to_string (result));
+ file = g_file_new_for_uri (uri);
+
+ g_return_if_fail (file != NULL);
+
+ istream = G_INPUT_STREAM (g_file_read (file, NULL, &error));
+
+ if (error) {
+ g_warning ("Unable to access free/busy url: %s", error->message);
+ g_error_free (error);
process_callbacks (qdata);
return;
}
- gnome_vfs_async_read (handle, qdata->buffer, buf_size, async_read, qdata);
+ if (!istream)
+ process_callbacks (qdata);
+ else
+ g_input_stream_read_async (istream, qdata->buffer, BUF_SIZE - 1, G_PRIORITY_DEFAULT, NULL, async_read, qdata);
}
void
diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c
index c62205fff5..08ce5f84c8 100644
--- a/calendar/gui/e-memos.c
+++ b/calendar/gui/e-memos.c
@@ -30,7 +30,6 @@
#include <string.h>
#include <gnome.h>
#include <glib/gi18n.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
#include <libedataserver/e-time-utils.h>
#include <table/e-table-scrolled.h>
#include <widgets/menus/gal-view-instance.h>
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index 6167f4a70c..7e55b99d20 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -28,7 +28,6 @@
#include <gnome.h>
#include <glib/gi18n.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
#include <libedataserver/e-time-utils.h>
#include <table/e-table-scrolled.h>
#include <widgets/menus/gal-view-instance.h>
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index 3f15b77c8e..a38ec7fcfb 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -27,7 +27,6 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-init.h>
-#include <libgnomevfs/gnome-vfs-init.h>
#include <glade/glade.h>
#include <bonobo/bonobo-main.h>
diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c
index 5ac2547d9d..cf670fefb6 100644
--- a/calendar/gui/migration.c
+++ b/calendar/gui/migration.c
@@ -33,8 +33,6 @@
#include <glib/gstdio.h>
#include <bonobo/bonobo-i18n.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-xfer.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtkmain.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 10:15:05 +0800