diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-03 17:02:08 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-07 17:01:59 +0100 |
| commit | 81d463219433e18b2c34ed19a1faf50642f0aa05 (patch) | |
| tree | f41ddbb12c6a259f78bb05ddcfa4870b1fcb4961 | |
| parent | 7b36d5a69e0ddc3fa06060d84635cc33fc9a72d2 (diff) | |
Rewrite the protocol name for local-xmpp accounts created by Telepathy1next-local-xmpp
| -rw-r--r-- | src/mcd-account.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/mcd-account.c b/src/mcd-account.c index 86524127..7cc779d7 100644 --- a/src/mcd-account.c +++ b/src/mcd-account.c @@ -2976,6 +2976,18 @@ mcd_account_setup (McdAccount *account) goto broken_account; } + /* Be compatible with accounts loaded from Telepathy0 - + * silently translate local-xmpp into local_xmpp, etc. */ + if (strchr (priv->protocol_name, '-') != NULL) + { + g_strdelimit (priv->protocol_name, "-", '_'); + + if (!mcd_storage_set_string (storage, name, MC_ACCOUNTS_KEY_PROTOCOL, + priv->protocol_name)) + WARNING ("Unable to write modified protocol name '%s' back", + priv->protocol_name); + } + priv->object_path = g_strconcat (TP_ACCOUNT_OBJECT_PATH_BASE, name, NULL); priv->enabled = mcd_storage_get_boolean (storage, name, |