Update docs, s/GObject.MainLoop/GLib.MainLoop/

Author: LEW21

README.rst

@@ -7,13 +7,17 @@ pydbus
 
 Pythonic DBus library.
 
-It's based on PyGI_, the Python GObject Introspection bindings, which is the recommended way to use GLib from Python. Unfortunately, PyGI is not packaged on pypi, so you need to install it from your distribution's repository (usually called python-gi, python-gobject or pygobject3).
-
-It's pythonic!
+Changelog: https://github.com/LEW21/pydbus/releases
 
-And now, it can also publish objects! However, publication support requires GLib 2.46 or newer.
+Requirements
+------------
+* Python 2.7+ - but works best on 3.4+ (help system is nicer there)
+* PyGI_ (not packaged on pypi, you need to install it from your distribution's repository - it's usually called python-gi, python-gobject or pygobject)
+* GLib_ 2.46+ and girepository_ 1.46+ (Ubuntu 16.04+) - for object publication support
 
-Changelog: https://github.com/LEW21/pydbus/releases
+.. _PyGI: https://wiki.gnome.org/Projects/PyGObject
+.. _GLib: https://developer.gnome.org/glib/
+.. _girepository: https://wiki.gnome.org/Projects/GObjectIntrospection
 
 Examples
 --------
@@ -46,18 +50,18 @@ Watch for new systemd jobs
 .. code-block:: python
 
 	from pydbus import SystemBus
-	from gi.repository import GObject
+	from gi.repository import GLib
 
 	bus = SystemBus()
 	systemd = bus.get(".systemd1")
 
 	systemd.JobNew.connect(print)
-	GObject.MainLoop().run()
+	GLib.MainLoop().run()
 
 	# or
 
 	systemd.onJobNew = print
-	GObject.MainLoop().run()
+	GLib.MainLoop().run()
 
 View object's API
 ~~~~~~~~~~~~~~~~~
@@ -75,7 +79,6 @@ More examples & documentation
 
 The Tutorial_ contains more examples and docs.
 
-.. _PyGI: https://wiki.gnome.org/PyGObject
 .. _Tutorial: https://github.com/LEW21/pydbus/blob/master/doc/tutorial.rst
 
 Copyright Information

doc/tutorial.rst

@@ -2,14 +2,14 @@
 pydbus tutorial
 ===============
 
-:Author: `Janusz Lewandowski`_
+:Author: `Linus Lewandowski`_
 :Based on: python-dbus tutorial by Simon McVittie, `Collabora Ltd.`_ (2006-06-14)
-:Date: 2016-04-08
+:Date: 2016-09-26
 
 .. _`Collabora Ltd.`: http://www.collabora.co.uk/
-.. _`Janusz Lewandowski`: http://lew21.net/
+.. _`Linus Lewandowski`: http://lew21.net/
 
-This tutorial requires Python 2.7 or up, and ``pydbus`` 0.5 or up.
+This tutorial requires Python 2.7 or up, and ``pydbus`` 0.6 or up.
 
 .. contents::
 
@@ -86,13 +86,16 @@ Setting up an event loop
 
 To handle signals emitted by exported objects, or to export your own objects, you need to setup an event loop.
 
-The only main loop supported by ``pydbus`` is GLib's GObject.MainLoop.
+The only main loop supported by ``pydbus`` is GLib.MainLoop.
+
+GLib.MainLoop
+-------------
 
 To create the loop object use::
 
-    from gi.repository import GObject
+    from gi.repository import GLib
 
-    loop = GObject.MainLoop()
+    loop = GLib.MainLoop()
 
 To execute the loop use::
 
@@ -315,7 +318,7 @@ See also
 
 See the example in ``pydbus/examples/clientserver/server.py``.
 
-.. _bus.own_name:
+.. _bus.request_name:
 .. _bus.register_object:
 
 Lower level API
