[folks] Rebase patch

[Brian Pepple]

commit d73b77a981adf897f28d8d196bcdde79742343ff
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Fri Mar 30 09:40:57 2012 -0400

    Rebase patch

 folks-use_tp_connection_get_account.patch |   62 +++++++++-------------------
 1 files changed, 20 insertions(+), 42 deletions(-)
---
diff --git a/folks-use_tp_connection_get_account.patch b/folks-use_tp_connection_get_account.patch
index 6e01699..7bf5990 100644
--- a/folks-use_tp_connection_get_account.patch
+++ b/folks-use_tp_connection_get_account.patch
@@ -1,37 +1,7 @@
-From 278de0b59eb5dee93f8436e982901438a55d5b19 Mon Sep 17 00:00:00 2001
-From: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
-Date: Wed, 28 Mar 2012 09:22:28 +0000
-Subject: tpf-persona: use tp_connection_get_account()
-
-telepathy-glib introduced API to get the TpAccount of a TpConnection so Folks
-doesn't have to do it manually.
-
-This has the nice side effect of fixing a crash when TpAccount/TpConnection
-are momentary out of sync while connecting/disconnecting accounts.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=672980
----
-diff --git a/NEWS b/NEWS
-index 0abe146..6d89c74 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,7 +1,11 @@
- Overview of changes from libfolks 0.6.8 to libfolks 0.6.9
- =============================================================
- 
-+Dependencies:
-+• telepathy-glib ≥ 0.15.5
-+
- Bugs fixed:
-+• Bug 672980 — tp_account_get_protocol: assertion `TP_IS_ACCOUNT (account)' failed
- 
- Overview of changes from libfolks 0.6.7 to libfolks 0.6.8
- =============================================================
-diff --git a/backends/telepathy/lib/tpf-persona.vala b/backends/telepathy/lib/tpf-persona.vala
-index 0b23b33..282b35d 100644
---- a/backends/telepathy/lib/tpf-persona.vala
-+++ b/backends/telepathy/lib/tpf-persona.vala
-@@ -614,7 +614,7 @@ public class Tpf.Persona : Folks.Persona,
+diff -urp folks-0.6.8.OLD/backends/telepathy/lib/tpf-persona.vala folks-0.6.8/backends/telepathy/lib/tpf-persona.vala
+--- folks-0.6.8.OLD/backends/telepathy/lib/tpf-persona.vala	2012-03-26 18:20:57.000000000 -0400
++++ folks-0.6.8/backends/telepathy/lib/tpf-persona.vala	2012-03-30 09:37:50.425562828 -0400
+@@ -614,7 +614,7 @@ public class Tpf.Persona : Folks.Persona
      {
        unowned string id = contact.get_identifier ();
        var connection = contact.connection;
@@ -40,7 +10,7 @@ index 0b23b33..282b35d 100644
        var uid = this.build_uid (store.type_id, store.id, id);
  
        Object (contact: contact,
-@@ -663,7 +663,7 @@ public class Tpf.Persona : Folks.Persona,
+@@ -663,7 +663,7 @@ public class Tpf.Persona : Folks.Persona
  
        /* Set our single IM address */
        var connection = this.contact.connection;
@@ -49,7 +19,7 @@ index 0b23b33..282b35d 100644
  
        try
          {
-@@ -1005,25 +1005,6 @@ public class Tpf.Persona : Folks.Persona,
+@@ -1005,25 +1005,6 @@ public class Tpf.Persona : Folks.Persona
          }
      }
  
@@ -75,10 +45,9 @@ index 0b23b33..282b35d 100644
    private void _contact_notify_presence_message ()
      {
        this.presence_message = this.contact.get_presence_message ();
-diff --git a/configure.ac b/configure.ac
-index c540bc5..2f5cd0d 100644
---- a/configure.ac
-+++ b/configure.ac
+diff -urp folks-0.6.8.OLD/configure.ac folks-0.6.8/configure.ac
+--- folks-0.6.8.OLD/configure.ac	2012-03-26 18:20:57.000000000 -0400
++++ folks-0.6.8/configure.ac	2012-03-30 09:37:50.433562372 -0400
 @@ -145,7 +145,7 @@ AM_CONDITIONAL([ENABLE_LIBSOCIALWEB],
  # -----------------------------------------------------------
  
@@ -88,5 +57,14 @@ index c540bc5..2f5cd0d 100644
  VALA_REQUIRED=0.15.2
  VALADOC_REQUIRED=0.3.1
  TRACKER_SPARQL_MAJOR=0.14
---
-cgit v0.9.0.2
+diff -urp folks-0.6.8.OLD/NEWS folks-0.6.8/NEWS
+--- folks-0.6.8.OLD/NEWS	2012-03-26 18:20:57.000000000 -0400
++++ folks-0.6.8/NEWS	2012-03-30 09:38:44.679470930 -0400
+@@ -11,6 +11,7 @@ Major changes:
+ * Improvements to folks-inspect to make it a good command line citizen
+ 
+ Bugs fixed:
++* Bug 672980 — tp_account_get_protocol: assertion `TP_IS_ACCOUNT (account)' failed
+ * Bug 670191 — IndividualAggregator::is-quiescent is never set to TRUE
+ * Bug 670523 — persona.vala:153:folks_persona_get_individual:
+   assertion failed: (_tmp6_)