projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dbus-1.4'
[platform/upstream/dbus.git]
/
bus
/
services.c
diff --git
a/bus/services.c
b/bus/services.c
index
0a04925
..
68a7022
100644
(file)
--- a/
bus/services.c
+++ b/
bus/services.c
@@
-385,7
+385,6
@@
bus_registry_acquire_service (BusRegistry *registry,
{
dbus_bool_t retval;
DBusConnection *old_owner_conn;
{
dbus_bool_t retval;
DBusConnection *old_owner_conn;
- DBusConnection *current_owner_conn;
BusClientPolicy *policy;
BusService *service;
BusActivation *activation;
BusClientPolicy *policy;
BusService *service;
BusActivation *activation;
@@
-510,12
+509,10
@@
bus_registry_acquire_service (BusRegistry *registry,
primary_owner = bus_service_get_primary_owner (service);
if (primary_owner == NULL)
goto out;
primary_owner = bus_service_get_primary_owner (service);
if (primary_owner == NULL)
goto out;
-
- current_owner_conn = primary_owner->conn;
-
+
if (old_owner_conn == NULL)
{
if (old_owner_conn == NULL)
{
- _dbus_assert (
current_owner_
conn == connection);
+ _dbus_assert (
primary_owner->
conn == connection);
*result = DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER;
}
*result = DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER;
}