upload tizen1.0 source

[profile/ivi/obexd.git] / client / transfer.c

diff --git a/client/transfer.c b/client/transfer.c
index 4388529..bd9870d 100644 (file)
--- a/client/transfer.c
+++ b/client/transfer.c
@@ -140,7 +140,6 @@ static void obc_transfer_abort(struct obc_transfer *transfer)
        g_obex_cancel_transfer(transfer->xfer);
        transfer->xfer = 0;
 
-#ifndef TIZEN_PATCH
        if (callback) {
                GError *err;
 
@@ -150,7 +149,6 @@ static void obc_transfer_abort(struct obc_transfer *transfer)
                                                        callback->data);
                g_error_free(err);
        }
-#endif
 }
 
 static DBusMessage *obc_transfer_cancel(DBusConnection *connection,
@@ -241,11 +239,7 @@ struct obc_transfer *obc_transfer_register(DBusConnection *conn,
 
        transfer->path = g_strdup_printf("%s/transfer%ju",
                        TRANSFER_BASEPATH, counter++);
-#ifdef TIZEN_PATCH
-       transfer->conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
-#else
        transfer->conn = dbus_bus_get(DBUS_BUS_SESSION, NULL);
-#endif
        if (transfer->conn == NULL) {
                obc_transfer_free(transfer);
                return NULL;