summary refs log tree commit diff stats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Makefile.am2
-rw-r--r--plugins/checksum/checksum.c2
-rw-r--r--plugins/dns/dns.c2
-rw-r--r--plugins/doat/doat.c2
-rw-r--r--plugins/ewc/ewc.c2
-rw-r--r--plugins/exec/exec.c2
-rw-r--r--plugins/fishlim/Makefile.am2
-rw-r--r--plugins/fishlim/fishlim-xp.vcxproj4
-rw-r--r--plugins/fishlim/fishlim-xp.vcxproj.filters4
-rw-r--r--plugins/fishlim/fishlim.vcxproj4
-rw-r--r--plugins/fishlim/fishlim.vcxproj.filters4
-rw-r--r--plugins/fishlim/keystore.c2
-rw-r--r--plugins/fishlim/plugin_hexchat.c (renamed from plugins/fishlim/plugin_xchat.c)2
-rw-r--r--plugins/fishlim/plugin_hexchat.h (renamed from plugins/fishlim/plugin_xchat.h)4
-rw-r--r--plugins/gtkpref/gtkpref.c2
-rw-r--r--plugins/hexchat-plugin.h (renamed from plugins/xchat-plugin.h)4
-rw-r--r--plugins/hextray/callbacks.cpp8
-rw-r--r--plugins/hextray/hexchat.cpp (renamed from plugins/hextray/xchat.cpp)6
-rw-r--r--plugins/hextray/hexchat.h (renamed from plugins/hextray/xchat.h)0
-rw-r--r--plugins/hextray/hextray-xp.vcxproj14
-rw-r--r--plugins/hextray/hextray-xp.vcxproj.filters10
-rw-r--r--plugins/hextray/hextray.cpp (renamed from plugins/hextray/xtray.cpp)4
-rw-r--r--plugins/hextray/hextray.def (renamed from plugins/hextray/xtray.def)0
-rw-r--r--plugins/hextray/hextray.h (renamed from plugins/hextray/xtray.h)0
-rw-r--r--plugins/hextray/hextray.vcxproj14
-rw-r--r--plugins/hextray/hextray.vcxproj.filters10
-rw-r--r--plugins/hextray/resource.rc4
-rw-r--r--plugins/hextray/utility.cpp4
-rw-r--r--plugins/lua/lua.c2
-rw-r--r--plugins/mailcheck/mailcheck.c2
-rw-r--r--plugins/mpcinfo/mpcInfo.c2
-rw-r--r--plugins/perl/perl.c2
-rw-r--r--plugins/plugin-conf.in4
-rw-r--r--plugins/plugin20.html54
-rw-r--r--plugins/python/python.c2
-rw-r--r--plugins/sasl/sasl.c2
-rw-r--r--plugins/sysinfo/sysinfo.cpp2
-rw-r--r--plugins/sysinfo/xsys.c2
-rw-r--r--plugins/tcl/tclplugin.c2
-rw-r--r--plugins/upd/upd.c2
-rw-r--r--plugins/winamp/winamp.c2
-rw-r--r--plugins/wmpa/hexchat-plugin.cpp (renamed from plugins/wmpa/xchat-plugin.cpp)2
-rw-r--r--plugins/wmpa/hexchat-plugin.h (renamed from plugins/wmpa/xchat-plugin.h)4
-rw-r--r--plugins/wmpa/wmpa-xp.vcxproj4
-rw-r--r--plugins/wmpa/wmpa-xp.vcxproj.filters4
-rw-r--r--plugins/wmpa/wmpa.vcxproj4
-rw-r--r--plugins/wmpa/wmpa.vcxproj.filters4
-rw-r--r--plugins/wmpa/wmpadialog.cpp2
-rw-r--r--plugins/xdcc/xdcc.c4
49 files changed, 113 insertions, 113 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 4a9cee09..9ca89e34 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -3,7 +3,7 @@ EXTRA_DIST = plugin20.html Make.plugin plugin-conf.in \
 				xdcc/xdcc.c \
 				xdcc/Makefile.am
 
-noinst_HEADERS = xchat-plugin.h
+noinst_HEADERS = hexchat-plugin.h
 
 if DO_PYTHON
 pythondir = python
diff --git a/plugins/checksum/checksum.c b/plugins/checksum/checksum.c
index f84eb243..d00249b0 100644
--- a/plugins/checksum/checksum.c
+++ b/plugins/checksum/checksum.c
@@ -46,7 +46,7 @@
 
 #include <sys/stat.h>
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 
 #define BUFSIZE 32768
 #define DEFAULT_LIMIT 256									/* default size is 256 MiB */
diff --git a/plugins/dns/dns.c b/plugins/dns/dns.c
index eb9bb7ee..2d269b01 100644
--- a/plugins/dns/dns.c
+++ b/plugins/dns/dns.c
@@ -43,7 +43,7 @@
 #include <sys/socket.h>
 #endif
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 #include "thread.h"
 
 #define HELP "Usage: DNS <nickname|hostname|numerical address>\n"
diff --git a/plugins/doat/doat.c b/plugins/doat/doat.c
index a0b5707a..237233c5 100644
--- a/plugins/doat/doat.c
+++ b/plugins/doat/doat.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 
 static xchat_plugin *ph;
 
diff --git a/plugins/ewc/ewc.c b/plugins/ewc/ewc.c
index 78e7e9ac..55366da6 100644
--- a/plugins/ewc/ewc.c
+++ b/plugins/ewc/ewc.c
@@ -17,8 +17,8 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

 

-#include "xchat-plugin.h"

 #include <windows.h>

+#include "hexchat-plugin.h"

 

 static xchat_plugin *ph;   /* plugin handle */

 static int enable = 1;

diff --git a/plugins/exec/exec.c b/plugins/exec/exec.c
index 28bc13ab..6f3e350c 100644
--- a/plugins/exec/exec.c
+++ b/plugins/exec/exec.c
@@ -23,7 +23,7 @@
 #include <windows.h>
 #include <time.h>
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 
 static xchat_plugin *ph;   /* plugin handle */
 static const char name[] = "Exec";
