zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-08 19:30:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Zmiana irssi -> irssip dla bezkonfliktowych testów

Browse source 
- Zmiana incdir z 'irssi' na 'irssip' w meson.build
- Zmiana nazwy binarja z 'irssi' na 'irssip'
- Zmiana katalogu config z ~/.irssi na ~/.irssip
- Aktualizacja wszystkich include paths z <irssi/> na <irssip/>
- Przywrócenie nazw plików źródłowych do oryginalnych 'irssi*'

Teraz może być instalowane w /opt/irssip bez konfliktów z systemowym irssi:
- Binarka: /opt/irssip/bin/irssip
- Konfiguracja: ~/.irssip/
- Moduły Perl: /opt/irssip/lib/irssip/perl/Irssi.pm
- Separacja modułów: systemowy irssi nie znajdzie naszych modułów w @INC
This commit is contained in:
kofany 2025-08-22 20:24:12 +02:00
commit 7bb2ee96ca
290 changed files with 1958 additions and 1958 deletions
Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -20,7 +20,7 @@ if host_machine.system() == 'android'
endif endif
includedir = get_option('includedir') includedir = get_option('includedir')
incdir = 'irssi' incdir = 'irssip'
moduledir = get_option('libdir') / incdir / 'modules' moduledir = get_option('libdir') / incdir / 'modules'
helpdir = get_option('datadir') / incdir / 'help' helpdir = get_option('datadir') / incdir / 'help'
themedir = get_option('datadir') / incdir / 'themes' themedir = get_option('datadir') / incdir / 'themes'

4
src/common.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_COMMON_H #ifndef IRSSI_COMMON_H
#define IRSSI_COMMON_H #define IRSSI_COMMON_H
#define IRSSI_DIR_FULL "%s/.irssi" /* %s == g_get_home_dir() */ #define IRSSI_DIR_FULL "%s/.irssip" /* %s == g_get_home_dir() */
#define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */ #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
#define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */ #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
@ -11,7 +11,7 @@
#define DEFAULT_SERVER_ADD_PORT 6667 #define DEFAULT_SERVER_ADD_PORT 6667
#define DEFAULT_SERVER_ADD_TLS_PORT 6697 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
#include <irssi/irssi-config.h> #include <irssip/irssi-config.h>
#include <stdio.h> #include <stdio.h>
#include <stddef.h> #include <stddef.h>

2
src/core/args.c
View file

@ -19,7 +19,7 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/args.h> #include <irssip/src/core/args.h>
static GOptionContext *context = NULL; static GOptionContext *context = NULL;

16
src/core/capsicum.c
View file

@ -23,14 +23,14 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/capsicum.h> #include <irssip/src/core/capsicum.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/log.h> #include <irssip/src/core/log.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/network.h> #include <irssip/src/core/network.h>
#include <irssi/src/core/network-openssl.h> #include <irssip/src/core/network-openssl.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/capsicum.h> #include <sys/capsicum.h>

2
src/core/channel-rec.h
View file

@ -1,6 +1,6 @@
/* CHANNEL_REC definition, used for inheritance */ /* CHANNEL_REC definition, used for inheritance */
#include <irssi/src/core/window-item-rec.h> #include <irssip/src/core/window-item-rec.h>
char *topic; char *topic;
char *topic_by; char *topic_by;

14
src/core/channels-setup.c
View file

@ -19,14 +19,14 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/lib-config/iconfig.h> #include <irssip/src/lib-config/iconfig.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/chat-protocols.h> #include <irssip/src/core/chat-protocols.h>
#include <irssi/src/core/chatnets.h> #include <irssip/src/core/chatnets.h>
#include <irssi/src/core/servers-setup.h> #include <irssip/src/core/servers-setup.h>
#include <irssi/src/core/channels-setup.h> #include <irssip/src/core/channels-setup.h>
GSList *setupchannels; GSList *setupchannels;

4
src/core/channels-setup.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_CORE_CHANNELS_SETUP_H #ifndef IRSSI_CORE_CHANNELS_SETUP_H
#define IRSSI_CORE_CHANNELS_SETUP_H #define IRSSI_CORE_CHANNELS_SETUP_H
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
#define CHANNEL_SETUP(server) \ #define CHANNEL_SETUP(server) \
MODULE_CHECK_CAST(server, CHANNEL_SETUP_REC, type, "CHANNEL SETUP") MODULE_CHECK_CAST(server, CHANNEL_SETUP_REC, type, "CHANNEL SETUP")
@ -10,7 +10,7 @@
(CHANNEL_SETUP(server) ? TRUE : FALSE) (CHANNEL_SETUP(server) ? TRUE : FALSE)
struct _CHANNEL_SETUP_REC { struct _CHANNEL_SETUP_REC {
#include <irssi/src/core/channel-setup-rec.h> #include <irssip/src/core/channel-setup-rec.h>
}; };
extern GSList *setupchannels; extern GSList *setupchannels;

14
src/core/channels.c
View file

@ -19,14 +19,14 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/special-vars.h> #include <irssip/src/core/special-vars.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/channels.h> #include <irssip/src/core/channels.h>
#include <irssi/src/core/channels-setup.h> #include <irssip/src/core/channels-setup.h>
#include <irssi/src/core/nicklist.h> #include <irssip/src/core/nicklist.h>
GSList *channels; /* List of all channels */ GSList *channels; /* List of all channels */

4
src/core/channels.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_CORE_CHANNELS_H #ifndef IRSSI_CORE_CHANNELS_H
#define IRSSI_CORE_CHANNELS_H #define IRSSI_CORE_CHANNELS_H
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
/* Returns CHANNEL_REC if it's channel, NULL if it isn't. */ /* Returns CHANNEL_REC if it's channel, NULL if it isn't. */
#define CHANNEL(channel) \ #define CHANNEL(channel) \
@ -13,7 +13,7 @@
#define STRUCT_SERVER_REC SERVER_REC #define STRUCT_SERVER_REC SERVER_REC
struct _CHANNEL_REC { struct _CHANNEL_REC {
#include <irssi/src/core/channel-rec.h> #include <irssip/src/core/channel-rec.h>
}; };
extern GSList *channels; extern GSList *channels;

28
src/core/chat-commands.c
View file

@ -19,21 +19,21 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/network.h> #include <irssip/src/core/network.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/special-vars.h> #include <irssip/src/core/special-vars.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/chat-protocols.h> #include <irssip/src/core/chat-protocols.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/servers-setup.h> #include <irssip/src/core/servers-setup.h>
#include <irssi/src/core/servers-reconnect.h> #include <irssip/src/core/servers-reconnect.h>
#include <irssi/src/core/channels.h> #include <irssip/src/core/channels.h>
#include <irssi/src/core/chatnets.h> #include <irssip/src/core/chatnets.h>
#include <irssi/src/core/queries.h> #include <irssip/src/core/queries.h>
#include <irssi/src/core/window-item-def.h> #include <irssip/src/core/window-item-def.h>
#include <irssi/src/core/rawlog.h> #include <irssip/src/core/rawlog.h>
static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr, static SERVER_CONNECT_REC *get_server_connect(const char *data, int *plus_addr,
char **rawlog_file) char **rawlog_file)

14
src/core/chat-protocols.c
View file

@ -19,14 +19,14 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/chat-protocols.h> #include <irssip/src/core/chat-protocols.h>
#include <irssi/src/core/chatnets.h> #include <irssip/src/core/chatnets.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/servers-setup.h> #include <irssip/src/core/servers-setup.h>
#include <irssi/src/core/channels-setup.h> #include <irssip/src/core/channels-setup.h>
GSList *chat_protocols; GSList *chat_protocols;

18
src/core/chatnets.c
View file

