projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[daemon-fix] Changed the way of make bus address when the address is not given
[platform/upstream/dbus.git]
/
bus
/
activation.c
diff --git
a/bus/activation.c
b/bus/activation.c
index
cd77faa
..
3dc8701
100644
(file)
--- a/
bus/activation.c
+++ b/
bus/activation.c
@@
-4,6
+4,7
@@
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2003 Red Hat, Inc.
* Copyright (C) 2004 Imendio HB
* Copyright (C) 2003 CodeFactory AB
* Copyright (C) 2003 Red Hat, Inc.
* Copyright (C) 2004 Imendio HB
+ * Copyright (C) 2013 Samsung Electronics
*
* Licensed under the Academic Free License version 2.1
*
*
* Licensed under the Academic Free License version 2.1
*
@@
-1187,6
+1188,7
@@
bus_activation_send_pending_auto_activation_messages (BusActivation *activation
{
DBusConnection *addressed_recipient;
{
DBusConnection *addressed_recipient;
+#ifdef ENABLE_KDBUS_TRANSPORT
/* kdbus change - we can not send anything using phantom connections
* (DBusConnection structures for services other than daemon)
* so we have to use daemon connection
/* kdbus change - we can not send anything using phantom connections
* (DBusConnection structures for services other than daemon)
* so we have to use daemon connection
@@
-1194,6
+1196,7
@@
bus_activation_send_pending_auto_activation_messages (BusActivation *activation
if(bus_context_is_kdbus(bus_transaction_get_context (transaction)))
addressed_recipient = entry->connection;
else
if(bus_context_is_kdbus(bus_transaction_get_context (transaction)))
addressed_recipient = entry->connection;
else
+#endif
addressed_recipient = bus_service_get_primary_owners_connection (service);
/* Resume dispatching where we left off in bus_dispatch() */
addressed_recipient = bus_service_get_primary_owners_connection (service);
/* Resume dispatching where we left off in bus_dispatch() */