diff options
| author | TingPing <tingping@tingping.se> | 2012-12-25 18:28:07 -0800 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2012-12-25 18:28:07 -0800 |
| commit | 2e9bf00e0a1f54a6a5a4692517fb91deb250f0e1 (patch) | |
| tree | 56a1cad259f0e727b7cd6c1c5d6025c09d68624b | |
| parent | 446d90d8358ee15d69f769973e87d6d97af6e14a (diff) | |
| parent | c1ccb244dbacb82519c0e0f85c82f8c6898b2cf2 (diff) | |
Merge pull request #336 from TingPing/beep
Don't beep when window is active.
| -rw-r--r-- | src/common/fe.h | 2 | ||||
| -rw-r--r-- | src/common/text.c | 2 | ||||
| -rw-r--r-- | src/fe-gtk/fe-gtk.c | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/common/fe.h b/src/common/fe.h index f1f3b484..4903ef0e 100644 --- a/src/common/fe.h +++ b/src/common/fe.h @@ -97,7 +97,7 @@ void fe_set_title (struct session *sess); void fe_set_nonchannel (struct session *sess, int state); void fe_set_nick (struct server *serv, char *newnick); void fe_ignore_update (int level); -void fe_beep (void); +void fe_beep (session *sess); void fe_lastlog (session *sess, session *lastlog_sess, char *sstr, gtk_xtext_search_flags flags); void fe_set_lag (server *serv, int lag); void fe_set_throttle (server *serv); diff --git a/src/common/text.c b/src/common/text.c index 2efa376b..a89fd511 100644 --- a/src/common/text.c +++ b/src/common/text.c @@ -2253,7 +2253,7 @@ sound_beep (session *sess) sound_play_event (XP_TE_BEEP); else /* system beep */ - fe_beep (); + fe_beep (sess); } static char * diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index d0cfd657..57ffa2f6 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -682,9 +682,10 @@ fe_print_text (struct session *sess, char *text, time_t stamp) } void -fe_beep (void) +fe_beep (session *sess) { - gdk_beep (); + if (fe_gui_info (sess, 0) != 1) + gdk_beep (); } void |