From: Nathan W. <fac...@us...> - 2003-10-31 06:53:15
|
Update of /cvsroot/gaim/gaim/src/protocols/jabber In directory sc8-pr-cvs1:/tmp/cvs-serv17202/src/protocols/jabber Modified Files: chat.c chat.h jabber.c Log Message: there isn't really whispering in jabber chats Index: chat.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/chat.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -p -r1.9 -r1.10 --- chat.c 31 Oct 2003 05:14:27 -0000 1.9 +++ chat.c 31 Oct 2003 06:53:11 -0000 1.10 @@ -138,22 +138,6 @@ void jabber_chat_invite(GaimConnection * g_free(room_jid); } -void jabber_chat_whisper(GaimConnection *gc, int id, const char *who, - const char *message) -{ - JabberStream *js = gc->proto_data; - JabberChat *chat; - char *full_jid; - - chat = jabber_chat_find_by_id(js, id); - - full_jid = g_strdup_printf("%s@%s/%s", chat->room, chat->server, who); - - jabber_message_send_im(gc, full_jid, message, 0); - - g_free(full_jid); -} - void jabber_chat_join(GaimConnection *gc, GHashTable *data) { JabberChat *chat; Index: chat.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/chat.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -p -r1.3 -r1.4 --- chat.h 31 Oct 2003 05:14:27 -0000 1.3 +++ chat.h 31 Oct 2003 06:53:11 -0000 1.4 @@ -47,8 +47,6 @@ JabberChat *jabber_chat_find(JabberStrea JabberChat *jabber_chat_find_by_id(JabberStream *js, int id); void jabber_chat_destroy(JabberChat *chat); gboolean jabber_chat_find_buddy(GaimConversation *conv, const char *name); -void jabber_chat_whisper(GaimConnection *gc, int id, const char *who, - const char *message); void jabber_chat_invite(GaimConnection *gc, int id, const char *message, const char *name); void jabber_chat_leave(GaimConnection *gc, int id); Index: jabber.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v retrieving revision 1.209 retrieving revision 1.210 diff -u -d -p -r1.209 -r1.210 --- jabber.c 31 Oct 2003 05:14:27 -0000 1.209 +++ jabber.c 31 Oct 2003 06:53:11 -0000 1.210 @@ -1075,7 +1075,7 @@ static GaimPluginProtocolInfo prpl_info jabber_chat_join, jabber_chat_invite, jabber_chat_leave, - jabber_chat_whisper, + NULL, jabber_message_send_chat, jabber_keepalive, jabber_register_account, |