diff --git a/plugins/fishlim/Makefile.am b/plugins/fishlim/Makefile.am
index 0f1189de..913312b5 100644
--- a/plugins/fishlim/Makefile.am
+++ b/plugins/fishlim/Makefile.am
@@ -3,7 +3,7 @@ EXTRA_DIST = INSTALL LICENSE README
 libdir = $(hexchatlibdir)/plugins
 
 lib_LTLIBRARIES = fishlim.la
-fishlim_la_SOURCES = fish.c irc.c keystore.c misc.c plugin_xchat.c
+fishlim_la_SOURCES = fish.c irc.c keystore.c misc.c plugin_hexchat.c
 fishlim_la_LDFLAGS = -avoid-version -module 
 fishlim_la_LIBADD = 
 AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(srcdir)/..
diff --git a/plugins/fishlim/fishlim-xp.vcxproj b/plugins/fishlim/fishlim-xp.vcxproj
index cabcd2fd..8b19b6dc 100644
--- a/plugins/fishlim/fishlim-xp.vcxproj
+++ b/plugins/fishlim/fishlim-xp.vcxproj
@@ -106,14 +106,14 @@
     <ClInclude Include="irc.h" />

     <ClInclude Include="keystore.h" />

     <ClInclude Include="misc.h" />

-    <ClInclude Include="plugin_xchat.h" />

+    <ClInclude Include="plugin_hexchat.h" />

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="fish.c" />

     <ClCompile Include="irc.c" />

     <ClCompile Include="keystore.c" />

     <ClCompile Include="misc.c" />

-    <ClCompile Include="plugin_xchat.c" />

+    <ClCompile Include="plugin_hexchat.c" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/fishlim/fishlim-xp.vcxproj.filters b/plugins/fishlim/fishlim-xp.vcxproj.filters
index 72e9f017..7c13733b 100644
--- a/plugins/fishlim/fishlim-xp.vcxproj.filters
+++ b/plugins/fishlim/fishlim-xp.vcxproj.filters
@@ -35,7 +35,7 @@
     <ClInclude Include="misc.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="plugin_xchat.h">

+    <ClInclude Include="plugin_hexchat.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

@@ -52,7 +52,7 @@
     <ClCompile Include="misc.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="plugin_xchat.c">

+    <ClCompile Include="plugin_hexchat.c">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

diff --git a/plugins/fishlim/fishlim.vcxproj b/plugins/fishlim/fishlim.vcxproj
index 0f166e6b..91925660 100644
--- a/plugins/fishlim/fishlim.vcxproj
+++ b/plugins/fishlim/fishlim.vcxproj
@@ -103,14 +103,14 @@
     <ClInclude Include="irc.h" />

     <ClInclude Include="keystore.h" />

     <ClInclude Include="misc.h" />

-    <ClInclude Include="plugin_xchat.h" />

+    <ClInclude Include="plugin_hexchat.h" />

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="fish.c" />

     <ClCompile Include="irc.c" />

     <ClCompile Include="keystore.c" />

     <ClCompile Include="misc.c" />

-    <ClCompile Include="plugin_xchat.c" />

+    <ClCompile Include="plugin_hexchat.c" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/fishlim/fishlim.vcxproj.filters b/plugins/fishlim/fishlim.vcxproj.filters
index 72e9f017..7c13733b 100644
--- a/plugins/fishlim/fishlim.vcxproj.filters
+++ b/plugins/fishlim/fishlim.vcxproj.filters
@@ -35,7 +35,7 @@
     <ClInclude Include="misc.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="plugin_xchat.h">

+    <ClInclude Include="plugin_hexchat.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

@@ -52,7 +52,7 @@
     <ClCompile Include="misc.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="plugin_xchat.c">

+    <ClCompile Include="plugin_hexchat.c">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

diff --git a/plugins/fishlim/keystore.c b/plugins/fishlim/keystore.c
index c54b5dca..9f1c446e 100644
--- a/plugins/fishlim/keystore.c
+++ b/plugins/fishlim/keystore.c
@@ -29,7 +29,7 @@
 #include "fish.h"
 #include "misc.h"
 #include "keystore.h"
-#include "plugin_xchat.h"
+#include "plugin_hexchat.h"
 
 
 static char *keystore_password = NULL;
diff --git a/plugins/fishlim/plugin_xchat.c b/plugins/fishlim/plugin_hexchat.c
index ff75fa93..91ba1d6a 100644
--- a/plugins/fishlim/plugin_xchat.c
+++ b/plugins/fishlim/plugin_hexchat.c
@@ -27,7 +27,7 @@
 #include <string.h>
 
 // #pragma GCC visibility push(default)
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 #define XCHAT_MAX_WORDS 32
 // #pragma GCC visibility pop
 
diff --git a/plugins/fishlim/plugin_xchat.h b/plugins/fishlim/plugin_hexchat.h
index d606526d..04a1f4ff 100644
--- a/plugins/fishlim/plugin_xchat.h
+++ b/plugins/fishlim/plugin_hexchat.h
@@ -22,8 +22,8 @@
 
 */
 
-#ifndef XCHAT_PLUGIN_H
-#define XCHAT_PLUGIN_H
+#ifndef PLUGIN_HEXCHAT_H
+#define PLUGIN_HEXCHAT_H
 
 gchar *get_config_filename();
 
diff --git a/plugins/gtkpref/gtkpref.c b/plugins/gtkpref/gtkpref.c
index 84f51726..1f6241c1 100644
--- a/plugins/gtkpref/gtkpref.c
+++ b/plugins/gtkpref/gtkpref.c
@@ -22,7 +22,7 @@
 
 #include <windows.h>
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 
 static xchat_plugin *ph;   /* plugin handle */
 
diff --git a/plugins/xchat-plugin.h b/plugins/hexchat-plugin.h
index 1b7da8fb..43621f78 100644
--- a/plugins/xchat-plugin.h
+++ b/plugins/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/plugins/hextray/callbacks.cpp b/plugins/hextray/callbacks.cpp
index 96990050..e7dcfdba 100644
--- a/plugins/hextray/callbacks.cpp
+++ b/plugins/hextray/callbacks.cpp
@@ -23,10 +23,10 @@
 #include <commctrl.h>

 #include <tchar.h>

 

-#include "xchat-plugin.h"

+#include "hexchat-plugin.h"

 #include "utility.h"

-#include "xtray.h"

-#include "xchat.h"

+#include "hextray.h"

