Kill screen_init(). it's been stubbed out for a while now. I don't envision it

coming back in it's current form.

ok okan@.

3 files changed, 3 insertions, 14 deletions

diff --git a/calmwm.c b/calmwm.c
index fe9d425..c667364 100644
--- a/calmwm.c
+++ b/calmwm.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: calmwm.c,v 1.23 2008/07/11 14:21:28 okan Exp $
+ * $Id: calmwm.c,v 1.24 2008/07/22 19:54:57 oga Exp $
  */
 
 #include "headers.h"
@@ -204,10 +204,6 @@ x_setupscreen(struct screen_ctx *sc, u_int which)
 	font_init(sc);
 	conf_font(&Conf);
 
-	/*
-	 * XXX - this should *really* be in screen_init().  ordering
-	 * problem.
-	 */
 	TAILQ_INIT(&sc->mruq);
 
 	/* Initialize menu window. */
@@ -228,7 +224,6 @@ x_setupscreen(struct screen_ctx *sc, u_int which)
 	}
 	XFree(wins);
 
-	screen_init();
 	screen_updatestackingorder();
 
 	rootattr.event_mask = ChildMask|PropertyChangeMask|EnterWindowMask|
diff --git a/calmwm.h b/calmwm.h
index fbf552a..ba4fec0 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: calmwm.h,v 1.60 2008/07/22 19:52:54 oga Exp $
+ * $Id: calmwm.h,v 1.61 2008/07/22 19:54:57 oga Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -412,7 +412,6 @@ char			*xstrdup(const char *);
 #define XMALLOC(p, t) ((p) = (t *)xmalloc(sizeof * (p)))
 #define XCALLOC(p, t) ((p) = (t *)xcalloc(1, sizeof * (p)))
 
-void			 screen_init(void);
 struct screen_ctx	*screen_fromroot(Window);
 struct screen_ctx	*screen_current(void);
 void			 screen_updatestackingorder(void);
diff --git a/screen.c b/screen.c
index 9ecf699..139c451 100644
--- a/screen.c
+++ b/screen.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: screen.c,v 1.7 2008/07/11 14:21:28 okan Exp $
+ * $Id: screen.c,v 1.8 2008/07/22 19:54:57 oga Exp $
  */
 
 #include "headers.h"
@@ -67,8 +67,3 @@ screen_updatestackingorder(void)
 
 	XFree(wins);
 }
-
-void
-screen_init(void)
-{
-}