diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-19 20:08:03 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-19 20:08:03 +0000 |
| commit | be1a06ec2ebf766bdaa749e7398f23ce99f0cf1f (patch) | |
| tree | 32ac41a76ede1212931b22847e05b8a4de15dfff | |
| parent | 15cbd7eae31c0eaea1694f06779922c3b3e61e09 (diff) | |
| parent | c3360149900435d895d68dbce38ff315e700d26d (diff) | |
Merge branch 'master' into next
Conflicts:
configure.ac
| m--------- | lib/ext/wocky | 0 | ||||
| -rw-r--r-- | src/protocol.c | 5 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/ext/wocky b/lib/ext/wocky -Subproject 01fbaec365cc58d6f3de46ce3f54f6413f3ec0f +Subproject c5932733128be4bfb1d5b0ce9be5b136746266d diff --git a/src/protocol.c b/src/protocol.c index 988b97a36..fd740e5bd 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -174,6 +174,9 @@ static TpCMParamSpec jabber_params[] = { { "extra-certificate-identities", "as", 0, 0, NULL, 0 /* unused */, NULL, NULL }, + { "account-path-suffix", "s", G_TYPE_STRING, + 0, NULL, 0 /* unused */, NULL, NULL }, + { NULL, NULL, 0, 0, NULL, 0 } }; @@ -268,6 +271,8 @@ new_connection (TpBaseProtocol *protocol, conn = g_object_new (GABBLE_TYPE_CONNECTION, "protocol", PROTOCOL_NAME, "password", tp_asv_get_string (params, "password"), + "account-path-suffix", tp_asv_get_string (params, + "account-path-suffix"), NULL); /* split up account into username, stream-server and resource */ |