- fixed dbus_bus_request_name

[platform/upstream/dbus.git] / dbus / dbus-bus.c

diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c
index de76315..ef7eb1e 100644 (file)
--- a/dbus/dbus-bus.c
+++ b/dbus/dbus-bus.c
@@ -694,8 +694,10 @@ dbus_bus_register (DBusConnection *connection,
          if(!bus_register_kdbus(name, connection, error))
                  goto out;
 
-/*       if(!bus_register_kdbus_policy(bd->unique_name, connection, error))   //todo should it be here?
-               goto out;*/
+         if(!bus_register_policy_kdbus(name, connection, error))
+               goto out;
+
+         dbus_connection_set_is_authenticated(connection);
   }
   else
   {
@@ -1195,13 +1197,10 @@ dbus_bus_request_name (DBusConnection *connection,
        }
        else
        {
-               if(!bus_register_policy_kdbus(name, connection, error))  //todo check what to do with policy if program doesn't use dbus_bus_request_name
+               if(!bus_register_policy_kdbus(name, connection, error))
                        return -1;
-               dbus_connection_set_is_authenticated(connection);
 
                result = bus_request_name_kdbus(connection, name, flags, error);
-               if(dbus_error_is_set(error))
-                       return -1;
        }
   
        return result;