# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1093975947 0
# Node ID b03884f4eda6f63037aa712ed77f4043bd7878cb
# Parent  b76915608068a94ddef8b6b2e1ded9ae6bd8caed
[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>

diff -r b76915608068 -r b03884f4eda6 src/protocols/zephyr/zephyr.c
--- 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; */