diff options
Diffstat (limited to 'src/common')
30 files changed, 70 insertions, 70 deletions
diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 830d73eb..22534bdd 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -10,6 +10,9 @@ EXTRA_DIST = \ ctcp.h \ dcc.h \ fe.h \ + hexchat.h \ + hexchatc.h \ + hexchat-plugin.h \ history.h \ identd.c \ ignore.h \ @@ -36,10 +39,7 @@ EXTRA_DIST = \ tree.h \ url.h \ userlist.h \ - util.h \ - xchat.h \ - xchatc.h \ - xchat-plugin.h + util.h if USE_OPENSSL ssl_c = ssl.c @@ -52,10 +52,10 @@ libhexchatcommon_a_LIBADD = \ endif SUBDIRS = $(dbusdir) . -libhexchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c history.c ignore.c \ - inbound.c modes.c msproxy.c network.c notify.c outbound.c \ - plugin.c plugin-timer.c proto-irc.c server.c servlist.c $(ssl_c) \ - strlutil.c text.c tree.c url.c userlist.c util.c xchat.c +libhexchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c hexchat.c \ + history.c ignore.c inbound.c modes.c msproxy.c network.c notify.c \ + outbound.c plugin.c plugin-timer.c proto-irc.c server.c servlist.c \ + $(ssl_c) strlutil.c text.c tree.c url.c userlist.c util.c libhexchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS) textevents: make-te diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c index 2312dada..9f3bc920 100644 --- a/src/common/cfgfiles.c +++ b/src/common/cfgfiles.c @@ -23,12 +23,12 @@ #include <sys/types.h> #include <sys/stat.h> -#include "xchat.h" +#include "hexchat.h" #include "cfgfiles.h" #include "util.h" #include "fe.h" #include "text.h" -#include "xchatc.h" +#include "hexchatc.h" #ifdef WIN32 #include <io.h> diff --git a/src/common/cfgfiles.h b/src/common/cfgfiles.h index 2cb4a4e2..9371f572 100644 --- a/src/common/cfgfiles.h +++ b/src/common/cfgfiles.h @@ -3,7 +3,7 @@ #ifndef XCHAT_CFGFILES_H #define XCHAT_CFGFILES_H -#include "xchat.h" +#include "hexchat.h" extern char *xdir_fs; extern char *xdir_utf; diff --git a/src/common/chanopt.c b/src/common/chanopt.c index 8e8b0312..d6d47fb2 100644 --- a/src/common/chanopt.c +++ b/src/common/chanopt.c @@ -14,13 +14,13 @@ #include <unistd.h> #endif -#include "xchat.h" +#include "hexchat.h" #include "cfgfiles.h" #include "server.h" #include "text.h" #include "util.h" -#include "xchatc.h" +#include "hexchatc.h" static GSList *chanopt_list = NULL; diff --git a/src/common/common-xp.vcxproj b/src/common/common-xp.vcxproj index 6eec3b12..736eacb1 100644 --- a/src/common/common-xp.vcxproj +++ b/src/common/common-xp.vcxproj @@ -43,9 +43,9 @@ <ClInclude Include="url.h" /> <ClInclude Include="userlist.h" /> <ClInclude Include="util.h" /> - <ClInclude Include="xchat-plugin.h" /> - <ClInclude Include="xchat.h" /> - <ClInclude Include="xchatc.h" /> + <ClInclude Include="hexchat-plugin.h" /> + <ClInclude Include="hexchat.h" /> + <ClInclude Include="hexchatc.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="cfgfiles.c" /> @@ -74,7 +74,7 @@ <ClCompile Include="url.c" /> <ClCompile Include="userlist.c" /> <ClCompile Include="util.c" /> - <ClCompile Include="xchat.c" /> + <ClCompile Include="hexchat.c" /> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{87554B59-006C-4D94-9714-897B27067BA3}</ProjectGuid> diff --git a/src/common/common-xp.vcxproj.filters b/src/common/common-xp.vcxproj.filters index 4940a6fd..3707caa0 100644 --- a/src/common/common-xp.vcxproj.filters +++ b/src/common/common-xp.vcxproj.filters @@ -98,13 +98,13 @@ <ClInclude Include="util.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="xchat.h"> + <ClInclude Include="hexchat.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="xchatc.h"> + <ClInclude Include="hexchatc.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="xchat-plugin.h"> + <ClInclude Include="hexchat-plugin.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="..\..\config.h"> @@ -193,7 +193,7 @@ <ClCompile Include="util.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="xchat.c"> + <ClCompile Include="hexchat.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="strlutil.c"> diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 55116995..9bb79ac5 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -43,9 +43,9 @@ <ClInclude Include="url.h" /> <ClInclude Include="userlist.h" /> <ClInclude Include="util.h" /> - <ClInclude Include="xchat-plugin.h" /> - <ClInclude Include="xchat.h" /> - <ClInclude Include="xchatc.h" /> + <ClInclude Include="hexchat-plugin.h" /> + <ClInclude Include="hexchat.h" /> + <ClInclude Include="hexchatc.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="cfgfiles.c" /> @@ -74,7 +74,7 @@ <ClCompile Include="url.c" /> <ClCompile Include="userlist.c" /> <ClCompile Include="util.c" /> - <ClCompile Include="xchat.c" /> + <ClCompile Include="hexchat.c" /> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{87554B59-006C-4D94-9714-897B27067BA3}</ProjectGuid> diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters index 4940a6fd..3707caa0 100644 --- a/src/common/common.vcxproj.filters +++ b/src/common/common.vcxproj.filters @@ -98,13 +98,13 @@ <ClInclude Include="util.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="xchat.h"> + <ClInclude Include="hexchat.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="xchatc.h"> + <ClInclude Include="hexchatc.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="xchat-plugin.h"> + <ClInclude Include="hexchat-plugin.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="..\..\config.h"> @@ -193,7 +193,7 @@ <ClCompile Include="util.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="xchat.c"> + <ClCompile Include="hexchat.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="strlutil.c"> diff --git a/src/common/ctcp.c b/src/common/ctcp.c index c0d1ce49..f950a901 100644 --- a/src/common/ctcp.c +++ b/src/common/ctcp.c @@ -24,7 +24,7 @@ #include <unistd.h> #endif -#include "xchat.h" +#include "hexchat.h" #include "cfgfiles.h" #include "util.h" #include "modes.h" @@ -35,7 +35,7 @@ #include "text.h" #include "ctcp.h" #include "server.h" -#include "xchatc.h" +#include "hexchatc.h" static void diff --git a/src/common/dcc.c b/src/common/dcc.c index 4aa581a7..d9b1b855 100644 --- a/src/common/dcc.c +++ b/src/common/dcc.c @@ -48,7 +48,7 @@ #include <glib.h> #include <glib/gstdio.h> -#include "xchat.h" +#include "hexchat.h" #include "util.h" #include "fe.h" #include "outbound.h" @@ -58,7 +58,7 @@ #include "server.h" #include "text.h" #include "url.h" -#include "xchatc.h" +#include "hexchatc.h" #ifdef USE_DCC64 #define BIG_STR_TO_INT(x) strtoull(x,NULL,10) diff --git a/src/common/xchat-plugin.h b/src/common/hexchat-plugin.h index 1b7da8fb..43621f78 100644 --- a/src/common/xchat-plugin.h +++ b/src/common/hexchat-plugin.h @@ -1,6 +1,6 @@ /* You can distribute this header with your plugins for easy compilation */ -#ifndef XCHAT_PLUGIN_H -#define XCHAT_PLUGIN_H +#ifndef HEXCHAT_PLUGIN_H +#define HEXCHAT_PLUGIN_H #include <time.h> diff --git a/src/common/xchat.c b/src/common/hexchat.c index d1916384..66612a30 100644 --- a/src/common/xchat.c +++ b/src/common/hexchat.c @@ -34,13 +34,13 @@ #include <unistd.h> #endif -#include "xchat.h" +#include "hexchat.h" #include "fe.h" #include "util.h" #include "cfgfiles.h" #include "chanopt.h" #include "ignore.h" -#include "xchat-plugin.h" +#include "hexchat-plugin.h" #include "plugin.h" #include "plugin-timer.h" #include "notify.h" @@ -49,7 +49,7 @@ #include "outbound.h" #include "text.h" #include "url.h" -#include "xchatc.h" +#include "hexchatc.h" #ifdef USE_OPENSSL #include <openssl/ssl.h> /* SSL_() */ diff --git a/src/common/xchat.h b/src/common/hexchat.h index 2980fc1c..2980fc1c 100644 --- a/src/common/xchat.h +++ b/src/common/hexchat.h diff --git a/src/common/xchatc.h b/src/common/hexchatc.h index 1d955055..1d955055 100644 --- a/src/common/xchatc.h +++ b/src/common/hexchatc.h diff --git a/src/common/identd.c b/src/common/identd.c index 5ef5e0c6..db08ff90 100644 --- a/src/common/identd.c +++ b/src/common/identd.c @@ -1,8 +1,8 @@ /* simple identd server for xchat under win32 */ #include "inet.h" -#include "xchat.h" -#include "xchatc.h" +#include "hexchat.h" +#include "hexchatc.h" #include "text.h" static int identd_is_running = FALSE; diff --git a/src/common/ignore.c b/src/common/ignore.c index 12a2926a..b6eae41a 100644 --- a/src/common/ignore.c +++ b/src/common/ignore.c @@ -29,13 +29,13 @@ #include <unistd.h> #endif -#include "xchat.h" +#include "hexchat.h" #include "ignore.h" #include "cfgfiles.h" #include "fe.h" #include "text.h" #include "util.h" -#include "xchatc.h" +#include "hexchatc.h" int ignored_ctcp = 0; /* keep a count of all we ignore */ diff --git a/src/common/inbound.c b/src/common/inbound.c index 9d39e5cd..3d42279f 100644 --- a/src/common/inbound.c +++ b/src/common/inbound.c @@ -33,7 +33,7 @@ #define WANTDNS #include "inet.h" -#include "xchat.h" +#include "hexchat.h" #include "util.h" #include "ignore.h" #include "fe.h" @@ -46,7 +46,7 @@ #include "text.h" #include "ctcp.h" #include "plugin.h" -#include "xchatc.h" +#include "hexchatc.h" void diff --git a/src/common/modes.c b/src/common/modes.c index 07a5cea4..b84b2b84 100644 --- a/src/common/modes.c +++ b/src/common/modes.c @@ -22,8 +22,8 @@ #include <glib.h> #include <glib/gprintf.h> -#include "xchat.h" -#include "xchatc.h" +#include "hexchat.h" +#include "hexchatc.h" #include "modes.h" #include "server.h" #include "text.h" diff --git a/src/common/msproxy.c b/src/common/msproxy.c index 01b6120a..9febe8d0 100644 --- a/src/common/msproxy.c +++ b/src/common/msproxy.c @@ -36,9 +36,9 @@ #define WANTARPA #include "inet.h" -#include "xchat.h" +#include "hexchat.h" #include "network.h" -#include "xchatc.h" +#include "hexchatc.h" #include "server.h" #include "msproxy.h" diff --git a/src/common/notify.c b/src/common/notify.c index f9fbe121..1dff8ec7 100644 --- a/src/common/notify.c +++ b/src/common/notify.c @@ -30,14 +30,14 @@ #include <unistd.h> #endif -#include "xchat.h" +#include "hexchat.h" #include "notify.h" #include "cfgfiles.h" #include "fe.h" #include "server.h" #include "text.h" #include "util.h" -#include "xchatc.h" +#include "hexchatc.h" GSList *notify_list = 0; diff --git a/src/common/outbound.c b/src/common/outbound.c index bb652aad..ed97886e 100644 --- a/src/common/outbound.c +++ b/src/common/outbound.c @@ -38,7 +38,7 @@ #include <sys/stat.h> #include <fcntl.h> -#include "xchat.h" +#include "hexchat.h" #include "plugin.h" #include "ignore.h" #include "util.h" @@ -49,7 +49,7 @@ #include "notify.h" #include "inbound.h" #include "text.h" -#include "xchatc.h" +#include "hexchatc.h" #include "servlist.h" #include "server.h" #include "tree.h" diff --git a/src/common/plugin-timer.c b/src/common/plugin-timer.c index 431ce8ab..eaf6cde6 100644 --- a/src/common/plugin-timer.c +++ b/src/common/plugin-timer.c @@ -1,7 +1,7 @@ #include <stdlib.h> #include <string.h> #include <glib.h> -#include "xchat-plugin.h" +#include "hexchat-plugin.h" #ifdef WIN32 #define g_ascii_strcasecmp stricmp diff --git a/src/common/plugin.c b/src/common/plugin.c index 7111289c..cc626659 100644 --- a/src/common/plugin.c +++ b/src/common/plugin.c @@ -29,7 +29,7 @@ #include <unistd.h> #endif -#include "xchat.h" +#include "hexchat.h" #include "fe.h" #include "util.h" #include "outbound.h" @@ -42,11 +42,11 @@ #include "text.h" #define PLUGIN_C typedef struct session xchat_context; -#include "xchat-plugin.h" +#include "hexchat-plugin.h" #include "plugin.h" -#include "xchatc.h" +#include "hexchatc.h" /* the USE_PLUGIN define only removes libdl stuff */ diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c index ed7d9a4d..8967504e 100644 --- a/src/common/proto-irc.c +++ b/src/common/proto-irc.c @@ -28,7 +28,7 @@ #include <unistd.h> #endif -#include "xchat.h" +#include "hexchat.h" #include "ctcp.h" #include "fe.h" #include "ignore.h" @@ -40,7 +40,7 @@ #include "text.h" #include "outbound.h" #include "util.h" -#include "xchatc.h" +#include "hexchatc.h" #include "url.h" diff --git a/src/common/server.c b/src/common/server.c index 8c831ad0..04b955bb 100644 --- a/src/common/server.c +++ b/src/common/server.c @@ -42,12 +42,12 @@ #include <unistd.h> #endif -#include "xchat.h" +#include "hexchat.h" #include "fe.h" #include "cfgfiles.h" #include "network.h" #include "notify.h" -#include "xchatc.h" +#include "hexchatc.h" #include "inbound.h" #include "outbound.h" #include "text.h" diff --git a/src/common/servlist.c b/src/common/servlist.c index 201652da..86a78ebf 100644 --- a/src/common/servlist.c +++ b/src/common/servlist.c @@ -26,7 +26,7 @@ #include <unistd.h> #endif -#include "xchat.h" +#include "hexchat.h" #include <glib.h> #include "cfgfiles.h" @@ -34,7 +34,7 @@ #include "server.h" #include "text.h" #include "util.h" /* token_foreach */ -#include "xchatc.h" +#include "hexchatc.h" #include "servlist.h" diff --git a/src/common/text.c b/src/common/text.c index 1076f8a0..39dd92c2 100644 --- a/src/common/text.c +++ b/src/common/text.c @@ -32,7 +32,7 @@ #include <sys/mman.h> #endif -#include "xchat.h" +#include "hexchat.h" #include <glib.h> #include "cfgfiles.h" #include "chanopt.h" @@ -41,7 +41,7 @@ #include "server.h" #include "util.h" #include "outbound.h" -#include "xchatc.h" +#include "hexchatc.h" #include "text.h" #ifdef WIN32 #include <windows.h> diff --git a/src/common/url.c b/src/common/url.c index 32d282db..f722ca34 100644 --- a/src/common/url.c +++ b/src/common/url.c @@ -20,8 +20,8 @@ #include <stdlib.h> #include <string.h> #include <ctype.h> -#include "xchat.h" -#include "xchatc.h" +#include "hexchat.h" +#include "hexchatc.h" #include "cfgfiles.h" #include "fe.h" #include "tree.h" diff --git a/src/common/userlist.c b/src/common/userlist.c index 2dedb997..620ed4aa 100644 --- a/src/common/userlist.c +++ b/src/common/userlist.c @@ -20,12 +20,12 @@ #include <stdlib.h> #include <string.h> -#include "xchat.h" +#include "hexchat.h" #include "modes.h" #include "fe.h" #include "notify.h" #include "tree.h" -#include "xchatc.h" +#include "hexchatc.h" #include "util.h" diff --git a/src/common/util.c b/src/common/util.c index 15184250..38a87f26 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -43,8 +43,8 @@ #include <fcntl.h> #include <errno.h> -#include "xchat.h" -#include "xchatc.h" +#include "hexchat.h" +#include "hexchatc.h" #include <glib.h> #include <ctype.h> #include "util.h" |