Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory sc8-pr-cvs1:/tmp/cvs-serv24388/src/protocols/jabber
Modified Files:
presence.c
Log Message:
and an error message about joining a chat, when you've been in that chat all day is pretty dumb.
Index: presence.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/presence.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -p -r1.15 -r1.16
--- presence.c 23 Oct 2003 21:44:50 -0000 1.15
+++ presence.c 23 Oct 2003 21:56:16 -0000 1.16
@@ -254,17 +254,22 @@ void jabber_presence_parse(JabberStream
if(!code)
code = "";
- if(!text)
- text = g_strdup(_("Unable to join chat"));
- buf = g_strdup_printf("Error %s joining chat %s: %s",
- code, from, text);
+ if(chat->conv) {
+ if(!text)
+ text = g_strdup(_("Unknown error"));
+ buf = g_strdup_printf("Error %s in chat %s: %s",
+ code, from, text);
+ serv_got_chat_left(js->gc, chat->id);
+ } else {
+ if(!text)
+ text = g_strdup(_("Unable to join chat"));
+ buf = g_strdup_printf("Error %s joining chat %s: %s",
+ code, from, text);
+ }
gaim_notify_error(js->gc, _("Error"), _("Error"), buf);
g_free(text);
g_free(buf);
-
- if(chat->conv)
- serv_got_chat_left(js->gc, chat->id);
jabber_chat_destroy(chat);
jabber_id_free(jid);
|
