diff options
| -rw-r--r-- | src/common/dbus/example-gdbus.py | 51 | ||||
| -rw-r--r-- | src/common/dbus/example.py | 50 |
2 files changed, 27 insertions, 74 deletions
diff --git a/src/common/dbus/example-gdbus.py b/src/common/dbus/example-gdbus.py deleted file mode 100644 index 4f141034..00000000 --- a/src/common/dbus/example-gdbus.py +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/python - -# HexChat -# Copyright (C) 1998-2010 Peter Zelezny. -# Copyright (C) 2009-2013 Berke Viktor. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -# - -from gi.repository import Gio - -bus = Gio.bus_get_sync(Gio.BusType.SESSION, None) -connection = Gio.DBusProxy.new_sync(bus, Gio.DBusProxyFlags.NONE, None, - 'org.hexchat.service', '/org/hexchat/Remote', 'org.hexchat.connection', None) -path = connection.Connect('(ssss)', - 'example.py', - 'Python example', - 'Example of a D-Bus client written in python', - '1.0') -hexchat = Gio.DBusProxy.new_sync(bus, Gio.DBusProxyFlags.NONE, None, - 'org.hexchat.service', path, 'org.hexchat.plugin', None) - -# Note the type before every arguement, this must be done. -# Type requirements are listed in our docs and characters are listed in the dbus docs. -# s = string, u = uint, i = int, etc. - -channels = hexchat.ListGet ('(s)', "channels") -while hexchat.ListNext ('(u)', channels): - name = hexchat.ListStr ('(us)', channels, "channel") - print("------- " + name + " -------") - hexchat.SetContext ('(u)', hexchat.ListInt ('(us)', channels, "context")) - hexchat.EmitPrint ('(sas)', "Channel Message", ["John", "Hi there", "@"]) - users = hexchat.ListGet ('(s)', "users") - while hexchat.ListNext ('(u)', users): - print("Nick: " + hexchat.ListStr ('(us)', users, "nick")) - hexchat.ListFree ('(u)', users) -hexchat.ListFree ('(u)', channels) - -print(hexchat.Strip ('(sii)', "\00312Blue\003 \002Bold!\002", -1, 1|2)) diff --git a/src/common/dbus/example.py b/src/common/dbus/example.py index 4b94cd68..4f141034 100644 --- a/src/common/dbus/example.py +++ b/src/common/dbus/example.py @@ -1,4 +1,4 @@ -#! /usr/bin/python +#!/usr/bin/python # HexChat # Copyright (C) 1998-2010 Peter Zelezny. @@ -19,29 +19,33 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # -import dbus +from gi.repository import Gio -bus = dbus.SessionBus() -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.hexchat.service', path) -hexchat = dbus.Interface(proxy, 'org.hexchat.plugin') +bus = Gio.bus_get_sync(Gio.BusType.SESSION, None) +connection = Gio.DBusProxy.new_sync(bus, Gio.DBusProxyFlags.NONE, None, + 'org.hexchat.service', '/org/hexchat/Remote', 'org.hexchat.connection', None) +path = connection.Connect('(ssss)', + 'example.py', + 'Python example', + 'Example of a D-Bus client written in python', + '1.0') +hexchat = Gio.DBusProxy.new_sync(bus, Gio.DBusProxyFlags.NONE, None, + 'org.hexchat.service', path, 'org.hexchat.plugin', None) + +# Note the type before every arguement, this must be done. +# Type requirements are listed in our docs and characters are listed in the dbus docs. +# s = string, u = uint, i = int, etc. -channels = hexchat.ListGet ("channels") -while hexchat.ListNext (channels): - name = hexchat.ListStr (channels, "channel") +channels = hexchat.ListGet ('(s)', "channels") +while hexchat.ListNext ('(u)', channels): + name = hexchat.ListStr ('(us)', channels, "channel") print("------- " + name + " -------") - hexchat.SetContext (hexchat.ListInt (channels, "context")) - hexchat.EmitPrint ("Channel Message", ["John", "Hi there", "@"]) - users = hexchat.ListGet ("users") - while hexchat.ListNext (users): - print("Nick: " + hexchat.ListStr (users, "nick")) - hexchat.ListFree (users) -hexchat.ListFree (channels) - -print(hexchat.Strip ("\00312Blue\003 \002Bold!\002", -1, 1|2)) + hexchat.SetContext ('(u)', hexchat.ListInt ('(us)', channels, "context")) + hexchat.EmitPrint ('(sas)', "Channel Message", ["John", "Hi there", "@"]) + users = hexchat.ListGet ('(s)', "users") + while hexchat.ListNext ('(u)', users): + print("Nick: " + hexchat.ListStr ('(us)', users, "nick")) + hexchat.ListFree ('(u)', users) +hexchat.ListFree ('(u)', channels) +print(hexchat.Strip ('(sii)', "\00312Blue\003 \002Bold!\002", -1, 1|2)) |