patches/evolution-data-server-06-marshal-list.diff
author Jon Tibble <meths@btinternet.com>
Sat, 06 Oct 2012 16:11:50 +0100
branchs11express-2010-11
changeset 22109 db10202d5f6d
parent 17347 50fdc4619e8a
permissions -rw-r--r--
Added tag oi_151a_prestable7 for changeset 25dee50cecca
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17347
50fdc4619e8a 2010-01-15 Jeff Cai <[email protected]>
qc161282
parents: 17322
diff changeset
     1
diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
50fdc4619e8a 2010-01-15 Jeff Cai <[email protected]>
qc161282
parents: 17322
diff changeset
     2
index e1042ab..75a3292 100644
50fdc4619e8a 2010-01-15 Jeff Cai <[email protected]>
qc161282
parents: 17322
diff changeset
     3
--- a/addressbook/libebook/e-book.c
50fdc4619e8a 2010-01-15 Jeff Cai <[email protected]>
qc161282
parents: 17322
diff changeset
     4
+++ b/addressbook/libebook/e-book.c
50fdc4619e8a 2010-01-15 Jeff Cai <[email protected]>
qc161282
parents: 17322
diff changeset
     5
@@ -1923,11 +1923,11 @@ make_me_card (void)
17322
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
     6
 
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
     7
 		western = e_name_western_parse (s);
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
     8
 		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
     9
-					western->last ?: "",
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    10
-					western->first ?: "",
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    11
-					western->middle ?: "",
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    12
-					western->prefix ?: "",
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    13
-					western->suffix ?: "");
17347
50fdc4619e8a 2010-01-15 Jeff Cai <[email protected]>
qc161282
parents: 17322
diff changeset
    14
+					western->last ? western->last : "",
50fdc4619e8a 2010-01-15 Jeff Cai <[email protected]>
qc161282
parents: 17322
diff changeset
    15
+					western->first ? western->first : "",
50fdc4619e8a 2010-01-15 Jeff Cai <[email protected]>
qc161282
parents: 17322
diff changeset
    16
+					western->middle ? western->middle : "",
50fdc4619e8a 2010-01-15 Jeff Cai <[email protected]>
qc161282
parents: 17322
diff changeset
    17
+					western->prefix ? western->prefix : "",
50fdc4619e8a 2010-01-15 Jeff Cai <[email protected]>
qc161282
parents: 17322
diff changeset
    18
+					western->suffix ? western->suffix : "");
17322
3d3d470cead7 2010-01-13 Christian Kelly <[email protected]>
chrisk
parents: 17223
diff changeset
    19
 		e_name_western_free (western);
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
 	g_string_append (vcard, "END:VCARD");