diff options
| -rw-r--r-- | .gitignore | 29 | ||||
| -rw-r--r-- | configure.in | 168 | ||||
| -rw-r--r-- | faq.html | 12 | ||||
| -rw-r--r-- | hexchat.spec | 8 | ||||
| -rw-r--r-- | plugins/Makefile.am | 10 | ||||
| -rw-r--r-- | plugins/checksum/Makefile.am | 9 | ||||
| -rw-r--r-- | plugins/checksum/checksum.c | 29 | ||||
| -rw-r--r-- | plugins/fishlim/Makefile | 40 | ||||
| -rw-r--r-- | plugins/fishlim/Makefile.am | 9 | ||||
| -rw-r--r-- | plugins/fishlim/keystore.c | 4 | ||||
| -rw-r--r-- | plugins/fishlim/plugin_xchat.c | 6 | ||||
| -rw-r--r-- | src/common/dbus/Makefile.am | 12 | ||||
| -rw-r--r-- | src/common/dbus/apps_hexchat_url_handler.schemas (renamed from src/common/dbus/apps_xchat_url_handler.schemas) | 10 | ||||
| -rw-r--r-- | src/common/dbus/dbus-client.c | 6 | ||||
| -rw-r--r-- | src/common/dbus/example.c | 8 | ||||
| -rw-r--r-- | src/common/dbus/example.py | 8 | ||||
| -rw-r--r-- | src/common/dbus/org.hexchat.service.service.in | 3 | ||||
| -rw-r--r-- | src/common/dbus/org.xchat.service.service.in | 3 | ||||
| -rw-r--r-- | src/common/dbus/remote-object.xml | 4 |
19 files changed, 226 insertions, 152 deletions
diff --git a/.gitignore b/.gitignore index 9a0cf619..8f2542c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,17 @@ -# git ignore file -*.user -plugins/wmpa/wmpa_h.h -plugins/wmpa/wmpa_i.c -src/pixmaps/inline_pngs.h -src/htm/obj/* -win32/build/* -win32/ipch/* -win32/hexchat.opensdf -win32/hexchat.sdf -win32/hexchat.suo -resource.h +# git ignore file +*.user +*.o +*.la +*.lo +*.gmo +*.po~ +plugins/wmpa/wmpa_h.h +plugins/wmpa/wmpa_i.c +src/pixmaps/inline_pngs.h +src/htm/obj/* +win32/build/* +win32/ipch/* +win32/hexchat.opensdf +win32/hexchat.sdf +win32/hexchat.suo +resource.h diff --git a/configure.in b/configure.in index 34f83f3d..c8b21be6 100644 --- a/configure.in +++ b/configure.in @@ -129,17 +129,25 @@ AC_ARG_ENABLE(tcl, [ --enable-tcl[=PATH] directory with Tcl config file: tclConfig.sh], tcl=$enableval, tcl=yes) -AC_ARG_ENABLE(sasl, -[ --disable-sasl disable the SASL plugin], - sasl=$enableval, sasl=yes) +AC_ARG_ENABLE(plugin, +[ --disable-plugin disable plugin support], + plugin=$enableval, plugin=yes) + +AC_ARG_ENABLE(checksum, +[ --disable-checksum disable the Checksum plugin], + checksum=$enableval, checksum=yes) AC_ARG_ENABLE(doat, [ --disable-doat disable the Do At plugin], doat=$enableval, doat=yes) -AC_ARG_ENABLE(plugin, -[ --disable-plugin disable plugin support], - plugin=$enableval, plugin=yes) +AC_ARG_ENABLE(fishlim, +[ --disable-fishlim disable the FiSHLiM plugin], + fishlim=$enableval, fishlim=yes) + +AC_ARG_ENABLE(sasl, +[ --disable-sasl disable the SASL plugin], + sasl=$enableval, sasl=yes) AC_ARG_ENABLE(dbus, [ --disable-dbus disable DBUS support], @@ -371,36 +379,6 @@ if test "$tcl" != "no"; then fi dnl ********************************************************************* -dnl ** SASL ************************************************************* -dnl ********************************************************************* - -if test "$sasl" != "no"; then -AC_MSG_CHECKING(for plugin interface used by SASL) - sasl=no - if test "$plugin" = yes; then - sasl=yes - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for SASL]) - fi -fi - -dnl ********************************************************************* -dnl ** DO AT ************************************************************ -dnl ********************************************************************* - -if test "$doat" != "no"; then -AC_MSG_CHECKING(for plugin interface used by Do At) - doat=no - if test "$plugin" = yes; then - doat=yes - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for Do At]) - fi -fi - -dnl ********************************************************************* dnl ** IPv6 ************************************************************* dnl ********************************************************************* @@ -521,6 +499,78 @@ if test "$plugin" = yes; then fi fi +dnl ********************************************************************* +dnl ** Checksum ********************************************************* +dnl ********************************************************************* + +if test "$checksum" != "no"; then + checksum=no + AC_MSG_CHECKING(for plugin interface used by Checksum) + if test "$plugin" = yes; then + AC_MSG_RESULT([yes]) + AC_MSG_CHECKING(for OpenSSL used by Checksum) + if test "$openssl" = yes; then + checksum=yes + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([OpenSSL cannot be found, use the --enable-openssl option]) + fi + else + AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option]) + fi +fi + +dnl ********************************************************************* +dnl ** DO AT ************************************************************ +dnl ********************************************************************* + +if test "$doat" != "no"; then + AC_MSG_CHECKING(for plugin interface used by Do At) + doat=no + if test "$plugin" = yes; then + doat=yes + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for Do At]) + fi +fi + +dnl ********************************************************************* +dnl ** FiSHLiM ********************************************************** +dnl ********************************************************************* + +if test "$fishlim" != "no"; then + fishlim=no + AC_MSG_CHECKING(for plugin interface used by FiSHLiM) + if test "$plugin" = yes; then + AC_MSG_RESULT([yes]) + AC_MSG_CHECKING(for OpenSSL used by FiSHLiM) + if test "$openssl" = yes; then + fishlim=yes + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([OpenSSL cannot be found, use the --enable-openssl option]) + fi + else + AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option]) + fi +fi + +dnl ********************************************************************* +dnl ** SASL ************************************************************* +dnl ********************************************************************* + +if test "$sasl" != "no"; then + AC_MSG_CHECKING(for plugin interface used by SASL) + sasl=no + if test "$plugin" = yes; then + sasl=yes + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for SASL]) + fi +fi + dnl ####################################################################### dnl # Check for DBUS libraries dnl ####################################################################### @@ -613,9 +663,11 @@ AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes") AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes") AM_CONDITIONAL(DO_PYTHON, test "x$python" = "xyes") AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes") -AM_CONDITIONAL(DO_SASL, test "x$sasl" = "xyes") -AM_CONDITIONAL(DO_DOAT, test "x$doat" = "xyes") AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes") +AM_CONDITIONAL(DO_CHECKSUM, test "x$checksum" = "xyes") +AM_CONDITIONAL(DO_DOAT, test "x$doat" = "xyes") +AM_CONDITIONAL(DO_FISHLIM, test "x$fishlim" = "xyes") +AM_CONDITIONAL(DO_SASL, test "x$sasl" = "xyes") AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes") AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno") @@ -877,8 +929,10 @@ plugins/Makefile plugins/python/Makefile plugins/perl/Makefile plugins/tcl/Makefile -plugins/sasl/Makefile +plugins/checksum/Makefile plugins/doat/Makefile +plugins/fishlim/Makefile +plugins/sasl/Makefile intl/Makefile po/Makefile.in ]) @@ -886,23 +940,33 @@ po/Makefile.in echo echo HexChat $VERSION echo -echo Building GTK+ Interface .... : $gtkfe -echo Building TEXT Interface .... : $textfe +echo GTK+ interface ........ : $gtkfe +echo Text interface ........ : $textfe echo -echo mmx tinting ......... : $mmx\ spelling .............. : $spell -echo XShm tinting ........ : $shm\ plugin interface ...... : $plugin +echo MMX tinting ........... : $mmx +echo XShm tinting .......... : $shm if test "$xft" = no; then - echo text backend ........ : pango\ nls/gettext ........... : $USE_NLS + echo Text backend .......... : Pango else - echo text backend ........ : xft\ nls/gettext ........... : $USE_NLS -fi -echo openssl support ..... : $openssl\ ipv6 support .......... : $ipv6 -echo dbus support ........ : $dbus\ msproxy ntlm \(ISA\) .... : $have_ntlm -echo libnotify support ... : $libnotify + echo Text backend .......... : Xft +fi +echo OpenSSL support ....... : $openssl +echo D-Bus support ......... : $dbus +echo libnotify support ..... : $libnotify +echo Spelling .............. : $spell +echo Plugin interface ...... : $plugin +echo NLS/gettext ........... : $USE_NLS +echo IPv6 support .......... : $ipv6 +echo MS Proxy NTLM \(ISA\) ... : $have_ntlm +echo +echo Perl .................. : $perl +echo Python ................ : $python +echo Tcl ................... : $tcl echo -echo Perl ................ : $perl\ SASL .................. : $sasl -echo Python .............. : $python\ Do At ................. : $doat -echo Tcl ................. : $tcl +echo Checksum .............. : $checksum +echo Do At ................. : $doat +echo FiSHLiM ............... : $fishlim +echo SASL .................. : $sasl echo echo The binary will be installed in $prefix/bin echo diff --git a/faq.html b/faq.html index 65a83d4e..0050fce2 100644 --- a/faq.html +++ b/faq.html @@ -82,6 +82,8 @@ p { margin: 3% } <br><br> <a href="#q225">25. Where did the Real Name field go?</a> <br><br> +<a href="#q226">26. How do I migrate my settings from XChat?</a> +<br><br> </p> <h2>3. Section Three: Contributions, Development and Bugs.</h2> @@ -522,6 +524,16 @@ the global real name, just issue the following command: /set irc_real_name Stewie Griffin </pre></blockquote> +<br><h3><a name="q226">26. How do I migrate my settings from XChat?</a></h3> +<p> +<u>UNIX:</u><br> + Copy <i>~/.xchat2</i> to <i>~/.config/hexchat</i><br /> + Rename <i>~/.config/hexchat/xchatlogs</i> to <i>~/.config/hexchat/logs</i> +<br><br><u>WINDOWS:</u><br> + Copy <i>%APPDATA%\X-Chat 2</i> to <i>%APPDATA%\HexChat</i><br /> + Rename <i>%APPDATA%\HexChat\xchatlogs</i> to <i>%APPDATA%\HexChat\logs</i> +</p> + <br><h2>3. Section Three: Contributions, Development and Bugs.</h2> <br><h3><a name="q31">1. Why does HexChat leak so much memory?</a></h3> diff --git a/hexchat.spec b/hexchat.spec index dfe8474e..f66719d2 100644 --- a/hexchat.spec +++ b/hexchat.spec @@ -103,19 +103,19 @@ EOF %post # Install schema export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule /etc/gconf/schemas/apps_xchat_url_handler.schemas >& /dev/null || : +gconftool-2 --makefile-install-rule /etc/gconf/schemas/apps_hexchat_url_handler.schemas >& /dev/null || : %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/apps_xchat_url_handler.schemas >& /dev/null || : + gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/apps_hexchat_url_handler.schemas >& /dev/null || : fi %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/apps_xchat_url_handler.schemas >& /dev/null || : + gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/apps_hexchat_url_handler.schemas >& /dev/null || : fi %clean @@ -132,7 +132,7 @@ fi %{_libdir}/hexchat/plugins/python.so %{_datadir}/applications/hexchat.desktop %{_datadir}/pixmaps/* -%{_sysconfdir}/gconf/schemas/apps_xchat_url_handler.schemas +%{_sysconfdir}/gconf/schemas/apps_hexchat_url_handler.schemas %{_datadir}/dbus-1/services/org.hexchat.service.service %files tcl diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 4ac35bce..53c59bf9 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -25,5 +25,13 @@ if DO_DOAT doatdir = doat endif +if DO_FISHLIM +fishlimdir = fishlim +endif + +if DO_CHECKSUM +checksumdir = checksum +endif + #SUBDIRS = . $(pythondir) $(perldir) mailcheck xdcc -SUBDIRS = . $(pythondir) $(perldir) $(tcldir) $(sasldir) $(doatdir) +SUBDIRS = . $(pythondir) $(perldir) $(tcldir) $(sasldir) $(doatdir) $(fishlimdir) $(checksumdir) diff --git a/plugins/checksum/Makefile.am b/plugins/checksum/Makefile.am new file mode 100644 index 00000000..747d5de4 --- /dev/null +++ b/plugins/checksum/Makefile.am @@ -0,0 +1,9 @@ +EXTRA_DIST = INSTALL LICENSE README + +libdir = $(hexchatlibdir)/plugins + +lib_LTLIBRARIES = checksum.la +checksum_la_SOURCES = checksum.c +checksum_la_LDFLAGS = -avoid-version -module +checksum_la_LIBADD = +INCLUDES = $(COMMON_CFLAGS) -I$(srcdir)/.. diff --git a/plugins/checksum/checksum.c b/plugins/checksum/checksum.c index 135764eb..f84eb243 100644 --- a/plugins/checksum/checksum.c +++ b/plugins/checksum/checksum.c @@ -22,28 +22,39 @@ #include <stdio.h> #include <string.h> +#include <stdlib.h> #include <malloc.h> #include <errno.h> #include <sys/types.h> -#include <sys/stat.h> #include <openssl/sha.h> +#include <glib.h> -#include "xchat-plugin.h" - -#define BUFSIZE 32768 -#define DEFAULT_LIMIT 256 /* default size is 256 MiB */ - +#ifdef WIN32 #ifndef snprintf #define snprintf _snprintf #endif #ifndef stat64 #define stat64 _stat64 #endif +#else +/* for INT_MAX */ +#include <limits.h> +#define __USE_LARGEFILE64 +#define _LARGEFILE_SOURCE +#define _LARGEFILE64_SOURCE +#endif + +#include <sys/stat.h> + +#include "xchat-plugin.h" + +#define BUFSIZE 32768 +#define DEFAULT_LIMIT 256 /* default size is 256 MiB */ static xchat_plugin *ph; /* plugin handle */ static const char name[] = "Checksum"; static const char desc[] = "Calculate checksum for DCC file transfers"; -static const char version[] = "3.0"; +static const char version[] = "3.1"; /* Use of OpenSSL SHA256 interface: http://adamlamers.com/?p=5 */ static void @@ -217,11 +228,11 @@ dccoffer_cb (char *word[], void *userdata) static void checksum (char *word[], void *userdata) { - if (!stricmp ("GET", word[2])) + if (!g_ascii_strcasecmp ("GET", word[2])) { print_limit (); } - else if (!stricmp ("SET", word[2])) + else if (!g_ascii_strcasecmp ("SET", word[2])) { set_limit (word[3]); } diff --git a/plugins/fishlim/Makefile b/plugins/fishlim/Makefile deleted file mode 100644 index 3f0e93d2..00000000 --- a/plugins/fishlim/Makefile +++ /dev/null @@ -1,40 +0,0 @@ - -OURCFLAGS = -Wall -Wextra -Wno-unused-parameter -std=c99 -pedantic `pkg-config --cflags glib-2.0 libcrypto` -DG_DISABLE_DEPRECATED=1 -fPIC $(CFLAGS) -#OURLINKFLAGS = `pkg-config --libs glib-2.0 libcrypto` -shared -fPIC -Wl,-z,defs $(CFLAGS) $(LDFLAGS) -OURLINKFLAGS = `pkg-config --libs glib-2.0 libcrypto` $(CFLAGS) $(LDFLAGS) - -BASE_OBJECTS = irc.o fish.o keystore.o misc.o -PLUGIN_OBJECTS = $(BASE_OBJECTS) plugin_xchat.o -TEST_OBJECTS = $(BASE_OBJECTS) test.o - -all: fishlim.so test - -fish.o: fish.h keystore.h misc.h -irc.o: irc.h -keystore.o: keystore.h irc.h fish.h misc.h plugin_xchat.h -misc.o: misc.h -test.o: fish.h -plugin_xchat.o: fish.h irc.h keystore.h plugin_xchat.h - -.c.o: - $(CC) $(OURCFLAGS) -c $< -o $@ - -fishlim.so: $(PLUGIN_OBJECTS) - $(CC) -shared $(OURLINKFLAGS) $(PLUGIN_OBJECTS) -o $@ - -test: $(TEST_OBJECTS) - $(CC) $(TEST_OBJECTS) -o $@ $(OURLINKFLAGS) - - -.PHONY: all clean distclean install uninstall -clean: - -$(RM) -f $(PLUGIN_OBJECTS) $(TEST_OBJECTS) fishlim.so test -distclean: clean - -install: fishlim.so - install -d $(DESTDIR)/usr/lib/xchat/plugins/ - install -m 644 fishlim.so $(DESTDIR)/usr/lib/xchat/plugins/ -uninstall: - rm $(DESTDIR)/usr/lib/xchat/plugins/fishlim.so - - diff --git a/plugins/fishlim/Makefile.am b/plugins/fishlim/Makefile.am new file mode 100644 index 00000000..951af6cd --- /dev/null +++ b/plugins/fishlim/Makefile.am @@ -0,0 +1,9 @@ +EXTRA_DIST = INSTALL LICENSE README + +libdir = $(hexchatlibdir)/plugins + +lib_LTLIBRARIES = fishlim.la +fishlim_la_SOURCES = fish.c irc.c keystore.c misc.c plugin_xchat.c +fishlim_la_LDFLAGS = -avoid-version -module +fishlim_la_LIBADD = +INCLUDES = $(COMMON_CFLAGS) -I$(srcdir)/.. diff --git a/plugins/fishlim/keystore.c b/plugins/fishlim/keystore.c index e628c289..0e211958 100644 --- a/plugins/fishlim/keystore.c +++ b/plugins/fishlim/keystore.c @@ -36,7 +36,7 @@ static char *keystore_password = NULL; /** - * Opens the key store file: ~/.xchat2/blow.ini + * Opens the key store file: ~/.config/hexchat/plugin_fishlim.conf */ static GKeyFile *getConfigFile() { gchar *filename = get_config_filename(); @@ -63,7 +63,7 @@ static const char *get_keystore_password() { /** - * Gets a value for a nick/channel from blow.ini. Unlike + * Gets a value for a nick/channel from plugin_fishlim.conf. Unlike * g_key_file_get_string, this function is case insensitive. */ static gchar *get_nick_value(GKeyFile *keyfile, const char *nick, const char *item) { diff --git a/plugins/fishlim/plugin_xchat.c b/plugins/fishlim/plugin_xchat.c index 5e261116..eb2784d3 100644 --- a/plugins/fishlim/plugin_xchat.c +++ b/plugins/fishlim/plugin_xchat.c @@ -27,11 +27,7 @@ #include <string.h> // #pragma GCC visibility push(default) -#ifdef _MSC_VER #include "xchat-plugin.h" -#else -#include <xchat/xchat-plugin.h> -#endif #define XCHAT_MAX_WORDS 32 // #pragma GCC visibility pop @@ -56,7 +52,7 @@ static xchat_plugin *ph; * Returns the path to the key store file. */ gchar *get_config_filename() { - return g_build_filename(xchat_get_info(ph, "xchatdirfs"), "blow.ini", NULL); + return g_build_filename(xchat_get_info(ph, "xchatdirfs"), "plugin_fishlim.conf", NULL); } /** diff --git a/src/common/dbus/Makefile.am b/src/common/dbus/Makefile.am index 05ee9de6..46940442 100644 --- a/src/common/dbus/Makefile.am +++ b/src/common/dbus/Makefile.am @@ -1,5 +1,5 @@ -noinst_LIBRARIES = libxchatdbus.a -libxchatdbus_a_SOURCES = \ +noinst_LIBRARIES = libhexchatdbus.a +libhexchatdbus_a_SOURCES = \ dbus-plugin.c \ dbus-plugin.h \ dbus-client.c \ @@ -7,10 +7,10 @@ libxchatdbus_a_SOURCES = \ EXTRA_DIST = \ remote-object.xml \ - apps_xchat_url_handler.schemas \ + apps_hexchat_url_handler.schemas \ marshallers.list \ example.py \ - org.xchat.service.service.in \ + org.hexchat.service.service.in \ README BUILT_SOURCES = \ @@ -33,7 +33,7 @@ marshallers.h: marshallers.list # Dbus service file servicedir = $(DBUS_SERVICES_DIR) -service_in_files = org.xchat.service.service.in +service_in_files = org.hexchat.service.service.in service_DATA = $(service_in_files:.service.in=.service) # Rule to make the service file with bindir expanded @@ -44,7 +44,7 @@ if DO_GCONF GCONF_SCHEMA_CONFIG_SOURCE = `$(GCONFTOOL) --get-default-source` GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_DATA = apps_xchat_url_handler.schemas +schema_DATA = apps_hexchat_url_handler.schemas install-data-local: if test -z "$(DESTDIR)" ; then \ for p in $(schema_DATA) ; do \ diff --git a/src/common/dbus/apps_xchat_url_handler.schemas b/src/common/dbus/apps_hexchat_url_handler.schemas index 10ac948d..7a91657b 100644 --- a/src/common/dbus/apps_xchat_url_handler.schemas +++ b/src/common/dbus/apps_hexchat_url_handler.schemas @@ -3,9 +3,9 @@ <schema> <key>/schemas/desktop/gnome/url-handlers/irc/command</key> <applyto>/desktop/gnome/url-handlers/irc/command</applyto> - <owner>xchat</owner> + <owner>hexchat</owner> <type>string</type> - <default>xchat --existing --url=%u</default> + <default>hexchat --existing --url=%u</default> <locale name="C"> <short>The handler for "irc://" URLs</short> </locale> @@ -14,7 +14,7 @@ <schema> <key>/schemas/desktop/gnome/url-handlers/irc/enabled</key> <applyto>/desktop/gnome/url-handlers/irc/enabled</applyto> - <owner>xchat</owner> + <owner>hexchat</owner> <type>bool</type> <default>true</default> <locale name="C"> @@ -25,11 +25,11 @@ <schema> <key>/schemas/desktop/gnome/url-handlers/irc/needs_terminal</key> <applyto>/desktop/gnome/url-handlers/irc/needs_terminal</applyto> - <owner>xchat</owner> + <owner>hexchat</owner> <type>bool</type> <default>false</default> <locale name="C"> - <short>Run xchat in a terminal?</short> + <short>Run hexchat in a terminal?</short> </locale> </schema> diff --git a/src/common/dbus/dbus-client.c b/src/common/dbus/dbus-client.c index ac6bf6dc..c11db6dd 100644 --- a/src/common/dbus/dbus-client.c +++ b/src/common/dbus/dbus-client.c @@ -24,9 +24,9 @@ #include "../xchat.h" #include "../xchatc.h" -#define DBUS_SERVICE "org.xchat.service" -#define DBUS_REMOTE "/org/xchat/Remote" -#define DBUS_REMOTE_INTERFACE "org.xchat.plugin" +#define DBUS_SERVICE "org.hexchat.service" +#define DBUS_REMOTE "/org/hexchat/Remote" +#define DBUS_REMOTE_INTERFACE "org.hexchat.plugin" static void write_error (char *message, diff --git a/src/common/dbus/example.c b/src/common/dbus/example.c index 1d072785..98f7fecc 100644 --- a/src/common/dbus/example.c +++ b/src/common/dbus/example.c @@ -24,10 +24,10 @@ #include <stdlib.h> #include "marshallers.h" -#define DBUS_SERVICE "org.xchat.service" -#define DBUS_REMOTE "/org/xchat/Remote" -#define DBUS_REMOTE_CONNECTION_INTERFACE "org.xchat.connection" -#define DBUS_REMOTE_PLUGIN_INTERFACE "org.xchat.plugin" +#define DBUS_SERVICE "org.hexchat.service" +#define DBUS_REMOTE "/org/hexchat/Remote" +#define DBUS_REMOTE_CONNECTION_INTERFACE "org.hexchat.connection" +#define DBUS_REMOTE_PLUGIN_INTERFACE "org.hexchat.plugin" guint command_id; guint server_id; diff --git a/src/common/dbus/example.py b/src/common/dbus/example.py index 08bfdac3..01156806 100644 --- a/src/common/dbus/example.py +++ b/src/common/dbus/example.py @@ -3,14 +3,14 @@ import dbus bus = dbus.SessionBus() -proxy = bus.get_object('org.xchat.service', '/org/xchat/Remote') -remote = dbus.Interface(proxy, 'org.xchat.connection') +proxy = bus.get_object('org.hexchat.service', '/org/hexchat/Remote') +remote = dbus.Interface(proxy, 'org.hexchat.connection') path = remote.Connect ("example.py", "Python example", "Example of a D-Bus client written in python", "1.0") -proxy = bus.get_object('org.xchat.service', path) -xchat = dbus.Interface(proxy, 'org.xchat.plugin') +proxy = bus.get_object('org.hexchat.service', path) +xchat = dbus.Interface(proxy, 'org.hexchat.plugin') channels = xchat.ListGet ("channels") while xchat.ListNext (channels): diff --git a/src/common/dbus/org.hexchat.service.service.in b/src/common/dbus/org.hexchat.service.service.in new file mode 100644 index 00000000..eda29be1 --- /dev/null +++ b/src/common/dbus/org.hexchat.service.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.hexchat.service +Exec=@bindir@/hexchat diff --git a/src/common/dbus/org.xchat.service.service.in b/src/common/dbus/org.xchat.service.service.in deleted file mode 100644 index 19490121..00000000 --- a/src/common/dbus/org.xchat.service.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.xchat.service -Exec=@bindir@/xchat diff --git a/src/common/dbus/remote-object.xml b/src/common/dbus/remote-object.xml index 88a8ae7c..1b80f0e7 100644 --- a/src/common/dbus/remote-object.xml +++ b/src/common/dbus/remote-object.xml @@ -2,7 +2,7 @@ <node name="/"> - <interface name="org.xchat.connection"> + <interface name="org.hexchat.connection"> <method name="Connect"> <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> <arg type="s" name="filename" direction="in"/> @@ -16,7 +16,7 @@ </method> </interface> - <interface name="org.xchat.plugin"> + <interface name="org.hexchat.plugin"> <method name="Command"> <arg type="s" name="command" direction="in"/> </method> |