+#include "hexchat.h"

 #include "callbacks.h"

 #include "resource.h"

 #include "sdTray.h"

@@ -45,7 +45,7 @@ BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam)
 	TCHAR szTitle[10];

 	GetWindowText(hWnd, szTitle, 9);

 

-	if(_tcsstr(szTitle, _T("XChat [")))

+	if(_tcsstr(szTitle, _T("HexChat [")))

 	{

 		g_hXchatWnd = hWnd;

 		return false;

diff --git a/plugins/hextray/xchat.cpp b/plugins/hextray/hexchat.cpp
index 47ce46a9..b1defc1f 100644
--- a/plugins/hextray/xchat.cpp
+++ b/plugins/hextray/hexchat.cpp
@@ -22,10 +22,10 @@
 #include <stdio.h>

 #include <tchar.h>

 

-#include "xchat-plugin.h"

-#include "xtray.h"

+#include "hexchat-plugin.h"

+#include "hextray.h"

 #include "resource.h"

-#include "xchat.h"

+#include "hexchat.h"

 #include "utility.h"

 

 // from util.c of xchat source code ( slightly modified to fit X-Tray Syntax )

diff --git a/plugins/hextray/xchat.h b/plugins/hextray/hexchat.h
index 76452aeb..76452aeb 100644
--- a/plugins/hextray/xchat.h
+++ b/plugins/hextray/hexchat.h
diff --git a/plugins/hextray/hextray-xp.vcxproj b/plugins/hextray/hextray-xp.vcxproj
index cd7581d5..72d1599e 100644
--- a/plugins/hextray/hextray-xp.vcxproj
+++ b/plugins/hextray/hextray-xp.vcxproj
@@ -69,7 +69,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

-      <ModuleDefinitionFile>xtray.def</ModuleDefinitionFile>

+      <ModuleDefinitionFile>hextray.def</ModuleDefinitionFile>

       <AdditionalDependencies>ntstc_msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

@@ -89,7 +89,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

-      <ModuleDefinitionFile>xtray.def</ModuleDefinitionFile>

+      <ModuleDefinitionFile>hextray.def</ModuleDefinitionFile>

       <AdditionalDependencies>ntstc_msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

@@ -103,7 +103,7 @@
     <None Include="icons\sd.ico" />

     <None Include="icons\notice.ico" />

     <None Include="icons\hexchat.ico" />

-    <None Include="xtray.def" />

+    <None Include="hextray.def" />

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="resource.rc" />

@@ -113,8 +113,8 @@
     <ClCompile Include="sdAlerts.cpp" />

     <ClCompile Include="sdTray.cpp" />

     <ClCompile Include="utility.cpp" />

-    <ClCompile Include="xchat.cpp" />

-    <ClCompile Include="xtray.cpp" />

+    <ClCompile Include="hexchat.cpp" />

+    <ClCompile Include="hextray.cpp" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="callbacks.h" />

@@ -122,8 +122,8 @@
     <ClInclude Include="sdAlerts.h" />

     <ClInclude Include="sdTray.h" />

     <ClInclude Include="utility.h" />

-    <ClInclude Include="xchat.h" />

-    <ClInclude Include="xtray.h" />

+    <ClInclude Include="hexchat.h" />

+    <ClInclude Include="hextray.h" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/hextray/hextray-xp.vcxproj.filters b/plugins/hextray/hextray-xp.vcxproj.filters
index b83dc813..1f9a4057 100644
--- a/plugins/hextray/hextray-xp.vcxproj.filters
+++ b/plugins/hextray/hextray-xp.vcxproj.filters
@@ -21,7 +21,7 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <None Include="xtray.def">

+    <None Include="hextray.def">

       <Filter>Resource Files</Filter>

     </None>

     <None Include="bitmaps\sd.bmp">

@@ -70,10 +70,10 @@
     <ClCompile Include="utility.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="xchat.cpp">

+    <ClCompile Include="hexchat.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="xtray.cpp">

+    <ClCompile Include="hextray.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

@@ -93,10 +93,10 @@
     <ClInclude Include="utility.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="xchat.h">

+    <ClInclude Include="hexchat.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="xtray.h">

+    <ClInclude Include="hextray.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

diff --git a/plugins/hextray/xtray.cpp b/plugins/hextray/hextray.cpp
index df4a5c89..9741e5f7 100644
--- a/plugins/hextray/xtray.cpp
+++ b/plugins/hextray/hextray.cpp
@@ -23,11 +23,11 @@
 #include <string>

 #include <shobjidl.h>

 

-#include "xchat-plugin.h"

+#include "hexchat-plugin.h"

 #include "resource.h"

 #include "callbacks.h"

 #include "utility.h"

-#include "xtray.h"

+#include "hextray.h"

 #include "sdTray.h"

 #include "sdAlerts.h"

 

diff --git a/plugins/hextray/xtray.def b/plugins/hextray/hextray.def
index 77670bf2..77670bf2 100644
--- a/plugins/hextray/xtray.def
+++ b/plugins/hextray/hextray.def
diff --git a/plugins/hextray/xtray.h b/plugins/hextray/hextray.h
index 0bd8a990..0bd8a990 100644
--- a/plugins/hextray/xtray.h
+++ b/plugins/hextray/hextray.h
diff --git a/plugins/hextray/hextray.vcxproj b/plugins/hextray/hextray.vcxproj
index 47f4c273..fd28aae3 100644
--- a/plugins/hextray/hextray.vcxproj
+++ b/plugins/hextray/hextray.vcxproj
@@ -66,7 +66,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

-      <ModuleDefinitionFile>xtray.def</ModuleDefinitionFile>

+      <ModuleDefinitionFile>hextray.def</ModuleDefinitionFile>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -85,7 +85,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

-      <ModuleDefinitionFile>xtray.def</ModuleDefinitionFile>

+      <ModuleDefinitionFile>hextray.def</ModuleDefinitionFile>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

@@ -98,7 +98,7 @@
     <None Include="icons\sd.ico" />

     <None Include="icons\notice.ico" />

     <None Include="icons\hexchat.ico" />

-    <None Include="xtray.def" />

+    <None Include="hextray.def" />

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="resource.rc" />

@@ -108,8 +108,8 @@
     <ClCompile Include="sdAlerts.cpp" />

     <ClCompile Include="sdTray.cpp" />

     <ClCompile Include="utility.cpp" />

-    <ClCompile Include="xchat.cpp" />

-    <ClCompile Include="xtray.cpp" />

+    <ClCompile Include="hexchat.cpp" />

+    <ClCompile Include="hextray.cpp" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="callbacks.h" />

@@ -117,8 +117,8 @@
     <ClInclude Include="sdAlerts.h" />

     <ClInclude Include="sdTray.h" />

     <ClInclude Include="utility.h" />

-    <ClInclude Include="xchat.h" />

-    <ClInclude Include="xtray.h" />

+    <ClInclude Include="hexchat.h" />

+    <ClInclude Include="hextray.h" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/hextray/hextray.vcxproj.filters b/plugins/hextray/hextray.vcxproj.filters
index b83dc813..1f9a4057 100644
--- a/plugins/hextray/hextray.vcxproj.filters
+++ b/plugins/hextray/hextray.vcxproj.filters
@@ -21,7 +21,7 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <None Include="xtray.def">

+    <None Include="hextray.def">

       <Filter>Resource Files</Filter>

     </None>

     <None Include="bitmaps\sd.bmp">

@@ -70,10 +70,10 @@
     <ClCompile Include="utility.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="xchat.cpp">

+    <ClCompile Include="hexchat.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="xtray.cpp">

+    <ClCompile Include="hextray.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

@@ -93,10 +93,10 @@
     <ClInclude Include="utility.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="xchat.h">

+    <ClInclude Include="hexchat.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="xtray.h">

+    <ClInclude Include="hextray.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

diff --git a/plugins/hextray/resource.rc b/plugins/hextray/resource.rc
index 4b028421..01899ac7 100644
--- a/plugins/hextray/resource.rc
+++ b/plugins/hextray/resource.rc
@@ -201,7 +201,7 @@ END
 

 3 TEXTINCLUDE 

 BEGIN

-    "xtray.h\0"

+    "hextray.h\0"

 END

 

 4 TEXTINCLUDE 

@@ -303,7 +303,7 @@ IDB_SD_LOGO             BITMAP                  "bitmaps\\sd.bmp"
 //

 // Generated from the TEXTINCLUDE 3 resource.

 //

-xtray.h

+hextray.h

 /////////////////////////////////////////////////////////////////////////////

 #endif    // not APSTUDIO_INVOKED

 

diff --git a/plugins/hextray/utility.cpp b/plugins/hextray/utility.cpp
index 8f6caa27..4a2ddde7 100644
--- a/plugins/hextray/utility.cpp
+++ b/plugins/hextray/utility.cpp
@@ -21,9 +21,9 @@
 #include <commctrl.h>

 #include <tchar.h>

 

-#include "xchat-plugin.h"

+#include "hexchat-plugin.h"

 #include "utility.h"

-#include "xtray.h"

+#include "hextray.h"

 #include "callbacks.h"

 #include "resource.h"

 

diff --git a/plugins/lua/lua.c b/plugins/lua/lua.c
index 8fc55a26..3809e66e 100644
--- a/plugins/lua/lua.c
+++ b/plugins/lua/lua.c
@@ -65,7 +65,7 @@
 
 #define lua_pop(L,n)  lua_settop(L, -(n)-1)
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 
 static xchat_plugin *ph; /* plugin handle */
 
diff --git a/plugins/mailcheck/mailcheck.c b/plugins/mailcheck/mailcheck.c
index 19011ab3..fb507539 100644
--- a/plugins/mailcheck/mailcheck.c
+++ b/plugins/mailcheck/mailcheck.c
@@ -7,7 +7,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 
 
 static xchat_plugin *ph;	/* plugin handle */
diff --git a/plugins/mpcinfo/mpcInfo.c b/plugins/mpcinfo/mpcInfo.c
index e467e516..cfbcc3b7 100644
--- a/plugins/mpcinfo/mpcInfo.c
+++ b/plugins/mpcinfo/mpcInfo.c
@@ -23,7 +23,7 @@ static char *VERSION="0.0.6";
 #include <stdio.h>
 #include <ctype.h>
 #include <math.h>
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 static xchat_plugin *ph;
 
 #include "functions.c"
diff --git a/plugins/perl/perl.c b/plugins/perl/perl.c
index c9bfa5e9..38de8208 100644
--- a/plugins/perl/perl.c
+++ b/plugins/perl/perl.c
@@ -33,7 +33,7 @@
 
 #undef PACKAGE
 #include "../../config.h"		  /* for #define OLD_PERL */
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 
 static xchat_plugin *ph;		  /* plugin handle */
 
diff --git a/plugins/plugin-conf.in b/plugins/plugin-conf.in
index 1e2c338e..f43f5c53 100644
--- a/plugins/plugin-conf.in
+++ b/plugins/plugin-conf.in
@@ -1,12 +1,12 @@
 AC_INIT(@PLUGIN@-config.h.in)
 AM_CONFIG_HEADER(@PLUGIN@-config.h)
-AM_INIT_AUTOMAKE(xchat-@PLUGIN@, @PLUGIN_VERSION@)
+AM_INIT_AUTOMAKE(hexchat-@PLUGIN@, @PLUGIN_VERSION@)
 AM_MAINTAINER_MODE
 AM_DISABLE_STATIC
 AM_PROG_LIBTOOL
 
 AC_ARG_WITH(plugin-includes,
-[  --with-plugin-includes  directory containing xchat-plugin.h],         
+[  --with-plugin-includes  directory containing hexchat-plugin.h],
 	PLUGIN_INCLUDES=$enableval)
 
 AC_SUBST(PLUGIN_INCLUDES)
diff --git a/plugins/plugin20.html b/plugins/plugin20.html
index 2c2d106c..e17f3346 100644
--- a/plugins/plugin20.html
+++ b/plugins/plugin20.html
@@ -101,12 +101,12 @@ margin-right: 32px;
 </blockquote><br>
 
 <h3><a name=intro>Introduction</a></h3>
-Plugins for XChat are written in C. The interface aims to keep 100%
-binary compatability. This means that if you upgrade XChat, you will
+Plugins for HexChat are written in C. The interface aims to keep 100%
+binary compatability. This means that if you upgrade HexChat, you will
 not need to recompile your plugins, they'll continue to work. The
 interface doesn't depend on any structures and offsets, so compiler
 versions shouldn't have an impact either. The only real requirement of
-an XChat plugin, is that it define a "xchat_plugin_init" symbol. This
+an HexChat plugin, is that it define a "xchat_plugin_init" symbol. This
 is your entry point function, see the example below. You should make
 all your global variables and functions <i>static</i>, so that a symbol
 is not exported. There is no harm in exporting these symbols, but they
@@ -130,7 +130,7 @@ of locale. <a href="#unicode">What does this mean</a>?
 <h3><a name=sample>Sample plugin</a></h3>
 This simple plugin autoOps anyone who joins a channel you're in. It also
 adds a new command /AUTOOPTOGGLE, which can be used to turn the feature ON
-or OFF. Every XChat plugin must define an xchat_plugin_init function, this
+or OFF. Every HexChat plugin must define an xchat_plugin_init function, this
 is the normal entry point. xchat_plugin_deinit is optional.
 <br>
 <div style="color: #ffffff; background-color: #111199;">
@@ -142,7 +142,7 @@ is the normal entry point. xchat_plugin_deinit is optional.
 <font color="#00ff00">#define PDESC </font><font color="#00ffff">&quot;Auto Ops anyone that joins&quot;</font>
 <font color="#00ff00">#define PVERSION </font><font color="#00ffff">&quot;0.1&quot;</font>
 
-<font color="#ffa500"><b>static</b></font> xchat_plugin *ph;   <font color="#bebebe"><b>/*</b></font><font color="#bebebe"><b> plugin handle </b></font><font color="#bebebe"><b>*/</b></font>
+<font color="#ffa500"><b>static</b></font> hexchat_plugin *ph;   <font color="#bebebe"><b>/*</b></font><font color="#bebebe"><b> plugin handle </b></font><font color="#bebebe"><b>*/</b></font>
 <font color="#ffa500"><b>static</b></font> <font color="#ffa500"><b>int</b></font> enable = <font color="#00ffff">1</font>;
 
 <font color="#ffa500"><b>static</b></font> <font color="#ffa500"><b>int</b></font> join_cb(<font color="#ffa500"><b>char</b></font> *word[], <font color="#ffa500"><b>void</b></font> *userdata)
@@ -152,7 +152,7 @@ is the normal entry point. xchat_plugin_deinit is optional.
       xchat_commandf(ph, <font color="#00ffff">&quot;OP </font><font color="#ff00ff">%s</font><font color="#00ffff">&quot;</font>, word[<font color="#00ffff">1</font>]);
    <font color="#bebebe"><b>/*</b></font><font color="#bebebe"><b> word[1] is the nickname, as in the Settings-&gt;Advanced-&gt;TextEvents window in xchat </b></font><font color="#bebebe"><b>*/</b></font>
 
-   <font color="#ffff00">return</font> XCHAT_EAT_NONE;  <font color="#bebebe"><b>/*</b></font><font color="#bebebe"><b> don't eat this event, xchat needs to see it! </b></font><font color="#bebebe"><b>*/</b></font>
+   <font color="#ffff00">return</font> XCHAT_EAT_NONE;  <font color="#bebebe"><b>/*</b></font><font color="#bebebe"><b> don't eat this event, HexChat needs to see it! </b></font><font color="#bebebe"><b>*/</b></font>
 }
 
 <font color="#ffa500"><b>static</b></font> <font color="#ffa500"><b>int</b></font> autooptoggle_cb(<font color="#ffa500"><b>char</b></font> *word[], <font color="#ffa500"><b>char</b></font> *word_eol[], <font color="#ffa500"><b>void</b></font> *userdata)
