patches/evolution-data-server-06-marshal-list.diff
author chrisk
Wed, 13 Jan 2010 14:04:56 +0000
changeset 17322 3d3d470cead7
parent 17223 cf4a8b6ab1d7
child 17347 50fdc4619e8a
permissions -rw-r--r--
2010-01-13 Christian Kelly <[email protected]> * patches/evolution-data-server-06-marshal-list.diff: Hack to fix build issue.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17223
cf4a8b6ab1d7 2009-12-22 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     1
--- evolution-data-server-2.29.3/libedataserverui/e-data-server-ui-marshal.list.orig	2009-12-03 18:51:30.553399000 +0800
cf4a8b6ab1d7 2009-12-22 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     2
+++ evolution-data-server-2.29.3/libedataserverui/e-data-server-ui-marshal.list	2009-12-03 18:43:49.115897000 +0800
cf4a8b6ab1d7 2009-12-22 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     3
@@ -0,0 +1,2 @@
cf4a8b6ab1d7 2009-12-22 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     4
+BOOLEAN:OBJECT,BOXED
cf4a8b6ab1d7 2009-12-22 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     5
+BOOLEAN:BOXED,OBJECT,FLAGS,UINT
17322
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
     6
--- evolution-data-server-2.29.4.orig/addressbook/libebook/e-book.c	2010-01-13 13:55:22.862085019 +0000
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
     7
+++ evolution-data-server-2.29.4/addressbook/libebook/e-book.c	2010-01-13 13:56:12.124995969 +0000
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
     8
@@ -1923,11 +1923,11 @@
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
     9
 
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    10
 		western = e_name_western_parse (s);
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    11
 		g_string_append_printf (vcard, "N:%s;%s;%s;%s;%s\n",
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    12
-					western->last ?: "",
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    13
-					western->first ?: "",
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    14
-					western->middle ?: "",
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    15
-					western->prefix ?: "",
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    16
-					western->suffix ?: "");
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    17
+					"",
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    18
+					"",
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    19
+					"",
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    20
+					"",
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    21
+					"");
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    22
 		e_name_western_free (western);
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    23
 	}
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    24
 	g_string_append (vcard, "END:VCARD");