Now some final cleanup (I hope)

This commit is contained in:
Berke Viktor 2012-10-30 11:47:12 +01:00
parent a51a69134b
commit 507af191bd
12 changed files with 28 additions and 28 deletions

View File

@ -1,4 +1,4 @@
/* XChat Win32 DNS Plugin /* HexChat Win32 DNS Plugin
* Copyright (C) 2003-2004 Peter Zelezny. * Copyright (C) 2003-2004 Peter Zelezny.
* Copyright (C) 2012 Berke Viktor. * Copyright (C) 2012 Berke Viktor.
* *
@ -317,7 +317,7 @@ hexchat_plugin_init
(hexchat_plugin *plugin_handle, char **plugin_name, (hexchat_plugin *plugin_handle, char **plugin_name,
char **plugin_desc, char **plugin_version, char *arg) 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; ph = plugin_handle;
*plugin_name = "DNS"; *plugin_name = "DNS";

View File

@ -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 Copyright (C) Yann HAMON & contributors
This library is free software; you can redistribute it and/or 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"); hexchat_print(ph, "Winamp's window not found - Is winamp really running?\n");
else { else {
//Winamp's running //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); SendMessage(hwndWinamp, WM_USER, (WPARAM)0, (LPARAM)125);
if ((samplerate = SendMessage(hwndWinamp, WM_USER, (WPARAM)0, (LPARAM)126)) == 0) { 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); 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 **plugin_version,
char *arg) 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; ph = plugin_handle;
*plugin_name = "EasyWinampControl"; *plugin_name = "EasyWinampControl";

View File

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

View File

@ -28,7 +28,7 @@
// #pragma GCC visibility push(default) // #pragma GCC visibility push(default)
#include "hexchat-plugin.h" #include "hexchat-plugin.h"
#define XCHAT_MAX_WORDS 32 #define HEXCHAT_MAX_WORDS 32
// #pragma GCC visibility pop // #pragma GCC visibility pop
//#define EXPORT __attribute((visibility("default"))) //#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++; if (!strcmp(command, "332")) w++;
// Look for encrypted data // 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]); const char *s = (ew == w+1 ? word[ew]+1 : word[ew]);
if (strcmp(s, "+OK") == 0 || strcmp(s, "mcps") == 0) goto has_encrypted_data; 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; length = 0;
if (!append(&message, &length, "RECV")) goto decrypt_error; 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 (word[uw][0] != '\0' && !append(&message, &length, " ")) goto decrypt_error;
if (uw == ew) { if (uw == ew) {
@ -263,7 +263,7 @@ int hexchat_plugin_init(hexchat_plugin *plugin_handle,
char *arg) { char *arg) {
ph = plugin_handle; ph = plugin_handle;
/* Send our info to XChat */ /* Send our info to HexChat */
*name = plugin_name; *name = plugin_name;
*desc = plugin_desc; *desc = plugin_desc;
*version = plugin_version; *version = plugin_version;

View File

@ -27,7 +27,7 @@
#include <string.h> #include <string.h>
#include "fish.h" #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() { gchar *get_config_filename() {
const gchar *homedir = g_get_home_dir(); const gchar *homedir = g_get_home_dir();
return g_build_filename(homedir, ".xchat2", "blow.ini", NULL); return g_build_filename(homedir, ".xchat2", "blow.ini", NULL);

View File

@ -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 ***********/ /******* our HexChat event call back, get the name and info for each event and save it *********/
/******* for our alerts later ***********/ /******* for our alerts later ******************************************************************/
/***********************************************************************************************/ /***********************************************************************************************/
int event_cb(char *word[], void *userdata) 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; return HEXCHAT_EAT_NONE;
} }
@ -256,7 +256,7 @@ LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wparam, LPARAM lparam)
case WM_SIZE: case WM_SIZE:
{ {
/******************************************/ /******************************************/
/***** User wants to minimize xChat, ******/ /***** User wants to minimize HexChat, ****/
/***** are we allowed to go to tray? ******/ /***** are we allowed to go to tray? ******/
/******************************************/ /******************************************/
if((g_dwPrefs & (1<<PREF_TOT)) && (wparam == SIZE_MINIMIZED)) if((g_dwPrefs & (1<<PREF_TOT)) && (wparam == SIZE_MINIMIZED))
@ -369,10 +369,10 @@ LRESULT CALLBACK sdTrayProc(HWND hWnd, int msg)
break; break;
case ACT_RESTORE: case ACT_RESTORE:
{ {
/***********************************************/ /*************************************************/
/** user wants us to restore the xchat window **/ /** user wants us to restore the HexChat window **/
/** and of autoaway is on, set as back **/ /** and of autoaway is on, set as back ******** **/
/***********************************************/ /*************************************************/
SendMessage(g_hXchatWnd, WM_SYSCOMMAND, SC_RESTORE, 0); SendMessage(g_hXchatWnd, WM_SYSCOMMAND, SC_RESTORE, 0);
SetForegroundWindow(hWnd); SetForegroundWindow(hWnd);

View File

@ -28,7 +28,7 @@
#include "hexchat.h" #include "hexchat.h"
#include "utility.h" #include "utility.h"
// from util.c of xchat source code ( slightly modified to fit X-Tray Syntax ) // from util.c of HexChat source code ( slightly modified to fit HexTray Syntax )
char *hexchat_strip_color (char *text) char *hexchat_strip_color (char *text)
{ {
int nc = 0; int nc = 0;

View File

@ -1,4 +1,4 @@
/* XCHAT 2.0 PLUGIN: Mail checker */ /* HexChat 2.0 plugin: Mail checker */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

View File

@ -22,7 +22,7 @@
*/ */
/* /*
* SASL authentication plugin for XChat * SASL authentication plugin for HexChat
* Extremely primitive: only PLAIN, no error checking * Extremely primitive: only PLAIN, no error checking
* *
* http://ygrek.org.ua/p/cap_sasl.html * http://ygrek.org.ua/p/cap_sasl.html
@ -283,10 +283,10 @@ connect_cb (char *word[], void *userdata)
int int
hexchat_plugin_init (hexchat_plugin *plugin_handle, char **plugin_name, char **plugin_desc, char **plugin_version, char *arg) 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; ph = plugin_handle;
/* tell xchat our info */ /* tell HexChat our info */
*plugin_name = name; *plugin_name = name;
*plugin_desc = desc; *plugin_desc = desc;
*plugin_version = version; *plugin_version = version;

View File

@ -165,7 +165,7 @@ hexchat_plugin_init(hexchat_plugin *plugin_handle,
char **plugin_version, char **plugin_version,
char *arg) 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; ph = plugin_handle;
*plugin_name = "Winamp"; *plugin_name = "Winamp";

View File

@ -21,7 +21,7 @@
#define HEXCHAT_FD_NOTSOCKET 8 #define HEXCHAT_FD_NOTSOCKET 8
#define HEXCHAT_EAT_NONE 0 /* pass it on through! */ #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_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 */ #define HEXCHAT_EAT_ALL (HEXCHAT_EAT_HEXCHAT|HEXCHAT_EAT_PLUGIN) /* don't let anything see this event */

View File

@ -1,4 +1,4 @@
/* xchat 2.0 plugin: simple xdcc server example */ /* HexChat 2.0 plugin: simple XDCC server example */
#include <glib.h> #include <glib.h>
#include <string.h> #include <string.h>