[Gaim-commits] SF.net SVN: gaim: [16498] branches/soc-2006-file-loggers/src

[<ro...@us...>]

Revision: 16498
Author:   roast
Date:     2006-07-16 19:58:46 -0700 (Sun, 16 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16498&view=rev

Log Message:
-----------
added buzz message-type logging support into Yahoo and MSN

Modified Paths:
--------------
    branches/soc-2006-file-loggers/plugins/ChangeLog.API
    branches/soc-2006-file-loggers/src/conversation.h
    branches/soc-2006-file-loggers/src/log.c
    branches/soc-2006-file-loggers/src/protocols/msn/msn.c
    branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo.c
Modified: branches/soc-2006-file-loggers/plugins/ChangeLog.API
===================================================================
--- branches/soc-2006-file-loggers/plugins/ChangeLog.API	2006-07-16 19:09:06 UTC (rev 16497)
+++ branches/soc-2006-file-loggers/plugins/ChangeLog.API	2006-07-17 02:58:46 UTC (rev 16498)
@@ -291,6 +291,7 @@
 	* gaim_proxy_get_setup()
 	* GaimNotifySearchResultsCallback: Added user_data.
 	* gaim_notify_searchresults: Added user_data.
+	* GAIM_MESSAGE_BELL, for pokes, nudges, and buzzes (and bells)
 
 	Signals - Changed:  (See the Doxygen docs for details on all signals.)
 	* Signal propagation now stops after a handler returns a non-NULL value.

Modified: branches/soc-2006-file-loggers/src/conversation.h
===================================================================
--- branches/soc-2006-file-loggers/src/conversation.h	2006-07-16 19:09:06 UTC (rev 16497)
+++ branches/soc-2006-file-loggers/src/conversation.h	2006-07-17 02:58:46 UTC (rev 16498)
@@ -115,7 +115,8 @@
 	GAIM_MESSAGE_DELAYED     = 0x0400, /**< Delayed message.         */
 	GAIM_MESSAGE_RAW         = 0x0800, /**< "Raw" message - don't
 	                                        apply formatting         */
-	GAIM_MESSAGE_IMAGES      = 0x1000  /**< Message contains images  */
+	GAIM_MESSAGE_IMAGES      = 0x1000, /**< Message contains images  */
+	GAIM_MESSAGE_BELL        = 0x2000  /**< Bell/Poke/Nudge message  */
 
 } GaimMessageFlags;
 

Modified: branches/soc-2006-file-loggers/src/log.c
===================================================================
--- branches/soc-2006-file-loggers/src/log.c	2006-07-16 19:09:06 UTC (rev 16497)
+++ branches/soc-2006-file-loggers/src/log.c	2006-07-17 02:58:46 UTC (rev 16498)
@@ -1068,6 +1068,9 @@
 	else if (type & GAIM_MESSAGE_WHISPER) {
 		g_string_printf(writebuf, "\t<message time=\"%s\" sender=\"%s\" gaim:type=\"whisper\">%s</message>\n", date, from, msg_fixed);
 	}
+	else if (type & GAIM_MESSAGE_BELL) {
+		g_string_printf(writebuf, "\t<message time=\"%s\" sender=\"%s\" gaim:type=\"bell\">%s</message>\n", date, from, msg_fixed);
+	}
 	else if (type & GAIM_MESSAGE_AUTO_RESP && (type & GAIM_MESSAGE_SEND || type & GAIM_MESSAGE_RECV)) {
 		gboolean recv_from_self = FALSE;
 		if (type & GAIM_MESSAGE_RECV) {

Modified: branches/soc-2006-file-loggers/src/protocols/msn/msn.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/msn/msn.c	2006-07-16 19:09:06 UTC (rev 16497)
+++ branches/soc-2006-file-loggers/src/protocols/msn/msn.c	2006-07-17 02:58:46 UTC (rev 16498)
@@ -110,7 +110,7 @@
 
 	msn_switchboard_send_msg(swboard, msg, TRUE);
 
-	gaim_conversation_write(conv, NULL, _("You have just sent a Nudge!"), GAIM_MESSAGE_SYSTEM, time(NULL));
+	gaim_conversation_write(conv, NULL, _("You have just sent a Nudge!"), GAIM_MESSAGE_SYSTEM|GAIM_MESSAGE_BELL, time(NULL));
 
 	return GAIM_CMD_RET_OK;
 }

Modified: branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo.c	2006-07-16 19:09:06 UTC (rev 16497)
+++ branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo.c	2006-07-17 02:58:46 UTC (rev 16498)
@@ -767,7 +767,7 @@
 		if (!strcmp(m, "<ding>")) {
 			GaimConversation *c = gaim_conversation_new(GAIM_CONV_TYPE_IM,
 			                                            gaim_connection_get_account(gc), im->from);
-			gaim_conv_im_write(GAIM_CONV_IM(c), "", _("Buzz!!"), GAIM_MESSAGE_NICK|GAIM_MESSAGE_RECV,
+			gaim_conv_im_write(GAIM_CONV_IM(c), "", _("Buzz!!"), GAIM_MESSAGE_NICK|GAIM_MESSAGE_RECV|GAIM_MESSAGE_BELL,
 			                   im->time);
 			g_free(m);
 			g_free(im);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.