[Pkg-telepathy-commits] [SCM] MC 5 packaging branch, debian, updated. debian/1%5.12.1-2-4-g07a42a9

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 1b17baf232941d10174107b6b65af67a4057e1ac
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Sep 6 17:06:20 2012 +0100

    Add patch from upstream stable release 5.12.2 to migrate the passwords of Butterfly accounts too

diff --git a/debian/changelog b/debian/changelog
index 4eb7173..3777cfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ telepathy-mission-control-5 (1:5.12.1-3) UNRELEASED; urgency=low
   * Add patch from upstream stable release 5.12.2 to enable migration of
     Butterfly accounts to Haze after Butterfly has been uninstalled
     (Closes: #686835)
+  * Add patch from upstream stable release 5.12.2 to migrate the
+    passwords of Butterfly accounts too
 
  -- Simon McVittie <smcv at debian.org>  Thu, 06 Sep 2012 09:41:30 +0100
 
diff --git a/debian/patches/0015-Butterfly-account-migration-migrate-the-password-too.patch b/debian/patches/0015-Butterfly-account-migration-migrate-the-password-too.patch
new file mode 100644
index 0000000..c6d42be
--- /dev/null
+++ b/debian/patches/0015-Butterfly-account-migration-migrate-the-password-too.patch
@@ -0,0 +1,55 @@
+From: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: Thu, 6 Sep 2012 16:40:37 +0100
+Subject: [PATCH 15/16] Butterfly account migration: migrate the password too,
+ if stored
+
+Otherwise the upgrade from Debian 6 to 7 forgets MSN passwords, which
+is not the end of the world, but seems less nice than it could be.
+
+Signed-off-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Reviewed-by: Xavier Claessens <xavier.claessens at collabora.co.uk>
+Origin: upstream, 5.12.2, commit:5e1bbe8f891af4d86cb9dfd2f0b36fdfbbb7b2ef
+---
+ src/mcd-account-manager.c |   12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
+index a13ba03..e4a81f7 100644
+--- a/src/mcd-account-manager.c
++++ b/src/mcd-account-manager.c
+@@ -1209,6 +1209,7 @@ migrate_butterfly_haze_ready (McdManager *manager,
+     MigrateCtx *ctx = user_data;
+     gchar *display_name;
+     GValue v = {0,};
++    GValue password_v = {0,};
+     GHashTable *parameters, *properties;
+     gchar *str;
+     GPtrArray *supersedes;
+@@ -1221,7 +1222,7 @@ migrate_butterfly_haze_ready (McdManager *manager,
+         goto error;
+     }
+ 
+-    /* Parameters; we just care about 'account' */
++    /* Parameters; the only mandatory one is 'account' */
+     if (!mcd_account_get_parameter_of_known_type (ctx->account,
+                                                   "account", G_TYPE_STRING,
+                                                   &v, NULL))
+@@ -1233,6 +1234,15 @@ migrate_butterfly_haze_ready (McdManager *manager,
+     parameters = g_hash_table_new (g_str_hash, g_str_equal);
+     g_hash_table_insert (parameters, "account", &v);
+ 
++    /* If MC is storing the password, let's copy that too, so Empathy
++     * can migrate it somewhere better. */
++    if (mcd_account_get_parameter_of_known_type (ctx->account,
++                                                 "password", G_TYPE_STRING,
++                                                 &password_v, NULL))
++    {
++        g_hash_table_insert (parameters, "password", &password_v);
++    }
++
+     display_name = mcd_account_dup_display_name (ctx->account);
+ 
+     /* Properties */
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index fea8b8c..5473c2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0012-Default-account-backend-when-deleting-from-the-keyri.patch
 0013-Default-account-backend-when-deleting-passwords-dele.patch
 0014-Migrate-from-Butterfly-to-Haze-even-if-Butterfly-is-.patch
+0015-Butterfly-account-migration-migrate-the-password-too.patch

-- 
MC 5 packaging