From: Christian H. <ch...@us...> - 2003-08-13 06:07:39
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1:/tmp/cvs-serv30719 Modified Files: gtkpounce.c pounce.c server.c Log Message: 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" Index: gtkpounce.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkpounce.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- gtkpounce.c 5 Aug 2003 10:55:01 -0000 1.29 +++ gtkpounce.c 13 Aug 2003 06:05:03 -0000 1.30 @@ -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); Index: pounce.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/pounce.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- pounce.c 22 Jul 2003 12:36:32 -0000 1.21 +++ pounce.c 13 Aug 2003 06:05:03 -0000 1.22 @@ -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; Index: server.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/server.c,v retrieving revision 1.350 retrieving revision 1.351 diff -u -d -r1.350 -r1.351 --- server.c 7 Aug 2003 01:09:38 -0000 1.350 +++ server.c 13 Aug 2003 06:05:03 -0000 1.351 @@ -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); |