evolution r34770 - branches/gnome-2-20/plugins/ipod-sync

[msuman svn gnome org]

Author: msuman
Date: Sun Jan  6 18:53:54 2008
New Revision: 34770
URL: http://svn.gnome.org/viewvc/evolution?rev=34770&view=rev

Log:
Patch from JoÃo Vale  <jpvale gmail com>: Fix for bug #375580 (Use ISO-8859-1 encoding to store contacts in iPod)

Modified:
   branches/gnome-2-20/plugins/ipod-sync/ChangeLog
   branches/gnome-2-20/plugins/ipod-sync/ipod-sync.c

Modified: branches/gnome-2-20/plugins/ipod-sync/ChangeLog
==============================================================================
--- branches/gnome-2-20/plugins/ipod-sync/ChangeLog	(original)
+++ branches/gnome-2-20/plugins/ipod-sync/ChangeLog	Sun Jan  6 18:53:54 2008
@@ -1,3 +1,10 @@
+2008-01-07  JoÃo Vale  <jpvale gmail com>
+
+	** Fix for bug #375580
+
+	* ipod-sync.c: (destination_save_addressbook): Use ISO-8859-1 encoding
+	to store contacts in iPod. 
+
 2007-06-07  Gilles Dartiguelongue  <dartigug esiee fr>
 
 	* evolution-ipod-sync.c: (ipod_get_mount):
@@ -51,7 +58,7 @@
 2005-10-18  Srinivasa Ragavan <sragavan novell com>
 
 	* Created the iPod sync plugin. It based on Justin Wakes bounty
-	work and rodrigo's save callendar plugin.
+	work and rodrigo's save calendar plugin.
 
 
 

Modified: branches/gnome-2-20/plugins/ipod-sync/ipod-sync.c
==============================================================================
--- branches/gnome-2-20/plugins/ipod-sync/ipod-sync.c	(original)
+++ branches/gnome-2-20/plugins/ipod-sync/ipod-sync.c	Sun Jan  6 18:53:54 2008
@@ -112,9 +112,12 @@
 				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);
-				if ((result = gnome_vfs_write (handle, (gconstpointer) vcard, strlen (vcard), &bytes_written))
+				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));
@@ -123,6 +126,7 @@
 				g_object_unref (contact);
 				g_free (temp);
 				g_free (vcard);
+				g_free (converted_vcard);
 		}
 	}