Index: zephyr.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/zephyr/zephyr.c,v
retrieving revision 1.122
diff -u -u -r1.122 zephyr.c
--- zephyr.c	31 Aug 2004 01:45:12 -0000	1.122
+++ zephyr.c	31 Aug 2004 18:05:57 -0000
@@ -2181,10 +2184,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; */