dbus/python/examples example-signal-emitter.py, 1.8, 1.9 example-signal-recipient.py, 1.6, 1.7

[John Palmieri]

Update of /cvs/dbus/dbus/python/examples
In directory gabe:/tmp/cvs-serv10478/python/examples

Modified Files:
	example-signal-emitter.py example-signal-recipient.py 
Log Message:
* Merge DBUS_0_35_2 branch into HEAD

2005-07-17  John (J5) Palmieri  <johnp at redhat.com>

        * NEWS: Update to 0.35.2

2005-07-17  John (J5) Palmieri  <johnp at redhat.com>

        * python/_dbus.py: Remove import of the dbus.services
        module as it no longer exists (patch from Dimitur Kirov)

        * python/service.py (Object::__init__): Fixed typo
        s/name/bus_name (patch from Dimitur Kirov)

        * python/examples/example-signal-emitter.py: import dbus.glib
        to get the main loop and use glib mainloop instead of gtk so
        X doesn't have to be running.

        * python/examples/example-signal-recipient.py: import dbus.glib
        to get the main loop and use glib mainloop instead of gtk so
        X doesn't have to be running. Import the decorators module
        directly.

        * test/glib/Makefile.am:  Added DIST_EXTRA files that distcheck
        didn't pick up on but are needed to build

        * configure.in: upped version to 0.35.2

        * bus/driver.c, bus/selinux.c, bus/selinux.h, dbus/dbus-protocol.h:
        added Colin Walters' SELinux API rename patch from head
        s/unix sercurity context/selinux security context/

2005-07-16  John (J5) Palmieri  <johnp at redhat.com>

        * python/Makefile.am: dbus_binding.pxd.in should be included
        in EXTRA_DIST not dbus_binding.pxd
        fix up $(srcdir) hopefully for the last time

        * NEWS: Update to 0.35.1



Index: example-signal-emitter.py
===================================================================
RCS file: /cvs/dbus/dbus/python/examples/example-signal-emitter.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- example-signal-emitter.py	15 Jul 2005 18:09:59 -0000	1.8
+++ example-signal-emitter.py	17 Jul 2005 21:02:56 -0000	1.9
@@ -2,7 +2,8 @@
 
 import dbus
 import dbus.service
-import gtk
+import dbus.glib
+import gobject
 
 class TestObject(dbus.service.Object):
     def __init__(self, bus_name, object_path='/org/designfu/TestService/object'):
@@ -24,4 +25,5 @@
 name = dbus.service.BusName('org.designfu.TestService', bus=session_bus)
 object = TestObject(name)
 
-gtk.main()
+loop = gobject.MainLoop()
+loop.run()

Index: example-signal-recipient.py
===================================================================
RCS file: /cvs/dbus/dbus/python/examples/example-signal-recipient.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- example-signal-recipient.py	24 May 2005 16:30:51 -0000	1.6
+++ example-signal-recipient.py	17 Jul 2005 21:02:56 -0000	1.7
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 
-import gtk
 import dbus
+import dbus.decorators
+import dbus.glib
 import gobject
 
 def handle_reply(msg):
@@ -11,7 +12,7 @@
     print str(e)
 
 def emit_signal():
-   #call the emitHelloSignal method async
+   #call the emitHelloSignal method 
    object.emitHelloSignal(dbus_interface="org.designfu.TestService")
                           #reply_handler = handle_reply, error_handler = handle_error)
    return True
@@ -22,7 +23,7 @@
 def hello_signal_handler(hello_string):
     print ("Received signal and it says: " + hello_string)
 
- at dbus.explicitly_pass_message
+ at dbus.decorators.explicitly_pass_message
 def catchall_signal_handler(*args, **keywords):
     #The dbus.handler directive passes in the special __dbus_message__ variable
     dbus_message = keywords["dbus_message"]
@@ -33,7 +34,7 @@
 def catchall_hello_signals_handler(hello_string):
     print ("Received a hello signal and it says ") + hello_string
     
- at dbus.explicitly_pass_message
+ at dbus.decorators.explicitly_pass_message
 def catchall_testservice_interface_handler(hello_string, dbus_message):
     print "org.designfu.TestService interface says " + hello_string + " when it sent signal " + dbus_message.get_member()
 
@@ -48,5 +49,5 @@
 
 # Tell the remote object to emit the signal
 
-gtk.main()
-
+loop = gobject.MainLoop()
+loop.run()