[Pkg-telepathy-commits] [SCM] MC 5 packaging branch, debian, updated. debian/1%5.12.1-3-6-gc6860cd
Simon McVittie
smcv at debian.org
Thu Sep 20 14:43:02 UTC 2012
The following commit has been merged in the debian branch:
commit 55aefcfe220bcd1ff3f2883cdb5482164619b51a
Author: Simon McVittie <smcv at debian.org>
Date: Thu Sep 20 13:04:05 2012 +0100
New upstream stable release
- remove all patches: all applied upstream
diff --git a/debian/changelog b/debian/changelog
index 136a814..b4bfe4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+telepathy-mission-control-5 (1:5.12.3-1) UNRELEASED; urgency=low
+
+ * New upstream stable release
+ - remove all patches: all applied upstream
+
+ -- Simon McVittie <smcv at debian.org> Thu, 20 Sep 2012 13:03:07 +0100
+
telepathy-mission-control-5 (1:5.12.1-3) unstable; urgency=low
* Add patches from upstream stable release 5.12.2 to fix deletion of
diff --git a/debian/patches/0001-Revert-stop-using-deprecated-tp-glib-functions.patch b/debian/patches/0001-Revert-stop-using-deprecated-tp-glib-functions.patch
deleted file mode 100644
index 97c666d..0000000
--- a/debian/patches/0001-Revert-stop-using-deprecated-tp-glib-functions.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-From: Laurent Bigonville <bigon at bigon.be>
-Date: Tue, 24 Jul 2012 13:40:00 +0200
-Subject: Revert "stop using deprecated tp-glib functions"
-
-This reverts commit 88642511bb9c6f66d2fe4aae1550893eb0d781b2.
----
- src/mcd-channel.c | 26 +++++++-------------------
- src/mcd-connection.c | 24 ++++++++----------------
- src/mcd-manager.c | 14 +++++---------
- 3 files changed, 20 insertions(+), 44 deletions(-)
-
-diff --git a/src/mcd-channel.c b/src/mcd-channel.c
-index 2d6d173..64d12a4 100644
---- a/src/mcd-channel.c
-+++ b/src/mcd-channel.c
-@@ -191,20 +191,11 @@ _mcd_channel_setup_group (McdChannel *channel)
- }
-
- static void
--on_channel_ready (GObject *source_object, GAsyncResult *result, gpointer user_data)
-+on_channel_ready (TpChannel *tp_chan, const GError *error, gpointer user_data)
- {
-- TpChannel *tp_chan = TP_CHANNEL (source_object);
- McdChannel *channel, **channel_ptr = user_data;
- McdChannelPrivate *priv;
- gboolean requested, valid;
-- GError *error = NULL;
--
-- if (!tp_proxy_prepare_finish (tp_chan, result, &error))
-- {
-- DEBUG ("failed to prepare channel: %s", error->message);
-- g_clear_error (&error);
-- return;
-- }
-
- channel = *channel_ptr;
- if (channel)
-@@ -305,7 +296,7 @@ _mcd_channel_setup (McdChannel *channel, McdChannelPrivate *priv)
- channel_ptr = g_slice_alloc (sizeof (McdChannel *));
- *channel_ptr = channel;
- g_object_add_weak_pointer ((GObject *)channel, (gpointer)channel_ptr);
-- tp_proxy_prepare_async (priv->tp_chan, NULL, on_channel_ready, channel_ptr);
-+ tp_channel_call_when_ready (priv->tp_chan, on_channel_ready, channel_ptr);
-
- g_signal_connect (priv->tp_chan, "invalidated",
- G_CALLBACK (proxy_destroyed), channel);
-@@ -1398,21 +1389,18 @@ typedef struct {
- } DepartData;
-
- static void
--mcd_channel_ready_to_depart_cb (GObject *source_object,
-- GAsyncResult *result,
-+mcd_channel_ready_to_depart_cb (TpChannel *channel,
-+ const GError *error,
- gpointer data)
- {
-- TpChannel *channel = TP_CHANNEL (source_object);
- DepartData *d = data;
-- GError *error = NULL;
-
-- if (!tp_proxy_prepare_finish (channel, result, &error))
-+ if (error != NULL)
- {
- DEBUG ("%s %d: %s", g_quark_to_string (error->domain), error->code,
- error->message);
- g_free (d->message);
- g_slice_free (DepartData, d);
-- g_clear_error (&error);
- return;
- }
-
-@@ -1468,8 +1456,8 @@ _mcd_channel_depart (McdChannel *channel,
- d->reason = reason;
- d->message = g_strdup (message);
-
-- tp_proxy_prepare_async (channel->priv->tp_chan, NULL,
-- mcd_channel_ready_to_depart_cb, d);
-+ tp_channel_call_when_ready (channel->priv->tp_chan,
-+ mcd_channel_ready_to_depart_cb, d);
- }
-
- /*
-diff --git a/src/mcd-connection.c b/src/mcd-connection.c
-index d5ac240..40a5952 100644
---- a/src/mcd-connection.c
-+++ b/src/mcd-connection.c
-@@ -1561,25 +1561,21 @@ mcd_connection_setup_pre_requests (McdConnection *connection)
- }
-
- static void
--on_connection_ready (GObject *source_object, GAsyncResult *result,
-- gpointer user_data)
-+on_connection_ready (TpConnection *tp_conn, const GError *error,
-+ gpointer user_data)
- {
-- TpConnection *tp_conn = TP_CONNECTION (source_object);
- McdConnection *connection, **connection_ptr = user_data;
- McdConnectionPrivate *priv;
-- GError *error = NULL;
-
- connection = *connection_ptr;
- if (connection)
- g_object_remove_weak_pointer ((GObject *)connection,
- (gpointer)connection_ptr);
- g_slice_free (McdConnection *, connection_ptr);
--
-- if (!tp_proxy_prepare_finish (tp_conn, result, &error))
-+ if (error)
- {
- DEBUG ("got error: %s", error->message);
-- g_clear_error (&error);
-- return;
-+ return;
- }
-
- if (!connection) return;
-@@ -2292,7 +2288,7 @@ _mcd_connection_request_channel (McdConnection *connection, McdChannel *channel)
- g_return_val_if_fail (priv->tp_conn != NULL, FALSE);
- g_return_val_if_fail (TP_IS_CONNECTION (priv->tp_conn), FALSE);
-
-- if (!tp_proxy_is_prepared (priv->tp_conn, TP_CONNECTION_FEATURE_CONNECTED))
-+ if (!tp_connection_is_ready (priv->tp_conn))
- {
- /* don't request any channel until the connection is ready (because we
- * don't know if the CM implements the Requests interface). The channel
-@@ -2720,10 +2716,6 @@ _mcd_connection_set_tp_connection (McdConnection *connection,
- {
- McdConnection **connection_ptr;
- McdConnectionPrivate *priv;
-- GQuark features[] = {
-- TP_CONNECTION_FEATURE_CONNECTED,
-- 0
-- };
-
- g_return_if_fail (MCD_IS_CONNECTION (connection));
- priv = connection->priv;
-@@ -2771,8 +2763,8 @@ _mcd_connection_set_tp_connection (McdConnection *connection,
- *connection_ptr = connection;
- g_object_add_weak_pointer ((GObject *)connection,
- (gpointer)connection_ptr);
-- tp_proxy_prepare_async (priv->tp_conn, features,
-- on_connection_ready, connection_ptr);
-+ tp_connection_call_when_ready (priv->tp_conn, on_connection_ready,
-+ connection_ptr);
- }
-
- /**
-@@ -2794,7 +2786,7 @@ _mcd_connection_is_ready (McdConnection *self)
- g_return_val_if_fail (MCD_IS_CONNECTION (self), FALSE);
-
- return (self->priv->tp_conn != NULL) &&
-- tp_proxy_is_prepared (self->priv->tp_conn, TP_CONNECTION_FEATURE_CONNECTED);
-+ tp_connection_is_ready (self->priv->tp_conn);
- }
-
- gboolean
-diff --git a/src/mcd-manager.c b/src/mcd-manager.c
-index 1098cc3..d19cfc0 100644
---- a/src/mcd-manager.c
-+++ b/src/mcd-manager.c
-@@ -79,21 +79,16 @@ enum
- static GQuark readiness_quark = 0;
-
- static void
--on_manager_ready (GObject *source_object,
-- GAsyncResult *result, gpointer user_data)
-+on_manager_ready (TpConnectionManager *tp_conn_mgr, const GError *error,
-+ gpointer user_data, GObject *weak_object)
- {
-- TpConnectionManager *tp_conn_mgr = TP_CONNECTION_MANAGER (source_object);
-- McdManager *manager = MCD_MANAGER (user_data);
-+ McdManager *manager = MCD_MANAGER (weak_object);
- McdManagerPrivate *priv;
-- GError *error = NULL;
--
-- tp_proxy_prepare_finish (tp_conn_mgr, result, &error);
-
- priv = manager->priv;
- DEBUG ("manager %s is ready", priv->name);
- priv->ready = TRUE;
- _mcd_object_ready (manager, readiness_quark, error);
-- g_clear_error (&error);
- }
-
- static gint
-@@ -203,7 +198,8 @@ mcd_manager_setup (McdManager *manager)
- goto error;
- }
-
-- tp_proxy_prepare_async (priv->tp_conn_mgr, NULL, on_manager_ready, manager);
-+ tp_connection_manager_call_when_ready (priv->tp_conn_mgr, on_manager_ready,
-+ NULL, NULL, (GObject *)manager);
-
- DEBUG ("Manager %s created", priv->name);
- return TRUE;
diff --git a/debian/patches/0010-Default-account-backend-when-deleting-always-delete-.patch b/debian/patches/0010-Default-account-backend-when-deleting-always-delete-.patch
deleted file mode 100644
index ac81a43..0000000
--- a/debian/patches/0010-Default-account-backend-when-deleting-always-delete-.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Date: Thu, 30 Aug 2012 18:09:21 +0100
-Subject: [PATCH 10/16] Default account backend: when deleting, always delete
- from both places
-
-Our tracking of whether something is "secret" (in the gnome-keyring) is
-pretty shaky, and in particular, we can forget that things are meant
-to be "secret" sometimes (we lose that information when deleting
-parameters).
-
-Happily, when we're deleting things, it doesn't actually matter: the
-right thing to do is clearly to delete from both locations, regardless
-of where we think it ought to be.
-
-Similarly, when we're setting a property to a new value, it's appropriate
-to delete it from both locations, then put it in the right location
-(only).
-
-Signed-off-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Reviewed-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=42088
-Cherry-picked-from: 5b4954d2c959c4ba7f6c67b7d8e16eaa5ab272dd
-Origin: upstream, 5.12.2, commit:dbba880903def15bc7bb5fdb9d05ee310f1a5bfe
----
- src/mcd-account-manager-default.c | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/src/mcd-account-manager-default.c b/src/mcd-account-manager-default.c
-index e156de1..221c5d0 100644
---- a/src/mcd-account-manager-default.c
-+++ b/src/mcd-account-manager-default.c
-@@ -411,6 +411,10 @@ _set (const McpAccountStorage *self,
- /* if we have a keyring, secrets are segregated */
- secret = mcp_account_manager_parameter_is_secret (am, account, key);
-
-+ /* remove it from both sets, then re-add it to the right one if non-null */
-+ g_key_file_remove_key (amd->secrets, account, key, NULL);
-+ g_key_file_remove_key (amd->keyfile, account, key, NULL);
-+
- if (val != NULL)
- {
- if (secret)
-@@ -418,13 +422,6 @@ _set (const McpAccountStorage *self,
- else
- g_key_file_set_value (amd->keyfile, account, key, val);
- }
-- else
-- {
-- if (secret)
-- g_key_file_remove_key (amd->secrets, account, key, NULL);
-- else
-- g_key_file_remove_key (amd->keyfile, account, key, NULL);
-- }
-
- /* if we removed the account before, it now exists again, so... */
- g_hash_table_remove (amd->removed_accounts, account);
-@@ -561,8 +558,10 @@ _delete (const McpAccountStorage *self,
- g_key_file_remove_group (amd->keyfile, account, NULL);
- _delete_from_keyring (self, am, account, NULL);
- }
-- else if (mcp_account_manager_parameter_is_secret (am, account, key))
-+ else
- {
-+ /* always delete from keyring, even if we didn't previously
-+ * think it was secret - we might have been wrong */
- _delete_from_keyring (self, am, account, key);
- }
-
---
-1.7.10.4
-
diff --git a/debian/patches/0011-_keyring_commit-perform-deletions-for-keys-in-remove.patch b/debian/patches/0011-_keyring_commit-perform-deletions-for-keys-in-remove.patch
deleted file mode 100644
index 8117287..0000000
--- a/debian/patches/0011-_keyring_commit-perform-deletions-for-keys-in-remove.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Date: Thu, 30 Aug 2012 16:03:08 +0100
-Subject: [PATCH 11/16] _keyring_commit: perform deletions for keys in
- removed, not in secrets
-
-'removed' is essentially a set of (account, key) tuples that should
-be deleted. What we were doing was:
-
- foreach account in removed
- foreach key in secrets[account]
- delete (account, key)
-
-which makes little sense - if we have param-password and
-param-proxy-password and we want to unset Parameters['password'],
-the current implementation would delete both. This commit changes it to:
-
- foreach account in removed
- foreach key in removed[account]
- delete (account, key)
-
-which has the advantage of actually making sense.
-
-Signed-off-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Reviewed-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=42088
-Cherry-picked-from: d4ca35cffea9d0093e127e0be633501d22ded35f
-Origin: upstream, 5.12.2, commit:efc15381535a2d94eeec2b19651302768f65d0ad
----
- src/mcd-account-manager-default.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mcd-account-manager-default.c b/src/mcd-account-manager-default.c
-index 221c5d0..6989d62 100644
---- a/src/mcd-account-manager-default.c
-+++ b/src/mcd-account-manager-default.c
-@@ -187,7 +187,7 @@ _keyring_commit (const McpAccountStorage *self,
- {
- gsize j;
- gsize k;
-- GStrv keys = g_key_file_get_keys (amd->secrets, accts[i], &k, NULL);
-+ GStrv keys = g_key_file_get_keys (amd->removed, accts[i], &k, NULL);
-
- if (keys == NULL)
- k = 0;
---
-1.7.10.4
-
diff --git a/debian/patches/0012-Default-account-backend-when-deleting-from-the-keyri.patch b/debian/patches/0012-Default-account-backend-when-deleting-from-the-keyri.patch
deleted file mode 100644
index 6e6c8de..0000000
--- a/debian/patches/0012-Default-account-backend-when-deleting-from-the-keyri.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Date: Thu, 30 Aug 2012 18:12:06 +0100
-Subject: [PATCH 12/16] Default account backend: when deleting from the
- keyring, remove from secrets
-
-Otherwise we'd just delete it, then (because it's still in secrets)
-re-commit it!
-
-Signed-off-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Reviewed-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=42088
-Cherry-picked-from: 16e4507c5001f6f45158ef3d0b46998fa8c1ca2a
-Origin: upstream, 5.12.2, commit:bd56ee0e36a681ee50d3e02d4f158bbc5df462f1
----
- src/mcd-account-manager-default.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/mcd-account-manager-default.c b/src/mcd-account-manager-default.c
-index 6989d62..22eb29e 100644
---- a/src/mcd-account-manager-default.c
-+++ b/src/mcd-account-manager-default.c
-@@ -78,11 +78,13 @@ _delete_from_keyring (const McpAccountStorage *self,
- /* flag the whole account as purged */
- gchar *removed = g_strdup (account);
- g_hash_table_replace (amd->removed_accounts, removed, removed);
-+ g_key_file_remove_group (amd->secrets, removed, NULL);
- }
- else
- {
- /* remember to forget this one param */
- g_key_file_set_value (amd->removed, account, key, "");
-+ g_key_file_remove_key (amd->secrets, account, key, NULL);
- }
- }
-
---
-1.7.10.4
-
diff --git a/debian/patches/0013-Default-account-backend-when-deleting-passwords-dele.patch b/debian/patches/0013-Default-account-backend-when-deleting-passwords-dele.patch
deleted file mode 100644
index edd09a9..0000000
--- a/debian/patches/0013-Default-account-backend-when-deleting-passwords-dele.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Date: Thu, 30 Aug 2012 18:50:41 +0100
-Subject: [PATCH 13/16] Default account backend: when deleting passwords,
- delete the same thing we will look for
-
-Deleting secrets with param="param-password" isn't a whole lot of use
-when we save, and look up, param="password".
-
-Signed-off-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Reviewed-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=42088
-Cherry-picked-from: 1d9e8f5cfb9e7b426a99ae6e16c35c1101d55a91
-Origin: upstream, 5.12.2, commit:1ce1e32bc7f83b5dfc3b75407e896c7bd7e6cbdb
----
- src/mcd-account-manager-default.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/mcd-account-manager-default.c b/src/mcd-account-manager-default.c
-index 22eb29e..cd6d019 100644
---- a/src/mcd-account-manager-default.c
-+++ b/src/mcd-account-manager-default.c
-@@ -197,15 +197,21 @@ _keyring_commit (const McpAccountStorage *self,
- for (j = 0; j < k; j++)
- {
- KeyringSetData *ksd = g_slice_new0 (KeyringSetData);
-+ const gchar *key = keys[j];
-+
-+ /* for compatibility with old gnome keyring code we must strip *
-+ * the param- prefix from the name before saving to the keyring */
-+ if (g_str_has_prefix (key, "param-"))
-+ key += strlen ("param-");
-
- ksd->account = g_strdup (accts[i]);
-- ksd->name = g_strdup (keys[j]);
-+ ksd->name = g_strdup (key);
- ksd->set = FALSE;
-
- gnome_keyring_delete_password (&keyring_schema,
- _keyring_set_cb, ksd, NULL,
- "account", accts[i],
-- "param", keys[j],
-+ "param", key,
- NULL);
- }
-
---
-1.7.10.4
-
diff --git a/debian/patches/0014-Migrate-from-Butterfly-to-Haze-even-if-Butterfly-is-.patch b/debian/patches/0014-Migrate-from-Butterfly-to-Haze-even-if-Butterfly-is-.patch
deleted file mode 100644
index 932ea4e..0000000
--- a/debian/patches/0014-Migrate-from-Butterfly-to-Haze-even-if-Butterfly-is-.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Date: Thu, 6 Sep 2012 16:43:19 +0100
-Subject: [PATCH 14/16] Migrate from Butterfly to Haze even if Butterfly is no
- longer installed
-
-Mission Control has a bug/design flaw/whatever in which it doesn't
-know the types of parameters without looking at the corresponding
-connection manager, which doesn't work if that connection manager has
-been uninstalled. This turns out to be bad for the upgrade from
-Debian 6 to Debian 7, which upgrades MC to a version that will
-perform the migration from Butterfly to Haze, but also uninstalls
-Butterfly...
-
-Since we know what the type of 'account' is, with a bit of refactoring
-we can tell McdAccount that we know it's a string, get its value
-anyway, and get on with our lives.
-
-Bug-Debian: http://bugs.debian.org/686835
-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:3ae49c706e93d06131cabf5b4a0421869948ec62
----
- src/mcd-account-manager.c | 4 +++-
- src/mcd-account.c | 18 +++++++++++++++---
- src/mcd-account.h | 6 ++++++
- 3 files changed, 24 insertions(+), 4 deletions(-)
-
-diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
-index 4d93220..a13ba03 100644
---- a/src/mcd-account-manager.c
-+++ b/src/mcd-account-manager.c
-@@ -1222,7 +1222,9 @@ migrate_butterfly_haze_ready (McdManager *manager,
- }
-
- /* Parameters; we just care about 'account' */
-- if (!mcd_account_get_parameter (ctx->account, "account", &v, NULL))
-+ if (!mcd_account_get_parameter_of_known_type (ctx->account,
-+ "account", G_TYPE_STRING,
-+ &v, NULL))
- {
- _mcd_account_set_enabled (ctx->account, FALSE, TRUE, NULL);
- goto error;
-diff --git a/src/mcd-account.c b/src/mcd-account.c
-index 192d8d9..1864e7d 100644
---- a/src/mcd-account.c
-+++ b/src/mcd-account.c
-@@ -429,16 +429,28 @@ mcd_account_get_parameter (McdAccount *account, const gchar *name,
- GError **error)
- {
- McdAccountPrivate *priv = account->priv;
-- McdStorage *storage = priv->storage;
-- gchar key[MAX_KEY_LENGTH];
- const TpConnectionManagerParam *param;
- GType type;
-- const gchar *account_name = mcd_account_get_unique_name (account);
-
- param = mcd_manager_get_protocol_param (priv->manager,
- priv->protocol_name, name);
- type = mc_param_type (param);
-
-+ return mcd_account_get_parameter_of_known_type (account, name,
-+ type, parameter, error);
-+}
-+
-+gboolean
-+mcd_account_get_parameter_of_known_type (McdAccount *account,
-+ const gchar *name,
-+ GType type,
-+ GValue *parameter,
-+ GError **error)
-+{
-+ const gchar *account_name = mcd_account_get_unique_name (account);
-+ McdStorage *storage = account->priv->storage;
-+ gchar key[MAX_KEY_LENGTH];
-+
- g_snprintf (key, sizeof (key), "param-%s", name);
-
- if (mcd_storage_has_value (storage, account_name, key))
-diff --git a/src/mcd-account.h b/src/mcd-account.h
-index 6b0dd60..90e429a 100644
---- a/src/mcd-account.h
-+++ b/src/mcd-account.h
-@@ -148,6 +148,12 @@ gboolean mcd_account_get_parameter (McdAccount *account, const gchar *name,
- GValue *parameter,
- GError **error);
-
-+gboolean mcd_account_get_parameter_of_known_type (McdAccount *account,
-+ const gchar *name,
-+ GType type,
-+ GValue *parameter,
-+ GError **error);
-+
- gchar * mcd_account_dup_icon (McdAccount *self);
-
- gchar * mcd_account_dup_nickname (McdAccount *self);
---
-1.7.10.4
-
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
deleted file mode 100644
index c6d42be..0000000
--- a/debian/patches/0015-Butterfly-account-migration-migrate-the-password-too.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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 5473c2a..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +0,0 @@
-0001-Revert-stop-using-deprecated-tp-glib-functions.patch
-0010-Default-account-backend-when-deleting-always-delete-.patch
-0011-_keyring_commit-perform-deletions-for-keys-in-remove.patch
-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
More information about the Pkg-telepathy-commits
mailing list