diff options
| author | James Booth <boothj5@gmail.com> | 2013-02-02 20:55:58 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2013-02-02 20:55:58 +0000 |
| commit | fc5bfb7d33dc6e1a6a53c46d414df4f9324f6ad5 (patch) | |
| tree | 1f4fa04b2101bc021cbd054a2c914ee17f10c9da /src/ui | |
| parent | 8cc4b559452f0bb279a1330d0a166c65045e3417 (diff) | |
| download | profani-tty-fc5bfb7d33dc6e1a6a53c46d414df4f9324f6ad5.tar.gz | |
Tidied #include's
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/inputwin.c | 4 | ||||
| -rw-r--r-- | src/ui/statusbar.c | 2 | ||||
| -rw-r--r-- | src/ui/titlebar.c | 2 | ||||
| -rw-r--r-- | src/ui/ui.h | 1 | ||||
| -rw-r--r-- | src/ui/window.c | 3 | ||||
| -rw-r--r-- | src/ui/window.h | 2 | ||||
| -rw-r--r-- | src/ui/windows.c | 10 |
7 files changed, 9 insertions, 15 deletions
diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c index 46a3cb13..203efe30 100644 --- a/src/ui/inputwin.c +++ b/src/ui/inputwin.c @@ -33,14 +33,14 @@ #include <ncurses.h> #endif -#include "common.h" #include "command.h" +#include "common.h" #include "contact_list.h" #include "log.h" #include "preferences.h" #include "profanity.h" #include "theme.h" -#include "ui.h" +#include "ui/ui.h" #define _inp_win_refresh() prefresh(inp_win, 0, pad_start, rows-1, 0, rows-1, cols-1) diff --git a/src/ui/statusbar.c b/src/ui/statusbar.c index 07f4295a..7d894f07 100644 --- a/src/ui/statusbar.c +++ b/src/ui/statusbar.c @@ -32,7 +32,7 @@ #endif #include "theme.h" -#include "ui.h" +#include "ui/ui.h" static WINDOW *status_bar; static char *message = NULL; diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c index e563381b..fc208063 100644 --- a/src/ui/titlebar.c +++ b/src/ui/titlebar.c @@ -25,7 +25,7 @@ #include "common.h" #include "theme.h" -#include "ui.h" +#include "ui/ui.h" static WINDOW *title_bar; static char *current_title = NULL; diff --git a/src/ui/ui.h b/src/ui/ui.h index 7599d374..d83b73f3 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -28,7 +28,6 @@ #include <wchar.h> #include <glib.h> - #ifdef HAVE_NCURSESW_NCURSES_H #include <ncursesw/ncurses.h> #elif HAVE_NCURSES_H diff --git a/src/ui/window.c b/src/ui/window.c index 2a597127..b9c5d9cb 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -26,7 +26,6 @@ #include <string.h> #include <glib.h> - #ifdef HAVE_NCURSESW_NCURSES_H #include <ncursesw/ncurses.h> #elif HAVE_NCURSES_H @@ -34,7 +33,7 @@ #endif #include "theme.h" -#include "window.h" +#include "ui/window.h" #define CONS_WIN_TITLE "_cons" diff --git a/src/ui/window.h b/src/ui/window.h index 61790de2..ce980dd6 100644 --- a/src/ui/window.h +++ b/src/ui/window.h @@ -23,7 +23,7 @@ #ifndef WINDOW_H #define WINDOW_H -#include "ui.h" +#include "ui/ui.h" typedef struct prof_win_t { char *from; diff --git a/src/ui/windows.c b/src/ui/windows.c index b809a513..389c362f 100644 --- a/src/ui/windows.c +++ b/src/ui/windows.c @@ -24,20 +24,16 @@ #include <stdlib.h> #include <string.h> - #ifdef HAVE_LIBXSS #include <X11/extensions/scrnsaver.h> #endif - #include <glib.h> - #ifdef HAVE_LIBNOTIFY #include <libnotify/notify.h> #endif #ifdef PLATFORM_CYGWIN #include <windows.h> #endif - #ifdef HAVE_NCURSESW_NCURSES_H #include <ncursesw/ncurses.h> #elif HAVE_NCURSES_H @@ -51,11 +47,11 @@ #include "contact_list.h" #include "jid.h" #include "log.h" -#include "preferences.h" #include "muc.h" +#include "preferences.h" #include "theme.h" -#include "ui.h" -#include "window.h" +#include "ui/ui.h" +#include "ui/window.h" #define CONS_WIN_TITLE "_cons" #define NUM_WINS 10 |