[Pkg-telepathy-commits] [SCM] folks packaging branch branch, debian, updated. debian/0.6.8-2-8-g46a6c5d

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit 435428864387cf83ae86bca32477b3967edd119a
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Apr 17 15:09:22 2012 +0200

    d/p/0001-tpf-persona-use-tp_connection_get_account.patch: Drop patch, applied upstream

diff --git a/debian/changelog b/debian/changelog
index 5e8f5e8..fd9d774 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ folks (0.6.9-1) UNRELEASED; urgency=low
 
   * New upstream release
     - Bump libtelepathy-glib-dev build-dependency
+  * d/p/0001-tpf-persona-use-tp_connection_get_account.patch: Drop patch,
+    applied upstream
 
- -- Laurent Bigonville <bigon at debian.org>  Tue, 17 Apr 2012 15:07:48 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Tue, 17 Apr 2012 15:09:04 +0200
 
 folks (0.6.8-2) unstable; urgency=low
 
diff --git a/debian/patches/0001-tpf-persona-use-tp_connection_get_account.patch b/debian/patches/0001-tpf-persona-use-tp_connection_get_account.patch
deleted file mode 100644
index 68d9c42..0000000
--- a/debian/patches/0001-tpf-persona-use-tp_connection_get_account.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 278de0b59eb5dee93f8436e982901438a55d5b19 Mon Sep 17 00:00:00 2001
-From: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
-Date: Wed, 28 Mar 2012 11:22:28 +0200
-Subject: [PATCH] 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
----
- NEWS                                    |    4 ++++
- backends/telepathy/lib/tpf-persona.vala |   23 ++---------------------
- configure.ac                            |    2 +-
- 3 files changed, 7 insertions(+), 22 deletions(-)
-
-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,
-     {
-       unowned string id = contact.get_identifier ();
-       var connection = contact.connection;
--      var account = this._account_for_connection (connection);
-+      var account = connection.get_account ();
-       var uid = this.build_uid (store.type_id, store.id, id);
- 
-       Object (contact: contact,
-@@ -663,7 +663,7 @@ public class Tpf.Persona : Folks.Persona,
- 
-       /* Set our single IM address */
-       var connection = this.contact.connection;
--      var account = this._account_for_connection (connection);
-+      var account = connection.get_account ();
- 
-       try
-         {
-@@ -1005,25 +1005,6 @@ public class Tpf.Persona : Folks.Persona,
-         }
-     }
- 
--  private static Account? _account_for_connection (Connection conn)
--    {
--      var manager = AccountManager.dup ();
--      var accounts = manager.get_valid_accounts ();
--
--      Account account_found = null;
--      accounts.foreach ((l) =>
--        {
--          unowned Account account = (Account) l;
--          if (account.connection == conn)
--            {
--              account_found = account;
--              return;
--            }
--        });
--
--      return account_found;
--    }
--
-   private void _contact_notify_presence_message ()
-     {
-       this.presence_message = this.contact.get_presence_message ();
--- 
-1.7.9.1
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8d4d505..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-tpf-persona-use-tp_connection_get_account.patch

-- 
folks packaging branch