From ae97b7432232bc008e20e4696c512bcf69938dd8 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 10 Dec 2007 15:13:48 +0000
Subject: [PATCH] =?utf8?q?When=20user=20sets=20reply=5Fhandler=20but=20not?=
 =?utf8?q?=20error=5Fhandler=20raise=20MissingReplyHandlerException=20inst?=
 =?utf8?q?ead=20of=20MissingErrorHandlerException,=20and=20vice=20versa=20?=
 =?utf8?q?(fd.o=20#12304,=20patch=20from=20Ren=C3=A9=20Neumann)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 NEWS            | 5 ++++-
 dbus/proxies.py | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 5e43947..1889546 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,11 @@
-D-Bus Python Bindings 0.82.4 (unreleased)
+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/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')
-- 
2.11.4.GIT