SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebranding for XCHAT_PRI_*

This commit is contained in:
Berke Viktor 2012-10-30 07:18:25 +01:00
parent 50a2335276
commit 91dd079add
24 changed files with 124 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/checksum/checksum.c
View File

@ -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_pluginpref_set_int (ph, "limit", DEFAULT_LIMIT);
} }
xchat_hook_command (ph, "CHECKSUM", XCHAT_PRI_NORM, checksum, "Usage: /CHECKSUM GET|SET", 0); xchat_hook_command (ph, "CHECKSUM", HEXCHAT_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 RECV Complete", HEXCHAT_PRI_NORM, dccrecv_cb, NULL);
xchat_hook_print (ph, "DCC Offer", XCHAT_PRI_NORM, dccoffer_cb, NULL); xchat_hook_print (ph, "DCC Offer", HEXCHAT_PRI_NORM, dccoffer_cb, NULL);
xchat_printf (ph, "%s plugin loaded\n", name); xchat_printf (ph, "%s plugin loaded\n", name);
return 1; return 1;

2
plugins/dns/dns.c
View File

@ -324,7 +324,7 @@ xchat_plugin_init
*plugin_desc = "Threaded IPv4/6 DNS Command"; *plugin_desc = "Threaded IPv4/6 DNS Command";
*plugin_version = DNS_VERSION; *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"); xchat_printf (ph, "DNS plugin loaded\n");
return 1; /* return 1 for success */ return 1; /* return 1 for success */

2
plugins/doat/doat.c
View File

@ -79,7 +79,7 @@ xchat_plugin_init( xchat_plugin * plugin_handle, char **plugin_name,
*plugin_version = "1.0001"; *plugin_version = "1.0001";
*plugin_desc = "Perform an arbitrary command on multiple channels"; *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"); xchat_print (ph, "Do At plugin loaded\n");

4
plugins/ewc/ewc.c
View File

@ -213,10 +213,10 @@ int xchat_plugin_init(xchat_plugin *plugin_handle,
*plugin_desc = "Some commands to remotely control winamp"; *plugin_desc = "Some commands to remotely control winamp";
*plugin_version = "1.2"; *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); "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); "Usage: wcmd [play|pause|stop|prev|next]", 0);
xchat_print(ph, "EasyWinampControl plugin loaded\n"); xchat_print(ph, "EasyWinampControl plugin loaded\n");

2
plugins/exec/exec.c
View File

@ -124,7 +124,7 @@ xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugi
*plugin_desc = desc; *plugin_desc = desc;
*plugin_version = version; *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); xchat_printf (ph, "%s plugin loaded\n", name);
return 1; /* return 1 for success */ return 1; /* return 1 for success */

16
plugins/fishlim/plugin_hexchat.c
View File

@ -269,16 +269,16 @@ int xchat_plugin_init(xchat_plugin *plugin_handle,
*version = plugin_version; *version = plugin_version;
/* Register commands */ /* Register commands */
xchat_hook_command(ph, "SETKEY", XCHAT_PRI_NORM, handle_setkey, usage_setkey, NULL); xchat_hook_command(ph, "SETKEY", HEXCHAT_PRI_NORM, handle_setkey, usage_setkey, NULL);
xchat_hook_command(ph, "DELKEY", XCHAT_PRI_NORM, handle_delkey, usage_delkey, NULL); xchat_hook_command(ph, "DELKEY", HEXCHAT_PRI_NORM, handle_delkey, usage_delkey, NULL);
/* Add handlers */ /* Add handlers */
xchat_hook_command(ph, "", XCHAT_PRI_NORM, handle_outgoing, NULL, NULL); xchat_hook_command(ph, "", HEXCHAT_PRI_NORM, handle_outgoing, NULL, NULL);
xchat_hook_server(ph, "NOTICE", XCHAT_PRI_NORM, handle_incoming, NULL); xchat_hook_server(ph, "NOTICE", HEXCHAT_PRI_NORM, handle_incoming, NULL);
xchat_hook_server(ph, "PRIVMSG", XCHAT_PRI_NORM, handle_incoming, NULL); xchat_hook_server(ph, "PRIVMSG", HEXCHAT_PRI_NORM, handle_incoming, NULL);
//xchat_hook_server(ph, "RAW LINE", XCHAT_PRI_NORM, handle_debug, NULL); //xchat_hook_server(ph, "RAW LINE", HEXCHAT_PRI_NORM, handle_debug, NULL);
xchat_hook_server(ph, "TOPIC", XCHAT_PRI_NORM, handle_incoming, NULL); xchat_hook_server(ph, "TOPIC", HEXCHAT_PRI_NORM, handle_incoming, NULL);
xchat_hook_server(ph, "332", XCHAT_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); xchat_printf(ph, "%s plugin loaded\n", plugin_name);
/* Return success */ /* Return success */

2
plugins/gtkpref/gtkpref.c
View File

@ -54,7 +54,7 @@ xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugi
*plugin_desc = "GTK+ Preference Tool Launcher"; *plugin_desc = "GTK+ Preference Tool Launcher";
*plugin_version = "1.0"; *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\""); xchat_command (ph, "MENU -ietc\\gtkpref.png ADD \"Settings/GTK+ Preferences\" \"GTKPREF\"");
return 1; /* return 1 for success */ return 1; /* return 1 for success */

28
plugins/hextray/hextray.cpp
View File

@ -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 *************************************/ /************************* 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 Msg Hilight", HEXCHAT_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, "Channel Message", HEXCHAT_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, "Topic Change", HEXCHAT_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 Action Hilight", HEXCHAT_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, "Channel INVITE", HEXCHAT_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, "You Kicked", HEXCHAT_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, "Banned", HEXCHAT_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, "CTCP Generic", HEXCHAT_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", HEXCHAT_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, "Private Message to Dialog", HEXCHAT_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, "Disconnected", HEXCHAT_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, "Killed", HEXCHAT_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_print(ph, "Notice", HEXCHAT_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_command(ph, "tray_alert", HEXCHAT_PRI_NORM, command_cb, "Create an Alert", NULL));
return 1; return 1;
} }

22
plugins/lua/lua.c
View File

@ -187,11 +187,11 @@ static struct {
{"FD_NOTSOCKET", XCHAT_FD_NOTSOCKET}, {"FD_NOTSOCKET", XCHAT_FD_NOTSOCKET},
*/ */
{"PRI_HIGHEST", XCHAT_PRI_HIGHEST}, {"PRI_HIGHEST", HEXCHAT_PRI_HIGHEST},
{"PRI_HIGH", XCHAT_PRI_HIGH}, {"PRI_HIGH", HEXCHAT_PRI_HIGH},
{"PRI_NORM", XCHAT_PRI_NORM}, {"PRI_NORM", HEXCHAT_PRI_NORM},
{"PRI_LOW", XCHAT_PRI_LOW}, {"PRI_LOW", HEXCHAT_PRI_LOW},
{"PRI_LOWEST", XCHAT_PRI_LOWEST}, {"PRI_LOWEST", HEXCHAT_PRI_LOWEST},
/* for: clean = xchat.strip(dirty, xchat.STRIP_ALL) */ /* for: clean = xchat.strip(dirty, xchat.STRIP_ALL) */
{"STRIP_COLOR", LXC_STRIP_COLOR}, {"STRIP_COLOR", LXC_STRIP_COLOR},
@ -674,9 +674,9 @@ int xchat_plugin_init(xchat_plugin *plugin_handle,
*plugin_desc = LXC_DESC; *plugin_desc = LXC_DESC;
*plugin_version = LXC_VERSION; *plugin_version = LXC_VERSION;
xchat_hook_command(ph, "LOAD", XCHAT_PRI_NORM, lxc_cb_load, NULL, NULL); xchat_hook_command(ph, "LOAD", HEXCHAT_PRI_NORM, lxc_cb_load, NULL, NULL);
xchat_hook_command(ph, "UNLOAD", XCHAT_PRI_NORM, lxc_cb_unload, NULL, NULL); xchat_hook_command(ph, "UNLOAD", HEXCHAT_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, "LUA", HEXCHAT_PRI_NORM, lxc_cb_lua, "Usage: LUA <code>, executes <code> in a new lua state", NULL);
xdir = xchat_get_info (ph, "xchatdirfs"); xdir = xchat_get_info (ph, "xchatdirfs");
xsubdir = g_build_filename (xdir, "addons", NULL); xsubdir = g_build_filename (xdir, "addons", NULL);
@ -939,7 +939,7 @@ static int lxc_hook_command(lua_State *L)
cb->hook = NULL; cb->hook = NULL;
if (lua_type(L, 3) == LUA_TNIL) if (lua_type(L, 3) == LUA_TNIL)
prio = XCHAT_PRI_NORM; prio = HEXCHAT_PRI_NORM;
else else
prio = luaL_checknumber(L, 3); prio = luaL_checknumber(L, 3);
@ -1064,7 +1064,7 @@ static int lxc_hook_print(lua_State *L)
name = luaL_checkstring(L, 1); name = luaL_checkstring(L, 1);
func = luaL_checkstring(L, 2); func = luaL_checkstring(L, 2);
if (lua_type(L, 3) == LUA_TNIL) if (lua_type(L, 3) == LUA_TNIL)
prio = XCHAT_PRI_NORM; prio = HEXCHAT_PRI_NORM;
else else
prio = luaL_checknumber(L, 3); prio = luaL_checknumber(L, 3);
@ -1143,7 +1143,7 @@ static int lxc_hook_server(lua_State *L)
name = luaL_checkstring(L, 1); name = luaL_checkstring(L, 1);
func = luaL_checkstring(L, 2); func = luaL_checkstring(L, 2);
if (lua_type(L, 3) == LUA_TNIL) if (lua_type(L, 3) == LUA_TNIL)
prio = XCHAT_PRI_NORM; prio = HEXCHAT_PRI_NORM;
else else
prio = luaL_checknumber(L, 3); prio = luaL_checknumber(L, 3);

6
plugins/mpcinfo/mpcInfo.c
View File

@ -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_desc = "Information-Script for Media Player Classic";
*plugin_version=VERSION; *plugin_version=VERSION;
xchat_hook_command(ph, "mpc", XCHAT_PRI_NORM, mpc_tell,"no help text", 0); xchat_hook_command(ph, "mpc", HEXCHAT_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_themes", HEXCHAT_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_reloadthemes", HEXCHAT_PRI_NORM, mpc_themeReload,"no help text", 0);
xchat_command (ph, "MENU -ietc\\music.png ADD \"Window/Display Current Song (MPC)\" \"MPC\""); xchat_command (ph, "MENU -ietc\\music.png ADD \"Window/Display Current Song (MPC)\" \"MPC\"");
themeInit(); themeInit();

22
plugins/perl/perl.c
View File

@ -1322,11 +1322,11 @@ xs_init (pTHX)
exit (1); exit (1);
} }
newCONSTSUB (stash, "PRI_HIGHEST", newSViv (XCHAT_PRI_HIGHEST)); newCONSTSUB (stash, "PRI_HIGHEST", newSViv (HEXCHAT_PRI_HIGHEST));
newCONSTSUB (stash, "PRI_HIGH", newSViv (XCHAT_PRI_HIGH)); newCONSTSUB (stash, "PRI_HIGH", newSViv (HEXCHAT_PRI_HIGH));
newCONSTSUB (stash, "PRI_NORM", newSViv (XCHAT_PRI_NORM)); newCONSTSUB (stash, "PRI_NORM", newSViv (HEXCHAT_PRI_NORM));
newCONSTSUB (stash, "PRI_LOW", newSViv (XCHAT_PRI_LOW)); newCONSTSUB (stash, "PRI_LOW", newSViv (HEXCHAT_PRI_LOW));
newCONSTSUB (stash, "PRI_LOWEST", newSViv (XCHAT_PRI_LOWEST)); newCONSTSUB (stash, "PRI_LOWEST", newSViv (HEXCHAT_PRI_LOWEST));
newCONSTSUB (stash, "EAT_NONE", newSViv (XCHAT_EAT_NONE)); newCONSTSUB (stash, "EAT_NONE", newSViv (XCHAT_EAT_NONE));
newCONSTSUB (stash, "EAT_XCHAT", newSViv (XCHAT_EAT_XCHAT)); 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_desc = "Perl scripting interface";
*plugin_version = PACKAGE_VERSION; *plugin_version = PACKAGE_VERSION;
xchat_hook_command (ph, "load", XCHAT_PRI_NORM, perl_command_load, 0, 0); xchat_hook_command (ph, "load", HEXCHAT_PRI_NORM, perl_command_load, 0, 0);
xchat_hook_command (ph, "unload", XCHAT_PRI_NORM, perl_command_unload, 0, xchat_hook_command (ph, "unload", HEXCHAT_PRI_NORM, perl_command_unload, 0,
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); 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); 0);
xchat_hook_command (ph, "unloadall", XCHAT_PRI_NORM, xchat_hook_command (ph, "unloadall", HEXCHAT_PRI_NORM,
perl_command_unloadall, 0, 0); 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_command_reloadall, 0, 0);
/*perl_init (); */ /*perl_init (); */