@ -19,16 +19,16 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/network.h> #include <irssip/src/core/network.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/special-vars.h> #include <irssip/src/core/special-vars.h>
#include <irssi/src/lib-config/iconfig.h> #include <irssip/src/lib-config/iconfig.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/chat-protocols.h> #include <irssip/src/core/chat-protocols.h>
#include <irssi/src/core/chatnets.h> #include <irssip/src/core/chatnets.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
GSList *chatnets, *chatnets_unavailable; /* list of available chat networks */ GSList *chatnets, *chatnets_unavailable; /* list of available chat networks */

4
src/core/chatnets.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_CORE_CHATNETS_H #ifndef IRSSI_CORE_CHATNETS_H
#define IRSSI_CORE_CHATNETS_H #define IRSSI_CORE_CHATNETS_H
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
/* Returns CHATNET_REC if it's chatnet, NULL if it isn't. */ /* Returns CHATNET_REC if it's chatnet, NULL if it isn't. */
#define CHATNET(chatnet) \ #define CHATNET(chatnet) \
@ -11,7 +11,7 @@
(CHATNET(chatnet) ? TRUE : FALSE) (CHATNET(chatnet) ? TRUE : FALSE)
struct _CHATNET_REC { struct _CHATNET_REC {
#include <irssi/src/core/chatnet-rec.h> #include <irssip/src/core/chatnet-rec.h>
}; };
extern GSList *chatnets; /* list of available chat networks */ extern GSList *chatnets; /* list of available chat networks */

18
src/core/commands.c
View file

@ -19,17 +19,17 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/special-vars.h> #include <irssip/src/core/special-vars.h>
#include <irssi/src/core/window-item-def.h> #include <irssip/src/core/window-item-def.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/channels.h> #include <irssip/src/core/channels.h>
#include <irssi/src/lib-config/iconfig.h> #include <irssip/src/lib-config/iconfig.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
GSList *commands; GSList *commands;
char *current_command; char *current_command;

