evolution r35389 - trunk/plugins/ipod-sync

[mbarnes svn gnome org]

Author: mbarnes
Date: Sat Apr 19 19:53:51 2008
New Revision: 35389
URL: http://svn.gnome.org/viewvc/evolution?rev=35389&view=rev

Log:
2008-04-19  Matthew Barnes  <mbarnes redhat com>

	* plugins/ipod-sync/ical-fomat.c (do_save_calendar_ical):
	* plugins/ipod-sync/ipod-sync.c (open_for_writing),
	(destination_save_addressbook):
	Fix some compilation errors.



Modified:
   trunk/plugins/ipod-sync/ChangeLog
   trunk/plugins/ipod-sync/ical-format.c
   trunk/plugins/ipod-sync/ipod-sync.c

Modified: trunk/plugins/ipod-sync/ical-format.c
==============================================================================
--- trunk/plugins/ipod-sync/ical-format.c	(original)
+++ trunk/plugins/ipod-sync/ical-format.c	Sat Apr 19 19:53:51 2008
@@ -96,7 +96,7 @@
 			char *ical_str = icalcomponent_as_ical_string (top_level);
 
 			g_output_stream_write_all (stream, ical_str, strlen (ical_str), NULL, NULL, &error);
-			g_output_stream_close (stream);
+			g_output_stream_close (stream, NULL, NULL);
 
 			g_free (ical_str);
 		}

Modified: trunk/plugins/ipod-sync/ipod-sync.c
==============================================================================
--- trunk/plugins/ipod-sync/ipod-sync.c	(original)
+++ trunk/plugins/ipod-sync/ipod-sync.c	Sat Apr 19 19:53:51 2008
@@ -30,6 +30,7 @@
 #endif
 
 #include <glib.h>
+#include <gio/gio.h>
 #include <glib/gi18n.h>
 
 #include <libebook/e-book.h>
@@ -42,6 +43,7 @@
 #include <addressbook/gui/widgets/eab-popup.h>
 #include <string.h>
 
+#include "e-util/e-error.h"
 #include "format-handler.h"
 #include "evolution-ipod-sync.h"
 
@@ -81,7 +83,7 @@
 	fostream = g_file_create (file, G_FILE_CREATE_NONE, NULL, &err);
 
 	if (err && err->code == G_IO_ERROR_EXISTS) {
-		g_error_clear (&err);
+		g_clear_error (&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);
@@ -119,7 +121,7 @@
 	GList *contacts, *tmp;
 	ESource *primary_source;
 	gchar *uri;
-	GOutputSream *stream;
+	GOutputStream *stream;
 	GError *error = NULL;
 	char *dest_uri = NULL;
 	char *mount = ipod_get_mount();
@@ -161,7 +163,7 @@
 
 			if (error) {
 				display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (target->selector)), error->message);
-				g_error_clear (&error);
+				g_clear_error (&error);
 			}
 
 			g_object_unref (contact);
@@ -170,7 +172,7 @@
 			g_free (converted_vcard);
 		}
 
-		g_output_stream_close (stream);
+		g_output_stream_close (stream, NULL, NULL);
 	}
 
 	if (stream)