From: Ethan B. <ebl...@us...> - 2003-08-20 01:43:25
|
Update of /cvsroot/gaim/gaim/plugins In directory sc8-pr-cvs1:/tmp/cvs-serv14301/plugins Modified Files: signals-test.c Log Message: This changes the sending and receiving signals to use GaimAccounts and recipient/sender usernames rather than GaimConversations. The display* signals aren't changed yet because I'm not sure I fully grok them. Index: signals-test.c =================================================================== RCS file: /cvsroot/gaim/gaim/plugins/signals-test.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- signals-test.c 18 Aug 2003 15:42:55 -0000 1.3 +++ signals-test.c 19 Aug 2003 23:52:06 -0000 1.4 @@ -175,31 +175,32 @@ } static gboolean -sending_im_msg_cb(GaimConversation *conv, char **buffer, void *data) +sending_im_msg_cb(GaimAccount *account, char *recipient, char **buffer, void *data) { gaim_debug(GAIM_DEBUG_MISC, "signals test", - "sending-im-msg (%s, %s)\n", - gaim_conversation_get_name(conv), *buffer); + "sending-im-msg (%s, %s, %s)\n", + gaim_account_get_username(account), recipient, + *buffer); return FALSE; } static void -sent_im_msg_cb(GaimConversation *conv, const char *buffer, void *data) +sent_im_msg_cb(GaimAccount *account, const char *recipient, const char *buffer, void *data) { gaim_debug(GAIM_DEBUG_MISC, "signals test", - "sent-im-msg (%s, %s)\n", - gaim_conversation_get_name(conv), buffer); + "sent-im-msg (%s, %s, %s)\n", + gaim_account_get_username(account), + recipient, buffer); } static gboolean -received_im_msg_cb(GaimAccount *account, GaimConversation *conv, - char **sender, char **buffer, int *flags, void *data) +received_im_msg_cb(GaimAccount *account, char **sender, char **buffer, + int *flags, void *data) { gaim_debug(GAIM_DEBUG_MISC, "signals test", - "received-im-msg (%s, %s, %s, %s, %d)\n", - gaim_account_get_username(account), - gaim_conversation_get_name(conv), *sender, *buffer, *flags); + "received-im-msg (%s, %s, %s, %d)\n", + gaim_account_get_username(account), *sender, *buffer, *flags); return FALSE; } @@ -223,31 +224,30 @@ } static gboolean -sending_chat_msg_cb(GaimConversation *conv, char **buffer, void *data) +sending_chat_msg_cb(GaimAccount *account, char **buffer, int id, void *data) { gaim_debug(GAIM_DEBUG_MISC, "signals test", - "sending-chat-msg (%s, %s)\n", - gaim_conversation_get_name(conv), *buffer); + "sending-chat-msg (%s, %s, %d)\n", + gaim_account_get_username(account), *buffer, id); return FALSE; } static void -sent_chat_msg_cb(GaimConversation *conv, const char *buffer, void *data) +sent_chat_msg_cb(GaimAccount *account, const char *buffer, int id, void *data) { gaim_debug(GAIM_DEBUG_MISC, "signals test", - "sent-chat-msg (%s, %s)\n", - gaim_conversation_get_name(conv), buffer); + "sent-chat-msg (%s, %s, %d)\n", + gaim_account_get_username(account), buffer, id); } static gboolean -received_chat_msg_cb(GaimAccount *account, GaimConversation *conv, - char **sender, char **buffer, void *data) +received_chat_msg_cb(GaimAccount *account, char **sender, char **buffer, + int id, void *data) { gaim_debug(GAIM_DEBUG_MISC, "signals test", - "received-chat-msg (%s, %s, %s, %s)\n", - gaim_account_get_username(account), - gaim_conversation_get_name(conv), *sender, *buffer); + "received-chat-msg (%s, %s, %s, %s, %d)\n", + gaim_account_get_username(account), *sender, *buffer, id); return FALSE; } |