aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Merge branch 'master' into otr

Browse Source
This commit is contained in:
James Booth 2014-01-12 01:25:35 +00:00
commit 4e97c1e460
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -62,8 +62,9 @@ AM_CPPFLAGS="$AM_CPPFLAGS $PARSER_CFLAGS"
LIBS="$LIBS $PARSER_LIBS" LIBS="$LIBS $PARSER_LIBS"
### Check for libstrophe dependencies ### Check for libstrophe dependencies
AC_CHECK_LIB([resolv], [__res_query], [], AC_CHECK_LIB([resolv], [res_query], [],
[AC_MSG_ERROR([libresolv is required for profanity])]) [AC_CHECK_LIB([resolv], [__res_query], [],
[AC_MSG_ERROR([libresolv is required for profanity])])])
PKG_CHECK_MODULES([openssl], [openssl], [], PKG_CHECK_MODULES([openssl], [openssl], [],
[AC_MSG_ERROR([openssl is required for profanity])]) [AC_MSG_ERROR([openssl is required for profanity])])
AM_CPPFLAGS="$AM_CPPFLAGS $openssl_CFLAGS" AM_CPPFLAGS="$AM_CPPFLAGS $openssl_CFLAGS"

2
src/ui/window.c
View File

@ -326,8 +326,10 @@ win_handle_error_message(ProfWin *window, const char * const from,
case WIN_DUCK: case WIN_DUCK:
case WIN_CONSOLE: case WIN_CONSOLE:
handled = FALSE; handled = FALSE;
break;
case WIN_MUC: case WIN_MUC:
handled = _muc_handle_error_message(window, from, err_msg); handled = _muc_handle_error_message(window, from, err_msg);
break;
default: default:
assert(FALSE); assert(FALSE);
break; break;