diff options
-rw-r--r-- | plugins/lua/lua.c | 4 | ||||
-rw-r--r-- | plugins/perl/perl.c | 4 | ||||
-rw-r--r-- | plugins/python/python.c | 2 | ||||
-rw-r--r-- | plugins/tcl/tclplugin.c | 2 | ||||
-rw-r--r-- | plugins/wmpa/hexchat-plugin.h | 6 | ||||
-rw-r--r-- | share/doc/dbus.md | 6 | ||||
-rw-r--r-- | share/doc/perl.md | 2 | ||||
-rw-r--r-- | share/doc/plugins.md | 2 | ||||
-rw-r--r-- | src/common/dbus/dbus-client.c | 12 | ||||
-rw-r--r-- | src/common/dbus/dbus-client.h | 2 | ||||
-rw-r--r-- | src/common/dbus/dbus-plugin.c | 4 | ||||
-rw-r--r-- | src/common/dbus/dbus-plugin.h | 4 | ||||
-rw-r--r-- | src/common/dbus/example.c | 4 | ||||
-rw-r--r-- | src/common/hexchat-plugin.h | 6 | ||||
-rw-r--r-- | src/common/plugin.c | 4 | ||||
-rw-r--r-- | 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.</p> </table><p>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.</p><p> </p> -<h3><a name="xchat_get_prefs" /><code>Xchat::get_prefs( $name )</code></h3> +<h3><a name="hexchat_get_prefs" /><code>Xchat::get_prefs( $name )</code></h3> <ul> <li><strong><code>$name</code> - name of a X-Chat setting (available through the /set command)</strong> </li> diff --git a/share/doc/plugins.md b/share/doc/plugins.md index aee9d174..bf2255c1 100644 --- a/share/doc/plugins.md +++ b/share/doc/plugins.md @@ -875,7 +875,7 @@ A few extra bits of information are available that don't appear in the _/SET_ li int i; const char *str; - if (xchat_get_prefs (ph, "irc_nick1", &str, &i) == 1) + if (hexchat_get_prefs (ph, "irc_nick1", &str, &i) == 1) { hexchat_printf (ph, "Current nickname setting: %s\n", str); } diff --git a/src/common/dbus/dbus-client.c b/src/common/dbus/dbus-client.c index 6f146261..70b94b50 100644 --- a/src/common/dbus/dbus-client.c +++ b/src/common/dbus/dbus-client.c @@ -40,7 +40,7 @@ write_error (char *message, } void -xchat_remote (void) +hexchat_remote (void) /* TODO: dbus_g_connection_unref (connection) are commented because it makes * dbus to crash. Fixed in dbus >=0.70 ?!? * https://launchpad.net/distros/ubuntu/+source/dbus/+bug/54375 @@ -49,7 +49,7 @@ xchat_remote (void) DBusGConnection *connection; DBusGProxy *dbus = NULL; DBusGProxy *remote_object = NULL; - gboolean xchat_running; + gboolean hexchat_running; GError *error = NULL; char *command = NULL; @@ -73,7 +73,7 @@ xchat_remote (void) return; } - /* Checks if xchat is already running */ + /* Checks if HexChat is already running */ dbus = dbus_g_proxy_new_for_name (connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, @@ -81,14 +81,14 @@ xchat_remote (void) if (!dbus_g_proxy_call (dbus, "NameHasOwner", &error, G_TYPE_STRING, DBUS_SERVICE, G_TYPE_INVALID, - G_TYPE_BOOLEAN, &xchat_running, + G_TYPE_BOOLEAN, &hexchat_running, G_TYPE_INVALID)) { write_error (_("Failed to complete NameHasOwner"), &error); - xchat_running = FALSE; + hexchat_running = FALSE; } g_object_unref (dbus); - if (!xchat_running) { + if (!hexchat_running) { //dbus_g_connection_unref (connection); return; } diff --git a/src/common/dbus/dbus-client.h b/src/common/dbus/dbus-client.h index cafc2b71..a689e978 100644 --- a/src/common/dbus/dbus-client.h +++ b/src/common/dbus/dbus-client.h @@ -22,6 +22,6 @@ #ifndef __DBUS_PLUGIN_H__ #define __DBUS_PLUGIN_H__ -void xchat_remote (void); +void hexchat_remote (void); #endif /* __DBUS_PLUGIN_H__ */ diff --git a/src/common/dbus/dbus-plugin.c b/src/common/dbus/dbus-plugin.c index cba106a9..b62bfda5 100644 --- a/src/common/dbus/dbus-plugin.c +++ b/src/common/dbus/dbus-plugin.c @@ -1,4 +1,4 @@ -/* dbus-plugin.c - xchat plugin for remote access using D-Bus +/* dbus-plugin.c - hexchat plugin for remote access using D-Bus * Copyright (C) 2006 Claessens Xavier * * This program is free software; you can redistribute it and/or modify @@ -510,7 +510,7 @@ remote_object_get_prefs (RemoteObject *obj, *ret_type = 0; return TRUE; } - *ret_type = xchat_get_prefs (ph, name, &str, ret_int); + *ret_type = hexchat_get_prefs (ph, name, &str, ret_int); *ret_str = g_strdup (str); return TRUE; diff --git a/src/common/dbus/dbus-plugin.h b/src/common/dbus/dbus-plugin.h index bda8f61c..49dded9c 100644 --- a/src/common/dbus/dbus-plugin.h +++ b/src/common/dbus/dbus-plugin.h @@ -1,4 +1,4 @@ -/* dbus-plugin.c - xchat plugin for remote access using DBUS +/* dbus-plugin.c - hexchat plugin for remote access using DBUS * Copyright (C) 2006 Claessens Xavier * * This program is free software; you can redistribute it and/or modify @@ -22,7 +22,7 @@ #ifndef XCHAT_DBUS_PLUGIN_H #define XCHAT_DBUS_PLUGIN_H -int dbus_plugin_init (xchat_plugin *plugin_handle, +int dbus_plugin_init (hexchat_plugin *plugin_handle, char **plugin_name, char **plugin_desc, char **plugin_version, diff --git a/src/common/dbus/example.c b/src/common/dbus/example.c index 98f7fecc..1eebdfcf 100644 --- a/src/common/dbus/example.c +++ b/src/common/dbus/example.c @@ -73,7 +73,7 @@ test_command_cb (DBusGProxy *proxy, G_TYPE_INVALID, G_TYPE_INVALID)) { write_error ("Failed to complete unhook", &error); } - /* Now if you write "/test blah" again in the xchat window + /* Now if you write "/test blah" again in the HexChat window * you'll get a "Unknown command" error message */ g_print ("test command received: %s\n", word_eol[1]); if (!dbus_g_proxy_call (proxy, "Print", @@ -193,7 +193,7 @@ main (int argc, char **argv) G_CALLBACK (unload_cb), NULL, NULL); - /* Now you can write on the xchat windows: "/test arg1 arg2 ..." */ + /* Now you can write on the HexChat windows: "/test arg1 arg2 ..." */ mainloop = g_main_loop_new (NULL, FALSE); g_main_loop_run (mainloop); diff --git a/src/common/hexchat-plugin.h b/src/common/hexchat-plugin.h index f0b76ad6..bc2e5ed9 100644 --- a/src/common/hexchat-plugin.h +++ b/src/common/hexchat-plugin.h @@ -81,7 +81,7 @@ struct _hexchat_plugin 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); @@ -226,7 +226,7 @@ hexchat_get_info (hexchat_plugin *ph, const char *id); int -xchat_get_prefs (hexchat_plugin *ph, +hexchat_get_prefs (hexchat_plugin *ph, const char *name, const char **string, int *integer); @@ -345,7 +345,7 @@ hexchat_pluginpref_list (hexchat_plugin *ph, #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/src/common/plugin.c b/src/common/plugin.c index a3bf8dc2..7ccd15b5 100644 --- a/src/common/plugin.c +++ b/src/common/plugin.c @@ -262,7 +262,7 @@ plugin_add (session *sess, char *filename, void *handle, void *init_func, pl->hexchat_find_context = hexchat_find_context; pl->hexchat_get_context = hexchat_get_context; pl->hexchat_get_info = hexchat_get_info; - pl->xchat_get_prefs = xchat_get_prefs; + pl->hexchat_get_prefs = hexchat_get_prefs; pl->hexchat_list_get = hexchat_list_get; pl->hexchat_list_free = hexchat_list_free; pl->hexchat_list_fields = hexchat_list_fields; @@ -1137,7 +1137,7 @@ hexchat_get_info (hexchat_plugin *ph, const char *id) } int -xchat_get_prefs (hexchat_plugin *ph, const char *name, const char **string, int *integer) +hexchat_get_prefs (hexchat_plugin *ph, const char *name, const char **string, int *integer) { int i = 0; diff --git a/src/common/plugin.h b/src/common/plugin.h index e61b5111..52d82587 100644 --- a/src/common/plugin.h +++ b/src/common/plugin.h @@ -52,7 +52,7 @@ struct _hexchat_plugin 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); |