Rebranding for XCHAT_PRI_*

21 files changed, 112 insertions, 112 deletions

diff --git a/plugins/checksum/checksum.c b/plugins/checksum/checksum.c
index fed5706c..df9be2de 100644
--- a/plugins/checksum/checksum.c
+++ b/plugins/checksum/checksum.c
@@ -261,9 +261,9 @@ xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugi
 		xchat_pluginpref_set_int (ph, "limit", DEFAULT_LIMIT);
 	}
 
-	xchat_hook_command (ph, "CHECKSUM", XCHAT_PRI_NORM, checksum, "Usage: /CHECKSUM GET|SET", 0);
-	xchat_hook_print (ph, "DCC RECV Complete", XCHAT_PRI_NORM, dccrecv_cb, NULL);
-	xchat_hook_print (ph, "DCC Offer", XCHAT_PRI_NORM, dccoffer_cb, NULL);
+	xchat_hook_command (ph, "CHECKSUM", HEXCHAT_PRI_NORM, checksum, "Usage: /CHECKSUM GET|SET", 0);
+	xchat_hook_print (ph, "DCC RECV Complete", HEXCHAT_PRI_NORM, dccrecv_cb, NULL);
+	xchat_hook_print (ph, "DCC Offer", HEXCHAT_PRI_NORM, dccoffer_cb, NULL);
 
 	xchat_printf (ph, "%s plugin loaded\n", name);
 	return 1;
diff --git a/plugins/dns/dns.c b/plugins/dns/dns.c
index 2d269b01..2417b1d2 100644
--- a/plugins/dns/dns.c
+++ b/plugins/dns/dns.c
@@ -324,7 +324,7 @@ xchat_plugin_init
 	*plugin_desc = "Threaded IPv4/6 DNS Command";
 	*plugin_version = DNS_VERSION;
 
-	xchat_hook_command(ph, "DNS", XCHAT_PRI_LOW, dns_cmd_cb, HELP, 0);
+	xchat_hook_command(ph, "DNS", HEXCHAT_PRI_LOW, dns_cmd_cb, HELP, 0);
 	xchat_printf (ph, "DNS plugin loaded\n");
 
 	return 1;       /* return 1 for success */