@@ -324,8 +327,8 @@ Lower level API
 Sometimes, you can't just publish everything in one call, you need more control
 over the process of binding a name and exporting single objects.
 
-In this case, you can use ``bus.own_name()`` and ``bus.register_object()`` yourself.
-See ``help(bus.own_name)`` and ``help(bus.register_object)`` for details.
+In this case, you can use ``bus.request_name()`` and ``bus.register_object()`` yourself.
+See ``help(bus.request_name)`` and ``help(bus.register_object)`` for details.
 
 .. --------------------------------------------------------------------
 
@@ -380,7 +383,7 @@ License for this document
 
 Copyright 2006-2007 `Collabora Ltd.`_
 
-Copyright 2016 `Janusz Lewandowski`_
+Copyright 2016 `Linus Lewandowski`_
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

pydbus/bus_names.py

@@ -28,8 +28,8 @@ def own_name(self, name, flags=0, name_aquired=None, name_lost=None):
 		Starts acquiring name on the bus specified by bus_type and calls
 		name_acquired and name_lost when the name is acquired respectively lost.
 
-		To receive name_aquired and name_lost callbacks, you need GLib main loop.
-		You can execute it with GObject.MainLoop().run().
+		To receive name_aquired and name_lost callbacks, you need an event loop.
+		https://github.com/LEW21/pydbus/blob/master/doc/tutorial.rst#setting-up-an-event-loop
 
 		Parameters
 		----------
@@ -68,8 +68,8 @@ def watch_name(self, name, flags=0, name_appeared=None, name_vanished=None):
 		name_appeared and name_vanished when the name is known to have a owner
 		respectively known to lose its owner.
 
-		To receive name_appeared and name_vanished callbacks, you need GLib main loop.
-		You can execute it with GObject.MainLoop().run().
+		To receive name_appeared and name_vanished callbacks, you need an event loop.
+		https://github.com/LEW21/pydbus/blob/master/doc/tutorial.rst#setting-up-an-event-loop
 
 		Parameters
 		----------

pydbus/examples/clientserver/server.py

@@ -5,10 +5,10 @@
 # Python DBUS Test Server
 # runs until the Quit() method is called via DBUS
 
-from gi.repository import GObject
+from gi.repository import GLib
 from pydbus import SessionBus
 
-loop = GObject.MainLoop()
+loop = GLib.MainLoop()
 
 class MyDBUSService(object):
 	"""

pydbus/examples/polkit/service.py

@@ -1,8 +1,8 @@
 from pydbus import SystemBus
-from gi.repository import GObject
+from gi.repository import GLib
 import logging
 
-loop = GObject.MainLoop()
+loop = GLib.MainLoop()
 
 class TestObject(object):
 	dbus = '''

pydbus/proxy_method.py

@@ -1,4 +1,4 @@
-from gi.repository import GLib, GObject
+from gi.repository import GLib
 from .generic import bound_method
 from .identifier import filter_identifier
 from .timeout import timeout_to_glib

pydbus/subscription.py

@@ -19,8 +19,8 @@ def subscribe(self, sender=None, iface=None, signal=None, object=None, arg0=None
 		Subscribes to signals on connection and invokes signal_fired callback
 		whenever the signal is received.
 
-		To receive signal_fired callback, you need GLib main loop.
-		You can execute it with GObject.MainLoop().run().
+		To receive signal_fired callback, you need an event loop.
+		https://github.com/LEW21/pydbus/blob/master/doc/tutorial.rst#setting-up-an-event-loop
 
 		Parameters
 		----------

pydbus/tests/gnome_music.py

@@ -1,10 +1,10 @@
 from __future__ import print_function
 from pydbus import SessionBus
-from gi.repository import GObject, GLib
+from gi.repository import GLib
 import subprocess
 from time import sleep
 
-loop = GObject.MainLoop()
+loop = GLib.MainLoop()
 
 subprocess.Popen("gnome-music")
 sleep(5)