From 746d9b542bb70764366e2dd406e74a60893aa192 Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Wed, 18 Jul 2012 15:18:43 +0200 Subject: Complete the rebranding of the D-Bus plugin --- hexchat.spec | 8 ++--- src/common/dbus/Makefile.am | 8 ++--- src/common/dbus/apps_hexchat_url_handler.schemas | 37 ++++++++++++++++++++++++ src/common/dbus/apps_xchat_url_handler.schemas | 37 ------------------------ src/common/dbus/dbus-client.c | 6 ++-- src/common/dbus/example.c | 8 ++--- src/common/dbus/example.py | 8 ++--- src/common/dbus/org.hexchat.service.service.in | 3 ++ src/common/dbus/org.xchat.service.service.in | 3 -- src/common/dbus/remote-object.xml | 4 +-- 10 files changed, 61 insertions(+), 61 deletions(-) create mode 100644 src/common/dbus/apps_hexchat_url_handler.schemas delete mode 100644 src/common/dbus/apps_xchat_url_handler.schemas create mode 100644 src/common/dbus/org.hexchat.service.service.in delete mode 100644 src/common/dbus/org.xchat.service.service.in 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/src/common/dbus/Makefile.am b/src/common/dbus/Makefile.am index 05ee9de6..15a3d136 100644 --- a/src/common/dbus/Makefile.am +++ b/src/common/dbus/Makefile.am @@ -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_hexchat_url_handler.schemas b/src/common/dbus/apps_hexchat_url_handler.schemas new file mode 100644 index 00000000..7a91657b --- /dev/null +++ b/src/common/dbus/apps_hexchat_url_handler.schemas @@ -0,0 +1,37 @@ + + + + /schemas/desktop/gnome/url-handlers/irc/command + /desktop/gnome/url-handlers/irc/command + hexchat + string + hexchat --existing --url=%u + + The handler for "irc://" URLs + + + + + /schemas/desktop/gnome/url-handlers/irc/enabled + /desktop/gnome/url-handlers/irc/enabled + hexchat + bool + true + + Set it at TRUE if you want it activated + + + + + /schemas/desktop/gnome/url-handlers/irc/needs_terminal + /desktop/gnome/url-handlers/irc/needs_terminal + hexchat + bool + false + + Run hexchat in a terminal? + + + + + diff --git a/src/common/dbus/apps_xchat_url_handler.schemas b/src/common/dbus/apps_xchat_url_handler.schemas deleted file mode 100644 index 10ac948d..00000000 --- a/src/common/dbus/apps_xchat_url_handler.schemas +++ /dev/null @@ -1,37 +0,0 @@ - - - - /schemas/desktop/gnome/url-handlers/irc/command - /desktop/gnome/url-handlers/irc/command - xchat - string - xchat --existing --url=%u - - The handler for "irc://" URLs - - - - - /schemas/desktop/gnome/url-handlers/irc/enabled - /desktop/gnome/url-handlers/irc/enabled - xchat - bool - true - - Set it at TRUE if you want it activated - - - - - /schemas/desktop/gnome/url-handlers/irc/needs_terminal - /desktop/gnome/url-handlers/irc/needs_terminal - xchat - bool - false - - Run xchat in a terminal? - - - - - 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 #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 @@ - + @@ -16,7 +16,7 @@ - + -- cgit 1.4.1