24
plugins/python/python.c
View File

@ -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_XCHAT", XCHAT_EAT_XCHAT);
PyModule_AddIntConstant(m, "EAT_PLUGIN", XCHAT_EAT_PLUGIN); PyModule_AddIntConstant(m, "EAT_PLUGIN", XCHAT_EAT_PLUGIN);
PyModule_AddIntConstant(m, "EAT_ALL", XCHAT_EAT_ALL); PyModule_AddIntConstant(m, "EAT_ALL", XCHAT_EAT_ALL);
PyModule_AddIntConstant(m, "PRI_HIGHEST", XCHAT_PRI_HIGHEST); PyModule_AddIntConstant(m, "PRI_HIGHEST", HEXCHAT_PRI_HIGHEST);
PyModule_AddIntConstant(m, "PRI_HIGH", XCHAT_PRI_HIGH); PyModule_AddIntConstant(m, "PRI_HIGH", HEXCHAT_PRI_HIGH);
PyModule_AddIntConstant(m, "PRI_NORM", XCHAT_PRI_NORM); PyModule_AddIntConstant(m, "PRI_NORM", HEXCHAT_PRI_NORM);
PyModule_AddIntConstant(m, "PRI_LOW", XCHAT_PRI_LOW); PyModule_AddIntConstant(m, "PRI_LOW", HEXCHAT_PRI_LOW);
PyModule_AddIntConstant(m, "PRI_LOWEST", XCHAT_PRI_LOWEST); PyModule_AddIntConstant(m, "PRI_LOWEST", HEXCHAT_PRI_LOWEST);
o = Py_BuildValue("(ii)", VERSION_MAJOR, VERSION_MINOR); o = Py_BuildValue("(ii)", VERSION_MAJOR, VERSION_MINOR);
if (o == NULL) { if (o == NULL) {
@ -1654,7 +1654,7 @@ Module_xchat_hook_command(PyObject *self, PyObject *args, PyObject *kwargs)
char *name; char *name;
PyObject *callback; PyObject *callback;
PyObject *userdata = Py_None; PyObject *userdata = Py_None;
int priority = XCHAT_PRI_NORM; int priority = HEXCHAT_PRI_NORM;
char *help = NULL; char *help = NULL;
PyObject *plugin; PyObject *plugin;
Hook *hook; Hook *hook;
@ -1692,7 +1692,7 @@ Module_xchat_hook_server(PyObject *self, PyObject *args, PyObject *kwargs)
char *name; char *name;
PyObject *callback; PyObject *callback;
PyObject *userdata = Py_None; PyObject *userdata = Py_None;
int priority = XCHAT_PRI_NORM; int priority = HEXCHAT_PRI_NORM;
PyObject *plugin; PyObject *plugin;
Hook *hook; Hook *hook;
char *kwlist[] = {"name", "callback", "userdata", "priority", 0}; char *kwlist[] = {"name", "callback", "userdata", "priority", 0};
@ -1728,7 +1728,7 @@ Module_xchat_hook_print(PyObject *self, PyObject *args, PyObject *kwargs)
char *name; char *name;
PyObject *callback; PyObject *callback;
PyObject *userdata = Py_None; PyObject *userdata = Py_None;
int priority = XCHAT_PRI_NORM; int priority = HEXCHAT_PRI_NORM;
PyObject *plugin; PyObject *plugin;
Hook *hook; Hook *hook;
char *kwlist[] = {"name", "callback", "userdata", "priority", 0}; 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, "", HEXCHAT_PRI_NORM, IInterp_Cmd, 0, 0);
xchat_hook_command(ph, "PY", XCHAT_PRI_NORM, Command_Py, usage, 0); xchat_hook_command(ph, "PY", HEXCHAT_PRI_NORM, Command_Py, usage, 0);
xchat_hook_command(ph, "LOAD", XCHAT_PRI_NORM, Command_Load, 0, 0); xchat_hook_command(ph, "LOAD", HEXCHAT_PRI_NORM, Command_Load, 0, 0);
xchat_hook_command(ph, "UNLOAD", XCHAT_PRI_NORM, Command_Unload, 0, 0); xchat_hook_command(ph, "UNLOAD", HEXCHAT_PRI_NORM, Command_Unload, 0, 0);
#ifdef WITH_THREAD #ifdef WITH_THREAD
thread_timer = xchat_hook_timer(ph, 300, Callback_ThreadTimer, NULL); thread_timer = xchat_hook_timer(ph, 300, Callback_ThreadTimer, NULL);
#endif #endif

20
plugins/sasl/sasl.c
View File

@ -291,16 +291,16 @@ xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugi
*plugin_desc = desc; *plugin_desc = desc;
*plugin_version = version; *plugin_version = version;
xchat_hook_command (ph, "SASL", XCHAT_PRI_NORM, sasl_cmd_cb, sasl_help, 0); xchat_hook_command (ph, "SASL", HEXCHAT_PRI_NORM, sasl_cmd_cb, sasl_help, 0);
xchat_hook_print (ph, "Connected", XCHAT_PRI_NORM, connect_cb, NULL); xchat_hook_print (ph, "Connected", HEXCHAT_PRI_NORM, connect_cb, NULL);
/* xchat_hook_print (ph, "Disconnected", XCHAT_PRI_NORM, disconnect_cb, NULL); */ /* xchat_hook_print (ph, "Disconnected", HEXCHAT_PRI_NORM, disconnect_cb, NULL); */
xchat_hook_server (ph, "CAP", XCHAT_PRI_NORM, cap_cb, NULL); xchat_hook_server (ph, "CAP", HEXCHAT_PRI_NORM, cap_cb, NULL);
xchat_hook_server (ph, "RAW LINE", XCHAT_PRI_NORM, server_cb, NULL); xchat_hook_server (ph, "RAW LINE", HEXCHAT_PRI_NORM, server_cb, NULL);
xchat_hook_server (ph, "903", XCHAT_PRI_NORM, authend_cb, NULL); xchat_hook_server (ph, "903", HEXCHAT_PRI_NORM, authend_cb, NULL);
xchat_hook_server (ph, "904", XCHAT_PRI_NORM, authend_cb, NULL); xchat_hook_server (ph, "904", HEXCHAT_PRI_NORM, authend_cb, NULL);
xchat_hook_server (ph, "905", XCHAT_PRI_NORM, authend_cb, NULL); xchat_hook_server (ph, "905", HEXCHAT_PRI_NORM, authend_cb, NULL);
xchat_hook_server (ph, "906", XCHAT_PRI_NORM, authend_cb, NULL); xchat_hook_server (ph, "906", HEXCHAT_PRI_NORM, authend_cb, NULL);
xchat_hook_server (ph, "907", XCHAT_PRI_NORM, authend_cb, NULL); xchat_hook_server (ph, "907", HEXCHAT_PRI_NORM, authend_cb, NULL);
xchat_printf (ph, "%s plugin loaded\n", name); xchat_printf (ph, "%s plugin loaded\n", name);

2
plugins/sysinfo/sysinfo.cpp
View File

@ -397,7 +397,7 @@ xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugi
firstRun = 1; 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_command (ph, "MENU -ietc\\system.png ADD \"Window/Display System Info\" \"SYSINFO\"");
xchat_printf (ph, "%s plugin loaded\n", name); xchat_printf (ph, "%s plugin loaded\n", name);

6
plugins/sysinfo/xsys.c
View File

@ -847,9 +847,9 @@ xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugi
*plugin_version = version; *plugin_version = version;
char buffer[bsize]; char buffer[bsize];
xchat_hook_command (ph, "SYSINFO", XCHAT_PRI_NORM, sysinfo_cb, sysinfo_help, NULL); xchat_hook_command (ph, "SYSINFO", HEXCHAT_PRI_NORM, sysinfo_cb, sysinfo_help, NULL);
xchat_hook_command (ph, "NETDATA", XCHAT_PRI_NORM, netdata_cb, NULL, NULL); xchat_hook_command (ph, "NETDATA", HEXCHAT_PRI_NORM, netdata_cb, NULL, NULL);
xchat_hook_command (ph, "NETSTREAM", XCHAT_PRI_NORM, netstream_cb, NULL, NULL); xchat_hook_command (ph, "NETSTREAM", HEXCHAT_PRI_NORM, netstream_cb, NULL, NULL);
/* this is required for the very first run */ /* this is required for the very first run */
if (xchat_pluginpref_get_str (ph, "pciids", buffer) == 0) if (xchat_pluginpref_get_str (ph, "pciids", buffer) == 0)

16
plugins/tcl/tclplugin.c
View File

@ -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++) { for (index = 0; index < XC_SIZE; index++) {
if (strcmp(xc[index].event, token) == 0) { if (strcmp(xc[index].event, token) == 0) {
if (xc[index].hook == NULL) { 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; break;
} }
} }
@ -950,7 +950,7 @@ static int tcl_alias(ClientData cd, Tcl_Interp * irp, int argc, const char *argv
if (string[0] == '@') if (string[0] == '@')
aliasPtr->hook = NULL; aliasPtr->hook = NULL;
else 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 { } else {
aliasPtr = Tcl_GetHashValue(entry); aliasPtr = Tcl_GetHashValue(entry);
DeleteInternalProc(aliasPtr->procPtr); DeleteInternalProc(aliasPtr->procPtr);
@ -2245,13 +2245,13 @@ int xchat_plugin_init(xchat_plugin * plugin_handle, char **plugin_name, char **p
Tcl_Plugin_Init(); Tcl_Plugin_Init();
raw_line_hook = xchat_hook_server(ph, "RAW LINE", XCHAT_PRI_NORM, Server_raw_line, NULL); raw_line_hook = xchat_hook_server(ph, "RAW LINE", HEXCHAT_PRI_NORM, Server_raw_line, NULL);
Command_TCL_hook = xchat_hook_command(ph, "tcl", XCHAT_PRI_NORM, Command_TCL, 0, 0); Command_TCL_hook = xchat_hook_command(ph, "tcl", HEXCHAT_PRI_NORM, Command_TCL, 0, 0);
Command_Source_hook = xchat_hook_command(ph, "source", XCHAT_PRI_NORM, Command_Source, 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", XCHAT_PRI_NORM, Command_Reloadall, 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", XCHAT_PRI_NORM, Command_Source, 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); 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(); banner();
xchat_print(ph, "Tcl interface loaded\n"); xchat_print(ph, "Tcl interface loaded\n");

2
plugins/upd/upd.c
View File

@ -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_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_hook_timer (ph, delay * 1000, delayed_check, NULL);
xchat_command (ph, "MENU -ietc\\download.png ADD \"Help/Check for Updates\" \"UPDCHK\""); xchat_command (ph, "MENU -ietc\\download.png ADD \"Help/Check for Updates\" \"UPDCHK\"");
xchat_printf (ph, "%s plugin loaded\n", name); xchat_printf (ph, "%s plugin loaded\n", name);

2
plugins/winamp/winamp.c
View File

@ -172,7 +172,7 @@ xchat_plugin_init(xchat_plugin *plugin_handle,
*plugin_desc = "Winamp plugin for HexChat"; *plugin_desc = "Winamp plugin for HexChat";
*plugin_version = "0.5"; *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_command (ph, "MENU -ietc\\music.png ADD \"Window/Display Current Song (Winamp)\" \"WINAMP\"");
xchat_print (ph, "Winamp plugin loaded\n"); xchat_print (ph, "Winamp plugin loaded\n");

24
plugins/wmpa/hexchat-plugin.cpp
View File

@ -61,18 +61,18 @@ int xchat_plugin_init(xchat_plugin *plugin_handle,
xchat_printf(ph, "WMPA: Failed to restore the settings."); xchat_printf(ph, "WMPA: Failed to restore the settings.");
} }
xchat_hook_command(ph, "auto", XCHAT_PRI_NORM, wmpaAuto, 0, 0); xchat_hook_command(ph, "auto", HEXCHAT_PRI_NORM, wmpaAuto, 0, 0);
xchat_hook_command(ph, "curr", XCHAT_PRI_NORM, wmpaCurr, 0, 0); xchat_hook_command(ph, "curr", HEXCHAT_PRI_NORM, wmpaCurr, 0, 0);
xchat_hook_command(ph, "find", XCHAT_PRI_NORM, wmpaFind, 0, 0); xchat_hook_command(ph, "find", HEXCHAT_PRI_NORM, wmpaFind, 0, 0);
xchat_hook_command(ph, "slist", XCHAT_PRI_NORM, wmpaList, 0, 0); xchat_hook_command(ph, "slist", HEXCHAT_PRI_NORM, wmpaList, 0, 0);
xchat_hook_command(ph, "next", XCHAT_PRI_NORM, wmpaNext, 0, 0); xchat_hook_command(ph, "next", HEXCHAT_PRI_NORM, wmpaNext, 0, 0);
xchat_hook_command(ph, "play", XCHAT_PRI_NORM, wmpaPlay, 0, 0); xchat_hook_command(ph, "play", HEXCHAT_PRI_NORM, wmpaPlay, 0, 0);
xchat_hook_command(ph, "pause", XCHAT_PRI_NORM, wmpaPause, 0, 0); xchat_hook_command(ph, "pause", HEXCHAT_PRI_NORM, wmpaPause, 0, 0);
xchat_hook_command(ph, "prev", XCHAT_PRI_NORM, wmpaPrev, 0, 0); xchat_hook_command(ph, "prev", HEXCHAT_PRI_NORM, wmpaPrev, 0, 0);
xchat_hook_command(ph, "song", XCHAT_PRI_NORM, wmpaSong, 0, 0); xchat_hook_command(ph, "song", HEXCHAT_PRI_NORM, wmpaSong, 0, 0);
xchat_hook_command(ph, "stop", XCHAT_PRI_NORM, wmpaStop, 0, 0); xchat_hook_command(ph, "stop", HEXCHAT_PRI_NORM, wmpaStop, 0, 0);
xchat_hook_command(ph, "volume", XCHAT_PRI_NORM, wmpaVolume, 0, 0); xchat_hook_command(ph, "volume", HEXCHAT_PRI_NORM, wmpaVolume, 0, 0);
xchat_hook_command(ph, "wmpahelp", XCHAT_PRI_NORM, wmpaHelp, 0, 0); xchat_hook_command(ph, "wmpahelp", HEXCHAT_PRI_NORM, wmpaHelp, 0, 0);
xchat_printf(ph, "WMPA %s successfully loaded.", VER_STRING); xchat_printf(ph, "WMPA %s successfully loaded.", VER_STRING);
wmpaCommands(); wmpaCommands();

10
plugins/wmpa/hexchat-plugin.h
View File

@ -9,11 +9,11 @@
#include <time.h> #include <time.h>
#include <tchar.h> #include <tchar.h>
#define XCHAT_PRI_HIGHEST 127 #define HEXCHAT_PRI_HIGHEST 127
#define XCHAT_PRI_HIGH 64 #define HEXCHAT_PRI_HIGH 64
#define XCHAT_PRI_NORM 0 #define HEXCHAT_PRI_NORM 0
#define XCHAT_PRI_LOW (-64) #define HEXCHAT_PRI_LOW (-64)
#define XCHAT_PRI_LOWEST (-128) #define HEXCHAT_PRI_LOWEST (-128)
#define XCHAT_FD_READ 1 #define XCHAT_FD_READ 1
#define XCHAT_FD_WRITE 2 #define XCHAT_FD_WRITE 2

6
plugins/xdcc/xdcc.c
View File

@ -320,9 +320,9 @@ int xchat_plugin_init(xchat_plugin *plugin_handle,
*plugin_desc = "Very simple XDCC server"; *plugin_desc = "Very simple XDCC server";
*plugin_version = "0.1"; *plugin_version = "0.1";
xchat_hook_command(ph, "XDCC", XCHAT_PRI_NORM, xdcc_command, 0, 0); xchat_hook_command(ph, "XDCC", HEXCHAT_PRI_NORM, xdcc_command, 0, 0);
xchat_hook_print(ph, "CTCP Generic", XCHAT_PRI_NORM, ctcp_cb, 0); xchat_hook_print(ph, "CTCP Generic", HEXCHAT_PRI_NORM, ctcp_cb, 0);
xchat_hook_print(ph, "CTCP Generic to Channel", XCHAT_PRI_NORM, ctcp_cb, 0); xchat_hook_print(ph, "CTCP Generic to Channel", HEXCHAT_PRI_NORM, ctcp_cb, 0);
xdcc_load(); xdcc_load();
xchat_print(ph, "XDCC loaded. Type /XDCC for help.\n"); xchat_print(ph, "XDCC loaded. Type /XDCC for help.\n");

12
share/doc/plugins.md
View File

@ -90,8 +90,8 @@ xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugi
*plugin_desc = PDESC; *plugin_desc = PDESC;
*plugin_version = PVERSION; *plugin_version = PVERSION;
xchat_hook_command (ph, "AutoOpToggle", XCHAT_PRI_NORM, autooptoggle_cb, "Usage: AUTOOPTOGGLE, Turns OFF/ON Auto Oping", 0); xchat_hook_command (ph, "AutoOpToggle", HEXCHAT_PRI_NORM, autooptoggle_cb, "Usage: AUTOOPTOGGLE, Turns OFF/ON Auto Oping", 0);
xchat_hook_print (ph, "Join", XCHAT_PRI_NORM, join_cb, 0); xchat_hook_print (ph, "Join", HEXCHAT_PRI_NORM, join_cb, 0);
xchat_print (ph, "AutoOpPlugin loaded successfully!\n"); xchat_print (ph, "AutoOpPlugin loaded successfully!\n");
@ -502,7 +502,7 @@ onotice_cb (char *word[], char *word_eol[], void *userdata)
return XCHAT_EAT_ALL; return XCHAT_EAT_ALL;
} }
xchat_hook_command (ph, "ONOTICE", XCHAT_PRI_NORM, onotice_cb, "Usage: ONOTICE &lt;message> Sends a notice to all ops", NULL); xchat_hook_command (ph, "ONOTICE", HEXCHAT_PRI_NORM, onotice_cb, "Usage: ONOTICE &lt;message> Sends a notice to all ops", NULL);
</pre> </pre>
*** ***
@ -572,7 +572,7 @@ youpart_cb (char *word[], void *userdata)
return XCHAT_EAT_XCHAT; /* dont let HexChat 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); xchat_hook_print (ph, "You Part", HEXCHAT_PRI_NORM, youpart_cb, NULL);
</pre> </pre>
*** ***
@ -604,7 +604,7 @@ kick_cb (char *word[], char *word_eol[], void *userdata)
return XCHAT_EAT_NONE; /* don't eat this event, let other plugins and HexChat 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); xchat_hook_server (ph, "KICK", HEXCHAT_PRI_NORM, kick_cb, NULL);
</pre> </pre>
*** ***
@ -650,7 +650,7 @@ timeout_cb (void *userdata)
} }
myhook = xchat_hook_timer (ph, 5000, timeout_cb, NULL); myhook = xchat_hook_timer (ph, 5000, timeout_cb, NULL);
xchat_hook_command (ph, "STOP", XCHAT_PRI_NORM, stop_cb, NULL, NULL); xchat_hook_command (ph, "STOP", HEXCHAT_PRI_NORM, stop_cb, NULL, NULL);
</pre> </pre>
*** ***

10
src/common/hexchat-plugin.h
View File

@ -4,11 +4,11 @@
#include <time.h> #include <time.h>
#define XCHAT_PRI_HIGHEST 127 #define HEXCHAT_PRI_HIGHEST 127
#define XCHAT_PRI_HIGH 64 #define HEXCHAT_PRI_HIGH 64
#define XCHAT_PRI_NORM 0 #define HEXCHAT_PRI_NORM 0
#define XCHAT_PRI_LOW (-64) #define HEXCHAT_PRI_LOW (-64)
#define XCHAT_PRI_LOWEST (-128) #define HEXCHAT_PRI_LOWEST (-128)
#define XCHAT_FD_READ 1 #define XCHAT_FD_READ 1
#define XCHAT_FD_WRITE 2 #define XCHAT_FD_WRITE 2

2
src/common/plugin-timer.c
View File

@ -202,7 +202,7 @@ xchat_plugin_init
*plugin_desc = "IrcII style /TIMER command"; *plugin_desc = "IrcII style /TIMER command";
*plugin_version = ""; *plugin_version = "";
xchat_hook_command (ph, "TIMER", XCHAT_PRI_NORM, timer_cb, HELP, 0); xchat_hook_command (ph, "TIMER", HEXCHAT_PRI_NORM, timer_cb, HELP, 0);
return 1; /* return 1 for success */ return 1; /* return 1 for success */
} }