aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/ipod-sync
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/ipod-sync')
-rw-r--r--plugins/ipod-sync/ChangeLog10
-rw-r--r--plugins/ipod-sync/format-handler.h3
-rw-r--r--plugins/ipod-sync/ical-format.c36
-rw-r--r--plugins/ipod-sync/ipod-sync.c117
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 14:12:44 +0800