pidgin.next.minor: 5925c76b: When calling serv_got_chat_in() after se...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 5925c76b273bcb15108005a602791eb3e7bd0dda
Ancestor: f01a8a459beecb889ec21a8a33ebd0cd153d3e39
Author: evands at pidgin.im
Date: 2008-05-14T23:36:37
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/5925c76b273bcb15108005a602791eb3e7bd0dda

Modified files:
        libpurple/protocols/gg/gg.c libpurple/protocols/irc/irc.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/silc/chat.c
        libpurple/protocols/silc10/chat.c
        libpurple/protocols/yahoo/yahoochat.c

ChangeLog: 

When calling serv_got_chat_in() after sending a group chat message (to let
the core know that it was sent, since unlike sending an IM conversation 
message it is not immedately written out to the conversation by
common_send()), pass back the flags initially sent to the prpl. This maintains
the PURPLE_MESSAGE_SEND flag as well as anything else which might be
helpful to the UI, such as PURPLE_MESSAGE_IMAGES.

-------------- next part --------------
============================================================
--- libpurple/protocols/gg/gg.c	2944ce2bf9dbf0b072a57eca9333c2ae4f3ddd37
+++ libpurple/protocols/gg/gg.c	68d4677562e5e8ffe30847a35628a781ccbdf21e
@@ -1998,7 +1998,7 @@ static int ggp_chat_send(PurpleConnectio
 
 	serv_got_chat_in(gc, id,
 			 purple_account_get_username(purple_connection_get_account(gc)),
-			 0, message, time(NULL));
+			 flags, message, time(NULL));
 
 	return 0;
 }
============================================================
--- libpurple/protocols/irc/irc.c	732b4b16ee047cf87887690d45dce55f6325bab2
+++ libpurple/protocols/irc/irc.c	558207fa69b562614f8544933c4630d8500225db
@@ -733,7 +733,7 @@ static int irc_chat_send(PurpleConnectio
 
 	irc_cmd_privmsg(irc, "msg", NULL, args);
 
-	serv_got_chat_in(gc, id, purple_connection_get_display_name(gc), 0, what, time(NULL));
+	serv_got_chat_in(gc, id, purple_connection_get_display_name(gc), flags, what, time(NULL));
 	g_free(tmp);
 	return 0;
 }
============================================================
--- libpurple/protocols/msn/msn.c	3487c50797f9d4a375c5b90777f39c8e55614bea
+++ libpurple/protocols/msn/msn.c	32674ec4d2a2549401071a0b9c489abf5ba01931
@@ -1551,7 +1551,7 @@ msn_chat_send(PurpleConnection *gc, int 
 	g_free(msgformat);
 	g_free(msgtext);
 
-	serv_got_chat_in(gc, id, purple_account_get_username(account), 0,
+	serv_got_chat_in(gc, id, purple_account_get_username(account), flags,
 					 message, time(NULL));
 
 	return 0;
============================================================
--- libpurple/protocols/msnp9/msn.c	ac84e0513fa832df1e4863330aac0c6bdd98b64d
+++ libpurple/protocols/msnp9/msn.c	cab3422fbad8816550b077a2507912548723be7b
@@ -1392,7 +1392,7 @@ msn_chat_send(PurpleConnection *gc, int 
 	g_free(msgformat);
 	g_free(msgtext);
 
-	serv_got_chat_in(gc, id, purple_account_get_username(account), 0,
+	serv_got_chat_in(gc, id, purple_account_get_username(account), flags,
 					 message, time(NULL));
 
 	return 0;
============================================================
--- libpurple/protocols/novell/novell.c	5c56264a340ff8f1604c32aff7f2224a25a5578a
+++ libpurple/protocols/novell/novell.c	d6063e2f4e847e79338414c8be2767d44bdf2ccc
@@ -2506,7 +2506,7 @@ novell_chat_send(PurpleConnection * gc, 
 						}
 					}
 
-					serv_got_chat_in(gc, id, name, 0, text, time(NULL));
+					serv_got_chat_in(gc, id, name, flags, text, time(NULL));
 					return 0;
 				} else
 					return -1;
============================================================
--- libpurple/protocols/silc/chat.c	887b15c0645ce16bcd0bf37aba919f6228dd97fc
+++ libpurple/protocols/silc/chat.c	749446bb892a607589f50093346156b207802e04
@@ -1315,7 +1315,7 @@ int silcpurple_chat_send(PurpleConnectio
 			g_free(tmp);
 
 			if (ret)
-				  serv_got_chat_in(gc, id, purple_connection_get_display_name(gc), 0, msg, time(NULL));
+				  serv_got_chat_in(gc, id, purple_connection_get_display_name(gc), msgflags, msg, time(NULL));
 			return ret;
 		}
 	}
@@ -1326,7 +1326,7 @@ int silcpurple_chat_send(PurpleConnectio
 					       (unsigned char *)msg2,
 					       strlen(msg2));
 	if (ret) {
-		serv_got_chat_in(gc, id, purple_connection_get_display_name(gc), 0, msg,
+		serv_got_chat_in(gc, id, purple_connection_get_display_name(gc), msgflags, msg,
 				 time(NULL));
 	}
 	g_free(tmp);
============================================================
--- libpurple/protocols/silc10/chat.c	9f3d442d7c142e237ea46c41977ad8873b1de7a5
+++ libpurple/protocols/silc10/chat.c	101c56a3b5222fc6f7ef38e652031de38f052cfe
@@ -1351,7 +1351,7 @@ int silcpurple_chat_send(PurpleConnectio
 					       flags, (unsigned char *)msg2,
 					       strlen(msg2), TRUE);
 	if (ret) {
-		serv_got_chat_in(gc, id, purple_connection_get_display_name(gc), 0, msg,
+		serv_got_chat_in(gc, id, purple_connection_get_display_name(gc), msgflags, msg,
 				 time(NULL));
 	}
 	g_free(tmp);
============================================================
--- libpurple/protocols/yahoo/yahoochat.c	e751ba4d1c8637a239f8f0a18413214cc69133fe
+++ libpurple/protocols/yahoo/yahoochat.c	95a42a96af02fb94b109a493602c8be7ed44a919
@@ -1043,7 +1043,7 @@ int yahoo_c_send(PurpleConnection *gc, i
 						purple_conversation_get_name(c), what, flags);
 		if (!ret)
 			serv_got_chat_in(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(c)),
-					purple_connection_get_display_name(gc), 0, what, time(NULL));
+					purple_connection_get_display_name(gc), flags, what, time(NULL));
 	}
 	return ret;
 }