5 files changed, 17 insertions, 29 deletions
diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am
index 66f5bde0..7f402d8c 100644
--- a/src/fe-text/Makefile.am
+++ b/src/fe-text/Makefile.am
@@ -19,9 +19,9 @@ irssi_LDADD = \
 
 irssi_SOURCES = \
         gui-entry.c \
+	gui-expandos.c \
         gui-printtext.c \
         gui-readline.c \
-	gui-special-vars.c \
         gui-textwidget.c \
         gui-windows.c \
         mainwindows.c \
@@ -36,8 +36,6 @@ noinst_HEADERS = \
         gui-entry.h \
         gui-printtext.h \
         gui-readline.h \
-	gui-special-vars.h \
-        gui-textwidget.h \
         gui-windows.h \
         mainwindows.h \
         statusbar.h \
diff --git a/src/fe-text/gui-special-vars.c b/src/fe-text/gui-expandos.c
index df936c84..c95ac621 100644
--- a/src/fe-text/gui-special-vars.c
+++ b/src/fe-text/gui-expandos.c
@@ -1,5 +1,5 @@
 /*
- gui-special-vars.c : irssi
+ gui-expandos.c : irssi
 
     Copyright (C) 2000 Timo Sirainen
 
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "special-vars.h"
+#include "expandos.h"
 
 #include "gui-entry.h"
 #include "gui-readline.h"
@@ -40,20 +40,20 @@ static char *expando_inputline(SERVER_REC *server, void *item, int *free_ret)
 	return gui_entry_get_text();
 }
 
-/* FIXME: value of cutbuffer */
+/* value of cutbuffer */
 static char *expando_cutbuffer(SERVER_REC *server, void *item, int *free_ret)
 {
 	return cutbuffer;
 }
 
-void gui_special_vars_init(void)
+void gui_expandos_init(void)
 {
-	expando_create("E", expando_idletime);
-	expando_create("L", expando_inputline);
-	expando_create("U", expando_cutbuffer);
+	expando_create("E", expando_idletime, NULL);
+	expando_create("L", expando_inputline, NULL);
+	expando_create("U", expando_cutbuffer, NULL);
 }
 
-void gui_special_vars_deinit(void)
+void gui_expandos_deinit(void)
 {
 	expando_destroy("E", expando_idletime);
 	expando_destroy("L", expando_inputline);
diff --git a/src/fe-text/gui-special-vars.h b/src/fe-text/gui-special-vars.h
deleted file mode 100644
index 392efc85..00000000
--- a/src/fe-text/gui-special-vars.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __GUI_SPECIAL_VARS_H
-#define __GUI_SPECIAL_VARS_H
-
-void gui_special_vars_init(void);
-void gui_special_vars_deinit(void);
-
-#endif
diff --git a/src/fe-text/gui-textwidget.h b/src/fe-text/gui-textwidget.h
deleted file mode 100644
index f27ae7fb..00000000
--- a/src/fe-text/gui-textwidget.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __GUI_TEXTWIDGET_H
-#define __GUI_TEXTWIDGET_H
-
-void gui_textwidget_init(void);
-void gui_textwidget_deinit(void);
-
-#endif
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index eb151ae7..dd567f28 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -35,9 +35,7 @@
 #include "mainwindows.h"
 #include "gui-printtext.h"
 #include "gui-readline.h"
-#include "gui-special-vars.h"
 #include "statusbar.h"
-#include "gui-textwidget.h"
 #include "gui-windows.h"
 
 #include <signal.h>
@@ -50,6 +48,12 @@ void perl_deinit(void);
 void irc_init(void);
 void irc_deinit(void);
 
+void gui_expandos_init(void);
+void gui_expandos_deinit(void);
+
+void gui_textwidget_init(void);
+void gui_textwidget_deinit(void);
+
 void mainwindow_activity_init(void);
 void mainwindow_activity_deinit(void);
 
@@ -111,9 +115,9 @@ static void textui_finish_init(void)
 
 	screen_refresh_freeze();
 	gui_entry_init();
+	gui_expandos_init();
 	gui_printtext_init();
 	gui_readline_init();
-	gui_special_vars_init();
 	gui_textwidget_init();
 	mainwindows_init();
 	mainwindow_activity_init();
@@ -146,13 +150,13 @@ static void textui_deinit(void)
 
 	signal_remove("gui exit", (SIGNAL_FUNC) sig_exit);
 	gui_textwidget_deinit();
-	gui_special_vars_deinit();
 	statusbar_deinit();
 	gui_printtext_deinit();
 	gui_readline_deinit();
 	gui_windows_deinit();
 	mainwindow_activity_deinit();
 	mainwindows_deinit();
+	gui_expandos_deinit();
 	gui_entry_deinit();
 	deinit_screen();