Mercurial > pidgin
diff src/conversation.c @ 12850:49b2347863b2
[gaim-migrate @ 15200]
SF Patch #1403151 from charkins
"This patch prevents two cases for "sonic avalanche" in
the sound code. The first is to only play sounds in
response to the chat-buddy-joined signal when the
new_arrival flag is set."
"The second case has to do with jabber pre-filling chat
history when a chat is joined. The GAIM_MESSAGE_DELAYED
flag is used on these messages, so sound are not played
when this flag is set on received messages."
"I also fixed sound_playing_event_cb() in
signals-test.c which was assuming account!=NULL, which
in turn was throwing an assertion error when
gaim_account_get_username() was called."
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Thu, 12 Jan 2006 06:59:39 +0000 |
| parents | 12b23eaa4911 |
| children | 3612e3e5dc3d |
line wrap: on
line diff
--- a/src/conversation.c Thu Jan 12 06:44:23 2006 +0000 +++ b/src/conversation.c Thu Jan 12 06:59:39 2006 +0000 @@ -1520,7 +1520,7 @@ } gaim_signal_emit(gaim_conversations_get_handle(), - "chat-buddy-joined", conv, user, flags); + "chat-buddy-joined", conv, user, flags, new_arrivals); ul = ul->next; fl = fl->next; if (extra_msgs != NULL) @@ -2154,11 +2154,12 @@ gaim_value_new(GAIM_TYPE_UINT)); gaim_signal_register(handle, "chat-buddy-joined", - gaim_marshal_VOID__POINTER_POINTER_UINT, NULL, 3, + gaim_marshal_VOID__POINTER_POINTER_UINT_UINT, NULL, 4, gaim_value_new(GAIM_TYPE_SUBTYPE, GAIM_SUBTYPE_CONVERSATION), gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_UINT)); + gaim_value_new(GAIM_TYPE_UINT), + gaim_value_new(GAIM_TYPE_BOOLEAN)); gaim_signal_register(handle, "chat-buddy-flags", gaim_marshal_VOID__POINTER_POINTER_UINT_UINT, NULL, 4,