diff options
| author | Richard Hitt <rbh00@localhost.localdomain> | 2013-06-15 17:26:13 -0700 |
|---|---|---|
| committer | Richard Hitt <rbh00@localhost.localdomain> | 2013-06-15 17:26:13 -0700 |
| commit | 6a7557da0156b235b8bad58b255e16625a8ed47e (patch) | |
| tree | c75ffec369055f3037abdc32af8f79083e546624 /src/fe-gtk/fe-gtk.c | |
| parent | d7045e2b6121f7750565f7b9e906bd74fecb72d9 (diff) | |
| parent | e68635b8e4b0aee7d958c482abbadfc4321cf2b0 (diff) | |
Merge branch 'master' of http://github.com/hexchat/hexchat
Diffstat (limited to 'src/fe-gtk/fe-gtk.c')
| -rw-r--r-- | src/fe-gtk/fe-gtk.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index d737b744..e017b9b9 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -62,6 +62,9 @@ GdkPixmap *channelwin_pix; +#ifdef USE_LIBCANBERRA +static ca_context *ca_con; +#endif #ifdef USE_XLIB @@ -674,11 +677,16 @@ fe_beep (session *sess) } #else #ifdef USE_LIBCANBERRA - ca_context *con; - ca_context_create (&con); - if (ca_context_play (con, 0, - CA_PROP_APPLICATION_NAME, DISPLAY_NAME, - CA_PROP_EVENT_ID, "message-new-instant", NULL) != 0) + if (ca_con == NULL) + { + ca_context_create (&ca_con); + ca_context_change_props (ca_con, + CA_PROP_APPLICATION_ID, "hexchat", + CA_PROP_APPLICATION_NAME, DISPLAY_NAME, + CA_PROP_APPLICATION_ICON_NAME, "hexchat", NULL); + } + + if (ca_context_play (ca_con, 0, CA_PROP_EVENT_ID, "message-new-instant", NULL) != 0) #endif gdk_beep (); #endif |