linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mikel Astiz <mikel.astiz.oss@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: Mikel Astiz <mikel.astiz.oss@gmail.com>
Subject: [PATCH obexd v1 2/6] client: Avoid GObex dependency from transfer.h
Date: Mon, 30 Apr 2012 17:26:23 +0200	[thread overview]
Message-ID: <1335799587-10370-3-git-send-email-mikel.astiz.oss@gmail.com> (raw)
In-Reply-To: <1335799587-10370-1-git-send-email-mikel.astiz.oss@gmail.com>

This workaround makes it possible to include transfer.h from the
modules, without adding a dependency to GObex.
---
 client/transfer.c |    2 +-
 client/transfer.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/transfer.c b/client/transfer.c
index 89690d0..411a7c0 100644
--- a/client/transfer.c
+++ b/client/transfer.c
@@ -610,7 +610,7 @@ static gboolean transfer_start_put(struct obc_transfer *transfer, GError **err)
 	return TRUE;
 }
 
-gboolean obc_transfer_start(struct obc_transfer *transfer, GObex *obex,
+gboolean obc_transfer_start(struct obc_transfer *transfer, void *obex,
 								GError **err)
 {
 	transfer->obex = g_obex_ref(obex);
diff --git a/client/transfer.h b/client/transfer.h
index f42e21f..1b83d18 100644
--- a/client/transfer.h
+++ b/client/transfer.h
@@ -55,7 +55,7 @@ gboolean obc_transfer_set_callback(struct obc_transfer *transfer,
 					transfer_callback_t func,
 					void *user_data);
 
-gboolean obc_transfer_start(struct obc_transfer *transfer, GObex *obex,
+gboolean obc_transfer_start(struct obc_transfer *transfer, void *obex,
 								GError **err);
 guint8 obc_transfer_get_operation(struct obc_transfer *transfer);
 
-- 
1.7.7.6


  parent reply	other threads:[~2012-04-30 15:26 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-30 15:26 [PATCH obexd v1 0/6] client: rethink transfer data access in session API Mikel Astiz
2012-04-30 15:26 ` [PATCH obexd v1 1/6] client: Minor buffer access API changes Mikel Astiz
2012-04-30 15:26 ` Mikel Astiz [this message]
2012-04-30 15:26 ` [PATCH obexd v1 3/6] client: Give transfer pointer in session callbacks Mikel Astiz
2012-04-30 15:26 ` [PATCH obexd v1 4/6] client: Use new session callback style in modules Mikel Astiz
2012-04-30 15:26 ` [PATCH obexd v1 5/6] client: Remove deprecated part of session API Mikel Astiz
2012-04-30 15:26 ` [PATCH obexd v1 6/6] client: Remove transfer from queue before callback Mikel Astiz
2012-05-02 11:56 ` [PATCH obexd v1 0/6] client: rethink transfer data access in session API Luiz Augusto von Dentz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1335799587-10370-3-git-send-email-mikel.astiz.oss@gmail.com \
    --to=mikel.astiz.oss@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).