@@ -167,7 +167,7 @@ is the normal entry point. xchat_plugin_deinit is optional.
       xchat_print(ph, <font color="#00ffff">&quot;AutoOping now disabled!</font><font color="#ff00ff">\n</font><font color="#00ffff">&quot;</font>);
    }
 
-   <font color="#ffff00">return</font> XCHAT_EAT_ALL;   <font color="#bebebe"><b>/*</b></font><font color="#bebebe"><b> eat this command so xchat and other plugins can't process it </b></font><font color="#bebebe"><b>*/</b></font>
+   <font color="#ffff00">return</font> XCHAT_EAT_ALL;   <font color="#bebebe"><b>/*</b></font><font color="#bebebe"><b> eat this command so HexChat and other plugins can't process it </b></font><font color="#bebebe"><b>*/</b></font>
 }
 
 <font color="#ffa500"><b>void</b></font> xchat_plugin_get_info(<font color="#ffa500"><b>char</b></font> **name, <font color="#ffa500"><b>char</b></font> **desc, <font color="#ffa500"><b>char</b></font> **version, <font color="#ffa500"><b>void</b></font> **reserved)
@@ -186,7 +186,7 @@ is the normal entry point. xchat_plugin_deinit is optional.
    <font color="#bebebe"><b>/*</b></font><font color="#bebebe"><b> we need to save this for use with any xchat_* functions </b></font><font color="#bebebe"><b>*/</b></font>
    ph = plugin_handle;
 
