diff options
| author | James Booth <boothj5@gmail.com> | 2014-01-12 01:25:35 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-01-12 01:25:35 +0000 |
| commit | 4e97c1e460d150b0cde6d8e35d8caf7bcf959a71 (patch) | |
| tree | 182a76fd90bdc61f711d9c1d7ddd8f297d72c86e | |
| parent | 462e84ea8218d267164ea563ea00412e57e3fb41 (diff) | |
| parent | f1bd350567aad2de409f53e0c5b0870366b56bac (diff) | |
| download | profani-tty-4e97c1e460d150b0cde6d8e35d8caf7bcf959a71.tar.gz | |
Merge branch 'master' into otr
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/ui/window.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 9fe3c201..4fb4deda 100644 --- a/configure.ac +++ b/configure.ac @@ -62,8 +62,9 @@ AM_CPPFLAGS="$AM_CPPFLAGS $PARSER_CFLAGS" LIBS="$LIBS $PARSER_LIBS" ### Check for libstrophe dependencies -AC_CHECK_LIB([resolv], [__res_query], [], - [AC_MSG_ERROR([libresolv is required for profanity])]) +AC_CHECK_LIB([resolv], [res_query], [], + [AC_CHECK_LIB([resolv], [__res_query], [], + [AC_MSG_ERROR([libresolv is required for profanity])])]) PKG_CHECK_MODULES([openssl], [openssl], [], [AC_MSG_ERROR([openssl is required for profanity])]) AM_CPPFLAGS="$AM_CPPFLAGS $openssl_CFLAGS" diff --git a/src/ui/window.c b/src/ui/window.c index 370f876c..a74479d8 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -326,8 +326,10 @@ win_handle_error_message(ProfWin *window, const char * const from, case WIN_DUCK: case WIN_CONSOLE: handled = FALSE; + break; case WIN_MUC: handled = _muc_handle_error_message(window, from, err_msg); + break; default: assert(FALSE); break; |