From d4dff22a7b9c14ff1228c44d1d5e3b9a259c07d0 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Mon, 16 Apr 2012 18:09:34 +0200
Subject: [PATCH] obexd: Remove glib-helper.h support

---
 obexd/plugins/bluetooth.c       |  1 -
 obexd/plugins/messages-dummy.c  |  1 -
 obexd/plugins/pbap.c            |  1 -
 obexd/plugins/phonebook-dummy.c |  1 -
 obexd/plugins/vcard.c           |  1 -
 obexd/src/glib-helper.h         | 30 ------------------------------
 6 files changed, 35 deletions(-)
 delete mode 100644 obexd/src/glib-helper.h

diff --git a/obexd/plugins/bluetooth.c b/obexd/plugins/bluetooth.c
index 7d549971c..aab50fd78 100644
--- a/obexd/plugins/bluetooth.c
+++ b/obexd/plugins/bluetooth.c
@@ -43,7 +43,6 @@
 #include "service.h"
 #include "log.h"
 #include "btio.h"
-#include "glib-helper.h"
 
 #define BT_RX_MTU 32767
 #define BT_TX_MTU 32767
diff --git a/obexd/plugins/messages-dummy.c b/obexd/plugins/messages-dummy.c
index afba7a700..833c31c2f 100644
--- a/obexd/plugins/messages-dummy.c
+++ b/obexd/plugins/messages-dummy.c
@@ -34,7 +34,6 @@
 #include "log.h"
 
 #include "messages.h"
-#include "glib-helper.h"
 
 static char *root_folder = NULL;
 
diff --git a/obexd/plugins/pbap.c b/obexd/plugins/pbap.c
index eb2bc9cd4..c6d7cfc90 100644
--- a/obexd/plugins/pbap.c
+++ b/obexd/plugins/pbap.c
@@ -49,7 +49,6 @@
 #include "mimetype.h"
 #include "filesystem.h"
 #include "manager.h"
-#include "glib-helper.h"
 
 #define PHONEBOOK_TYPE		"x-bt/phonebook"
 #define VCARDLISTING_TYPE	"x-bt/vcard-listing"
diff --git a/obexd/plugins/phonebook-dummy.c b/obexd/plugins/phonebook-dummy.c
index d026c5a96..035ec3578 100644
--- a/obexd/plugins/phonebook-dummy.c
+++ b/obexd/plugins/phonebook-dummy.c
@@ -43,7 +43,6 @@
 
 #include "log.h"
 #include "phonebook.h"
-#include "glib-helper.h"
 
 typedef void (*vcard_func_t) (const char *file, VObject *vo, void *user_data);
 
diff --git a/obexd/plugins/vcard.c b/obexd/plugins/vcard.c
index 7cc799443..31d6d0d9c 100644
--- a/obexd/plugins/vcard.c
+++ b/obexd/plugins/vcard.c
@@ -34,7 +34,6 @@
 #include <gdbus.h>
 
 #include "vcard.h"
-#include "glib-helper.h"
 
 #define ADDR_FIELD_AMOUNT 7
 #define LEN_MAX 128
diff --git a/obexd/src/glib-helper.h b/obexd/src/glib-helper.h
deleted file mode 100644
index 695d719c3..000000000
--- a/obexd/src/glib-helper.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- *  BlueZ - Bluetooth protocol stack for Linux
- *
- *  Copyright (C) 2004-2010  Marcel Holtmann <marcel@holtmann.org>
- *
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  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
- *
- */
-
-#ifdef NEED_G_SLIST_FREE_FULL
-static inline void g_slist_free_full(GSList *list, GDestroyNotify free_func)
-{
-	g_slist_foreach(list, (GFunc) free_func, NULL);
-	g_slist_free(list);
-}
-#endif
-- 
2.47.3