SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Complete the rebranding of the D-Bus plugin

This commit is contained in:
Berke Viktor 2012-07-18 15:18:43 +02:00
parent 1b0c07f8ea
commit 746d9b542b
9 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hexchat.spec
View File

@ -103,19 +103,19 @@ EOF
%post %post
# Install schema # Install schema
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` 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 %pre
if [ "$1" -gt 1 ]; then if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` 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 fi
%preun %preun
if [ "$1" -eq 0 ]; then if [ "$1" -eq 0 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` 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 fi
%clean %clean
@ -132,7 +132,7 @@ fi
%{_libdir}/hexchat/plugins/python.so %{_libdir}/hexchat/plugins/python.so
%{_datadir}/applications/hexchat.desktop %{_datadir}/applications/hexchat.desktop
%{_datadir}/pixmaps/* %{_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 %{_datadir}/dbus-1/services/org.hexchat.service.service
%files tcl %files tcl

8
src/common/dbus/Makefile.am
View File

@ -7,10 +7,10 @@ libxchatdbus_a_SOURCES = \
EXTRA_DIST = \ EXTRA_DIST = \
remote-object.xml \ remote-object.xml \
apps_xchat_url_handler.schemas \ apps_hexchat_url_handler.schemas \
marshallers.list \ marshallers.list \
example.py \ example.py \
org.xchat.service.service.in \ org.hexchat.service.service.in \
README README
BUILT_SOURCES = \ BUILT_SOURCES = \
@ -33,7 +33,7 @@ marshallers.h: marshallers.list
# Dbus service file # Dbus service file
servicedir = $(DBUS_SERVICES_DIR) 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) service_DATA = $(service_in_files:.service.in=.service)
# Rule to make the service file with bindir expanded # 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_CONFIG_SOURCE = `$(GCONFTOOL) --get-default-source`
GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas
schemadir = $(GCONF_SCHEMA_FILE_DIR) schemadir = $(GCONF_SCHEMA_FILE_DIR)
schema_DATA = apps_xchat_url_handler.schemas schema_DATA = apps_hexchat_url_handler.schemas
install-data-local: install-data-local:
if test -z "$(DESTDIR)" ; then \ if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \ for p in $(schema_DATA) ; do \

10
src/common/dbus/apps_xchat_url_handler.schemas → src/common/dbus/apps_hexchat_url_handler.schemas
View File

@ -3,9 +3,9 @@
<schema> <schema>
<key>/schemas/desktop/gnome/url-handlers/irc/command</key> <key>/schemas/desktop/gnome/url-handlers/irc/command</key>
<applyto>/desktop/gnome/url-handlers/irc/command</applyto> <applyto>/desktop/gnome/url-handlers/irc/command</applyto>
<owner>xchat</owner> <owner>hexchat</owner>
<type>string</type> <type>string</type>
<default>xchat --existing --url=%u</default> <default>hexchat --existing --url=%u</default>
<locale name="C"> <locale name="C">
<short>The handler for "irc://" URLs</short> <short>The handler for "irc://" URLs</short>
</locale> </locale>
@ -14,7 +14,7 @@
<schema> <schema>
<key>/schemas/desktop/gnome/url-handlers/irc/enabled</key> <key>/schemas/desktop/gnome/url-handlers/irc/enabled</key>
<applyto>/desktop/gnome/url-handlers/irc/enabled</applyto> <applyto>/desktop/gnome/url-handlers/irc/enabled</applyto>
<owner>xchat</owner> <owner>hexchat</owner>
<type>bool</type> <type>bool</type>
<default>true</default> <default>true</default>
<locale name="C"> <locale name="C">
@ -25,11 +25,11 @@
<schema> <schema>
<key>/schemas/desktop/gnome/url-handlers/irc/needs_terminal</key> <key>/schemas/desktop/gnome/url-handlers/irc/needs_terminal</key>
<applyto>/desktop/gnome/url-handlers/irc/needs_terminal</applyto> <applyto>/desktop/gnome/url-handlers/irc/needs_terminal</applyto>
<owner>xchat</owner> <owner>hexchat</owner>
<type>bool</type> <type>bool</type>
<default>false</default> <default>false</default>
<locale name="C"> <locale name="C">
<short>Run xchat in a terminal?</short> <short>Run hexchat in a terminal?</short>
</locale> </locale>
</schema> </schema>

6
src/common/dbus/dbus-client.c
View File

@ -24,9 +24,9 @@
#include "../xchat.h" #include "../xchat.h"
#include "../xchatc.h" #include "../xchatc.h"
#define DBUS_SERVICE "org.xchat.service" #define DBUS_SERVICE "org.hexchat.service"
#define DBUS_REMOTE "/org/xchat/Remote" #define DBUS_REMOTE "/org/hexchat/Remote"
#define DBUS_REMOTE_INTERFACE "org.xchat.plugin" #define DBUS_REMOTE_INTERFACE "org.hexchat.plugin"
static void static void
write_error (char *message, write_error (char *message,

8
src/common/dbus/example.c
View File

@ -24,10 +24,10 @@
#include <stdlib.h> #include <stdlib.h>
#include "marshallers.h" #include "marshallers.h"
#define DBUS_SERVICE "org.xchat.service" #define DBUS_SERVICE "org.hexchat.service"
#define DBUS_REMOTE "/org/xchat/Remote" #define DBUS_REMOTE "/org/hexchat/Remote"
#define DBUS_REMOTE_CONNECTION_INTERFACE "org.xchat.connection" #define DBUS_REMOTE_CONNECTION_INTERFACE "org.hexchat.connection"
#define DBUS_REMOTE_PLUGIN_INTERFACE "org.xchat.plugin" #define DBUS_REMOTE_PLUGIN_INTERFACE "org.hexchat.plugin"
guint command_id; guint command_id;
guint server_id; guint server_id;

8
src/common/dbus/example.py
View File

@ -3,14 +3,14 @@
import dbus import dbus
bus = dbus.SessionBus() bus = dbus.SessionBus()
proxy = bus.get_object('org.xchat.service', '/org/xchat/Remote') proxy = bus.get_object('org.hexchat.service', '/org/hexchat/Remote')
remote = dbus.Interface(proxy, 'org.xchat.connection') remote = dbus.Interface(proxy, 'org.hexchat.connection')
path = remote.Connect ("example.py", path = remote.Connect ("example.py",
"Python example", "Python example",
"Example of a D-Bus client written in python", "Example of a D-Bus client written in python",
"1.0") "1.0")
proxy = bus.get_object('org.xchat.service', path) proxy = bus.get_object('org.hexchat.service', path)
xchat = dbus.Interface(proxy, 'org.xchat.plugin') xchat = dbus.Interface(proxy, 'org.hexchat.plugin')
channels = xchat.ListGet ("channels") channels = xchat.ListGet ("channels")
while xchat.ListNext (channels): while xchat.ListNext (channels):

3
src/common/dbus/org.hexchat.service.service.in Normal file
View File

@ -0,0 +1,3 @@
[D-BUS Service]
Name=org.hexchat.service
Exec=@bindir@/hexchat

3
src/common/dbus/org.xchat.service.service.in
View File

@ -1,3 +0,0 @@
[D-BUS Service]
Name=org.xchat.service
Exec=@bindir@/xchat

4
src/common/dbus/remote-object.xml
View File

@ -2,7 +2,7 @@
<node name="/"> <node name="/">
<interface name="org.xchat.connection"> <interface name="org.hexchat.connection">
<method name="Connect"> <method name="Connect">
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/> <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
<arg type="s" name="filename" direction="in"/> <arg type="s" name="filename" direction="in"/>
@ -16,7 +16,7 @@
</method> </method>
</interface> </interface>
<interface name="org.xchat.plugin"> <interface name="org.hexchat.plugin">
<method name="Command"> <method name="Command">
<arg type="s" name="command" direction="in"/> <arg type="s" name="command" direction="in"/>
</method> </method>