Cleaned up printtext.c, split part of it to formats.c

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@796 dbcabf3a-b0e7-0310-adc4-f8d773084564

20 files changed, 28 insertions, 12 deletions

diff --git a/src/fe-common/irc/dcc/fe-dcc.c b/src/fe-common/irc/dcc/fe-dcc.c
index 08869107..bcd6ae34 100644
--- a/src/fe-common/irc/dcc/fe-dcc.c
+++ b/src/fe-common/irc/dcc/fe-dcc.c
@@ -35,6 +35,7 @@
 #include "windows.h"
 
 #include "module-formats.h"
+#include "printtext.h"
 
 static void dcc_connected(DCC_REC *dcc)
 {
diff --git a/src/fe-common/irc/dcc/module-formats.c b/src/fe-common/irc/dcc/module-formats.c
index 4fe22dbd..3994e9d3 100644
--- a/src/fe-common/irc/dcc/module-formats.c
+++ b/src/fe-common/irc/dcc/module-formats.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "printtext.h"
+#include "formats.h"
 
 FORMAT_REC fecommon_irc_dcc_formats[] = {
 	{ MODULE_NAME, "IRC", 0 },
diff --git a/src/fe-common/irc/dcc/module-formats.h b/src/fe-common/irc/dcc/module-formats.h
index ac07846d..f1a89e62 100644
--- a/src/fe-common/irc/dcc/module-formats.h
+++ b/src/fe-common/irc/dcc/module-formats.h
@@ -1,4 +1,4 @@
-#include "printtext.h"
+#include "formats.h"
 
 enum {
 	IRCTXT_MODULE_NAME,
diff --git a/src/fe-common/irc/fe-ctcp.c b/src/fe-common/irc/fe-ctcp.c
index 1c2ed843..02703883 100644
--- a/src/fe-common/irc/fe-ctcp.c
+++ b/src/fe-common/irc/fe-ctcp.c
@@ -32,6 +32,7 @@
 
 #include "windows.h"
 #include "window-items.h"
+#include "printtext.h"
 
 static void ctcp_print(const char *pre, const char *data, IRC_SERVER_REC *server, const char *nick, const char *addr, const char *target)
 {
diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 0bc6d245..fb506d68 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -30,6 +30,8 @@
 #include "irc-channels.h"
 #include "nicklist.h"
 
+#include "printtext.h"
+
 static char *last_away_nick = NULL;
 static char *last_away_msg = NULL;
 
@@ -96,10 +98,10 @@ static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist, gint it
 	    memset(linebuf, ' ', max);
 	    nickmode[0] = rec->op ? '@' : rec->voice ? '+' : ' ';
 	    memcpy(linebuf, rec->nick, strlen(rec->nick));
-	    ret = output_format_get_text(MODULE_NAME, NULL,
-					 channel->server, channel->name,
-					 IRCTXT_NAMES_NICK, nickmode, linebuf);
-            g_string_append(str, ret);
+	    ret = format_get_text(MODULE_NAME, NULL,
+				  channel->server, channel->name,
+				  IRCTXT_NAMES_NICK, nickmode, linebuf);
+	    g_string_append(str, ret);
 	    g_free(ret);
 	    cols++;
 	}
diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index acce8c20..4e1c70f7 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -36,6 +36,7 @@
 #include "irc-channels.h"
 #include "irc-nicklist.h"
 #include "windows.h"
+#include "printtext.h"
 
 #include "completion.h"
 
diff --git a/src/fe-common/irc/fe-irc-channels.c b/src/fe-common/irc/fe-irc-channels.c
index 8a7de92d..ef9a79b8 100644
--- a/src/fe-common/irc/fe-irc-channels.c
+++ b/src/fe-common/irc/fe-irc-channels.c
@@ -28,6 +28,8 @@
 #include "irc.h"
 #include "channel-rejoin.h"
 
+#include "printtext.h"
+
 static void sig_channel_rejoin(IRC_SERVER_REC *server, REJOIN_REC *rec)
 {
 	g_return_if_fail(rec != NULL);
diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c
index aae3bbc1..43bf0e94 100644
--- a/src/fe-common/irc/fe-irc-commands.c
+++ b/src/fe-common/irc/fe-irc-commands.c
@@ -36,6 +36,7 @@
 #include "fe-queries.h"
 #include "windows.h"
 #include "window-items.h"
+#include "printtext.h"
 
 /* SYNTAX: ME <message> */
 static void cmd_me(gchar *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
diff --git a/src/fe-common/irc/fe-irc-server.c b/src/fe-common/irc/fe-irc-server.c
index ace02feb..635391c4 100644
--- a/src/fe-common/irc/fe-irc-server.c
+++ b/src/fe-common/irc/fe-irc-server.c
@@ -32,6 +32,7 @@
 #include "irc-servers-setup.h"
 
 #include "windows.h"
+#include "printtext.h"
 
 static void sig_server_add_create(IRC_SERVER_SETUP_REC **rec,
 				  GHashTable *optlist)
diff --git a/src/fe-common/irc/fe-ircnet.c b/src/fe-common/irc/fe-ircnet.c
index 090c8a61..99dd7a69 100644
--- a/src/fe-common/irc/fe-ircnet.c
+++ b/src/fe-common/irc/fe-ircnet.c
@@ -28,6 +28,7 @@
 
 #include "irc-servers.h"
 #include "irc-chatnets.h"
+#include "printtext.h"
 
 static void cmd_ircnet_list(void)
 {
diff --git a/src/fe-common/irc/fe-netjoin.c b/src/fe-common/irc/fe-netjoin.c
index 9ce718db..40b43dcb 100644
--- a/src/fe-common/irc/fe-netjoin.c
+++ b/src/fe-common/irc/fe-netjoin.c
@@ -31,6 +31,8 @@
 #include "ignore.h"
 #include "netsplit.h"
 
+#include "printtext.h"
+
 #define NETJOIN_WAIT_TIME 2 /* how many seconds to wait for the netsplitted JOIN messages to stop */
 #define NETJOIN_MAX_WAIT 30 /* how many seconds to wait for nick to join to the rest of the channels she was before the netsplit */
 
diff --git a/src/fe-common/irc/fe-netsplit.c b/src/fe-common/irc/fe-netsplit.c
index a756ea7a..4b3a19a6 100644
--- a/src/fe-common/irc/fe-netsplit.c
+++ b/src/fe-common/irc/fe-netsplit.c
@@ -30,6 +30,8 @@
 #include "ignore.h"
 #include "netsplit.h"
 
+#include "printtext.h"
+
 #define SPLIT_WAIT_TIME 2 /* how many seconds to wait for the QUIT split messages to stop */
 
 static int split_tag;
diff --git a/src/fe-common/irc/flood/fe-flood.c b/src/fe-common/irc/flood/fe-flood.c
index ce96699f..7f5a0ee5 100644
--- a/src/fe-common/irc/flood/fe-flood.c
+++ b/src/fe-common/irc/flood/fe-flood.c
@@ -27,6 +27,7 @@
 #include "irc/flood/autoignore.h"
 
 #include "themes.h"
+#include "printtext.h"
 
 static void event_autoignore_new(IRC_SERVER_REC *server, AUTOIGNORE_REC *ignore)
 {
diff --git a/src/fe-common/irc/flood/module-formats.c b/src/fe-common/irc/flood/module-formats.c
index 2cca360f..29b76ace 100644
--- a/src/fe-common/irc/flood/module-formats.c
+++ b/src/fe-common/irc/flood/module-formats.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "printtext.h"
+#include "formats.h"
 
 FORMAT_REC fecommon_irc_flood_formats[] =
 {
diff --git a/src/fe-common/irc/flood/module-formats.h b/src/fe-common/irc/flood/module-formats.h
index 7386dd2a..73e313ba 100644
--- a/src/fe-common/irc/flood/module-formats.h
+++ b/src/fe-common/irc/flood/module-formats.h
@@ -1,4 +1,4 @@
-#include "printtext.h"
+#include "formats.h"
 
 enum {
 	IRCTXT_MODULE_NAME,
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 01197397..4229faff 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "printtext.h"
+#include "formats.h"
 
 FORMAT_REC fecommon_irc_formats[] = {
 	{ MODULE_NAME, "IRC", 0 },
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index 4bf14185..c1ad6d9d 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -1,4 +1,4 @@
-#include "printtext.h"
+#include "formats.h"
 
 enum {
 	IRCTXT_MODULE_NAME,
diff --git a/src/fe-common/irc/notifylist/fe-notifylist.c b/src/fe-common/irc/notifylist/fe-notifylist.c
index cd9adf9c..a408fb15 100644
--- a/src/fe-common/irc/notifylist/fe-notifylist.c
+++ b/src/fe-common/irc/notifylist/fe-notifylist.c
@@ -33,6 +33,7 @@
 #include "irc/notifylist/notifylist.h"
 
 #include "themes.h"
+#include "printtext.h"
 
 /* add the nick of a hostmask to list if it isn't there already */
 static GSList *mask_add_once(GSList *list, const char *mask)
diff --git a/src/fe-common/irc/notifylist/module-formats.c b/src/fe-common/irc/notifylist/module-formats.c
index 345dfe24..0b29406e 100644
--- a/src/fe-common/irc/notifylist/module-formats.c
+++ b/src/fe-common/irc/notifylist/module-formats.c
@@ -19,7 +19,7 @@
 */
 
 #include "module.h"
-#include "printtext.h"
+#include "formats.h"
 
 FORMAT_REC fecommon_irc_notifylist_formats[] =
 {
diff --git a/src/fe-common/irc/notifylist/module-formats.h b/src/fe-common/irc/notifylist/module-formats.h
index e37045f1..e934def3 100644
--- a/src/fe-common/irc/notifylist/module-formats.h
+++ b/src/fe-common/irc/notifylist/module-formats.h
@@ -1,4 +1,4 @@
-#include "printtext.h"
+#include "formats.h"
 
 enum {
 	IRCTXT_MODULE_NAME,