Mercurial > pidgin
changeset 9922:b03884f4eda6
[gaim-migrate @ 10814]
(14:09:40) aatharuv: LSchiere2: could you look at
http://www.mit.edu/~aatharuv/gaim/zephyr.diff.getchatname (It outputs the
right chatname and should apply even with nosnilmot's recent patch
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Tue, 31 Aug 2004 18:12:27 +0000 |
| parents | b76915608068 |
| children | 248c3f88ce99 |
| files | src/protocols/zephyr/zephyr.c |
| diffstat | 1 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/zephyr/zephyr.c Tue Aug 31 18:01:58 2004 +0000 +++ b/src/protocols/zephyr/zephyr.c Tue Aug 31 18:12:27 2004 +0000 @@ -2181,10 +2181,19 @@ } static char *zephyr_get_chat_name(GHashTable *data) { - /** XXX someone who uses zephyr should verify this */ - return g_strdup(g_hash_table_lookup(data, "recipient")); + gchar* zclass = g_hash_table_lookup(data,"class"); + gchar* inst = g_hash_table_lookup(data,"instance"); + gchar* recipient = g_hash_table_lookup(data, "recipient"); + if (!zclass) /* This should never happen */ + zclass = ""; + if (!inst) + inst = "*"; + if (!recipient) + recipient = ""; + return g_strdup_printf("%s,%s,%s",zclass,inst,recipient); } + static void zephyr_join_chat(GaimConnection * gc, GHashTable * data) { /* ZSubscription_t sub; */