moparisthebest
/
hexchat
mirror of https://github.com/moparisthebest/hexchat
1
0
Fork 0
Code Issues Releases Wiki Activity

Use regular canberra not gtk

This commit is contained in:
TingPing 2013-04-27 20:28:39 -04:00
parent 5bb284267b
commit bb878848f7
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -616,12 +616,12 @@ dnl ** LIBCANBERRA ******************************************************
dnl ********************************************************************* dnl *********************************************************************
if test "x$libcanberra" = "xyes" ; then if test "x$libcanberra" = "xyes" ; then
PKG_CHECK_MODULES(LIBCANBERRAGTK, libcanberra-gtk >= 0.22, [], [ PKG_CHECK_MODULES(LIBCANBERRA, libcanberra >= 0.22, [], [
libcanberra=no libcanberra=no
]) ])
if test "$libcanberra" != "no" ; then if test "$libcanberra" != "no" ; then
GUI_LIBS="$GUI_LIBS $LIBCANBERRAGTK_LIBS" COMMON_LIBS="$COMMON_LIBS $LIBCANBERRA_LIBS"
GUI_CFLAGS="$GUI_CFLAGS $LIBCANBERRAGTK_CFLAGS" COMMON_CFLAGS="$COMMON_CFLAGS $LIBCANBERRA_CFLAGS"
AC_DEFINE(USE_LIBCANBERRA) AC_DEFINE(USE_LIBCANBERRA)
fi fi
fi fi

6
src/fe-gtk/fe-gtk.c
View File

@ -57,7 +57,7 @@
#endif #endif
#ifdef USE_LIBCANBERRA #ifdef USE_LIBCANBERRA
#include <canberra-gtk.h> #include <canberra.h>
#endif #endif
GdkPixmap *channelwin_pix; GdkPixmap *channelwin_pix;
@ -674,7 +674,9 @@ fe_beep (session *sess)
} }
#else #else
#ifdef USE_LIBCANBERRA #ifdef USE_LIBCANBERRA
if (ca_context_play (ca_gtk_context_get (), 0, ca_context *con;
ca_context_create (&con);
if (ca_context_play (con, 0,
CA_PROP_APPLICATION_NAME, DISPLAY_NAME, CA_PROP_APPLICATION_NAME, DISPLAY_NAME,
CA_PROP_EVENT_ID, "message-new-instant", NULL) != 0) CA_PROP_EVENT_ID, "message-new-instant", NULL) != 0)
#endif #endif