diff --git a/plugins/doat/doat.c b/plugins/doat/doat.c
index 237233c5..ab84c85e 100644
--- a/plugins/doat/doat.c
+++ b/plugins/doat/doat.c
@@ -79,7 +79,7 @@ xchat_plugin_init( xchat_plugin * plugin_handle, char **plugin_name,
 	*plugin_version = "1.0001";
 	*plugin_desc = "Perform an arbitrary command on multiple channels";
 
-	xchat_hook_command( ph, "doat", XCHAT_PRI_NORM, parse_command, "DOAT [channel,list,/network] [command], perform a command on multiple contexts", NULL );
+	xchat_hook_command( ph, "doat", HEXCHAT_PRI_NORM, parse_command, "DOAT [channel,list,/network] [command], perform a command on multiple contexts", NULL );
 
 	xchat_print (ph, "Do At plugin loaded\n");
 
diff --git a/plugins/ewc/ewc.c b/plugins/ewc/ewc.c
index 55366da6..d7ae3703 100644
--- a/plugins/ewc/ewc.c
+++ b/plugins/ewc/ewc.c
@@ -213,10 +213,10 @@ int xchat_plugin_init(xchat_plugin *plugin_handle,
   *plugin_desc = "Some commands to remotely control winamp";

   *plugin_version = "1.2";

 

-  xchat_hook_command(ph, "wp", XCHAT_PRI_NORM, wp_cb,

+  xchat_hook_command(ph, "wp", HEXCHAT_PRI_NORM, wp_cb,

                     "Usage: wp", 0);

 

-  xchat_hook_command(ph, "wcmd", XCHAT_PRI_NORM, wcmd_cb,

+  xchat_hook_command(ph, "wcmd", HEXCHAT_PRI_NORM, wcmd_cb,

                     "Usage: wcmd [play|pause|stop|prev|next]", 0);

 

   xchat_print(ph, "EasyWinampControl plugin loaded\n");

diff --git a/plugins/exec/exec.c b/plugins/exec/exec.c
index e2e2f5cf..a4d1a8f3 100644
--- a/plugins/exec/exec.c
+++ b/plugins/exec/exec.c
@@ -124,7 +124,7 @@ xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugi
 	*plugin_desc = desc;
 	*plugin_version = version;
 
-	xchat_hook_command (ph, "EXEC", XCHAT_PRI_NORM, run_command, "Usage: /EXEC [-O] - execute commands inside XChat", 0);
+	xchat_hook_command (ph, "EXEC", HEXCHAT_PRI_NORM, run_command, "Usage: /EXEC [-O] - execute commands inside XChat", 0);
 	xchat_printf (ph, "%s plugin loaded\n", name);
 
 	return 1;       /* return 1 for success */
diff --git a/plugins/fishlim/plugin_hexchat.c b/plugins/fishlim/plugin_hexchat.c
index 91ba1d6a..155a3a57 100644
--- a/plugins/fishlim/plugin_hexchat.c
+++ b/plugins/fishlim/plugin_hexchat.c
@@ -269,16 +269,16 @@ int xchat_plugin_init(xchat_plugin *plugin_handle,
     *version = plugin_version;
     
     /* Register commands */
-    xchat_hook_command(ph, "SETKEY", XCHAT_PRI_NORM, handle_setkey, usage_setkey, NULL);
-    xchat_hook_command(ph, "DELKEY", XCHAT_PRI_NORM, handle_delkey, usage_delkey, NULL);
+    xchat_hook_command(ph, "SETKEY", HEXCHAT_PRI_NORM, handle_setkey, usage_setkey, NULL);
+    xchat_hook_command(ph, "DELKEY", HEXCHAT_PRI_NORM, handle_delkey, usage_delkey, NULL);
     
     /* Add handlers */
-    xchat_hook_command(ph, "", XCHAT_PRI_NORM, handle_outgoing, NULL, NULL);
-    xchat_hook_server(ph, "NOTICE", XCHAT_PRI_NORM, handle_incoming, NULL);
-    xchat_hook_server(ph, "PRIVMSG", XCHAT_PRI_NORM, handle_incoming, NULL);
-    //xchat_hook_server(ph, "RAW LINE", XCHAT_PRI_NORM, handle_debug, NULL);
-    xchat_hook_server(ph, "TOPIC", XCHAT_PRI_NORM, handle_incoming, NULL);
-    xchat_hook_server(ph, "332", XCHAT_PRI_NORM, handle_incoming, NULL);
+    xchat_hook_command(ph, "", HEXCHAT_PRI_NORM, handle_outgoing, NULL, NULL);
+    xchat_hook_server(ph, "NOTICE", HEXCHAT_PRI_NORM, handle_incoming, NULL);
+    xchat_hook_server(ph, "PRIVMSG", HEXCHAT_PRI_NORM, handle_incoming, NULL);
+    //xchat_hook_server(ph, "RAW LINE", HEXCHAT_PRI_NORM, handle_debug, NULL);
+    xchat_hook_server(ph, "TOPIC", HEXCHAT_PRI_NORM, handle_incoming, NULL);
+    xchat_hook_server(ph, "332", HEXCHAT_PRI_NORM, handle_incoming, NULL);
     
     xchat_printf(ph, "%s plugin loaded\n", plugin_name);
     /* Return success */
diff --git a/plugins/gtkpref/gtkpref.c b/plugins/gtkpref/gtkpref.c
index 1f6241c1..8fdb4714 100644
--- a/plugins/gtkpref/gtkpref.c
+++ b/plugins/gtkpref/gtkpref.c
@@ -54,7 +54,7 @@ xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugi
 	*plugin_desc = "GTK+ Preference Tool Launcher";
 	*plugin_version = "1.0";
 
-	xchat_hook_command (ph, "GTKPREF", XCHAT_PRI_NORM, launch_tool, 0, 0);
+	xchat_hook_command (ph, "GTKPREF", HEXCHAT_PRI_NORM, launch_tool, 0, 0);
 	xchat_command (ph, "MENU -ietc\\gtkpref.png ADD \"Settings/GTK+ Preferences\" \"GTKPREF\"");
 
 	return 1;       /* return 1 for success */
diff --git a/plugins/hextray/hextray.cpp b/plugins/hextray/hextray.cpp
index e18c973e..5b5f56af 100644
--- a/plugins/hextray/hextray.cpp
+++ b/plugins/hextray/hextray.cpp
@@ -161,20 +161,20 @@ int xchat_plugin_init(xchat_plugin *plugin_handle, char **plugin_name, char **pl
 	/***************************************************************************************************************************/

 	/************************* Set our hooks and save them for later so we can unhook them *************************************/

 	/***************************************************************************************************************************/

-	g_vHooks.push_back(xchat_hook_print(ph, "Channel Msg Hilight",			XCHAT_PRI_NORM, event_cb,	(void *)CHAN_HILIGHT));

-	g_vHooks.push_back(xchat_hook_print(ph, "Channel Message",				XCHAT_PRI_NORM, event_cb,	(void *)CHAN_MESSAGE));

-	g_vHooks.push_back(xchat_hook_print(ph, "Topic Change",					XCHAT_PRI_NORM, event_cb,	(void *)CHAN_TOPIC_CHANGE));

-	g_vHooks.push_back(xchat_hook_print(ph, "Channel Action Hilight",		XCHAT_PRI_NORM, event_cb,	(void *)CHAN_HILIGHT));

-	g_vHooks.push_back(xchat_hook_print(ph, "Channel INVITE",				XCHAT_PRI_NORM, event_cb,	(void *)CHAN_INVITE));

-	g_vHooks.push_back(xchat_hook_print(ph, "You Kicked",					XCHAT_PRI_NORM, event_cb,	(void *)CHAN_KICKED));

-	g_vHooks.push_back(xchat_hook_print(ph, "Banned",						XCHAT_PRI_NORM, event_cb,	(void *)CHAN_BANNED));

-	g_vHooks.push_back(xchat_hook_print(ph, "CTCP Generic",					XCHAT_PRI_NORM, event_cb,	(void *)CTCP_GENERIC));

-	g_vHooks.push_back(xchat_hook_print(ph, "Private Message",				XCHAT_PRI_NORM, event_cb,	(void *)PMSG_RECEIVE));

-	g_vHooks.push_back(xchat_hook_print(ph, "Private Message to Dialog",	XCHAT_PRI_NORM, event_cb,	(void *)PMSG_RECEIVE));

-	g_vHooks.push_back(xchat_hook_print(ph, "Disconnected",					XCHAT_PRI_NORM, event_cb,	(void *)SERV_DISCONNECT));

-	g_vHooks.push_back(xchat_hook_print(ph, "Killed",						XCHAT_PRI_NORM, event_cb,	(void *)SERV_KILLED));

-	g_vHooks.push_back(xchat_hook_print(ph, "Notice",						XCHAT_PRI_NORM, event_cb,	(void *)SERV_NOTICE));

-	g_vHooks.push_back(xchat_hook_command(ph, "tray_alert",					XCHAT_PRI_NORM, command_cb,	"Create an Alert", NULL));

+	g_vHooks.push_back(xchat_hook_print(ph, "Channel Msg Hilight",			HEXCHAT_PRI_NORM, event_cb,	(void *)CHAN_HILIGHT));

+	g_vHooks.push_back(xchat_hook_print(ph, "Channel Message",				HEXCHAT_PRI_NORM, event_cb,	(void *)CHAN_MESSAGE));

+	g_vHooks.push_back(xchat_hook_print(ph, "Topic Change",					HEXCHAT_PRI_NORM, event_cb,	(void *)CHAN_TOPIC_CHANGE));

+	g_vHooks.push_back(xchat_hook_print(ph, "Channel Action Hilight",		HEXCHAT_PRI_NORM, event_cb,	(void *)CHAN_HILIGHT));

+	g_vHooks.push_back(xchat_hook_print(ph, "Channel INVITE",				HEXCHAT_PRI_NORM, event_cb,	(void *)CHAN_INVITE));

+	g_vHooks.push_back(xchat_hook_print(ph, "You Kicked",					HEXCHAT_PRI_NORM, event_cb,	(void *)CHAN_KICKED));

+	g_vHooks.push_back(xchat_hook_print(ph, "Banned",						HEXCHAT_PRI_NORM, event_cb,	(void *)CHAN_BANNED));

+	g_vHooks.push_back(xchat_hook_print(ph, "CTCP Generic",					HEXCHAT_PRI_NORM, event_cb,	(void *)CTCP_GENERIC));

+	g_vHooks.push_back(xchat_hook_print(ph, "Private Message",				HEXCHAT_PRI_NORM, event_cb,	(void *)PMSG_RECEIVE));

+	g_vHooks.push_back(xchat_hook_print(ph, "Private Message to Dialog",	HEXCHAT_PRI_NORM, event_cb,	(void *)PMSG_RECEIVE));

+	g_vHooks.push_back(xchat_hook_print(ph, "Disconnected",					HEXCHAT_PRI_NORM, event_cb,	(void *)SERV_DISCONNECT));

+	g_vHooks.push_back(xchat_hook_print(ph, "Killed",						HEXCHAT_PRI_NORM, event_cb,	(void *)SERV_KILLED));

+	g_vHooks.push_back(xchat_hook_print(ph, "Notice",						HEXCHAT_PRI_NORM, event_cb,	(void *)SERV_NOTICE));

+	g_vHooks.push_back(xchat_hook_command(ph, "tray_alert",					HEXCHAT_PRI_NORM, command_cb,	"Create an Alert", NULL));

 

 	return 1;

 }

diff --git a/plugins/lua/lua.c b/plugins/lua/lua.c
index 3809e66e..c5a7e338 100644
--- a/plugins/lua/lua.c
+++ b/plugins/lua/lua.c
@@ -187,11 +187,11 @@ static struct {
 	{"FD_NOTSOCKET",	XCHAT_FD_NOTSOCKET},
    */
 
-	{"PRI_HIGHEST", 	XCHAT_PRI_HIGHEST},
-	{"PRI_HIGH", 		XCHAT_PRI_HIGH},
-	{"PRI_NORM", 		XCHAT_PRI_NORM},
-	{"PRI_LOW", 		XCHAT_PRI_LOW},
-	{"PRI_LOWEST", 	XCHAT_PRI_LOWEST},
+	{"PRI_HIGHEST", 	HEXCHAT_PRI_HIGHEST},
+	{"PRI_HIGH", 		HEXCHAT_PRI_HIGH},
+	{"PRI_NORM", 		HEXCHAT_PRI_NORM},
+	{"PRI_LOW", 		HEXCHAT_PRI_LOW},
+	{"PRI_LOWEST", 	HEXCHAT_PRI_LOWEST},
 
 	/* for: clean = xchat.strip(dirty, xchat.STRIP_ALL) */
 	{"STRIP_COLOR",	LXC_STRIP_COLOR},
@@ -674,9 +674,9 @@ int xchat_plugin_init(xchat_plugin *plugin_handle,
    *plugin_desc = LXC_DESC;
    *plugin_version = LXC_VERSION;
 
-	xchat_hook_command(ph, "LOAD", XCHAT_PRI_NORM, lxc_cb_load, NULL, NULL);
-	xchat_hook_command(ph, "UNLOAD", XCHAT_PRI_NORM, lxc_cb_unload, NULL, NULL);
-	xchat_hook_command(ph, "LUA", XCHAT_PRI_NORM, lxc_cb_lua, "Usage: LUA <code>, executes <code> in a new lua state", NULL);
+	xchat_hook_command(ph, "LOAD", HEXCHAT_PRI_NORM, lxc_cb_load, NULL, NULL);
+	xchat_hook_command(ph, "UNLOAD", HEXCHAT_PRI_NORM, lxc_cb_unload, NULL, NULL);
+	xchat_hook_command(ph, "LUA", HEXCHAT_PRI_NORM, lxc_cb_lua, "Usage: LUA <code>, executes <code> in a new lua state", NULL);
 
 	xdir = xchat_get_info (ph, "xchatdirfs");
 	xsubdir = g_build_filename (xdir, "addons", NULL);
@@ -939,7 +939,7 @@ static int lxc_hook_command(lua_State *L)
 	cb->hook = NULL;
 
 	if (lua_type(L, 3) == LUA_TNIL)
-		prio = XCHAT_PRI_NORM;
+		prio = HEXCHAT_PRI_NORM;
 	else
 		prio = luaL_checknumber(L, 3);
 
@@ -1064,7 +1064,7 @@ static int lxc_hook_print(lua_State *L)
 	name = luaL_checkstring(L, 1);
 	func = luaL_checkstring(L, 2);
 	if (lua_type(L, 3) == LUA_TNIL)
-		prio = XCHAT_PRI_NORM;
+		prio = HEXCHAT_PRI_NORM;
 	else
 		prio = luaL_checknumber(L, 3);
 
@@ -1143,7 +1143,7 @@ static int lxc_hook_server(lua_State *L)
 	name = luaL_checkstring(L, 1);
 	func = luaL_checkstring(L, 2);
 	if (lua_type(L, 3) == LUA_TNIL)
-		prio = XCHAT_PRI_NORM;
+		prio = HEXCHAT_PRI_NORM;
 	else
 		prio = luaL_checknumber(L, 3);
 
diff --git a/plugins/mpcinfo/mpcInfo.c b/plugins/mpcinfo/mpcInfo.c
index cfbcc3b7..1499c0e3 100644
--- a/plugins/mpcinfo/mpcInfo.c
+++ b/plugins/mpcinfo/mpcInfo.c
@@ -128,9 +128,9 @@ int xchat_plugin_init(xchat_plugin *plugin_handle, char **plugin_name, char **pl
 	*plugin_desc = "Information-Script for Media Player Classic"; 
 	*plugin_version=VERSION;
 
-	xchat_hook_command(ph, "mpc", XCHAT_PRI_NORM, mpc_tell,"no help text", 0);
-	xchat_hook_command(ph, "mpc_themes", XCHAT_PRI_NORM, print_themes,"no help text", 0);
-	xchat_hook_command(ph, "mpc_reloadthemes", XCHAT_PRI_NORM, mpc_themeReload,"no help text", 0);
+	xchat_hook_command(ph, "mpc", HEXCHAT_PRI_NORM, mpc_tell,"no help text", 0);
+	xchat_hook_command(ph, "mpc_themes", HEXCHAT_PRI_NORM, print_themes,"no help text", 0);
+	xchat_hook_command(ph, "mpc_reloadthemes", HEXCHAT_PRI_NORM, mpc_themeReload,"no help text", 0);
 	xchat_command (ph, "MENU -ietc\\music.png ADD \"Window/Display Current Song (MPC)\" \"MPC\"");
 
 	themeInit();
diff --git a/plugins/perl/perl.c b/plugins/perl/perl.c
index 1ef97f9a..1ecea703 100644
--- a/plugins/perl/perl.c
+++ b/plugins/perl/perl.c
@@ -1322,11 +1322,11 @@ xs_init (pTHX)
 		exit (1);
 	}
 
-	newCONSTSUB (stash, "PRI_HIGHEST", newSViv (XCHAT_PRI_HIGHEST));
-	newCONSTSUB (stash, "PRI_HIGH", newSViv (XCHAT_PRI_HIGH));
-	newCONSTSUB (stash, "PRI_NORM", newSViv (XCHAT_PRI_NORM));
-	newCONSTSUB (stash, "PRI_LOW", newSViv (XCHAT_PRI_LOW));
-	newCONSTSUB (stash, "PRI_LOWEST", newSViv (XCHAT_PRI_LOWEST));
+	newCONSTSUB (stash, "PRI_HIGHEST", newSViv (HEXCHAT_PRI_HIGHEST));
+	newCONSTSUB (stash, "PRI_HIGH", newSViv (HEXCHAT_PRI_HIGH));
+	newCONSTSUB (stash, "PRI_NORM", newSViv (HEXCHAT_PRI_NORM));
+	newCONSTSUB (stash, "PRI_LOW", newSViv (HEXCHAT_PRI_LOW));
+	newCONSTSUB (stash, "PRI_LOWEST", newSViv (HEXCHAT_PRI_LOWEST));
 
 	newCONSTSUB (stash, "EAT_NONE", newSViv (XCHAT_EAT_NONE));
 	newCONSTSUB (stash, "EAT_XCHAT", newSViv (XCHAT_EAT_XCHAT));
@@ -1566,16 +1566,16 @@ xchat_plugin_init (xchat_plugin * plugin_handle, char **plugin_name,
 	*plugin_desc = "Perl scripting interface";
 	*plugin_version = PACKAGE_VERSION;
 
-	xchat_hook_command (ph, "load", XCHAT_PRI_NORM, perl_command_load, 0, 0);
-	xchat_hook_command (ph, "unload", XCHAT_PRI_NORM, perl_command_unload, 0,
+	xchat_hook_command (ph, "load", HEXCHAT_PRI_NORM, perl_command_load, 0, 0);
+	xchat_hook_command (ph, "unload", HEXCHAT_PRI_NORM, perl_command_unload, 0,
 							  0);
-	xchat_hook_command (ph, "reload", XCHAT_PRI_NORM, perl_command_reload, 0,
+	xchat_hook_command (ph, "reload", HEXCHAT_PRI_NORM, perl_command_reload, 0,
 							  0);
-	xchat_hook_command (ph, "pl_reload", XCHAT_PRI_NORM, perl_command_reload, 0,
+	xchat_hook_command (ph, "pl_reload", HEXCHAT_PRI_NORM, perl_command_reload, 0,
 							  0);
-	xchat_hook_command (ph, "unloadall", XCHAT_PRI_NORM,
+	xchat_hook_command (ph, "unloadall", HEXCHAT_PRI_NORM,
 							  perl_command_unloadall, 0, 0);
-	xchat_hook_command (ph, "reloadall", XCHAT_PRI_NORM,
+	xchat_hook_command (ph, "reloadall", HEXCHAT_PRI_NORM,
 							  perl_command_reloadall, 0, 0);
 
 	/*perl_init (); */
diff --git a/plugins/python/python.c b/plugins/python/python.c
index f866a501..a1822a8c 100644
--- a/plugins/python/python.c
+++ b/plugins/python/python.c
@@ -1174,11 +1174,11 @@ Plugin_New(char *filename, PyMethodDef *xchat_methods, PyObject *xcoobj)
 	PyModule_AddIntConstant(m, "EAT_XCHAT", XCHAT_EAT_XCHAT);
 	PyModule_AddIntConstant(m, "EAT_PLUGIN", XCHAT_EAT_PLUGIN);
 	PyModule_AddIntConstant(m, "EAT_ALL", XCHAT_EAT_ALL);
-	PyModule_AddIntConstant(m, "PRI_HIGHEST", XCHAT_PRI_HIGHEST);
-	PyModule_AddIntConstant(m, "PRI_HIGH", XCHAT_PRI_HIGH);
-	PyModule_AddIntConstant(m, "PRI_NORM", XCHAT_PRI_NORM);
-	PyModule_AddIntConstant(m, "PRI_LOW", XCHAT_PRI_LOW);
-	PyModule_AddIntConstant(m, "PRI_LOWEST", XCHAT_PRI_LOWEST);
+	PyModule_AddIntConstant(m, "PRI_HIGHEST", HEXCHAT_PRI_HIGHEST);
+	PyModule_AddIntConstant(m, "PRI_HIGH", HEXCHAT_PRI_HIGH);
+	PyModule_AddIntConstant(m, "PRI_NORM", HEXCHAT_PRI_NORM);
+	PyModule_AddIntConstant(m, "PRI_LOW", HEXCHAT_PRI_LOW);
+	PyModule_AddIntConstant(m, "PRI_LOWEST", HEXCHAT_PRI_LOWEST);
 
 	o = Py_BuildValue("(ii)", VERSION_MAJOR, VERSION_MINOR);
 	if (o == NULL) {
@@ -1654,7 +1654,7 @@ Module_xchat_hook_command(PyObject *self, PyObject *args, PyObject *kwargs)
 	char *name;
 	PyObject *callback;
 	PyObject *userdata = Py_None;
-	int priority = XCHAT_PRI_NORM;
+	int priority = HEXCHAT_PRI_NORM;
 	char *help = NULL;
 	PyObject *plugin;
 	Hook *hook;
@@ -1692,7 +1692,7 @@ Module_xchat_hook_server(PyObject *self, PyObject *args, PyObject *kwargs)
 	char *name;
 	PyObject *callback;
 	PyObject *userdata = Py_None;
-	int priority = XCHAT_PRI_NORM;
+	int priority = HEXCHAT_PRI_NORM;
 	PyObject *plugin;
 	Hook *hook;
 	char *kwlist[] = {"name", "callback", "userdata", "priority", 0};
@@ -1728,7 +1728,7 @@ Module_xchat_hook_print(PyObject *self, PyObject *args, PyObject *kwargs)
 	char *name;
 	PyObject *callback;
 	PyObject *userdata = Py_None;
-	int priority = XCHAT_PRI_NORM;
+	int priority = HEXCHAT_PRI_NORM;
 	PyObject *plugin;
 	Hook *hook;
 	char *kwlist[] = {"name", "callback", "userdata", "priority", 0};
@@ -2292,10 +2292,10 @@ xchat_plugin_init(xchat_plugin *plugin_handle,
 	}
 
 
-	xchat_hook_command(ph, "", XCHAT_PRI_NORM, IInterp_Cmd, 0, 0);
-	xchat_hook_command(ph, "PY", XCHAT_PRI_NORM, Command_Py, usage, 0);
-	xchat_hook_command(ph, "LOAD", XCHAT_PRI_NORM, Command_Load, 0, 0);
-	xchat_hook_command(ph, "UNLOAD", XCHAT_PRI_NORM, Command_Unload, 0, 0);
+	xchat_hook_command(ph, "", HEXCHAT_PRI_NORM, IInterp_Cmd, 0, 0);
+	xchat_hook_command(ph, "PY", HEXCHAT_PRI_NORM, Command_Py, usage, 0);
+	xchat_hook_command(ph, "LOAD", HEXCHAT_PRI_NORM, Command_Load, 0, 0);
+	xchat_hook_command(ph, "UNLOAD", HEXCHAT_PRI_NORM, Command_Unload, 0, 0);
 #ifdef WITH_THREAD
 	thread_timer = xchat_hook_timer(ph, 300, Callback_ThreadTimer, NULL);
 #endif
diff --git a/plugins/sasl/sasl.c b/plugins/sasl/sasl.c
index cdf225b1..a3f1eef6 100644
--- a/plugins/sasl/sasl.c
+++ b/plugins/sasl/sasl.c
@@ -291,16 +291,16 @@ xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugi
 	*plugin_desc = desc;
 	*plugin_version = version;
 
-	xchat_hook_command (ph, "SASL", XCHAT_PRI_NORM, sasl_cmd_cb, sasl_help, 0);
-	xchat_hook_print (ph, "Connected", XCHAT_PRI_NORM, connect_cb, NULL);
-	/* xchat_hook_print (ph, "Disconnected", XCHAT_PRI_NORM, disconnect_cb, NULL); */
-	xchat_hook_server (ph, "CAP", XCHAT_PRI_NORM, cap_cb, NULL);
-	xchat_hook_server (ph, "RAW LINE", XCHAT_PRI_NORM, server_cb, NULL);
-	xchat_hook_server (ph, "903", XCHAT_PRI_NORM, authend_cb, NULL);
-	xchat_hook_server (ph, "904", XCHAT_PRI_NORM, authend_cb, NULL);
-	xchat_hook_server (ph, "905", XCHAT_PRI_NORM, authend_cb, NULL);
-	xchat_hook_server (ph, "906", XCHAT_PRI_NORM, authend_cb, NULL);
-	xchat_hook_server (ph, "907", XCHAT_PRI_NORM, authend_cb, NULL);
+	xchat_hook_command (ph, "SASL", HEXCHAT_PRI_NORM, sasl_cmd_cb, sasl_help, 0);
+	xchat_hook_print (ph, "Connected", HEXCHAT_PRI_NORM, connect_cb, NULL);
+	/* xchat_hook_print (ph, "Disconnected", HEXCHAT_PRI_NORM, disconnect_cb, NULL); */
+	xchat_hook_server (ph, "CAP", HEXCHAT_PRI_NORM, cap_cb, NULL);
+	xchat_hook_server (ph, "RAW LINE", HEXCHAT_PRI_NORM, server_cb, NULL);
+	xchat_hook_server (ph, "903", HEXCHAT_PRI_NORM, authend_cb, NULL);
+	xchat_hook_server (ph, "904", HEXCHAT_PRI_NORM, authend_cb, NULL);
+	xchat_hook_server (ph, "905", HEXCHAT_PRI_NORM, authend_cb, NULL);
+	xchat_hook_server (ph, "906", HEXCHAT_PRI_NORM, authend_cb, NULL);
+	xchat_hook_server (ph, "907", HEXCHAT_PRI_NORM, authend_cb, NULL);
 
 	xchat_printf (ph, "%s plugin loaded\n", name);
 
diff --git a/plugins/sysinfo/sysinfo.cpp b/plugins/sysinfo/sysinfo.cpp
index d525e6b3..c14089e7 100644
--- a/plugins/sysinfo/sysinfo.cpp
+++ b/plugins/sysinfo/sysinfo.cpp
@@ -397,7 +397,7 @@ xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugi
 
 	firstRun = 1;
 
-	xchat_hook_command (ph, "SYSINFO", XCHAT_PRI_NORM, printInfo, NULL, NULL);
+	xchat_hook_command (ph, "SYSINFO", HEXCHAT_PRI_NORM, printInfo, NULL, NULL);
 	xchat_command (ph, "MENU -ietc\\system.png ADD \"Window/Display System Info\" \"SYSINFO\"");
 
 	xchat_printf (ph, "%s plugin loaded\n", name);
diff --git a/plugins/sysinfo/xsys.c b/plugins/sysinfo/xsys.c
index 8580445a..b8a6c7d5 100644
--- a/plugins/sysinfo/xsys.c
+++ b/plugins/sysinfo/xsys.c
@@ -847,9 +847,9 @@ xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugi
 	*plugin_version = version;
 	char buffer[bsize];
 
-	xchat_hook_command (ph, "SYSINFO",	XCHAT_PRI_NORM,	sysinfo_cb,	sysinfo_help, NULL);
-	xchat_hook_command (ph, "NETDATA",	XCHAT_PRI_NORM,	netdata_cb,	NULL, NULL);
-	xchat_hook_command (ph, "NETSTREAM",	XCHAT_PRI_NORM,	netstream_cb,	NULL, NULL);
+	xchat_hook_command (ph, "SYSINFO",	HEXCHAT_PRI_NORM,	sysinfo_cb,	sysinfo_help, NULL);
+	xchat_hook_command (ph, "NETDATA",	HEXCHAT_PRI_NORM,	netdata_cb,	NULL, NULL);
+	xchat_hook_command (ph, "NETSTREAM",	HEXCHAT_PRI_NORM,	netstream_cb,	NULL, NULL);
 
 	/* this is required for the very first run */
 	if (xchat_pluginpref_get_str (ph, "pciids", buffer) == 0)
diff --git a/plugins/tcl/tclplugin.c b/plugins/tcl/tclplugin.c
index fe507bee..03b73825 100644
--- a/plugins/tcl/tclplugin.c
+++ b/plugins/tcl/tclplugin.c
@@ -832,7 +832,7 @@ static int tcl_on(ClientData cd, Tcl_Interp * irp, int argc, const char *argv[])
         for (index = 0; index < XC_SIZE; index++) {
             if (strcmp(xc[index].event, token) == 0) {
                 if (xc[index].hook == NULL) {
-                    xc[index].hook = xchat_hook_print(ph, xc[index].emit, XCHAT_PRI_NORM, Print_Hook, (void *) index);
+                    xc[index].hook = xchat_hook_print(ph, xc[index].emit, HEXCHAT_PRI_NORM, Print_Hook, (void *) index);
                     break;
                 }
             }
@@ -950,7 +950,7 @@ static int tcl_alias(ClientData cd, Tcl_Interp * irp, int argc, const char *argv
             if (string[0] == '@')
                 aliasPtr->hook = NULL;
             else
-                aliasPtr->hook = xchat_hook_command(ph, string, XCHAT_PRI_NORM, Command_Alias, help, 0);
+                aliasPtr->hook = xchat_hook_command(ph, string, HEXCHAT_PRI_NORM, Command_Alias, help, 0);
         } else {
             aliasPtr = Tcl_GetHashValue(entry);
             DeleteInternalProc(aliasPtr->procPtr);
@@ -2245,13 +2245,13 @@ int xchat_plugin_init(xchat_plugin * plugin_handle, char **plugin_name, char **p
 
     Tcl_Plugin_Init();
 
-    raw_line_hook = xchat_hook_server(ph, "RAW LINE", XCHAT_PRI_NORM, Server_raw_line, NULL);
-    Command_TCL_hook = xchat_hook_command(ph, "tcl", XCHAT_PRI_NORM, Command_TCL, 0, 0);
-    Command_Source_hook = xchat_hook_command(ph, "source", XCHAT_PRI_NORM, Command_Source, 0, 0);
-    Command_Reload_hook = xchat_hook_command(ph, "reloadall", XCHAT_PRI_NORM, Command_Reloadall, 0, 0);
-    Command_Load_hook = xchat_hook_command(ph, "LOAD", XCHAT_PRI_NORM, Command_Source, 0, 0);
+    raw_line_hook = xchat_hook_server(ph, "RAW LINE", HEXCHAT_PRI_NORM, Server_raw_line, NULL);
+    Command_TCL_hook = xchat_hook_command(ph, "tcl", HEXCHAT_PRI_NORM, Command_TCL, 0, 0);
+    Command_Source_hook = xchat_hook_command(ph, "source", HEXCHAT_PRI_NORM, Command_Source, 0, 0);
+    Command_Reload_hook = xchat_hook_command(ph, "reloadall", HEXCHAT_PRI_NORM, Command_Reloadall, 0, 0);
+    Command_Load_hook = xchat_hook_command(ph, "LOAD", HEXCHAT_PRI_NORM, Command_Source, 0, 0);
     Event_Handler_hook = xchat_hook_timer(ph, 100, TCL_Event_Handler, 0);
-    Null_Command_hook = xchat_hook_command(ph, "", XCHAT_PRI_NORM, Null_Command_Alias, "", 0);
+    Null_Command_hook = xchat_hook_command(ph, "", HEXCHAT_PRI_NORM, Null_Command_Alias, "", 0);
 
     banner();
     xchat_print(ph, "Tcl interface loaded\n");
diff --git a/plugins/upd/upd.c b/plugins/upd/upd.c
index d7cabe59..60e869cd 100644
--- a/plugins/upd/upd.c
+++ b/plugins/upd/upd.c
@@ -297,7 +297,7 @@ xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugi
 		xchat_pluginpref_set_int (ph, "freq", DEFAULT_FREQ);
 	}
 
-	xchat_hook_command (ph, "UPDCHK", XCHAT_PRI_NORM, print_version, upd_help, NULL);
+	xchat_hook_command (ph, "UPDCHK", HEXCHAT_PRI_NORM, print_version, upd_help, NULL);
 	xchat_hook_timer (ph, delay * 1000, delayed_check, NULL);
 	xchat_command (ph, "MENU -ietc\\download.png ADD \"Help/Check for Updates\" \"UPDCHK\"");
 	xchat_printf (ph, "%s plugin loaded\n", name);
diff --git a/plugins/winamp/winamp.c b/plugins/winamp/winamp.c
index eb9493a6..ebabf276 100644
--- a/plugins/winamp/winamp.c
+++ b/plugins/winamp/winamp.c
@@ -172,7 +172,7 @@ xchat_plugin_init(xchat_plugin *plugin_handle,
 	*plugin_desc = "Winamp plugin for HexChat";
 	*plugin_version = "0.5";
 
-	xchat_hook_command (ph, "WINAMP", XCHAT_PRI_NORM, winamp, "Usage: /WINAMP [PAUSE|PLAY|STOP|NEXT|PREV|START] - control Winamp or show what's currently playing", 0);
+	xchat_hook_command (ph, "WINAMP", HEXCHAT_PRI_NORM, winamp, "Usage: /WINAMP [PAUSE|PLAY|STOP|NEXT|PREV|START] - control Winamp or show what's currently playing", 0);
    	xchat_command (ph, "MENU -ietc\\music.png ADD \"Window/Display Current Song (Winamp)\" \"WINAMP\"");
 
 	xchat_print (ph, "Winamp plugin loaded\n");
diff --git a/plugins/wmpa/hexchat-plugin.cpp b/plugins/wmpa/hexchat-plugin.cpp
index b8a21135..dcf82965 100644
--- a/plugins/wmpa/hexchat-plugin.cpp
+++ b/plugins/wmpa/hexchat-plugin.cpp
@@ -61,18 +61,18 @@ int xchat_plugin_init(xchat_plugin *plugin_handle,
       xchat_printf(ph, "WMPA: Failed to restore the settings.");
    }
 
-   xchat_hook_command(ph, "auto", XCHAT_PRI_NORM, wmpaAuto, 0, 0);
-   xchat_hook_command(ph, "curr", XCHAT_PRI_NORM, wmpaCurr, 0, 0);
-   xchat_hook_command(ph, "find", XCHAT_PRI_NORM, wmpaFind, 0, 0);
-   xchat_hook_command(ph, "slist", XCHAT_PRI_NORM, wmpaList, 0, 0);
-   xchat_hook_command(ph, "next", XCHAT_PRI_NORM, wmpaNext, 0, 0);
-   xchat_hook_command(ph, "play", XCHAT_PRI_NORM, wmpaPlay, 0, 0);
-   xchat_hook_command(ph, "pause", XCHAT_PRI_NORM, wmpaPause, 0, 0);
-   xchat_hook_command(ph, "prev", XCHAT_PRI_NORM, wmpaPrev, 0, 0);
-   xchat_hook_command(ph, "song", XCHAT_PRI_NORM, wmpaSong, 0, 0);
-   xchat_hook_command(ph, "stop", XCHAT_PRI_NORM, wmpaStop, 0, 0);
-   xchat_hook_command(ph, "volume", XCHAT_PRI_NORM, wmpaVolume, 0, 0);
-   xchat_hook_command(ph, "wmpahelp", XCHAT_PRI_NORM, wmpaHelp, 0, 0);
+   xchat_hook_command(ph, "auto", HEXCHAT_PRI_NORM, wmpaAuto, 0, 0);
+   xchat_hook_command(ph, "curr", HEXCHAT_PRI_NORM, wmpaCurr, 0, 0);
+   xchat_hook_command(ph, "find", HEXCHAT_PRI_NORM, wmpaFind, 0, 0);
+   xchat_hook_command(ph, "slist", HEXCHAT_PRI_NORM, wmpaList, 0, 0);
+   xchat_hook_command(ph, "next", HEXCHAT_PRI_NORM, wmpaNext, 0, 0);
+   xchat_hook_command(ph, "play", HEXCHAT_PRI_NORM, wmpaPlay, 0, 0);
+   xchat_hook_command(ph, "pause", HEXCHAT_PRI_NORM, wmpaPause, 0, 0);
+   xchat_hook_command(ph, "prev", HEXCHAT_PRI_NORM, wmpaPrev, 0, 0);
+   xchat_hook_command(ph, "song", HEXCHAT_PRI_NORM, wmpaSong, 0, 0);
+   xchat_hook_command(ph, "stop", HEXCHAT_PRI_NORM, wmpaStop, 0, 0);
+   xchat_hook_command(ph, "volume", HEXCHAT_PRI_NORM, wmpaVolume, 0, 0);
+   xchat_hook_command(ph, "wmpahelp", HEXCHAT_PRI_NORM, wmpaHelp, 0, 0);
 
    xchat_printf(ph, "WMPA %s successfully loaded.", VER_STRING);
    wmpaCommands();
diff --git a/plugins/wmpa/hexchat-plugin.h b/plugins/wmpa/hexchat-plugin.h
index aa9befdc..55e2c0b3 100644
--- a/plugins/wmpa/hexchat-plugin.h
+++ b/plugins/wmpa/hexchat-plugin.h
@@ -9,11 +9,11 @@
 #include <time.h>
 #include <tchar.h>
 
-#define XCHAT_PRI_HIGHEST  127
-#define XCHAT_PRI_HIGH     64
-#define XCHAT_PRI_NORM     0
-#define XCHAT_PRI_LOW      (-64)
-#define XCHAT_PRI_LOWEST   (-128)
+#define HEXCHAT_PRI_HIGHEST  127
+#define HEXCHAT_PRI_HIGH     64
+#define HEXCHAT_PRI_NORM     0
+#define HEXCHAT_PRI_LOW      (-64)
+#define HEXCHAT_PRI_LOWEST   (-128)
 
 #define XCHAT_FD_READ      1
 #define XCHAT_FD_WRITE     2
diff --git a/plugins/xdcc/xdcc.c b/plugins/xdcc/xdcc.c
index 9233f12b..d26eb43b 100644
--- a/plugins/xdcc/xdcc.c
+++ b/plugins/xdcc/xdcc.c
@@ -320,9 +320,9 @@ int xchat_plugin_init(xchat_plugin *plugin_handle,
 	*plugin_desc = "Very simple XDCC server";
 	*plugin_version = "0.1";
 
-	xchat_hook_command(ph, "XDCC", XCHAT_PRI_NORM, xdcc_command, 0, 0);
-	xchat_hook_print(ph, "CTCP Generic", XCHAT_PRI_NORM, ctcp_cb, 0);
-	xchat_hook_print(ph, "CTCP Generic to Channel", XCHAT_PRI_NORM, ctcp_cb, 0);
+	xchat_hook_command(ph, "XDCC", HEXCHAT_PRI_NORM, xdcc_command, 0, 0);
+	xchat_hook_print(ph, "CTCP Generic", HEXCHAT_PRI_NORM, ctcp_cb, 0);
+	xchat_hook_print(ph, "CTCP Generic to Channel", HEXCHAT_PRI_NORM, ctcp_cb, 0);
 
 	xdcc_load();
 	xchat_print(ph, "XDCC loaded. Type /XDCC for help.\n");