X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bus%2Factivation.c;h=3dc87016a994a03dbb19b72fcbd045eabb8cf553;hb=3428a70ec49b9657651ad74f372912f7aa4d6b09;hp=cd77faa83112a8a4090f7fffef771470003215b2;hpb=bd6d8d261df61ed8b396434e5a80285d43184d6c;p=platform%2Fupstream%2Fdbus.git diff --git a/bus/activation.c b/bus/activation.c index cd77faa..3dc8701 100644 --- 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) 2013 Samsung Electronics * * 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; +#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 @@ -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 +#endif addressed_recipient = bus_service_get_primary_owners_connection (service); /* Resume dispatching where we left off in bus_dispatch() */