[Pkg-telepathy-commits] [folks] 03/15: Pull in some patches from upstream that were applied in Ubuntu

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch telepathy1
in repository folks.

commit 148f85667e0928b000fab264858ffeea41becbb9
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Mar 25 16:11:23 2014 +0000

    Pull in some patches from upstream that were applied in Ubuntu
---
 debian/changelog                                   |  5 +++
 ...ixed-EDS-persona-store-display-name-value.patch | 25 ++++++++++++
 ...e-of-EVCard.remove_attribute-to-EVCard.re.patch | 45 ++++++++++++++++++++++
 debian/patches/series                              |  2 +
 4 files changed, 77 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fe898b7..3800442 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,11 @@ folks (0.9.6-2) UNRELEASED; urgency=medium
   * Add patch to reduce dependency on evolution-data-server: it's only
     the BlueZ backend, which we don't compile, that needs a newer version
     than 3.8.
+  * Pull in some patches from upstream that were applied in Ubuntu:
+    + fix display-names in the EDS persona store (GNOME #726787)
+    + fix unsetting favourite contacts (GNOME #724809)
+    + do not fix GNOME #724058 for now, it's new API and should
+      be received in an upstream release instead
 
  -- Simon McVittie <smcv at debian.org>  Tue, 25 Mar 2014 15:37:49 +0000
 
diff --git a/debian/patches/0002-Fixed-EDS-persona-store-display-name-value.patch b/debian/patches/0002-Fixed-EDS-persona-store-display-name-value.patch
new file mode 100644
index 0000000..1faf17a
--- /dev/null
+++ b/debian/patches/0002-Fixed-EDS-persona-store-display-name-value.patch
@@ -0,0 +1,25 @@
+From: Renato Araujo Oliveira Filho <renato.filho at canonical.com>
+Date: Thu, 20 Mar 2014 15:13:10 -0300
+Subject: Fixed EDS persona store display-name value.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=726787
+Applied-upstream: 0.9.7, commit:87e037787476ba645ced4b8d6a406b32f7dbfae0
+---
+ backends/eds/lib/edsf-persona-store.vala | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala
+index 0c6b9c1..37de716 100644
+--- a/backends/eds/lib/edsf-persona-store.vala
++++ b/backends/eds/lib/edsf-persona-store.vala
+@@ -313,8 +313,9 @@ public class Edsf.PersonaStore : Folks.PersonaStore
+   public PersonaStore.with_source_registry (E.SourceRegistry r, E.Source s)
+     {
+       string eds_uid = s.get_uid ();
++      string eds_name = s.get_display_name ();
+       Object (id: eds_uid,
+-              display_name: eds_uid,
++              display_name: eds_name,
+               source: s);
+ 
+       this._source_registry = r;
diff --git a/debian/patches/0003-Replaced-use-of-EVCard.remove_attribute-to-EVCard.re.patch b/debian/patches/0003-Replaced-use-of-EVCard.remove_attribute-to-EVCard.re.patch
new file mode 100644
index 0000000..93ace5b
--- /dev/null
+++ b/debian/patches/0003-Replaced-use-of-EVCard.remove_attribute-to-EVCard.re.patch
@@ -0,0 +1,45 @@
+From: Renato Araujo Oliveira Filho <renato.filho at canonical.com>
+Date: Thu, 20 Feb 2014 18:21:27 -0300
+Subject: Replaced use of EVCard.remove_attribute to EVCard.remove_attributes.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=724809
+---
+ backends/eds/lib/edsf-persona-store.vala | 14 +++++---------
+ 1 file changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala
+index 37de716..90b0c1e 100644
+--- a/backends/eds/lib/edsf-persona-store.vala
++++ b/backends/eds/lib/edsf-persona-store.vala
+@@ -1310,11 +1310,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
+ 
+   private void _remove_attribute (E.Contact contact, string attr_name)
+     {
+-      unowned VCardAttribute? attr = contact.get_attribute (attr_name);
+-      if (attr != null)
+-        {
+-          contact.remove_attribute ((!) attr);
+-        }
++      contact.remove_attributes (null, attr_name);
+     }
+ 
+   internal async void _set_avatar (Edsf.Persona persona, LoadableIcon? avatar)
+@@ -2049,14 +2045,14 @@ public class Edsf.PersonaStore : Folks.PersonaStore
+ 
+   private void _set_contact_system_groups (E.Contact contact, Set<string> system_groups)
+     {
++      var group_ids_str = "X-GOOGLE-SYSTEM-GROUP-IDS";
+       var vcard = (E.VCard) contact;
+-      unowned E.VCardAttribute? prev_attr =
+-          vcard.get_attribute ("X-GOOGLE-SYSTEM-GROUP-IDS");
++      unowned E.VCardAttribute? prev_attr = vcard.get_attribute (group_ids_str);
+ 
+       if (prev_attr != null)
+-        contact.remove_attribute (prev_attr);
++        contact.remove_attributes (null, group_ids_str);
+ 
+-      E.VCardAttribute new_attr = new E.VCardAttribute ("", "X-GOOGLE-SYSTEM-GROUP-IDS");
++      E.VCardAttribute new_attr = new E.VCardAttribute ("", group_ids_str);
+       foreach (var group in system_groups)
+         {
+           if (group == null || group == "")
diff --git a/debian/patches/series b/debian/patches/series
index c5cb21c..bc3592b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 0001-Reduce-libebook-dependency-when-not-compiling-the-Bl.patch
+0002-Fixed-EDS-persona-store-display-name-value.patch
+0003-Replaced-use-of-EVCard.remove_attribute-to-EVCard.re.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/folks.git