Merge "[lib-fix] Fixed return value of kdbus_write_msg Change-Id: Ia3a45a6a79b4078929...

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

diff --git a/bus/connection.c b/bus/connection.c
index f97935d..077203e 100644 (file)
--- a/bus/connection.c
+++ b/bus/connection.c
@@ -202,7 +202,7 @@ bus_connection_disconnected (DBusConnection *connection)
                  d->name ? d->name : "(inactive)");
 
 #ifdef ENABLE_KDBUS_TRANSPORT
-  if(bus_context_is_kdbus(d->connections->context) && (strcmp(bus_connection_get_name(connection), ":1.1")))
+  if((d->name) && bus_context_is_kdbus(d->connections->context) && (strcmp(d->name, ":1.1")))
       is_phantom = TRUE;
 #endif
 
@@ -2282,15 +2282,6 @@ bus_transaction_execute_and_free (BusTransaction *transaction)
   dbus_free (transaction);
 }
 
-#ifdef ENABLE_KDBUS_TRANSPORT
-void
-bus_transaction_free (BusTransaction *transaction)
-{
-         free_cancel_hooks (transaction);
-         dbus_free (transaction);
-}
-#endif
-
 static void
 bus_connection_remove_transactions (DBusConnection *connection)
 {