-   <font color="#bebebe"><b>/*</b></font><font color="#bebebe"><b> tell xchat our info </b></font><font color="#bebebe"><b>*/</b></font>
+   <font color="#bebebe"><b>/*</b></font><font color="#bebebe"><b> tell HexChat our info </b></font><font color="#bebebe"><b>*/</b></font>
    *plugin_name = PNAME;
    *plugin_desc = PDESC;
    *plugin_version = PVERSION;
@@ -358,7 +358,7 @@ Yes, it can be done. All you need is either
 Simply compile your plugin as a DLL. You should have the following files:
 
 <ul>
-<li><a href="http://xchat.org/docs/xchat-plugin.h">xchat-plugin.h</a> - Main Plugin header</li>
+<li><a href="https://github.com/hexchat/hexchat/blob/master/plugins/hexchat-plugin.h">hexchat-plugin.h</a> - Main Plugin header</li>
 <li>plugin.c - Your plugin, you need to write this one :)</li>
 <li>plugin.def - A simple text file containing the following:</li>
 </ul>
@@ -395,16 +395,16 @@ xchat_command(ph, "GUI .....");.
 </p>
 <blockquote>
 	<table border=0 cellpadding=4>
-	<tr><td>GUI ATTACH</td><td>Same function as "Attach Window" in the XChat menu (new for 2.6.2).</td></tr>
-	<tr><td>GUI DETACH</td><td>Same function as "Detach Tab" in the XChat menu (new for 2.6.2).</td></tr>
+	<tr><td>GUI ATTACH</td><td>Same function as "Attach Window" in the HexChat menu (new for 2.6.2).</td></tr>
+	<tr><td>GUI DETACH</td><td>Same function as "Detach Tab" in the HexChat menu (new for 2.6.2).</td></tr>
 	<tr><td>GUI APPLY</td><td>Similar to clicking OK in the settings window. Execute this after /SET to activate GUI changes (new for 2.8.0)</td></tr>
 	<tr><td>GUI COLOR <i>n</i></td><td>Change the tab color of the current context, where n is a number from 0 to 3.</td></tr>
 	<tr><td>GUI FOCUS</td><td>Focus the current window or tab.</td></tr>
 	<tr><td>GUI FLASH</td><td>Flash the taskbar button. It will flash only if the window isn't focused and will stop when it is focused by the user.</td></tr>
