comparison mcabber/src/jabglue.c @ 643:dd73c3dad815

Fix double UTF-8 encoding when joining a room
author Mikael Berthe <mikael@lilotux.net>
date Mon, 02 Jan 2006 22:07:15 +0100
parents ebbe3845b46b
children 68fb0c1dfb15
comparison
equal deleted inserted replaced
642:ebbe3845b46b 643:dd73c3dad815
573 573
574 // Join a MUC room 574 // Join a MUC room
575 void jb_room_join(const char *room, const char *nickname) 575 void jb_room_join(const char *room, const char *nickname)
576 { 576 {
577 xmlnode x, y; 577 xmlnode x, y;
578 gchar *roomid, *utf8_nickname; 578 gchar *roomid;
579 579
580 if (!online || !room) return; 580 if (!online || !room) return;
581 if (!nickname) return; 581 if (!nickname) return;
582 582
583 utf8_nickname = to_utf8(nickname); 583 roomid = g_strdup_printf("%s/%s", room, nickname);
584 roomid = g_strdup_printf("%s/%s", room, utf8_nickname);
585 g_free(utf8_nickname);
586 if (check_jid_syntax(roomid)) { 584 if (check_jid_syntax(roomid)) {
587 scr_LogPrint(LPRINT_NORMAL, "<%s/%s> is not a valid Jabber room", room, 585 scr_LogPrint(LPRINT_NORMAL, "<%s/%s> is not a valid Jabber room", room,
588 nickname); 586 nickname);
589 g_free(roomid); 587 g_free(roomid);
590 return; 588 return;