engine: support GEO property (part of FDO #60374)

Was lost earlier during syncing. Must be defined in field list and
vCard profile. Still not supported by PIM Manager, because folks doesn't
support it (see FDO #60373).

9 files changed, 41 insertions, 36 deletions

diff --git a/test/testcases/eds_contact.vcf b/test/testcases/eds_contact.vcf
index 2abf924e..e175fae9 100644
--- a/test/testcases/eds_contact.vcf
+++ b/test/testcases/eds_contact.vcf
@@ -172,6 +172,7 @@ N:Doe;John;;;
 X-EVOLUTION-FILE-AS:Doe\, John

 CATEGORIES:TEST

 X-EVOLUTION-BLOG-URL:web log

+GEO:30.12;-130.34

 CALURI:calender

 FBURL:free/busy

 X-EVOLUTION-VIDEO-URL:chat

diff --git a/test/testcases/eds_contact.vcf.exchange.tem.patch b/test/testcases/eds_contact.vcf.exchange.tem.patch
index a3b55395..a97af110 100644
--- a/test/testcases/eds_contact.vcf.exchange.tem.patch
+++ b/test/testcases/eds_contact.vcf.exchange.tem.patch
@@ -111,7 +111,7 @@
  LABEL;TYPE=HOME:Address Line 1\nAddress Line 2\nAddress Line 3

  UID:pas-id-43C15DFB000001AB

  END:VCARD

-@@ -167,48 +156,31 @@
+@@ -167,49 +156,32 @@
  X-EVOLUTION-ANNIVERSARY:2006-01-09

  X-EVOLUTION-SPOUSE:Joan Doe

  NOTE:This is a test case which uses almost all Evolution fields.

@@ -120,6 +120,7 @@
  X-EVOLUTION-FILE-AS:Doe\, John

  CATEGORIES:TEST

 -X-EVOLUTION-BLOG-URL:web log

+ GEO:30.12;-130.34

 -CALURI:calender

 -FBURL:free/busy

 -X-EVOLUTION-VIDEO-URL:chat

@@ -175,7 +176,7 @@
  END:VCARD

  

  BEGIN:VCARD

-@@ -221,8 +193,7 @@
+@@ -222,8 +194,7 @@
  NICKNAME:user5

  X-EVOLUTION-SPOUSE:

  NOTE:image in JPG format

@@ -185,7 +186,7 @@
  X-EVOLUTION-FILE-AS:JPG

  X-EVOLUTION-BLOG-URL:

  CALURI:

-@@ -257,8 +228,7 @@
+@@ -258,8 +229,7 @@
  NICKNAME:user4

  X-EVOLUTION-SPOUSE:

  NOTE:image in PNG format

@@ -195,7 +196,7 @@
  X-EVOLUTION-FILE-AS:PNG

  X-EVOLUTION-BLOG-URL:

  CALURI:

-@@ -288,8 +258,7 @@
+@@ -289,8 +259,7 @@
  NICKNAME:user6

  X-EVOLUTION-SPOUSE:

  NOTE:The first name is "First \; special \;".

@@ -205,7 +206,7 @@
  X-EVOLUTION-FILE-AS:Last\, First \; special \;

  X-EVOLUTION-BLOG-URL:

  CALURI:

-@@ -309,8 +278,7 @@
+@@ -310,8 +279,7 @@
  NICKNAME:user3

  X-EVOLUTION-SPOUSE:

  NOTE:image in GIF format

@@ -215,7 +216,7 @@
  X-EVOLUTION-FILE-AS:GIF

  X-EVOLUTION-BLOG-URL:

  CALURI:

-@@ -429,7 +397,6 @@
+@@ -430,7 +398,6 @@
    & < & < & < & < & < & < & < & < & < & < & < & < & < & < & < & < & < & <

    & < & < & < & < & < & < & < & < & < & < & < & < & < & < & < & < & < & <

    & < & < & < & < & < & < & < & < & < & < & < & < & < & < & < & < & < & <

diff --git a/test/testcases/eds_contact.vcf.google.tem.patch b/test/testcases/eds_contact.vcf.google.tem.patch
index 7f90e542..8baa01f1 100644
--- a/test/testcases/eds_contact.vcf.google.tem.patch
+++ b/test/testcases/eds_contact.vcf.google.tem.patch
@@ -46,7 +46,7 @@
  X-EVOLUTION-FILE-AS:Doe\, John

  CATEGORIES:TEST

  X-EVOLUTION-BLOG-URL:web log

-@@ -287,7 +287,7 @@
+@@ -288,7 +288,7 @@
  X-EVOLUTION-ASSISTANT:

  NICKNAME:user6

  X-EVOLUTION-SPOUSE:

diff --git a/test/testcases/eds_contact.vcf.memotoo.tem.patch b/test/testcases/eds_contact.vcf.memotoo.tem.patch
index f6094201..19b7247c 100644
--- a/test/testcases/eds_contact.vcf.memotoo.tem.patch
+++ b/test/testcases/eds_contact.vcf.memotoo.tem.patch
@@ -37,7 +37,7 @@
  ROLE:professional test case

  X-EVOLUTION-MANAGER:John Doe Senior

  X-EVOLUTION-ASSISTANT:John Doe Junior

-@@ -176,22 +176,14 @@
+@@ -177,22 +177,14 @@
  FBURL:free/busy

  X-EVOLUTION-VIDEO-URL:chat

  X-MOZILLA-HTML:TRUE

@@ -63,7 +63,7 @@
  TEL;TYPE=work;TYPE=Voice;X-EVOLUTION-UI-SLOT=1:business 1

  TEL;TYPE=homE;TYPE=VOICE;X-EVOLUTION-UI-SLOT=2:home 2

  TEL;TYPE=CELL;X-EVOLUTION-UI-SLOT=3:mobile 3

-@@ -199,7 +191,6 @@
+@@ -200,7 +192,6 @@
  TEL;TYPE=HOME;TYPE=FAX;X-EVOLUTION-UI-SLOT=5:homefax 5

  TEL;TYPE=PAGER;X-EVOLUTION-UI-SLOT=6:pager 6

  TEL;TYPE=CAR;X-EVOLUTION-UI-SLOT=7:car 7

@@ -71,7 +71,7 @@
  X-AIM;X-EVOLUTION-UI-SLOT=1:AIM JOHN

  X-YAHOO;X-EVOLUTION-UI-SLOT=2:YAHOO JDOE

  X-ICQ;X-EVOLUTION-UI-SLOT=3:ICQ JD

-@@ -289,7 +280,7 @@
+@@ -290,7 +281,7 @@
  X-EVOLUTION-SPOUSE:

  NOTE:The first name is "First \; special \;".

  FN:Mr. First \; special \; middle Last

diff --git a/test/testcases/eds_contact.vcf.mobical.tem.patch b/test/testcases/eds_contact.vcf.mobical.tem.patch
index 2ffea035..76922df6 100644
--- a/test/testcases/eds_contact.vcf.mobical.tem.patch
+++ b/test/testcases/eds_contact.vcf.mobical.tem.patch
@@ -85,7 +85,7 @@
  X-FOOBAR-EXTENSION;X-FOOBAR-PARAMETER=foobar:has to be stored internally by engine and preserved in testExtensions test\; never sent to a peer

  X-TEST;PARAMETER1=nonquoted;PARAMETER2="quoted because of spaces":Content with\nMultiple\nText lines\nand national chars: äöü

  X-EVOLUTION-ANNIVERSARY:2006-01-09

-@@ -184,7 +193,6 @@
+@@ -185,7 +194,6 @@
   5;Testovia

  LABEL;TYPE=HOME:Test Drive 1\nTest Village\, Lower Test County\n12345\nTest

    Box #1\nTestovia

@@ -93,7 +93,7 @@
  LABEL;TYPE=OTHER:Test Drive 3\nTest Megacity\, Test County\n12347\nTest Box

    #3\nNew Testonia

  UID:pas-id-43C0ED3900000001

-@@ -213,7 +221,7 @@
+@@ -214,7 +222,7 @@
  

  BEGIN:VCARD

  VERSION:3.0

@@ -102,7 +102,7 @@
  TITLE:

  ROLE:

  X-EVOLUTION-MANAGER:

-@@ -249,7 +257,7 @@
+@@ -250,7 +258,7 @@
  

  BEGIN:VCARD

  VERSION:3.0

@@ -111,7 +111,7 @@
  TITLE:

  ROLE:

  X-EVOLUTION-MANAGER:

-@@ -280,7 +288,7 @@
+@@ -281,7 +289,7 @@
  

  BEGIN:VCARD

  VERSION:3.0

@@ -120,7 +120,7 @@
  TITLE:

  ROLE:

  X-EVOLUTION-MANAGER:

-@@ -289,7 +297,7 @@
+@@ -290,7 +298,7 @@
  X-EVOLUTION-SPOUSE:

  NOTE:The first name is "First \; special \;".

  FN:Mr. First \; special \; middle Last

@@ -129,7 +129,7 @@
  X-EVOLUTION-FILE-AS:Last\, First \; special \;

  X-EVOLUTION-BLOG-URL:

  CALURI:

-@@ -301,7 +309,7 @@
+@@ -302,7 +310,7 @@
  

  BEGIN:VCARD

  VERSION:3.0

@@ -138,7 +138,7 @@
  TITLE:

  ROLE:

  X-EVOLUTION-MANAGER:

-@@ -383,53 +391,8 @@
+@@ -384,53 +392,8 @@
    & < & < & < & < & < & < & < & < & < & < & < & < & < & < & < & < & < & <

    & < & < & < & < & < & < & < & < & < & < & < & < & < & < & < & < & < & <

    & < & < & < & < & < & < & < & < & < & < & < & < & < & < & < & < & < & <

diff --git a/test/testcases/eds_contact.vcf.oracle.tem.patch b/test/testcases/eds_contact.vcf.oracle.tem.patch
index 948a477d..b11dd9b2 100644
--- a/test/testcases/eds_contact.vcf.oracle.tem.patch
+++ b/test/testcases/eds_contact.vcf.oracle.tem.patch
@@ -1,13 +1,7 @@
-@@ -279,27 +279,6 @@
- END:VCARD

- 

- BEGIN:VCARD

--VERSION:3.0

--URL:

--TITLE:

--ROLE:

--X-EVOLUTION-MANAGER:

--X-EVOLUTION-ASSISTANT:

+@@ -286,27 +286,6 @@
+ ROLE:

+ X-EVOLUTION-MANAGER:

+ X-EVOLUTION-ASSISTANT:

 -NICKNAME:user6

 -X-EVOLUTION-SPOUSE:

 -NOTE:The first name is "First \; special \;".

@@ -23,6 +17,12 @@
 -END:VCARD

 -

 -BEGIN:VCARD

- VERSION:3.0

- URL:

- TITLE:

+-VERSION:3.0

+-URL:

+-TITLE:

+-ROLE:

+-X-EVOLUTION-MANAGER:

+-X-EVOLUTION-ASSISTANT:

+ NICKNAME:user3

+ X-EVOLUTION-SPOUSE:

+ NOTE:image in GIF format

diff --git a/test/testcases/eds_contact.vcf.synthesis.tem.patch b/test/testcases/eds_contact.vcf.synthesis.tem.patch
index c41f57eb..43775dac 100644
--- a/test/testcases/eds_contact.vcf.synthesis.tem.patch
+++ b/test/testcases/eds_contact.vcf.synthesis.tem.patch
@@ -16,7 +16,7 @@
  X-EVOLUTION-ANNIVERSARY:2006-01-09

  X-EVOLUTION-SPOUSE:Joan Doe

  NOTE:This is a test case which uses almost all Evolution fields.

-@@ -198,14 +198,14 @@
+@@ -199,14 +199,14 @@
  TEL;TYPE=WORK;TYPE=FAX;X-EVOLUTION-UI-SLOT=4:businessfax 4

  TEL;TYPE=HOME;TYPE=FAX;X-EVOLUTION-UI-SLOT=5:homefax 5

  TEL;TYPE=PAGER;X-EVOLUTION-UI-SLOT=6:pager 6

diff --git a/test/testcases/eds_contact.vcf.yahoo.tem.patch b/test/testcases/eds_contact.vcf.yahoo.tem.patch
index 1dae2ffe..bbd88f37 100644
--- a/test/testcases/eds_contact.vcf.yahoo.tem.patch
+++ b/test/testcases/eds_contact.vcf.yahoo.tem.patch
@@ -104,12 +104,15 @@
  X-EVOLUTION-MANAGER:John Doe Senior

  X-EVOLUTION-ASSISTANT:John Doe Junior

  NICKNAME:user1

-@@ -172,34 +84,31 @@
+@@ -171,36 +83,33 @@
+ N:Doe;John;;;

  X-EVOLUTION-FILE-AS:Doe\, John

  CATEGORIES:TEST

- X-EVOLUTION-BLOG-URL:web log

+-X-EVOLUTION-BLOG-URL:web log

+ GEO:30.12;-130.34

 -CALURI:calender

 -FBURL:free/busy

++X-EVOLUTION-BLOG-URL:web log

  X-EVOLUTION-VIDEO-URL:chat

  X-MOZILLA-HTML:TRUE

 -ADR;TYPE=WORK:Test Box #2;;Test Drive 2;Test Town;Upper Test County;12346;O

@@ -150,7 +153,7 @@
  X-AIM;X-EVOLUTION-UI-SLOT=1:AIM JOHN

  X-YAHOO;X-EVOLUTION-UI-SLOT=2:YAHOO JDOE

  X-ICQ;X-EVOLUTION-UI-SLOT=3:ICQ JD

-@@ -210,226 +119,3 @@
+@@ -211,226 +120,3 @@
  X-SKYPE:SKYPE DOE

  X-SIP:SIP DOE

  END:VCARD

diff --git a/test/testcases/eds_contact.vcf.zyb.tem.patch b/test/testcases/eds_contact.vcf.zyb.tem.patch
index 1787d92d..73fdb7c4 100644
--- a/test/testcases/eds_contact.vcf.zyb.tem.patch
+++ b/test/testcases/eds_contact.vcf.zyb.tem.patch
@@ -7,7 +7,7 @@
  FN:xml entities

  N:xml;entities;;;

  X-EVOLUTION-FILE-AS:xml\, entities

-@@ -177,11 +177,11 @@
+@@ -178,11 +178,11 @@
  X-EVOLUTION-VIDEO-URL:chat

  X-MOZILLA-HTML:TRUE

  ADR;TYPE=WORK:Test Box #2;;Test Drive 2;Test Town;Upper Test County;12346;O

@@ -21,7 +21,7 @@
  LABEL;TYPE=HOME:Test Drive 1\nTest Village\, Lower Test County\n12345\nTest

    Box #1\nTestovia

  ADR:Test Box #3;;Test Drive 3;Test Megacity;Test County;12347;New Testonia

-@@ -289,7 +289,7 @@
+@@ -290,7 +290,7 @@
  X-EVOLUTION-SPOUSE:

  NOTE:The first name is "First \; special \;".

  FN:Mr. First \; special \; middle Last