Don't duplicate module-formats.* in fe-fuzz

4 files changed, 3 insertions, 143 deletions

diff --git a/src/fe-fuzz/Makefile.am b/src/fe-fuzz/Makefile.am
index 2ecf4a85..3a547c66 100644
--- a/src/fe-fuzz/Makefile.am
+++ b/src/fe-fuzz/Makefile.am
@@ -19,7 +19,7 @@ irssi_fuzz_LDADD = \
 
 irssi_fuzz_SOURCES = \
         irssi.c \
-	module-formats.c
+	$(top_srcdir)/src/fe-text/module-formats.c
 
 noinst_HEADERS = \
-	module-formats.h
+	$(top_srcdir)/src/fe-text/module-formats.h
diff --git a/src/fe-fuzz/irssi.c b/src/fe-fuzz/irssi.c
index 3b2c617a..12c61147 100644
--- a/src/fe-fuzz/irssi.c
+++ b/src/fe-fuzz/irssi.c
@@ -21,7 +21,7 @@
 #include "module.h"
 #include "modules-load.h"
 #include "levels.h"
-#include "module-formats.h"
+#include "../fe-text/module-formats.h" // need to explicitly grab from fe-text
 #include "themes.h"
 #include "core.h"
 #include "fe-common-core.h"
diff --git a/src/fe-fuzz/module-formats.c b/src/fe-fuzz/module-formats.c
deleted file mode 100644
index 899827c2..00000000
--- a/src/fe-fuzz/module-formats.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- module-formats.c : irssi
-
-    Copyright (C) 2000 Timo Sirainen
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "module.h"
-#include "formats.h"
-
-FORMAT_REC gui_text_formats[] =
-{
-	{ MODULE_NAME, "Text user interface", 0 },
-
-	/* ---- */
-	{ NULL, "Lastlog", 0 },
-
-	{ "lastlog_too_long", "/LASTLOG would print $0 lines. If you really want to print all these lines use -force option.", 1, { 1 } },
-	{ "lastlog_count", "{hilight Lastlog}: $0 lines", 1, { 1 } },
-	{ "lastlog_start", "{hilight Lastlog}:", 0 },
-	{ "lastlog_end", "{hilight End of Lastlog}", 0 },
-	{ "lastlog_separator", "--", 0 },
-	{ "lastlog_date", "%%F ", 0 },
-
-	/* ---- */
-	{ NULL, "Windows", 0 },
-
-	{ "refnum_not_found", "Window number $0 not found", 1, { 0 } },
-	{ "window_too_small", "Not enough room to resize this window", 0 },
-	{ "cant_hide_last", "You can't hide the last window", 0 },
-	{ "cant_hide_sticky_windows", "You can't hide sticky windows (use /WINDOW STICK OFF)", 0 },
-	{ "cant_show_sticky_windows", "You can't show sticky windows (use /WINDOW STICK OFF)", 0 },
-	{ "window_not_sticky", "Window is not sticky", 0 },
-	{ "window_set_sticky", "Window set sticky", 0 },
-	{ "window_unset_sticky", "Window is not sticky anymore", 0 },
-	{ "window_info_sticky", "%#Sticky  : $0", 1, { 0 } },
-	{ "window_info_scroll", "%#Scroll  : $0", 1, { 0 } },
-	{ "window_scroll", "Window scroll mode is now $0", 1, { 0 } },
-	{ "window_scroll_unknown", "Unknown scroll mode $0, must be ON, OFF or DEFAULT", 1, { 0 } },
-
-	/* ---- */
-	{ NULL, "Statusbars", 0 },
-
-	{ "statusbar_list_header", "%#Name                           Type   Placement Position Visible", 0 },
-	{ "statusbar_list_footer", "", 0 },
-	{ "statusbar_list", "%#$[30]0 $[6]1 $[9]2 $[8]3 $4", 5, { 0, 0, 0, 1, 0 } },
-	{ "statusbar_info_name", "%#Statusbar: {hilight $0}", 1, { 0 } },
-	{ "statusbar_info_type", "%#Type     : $0", 1, { 0 } },
-	{ "statusbar_info_placement", "%#Placement: $0", 1, { 0 } },
-	{ "statusbar_info_position", "%#Position : $0", 1, { 1 } },
-	{ "statusbar_info_visible", "%#Visible  : $0", 1, { 0 } },
-	{ "statusbar_info_item_header", "%#Items    : Name                                Priority  Alignment", 0 },
-	{ "statusbar_info_item_footer", "", 0 },
-	{ "statusbar_info_item_name",  "%#         : $[35]0 $[9]1 $2", 3, { 0, 1, 0 } },
-	{ "statusbar_not_found", "Statusbar doesn't exist: $0", 1, { 0 } },
-	{ "statusbar_item_not_found", "Statusbar item doesn't exist: $0", 1, { 0 } },
-	{ "statusbar_unknown_command", "Unknown statusbar command: $0", 1, { 0 } },
-	{ "statusbar_unknown_type", "Statusbar type must be 'window' or 'root'", 1, { 0 } },
-	{ "statusbar_unknown_placement", "Statusbar placement must be 'top' or 'bottom'", 1, { 0 } },
-	{ "statusbar_unknown_visibility", "Statusbar visibility must be 'always', 'active' or 'inactive'", 1, { 0 } },
-
-	/* ---- */
-	{ NULL, "Pasting", 0 },
-
-	{ "paste_warning", "Pasting $0 lines to $1. Press Ctrl-K if you wish to do this or Ctrl-C to cancel.", 2, { 1, 0 } },
-	{ "paste_prompt", "Hit Ctrl-K to paste, Ctrl-C to abort?", 0 },
-
-	{ NULL, NULL, 0 }
-};
diff --git a/src/fe-fuzz/module-formats.h b/src/fe-fuzz/module-formats.h
deleted file mode 100644
index 3fa8c511..00000000
--- a/src/fe-fuzz/module-formats.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "formats.h"
-
-enum {
-	TXT_MODULE_NAME,
-
-	TXT_FILL_1,
-
-        TXT_LASTLOG_TOO_LONG,
-        TXT_LASTLOG_COUNT,
-	TXT_LASTLOG_START,
-	TXT_LASTLOG_END,
-	TXT_LASTLOG_SEPARATOR,
-	TXT_LASTLOG_DATE,
-
-	TXT_FILL_2,
-
-        TXT_REFNUM_NOT_FOUND,
-        TXT_WINDOW_TOO_SMALL,
-        TXT_CANT_HIDE_LAST,
-	TXT_CANT_HIDE_STICKY_WINDOWS,
-        TXT_CANT_SHOW_STICKY_WINDOWS,
-        TXT_WINDOW_NOT_STICKY,
-        TXT_WINDOW_SET_STICKY,
-	TXT_WINDOW_UNSET_STICKY,
-	TXT_WINDOW_INFO_STICKY,
-        TXT_WINDOW_INFO_SCROLL,
-        TXT_WINDOW_SCROLL,
-        TXT_WINDOW_SCROLL_UNKNOWN,
-
-	TXT_FILL_3,
-
-        TXT_STATUSBAR_LIST_HEADER,
-	TXT_STATUSBAR_LIST_FOOTER,
-	TXT_STATUSBAR_LIST,
-	TXT_STATUSBAR_INFO_NAME,
-	TXT_STATUSBAR_INFO_TYPE,
-        TXT_STATUSBAR_INFO_PLACEMENT,
-	TXT_STATUSBAR_INFO_POSITION,
-	TXT_STATUSBAR_INFO_VISIBLE,
-        TXT_STATUSBAR_INFO_ITEM_HEADER,
-	TXT_STATUSBAR_INFO_ITEM_FOOTER,
-        TXT_STATUSBAR_INFO_ITEM_NAME,
-        TXT_STATUSBAR_NOT_FOUND,
-        TXT_STATUSBAR_ITEM_NOT_FOUND,
-	TXT_STATUSBAR_UNKNOWN_COMMAND,
-        TXT_STATUSBAR_UNKNOWN_TYPE,
-	TXT_STATUSBAR_UNKNOWN_PLACEMENT,
-        TXT_STATUSBAR_UNKNOWN_VISIBILITY,
-
-	TXT_FILL_4,
-
-	TXT_PASTE_WARNING,
-	TXT_PASTE_PROMPT,
-
-	TXT_COUNT
-};
-
-extern FORMAT_REC gui_text_formats[TXT_COUNT+1];