-	<tr><td>GUI HIDE</td><td>Hide the main xchat window completely (this is used by the Systray plugin).</td></tr>
-	<tr><td>GUI ICONIFY</td><td>Iconify (minimize to taskbar) the current xchat window.</td></tr>
+	<tr><td>GUI HIDE</td><td>Hide the main HexChat window completely (this is used by the Systray plugin).</td></tr>
+	<tr><td>GUI ICONIFY</td><td>Iconify (minimize to taskbar) the current HexChat window.</td></tr>
 	<tr><td>GUI MSGBOX <i>text</i></td><td>Displays a asynchronous message box with your text (new for 2.4.5).</td></tr>
-	<tr><td>GUI SHOW</td><td>Show the main xchat window (if currently hidden).</td></tr>
+	<tr><td>GUI SHOW</td><td>Show the main HexChat window (if currently hidden).</td></tr>
 	</table>
 </blockquote>
 <p>
@@ -439,11 +439,11 @@ Parameters and flags:
 
 If you want to change an item's toggle state or enabled flag,
 just ADD an item with exactly the same name and command and specify the -tX -eX parameters you need.
-<br><br>It's also possible to add items to XChat's existing menus, for example:<br>
+<br><br>It's also possible to add items to HexChat's existing menus, for example:<br>
 <pre>	MENU ADD "Settings/Sub Menu"
 	MENU -t0 ADD "Settings/Sub Menu/My Setting" myseton mysetoff
 </pre>
-However, internal names and layouts of XChat's menu may change in the future, so use at own risk.
+However, internal names and layouts of HexChat's menu may change in the future, so use at own risk.
 <br><br>
 Here is an example of Radio items:
 <pre>	MENU ADD "Language"
@@ -468,10 +468,10 @@ From 2.8.0, you can also change menus other than the main one (i.e popup menus).
 </pre>
 
 <br>
-<a name=tray>Starting from 2.8.0 you can manipulate XChat's system tray icon using the /TRAY command</a>:
+<a name=tray>Starting from 2.8.0 you can manipulate HexChat's system tray icon using the /TRAY command</a>:
 <pre>
  Usage: 
- TRAY -f &lt;timeout> &lt;file1> [&lt;file2>] Flash tray between two icons. Leave off file2 to use default xchat icon.
+ TRAY -f &lt;timeout> &lt;file1> [&lt;file2>] Flash tray between two icons. Leave off file2 to use default HexChat icon.
  TRAY -f &lt;filename>                  Set tray to a fixed icon.
  TRAY -i &lt;number>                    Flash tray with an internal icon.
                                      <small>2=Message 5=Highlight 8=Private 11=File</small>
@@ -479,12 +479,12 @@ From 2.8.0, you can also change menus other than the main one (i.e popup menus).
  TRAY -b &lt;title> &lt;text>              Set the tray balloon.
                                      <small>Supported on Windows from 2.8.1 and 2.8.2 on Linux (libnotify required on Linux).</small>
 </pre>
-Filenames can be ICO or PNG format. PNG format is supported on Linux/BSD and Windows XP (but requires installation of GDI+ on Windows 2000). Set a timeout of -1 to use XChat's default.
+Filenames can be ICO or PNG format. PNG format is supported on Linux/BSD and Windows XP (but requires installation of GDI+ on Windows 2000). Set a timeout of -1 to use HexChat's default.
 <br><br>
 
 <h3><a name=unicode>Handling UTF-8/Unicode strings</a></h3>
 <p>
-The XChat plugin API specifies that strings passed to and from xchat must be encoded in UTF-8.
+The HexChat plugin API specifies that strings passed to and from HexChat must be encoded in UTF-8.
 <br><br>
 What does this mean for the plugin programmer? You just have to be a little careful when
 passing strings obtained from IRC to system calls. For example, if you're writing a file-server
@@ -512,7 +512,7 @@ static void get_file_name(char *nick, char *fname)
 	char buf[256];
 	FILE *fp;
 
-<font color="#777777">	/* the fname is in UTF-8, because it came from the xchat API */</font>
+<font color="#777777">	/* the fname is in UTF-8, because it came from the HexChat API */</font>
 </pre><font color="#33aa44">#ifdef _WIN32</font><pre>
 	wchar_t wide_name[MAX_PATH];
 
