From 8d6f4d9d40c68f3174cbe94f7107dea74d00d5fc Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Tue, 30 Oct 2012 08:58:50 +0100 Subject: [PATCH] Some remaining fixes --- plugins/lua/lua.c | 4 ++-- plugins/perl/perl.c | 4 ++-- plugins/python/python.c | 2 +- plugins/tcl/tclplugin.c | 2 +- plugins/wmpa/hexchat-plugin.h | 6 +++--- share/doc/dbus.md | 6 +++--- share/doc/perl.md | 2 +- share/doc/plugins.md | 2 +- src/common/dbus/dbus-client.c | 12 ++++++------ src/common/dbus/dbus-client.h | 2 +- src/common/dbus/dbus-plugin.c | 4 ++-- src/common/dbus/dbus-plugin.h | 4 ++-- src/common/dbus/example.c | 4 ++-- src/common/hexchat-plugin.h | 6 +++--- src/common/plugin.c | 4 ++-- src/common/plugin.h | 2 +- 16 files changed, 33 insertions(+), 33 deletions(-) diff --git a/plugins/lua/lua.c b/plugins/lua/lua.c index 98778e64..6f17b50d 100644 --- a/plugins/lua/lua.c +++ b/plugins/lua/lua.c @@ -1663,7 +1663,7 @@ static int lxc_get_info(lua_State *L) } /* - * lua: xchat.get_prefs(name) + * lua: hexchat.get_prefs(name) * desc: Provides xchat's setting information (that which is available * through the /set command). A few extra bits of information are * available that don't appear in the /set list, currently they are: @@ -1684,7 +1684,7 @@ static int lxc_get_prefs(lua_State *L) * luckily we can store anything in a lua var... this makes the * xchat lua api more user friendly ;-) */ - switch (xchat_get_prefs(ph, name, &str, &i)) { + switch (hexchat_get_prefs(ph, name, &str, &i)) { case 0: /* request failed */ lua_pushnil(L); break; diff --git a/plugins/perl/perl.c b/plugins/perl/perl.c index 3b2bbba1..5427c62f 100644 --- a/plugins/perl/perl.c +++ b/plugins/perl/perl.c @@ -836,7 +836,7 @@ XS (XS_Xchat_get_prefs) } else { - switch (xchat_get_prefs (ph, SvPV_nolen (ST (0)), &str, &integer)) { + switch (hexchat_get_prefs (ph, SvPV_nolen (ST (0)), &str, &integer)) { case 0: XSRETURN_UNDEF; break; @@ -1376,7 +1376,7 @@ perl_init (void) #endif warn = 0; - xchat_get_prefs (ph, "perl_warnings", NULL, &warn); + hexchat_get_prefs (ph, "perl_warnings", NULL, &warn); arg_count = warn ? 4 : 3; PERL_SYS_INIT3 (&arg_count, (char ***)&perl_args, (char ***)&env); diff --git a/plugins/python/python.c b/plugins/python/python.c index 9c797ef0..84f2647a 100644 --- a/plugins/python/python.c +++ b/plugins/python/python.c @@ -1519,7 +1519,7 @@ Module_xchat_get_prefs(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "s:get_prefs", &name)) return NULL; BEGIN_XCHAT_CALLS(NONE); - type = xchat_get_prefs(ph, name, &info, &integer); + type = hexchat_get_prefs(ph, name, &info, &integer); END_XCHAT_CALLS(); switch (type) { case 0: diff --git a/plugins/tcl/tclplugin.c b/plugins/tcl/tclplugin.c index ec17aef5..f0cc2429 100644 --- a/plugins/tcl/tclplugin.c +++ b/plugins/tcl/tclplugin.c @@ -1081,7 +1081,7 @@ static int tcl_prefs(ClientData cd, Tcl_Interp * irp, int argc, const char *argv BADARGS(2, 2, " name"); - switch (xchat_get_prefs (ph, argv[1], &str, &i)) { + switch (hexchat_get_prefs (ph, argv[1], &str, &i)) { case 1: Tcl_AppendResult(irp, str, NULL); break; diff --git a/plugins/wmpa/hexchat-plugin.h b/plugins/wmpa/hexchat-plugin.h index 934c070e..4b4e666c 100644 --- a/plugins/wmpa/hexchat-plugin.h +++ b/plugins/wmpa/hexchat-plugin.h @@ -86,7 +86,7 @@ extern "C" { hexchat_context *(*hexchat_get_context) (hexchat_plugin *ph); const char *(*hexchat_get_info) (hexchat_plugin *ph, const char *id); - int (*xchat_get_prefs) (hexchat_plugin *ph, + int (*hexchat_get_prefs) (hexchat_plugin *ph, const char *name, const char **string, int *integer); @@ -216,7 +216,7 @@ extern "C" { const char *id); int - xchat_get_prefs (hexchat_plugin *ph, + hexchat_get_prefs (hexchat_plugin *ph, const char *name, const char **string, int *integer); @@ -309,7 +309,7 @@ extern "C" { #define hexchat_find_context ((HEXCHAT_PLUGIN_HANDLE)->hexchat_find_context) #define hexchat_get_context ((HEXCHAT_PLUGIN_HANDLE)->hexchat_get_context) #define hexchat_get_info ((HEXCHAT_PLUGIN_HANDLE)->hexchat_get_info) -#define xchat_get_prefs ((HEXCHAT_PLUGIN_HANDLE)->xchat_get_prefs) +#define hexchat_get_prefs ((HEXCHAT_PLUGIN_HANDLE)->hexchat_get_prefs) #define hexchat_list_get ((HEXCHAT_PLUGIN_HANDLE)->hexchat_list_get) #define hexchat_list_free ((HEXCHAT_PLUGIN_HANDLE)->hexchat_list_free) #define hexchat_list_fields ((HEXCHAT_PLUGIN_HANDLE)->hexchat_list_fields) diff --git a/share/doc/dbus.md b/share/doc/dbus.md index d3c986df..8db9c340 100644 --- a/share/doc/dbus.md +++ b/share/doc/dbus.md @@ -70,7 +70,7 @@ You can use the "/org/hexchat/Remote" object with interface "org.hexchat.plugin" * gchar\*: Name of the command (without the forward slash). * int: Priority of this command. * gchar\*: String of text to display when the user executes /help for this command. May be NULL if you're lazy. - * int: Value to returns when the command is catched. See XCHAT\_EAT\_*. + * int: Value to returns when the command is catched. See HEXCHAT\_EAT\_*. * Returns: * guint: The ID of the hook. @@ -78,7 +78,7 @@ You can use the "/org/hexchat/Remote" object with interface "org.hexchat.plugin" * Parameters: * gchar\*: Name of the server event. * int: Priority of this command. - * int: Value to returns when the command is catched. See XCHAT\_EAT\_*. + * int: Value to returns when the command is catched. See HEXCHAT\_EAT\_*. * Returns: * guint: The ID of the hook. @@ -86,7 +86,7 @@ You can use the "/org/hexchat/Remote" object with interface "org.hexchat.plugin" * Parameters: * gchar\*: Name of the print event. * int: Priority of this command. - * int: Value to returns when the command is catched. See XCHAT\_EAT\_*. + * int: Value to returns when the command is catched. See HEXCHAT\_EAT\_*. * Returns: * guint: The ID of the hook. diff --git a/share/doc/perl.md b/share/doc/perl.md index c0a45f27..d1553c65 100644 --- a/share/doc/perl.md +++ b/share/doc/perl.md @@ -514,7 +514,7 @@ a context cannot be found.

This function is used to retrieve certain information about the current context. If there is an associated command then that command can be used to change the value for a particular ID.

-

Xchat::get_prefs( $name )

+

Xchat::get_prefs( $name )