Mercurial > pidgin.yaz
changeset 6444:601c2a52d74a
[gaim-migrate @ 6953]
Some buddy pounce fixes from Kevin Stange. He says, "GAIM_TYPED = typing
stopped event, GAIM_TYPING = typing started event (before it was GAIM_TYPED
& GAIM_TYPING both were typing started). this also makes pounce sounds work
(pounce file string error) and the start-typing event is now maintained
when the pounce file is read on startup. that last one was another mistake
with a string value in the pounces.xml file"
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Wed, 13 Aug 2003 06:05:03 +0000 |
| parents | 9e87b873df72 |
| children | 1bd8afb82282 |
| files | src/gtkpounce.c src/pounce.c src/server.c |
| diffstat | 3 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkpounce.c Tue Aug 12 23:32:00 2003 +0000 +++ b/src/gtkpounce.c Wed Aug 13 06:05:03 2003 +0000 @@ -895,7 +895,7 @@ const char *sound; sound = gaim_pounce_action_get_attribute(pounce, "play-sound", - "sound"); + "filename"); if (sound != NULL) gaim_sound_play_file(sound);
--- a/src/pounce.c Tue Aug 12 23:32:00 2003 +0000 +++ b/src/pounce.c Wed Aug 13 06:05:03 2003 +0000 @@ -545,7 +545,7 @@ data->events |= GAIM_POUNCE_IDLE; else if (!strcmp(data->event_type, "return-from-idle")) data->events |= GAIM_POUNCE_IDLE_RETURN; - else if (!strcmp(data->event_type, "typing")) + else if (!strcmp(data->event_type, "start-typing")) data->events |= GAIM_POUNCE_TYPING; else if (!strcmp(data->event_type, "stop-typing")) data->events |= GAIM_POUNCE_TYPING_STOPPED;
--- a/src/server.c Tue Aug 12 23:32:00 2003 +0000 +++ b/src/server.c Wed Aug 13 06:05:03 2003 +0000 @@ -1193,7 +1193,12 @@ gaim_event_broadcast(event_got_typing, gc, name); if (b != NULL) - gaim_pounce_execute(gc->account, name, GAIM_POUNCE_TYPING); + if (state == GAIM_TYPING) + gaim_pounce_execute(gc->account, name, + GAIM_POUNCE_TYPING); + else + gaim_pounce_execute(gc->account, name, + GAIM_POUNCE_TYPING_STOPPED); if (timeout > 0) gaim_im_start_typing_timeout(im, timeout);