Merge branch 'master' into purity

3 files changed, 9 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index b6fde56..de6b6fd 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,10 @@ Features:
 
 Fixes:
 
+* don't emit spurious Error messages if libdbus gives object-path handlers
+  a message that isn't a method call (most likely because of binding to a
+  locally emitted signal, as in fd.o #14199)
+
 D-Bus Python Bindings 0.82.4 (2007-12-10)
 =========================================
 
diff --git a/_dbus_bindings/conn-methods.c b/_dbus_bindings/conn-methods.c
index 7e3273c..a4a284a 100644
--- a/_dbus_bindings/conn-methods.c
+++ b/_dbus_bindings/conn-methods.c
@@ -73,6 +73,7 @@ _filter_message(DBusConnection *conn, DBusMessage *message, void *user_data)
         callable = PyList_GET_ITEM(conn_obj->filters, i);
         if (callable == user_data) {
             Py_INCREF(callable);
+            break;
         }
         else {
             callable = NULL;
diff --git a/dbus/service.py b/dbus/service.py
index 1d104b9..141d1a3 100644
--- a/dbus/service.py
+++ b/dbus/service.py
@@ -43,7 +43,7 @@ from dbus.decorators import method, signal
 from dbus.exceptions import DBusException, \
                             NameExistsException, \
                             UnknownMethodException
-from dbus.lowlevel import ErrorMessage, MethodReturnMessage
+from dbus.lowlevel import ErrorMessage, MethodReturnMessage, MethodCallMessage
 from dbus.proxies import LOCAL_PATH
 
 
@@ -637,6 +637,9 @@ class Object(Interface):
                      'on %r', self, path, connection)
 
     def _message_cb(self, connection, message):
+        if not isinstance(message, MethodCallMessage):
+            return
+
         try:
             # lookup candidate method and parent method
             method_name = message.get_member()