2
src/core/commands.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_CORE_COMMANDS_H #ifndef IRSSI_CORE_COMMANDS_H
#define IRSSI_CORE_COMMANDS_H #define IRSSI_CORE_COMMANDS_H
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
typedef struct { typedef struct {
SIGNAL_FUNC func; SIGNAL_FUNC func;

48
src/core/core.c
View file

@ -21,35 +21,35 @@
#include "module.h" #include "module.h"
#include <signal.h> #include <signal.h>
#include <irssi/src/core/args.h> #include <irssip/src/core/args.h>
#include <irssi/src/core/pidwait.h> #include <irssip/src/core/pidwait.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/net-disconnect.h> #include <irssip/src/core/net-disconnect.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/session.h> #include <irssip/src/core/session.h>
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
#include <irssi/src/core/capsicum.h> #include <irssip/src/core/capsicum.h>
#endif #endif
#include <irssi/src/core/chat-protocols.h> #include <irssip/src/core/chat-protocols.h>
#include <irssi/src/core/chatnets.h> #include <irssip/src/core/chatnets.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/expandos.h> #include <irssip/src/core/expandos.h>
#include <irssi/src/core/ignore.h> #include <irssip/src/core/ignore.h>
#include <irssi/src/core/log.h> #include <irssip/src/core/log.h>
#include <irssi/src/core/rawlog.h> #include <irssip/src/core/rawlog.h>
#include <irssi/src/core/recode.h> #include <irssip/src/core/recode.h>
#include <irssi/src/core/refstrings.h> #include <irssip/src/core/refstrings.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/special-vars.h> #include <irssip/src/core/special-vars.h>
#include <irssi/src/core/write-buffer.h> #include <irssip/src/core/write-buffer.h>
#include <irssi/src/core/channels.h> #include <irssip/src/core/channels.h>
#include <irssi/src/core/queries.h> #include <irssip/src/core/queries.h>
#include <irssi/src/core/nicklist.h> #include <irssip/src/core/nicklist.h>
#include <irssi/src/core/nickmatch-cache.h> #include <irssip/src/core/nickmatch-cache.h>
#ifdef HAVE_SYS_RESOURCE_H #ifdef HAVE_SYS_RESOURCE_H
# include <sys/resource.h> # include <sys/resource.h>

2
src/core/core.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_CORE_CORE_H #ifndef IRSSI_CORE_CORE_H
#define IRSSI_CORE_CORE_H #define IRSSI_CORE_CORE_H
#include <irssi/src/common.h> #include <irssip/src/common.h>
/* for determining what GUI is currently in use: */ /* for determining what GUI is currently in use: */
#define IRSSI_GUI_NONE 0 #define IRSSI_GUI_NONE 0

24
src/core/expandos.c
View file

@ -18,20 +18,20 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include <irssi/src/core/core.h> #include <irssip/src/core/core.h>
#include "module.h" #include "module.h"
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/expandos.h> #include <irssip/src/core/expandos.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/irssi-version.h> #include <irssip/irssi-version.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/channels.h> #include <irssip/src/core/channels.h>
#include <irssi/src/core/queries.h> #include <irssip/src/core/queries.h>
#include <irssi/src/core/window-item-def.h> #include <irssip/src/core/window-item-def.h>
#ifdef HAVE_SYS_UTSNAME_H #ifdef HAVE_SYS_UTSNAME_H
# include <sys/utsname.h> # include <sys/utsname.h>

2
src/core/expandos.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_CORE_EXPANDOS_H #ifndef IRSSI_CORE_EXPANDOS_H
#define IRSSI_CORE_EXPANDOS_H #define IRSSI_CORE_EXPANDOS_H
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
/* first argument of signal must match to active .. */ /* first argument of signal must match to active .. */
typedef enum { typedef enum {

24
src/core/ignore.c
View file

@ -19,20 +19,20 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/lib-config/iconfig.h> #include <irssip/src/lib-config/iconfig.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/iregex.h> #include <irssip/src/core/iregex.h>
#include <irssi/src/core/masks.h> #include <irssip/src/core/masks.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/channels.h> #include <irssip/src/core/channels.h>
#include <irssi/src/core/nicklist.h> #include <irssip/src/core/nicklist.h>
#include <irssi/src/core/nickmatch-cache.h> #include <irssip/src/core/nickmatch-cache.h>
#include <irssi/src/core/ignore.h> #include <irssip/src/core/ignore.h>
GSList *ignores; GSList *ignores;

2
src/core/ignore.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_CORE_IGNORE_H #ifndef IRSSI_CORE_IGNORE_H
#define IRSSI_CORE_IGNORE_H #define IRSSI_CORE_IGNORE_H
#include <irssi/src/core/iregex.h> #include <irssip/src/core/iregex.h>
typedef struct _IGNORE_REC IGNORE_REC; typedef struct _IGNORE_REC IGNORE_REC;

2
src/core/iregex-gregex.c
View file

@ -1,6 +1,6 @@
#include <string.h> #include <string.h>
#include <irssi/src/core/iregex.h> #include <irssip/src/core/iregex.h>
struct _MatchInfo { struct _MatchInfo {
const char *valid_string; const char *valid_string;

2
src/core/iregex.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_CORE_IREGEX_H #ifndef IRSSI_CORE_IREGEX_H
#define IRSSI_CORE_IREGEX_H #define IRSSI_CORE_IREGEX_H
#include <irssi/src/common.h> #include <irssip/src/common.h>
#include <glib.h> #include <glib.h>
typedef GRegex Regex; typedef GRegex Regex;

4
src/core/levels.c
View file

@ -19,8 +19,8 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
/* the order of these levels must match the bits in levels.h */ /* the order of these levels must match the bits in levels.h */
static const char *levels[] = { static const char *levels[] = {

2
src/core/line-split.c
View file

@ -19,7 +19,7 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
/* Maximum line length - split to two lines if it's longer than this. /* Maximum line length - split to two lines if it's longer than this.

12
src/core/log-away.c
View file

@ -19,12 +19,12 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/log.h> #include <irssip/src/core/log.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/write-buffer.h> #include <irssip/src/core/write-buffer.h>
static LOG_REC *awaylog; static LOG_REC *awaylog;
static int away_filepos; static int away_filepos;

20
src/core/log.c
View file

@ -19,19 +19,19 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/log.h> #include <irssip/src/core/log.h>
#include <irssi/src/core/write-buffer.h> #include <irssip/src/core/write-buffer.h>
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
#include <irssi/src/core/capsicum.h> #include <irssip/src/core/capsicum.h>
#endif #endif
#include <irssi/src/lib-config/iconfig.h> #include <irssip/src/lib-config/iconfig.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#define DEFAULT_LOG_FILE_CREATE_MODE 600 #define DEFAULT_LOG_FILE_CREATE_MODE 600

6
src/core/masks.c
View file

@ -19,10 +19,10 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/network.h> #include <irssip/src/core/network.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
/* Returns TRUE if mask contains '!' ie. address should be checked too. /* Returns TRUE if mask contains '!' ie. address should be checked too.
Also checks if mask contained any wildcards. */ Also checks if mask contained any wildcards. */

4
src/core/misc.c
View file

@ -19,8 +19,8 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
typedef struct { typedef struct {
int condition; int condition;

2
src/core/module.h
View file

@ -1,3 +1,3 @@
#include <irssi/src/common.h> #include <irssip/src/common.h>
#define MODULE_NAME "core" #define MODULE_NAME "core"

12
src/core/modules-load.c
View file

@ -19,13 +19,13 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
#include <irssi/src/core/modules-load.h> #include <irssip/src/core/modules-load.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
/* Returns the module name without path, "lib" prefix or ".so" suffix */ /* Returns the module name without path, "lib" prefix or ".so" suffix */
static char *module_get_name(const char *path, int *start, int *end) static char *module_get_name(const char *path, int *start, int *end)

2
src/core/modules-load.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_CORE_MODULES_LOAD_H #ifndef IRSSI_CORE_MODULES_LOAD_H
#define IRSSI_CORE_MODULES_LOAD_H #define IRSSI_CORE_MODULES_LOAD_H
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
/* Load module - automatically tries to load also the related non-core /* Load module - automatically tries to load also the related non-core
modules given in `prefixes' (like irc, fe, fe_text, ..) */ modules given in `prefixes' (like irc, fe, fe_text, ..) */

4
src/core/modules.c
View file

@ -19,8 +19,8 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
GSList *modules; GSList *modules;

2
src/core/net-disconnect.c
View file

@ -19,7 +19,7 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/network.h> #include <irssip/src/core/network.h>
#include <sys/select.h> #include <sys/select.h>

4
src/core/net-nonblock.c
View file

@ -22,8 +22,8 @@
#include <signal.h> #include <signal.h>
#include <irssi/src/core/pidwait.h> #include <irssip/src/core/pidwait.h>
#include <irssi/src/core/net-nonblock.h> #include <irssip/src/core/net-nonblock.h>
/* nonblocking gethostbyname(), ip (IPADDR) + error (int, 0 = not error) is /* nonblocking gethostbyname(), ip (IPADDR) + error (int, 0 = not error) is
written to pipe when found PID of the resolver child is returned */ written to pipe when found PID of the resolver child is returned */

2
src/core/net-nonblock.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_CORE_NET_NONBLOCK_H #ifndef IRSSI_CORE_NET_NONBLOCK_H
#define IRSSI_CORE_NET_NONBLOCK_H #define IRSSI_CORE_NET_NONBLOCK_H
#include <irssi/src/core/network.h> #include <irssip/src/core/network.h>
typedef struct { typedef struct {
IPADDR ip4, ip6; /* resolved ip addresses */ IPADDR ip4, ip6; /* resolved ip addresses */

6
src/core/net-sendbuffer.c
View file

@ -20,9 +20,9 @@
#include "module.h" #include "module.h"
#include <irssi/src/core/network.h> #include <irssip/src/core/network.h>
#include <irssi/src/core/net-sendbuffer.h> #include <irssip/src/core/net-sendbuffer.h>
#include <irssi/src/core/line-split.h> #include <irssip/src/core/line-split.h>
/* Create new buffer - if `bufsize' is zero or less, DEFAULT_BUFFER_SIZE /* Create new buffer - if `bufsize' is zero or less, DEFAULT_BUFFER_SIZE
is used */ is used */

14
src/core/network-openssl.c
View file

@ -19,13 +19,13 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/network.h> #include <irssip/src/core/network.h>
#include <irssi/src/core/network-openssl.h> #include <irssip/src/core/network-openssl.h>
#include <irssi/src/core/net-sendbuffer.h> #include <irssip/src/core/net-sendbuffer.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/tls.h> #include <irssip/src/core/tls.h>
#include <openssl/crypto.h> #include <openssl/crypto.h>
#include <openssl/objects.h> #include <openssl/objects.h>

4
src/core/network.c
View file

@ -19,9 +19,9 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/network.h> #include <irssip/src/core/network.h>
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
#include <irssi/src/core/capsicum.h> #include <irssip/src/core/capsicum.h>
#endif #endif
#include <sys/un.h> #include <sys/un.h>

12
src/core/nicklist.c
View file

@ -19,13 +19,13 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/channels.h> #include <irssip/src/core/channels.h>
#include <irssi/src/core/nicklist.h> #include <irssip/src/core/nicklist.h>
#include <irssi/src/core/masks.h> #include <irssip/src/core/masks.h>
#define isalnumhigh(a) \ #define isalnumhigh(a) \
(i_isalnum(a) || (unsigned char) (a) >= 128) (i_isalnum(a) || (unsigned char) (a) >= 128)

2
src/core/nicklist.h
View file

@ -11,7 +11,7 @@
#define MAX_USER_PREFIXES 7 /* Max prefixes kept for any user-in-chan. 7+1 is a memory unit */ #define MAX_USER_PREFIXES 7 /* Max prefixes kept for any user-in-chan. 7+1 is a memory unit */
struct _NICK_REC { struct _NICK_REC {
#include <irssi/src/core/nick-rec.h> #include <irssip/src/core/nick-rec.h>
}; };
/* Add new nick to list */ /* Add new nick to list */

8
src/core/nickmatch-cache.c
View file

@ -19,12 +19,12 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/channels.h> #include <irssip/src/core/channels.h>
#include <irssi/src/core/nicklist.h> #include <irssip/src/core/nicklist.h>
#include <irssi/src/core/nickmatch-cache.h> #include <irssip/src/core/nickmatch-cache.h>
static GSList *lists; static GSList *lists;

4
src/core/pidwait.c
View file

@ -19,8 +19,8 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
static GHashTable *child_pids; static GHashTable *child_pids;
static GSList *pids; static GSList *pids;

8
src/core/queries.c
View file

@ -19,11 +19,11 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/queries.h> #include <irssip/src/core/queries.h>
GSList *queries; GSList *queries;

4
src/core/queries.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_CORE_QUERIES_H #ifndef IRSSI_CORE_QUERIES_H
#define IRSSI_CORE_QUERIES_H #define IRSSI_CORE_QUERIES_H
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
/* Returns QUERY_REC if it's query, NULL if it isn't. */ /* Returns QUERY_REC if it's query, NULL if it isn't. */
#define QUERY(query) \ #define QUERY(query) \
@ -13,7 +13,7 @@
#define STRUCT_SERVER_REC SERVER_REC #define STRUCT_SERVER_REC SERVER_REC
struct _QUERY_REC { struct _QUERY_REC {
#include <irssi/src/core/query-rec.h> #include <irssip/src/core/query-rec.h>
}; };
extern GSList *queries; extern GSList *queries;

2
src/core/query-rec.h
View file

@ -1,6 +1,6 @@
/* QUERY_REC definition, used for inheritance */ /* QUERY_REC definition, used for inheritance */
#include <irssi/src/core/window-item-rec.h> #include <irssip/src/core/window-item-rec.h>
char *address; char *address;
char *server_tag; char *server_tag;

20
src/core/rawlog.c
View file

@ -19,19 +19,19 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/rawlog.h> #include <irssip/src/core/rawlog.h>
#include <irssi/src/core/log.h> #include <irssip/src/core/log.h>
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/write-buffer.h> #include <irssip/src/core/write-buffer.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
#include <irssi/src/core/capsicum.h> #include <irssip/src/core/capsicum.h>
#endif #endif
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
static int rawlog_lines; static int rawlog_lines;
static int signal_rawlog; static int signal_rawlog;

10
src/core/recode.c
View file

@ -19,11 +19,11 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/lib-config/iconfig.h> #include <irssip/src/lib-config/iconfig.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
static char *translit_charset; static char *translit_charset;
static gboolean term_is_utf8; static gboolean term_is_utf8;

2
src/core/refstrings.c
View file

@ -1,7 +1,7 @@
#include <glib.h> #include <glib.h>
#include <string.h> #include <string.h>
#include <irssi/src/core/refstrings.h> #include <irssip/src/core/refstrings.h>
#if GLIB_CHECK_VERSION(2, 58, 0) #if GLIB_CHECK_VERSION(2, 58, 0)

16
src/core/servers-reconnect.c
View file

@ -19,16 +19,16 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/network.h> #include <irssip/src/core/network.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/chat-protocols.h> #include <irssip/src/core/chat-protocols.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/servers-setup.h> #include <irssip/src/core/servers-setup.h>
#include <irssi/src/core/servers-reconnect.h> #include <irssip/src/core/servers-reconnect.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
GSList *reconnects; GSList *reconnects;
static int last_reconnect_tag; static int last_reconnect_tag;

16
src/core/servers-setup.c
View file

@ -19,15 +19,15 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/network.h> #include <irssip/src/core/network.h>
#include <irssi/src/lib-config/iconfig.h> #include <irssip/src/lib-config/iconfig.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/chat-protocols.h> #include <irssip/src/core/chat-protocols.h>
#include <irssi/src/core/chatnets.h> #include <irssip/src/core/chatnets.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/servers-setup.h> #include <irssip/src/core/servers-setup.h>
GSList *setupservers; GSList *setupservers;

4
src/core/servers-setup.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_CORE_SERVERS_SETUP_H #ifndef IRSSI_CORE_SERVERS_SETUP_H
#define IRSSI_CORE_SERVERS_SETUP_H #define IRSSI_CORE_SERVERS_SETUP_H
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
#define SERVER_SETUP(server) \ #define SERVER_SETUP(server) \
MODULE_CHECK_CAST(server, SERVER_SETUP_REC, type, "SERVER SETUP") MODULE_CHECK_CAST(server, SERVER_SETUP_REC, type, "SERVER SETUP")
@ -11,7 +11,7 @@
/* servers */ /* servers */
struct _SERVER_SETUP_REC { struct _SERVER_SETUP_REC {
#include <irssi/src/core/server-setup-rec.h> #include <irssip/src/core/server-setup-rec.h>
}; };
extern GSList *setupservers; extern GSList *setupservers;

30
src/core/servers.c
View file

@ -19,22 +19,22 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/net-disconnect.h> #include <irssip/src/core/net-disconnect.h>
#include <irssi/src/core/net-nonblock.h> #include <irssip/src/core/net-nonblock.h>
#include <irssi/src/core/net-sendbuffer.h> #include <irssip/src/core/net-sendbuffer.h>
#include <irssi/src/core/rawlog.h> #include <irssip/src/core/rawlog.h>
#include <irssi/src/core/refstrings.h> #include <irssip/src/core/refstrings.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/chat-protocols.h> #include <irssip/src/core/chat-protocols.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/servers-reconnect.h> #include <irssip/src/core/servers-reconnect.h>
#include <irssi/src/core/servers-setup.h> #include <irssip/src/core/servers-setup.h>
#include <irssi/src/core/channels.h> #include <irssip/src/core/channels.h>
#include <irssi/src/core/queries.h> #include <irssip/src/core/queries.h>
GSList *servers, *lookup_servers; GSList *servers, *lookup_servers;

6
src/core/servers.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_CORE_SERVERS_H #ifndef IRSSI_CORE_SERVERS_H
#define IRSSI_CORE_SERVERS_H #define IRSSI_CORE_SERVERS_H
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
/* Returns SERVER_REC if it's server, NULL if it isn't. */ /* Returns SERVER_REC if it's server, NULL if it isn't. */
#define SERVER(server) \ #define SERVER(server) \
@ -23,12 +23,12 @@
/* all strings should be either NULL or dynamically allocated */ /* all strings should be either NULL or dynamically allocated */
/* address and nick are mandatory, rest are optional */ /* address and nick are mandatory, rest are optional */
struct _SERVER_CONNECT_REC { struct _SERVER_CONNECT_REC {
#include <irssi/src/core/server-connect-rec.h> #include <irssip/src/core/server-connect-rec.h>
}; };
#define STRUCT_SERVER_CONNECT_REC SERVER_CONNECT_REC #define STRUCT_SERVER_CONNECT_REC SERVER_CONNECT_REC
struct _SERVER_REC { struct _SERVER_REC {
#include <irssi/src/core/server-rec.h> #include <irssip/src/core/server-rec.h>
}; };
#define SEND_TARGET_CHANNEL 0 #define SEND_TARGET_CHANNEL 0

26
src/core/session.c
View file

@ -19,20 +19,20 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/args.h> #include <irssip/src/core/args.h>
#include <irssi/src/core/network.h> #include <irssip/src/core/network.h>
#include <irssi/src/core/net-sendbuffer.h> #include <irssip/src/core/net-sendbuffer.h>
#include <irssi/src/core/pidwait.h> #include <irssip/src/core/pidwait.h>
#include <irssi/src/lib-config/iconfig.h> #include <irssip/src/lib-config/iconfig.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/chat-protocols.h> #include <irssip/src/core/chat-protocols.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/servers-setup.h> #include <irssip/src/core/servers-setup.h>
#include <irssi/src/core/channels.h> #include <irssip/src/core/channels.h>
#include <irssi/src/core/nicklist.h> #include <irssip/src/core/nicklist.h>
static char *session_file; static char *session_file;
char *irssi_binary = NULL; char *irssi_binary = NULL;

14
src/core/settings.c
View file

@ -19,14 +19,14 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/lib-config/iconfig.h> #include <irssip/src/lib-config/iconfig.h>
#include <irssi/src/core/recode.h> #include <irssip/src/core/recode.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include "default-config.h" #include "default-config.h"
#include <signal.h> #include <signal.h>

4
src/core/signals.c
View file

@ -19,8 +19,8 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
typedef struct _SignalHook { typedef struct _SignalHook {
struct _SignalHook *next; struct _SignalHook *next;

16
src/core/special-vars.c
View file

@ -19,14 +19,14 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/expandos.h> #include <irssip/src/core/expandos.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/refstrings.h> #include <irssip/src/core/refstrings.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/special-vars.h> #include <irssip/src/core/special-vars.h>
#include <irssi/src/core/utf8.h> #include <irssip/src/core/utf8.h>
#define isvarchar(c) \ #define isvarchar(c) \
(i_isalnum(c) || (c) == '_') (i_isalnum(c) || (c) == '_')

2
src/core/special-vars.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_CORE_SPECIAL_VARS_H #ifndef IRSSI_CORE_SPECIAL_VARS_H
#define IRSSI_CORE_SPECIAL_VARS_H #define IRSSI_CORE_SPECIAL_VARS_H
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#define PARSE_FLAG_GETNAME 0x01 /* return argument name instead of it's value */ #define PARSE_FLAG_GETNAME 0x01 /* return argument name instead of it's value */
#define PARSE_FLAG_ISSET_ANY 0x02 /* arg_used field specifies that at least one of the $variables was non-empty */ #define PARSE_FLAG_ISSET_ANY 0x02 /* arg_used field specifies that at least one of the $variables was non-empty */

2
src/core/tls.c
View file

@ -18,7 +18,7 @@
#include "module.h" #include "module.h"
#include <irssi/src/core/tls.h> #include <irssip/src/core/tls.h>
TLS_REC *tls_create_rec() TLS_REC *tls_create_rec()
{ {

4
src/core/utf8.c
View file

@ -22,11 +22,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include <irssi/src/core/utf8.h> #include <irssip/src/core/utf8.h>
#include "module.h" #include "module.h"
/* Provide is_utf8(): */ /* Provide is_utf8(): */
#include <irssi/src/core/recode.h> #include <irssip/src/core/recode.h>
int string_advance(char const **str, int policy) int string_advance(char const **str, int policy)
{ {

6
src/core/wcwidth-wrapper.c
View file

@ -22,9 +22,9 @@
#include <wchar.h> #include <wchar.h>
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/utf8.h> #include <irssip/src/core/utf8.h>
#ifdef HAVE_LIBUTF8PROC #ifdef HAVE_LIBUTF8PROC
#include <utf8proc.h> #include <utf8proc.h>

2
src/core/wcwidth.c
View file

@ -59,7 +59,7 @@
* Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
*/ */
#include <irssi/src/core/utf8.h> #include <irssip/src/core/utf8.h>
struct interval { struct interval {
int first; int first;

2
src/core/window-item-def.h
View file

@ -3,7 +3,7 @@
#define STRUCT_SERVER_REC SERVER_REC #define STRUCT_SERVER_REC SERVER_REC
struct _WI_ITEM_REC { struct _WI_ITEM_REC {
#include <irssi/src/core/window-item-rec.h> #include <irssip/src/core/window-item-rec.h>
}; };
#endif #endif

8
src/core/write-buffer.c
View file

@ -19,10 +19,10 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/write-buffer.h> #include <irssip/src/core/write-buffer.h>
#define BUFFER_BLOCK_SIZE 2048 #define BUFFER_BLOCK_SIZE 2048

32
src/fe-common/core/chat-completion.c
View file

@ -19,24 +19,24 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/lib-config/iconfig.h> #include <irssip/src/lib-config/iconfig.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/chatnets.h> #include <irssip/src/core/chatnets.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/servers-setup.h> #include <irssip/src/core/servers-setup.h>
#include <irssi/src/core/channels.h> #include <irssip/src/core/channels.h>
#include <irssi/src/core/channels-setup.h> #include <irssip/src/core/channels-setup.h>
#include <irssi/src/core/queries.h> #include <irssip/src/core/queries.h>
#include <irssi/src/core/nicklist.h> #include <irssip/src/core/nicklist.h>
#include <irssi/src/fe-common/core/completion.h> #include <irssip/src/fe-common/core/completion.h>
#include <irssi/src/fe-common/core/chat-completion.h> #include <irssip/src/fe-common/core/chat-completion.h>
#include <irssi/src/fe-common/core/window-items.h> #include <irssip/src/fe-common/core/window-items.h>
enum { enum {
COMPLETE_MCASE_NEVER = 0, COMPLETE_MCASE_NEVER = 0,

14
src/fe-common/core/command-history.c
View file

@ -19,15 +19,15 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/special-vars.h> #include <irssip/src/core/special-vars.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/fe-common/core/fe-windows.h> #include <irssip/src/fe-common/core/fe-windows.h>
#include <irssi/src/fe-common/core/window-items.h> #include <irssip/src/fe-common/core/window-items.h>
#include <irssi/src/fe-common/core/command-history.h> #include <irssip/src/fe-common/core/command-history.h>
/* command history */ /* command history */
static GList *history_entries; static GList *history_entries;

2
src/fe-common/core/command-history.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_FE_COMMON_CORE_COMMAND_HISTORY_H #ifndef IRSSI_FE_COMMON_CORE_COMMAND_HISTORY_H
#define IRSSI_FE_COMMON_CORE_COMMAND_HISTORY_H #define IRSSI_FE_COMMON_CORE_COMMAND_HISTORY_H
#include <irssi/src/common.h> #include <irssip/src/common.h>
typedef struct { typedef struct {
char *name; char *name;

18
src/fe-common/core/completion.c
View file

@ -19,16 +19,16 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/fe-common/core/module-formats.h> #include <irssip/src/fe-common/core/module-formats.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/lib-config/iconfig.h> #include <irssip/src/lib-config/iconfig.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/fe-common/core/completion.h> #include <irssip/src/fe-common/core/completion.h>
#include <irssi/src/fe-common/core/printtext.h> #include <irssip/src/fe-common/core/printtext.h>
static GList *complist; /* list of commands we're currently completing */ static GList *complist; /* list of commands we're currently completing */
static char *last_line; static char *last_line;

2
src/fe-common/core/completion.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_FE_COMMON_CORE_COMPLETION_H #ifndef IRSSI_FE_COMMON_CORE_COMPLETION_H
#define IRSSI_FE_COMMON_CORE_COMPLETION_H #define IRSSI_FE_COMMON_CORE_COMPLETION_H
#include <irssi/src/fe-common/core/window-items.h> #include <irssip/src/fe-common/core/window-items.h>
/* automatic word completion - called when space/enter is pressed */ /* automatic word completion - called when space/enter is pressed */
char *auto_word_complete(const char *line, int *pos); char *auto_word_complete(const char *line, int *pos);

10
src/fe-common/core/fe-capsicum.c
View file

@ -23,11 +23,11 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/fe-common/core/fe-capsicum.h> #include <irssip/src/fe-common/core/fe-capsicum.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/fe-common/core/module-formats.h> #include <irssip/src/fe-common/core/module-formats.h>
#include <irssi/src/fe-common/core/printtext.h> #include <irssip/src/fe-common/core/printtext.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
static void capability_mode_enabled(void) static void capability_mode_enabled(void)
{ {

38
src/fe-common/core/fe-channels.c
View file

@ -19,27 +19,27 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/fe-common/core/module-formats.h> #include <irssip/src/fe-common/core/module-formats.h>
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/special-vars.h> #include <irssip/src/core/special-vars.h>
#include <irssi/src/core/utf8.h> #include <irssip/src/core/utf8.h>
#include <irssi/src/core/chat-protocols.h> #include <irssip/src/core/chat-protocols.h>
#include <irssi/src/core/chatnets.h> #include <irssip/src/core/chatnets.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/channels.h> #include <irssip/src/core/channels.h>
#include <irssi/src/core/channels-setup.h> #include <irssip/src/core/channels-setup.h>
#include <irssi/src/core/nicklist.h> #include <irssip/src/core/nicklist.h>
#include <irssi/src/fe-common/core/fe-windows.h> #include <irssip/src/fe-common/core/fe-windows.h>
#include <irssi/src/fe-common/core/fe-channels.h> #include <irssip/src/fe-common/core/fe-channels.h>
#include <irssi/src/fe-common/core/window-items.h> #include <irssip/src/fe-common/core/window-items.h>
#include <irssi/src/fe-common/core/printtext.h> #include <irssip/src/fe-common/core/printtext.h>
static void signal_channel_created(CHANNEL_REC *channel, void *automatic) static void signal_channel_created(CHANNEL_REC *channel, void *automatic)
{ {

50
src/fe-common/core/fe-common-core.c
View file

@ -19,35 +19,35 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/fe-common/core/module-formats.h> #include <irssip/src/fe-common/core/module-formats.h>
#include <irssi/src/core/args.h> #include <irssip/src/core/args.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/channels.h> #include <irssip/src/core/channels.h>
#include <irssi/src/core/servers-setup.h> #include <irssip/src/core/servers-setup.h>
#include <irssi/src/core/special-vars.h> #include <irssip/src/core/special-vars.h>
#include <irssi/src/fe-common/core/fe-core-commands.h> #include <irssip/src/fe-common/core/fe-core-commands.h>
#include <irssi/src/fe-common/core/fe-queries.h> #include <irssip/src/fe-common/core/fe-queries.h>
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
#include <irssi/src/fe-common/core/fe-capsicum.h> #include <irssip/src/fe-common/core/fe-capsicum.h>
#endif #endif
#include <irssi/src/fe-common/core/hilight-text.h> #include <irssip/src/fe-common/core/hilight-text.h>
#include <irssi/src/fe-common/core/command-history.h> #include <irssip/src/fe-common/core/command-history.h>
#include <irssi/src/fe-common/core/completion.h> #include <irssip/src/fe-common/core/completion.h>
#include <irssi/src/fe-common/core/keyboard.h> #include <irssip/src/fe-common/core/keyboard.h>
#include <irssi/src/fe-common/core/printtext.h> #include <irssip/src/fe-common/core/printtext.h>
#include <irssi/src/fe-common/core/formats.h> #include <irssip/src/fe-common/core/formats.h>
#include <irssi/src/fe-common/core/themes.h> #include <irssip/src/fe-common/core/themes.h>
#include <irssi/src/fe-common/core/fe-channels.h> #include <irssip/src/fe-common/core/fe-channels.h>
#include <irssi/src/fe-common/core/fe-windows.h> #include <irssip/src/fe-common/core/fe-windows.h>
#include <irssi/src/fe-common/core/window-activity.h> #include <irssip/src/fe-common/core/window-activity.h>
#include <irssi/src/fe-common/core/window-items.h> #include <irssip/src/fe-common/core/window-items.h>
#include <irssi/src/fe-common/core/windows-layout.h> #include <irssip/src/fe-common/core/windows-layout.h>
#include <irssi/src/fe-common/core/fe-recode.h> #include <irssip/src/fe-common/core/fe-recode.h>
#include <signal.h> #include <signal.h>

24
src/fe-common/core/fe-core-commands.c
View file

@ -18,22 +18,22 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include <irssi/src/core/core.h> #include <irssip/src/core/core.h>
#include "module.h" #include "module.h"
#include <irssi/src/fe-common/core/module-formats.h> #include <irssip/src/fe-common/core/module-formats.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/irssi-version.h> #include <irssip/irssi-version.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
#include <irssi/src/core/capsicum.h> #include <irssip/src/core/capsicum.h>
#endif #endif
#include <irssi/src/fe-common/core/fe-windows.h> #include <irssip/src/fe-common/core/fe-windows.h>
#include <irssi/src/fe-common/core/printtext.h> #include <irssip/src/fe-common/core/printtext.h>
#define PASTE_CHECK_SPEED 200 /* 0.2 sec */ #define PASTE_CHECK_SPEED 200 /* 0.2 sec */

32
src/fe-common/core/fe-exec.c
View file

@ -19,24 +19,24 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/pidwait.h> #include <irssip/src/core/pidwait.h>
#include <irssi/src/core/line-split.h> #include <irssip/src/core/line-split.h>
#include <irssi/src/core/network.h> #include <irssip/src/core/network.h>
#include <irssi/src/core/net-sendbuffer.h> #include <irssip/src/core/net-sendbuffer.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/channels.h> #include <irssip/src/core/channels.h>
#include <irssi/src/core/queries.h> #include <irssip/src/core/queries.h>
#include <irssi/src/fe-common/core/printtext.h> #include <irssip/src/fe-common/core/printtext.h>
#include <irssi/src/fe-common/core/fe-exec.h> #include <irssip/src/fe-common/core/fe-exec.h>
#include <irssi/src/fe-common/core/fe-windows.h> #include <irssip/src/fe-common/core/fe-windows.h>
#include <irssi/src/fe-common/core/window-items.h> #include <irssip/src/fe-common/core/window-items.h>
#include <signal.h> #include <signal.h>
#include <stdlib.h> #include <stdlib.h>

4
src/fe-common/core/fe-exec.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_FE_COMMON_CORE_FE_EXEC_H #ifndef IRSSI_FE_COMMON_CORE_FE_EXEC_H
#define IRSSI_FE_COMMON_CORE_FE_EXEC_H #define IRSSI_FE_COMMON_CORE_FE_EXEC_H
#include <irssi/src/fe-common/core/fe-windows.h> #include <irssip/src/fe-common/core/fe-windows.h>
#define EXEC_WI(query) \ #define EXEC_WI(query) \
MODULE_CHECK_CAST_MODULE(query, EXEC_WI_REC, type, \ MODULE_CHECK_CAST_MODULE(query, EXEC_WI_REC, type, \
@ -14,7 +14,7 @@ typedef struct PROCESS_REC PROCESS_REC;
#define STRUCT_SERVER_REC void #define STRUCT_SERVER_REC void
typedef struct { typedef struct {
#include <irssi/src/core/window-item-rec.h> #include <irssip/src/core/window-item-rec.h>
PROCESS_REC *process; PROCESS_REC *process;
unsigned int destroying:1; unsigned int destroying:1;
} EXEC_WI_REC; } EXEC_WI_REC;

4
src/fe-common/core/fe-expandos.c
View file

@ -19,8 +19,8 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/expandos.h> #include <irssip/src/core/expandos.h>
#include <irssi/src/fe-common/core/fe-windows.h> #include <irssip/src/fe-common/core/fe-windows.h>
/* Window ref# */ /* Window ref# */
static char *expando_winref(SERVER_REC *server, void *item, int *free_ret) static char *expando_winref(SERVER_REC *server, void *item, int *free_ret)

14
src/fe-common/core/fe-help.c
View file

@ -19,14 +19,14 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/fe-common/core/printtext.h> #include <irssip/src/fe-common/core/printtext.h>
#include <irssi/src/fe-common/core/formats.h> #include <irssip/src/fe-common/core/formats.h>
static int commands_equal(COMMAND_REC *rec, COMMAND_REC *rec2) static int commands_equal(COMMAND_REC *rec, COMMAND_REC *rec2)
{ {

8
src/fe-common/core/fe-ignore-messages.c
View file

@ -19,10 +19,10 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/ignore.h> #include <irssip/src/core/ignore.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
static void sig_message_public(SERVER_REC *server, const char *msg, static void sig_message_public(SERVER_REC *server, const char *msg,
const char *nick, const char *address, const char *nick, const char *address,

16
src/fe-common/core/fe-ignore.c
View file

@ -20,15 +20,15 @@
#include "module.h" #include "module.h"
#include <time.h> #include <time.h>
#include <irssi/src/fe-common/core/module-formats.h> #include <irssip/src/fe-common/core/module-formats.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/ignore.h> #include <irssip/src/core/ignore.h>
#include <irssi/src/fe-common/core/printtext.h> #include <irssip/src/fe-common/core/printtext.h>
static char *ignore_get_key(IGNORE_REC *rec) static char *ignore_get_key(IGNORE_REC *rec)
{ {

40
src/fe-common/core/fe-log.c
View file

@ -19,30 +19,30 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/fe-common/core/module-formats.h> #include <irssip/src/fe-common/core/module-formats.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/chat-protocols.h> #include <irssip/src/core/chat-protocols.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/channels.h> #include <irssip/src/core/channels.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/log.h> #include <irssip/src/core/log.h>
#include <irssi/src/core/special-vars.h> #include <irssip/src/core/special-vars.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/lib-config/iconfig.h> #include <irssip/src/lib-config/iconfig.h>
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
#include <irssi/src/core/capsicum.h> #include <irssip/src/core/capsicum.h>
#endif #endif
#include <irssi/src/fe-common/core/fe-windows.h> #include <irssip/src/fe-common/core/fe-windows.h>
#include <irssi/src/fe-common/core/window-items.h> #include <irssip/src/fe-common/core/window-items.h>
#include <irssi/src/fe-common/core/formats.h> #include <irssip/src/fe-common/core/formats.h>
#include <irssi/src/fe-common/core/themes.h> #include <irssip/src/fe-common/core/themes.h>
#include <irssi/src/fe-common/core/printtext.h> #include <irssip/src/fe-common/core/printtext.h>
#include <irssi/src/fe-common/core/fe-common-core.h> #include <irssip/src/fe-common/core/fe-common-core.h>
#include <irssi/src/core/channels-setup.h> #include <irssip/src/core/channels-setup.h>
/* close autologs after 5 minutes of inactivity */ /* close autologs after 5 minutes of inactivity */
#define AUTOLOG_INACTIVITY_CLOSE (60*5) #define AUTOLOG_INACTIVITY_CLOSE (60*5)

30
src/fe-common/core/fe-messages.c
View file

@ -19,23 +19,23 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/fe-common/core/module-formats.h> #include <irssip/src/fe-common/core/module-formats.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/special-vars.h> #include <irssip/src/core/special-vars.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/channels.h> #include <irssip/src/core/channels.h>
#include <irssi/src/core/nicklist.h> #include <irssip/src/core/nicklist.h>
#include <irssi/src/core/ignore.h> #include <irssip/src/core/ignore.h>
#include <irssi/src/fe-common/core/window-items.h> #include <irssip/src/fe-common/core/window-items.h>
#include <irssi/src/fe-common/core/fe-queries.h> #include <irssip/src/fe-common/core/fe-queries.h>
#include <irssi/src/fe-common/core/hilight-text.h> #include <irssip/src/fe-common/core/hilight-text.h>
#include <irssi/src/fe-common/core/printtext.h> #include <irssip/src/fe-common/core/printtext.h>
#define ishighalnum(c) ((unsigned char) (c) >= 128 || i_isalnum(c)) #define ishighalnum(c) ((unsigned char) (c) >= 128 || i_isalnum(c))
#define isnickchar(a) \ #define isnickchar(a) \

16
src/fe-common/core/fe-modules.c
View file

@ -19,15 +19,15 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
#include <irssi/src/core/modules-load.h> #include <irssip/src/core/modules-load.h>
#include <irssi/src/fe-common/core/module-formats.h> #include <irssip/src/fe-common/core/module-formats.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/chat-protocols.h> #include <irssip/src/core/chat-protocols.h>
#include <irssi/src/fe-common/core/printtext.h> #include <irssip/src/fe-common/core/printtext.h>
static void sig_module_error(void *number, const char *data, static void sig_module_error(void *number, const char *data,
const char *rootmodule, const char *submodule) const char *rootmodule, const char *submodule)

26
src/fe-common/core/fe-queries.c
View file

@ -19,21 +19,21 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/fe-common/core/module-formats.h> #include <irssip/src/fe-common/core/module-formats.h>
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/chat-protocols.h> #include <irssip/src/core/chat-protocols.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/queries.h> #include <irssip/src/core/queries.h>
#include <irssi/src/fe-common/core/fe-core-commands.h> #include <irssip/src/fe-common/core/fe-core-commands.h>
#include <irssi/src/fe-common/core/fe-windows.h> #include <irssip/src/fe-common/core/fe-windows.h>
#include <irssi/src/fe-common/core/window-items.h> #include <irssip/src/fe-common/core/window-items.h>
#include <irssi/src/fe-common/core/printtext.h> #include <irssip/src/fe-common/core/printtext.h>
static int queryclose_tag, query_auto_close, querycreate_level; static int queryclose_tag, query_auto_close, querycreate_level;

2
src/fe-common/core/fe-queries.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_FE_COMMON_CORE_FE_QUERIES_H #ifndef IRSSI_FE_COMMON_CORE_FE_QUERIES_H
#define IRSSI_FE_COMMON_CORE_FE_QUERIES_H #define IRSSI_FE_COMMON_CORE_FE_QUERIES_H
#include <irssi/src/core/queries.h> #include <irssip/src/core/queries.h>
/* Return query where to put the private message. */ /* Return query where to put the private message. */
QUERY_REC *privmsg_get_query(SERVER_REC *server, const char *nick, QUERY_REC *privmsg_get_query(SERVER_REC *server, const char *nick,

18
src/fe-common/core/fe-recode.c
View file

@ -19,15 +19,15 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
#include <irssi/src/fe-common/core/module-formats.h> #include <irssip/src/fe-common/core/module-formats.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/lib-config/iconfig.h> #include <irssip/src/lib-config/iconfig.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/fe-common/core/printtext.h> #include <irssip/src/fe-common/core/printtext.h>
#include <irssi/src/fe-common/core/formats.h> #include <irssip/src/fe-common/core/formats.h>
#include <irssi/src/core/recode.h> #include <irssip/src/core/recode.h>
static char *recode_fallback = NULL; static char *recode_fallback = NULL;
static char *recode_out_default = NULL; static char *recode_out_default = NULL;

24
src/fe-common/core/fe-server.c
View file

@ -19,20 +19,20 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/network.h> #include <irssip/src/core/network.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/chat-protocols.h> #include <irssip/src/core/chat-protocols.h>
#include <irssi/src/core/chatnets.h> #include <irssip/src/core/chatnets.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/servers-setup.h> #include <irssip/src/core/servers-setup.h>
#include <irssi/src/core/servers-reconnect.h> #include <irssip/src/core/servers-reconnect.h>
#include <irssi/src/fe-common/core/module-formats.h> #include <irssip/src/fe-common/core/module-formats.h>
#include <irssi/src/fe-common/core/printtext.h> #include <irssip/src/fe-common/core/printtext.h>
static void print_servers(void) static void print_servers(void)
{ {

22
src/fe-common/core/fe-settings.c
View file

@ -19,17 +19,17 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/fe-common/core/module-formats.h> #include <irssip/src/fe-common/core/module-formats.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/lib-config/iconfig.h> #include <irssip/src/lib-config/iconfig.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/fe-common/core/fe-settings.h> #include <irssip/src/fe-common/core/fe-settings.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/fe-common/core/printtext.h> #include <irssip/src/fe-common/core/printtext.h>
#include <irssi/src/fe-common/core/keyboard.h> #include <irssip/src/fe-common/core/keyboard.h>
static void set_print(SETTINGS_REC *rec) static void set_print(SETTINGS_REC *rec)
{ {

14
src/fe-common/core/fe-tls.c
View file

@ -17,15 +17,15 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/tls.h> #include <irssip/src/core/tls.h>
#include <irssi/src/fe-common/core/module-formats.h> #include <irssip/src/fe-common/core/module-formats.h>
#include <irssi/src/fe-common/core/printtext.h> #include <irssip/src/fe-common/core/printtext.h>
#include <irssi/src/fe-common/core/fe-tls.h> #include <irssip/src/fe-common/core/fe-tls.h>
static void tls_handshake_finished(SERVER_REC *server, TLS_REC *tls) static void tls_handshake_finished(SERVER_REC *server, TLS_REC *tls)
{ {

22
src/fe-common/core/fe-windows.c
View file

@ -19,19 +19,19 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/fe-common/core/module-formats.h> #include <irssip/src/fe-common/core/module-formats.h>
#include <irssi/src/core/modules.h> #include <irssip/src/core/modules.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/fe-common/core/printtext.h> #include <irssip/src/fe-common/core/printtext.h>
#include <irssi/src/fe-common/core/fe-windows.h> #include <irssip/src/fe-common/core/fe-windows.h>
#include <irssi/src/fe-common/core/window-items.h> #include <irssip/src/fe-common/core/window-items.h>
GSList *windows; /* first in the list is the active window, GSList *windows; /* first in the list is the active window,
next is the last active, etc. */ next is the last active, etc. */

4
src/fe-common/core/fe-windows.h
View file

@ -1,8 +1,8 @@
#ifndef IRSSI_FE_COMMON_CORE_FE_WINDOWS_H #ifndef IRSSI_FE_COMMON_CORE_FE_WINDOWS_H
#define IRSSI_FE_COMMON_CORE_FE_WINDOWS_H #define IRSSI_FE_COMMON_CORE_FE_WINDOWS_H
#include <irssi/src/core/window-item-def.h> #include <irssip/src/core/window-item-def.h>
#include <irssi/src/fe-common/core/command-history.h> #include <irssip/src/fe-common/core/command-history.h>
enum { enum {
DATA_LEVEL_NONE = 0, DATA_LEVEL_NONE = 0,

28
src/fe-common/core/formats.c
View file

@ -19,22 +19,22 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/fe-common/core/module-formats.h> #include <irssip/src/fe-common/core/module-formats.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/special-vars.h> #include <irssip/src/core/special-vars.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/fe-common/core/fe-windows.h> #include <irssip/src/fe-common/core/fe-windows.h>
#include <irssi/src/fe-common/core/window-items.h> #include <irssip/src/fe-common/core/window-items.h>
#include <irssi/src/fe-common/core/formats.h> #include <irssip/src/fe-common/core/formats.h>
#include <irssi/src/fe-common/core/themes.h> #include <irssip/src/fe-common/core/themes.h>
#include <irssi/src/core/recode.h> #include <irssip/src/core/recode.h>
#include <irssi/src/core/utf8.h> #include <irssip/src/core/utf8.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/core/refstrings.h> #include <irssip/src/core/refstrings.h>
static const char *format_backs = "04261537"; static const char *format_backs = "04261537";
static const char *format_fores = "kbgcrmyw"; static const char *format_fores = "kbgcrmyw";

6
src/fe-common/core/formats.h
View file

@ -1,9 +1,9 @@
#ifndef IRSSI_FE_COMMON_CORE_FORMATS_H #ifndef IRSSI_FE_COMMON_CORE_FORMATS_H
#define IRSSI_FE_COMMON_CORE_FORMATS_H #define IRSSI_FE_COMMON_CORE_FORMATS_H
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/fe-common/core/fe-windows.h> #include <irssip/src/fe-common/core/fe-windows.h>
#include <irssi/src/fe-common/core/themes.h> #include <irssip/src/fe-common/core/themes.h>
#define GUI_PRINT_FLAG_BOLD 0x0001 #define GUI_PRINT_FLAG_BOLD 0x0001
#define GUI_PRINT_FLAG_REVERSE 0x0002 #define GUI_PRINT_FLAG_REVERSE 0x0002

30
src/fe-common/core/hilight-text.c
View file

@ -19,23 +19,23 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/fe-common/core/module-formats.h> #include <irssip/src/fe-common/core/module-formats.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/lib-config/iconfig.h> #include <irssip/src/lib-config/iconfig.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/core/iregex.h> #include <irssip/src/core/iregex.h>
#include <irssi/src/core/servers.h> #include <irssip/src/core/servers.h>
#include <irssi/src/core/channels.h> #include <irssip/src/core/channels.h>
#include <irssi/src/core/nicklist.h> #include <irssip/src/core/nicklist.h>
#include <irssi/src/fe-common/core/hilight-text.h> #include <irssip/src/fe-common/core/hilight-text.h>
#include <irssi/src/core/nickmatch-cache.h> #include <irssip/src/core/nickmatch-cache.h>
#include <irssi/src/fe-common/core/printtext.h> #include <irssip/src/fe-common/core/printtext.h>
#include <irssi/src/fe-common/core/formats.h> #include <irssip/src/fe-common/core/formats.h>
static NICKMATCH_REC *nickmatch; static NICKMATCH_REC *nickmatch;
static int never_hilight_level, default_hilight_level; static int never_hilight_level, default_hilight_level;

4
src/fe-common/core/hilight-text.h
View file

@ -1,8 +1,8 @@
#ifndef IRSSI_FE_COMMON_CORE_HILIGHT_TEXT_H #ifndef IRSSI_FE_COMMON_CORE_HILIGHT_TEXT_H
#define IRSSI_FE_COMMON_CORE_HILIGHT_TEXT_H #define IRSSI_FE_COMMON_CORE_HILIGHT_TEXT_H
#include <irssi/src/core/iregex.h> #include <irssip/src/core/iregex.h>
#include <irssi/src/fe-common/core/formats.h> #include <irssip/src/fe-common/core/formats.h>
struct _HILIGHT_REC { struct _HILIGHT_REC {
char *text; char *text;

20
src/fe-common/core/keyboard.c
View file

@ -19,17 +19,17 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/fe-common/core/module-formats.h> #include <irssip/src/fe-common/core/module-formats.h>
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
#include <irssi/src/core/commands.h> #include <irssip/src/core/commands.h>
#include <irssi/src/core/levels.h> #include <irssip/src/core/levels.h>
#include <irssi/src/core/misc.h> #include <irssip/src/core/misc.h>
#include <irssi/src/lib-config/iconfig.h> #include <irssip/src/lib-config/iconfig.h>
#include <irssi/src/core/settings.h> #include <irssip/src/core/settings.h>
#include <irssi/src/fe-common/core/keyboard.h> #include <irssip/src/fe-common/core/keyboard.h>
#include <irssi/src/fe-common/core/fe-windows.h> #include <irssip/src/fe-common/core/fe-windows.h>
#include <irssi/src/fe-common/core/printtext.h> #include <irssip/src/fe-common/core/printtext.h>
#define MAX_EXPAND_RECURSION 100 #define MAX_EXPAND_RECURSION 100

2
src/fe-common/core/keyboard.h
View file

@ -1,7 +1,7 @@
#ifndef IRSSI_FE_COMMON_CORE_KEYBOARD_H #ifndef IRSSI_FE_COMMON_CORE_KEYBOARD_H
#define IRSSI_FE_COMMON_CORE_KEYBOARD_H #define IRSSI_FE_COMMON_CORE_KEYBOARD_H
#include <irssi/src/core/signals.h> #include <irssip/src/core/signals.h>
typedef struct _KEYBOARD_REC KEYBOARD_REC; typedef struct _KEYBOARD_REC KEYBOARD_REC;
typedef struct _KEYINFO_REC KEYINFO_REC; typedef struct _KEYINFO_REC KEYINFO_REC;

2
src/fe-common/core/module-formats.c
View file

@ -19,7 +19,7 @@
*/ */
#include "module.h" #include "module.h"
#include <irssi/src/fe-common/core/formats.h> #include <irssip/src/fe-common/core/formats.h>
FORMAT_REC fecommon_core_formats[] = { FORMAT_REC fecommon_core_formats[] = {
/* clang-format off */ /* clang-format off */

2
src/fe-common/core/module-formats.h
View file

@ -1,4 +1,4 @@
#include <irssi/src/fe-common/core/formats.h> #include <irssip/src/fe-common/core/formats.h>
enum { enum {
TXT_MODULE_NAME, TXT_MODULE_NAME,

4
src/fe-common/core/module.h
View file

@ -1,8 +1,8 @@
#include <irssi/src/common.h> #include <irssip/src/common.h>
#define MODULE_NAME "fe-common/core" #define MODULE_NAME "fe-common/core"
#include <irssi/src/core/utf8.h> #include <irssip/src/core/utf8.h>
typedef struct { typedef struct {
time_t time; time_t time;
char *nick; char *nick;

Some files were not shown because too many files have changed in this diff Show more