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

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)
 {

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 },

src/fe-common/irc/dcc/module-formats.h

@@ -1,4 +1,4 @@
-#include "printtext.h"
+#include "formats.h"
 
 enum {
 	IRCTXT_MODULE_NAME,

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)
 {

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++;
 	}

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"
 

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);

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)

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)

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)
 {

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 */
 

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;

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)
 {

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[] =
 {

src/fe-common/irc/flood/module-formats.h

@@ -1,4 +1,4 @@
-#include "printtext.h"
+#include "formats.h"
 
 enum {
 	IRCTXT_MODULE_NAME,

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 },

src/fe-common/irc/module-formats.h

@@ -1,4 +1,4 @@
-#include "printtext.h"
+#include "formats.h"
 
 enum {
 	IRCTXT_MODULE_NAME,

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)

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[] =
 {

src/fe-common/irc/notifylist/module-formats.h

@@ -1,4 +1,4 @@
-#include "printtext.h"
+#include "formats.h"
 
 enum {
 	IRCTXT_MODULE_NAME,