libbtctl r135 - in trunk: . src

[hadess svn gnome org]

Author: hadess
Date: Wed Oct  8 01:30:43 2008
New Revision: 135
URL: http://svn.gnome.org/viewvc/libbtctl?rev=135&view=rev

Log:
2008-10-08  Bastien Nocera  <hadess hadess net>

	* autogen.sh:
	* configure.in:
	* src/btctlimpl.c (btctl_controller_impl_cmd_scan):
	Port to BlueZ 4.x (Closes: #555474)



Modified:
   trunk/ChangeLog
   trunk/autogen.sh
   trunk/configure.in
   trunk/src/btctlimpl.c

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Wed Oct  8 01:30:43 2008
@@ -5,7 +5,7 @@
 test -z "$srcdir" && srcdir=.
 
 # FIXME this is gross
-cat bluez-libs.m4 bluez-sdp.m4 python-headers.m4 openobex.m4 >acinclude.m4
+cat python-headers.m4 openobex.m4 >acinclude.m4
 
 PKG_NAME="GObject Bluetooth Controller"
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Oct  8 01:30:43 2008
@@ -46,7 +46,7 @@
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no)
 AC_SUBST(GLIB_GENMARSHAL)
 
-PKG_CHECK_MODULES(BTCTL, gobject-2.0 glib-2.0 >= 2.4.0)
+PKG_CHECK_MODULES(BTCTL, gobject-2.0 glib-2.0 >= 2.4.0 bluez >= 4.0)
 AC_SUBST(BTCTL_CFLAGS)
 AC_SUBST(BTCTL_LIBS)
 
@@ -58,20 +58,6 @@
 
 AM_PATH_OPENOBEX(1.2)
 
-dnl Bluetooth libraries
-BLUEZ_PATH_BLUETOOTH([], AC_MSG_ERROR([libbluetooth is required to build this software - part of bluez-libs]))
-
-dnl libsdp is only needed for bluez-libs,-sdp <= 2.6, so we test
-dnl for it and add if needed
-BLUEZ_PATH_SDP([HAVE_SDP=yes], AC_MSG_WARN([no libsdp but continuing anyway]))
-if test "x$HAVE_SDP" = "xyes"; then
-    ADDSDPLIB="-lsdp"
-    BLUETOOTH_LIBS="$BLUETOOTH_LIBS -lsdp"
-else
-    ADDSDPLIB=""
-fi
-AC_SUBST(ADDSDPLIB)
-
 dnl Python bindings
 PKG_CHECK_MODULES(BTCTLPY, pygtk-2.0, HAVE_PYTHON=yes, HAVE_PYTHON=no)
 AC_MSG_CHECKING(for python support)

Modified: trunk/src/btctlimpl.c
==============================================================================
--- trunk/src/btctlimpl.c	(original)
+++ trunk/src/btctlimpl.c	Wed Oct  8 01:30:43 2008
@@ -330,8 +330,8 @@
 	if (dd>=0) {
 		for (i = 0; i < num_rsp; i++) {
 			memset(name, 0, sizeof(name));
-			if (hci_remote_name(dd, &(info+i)->bdaddr,
-						sizeof(name), name, 100000) < 0)
+			if (hci_read_remote_name(dd, &(info+i)->bdaddr,
+						 sizeof(name), name, 100000) < 0)
 				strcpy(name, "n/a");
 
 			baswap(&bdaddr, &(info+i)->bdaddr);