From 6fbd1c7ff5b1023f543a304db4f76fc6eeb4dbd5 Mon Sep 17 00:00:00 2001 From: Robert McQueen Date: Sat, 29 Oct 2005 22:04:01 +0000 Subject: 2005-10-29 Robert McQueen * python/dbus_bindings.pyx: Tweak 'raise AssertionError' to assert(). Add checking for the end of struct character when marshalling a struct in MessageIter.append_strict. * python/examples/example-service.py, python/examples/gconf-proxy-service.py, python/examples/gconf-proxy-service2.py: Update to use gobject mainloop directly rather than appearing to depend on gtk. * python/test/test-client.py, python/test/test-server.py: Remove obsolete and broken test scripts for old bindings. We have up to date and working tests in test/python/. --- python/examples/example-service.py | 6 +++--- python/examples/gconf-proxy-service.py | 5 +++-- python/examples/gconf-proxy-service2.py | 5 +++-- 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'python/examples') diff --git a/python/examples/example-service.py b/python/examples/example-service.py index ce871a1f..cb25d203 100644 --- a/python/examples/example-service.py +++ b/python/examples/example-service.py @@ -3,8 +3,7 @@ import dbus import dbus.service import dbus.glib -import pygtk -import gtk +import gobject class SomeObject(dbus.service.Object): def __init__(self, bus_name, object_path="/SomeObject"): @@ -27,4 +26,5 @@ session_bus = dbus.SessionBus() name = dbus.service.BusName("org.designfu.SampleService", bus=session_bus) object = SomeObject(name) -gtk.main() +mainloop = gobject.MainLoop() +mainloop.run() diff --git a/python/examples/gconf-proxy-service.py b/python/examples/gconf-proxy-service.py index b9bdef14..a899cf21 100644 --- a/python/examples/gconf-proxy-service.py +++ b/python/examples/gconf-proxy-service.py @@ -2,7 +2,7 @@ #FIXME: Doesn't work with the new bindings import dbus -import gtk +import gobject import gconf class GConfService(dbus.Service): @@ -39,4 +39,5 @@ gconf_service = GConfService() print ("GConf Proxy service started.") print ("Run 'gconf-proxy-client.py' to fetch a GConf key through the proxy...") -gtk.main() +mainloop = gobject.MainLoop() +mainloop.run() diff --git a/python/examples/gconf-proxy-service2.py b/python/examples/gconf-proxy-service2.py index ba8d249b..5731ab28 100644 --- a/python/examples/gconf-proxy-service2.py +++ b/python/examples/gconf-proxy-service2.py @@ -2,7 +2,7 @@ #FIXME: doesn't work with the new bindings import dbus -import gtk +import gobject import gconf class GConfService(dbus.Service): @@ -35,4 +35,5 @@ gconf_service = GConfService() print ("GConf Proxy service started.") print ("Run 'gconf-proxy-client.py' to fetch a GConf key through the proxy...") -gtk.main() +mainloop = gobject.MainLoop() +mainloop.run() -- cgit