[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.618,1.619

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2788/src/protocols/oscar

Modified Files:
	oscar.c 
Log Message:
" This patch adds chat user status icons (voice / halfop
/ op / founder) to chats

There's a screenshot here, showing ops, voices and
ignored ops and voices
http://nosnilmot.com/gaim/chatusers.png

This required some changes in how the core stores the
list of users in chats to be able to store the status
too, which are detailed below.

I also fixed up some memory leaks as I came across them
(string values returned by gtk_tree_model_get() not
being g_free()'d) and a minor bug in signals-test.c

Conversation API:

Changed:
gaim_conv_chat_add_user() (added flags parameter)
gaim_conv_chat_add_users() now (added GList of flags
parameter)
gaim_conv_chat_get_users() now returns a GList of
GaimChatBuddy's
gaim_conv_chat_set_users() now expects a GList of
GaimChatBuddy's

Added:
gaim_conv_chat_set_user_flags()
gaim_conv_chat_get_user_flags()
gaim_conv_chat_find_user()
gaim_conv_chat_cb_new()
gaim_conv_chat_cb_find()
gaim_conv_chat_cb_destroy()
gaim_conv_chat_cb_get_name()

Conversation UI ops:

added: chat_update_user()

Signals:

Changed: chat-buddy-joining & chat-buddy-joined now
include the user's flags
Added: chat-buddy-flags for when user's flags change
Added:
gaim_marshal_VOID__POINTER_POINTER_POINTER_UINT_UINT
(required for the new chat-buddy-flags signal)

Protocol Plugins:
All updated to work with above changes (obviously)

User flags support added to IRC, Jabber and SILC

New Files:
pixmaps/status/default/ voice.svg halfop.svg op.svg
founder.svg
" --Stu Tomlinson 


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.618
retrieving revision 1.619
diff -u -d -p -r1.618 -r1.619
--- oscar.c	16 Jul 2004 02:34:32 -0000	1.618
+++ oscar.c	17 Jul 2004 18:11:11 -0000	1.619
@@ -4189,7 +4189,7 @@ static int gaim_conv_chat_join(aim_sessi
 		return 1;
 
 	for (i = 0; i < count; i++)
-		gaim_conv_chat_add_user(GAIM_CONV_CHAT(c->conv), info[i].sn, NULL);
+		gaim_conv_chat_add_user(GAIM_CONV_CHAT(c->conv), info[i].sn, NULL, GAIM_CBFLAGS_NONE);
 
 	return 1;
 }