[Pkg-cli-apps-commits] [SCM] gnome-do-plugins branch, master, updated. fa33103a2c923ef8342b7bd62a73f82c36779952

[Christopher James Halse Rogers]

The following commit has been merged in the master branch:
commit fa33103a2c923ef8342b7bd62a73f82c36779952
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date:   Wed Feb 23 22:31:03 2011 +1100

    Disable address scraping from GMail contacts to fix build against gdata1.7

diff --git a/debian/changelog b/debian/changelog
index cea18be..2892f6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ gnome-do-plugins (0.8.3-1) UNRELEASED; urgency=low
       Empathy plugin.
     - Bump Standards-Version; no changes required.
     - Transition VCS-* fields to git
+  * debian/patches/02_gdata_1.7_compatibility.diff:
+    - Drop address field from the GMail contacts plugin; this API changed in
+      gdata .NET 1.7, and needs fixing upstream
 
  -- Christopher James Halse Rogers <raof at ubuntu.com>  Mon, 21 Feb 2011 22:31:09 +1100
 
diff --git a/debian/patches/02_gdata_1.7_compatibility.diff b/debian/patches/02_gdata_1.7_compatibility.diff
new file mode 100644
index 0000000..5feb942
--- /dev/null
+++ b/debian/patches/02_gdata_1.7_compatibility.diff
@@ -0,0 +1,13 @@
+Index: gnome-do-plugins/GoogleContacts/src/GMailClient.cs
+===================================================================
+--- gnome-do-plugins.orig/GoogleContacts/src/GMailClient.cs	2011-02-23 21:03:10.102574419 +1100
++++ gnome-do-plugins/GoogleContacts/src/GMailClient.cs	2011-02-23 22:25:57.855914459 +1100
+@@ -77,7 +77,7 @@
+ 
+ 					AddDetails (buddy, entry.Emails);
+ 					AddDetails (buddy, entry.Phonenumbers);
+-					AddDetails (buddy, entry.PostalAddresses);
++//					AddDetails (buddy, entry.PostalAddresses);
+ 					
+ 					contacts.Add (buddy);
+ 				}
diff --git a/debian/patches/series b/debian/patches/series
index ddc9fbe..7ba0f83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 00_debian_default_plugins.patch
 01_firefox_iceweasel_rename.patch
+02_gdata_1.7_compatibility.diff

-- 
gnome-do-plugins