Drop sidebar.h

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/browser.c b/browser.c
index 44839d2..19fc098 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -16,7 +16,6 @@
 #include <lib-ui/lib-ui.h>
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
-#include <lib-ui/sidebar.h>
 #include <lib-mx/mx.h>
 
 #include "mutt.h"

diff --git a/buffy.cpkg b/buffy.cpkg
index c549b83..b516fe7 100644 (file)
--- a/buffy.cpkg
+++ b/buffy.cpkg
@@ -16,7 +16,6 @@
 
 #include <lib-lua/lib-lua.h>
 #include <lib-ui/lib-ui.h>
-#include <lib-ui/sidebar.h>
 #include <lib-mx/mx.h>
 #include <lib-mx/mh.h>
 

diff --git a/flags.c b/flags.c
index a893cc7..f83d2a3 100644 (file)
--- a/flags.c
+++ b/flags.c
@@ -11,7 +11,6 @@
 
 #include <lib-ui/lib-ui.h>
 #include <lib-ui/menu.h>
-#include <lib-ui/sidebar.h>
 #include <lib-mx/mx.h>
 
 #include "mutt.h"

diff --git a/lib-mx/mx.c b/lib-mx/mx.c
index 6693d27..6e84b10 100644 (file)
--- a/lib-mx/mx.c
+++ b/lib-mx/mx.c
@@ -15,7 +15,7 @@
 #include <lib-lua/lib-lua.h>
 #include <lib-sys/unix.h>
 #include <lib-mime/mime.h>
-#include <lib-ui/sidebar.h>
+#include <lib-ui/lib-ui.h>
 
 #include "mutt.h"
 #include "crypt.h"

diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index e80d302..8d0611f 100644 (file)
--- a/lib-ui/curs_main.c
+++ b/lib-ui/curs_main.c
@@ -11,8 +11,6 @@
  */
 
 #include <lib-ui/lib-ui.h>
-
-#include <lib-ui/sidebar.h>
 #include <lib-mx/mx.h>
 #include "pop.h"
 

diff --git a/lib-ui/layout.h b/lib-ui/layout.h
index 82425fc..f799114 100644 (file)
--- a/lib-ui/layout.h
+++ b/lib-ui/layout.h
@@ -20,6 +20,8 @@
 #ifndef MUTT_LIB_UI_LAYOUT_H
 #define MUTT_LIB_UI_LAYOUT_H
 
+#include "mutt.h" /* because of CONTEXT :| */
+
 extern WINDOW *sidebar_w, *main_w;
 
 void ui_layout_init(void);
@@ -31,4 +33,10 @@ void mutt_need_hard_redraw(void);
 void mutt_refresh(void);
 void mutt_endwin(const char *);
 
+int  sidebar_draw(void);
+void sidebar_scroll(int);
+void sidebar_set_buffystats(CONTEXT *);
+const char *sidebar_get_current(void);
+void sidebar_set_current(const char *);
+
 #endif

diff --git a/lib-ui/menu.c b/lib-ui/menu.c
index 873579e..0aac994 100644 (file)
--- a/lib-ui/menu.c
+++ b/lib-ui/menu.c
@@ -16,7 +16,6 @@
 #include "charset.h"
 
 #include <imap/imap.h>
-#include <lib-ui/sidebar.h>
 
 extern size_t UngetCount;
 

diff --git a/lib-ui/sidebar.c b/lib-ui/sidebar.c
index e99c9c6..b59a874 100644 (file)
--- a/lib-ui/sidebar.c
+++ b/lib-ui/sidebar.c
@@ -13,10 +13,9 @@
  */
 
 #include <lib-ui/lib-ui.h>
-#include <libgen.h>
-
 #include <lib-ui/menu.h>
-#include <lib-ui/sidebar.h>
+
+#include <libgen.h>
 
 #include "mutt.h"
 #include "charset.h"

diff --git a/lib-ui/sidebar.h b/lib-ui/sidebar.h
deleted file mode 100644 (file)
index 11a5873..0000000
--- a/lib-ui/sidebar.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright notice from original mutt:
- * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu>
- * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com>
- *
- * This file is part of mutt-ng, see http://www.muttng.org/.
- * It's licensed under the GNU General Public License,
- * please see the file GPL in the top level source directory.
- */
-
-#ifndef _SIDEBAR_H
-#define _SIDEBAR_H
-
-#include "mutt.h" /* because of CONTEXT :| */
-
-int  sidebar_draw(void);
-void sidebar_scroll(int);
-void sidebar_set_buffystats(CONTEXT *);
-const char *sidebar_get_current(void);
-void sidebar_set_current(const char *);
-
-#endif /* _SIDEBAR_H */

diff --git a/pager.c b/pager.c
index 59db45f..7fad6c6 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -16,7 +16,6 @@
 #include <lib-ui/lib-ui.h>
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
-#include <lib-ui/sidebar.h>
 #include <lib-ui/madtty.h>
 #include <lib-mx/mx.h>