Merge branch 'master' into purity

Conflicts:

	NEWS

5 files changed, 25 insertions, 6 deletions

diff --git a/Makefile.am b/Makefile.am
index 45fa47b..565633f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,6 +73,10 @@ TXT_RSTDOCS = doc/tutorial.txt doc/API_CHANGES.txt doc/HACKING.txt
 RSTDOCS = README NEWS TODO
 dist_doc_DATA = $(TXT_RSTDOCS) $(RSTDOCS)
 
+maintainer-upload:
+	rsync -tvpP --chmod=ugo=r $(DIST_ARCHIVES) $(DIST_ARCHIVES:%=%.asc) \
+	dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/releases/dbus-python/
+
 maintainer-update-website: _maintainer-update-apidocs \
 	_maintainer-update-htmldocs
 
@@ -136,4 +140,5 @@ endif
 
 .PHONY: cross-test-compile cross-test-server cross-test-client \
 	always-rebuild maintainer-update-website \
-	_maintainer-update-apidocs _maintainer-update-htmldocs
+	_maintainer-update-apidocs _maintainer-update-htmldocs \
+	maintainer-upload
diff --git a/NEWS b/NEWS
index cba6f16..b6fde56 100644
--- a/NEWS
+++ b/NEWS
@@ -14,11 +14,21 @@ Roadmap:
 * Implement message serialization and deserialization in pure Python
   (may need to be conditional on having dbus >= 1.1)
 
-D-Bus Python Bindings 0.82.4 (unreleased)
+D-Bus Python Bindings 0.82.5 (unreleased)
+=========================================
+
+Features:
+
+Fixes:
+
+D-Bus Python Bindings 0.82.4 (2007-12-10)
 =========================================
 
 Fixes:
 
+* supplying reply_handler but not error_handler raises
+  MissingReplyHandlerException instead of MissingErrorHandlerException,
+  and vice versa (fd.o #12304, patch from René Neumann)
 * Using non-recursive make for dbus/ directory should fix builds in some
   environments (fd.o #12741)
 
diff --git a/configure.ac b/configure.ac
index 79e21e2..614c034 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ m4_define(dbus_python_released, 0)
 dnl The dbus-python version number (must actually be numeric at the moment)
 m4_define(dbus_python_major_version, 0)
 m4_define(dbus_python_minor_version, 82)
-m4_define(dbus_python_micro_version, 3)
+m4_define(dbus_python_micro_version, 4)
 
 m4_define(dbus_python_maybe_datestamp,
           m4_esyscmd([if test x]dbus_python_released[ != x1; then date +.purity%Y%m%d | tr -d '\n\r'; fi]))
diff --git a/dbus/proxies.py b/dbus/proxies.py
index 15136ca..cbb5d53 100644
--- a/dbus/proxies.py
+++ b/dbus/proxies.py
@@ -105,9 +105,9 @@ class _ProxyMethod:
 
         if reply_handler is not None or error_handler is not None:
             if reply_handler is None:
-                raise MissingErrorHandlerException()
-            elif error_handler is None:
                 raise MissingReplyHandlerException()
+            elif error_handler is None:
+                raise MissingErrorHandlerException()
             elif ignore_reply:
                 raise TypeError('ignore_reply and reply_handler cannot be '
                                 'used together')
diff --git a/doc/tutorial.txt b/doc/tutorial.txt
index 4f04d45..73251cf 100644
--- a/doc/tutorial.txt
+++ b/doc/tutorial.txt
@@ -375,7 +375,11 @@ backwards-compatible code.
 The Qt main loop
 ~~~~~~~~~~~~~~~~
 
-FIXME: describe how to use the Qt event loop too (requires recent pyqt)
+PyQt v4.2 and later includes support for integrating dbus-python with
+the Qt event loop. To connect D-Bus to this main loop, call
+``dbus.mainloop.qt.DBusQtMainLoop`` instead of
+``dbus.mainloop.glib.DBusGMainLoop``. Otherwise the Qt loop is used in
+exactly the same way as the GLib loop.
 
 Making asynchronous calls
 -------------------------