fix bug in disconnected handling

2 files changed, 7 insertions, 0 deletions

diff --git a/changelog b/changelog
index c9d738c..77315ab 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,8 @@
+Version 2.6.1:
+
+   * Fix bug in disconnected signal/exception handling (Spotted by Serkan Kaba
+         <serkan_kaba -at- yahoo -dot- com>)
+
 Version 2.6:
 
 	* Add DBusConnection.releaseBusName API
diff --git a/org/freedesktop/dbus/Error.java b/org/freedesktop/dbus/Error.java
index 16e1126..9db1e07 100644
--- a/org/freedesktop/dbus/Error.java
+++ b/org/freedesktop/dbus/Error.java
@@ -17,6 +17,7 @@ import java.util.Vector;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.freedesktop.dbus.exceptions.MessageFormatException;
+import org.freedesktop.dbus.exceptions.NotConnected;
 
 import cx.ath.matthew.debug.Debug;
 
@@ -79,6 +80,7 @@ public class Error extends Message
    @SuppressWarnings("unchecked")
    private static Class<? extends DBusExecutionException> createExceptionClass(String name)
    {
+      if (name == "org.freedesktop.DBus.Local.Disconnected") return NotConnected.class;
       Class<? extends DBusExecutionException> c = null;
       do {
          try {