Mercurial > pidgin.yaz
changeset 23156:b17d6defb922
merge of '1845c83f173f8fb02f105f4b7ef8768b0a11961e'
and '5925c76b273bcb15108005a602791eb3e7bd0dda'
| author | Etan Reisner <pidgin@unreliablesource.net> |
|---|---|
| date | Fri, 16 May 2008 03:18:20 +0000 |
| parents | 7dccb11c5f1d (current diff) caa533b62902 (diff) |
| children | bc58e2d9f0f5 |
| files | |
| diffstat | 8 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/gg/gg.c Fri May 16 00:55:53 2008 +0000 +++ b/libpurple/protocols/gg/gg.c Fri May 16 03:18:20 2008 +0000 @@ -1998,7 +1998,7 @@ 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; }
--- a/libpurple/protocols/irc/irc.c Fri May 16 00:55:53 2008 +0000 +++ b/libpurple/protocols/irc/irc.c Fri May 16 03:18:20 2008 +0000 @@ -733,7 +733,7 @@ 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; }
--- a/libpurple/protocols/msn/msn.c Fri May 16 00:55:53 2008 +0000 +++ b/libpurple/protocols/msn/msn.c Fri May 16 03:18:20 2008 +0000 @@ -1551,7 +1551,7 @@ 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;
--- a/libpurple/protocols/msnp9/msn.c Fri May 16 00:55:53 2008 +0000 +++ b/libpurple/protocols/msnp9/msn.c Fri May 16 03:18:20 2008 +0000 @@ -1392,7 +1392,7 @@ 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;
--- a/libpurple/protocols/novell/novell.c Fri May 16 00:55:53 2008 +0000 +++ b/libpurple/protocols/novell/novell.c Fri May 16 03:18:20 2008 +0000 @@ -2506,7 +2506,7 @@ } } - 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;
--- a/libpurple/protocols/silc/chat.c Fri May 16 00:55:53 2008 +0000 +++ b/libpurple/protocols/silc/chat.c Fri May 16 03:18:20 2008 +0000 @@ -1315,7 +1315,7 @@ 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 @@ (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);
--- a/libpurple/protocols/silc10/chat.c Fri May 16 00:55:53 2008 +0000 +++ b/libpurple/protocols/silc10/chat.c Fri May 16 03:18:20 2008 +0000 @@ -1351,7 +1351,7 @@ 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);
--- a/libpurple/protocols/yahoo/yahoochat.c Fri May 16 00:55:53 2008 +0000 +++ b/libpurple/protocols/yahoo/yahoochat.c Fri May 16 03:18:20 2008 +0000 @@ -1043,7 +1043,7 @@ 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; }