@@ -601,7 +601,7 @@ xchat_hook_command(ph, "ONOTICE", XCHAT_PRI_NORM, onotice_cb,
 <blockquote><b>ph:</b> Plugin handle (as given to xchat_plugin_init).
 <br><b>fd:</b> The file descriptor or socket.
 <br><b>flags:</b> One or more of XCHAT_FD_READ, XCHAT_FD_WRITE, XCHAT_FD_EXCEPTION, XCHAT_FD_NOTSOCKET. Use bitwise OR to combine them.
-XCHAT_FD_NOTSOCKET tells xchat that the provided <b>fd</b> is not a socket, but a "MSVCRT.DLL" pipe.
+XCHAT_FD_NOTSOCKET tells HexChat that the provided <b>fd</b> is not a socket, but a "MSVCRT.DLL" pipe.
 <br><b>callb:</b> Callback function. This will be called when the socket is available for reading/writing or exception (depending on your chosen <b>flags</b>)
 <br><b>userdata:</b> Pointer passed to the callback function.</blockquote>
 <b>Returns:</b> Pointer to the hook. Can be passed to xchat_unhook.
@@ -644,7 +644,7 @@ tab-window is focused by the window manager.
 static int youpart_cb(char *word[], void *userdata)
 {
 	xchat_printf(ph, "You have left channel %s\n", word[3]);
-	return XCHAT_EAT_XCHAT;	/* dont let xchat do its normal printing */
+	return XCHAT_EAT_XCHAT;	/* dont let HexChat do its normal printing */
 }
 
 xchat_hook_print(ph, "You Part", XCHAT_PRI_NORM, youpart_cb, NULL);
@@ -673,7 +673,7 @@ hook every line that comes from the IRC server, you may use the special name of
 static int kick_cb(char *word[], char *word_eol[], void *userdata)
 {
 	xchat_printf(ph, "%s was kicked from %s (reason=%s)\n", word[4], word[3], word_eol[5]);
-	return XCHAT_EAT_NONE;	/* don't eat this event, let other plugins and xchat see it too */
+	return XCHAT_EAT_NONE;	/* don't eat this event, let other plugins and HexChat see it too */
 }
 
 xchat_hook_server(ph, "KICK", XCHAT_PRI_NORM, kick_cb, NULL);
@@ -737,7 +737,7 @@ removed, so you don't need to call this within your xchat_plugin_deinit() functi
 <h3><a class=cmd name="xchat_command">&nbsp;xchat_command()&nbsp;</a></h3>
 <b>Prototype:</b> void xchat_command(xchat_plugin *ph, const char *command);
 <br>
-<br><b>Description:</b> Executes a command as if it were typed in xchat's input box.
+<br><b>Description:</b> Executes a command as if it were typed in HexChat's input box.
 <br>
 <br><b>Arguments:</b>
 <blockquote><b>ph:</b> Plugin handle (as given to xchat_plugin_init).
@@ -748,7 +748,7 @@ removed, so you don't need to call this within your xchat_plugin_deinit() functi
 <h3><a class=cmd name="xchat_commandf">&nbsp;xchat_commandf()&nbsp;</a></h3>
 <b>Prototype:</b> void xchat_commandf(xchat_plugin *ph, const char *format, ...);
 <br>
-<br><b>Description:</b> Executes a command as if it were typed in xchat's input box and provides string formating like printf.
+<br><b>Description:</b> Executes a command as if it were typed in HexChat's input box and provides string formating like printf.
 <br>
 <br><b>Arguments:</b>
 <blockquote><b>ph:</b> Plugin handle (as given to xchat_plugin_init).
@@ -877,7 +877,7 @@ Changed in 2.6.1. If servname is NULL, it finds the channel (or query) by the gi
 	<tr><td>win_ptr</td><td>native window pointer. Unix: (GtkWindow *) Win32: HWND (since 2.6.0).</td></tr>
 	<tr><td>win_status</td><td>window status: "active", "hidden" or "normal" (since 2.0.9).</td>
 	<tr><td>xchatdir</td><td>xchat config directory, e.g.: /home/user/.xchat2 <small>This string is encoded in UTF-8, which means you _should_ convert it to "locale" encoding before using functions like open() or OpenFile(). For best <a href="#unicode">Unicode support</a> on Linux, convert this string using g_filename_from_utf8 and on Windows convert this string to UTF-16LE (wide) and use OpenFileW() etc.</small></td></tr>
-	<tr><td>xchatdirfs</td><td>xchat config directory, e.g.: /home/user/.xchat2 (since 2.0.9).<small>This string is encoded in local file system encoding, making it ideal for direct use with functions like open() or OpenFile(). For real Unicode support on Windows, it's best not to use xchatdirfs, but xchatdir instead.</small></td></tr>
+	<tr><td>xchatdirfs</td><td>xchat config directory, e.g.: /home/user/.xchat2 (since 2.0.9).<small>This string is encoded in local file system encoding, making it ideal for direct use with functions like open() or OpenFile(). For real Unicode support on Windows, it's best not to use HexChatdirfs, but HexChatdir instead.</small></td></tr>
 	</table>
 	</blockquote>
 </blockquote>
diff --git a/plugins/python/python.c b/plugins/python/python.c
index 4a594e05..9f3dd211 100644
--- a/plugins/python/python.c
+++ b/plugins/python/python.c
@@ -64,7 +64,7 @@
 #include <dirent.h>
 #endif
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 #include "Python.h"
 #include "structmember.h"
 #include "pythread.h"
diff --git a/plugins/sasl/sasl.c b/plugins/sasl/sasl.c
index 5e2ea5c4..7978251e 100644
--- a/plugins/sasl/sasl.c
+++ b/plugins/sasl/sasl.c
@@ -38,7 +38,7 @@
 #include <assert.h>
 #include <glib.h>
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 
 static xchat_plugin *ph;   /* plugin handle */
 static const char name[] = "SASL";
diff --git a/plugins/sysinfo/sysinfo.cpp b/plugins/sysinfo/sysinfo.cpp
index 5cb4b766..d525e6b3 100644
--- a/plugins/sysinfo/sysinfo.cpp
+++ b/plugins/sysinfo/sysinfo.cpp
@@ -25,7 +25,7 @@
 #include <comutil.h>
 #include <wbemidl.h>
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 
 static xchat_plugin *ph;   /* plugin handle */
 static char name[] = "SysInfo";
diff --git a/plugins/sysinfo/xsys.c b/plugins/sysinfo/xsys.c
index f328b9b0..1d867dd1 100644
--- a/plugins/sysinfo/xsys.c
+++ b/plugins/sysinfo/xsys.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <glib.h>
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 #include "parse.h"
 #include "match.h"
 #include "xsys.h"
diff --git a/plugins/tcl/tclplugin.c b/plugins/tcl/tclplugin.c
index 17b0b99b..fe507bee 100644
--- a/plugins/tcl/tclplugin.c
+++ b/plugins/tcl/tclplugin.c
@@ -36,7 +36,7 @@ static char RCSID[] = "$Id: tclplugin.c,v 1.65 2012/07/26 20:02:12 mooooooo Exp
 #include <unistd.h>
 #endif
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 #include "tclplugin.h"
 #include "printevents.h"
 
diff --git a/plugins/upd/upd.c b/plugins/upd/upd.c
index f0ed0a2d..f6030910 100644
--- a/plugins/upd/upd.c
+++ b/plugins/upd/upd.c
@@ -23,7 +23,7 @@
 #include <windows.h>
 #include <wininet.h>
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 
 static xchat_plugin *ph;   /* plugin handle */
 static const char name[] = "Update Checker";
diff --git a/plugins/winamp/winamp.c b/plugins/winamp/winamp.c
index 67907eba..eb9493a6 100644
--- a/plugins/winamp/winamp.c
+++ b/plugins/winamp/winamp.c
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 
 #define PLAYING 1
 #define PAUSED 3
diff --git a/plugins/wmpa/xchat-plugin.cpp b/plugins/wmpa/hexchat-plugin.cpp
index 7b3bc737..b8a21135 100644
--- a/plugins/wmpa/xchat-plugin.cpp
+++ b/plugins/wmpa/hexchat-plugin.cpp
@@ -7,7 +7,7 @@
 *
 ******************************************************************/
 #include "stdafx.h"
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 #include <windows.h>
 #include <tchar.h>
 #include "wmpa.h"
diff --git a/plugins/wmpa/xchat-plugin.h b/plugins/wmpa/hexchat-plugin.h
index ee189ffe..cec27a6f 100644
--- a/plugins/wmpa/xchat-plugin.h
+++ b/plugins/wmpa/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
 
 #define VER_STRING _T("1.0.2 (BETA)")
 
diff --git a/plugins/wmpa/wmpa-xp.vcxproj b/plugins/wmpa/wmpa-xp.vcxproj
index fb367520..15fed71d 100644
--- a/plugins/wmpa/wmpa-xp.vcxproj
+++ b/plugins/wmpa/wmpa-xp.vcxproj
@@ -118,7 +118,7 @@
     <ClCompile Include="wmpplaylistcollection.cpp" />

     <ClCompile Include="wmpsettings.cpp" />

     <ClCompile Include="wmpstringcollection.cpp" />

-    <ClCompile Include="xchat-plugin.cpp" />

+    <ClCompile Include="hexchat-plugin.cpp" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="resource.h" />

@@ -142,7 +142,7 @@
     <ClInclude Include="wmpplaylistcollection.h" />

     <ClInclude Include="wmpsettings.h" />

     <ClInclude Include="wmpstringcollection.h" />

-    <ClInclude Include="xchat-plugin.h" />

+    <ClInclude Include="hexchat-plugin.h" />

   </ItemGroup>

   <ItemGroup>

     <None Include="ReadMe.txt" />

diff --git a/plugins/wmpa/wmpa-xp.vcxproj.filters b/plugins/wmpa/wmpa-xp.vcxproj.filters
index 2be9d82f..7910f0d8 100644
--- a/plugins/wmpa/wmpa-xp.vcxproj.filters
+++ b/plugins/wmpa/wmpa-xp.vcxproj.filters
@@ -78,7 +78,7 @@
     <ClCompile Include="wmpstringcollection.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="xchat-plugin.cpp">

+    <ClCompile Include="hexchat-plugin.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

@@ -146,7 +146,7 @@
     <ClInclude Include="wmpstringcollection.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="xchat-plugin.h">

+    <ClInclude Include="hexchat-plugin.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

diff --git a/plugins/wmpa/wmpa.vcxproj b/plugins/wmpa/wmpa.vcxproj
index 7dafe2a6..0e5db7dc 100644
--- a/plugins/wmpa/wmpa.vcxproj
+++ b/plugins/wmpa/wmpa.vcxproj
@@ -115,7 +115,7 @@
     <ClCompile Include="wmpplaylistcollection.cpp" />

     <ClCompile Include="wmpsettings.cpp" />

     <ClCompile Include="wmpstringcollection.cpp" />

-    <ClCompile Include="xchat-plugin.cpp" />

+    <ClCompile Include="hexchat-plugin.cpp" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="resource.h" />

@@ -139,7 +139,7 @@
     <ClInclude Include="wmpplaylistcollection.h" />

     <ClInclude Include="wmpsettings.h" />

     <ClInclude Include="wmpstringcollection.h" />

-    <ClInclude Include="xchat-plugin.h" />

+    <ClInclude Include="hexchat-plugin.h" />

   </ItemGroup>

   <ItemGroup>

     <None Include="ReadMe.txt" />

diff --git a/plugins/wmpa/wmpa.vcxproj.filters b/plugins/wmpa/wmpa.vcxproj.filters
index 2be9d82f..7910f0d8 100644
--- a/plugins/wmpa/wmpa.vcxproj.filters
+++ b/plugins/wmpa/wmpa.vcxproj.filters
@@ -78,7 +78,7 @@
     <ClCompile Include="wmpstringcollection.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="xchat-plugin.cpp">

+    <ClCompile Include="hexchat-plugin.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

@@ -146,7 +146,7 @@
     <ClInclude Include="wmpstringcollection.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="xchat-plugin.h">

+    <ClInclude Include="hexchat-plugin.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

diff --git a/plugins/wmpa/wmpadialog.cpp b/plugins/wmpa/wmpadialog.cpp
index b0cdd16e..90bae309 100644
--- a/plugins/wmpa/wmpadialog.cpp
+++ b/plugins/wmpa/wmpadialog.cpp
@@ -10,7 +10,7 @@
 #include "wmpa.h"

 #include "WMPADialog.h"

 #include "shellapi.h"

-#include "xchat-plugin.h"

+#include "hexchat-plugin.h"

 

 #ifdef _DEBUG

 #define new DEBUG_NEW

diff --git a/plugins/xdcc/xdcc.c b/plugins/xdcc/xdcc.c
index 060dbbe3..9233f12b 100644
--- a/plugins/xdcc/xdcc.c
+++ b/plugins/xdcc/xdcc.c
@@ -9,8 +9,8 @@
 #include <unistd.h>
 #endif
 
-#include "xchat-plugin.h"
-#include "../../src/common/xchat.h"
+#include "hexchat-plugin.h"
+#include "../../src/common/hexchat.h"
 
 static xchat_plugin *ph;	/* plugin handle */