File gnome-phone-manager-bt33api.patch of Package gnome-phone-manager

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-phone-manager-bt33api.patch of Package gnome-phone-manager

From d51067ce7b0063f8106761da3df4cac585680017 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 1 Dec 2011 18:53:00 +0100
Subject: [PATCH 1/2] Bug 665309: support gnome-bluetooth 3.3 API

---
 configure.in               |    5 +++++
 gnome-bluetooth/phonemgr.c |    6 +++++-
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/configure.in b/configure.in
index 101a77f..42e4836 100644
--- a/configure.in
+++ b/configure.in
@@ -100,6 +100,11 @@ if test x$ENABLE_BLUETOOTH_PLUGIN = "xyes" ; then
 fi
 if test x$HAVE_BLUETOOTH_PLUGIN = "xyes"; then
 	AC_DEFINE(HAVE_BLUETOOTH_PLUGIN, 1, [Defined to 1 if you build the gnome-bluetooth plugin.])
+	dnl Verifying if we have gnome-bluetooth >= 3.3, which had an API change.
+	PKG_CHECK_MODULES(GNOME_BLUETOOTH_33, gnome-bluetooth-1.0 >= 3.3,
+			  AC_DEFINE(GNOME_BT33_API, 1, [Defined to 1 if you build with gnome-bluetooth 3.3 API.]),
+			  AC_DEFINE(GNOME_BT33_API, 0, [Defined to 1 if you build with gnome-bluetooth 3.3 API.]))
+
 fi
 AM_CONDITIONAL(HAVE_BLUETOOTH_PLUGIN, test x$HAVE_BLUETOOTH_PLUGIN = "xyes")
 
diff --git a/gnome-bluetooth/phonemgr.c b/gnome-bluetooth/phonemgr.c
index 9ebac12..07afa56 100644
--- a/gnome-bluetooth/phonemgr.c
+++ b/gnome-bluetooth/phonemgr.c
@@ -44,7 +44,11 @@ get_type (const char *address)
 	gboolean cont;
 
 	client = bluetooth_client_new (); 
-	model = bluetooth_client_get_device_model (client, NULL);
+	model = bluetooth_client_get_device_model (client
+#if !GNOME_BT33_API
+	, NULL
+#endif
+	);
 	if (model == NULL) {
 		g_object_unref (client);
 		return type;
-- 
1.7.7

Places

File gnome-phone-manager-bt33api.patch of Package gnome-phone-manager

Places