* dbus/dbus-auth.c (client_try_next_mechanism): Remove logic to

[platform/upstream/dbus.git] / dbus / dbus-server-debug-pipe.c

diff --git a/dbus/dbus-server-debug-pipe.c b/dbus/dbus-server-debug-pipe.c
index 905349b..4340e15 100644 (file)
--- a/dbus/dbus-server-debug-pipe.c
+++ b/dbus/dbus-server-debug-pipe.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2003  CodeFactory AB
  * Copyright (C) 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@
 #include "dbus-transport-unix.h"
 #include "dbus-connection-internal.h"
 #include "dbus-hash.h"
+#include "dbus-string.h"
 
 #ifdef DBUS_BUILD_TESTS
 
@@ -108,15 +109,6 @@ debug_finalize (DBusServer *server)
   dbus_free (server);
 }
 
-static dbus_bool_t
-debug_handle_watch (DBusServer  *server,
-                   DBusWatch   *watch,
-                   unsigned int flags)
-{
-
-  return TRUE;
-}
-
 static void
 debug_disconnect (DBusServer *server)
 {
@@ -125,7 +117,6 @@ debug_disconnect (DBusServer *server)
 
 static DBusServerVTable debug_vtable = {
   debug_finalize,
-  debug_handle_watch,
   debug_disconnect
 };
 
@@ -220,13 +211,19 @@ _dbus_transport_debug_pipe_new (const char     *server_name,
   DBusString address;
   
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
+
+  if (server_pipe_hash == NULL)
+    {
+      dbus_set_error (error, DBUS_ERROR_NO_SERVER, NULL);
+      return NULL;
+    }
   
   server = _dbus_hash_table_lookup_string (server_pipe_hash,
                                            server_name);
   if (server == NULL ||
       ((DBusServerDebugPipe*)server)->disconnected)
     {
-      dbus_set_error (error, DBUS_ERROR_BAD_ADDRESS, NULL);
+      dbus_set_error (error, DBUS_ERROR_NO_SERVER, NULL);
       return NULL;
     }