aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Include ncursesw, set locale

Browse Source
This commit is contained in:
James Booth 2013-01-02 20:27:37 +00:00
parent 3b37e53a5c
commit d28930eaf4
11 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -37,8 +37,8 @@ AC_CHECK_LIB([ssl], [main], [],
[AC_MSG_ERROR([openssl is required for profanity])]) [AC_MSG_ERROR([openssl is required for profanity])])
AC_CHECK_LIB([strophe], [main], [], AC_CHECK_LIB([strophe], [main], [],
[AC_MSG_ERROR([libstrophe is required for profanity])]) [AC_MSG_ERROR([libstrophe is required for profanity])])
AC_CHECK_LIB([ncurses], [main], [], AC_CHECK_LIB([ncursesw], [main], [],
[AC_MSG_ERROR([ncurses is required for profanity])]) [AC_MSG_ERROR([ncursesw is required for profanity])])
AC_CHECK_LIB([glib-2.0], [main], [], AC_CHECK_LIB([glib-2.0], [main], [],
[AC_MSG_ERROR([glib-2.0 is required for profanity])]) [AC_MSG_ERROR([glib-2.0 is required for profanity])])
AC_CHECK_LIB([curl], [main], [], AC_CHECK_LIB([curl], [main], [],
@ -54,8 +54,10 @@ AC_CHECK_LIB([X11], [main], [],
# Checks for header files. # Checks for header files.
AC_CHECK_HEADERS([stdlib.h string.h]) AC_CHECK_HEADERS([stdlib.h string.h])
# check for ncursesw/ncurses.h first, Arch linux uses ncurses.h for ncursesw
AC_CHECK_HEADERS([ncursesw/ncurses.h], [], [])
AC_CHECK_HEADERS([ncurses.h], [], []) AC_CHECK_HEADERS([ncurses.h], [], [])
AC_CHECK_HEADERS([ncurses/ncurses.h], [], [])
PKG_CHECK_MODULES([DEPS], [openssl glib-2.0 libcurl]) PKG_CHECK_MODULES([DEPS], [openssl glib-2.0 libcurl])
PKG_CHECK_MODULES([NOTIFY], [libnotify], [], PKG_CHECK_MODULES([NOTIFY], [libnotify], [],

4
src/input_win.c
View File

@ -47,8 +47,8 @@
#ifdef HAVE_NCURSES_H #ifdef HAVE_NCURSES_H
#include <ncurses.h> #include <ncurses.h>
#endif #endif
#ifdef HAVE_NCURSES_NCURSES_H #ifdef HAVE_NCURSESW_NCURSES_H
#include <ncurses/ncurses.h> #include <ncursesw/ncurses.h>
#endif #endif
#include "common.h" #include "common.h"

4
src/preferences.c
View File

@ -27,8 +27,8 @@
#ifdef HAVE_NCURSES_H #ifdef HAVE_NCURSES_H
#include <ncurses.h> #include <ncurses.h>
#endif #endif
#ifdef HAVE_NCURSES_NCURSES_H #ifdef HAVE_NCURSESW_NCURSES_H
#include <ncurses/ncurses.h> #include <ncursesw/ncurses.h>
#endif #endif
#include "config.h" #include "config.h"

4
src/preferences.h
View File

@ -30,8 +30,8 @@
#ifdef HAVE_NCURSES_H #ifdef HAVE_NCURSES_H
#include <ncurses.h> #include <ncurses.h>
#endif #endif
#ifdef HAVE_NCURSES_NCURSES_H #ifdef HAVE_NCURSESW_NCURSES_H
#include <ncurses/ncurses.h> #include <ncursesw/ncurses.h>
#endif #endif
#define PREFS_MIN_LOG_SIZE 64 #define PREFS_MIN_LOG_SIZE 64

2
src/profanity.c
View File

@ -22,6 +22,7 @@
#include "config.h" #include "config.h"
#include <locale.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <signal.h> #include <signal.h>
@ -519,6 +520,7 @@ _handle_idle_time()
static void static void
_init(const int disable_tls, char *log_level) _init(const int disable_tls, char *log_level)
{ {
setlocale(LC_ALL, "");
// ignore SIGPIPE // ignore SIGPIPE
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
files_create_directories(); files_create_directories();

4
src/status_bar.c
View File

@ -28,8 +28,8 @@
#ifdef HAVE_NCURSES_H #ifdef HAVE_NCURSES_H
#include <ncurses.h> #include <ncurses.h>
#endif #endif
#ifdef HAVE_NCURSES_NCURSES_H #ifdef HAVE_NCURSESW_NCURSES_H
#include <ncurses/ncurses.h> #include <ncursesw/ncurses.h>
#endif #endif
#include "theme.h" #include "theme.h"

4
src/theme.c
View File

@ -29,8 +29,8 @@
#ifdef HAVE_NCURSES_H #ifdef HAVE_NCURSES_H
#include <ncurses.h> #include <ncurses.h>
#endif #endif
#ifdef HAVE_NCURSES_NCURSES_H #ifdef HAVE_NCURSESW_NCURSES_H
#include <ncurses/ncurses.h> #include <ncursesw/ncurses.h>
#endif #endif
#include "files.h" #include "files.h"

4
src/theme.h
View File

@ -30,8 +30,8 @@
#ifdef HAVE_NCURSES_H #ifdef HAVE_NCURSES_H
#include <ncurses.h> #include <ncurses.h>
#endif #endif
#ifdef HAVE_NCURSES_NCURSES_H #ifdef HAVE_NCURSESW_NCURSES_H
#include <ncurses/ncurses.h> #include <ncursesw/ncurses.h>
#endif #endif
#define COLOUR_TEXT COLOR_PAIR(1) #define COLOUR_TEXT COLOR_PAIR(1)

4
src/ui.h
View File

@ -30,8 +30,8 @@
#ifdef HAVE_NCURSES_H #ifdef HAVE_NCURSES_H
#include <ncurses.h> #include <ncurses.h>
#endif #endif
#ifdef HAVE_NCURSES_NCURSES_H #ifdef HAVE_NCURSESW_NCURSES_H
#include <ncurses/ncurses.h> #include <ncursesw/ncurses.h>
#endif #endif
#include "jabber.h" #include "jabber.h"

4
src/window.c
View File

@ -29,8 +29,8 @@
#ifdef HAVE_NCURSES_H #ifdef HAVE_NCURSES_H
#include <ncurses.h> #include <ncurses.h>
#endif #endif
#ifdef HAVE_NCURSES_NCURSES_H #ifdef HAVE_NCURSESW_NCURSES_H
#include <ncurses/ncurses.h> #include <ncursesw/ncurses.h>
#endif #endif
#include "theme.h" #include "theme.h"

4
src/windows.c
View File

@ -41,8 +41,8 @@
#ifdef HAVE_NCURSES_H #ifdef HAVE_NCURSES_H
#include <ncurses.h> #include <ncurses.h>
#endif #endif
#ifdef HAVE_NCURSES_NCURSES_H #ifdef HAVE_NCURSESW_NCURSES_H
#include <ncurses/ncurses.h> #include <ncursesw/ncurses.h>
#endif #endif
#include "chat_log.h" #include "chat_log.h"