From 507af191bd9a100656b70da66111e2af105d82ee Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Tue, 30 Oct 2012 11:47:12 +0100 Subject: [PATCH] Now some final cleanup (I hope) --- plugins/dns/dns.c | 4 ++-- plugins/ewc/ewc.c | 8 ++++---- plugins/exec/exec.c | 2 +- plugins/fishlim/plugin_hexchat.c | 8 ++++---- plugins/fishlim/test.c | 2 +- plugins/hextray/callbacks.cpp | 16 ++++++++-------- plugins/hextray/hexchat.cpp | 2 +- plugins/mailcheck/mailcheck.c | 2 +- plugins/sasl/sasl.c | 6 +++--- plugins/winamp/winamp.c | 2 +- plugins/wmpa/hexchat-plugin.h | 2 +- plugins/xdcc/xdcc.c | 2 +- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/plugins/dns/dns.c b/plugins/dns/dns.c index b1c4c6ac..cd64c4b5 100644 --- a/plugins/dns/dns.c +++ b/plugins/dns/dns.c @@ -1,4 +1,4 @@ -/* XChat Win32 DNS Plugin +/* HexChat Win32 DNS Plugin * Copyright (C) 2003-2004 Peter Zelezny. * Copyright (C) 2012 Berke Viktor. * @@ -317,7 +317,7 @@ hexchat_plugin_init (hexchat_plugin *plugin_handle, char **plugin_name, char **plugin_desc, char **plugin_version, char *arg) { - /* we need to save this for use with any xchat_* functions */ + /* we need to save this for use with any hexchat_* functions */ ph = plugin_handle; *plugin_name = "DNS"; diff --git a/plugins/ewc/ewc.c b/plugins/ewc/ewc.c index 9fb5a135..c8e508f7 100644 --- a/plugins/ewc/ewc.c +++ b/plugins/ewc/ewc.c @@ -1,5 +1,5 @@ /* -EasyWinampControl - A Winamp "What's playing" plugin for Xchat +EasyWinampControl - A Winamp "What's playing" plugin for HexChat Copyright (C) Yann HAMON & contributors This library is free software; you can redistribute it and/or @@ -141,7 +141,7 @@ static int wp_cb(char *word[], char *word_eol[], void *userdata) hexchat_print(ph, "Winamp's window not found - Is winamp really running?\n"); else { //Winamp's running - // Seems buggy when winamp2's agent is running, and winamp not (or winamp3) -> crashes xchat. + // Seems buggy when winamp2's agent is running, and winamp not (or winamp3) -> crashes HexChat. SendMessage(hwndWinamp, WM_USER, (WPARAM)0, (LPARAM)125); if ((samplerate = SendMessage(hwndWinamp, WM_USER, (WPARAM)0, (LPARAM)126)) == 0) { @@ -195,7 +195,7 @@ static int wp_cb(char *word[], char *word_eol[], void *userdata) hexchat_commandf(ph, "dispcurrsong %d %d %d %s %s %s", samplerate, bitrate, nbchannels, elapsedtime, totaltime, this_title); } - return HEXCHAT_EAT_ALL; /* eat this command so xchat and other plugins can't process it */ + return HEXCHAT_EAT_ALL; /* eat this command so HexChat and other plugins can't process it */ } @@ -206,7 +206,7 @@ int hexchat_plugin_init(hexchat_plugin *plugin_handle, char **plugin_version, char *arg) { - /* we need to save this for use with any xchat_* functions */ + /* we need to save this for use with any hexchat_* functions */ ph = plugin_handle; *plugin_name = "EasyWinampControl"; diff --git a/plugins/exec/exec.c b/plugins/exec/exec.c index cc37ab70..483b8e7f 100644 --- a/plugins/exec/exec.c +++ b/plugins/exec/exec.c @@ -124,7 +124,7 @@ hexchat_plugin_init (hexchat_plugin *plugin_handle, char **plugin_name, char **p *plugin_desc = desc; *plugin_version = version; - hexchat_hook_command (ph, "EXEC", HEXCHAT_PRI_NORM, run_command, "Usage: /EXEC [-O] - execute commands inside XChat", 0); + hexchat_hook_command (ph, "EXEC", HEXCHAT_PRI_NORM, run_command, "Usage: /EXEC [-O] - execute commands inside HexChat", 0); hexchat_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 0f635cd9..3401f25d 100644 --- a/plugins/fishlim/plugin_hexchat.c +++ b/plugins/fishlim/plugin_hexchat.c @@ -28,7 +28,7 @@ // #pragma GCC visibility push(default) #include "hexchat-plugin.h" -#define XCHAT_MAX_WORDS 32 +#define HEXCHAT_MAX_WORDS 32 // #pragma GCC visibility pop //#define EXPORT __attribute((visibility("default"))) @@ -127,7 +127,7 @@ static int handle_incoming(char *word[], char *word_eol[], void *userdata) { if (!strcmp(command, "332")) w++; // Look for encrypted data - for (ew = w+1; ew < XCHAT_MAX_WORDS-1; ew++) { + for (ew = w+1; ew < HEXCHAT_MAX_WORDS-1; ew++) { const char *s = (ew == w+1 ? word[ew]+1 : word[ew]); if (strcmp(s, "+OK") == 0 || strcmp(s, "mcps") == 0) goto has_encrypted_data; } @@ -150,7 +150,7 @@ static int handle_incoming(char *word[], char *word_eol[], void *userdata) { length = 0; if (!append(&message, &length, "RECV")) goto decrypt_error; - for (uw = 1; uw < XCHAT_MAX_WORDS; uw++) { + for (uw = 1; uw < HEXCHAT_MAX_WORDS; uw++) { if (word[uw][0] != '\0' && !append(&message, &length, " ")) goto decrypt_error; if (uw == ew) { @@ -263,7 +263,7 @@ int hexchat_plugin_init(hexchat_plugin *plugin_handle, char *arg) { ph = plugin_handle; - /* Send our info to XChat */ + /* Send our info to HexChat */ *name = plugin_name; *desc = plugin_desc; *version = plugin_version; diff --git a/plugins/fishlim/test.c b/plugins/fishlim/test.c index 9e6a1f5f..09d19ca3 100644 --- a/plugins/fishlim/test.c +++ b/plugins/fishlim/test.c @@ -27,7 +27,7 @@ #include #include "fish.h" -// We can't use the XChat plugin API from here... +// We can't use the HexChat plugin API from here... gchar *get_config_filename() { const gchar *homedir = g_get_home_dir(); return g_build_filename(homedir, ".xchat2", "blow.ini", NULL); diff --git a/plugins/hextray/callbacks.cpp b/plugins/hextray/callbacks.cpp index 3882c137..0ced8384 100644 --- a/plugins/hextray/callbacks.cpp +++ b/plugins/hextray/callbacks.cpp @@ -55,8 +55,8 @@ BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) } /***********************************************************************************************/ -/******* our xchat event call back, get the name and info for each event and save it ***********/ -/******* for our alerts later ***********/ +/******* our HexChat event call back, get the name and info for each event and save it *********/ +/******* for our alerts later ******************************************************************/ /***********************************************************************************************/ int event_cb(char *word[], void *userdata) { @@ -174,7 +174,7 @@ int event_cb(char *word[], void *userdata) } /***********************************/ - /***** pass the events to xchat ****/ + /***** pass the events to HexChat **/ /***********************************/ return HEXCHAT_EAT_NONE; } @@ -256,7 +256,7 @@ LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wparam, LPARAM lparam) case WM_SIZE: { /******************************************/ - /***** User wants to minimize xChat, ******/ + /***** User wants to minimize HexChat, ****/ /***** are we allowed to go to tray? ******/ /******************************************/ if((g_dwPrefs & (1< #include diff --git a/plugins/sasl/sasl.c b/plugins/sasl/sasl.c index 3a15e0f4..3c5f4f5b 100644 --- a/plugins/sasl/sasl.c +++ b/plugins/sasl/sasl.c @@ -22,7 +22,7 @@ */ /* - * SASL authentication plugin for XChat + * SASL authentication plugin for HexChat * Extremely primitive: only PLAIN, no error checking * * http://ygrek.org.ua/p/cap_sasl.html @@ -283,10 +283,10 @@ connect_cb (char *word[], void *userdata) int hexchat_plugin_init (hexchat_plugin *plugin_handle, char **plugin_name, char **plugin_desc, char **plugin_version, char *arg) { - /* we need to save this for use with any xchat_* functions */ + /* we need to save this for use with any hexchat_* functions */ ph = plugin_handle; - /* tell xchat our info */ + /* tell HexChat our info */ *plugin_name = name; *plugin_desc = desc; *plugin_version = version; diff --git a/plugins/winamp/winamp.c b/plugins/winamp/winamp.c index 2db892a4..9ffcff04 100644 --- a/plugins/winamp/winamp.c +++ b/plugins/winamp/winamp.c @@ -165,7 +165,7 @@ hexchat_plugin_init(hexchat_plugin *plugin_handle, char **plugin_version, char *arg) { - /* we need to save this for use with any xchat_* functions */ + /* we need to save this for use with any hexchat_* functions */ ph = plugin_handle; *plugin_name = "Winamp"; diff --git a/plugins/wmpa/hexchat-plugin.h b/plugins/wmpa/hexchat-plugin.h index 58cc2400..94e4a4e5 100644 --- a/plugins/wmpa/hexchat-plugin.h +++ b/plugins/wmpa/hexchat-plugin.h @@ -21,7 +21,7 @@ #define HEXCHAT_FD_NOTSOCKET 8 #define HEXCHAT_EAT_NONE 0 /* pass it on through! */ -#define HEXCHAT_EAT_HEXCHAT 1 /* don't let xchat see this event */ +#define HEXCHAT_EAT_HEXCHAT 1 /* don't let HexChat see this event */ #define HEXCHAT_EAT_PLUGIN 2 /* don't let other plugins see this event */ #define HEXCHAT_EAT_ALL (HEXCHAT_EAT_HEXCHAT|HEXCHAT_EAT_PLUGIN) /* don't let anything see this event */ diff --git a/plugins/xdcc/xdcc.c b/plugins/xdcc/xdcc.c index 52791ca4..73a3983b 100644 --- a/plugins/xdcc/xdcc.c +++ b/plugins/xdcc/xdcc.c @@ -1,4 +1,4 @@ -/* xchat 2.0 plugin: simple xdcc server example */ +/* HexChat 2.0 plugin: simple XDCC server example */ #include #include