gobex: Merge gobex-transfer.h into gobex.h

diff --git a/gobex/gobex-transfer.c b/gobex/gobex-transfer.c
index bd69812..533956e 100644 (file)
--- a/gobex/gobex-transfer.c
+++ b/gobex/gobex-transfer.c
@@ -22,7 +22,6 @@
 #include <string.h>
 
 #include "gobex.h"
-#include "gobex-transfer.h"
 
 static GSList *transfers = NULL;
 

diff --git a/gobex/gobex-transfer.h b/gobex/gobex-transfer.h
deleted file mode 100644 (file)
index 29385ab..0000000
--- a/gobex/gobex-transfer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *
- *  OBEX library with GLib integration
- *
- *  Copyright (C) 2011  Intel Corporation. All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef __GOBEX_TRANSFER_H
-#define __GOBEX_TRANSFER_H
-
-#include <glib.h>
-
-#include <gobex/gobex.h>
-#include <gobex/gobex-defs.h>
-
-guint g_obex_put_req(GObex *obex, GObexDataProducer data_func,
-                       GObexFunc complete_func, gpointer user_data,
-                       GError **err, guint8 first_hdr_id, ...);
-
-guint g_obex_get_req(GObex *obex, GObexDataConsumer data_func,
-                       GObexFunc complete_func, gpointer user_data,
-                       GError **err, guint8 first_hdr_id, ...);
-
-guint g_obex_put_rsp(GObex *obex, GObexPacket *req,
-                       GObexDataConsumer data_func, GObexFunc complete_func,
-                       gpointer user_data, GError **err,
-                       guint8 first_hdr_id, ...);
-
-guint g_obex_get_rsp(GObex *obex, GObexDataProducer data_func,
-                       GObexFunc complete_func, gpointer user_data,
-                       GError **err, guint8 first_hdr_id, ...);
-
-gboolean g_obex_cancel_transfer(guint id);
-
-#endif /* __GOBEX_TRANSFER_H_ */

diff --git a/gobex/gobex.h b/gobex/gobex.h
index dfcd66f..7c2d4b7 100644 (file)
--- a/gobex/gobex.h
+++ b/gobex/gobex.h
@@ -25,6 +25,7 @@
 #include <stdarg.h>
 #include <glib.h>
 
+#include <gobex/gobex-defs.h>
 #include <gobex/gobex-packet.h>
 
 typedef enum {
@@ -80,4 +81,25 @@ guint g_obex_mkdir(GObex *obex, const char *path, GObexResponseFunc func,
 guint g_obex_delete(GObex *obex, const char *name, GObexResponseFunc func,
                                        gpointer user_data, GError **err);
 
+/* Transfer related high-level functions */
+
+guint g_obex_put_req(GObex *obex, GObexDataProducer data_func,
+                       GObexFunc complete_func, gpointer user_data,
+                       GError **err, guint8 first_hdr_id, ...);
+
+guint g_obex_get_req(GObex *obex, GObexDataConsumer data_func,
+                       GObexFunc complete_func, gpointer user_data,
+                       GError **err, guint8 first_hdr_id, ...);
+
+guint g_obex_put_rsp(GObex *obex, GObexPacket *req,
+                       GObexDataConsumer data_func, GObexFunc complete_func,
+                       gpointer user_data, GError **err,
+                       guint8 first_hdr_id, ...);
+
+guint g_obex_get_rsp(GObex *obex, GObexDataProducer data_func,
+                       GObexFunc complete_func, gpointer user_data,
+                       GError **err, guint8 first_hdr_id, ...);
+
+gboolean g_obex_cancel_transfer(guint id);
+
 #endif /* __GOBEX_H */

diff --git a/tools/obex-client-tool.c b/tools/obex-client-tool.c
index 387c511..ec6d1c2 100644 (file)
--- a/tools/obex-client-tool.c
+++ b/tools/obex-client-tool.c
@@ -33,7 +33,6 @@
 #include <readline/history.h>
 
 #include <gobex/gobex.h>
-#include <gobex/gobex-transfer.h>
 
 static GMainLoop *main_loop = NULL;
 static GObex *obex = NULL;

diff --git a/tools/obex-server-tool.c b/tools/obex-server-tool.c
index 18f6734..a4cf327 100644 (file)
--- a/tools/obex-server-tool.c
+++ b/tools/obex-server-tool.c
@@ -29,7 +29,6 @@
 #include <errno.h>
 
 #include <gobex/gobex.h>
-#include <gobex/gobex-transfer.h>
 
 static GMainLoop *main_loop = NULL;
 

diff --git a/unit/test-gobex-transfer.c b/unit/test-gobex-transfer.c
index 89ea1c5..40ce85d 100644 (file)
--- a/unit/test-gobex-transfer.c
+++ b/unit/test-gobex-transfer.c
@@ -28,7 +28,6 @@
 #include <stdint.h>
 
 #include <gobex/gobex.h>
-#include <gobex/gobex-transfer.h>
 
 #include "util.h"