forked from PsychoticNinja/irssi
windows.h conflicted with microsoft's windows.h :) renamed windows.[ch] to
fe-windows.[ch] git-svn-id: http://svn.irssi.org/repos/irssi/trunk@846 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
2edcdd715f
commit
39630c3d58
@ -33,7 +33,7 @@ libfe_common_core_a_SOURCES = \
|
|||||||
window-commands.c \
|
window-commands.c \
|
||||||
window-items.c \
|
window-items.c \
|
||||||
window-save.c \
|
window-save.c \
|
||||||
windows.c
|
fe-windows.c
|
||||||
|
|
||||||
noinst_HEADERS = \
|
noinst_HEADERS = \
|
||||||
command-history.h \
|
command-history.h \
|
||||||
@ -50,4 +50,4 @@ noinst_HEADERS = \
|
|||||||
translation.h \
|
translation.h \
|
||||||
window-items.h \
|
window-items.h \
|
||||||
window-save.h \
|
window-save.h \
|
||||||
windows.h
|
fe-windows.h
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
#include "line-split.h"
|
#include "line-split.h"
|
||||||
#include "special-vars.h"
|
#include "special-vars.h"
|
||||||
|
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
|
|
||||||
static void sig_autorun(void)
|
static void sig_autorun(void)
|
||||||
{
|
{
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
#include "special-vars.h"
|
#include "special-vars.h"
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
|
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "window-items.h"
|
#include "window-items.h"
|
||||||
|
|
||||||
/* command history */
|
/* command history */
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#ifndef __COMMAND_HISTORY_H
|
#ifndef __COMMAND_HISTORY_H
|
||||||
#define __COMMAND_HISTORY_H
|
#define __COMMAND_HISTORY_H
|
||||||
|
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
|
|
||||||
void command_history_init(void);
|
void command_history_init(void);
|
||||||
void command_history_deinit(void);
|
void command_history_deinit(void);
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
#include "channels-setup.h"
|
#include "channels-setup.h"
|
||||||
#include "nicklist.h"
|
#include "nicklist.h"
|
||||||
|
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "window-items.h"
|
#include "window-items.h"
|
||||||
#include "printtext.h"
|
#include "printtext.h"
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
#include "formats.h"
|
#include "formats.h"
|
||||||
#include "themes.h"
|
#include "themes.h"
|
||||||
#include "translation.h"
|
#include "translation.h"
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "window-items.h"
|
#include "window-items.h"
|
||||||
#include "window-save.h"
|
#include "window-save.h"
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
#include "irssi-version.h"
|
#include "irssi-version.h"
|
||||||
|
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "printtext.h"
|
#include "printtext.h"
|
||||||
|
|
||||||
#define PASTE_CHECK_SPEED 200 /* 0.2 sec */
|
#define PASTE_CHECK_SPEED 200 /* 0.2 sec */
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
#include "special-vars.h"
|
#include "special-vars.h"
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
|
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "window-items.h"
|
#include "window-items.h"
|
||||||
#include "formats.h"
|
#include "formats.h"
|
||||||
#include "themes.h"
|
#include "themes.h"
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include "levels.h"
|
#include "levels.h"
|
||||||
#include "queries.h"
|
#include "queries.h"
|
||||||
|
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "window-items.h"
|
#include "window-items.h"
|
||||||
#include "printtext.h"
|
#include "printtext.h"
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
#include "levels.h"
|
#include "levels.h"
|
||||||
|
|
||||||
#include "printtext.h"
|
#include "printtext.h"
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "window-items.h"
|
#include "window-items.h"
|
||||||
|
|
||||||
GSList *windows; /* first in the list is the active window,
|
GSList *windows; /* first in the list is the active window,
|
@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
#include "levels.h"
|
#include "levels.h"
|
||||||
|
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "formats.h"
|
#include "formats.h"
|
||||||
#include "themes.h"
|
#include "themes.h"
|
||||||
#include "translation.h"
|
#include "translation.h"
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
#define __FORMATS_H
|
#define __FORMATS_H
|
||||||
|
|
||||||
#include "themes.h"
|
#include "themes.h"
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
|
|
||||||
#define PRINTFLAG_BOLD 0x01
|
#define PRINTFLAG_BOLD 0x01
|
||||||
#define PRINTFLAG_REVERSE 0x02
|
#define PRINTFLAG_REVERSE 0x02
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
|
|
||||||
#include "keyboard.h"
|
#include "keyboard.h"
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "printtext.h"
|
#include "printtext.h"
|
||||||
|
|
||||||
GSList *keyinfos;
|
GSList *keyinfos;
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
#include "servers.h"
|
#include "servers.h"
|
||||||
|
|
||||||
#include "themes.h"
|
#include "themes.h"
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "printtext.h"
|
#include "printtext.h"
|
||||||
|
|
||||||
static int beep_msg_level, beep_when_away;
|
static int beep_msg_level, beep_when_away;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#ifndef __PRINTTEXT_H
|
#ifndef __PRINTTEXT_H
|
||||||
#define __PRINTTEXT_H
|
#define __PRINTTEXT_H
|
||||||
|
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
|
|
||||||
void printformat_module(const char *module, void *server, const char *target, int level, int formatnum, ...);
|
void printformat_module(const char *module, void *server, const char *target, int level, int formatnum, ...);
|
||||||
void printformat_module_window(const char *module, WINDOW_REC *window, int level, int formatnum, ...);
|
void printformat_module_window(const char *module, WINDOW_REC *window, int level, int formatnum, ...);
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
|
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "window-items.h"
|
#include "window-items.h"
|
||||||
#include "nicklist.h"
|
#include "nicklist.h"
|
||||||
#include "hilight-text.h"
|
#include "hilight-text.h"
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
#include "levels.h"
|
#include "levels.h"
|
||||||
|
|
||||||
#include "themes.h"
|
#include "themes.h"
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "window-items.h"
|
#include "window-items.h"
|
||||||
#include "window-save.h"
|
#include "window-save.h"
|
||||||
#include "printtext.h"
|
#include "printtext.h"
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
#include "levels.h"
|
#include "levels.h"
|
||||||
|
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "window-items.h"
|
#include "window-items.h"
|
||||||
#include "printtext.h"
|
#include "printtext.h"
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#ifndef __WINDOW_ITEMS_H
|
#ifndef __WINDOW_ITEMS_H
|
||||||
#define __WINDOW_ITEMS_H
|
#define __WINDOW_ITEMS_H
|
||||||
|
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
|
|
||||||
/* Add/remove window item from `window' */
|
/* Add/remove window item from `window' */
|
||||||
void window_add_item(WINDOW_REC *window, WI_ITEM_REC *item, int automatic);
|
void window_add_item(WINDOW_REC *window, WI_ITEM_REC *item, int automatic);
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
#include "queries.h"
|
#include "queries.h"
|
||||||
|
|
||||||
#include "themes.h"
|
#include "themes.h"
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "window-items.h"
|
#include "window-items.h"
|
||||||
|
|
||||||
static void sig_window_restore_item(WINDOW_REC *window, const char *type,
|
static void sig_window_restore_item(WINDOW_REC *window, const char *type,
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
#include "completion.h"
|
#include "completion.h"
|
||||||
#include "themes.h"
|
#include "themes.h"
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
|
|
||||||
#include "module-formats.h"
|
#include "module-formats.h"
|
||||||
#include "printtext.h"
|
#include "printtext.h"
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
#include "queries.h"
|
#include "queries.h"
|
||||||
#include "ignore.h"
|
#include "ignore.h"
|
||||||
|
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "window-items.h"
|
#include "window-items.h"
|
||||||
#include "printtext.h"
|
#include "printtext.h"
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
#include "fe-queries.h"
|
#include "fe-queries.h"
|
||||||
#include "irc-channels.h"
|
#include "irc-channels.h"
|
||||||
#include "irc-nicklist.h"
|
#include "irc-nicklist.h"
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "printtext.h"
|
#include "printtext.h"
|
||||||
|
|
||||||
#include "completion.h"
|
#include "completion.h"
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
#include "irc-queries.h"
|
#include "irc-queries.h"
|
||||||
|
|
||||||
#include "fe-queries.h"
|
#include "fe-queries.h"
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "window-items.h"
|
#include "window-items.h"
|
||||||
#include "printtext.h"
|
#include "printtext.h"
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
#include "servers-reconnect.h"
|
#include "servers-reconnect.h"
|
||||||
#include "irc-servers-setup.h"
|
#include "irc-servers-setup.h"
|
||||||
|
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "printtext.h"
|
#include "printtext.h"
|
||||||
|
|
||||||
static void sig_server_add_create(IRC_SERVER_SETUP_REC **rec,
|
static void sig_server_add_create(IRC_SERVER_SETUP_REC **rec,
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
#include "commands.h"
|
#include "commands.h"
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
|
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "formats.h"
|
#include "formats.h"
|
||||||
#include "printtext.h"
|
#include "printtext.h"
|
||||||
#include "themes.h"
|
#include "themes.h"
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
#include "command-history.h"
|
#include "command-history.h"
|
||||||
#include "keyboard.h"
|
#include "keyboard.h"
|
||||||
#include "translation.h"
|
#include "translation.h"
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
|
|
||||||
#include "screen.h"
|
#include "screen.h"
|
||||||
#include "gui-entry.h"
|
#include "gui-entry.h"
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
|
|
||||||
#include "irc-servers.h"
|
#include "irc-servers.h"
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "printtext.h"
|
#include "printtext.h"
|
||||||
|
|
||||||
#include "screen.h"
|
#include "screen.h"
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
#include "irc.h"
|
#include "irc.h"
|
||||||
#include "channels.h"
|
#include "channels.h"
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
|
|
||||||
#include "screen.h"
|
#include "screen.h"
|
||||||
#include "gui-entry.h"
|
#include "gui-entry.h"
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
#include "module.h"
|
#include "module.h"
|
||||||
#include "signals.h"
|
#include "signals.h"
|
||||||
|
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "gui-windows.h"
|
#include "gui-windows.h"
|
||||||
|
|
||||||
static void sig_activity(WINDOW_REC *window)
|
static void sig_activity(WINDOW_REC *window)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#ifndef __MAINWINDOWS_H
|
#ifndef __MAINWINDOWS_H
|
||||||
#define __MAINWINDOWS_H
|
#define __MAINWINDOWS_H
|
||||||
|
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "screen.h"
|
#include "screen.h"
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
#include "irc-servers.h"
|
#include "irc-servers.h"
|
||||||
#include "nicklist.h"
|
#include "nicklist.h"
|
||||||
|
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
#include "window-items.h"
|
#include "window-items.h"
|
||||||
#include "printtext.h"
|
#include "printtext.h"
|
||||||
#include "formats.h"
|
#include "formats.h"
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
#include "servers.h"
|
#include "servers.h"
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
|
|
||||||
#include "windows.h"
|
#include "fe-windows.h"
|
||||||
|
|
||||||
#include "screen.h"
|
#include "screen.h"
|
||||||
#include "statusbar.h"
|
#include "statusbar.h"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user