Merge branch 'master' into openpgp

2015-06-15 20:39:17 +01:00
parent b52de6869a 5cdd69f478
commit c76692516a
28 changed files with 313 additions and 276 deletions
--- a/src/config/preferences.c
+++ b/src/config/preferences.c
@@ -41,12 +41,6 @@
 #include <glib.h>
 #include <glib/gstdio.h>

-#ifdef HAVE_NCURSESW_NCURSES_H
-#include <ncursesw/ncurses.h>
-#elif HAVE_NCURSES_H
-#include <ncurses.h>
-#endif
-
 #include "common.h"
 #include "log.h"
 #include "preferences.h"
--- a/src/config/preferences.h
+++ b/src/config/preferences.h
@@ -38,11 +38,6 @@
 #include "config.h"

 #include <glib.h>
-#ifdef HAVE_NCURSESW_NCURSES_H
-#include <ncursesw/ncurses.h>
-#elif HAVE_NCURSES_H
-#include <ncurses.h>
-#endif

 #define PREFS_MIN_LOG_SIZE 64
 #define PREFS_MAX_LOG_SIZE 1048580
--- a/src/config/theme.h
+++ b/src/config/theme.h
@@ -38,11 +38,6 @@
 #include "config.h"

 #include <glib.h>
-#ifdef HAVE_NCURSESW_NCURSES_H
-#include <ncursesw/ncurses.h>
-#elif HAVE_NCURSES_H
-#include <ncurses.h>
-#endif

 typedef enum {
    THEME_TEXT,