comparison: src/gtkconv.c
src/gtkconv.c
- changeset 9704
- ad0722a04b11
- parent 9699
- d1ca5dd91cc2
- child 9706
- d5b657fe9cff
equal
deleted
inserted
replaced
| 9703:3823f25e92e7 | 9704:ad0722a04b11 |
|---|---|
| 4957 | 4957 |
| 4958 g_object_get(G_OBJECT(gtkwin->window), "has-toplevel-focus", &has_focus, NULL); | 4958 g_object_get(G_OBJECT(gtkwin->window), "has-toplevel-focus", &has_focus, NULL); |
| 4959 | 4959 |
| 4960 /* Play a sound, if specified in prefs. */ | 4960 /* Play a sound, if specified in prefs. */ |
| 4961 if (gtkconv->make_sound && !((gaim_conv_window_get_active_conversation(gaimwin) == conv) && | 4961 if (gtkconv->make_sound && !((gaim_conv_window_get_active_conversation(gaimwin) == conv) && |
| 4962 !gaim_prefs_get_bool("/gaim/gtk/sound/conv_focus") && has_focus)) { | 4962 !gaim_prefs_get_bool("/gaim/gtk/sound/conv_focus") && has_focus) && |
| 4963 !(flags & GAIM_MESSAGE_DELAYED) && | |
| 4964 !(flags & GAIM_MESSAGE_SYSTEM)) { | |
| 4965 | |
| 4963 if (!(flags & GAIM_MESSAGE_WHISPER) && (flags & GAIM_MESSAGE_SEND)) | 4966 if (!(flags & GAIM_MESSAGE_WHISPER) && (flags & GAIM_MESSAGE_SEND)) |
| 4964 gaim_sound_play_event(GAIM_SOUND_CHAT_YOU_SAY); | 4967 gaim_sound_play_event(GAIM_SOUND_CHAT_YOU_SAY); |
| 4965 else if ((flags & GAIM_MESSAGE_RECV) && | 4968 else if (flags & GAIM_MESSAGE_RECV) { |
| 4966 !(flags & GAIM_MESSAGE_DELAYED) && | |
| 4967 !(flags & GAIM_MESSAGE_SYSTEM)) { | |
| 4968 | |
| 4969 if ((flags & GAIM_MESSAGE_NICK) && | 4969 if ((flags & GAIM_MESSAGE_NICK) && |
| 4970 gaim_prefs_get_bool("/gaim/gtk/sound/enabled/nick_said")) { | 4970 gaim_prefs_get_bool("/gaim/gtk/sound/enabled/nick_said")) { |
| 4971 | 4971 |
| 4972 gaim_sound_play_event(GAIM_SOUND_CHAT_NICK); | 4972 gaim_sound_play_event(GAIM_SOUND_CHAT_NICK); |
| 4973 } | 4973 } |
