[maemo-commits] [maemo-commits] r17045 - in projects/connectivity/osso-bluez-compat/trunk: . debian etc src

Fri Jan 2 14:58:47 EET 2009

Author: jh
Date: 2009-01-02 14:58:46 +0200 (Fri, 02 Jan 2009)
New Revision: 17045

Added:
   projects/connectivity/osso-bluez-compat/trunk/src/maemo-bluez-cud
   projects/connectivity/osso-bluez-compat/trunk/src/maemo-bluez-restore
   projects/connectivity/osso-bluez-compat/trunk/src/maemo-bluez-rfs
Removed:
   projects/connectivity/osso-bluez-compat/trunk/src/cud.c
Modified:
   projects/connectivity/osso-bluez-compat/trunk/configure.ac
   projects/connectivity/osso-bluez-compat/trunk/debian/changelog
   projects/connectivity/osso-bluez-compat/trunk/debian/control
   projects/connectivity/osso-bluez-compat/trunk/debian/copyright
   projects/connectivity/osso-bluez-compat/trunk/etc/bluez-cud.sh
   projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh
   projects/connectivity/osso-bluez-compat/trunk/etc/bluez-rfs.sh
   projects/connectivity/osso-bluez-compat/trunk/src/Makefile.am
Log:
Use python scripts and BlueZ 4.x API

Modified: projects/connectivity/osso-bluez-compat/trunk/configure.ac
===================================================================

--- projects/connectivity/osso-bluez-compat/trunk/configure.ac	2008-12-29 13:27:20 UTC (rev 17044)
+++ projects/connectivity/osso-bluez-compat/trunk/configure.ac	2009-01-02 12:58:46 UTC (rev 17045)
@@ -1,4 +1,4 @@
-AC_INIT([osso-bluez-compat],[0.14])
+AC_INIT([maemo-bluez-compat],[0.15])
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)

Modified: projects/connectivity/osso-bluez-compat/trunk/debian/changelog
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/debian/changelog	2008-12-29 13:27:20 UTC (rev 17044)
+++ projects/connectivity/osso-bluez-compat/trunk/debian/changelog	2009-01-02 12:58:46 UTC (rev 17045)
@@ -1,3 +1,10 @@
+maemo-bluez-compat (0.15) unstable; urgency=low
+
+  * Package rename
+  * Update to BlueZ 4.x API. Fixes: NB#95096
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Wed, 31 Dec 2008 11:27:34 +0000
+
 osso-bluez-compat (0.14) unstable; urgency=low
 
   * Don't switch bluetooth on in restore script. Fixes: NB#72216 

Modified: projects/connectivity/osso-bluez-compat/trunk/debian/control
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/debian/control	2008-12-29 13:27:20 UTC (rev 17044)
+++ projects/connectivity/osso-bluez-compat/trunk/debian/control	2009-01-02 12:58:46 UTC (rev 17045)
@@ -1,15 +1,15 @@
-Source: osso-bluez-compat
+Source: maemo-bluez-compat
 Section: libs
 Priority: optional
 Maintainer: Johan Hedberg <johan.hedberg at nokia.com>
 Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev, libdbus-1-dev, libdbus-glib-1-dev, cdbs
 Standards-Version: 3.6.1.0
 
-Package: osso-bluez-compat
+Package: maemo-bluez-compat
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, bluez-utils (>= 3.20)
-Description: OSSO compatibility tools for BlueZ
+Depends: ${shlibs:Depends}, bluez (>= 4.22)
+Description: Maemo compatibility tools for BlueZ
  This package contais a some programs and scripts which help
- integrate BlueZ to the OSSO environment.
+ integrate BlueZ to the Maemo environment.
 

Modified: projects/connectivity/osso-bluez-compat/trunk/debian/copyright
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/debian/copyright	2008-12-29 13:27:20 UTC (rev 17044)
+++ projects/connectivity/osso-bluez-compat/trunk/debian/copyright	2009-01-02 12:58:46 UTC (rev 17045)
@@ -1,6 +1,6 @@
-osso-bluez-compat - OSSO compatibility tools for BlueZ
+maemo-bluez-compat - Maemo compatibility tools for BlueZ
 
 Author: Johan Hedberg <johan.hedberg at nokia.com>
 
-Copyright (C) 2006 Nokia Corporation
+Copyright (C) 2006-2008 Nokia Corporation
 

Modified: projects/connectivity/osso-bluez-compat/trunk/etc/bluez-cud.sh
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/etc/bluez-cud.sh	2008-12-29 13:27:20 UTC (rev 17044)
+++ projects/connectivity/osso-bluez-compat/trunk/etc/bluez-cud.sh	2009-01-02 12:58:46 UTC (rev 17045)
@@ -1,11 +1,3 @@
 #!/bin/sh
 
-MODE=`dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.GetMode|tail -n 1|awk '{ print $2 }'|sed s/\"//g`
-
-dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:connectable > /dev/null
-
-/usr/bin/osso-bluez-cud
-
-if [ "$MODE" ]; then
-	dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:$MODE > /dev/null
-fi
+/usr/bin/maemo-bluez-cud

Modified: projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh	2008-12-29 13:27:20 UTC (rev 17044)
+++ projects/connectivity/osso-bluez-compat/trunk/etc/bluez-restore.sh	2009-01-02 12:58:46 UTC (rev 17045)
@@ -38,11 +38,4 @@
 	NAME=`egrep ^name $CORRECT_DIR/config|sed 's/^name //'`
 fi
 
-if [ "$NAME" ]; then
-	dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetName string:"$NAME" > /dev/null
-fi
-
-if [ "$BK_MODE" ]; then
-	dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:$BK_MODE > /dev/null
-fi
-
+/usr/bin/maemo-bluez-restore "$NANE" "$BK_MODE"

Modified: projects/connectivity/osso-bluez-compat/trunk/etc/bluez-rfs.sh
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/etc/bluez-rfs.sh	2008-12-29 13:27:20 UTC (rev 17044)
+++ projects/connectivity/osso-bluez-compat/trunk/etc/bluez-rfs.sh	2009-01-02 12:58:46 UTC (rev 17045)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 AF_DEFINES="/etc/osso-af-init/af-defines.sh"
-PRODUCT_NAME="Nokia Tablet"
+PRODUCT_NAME="Nokia NXX"
 
 if [ "$OSSO_PRODUCT_NAME" ]; then
 	PRODUCT_NAME="Nokia $OSSO_PRODUCT_NAME"
@@ -12,8 +12,4 @@
 	fi
 fi
 
-dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:connectable > /dev/null
-
-dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetName string:"$PRODUCT_NAME" > /dev/null
-dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetDiscoverableTimeout uint32:0 > /dev/null
-dbus-send --print-reply --system --dest=org.bluez /org/bluez/hci0 org.bluez.Adapter.SetMode string:off > /dev/null
+/usr/bin/maemo-bluez-rfs "$PRODUCT_NAME"

Modified: projects/connectivity/osso-bluez-compat/trunk/src/Makefile.am
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/src/Makefile.am	2008-12-29 13:27:20 UTC (rev 17044)
+++ projects/connectivity/osso-bluez-compat/trunk/src/Makefile.am	2009-01-02 12:58:46 UTC (rev 17045)
@@ -1,13 +1,4 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = -D_GNU_SOURCE -DDBUS_API_SUBJECT_TO_CHANGE
+bin_SCRIPTS = maemo-bluez-cud maemo-bluez-restore maemo-bluez-rfs
 
-if DEBUG_ENABLED
-  AM_CPPFLAGS += -DDEBUG
-endif
-
-bin_PROGRAMS = osso-bluez-cud
-
-osso_bluez_cud_LDADD = @COMMON_LIBS@
-osso_bluez_cud_CFLAGS  = @COMMON_CFLAGS@
-osso_bluez_cud_SOURCES = cud.c

Deleted: projects/connectivity/osso-bluez-compat/trunk/src/cud.c
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/src/cud.c	2008-12-29 13:27:20 UTC (rev 17044)
+++ projects/connectivity/osso-bluez-compat/trunk/src/cud.c	2009-01-02 12:58:46 UTC (rev 17045)
@@ -1,43 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <dbus/dbus-glib.h>
-
-int main(int argc, char *argv[])
-{
-    DBusGConnection *conn;
-    GError *err = NULL;
-    const gchar **devs = NULL;
-    DBusGProxy *hci0;
-
-    g_type_init();
-
-    conn = dbus_g_bus_get(DBUS_BUS_SYSTEM, &err);
-    if (err != NULL) {
-        g_printerr("Connecting to system bus failed: %s\n", err->message);
-        g_error_free(err);
-        exit(EXIT_FAILURE);
-    }
-
-    hci0 = dbus_g_proxy_new_for_name(conn, "org.bluez", "/org/bluez/hci0",
-                                     "org.bluez.Adapter");
-
-    dbus_g_proxy_call(hci0, "ListBondings", &err, G_TYPE_INVALID,
-                      G_TYPE_STRV, &devs, G_TYPE_INVALID);
-    if (err != NULL) {
-        g_printerr("ListBondings failed: %s\n", err->message);
-        g_error_free(err);
-        exit(EXIT_FAILURE);
-    }
-
-    while (*devs) {
-        g_print("Removing bonding for %s\n", *devs);
-        dbus_g_proxy_call(hci0, "RemoveBonding", NULL, G_TYPE_STRING, *devs,
-                G_TYPE_INVALID);
-        devs++;
-    }
-
-    exit(EXIT_SUCCESS);
-}

Added: projects/connectivity/osso-bluez-compat/trunk/src/maemo-bluez-cud
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/src/maemo-bluez-cud	2008-12-29 13:27:20 UTC (rev 17044)
+++ projects/connectivity/osso-bluez-compat/trunk/src/maemo-bluez-cud	2009-01-02 12:58:46 UTC (rev 17045)
@@ -0,0 +1,15 @@
+#!/usr/bin/python
+
+import dbus
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object("org.bluez", "/"), "org.bluez.Manager")
+adapter = dbus.Interface(bus.get_object("org.bluez", manager.DefaultAdapter()),
+							"org.bluez.Adapter")
+adapter.SetProperty("Powered", True)
+
+properties = device.GetProperties()
+
+for device in properties["Devices"]:
+	adapter.RemoveDevice(device)


Property changes on: projects/connectivity/osso-bluez-compat/trunk/src/maemo-bluez-cud
___________________________________________________________________
Name: svn:executable
   + *

Added: projects/connectivity/osso-bluez-compat/trunk/src/maemo-bluez-restore
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/src/maemo-bluez-restore	2008-12-29 13:27:20 UTC (rev 17044)
+++ projects/connectivity/osso-bluez-compat/trunk/src/maemo-bluez-restore	2009-01-02 12:58:46 UTC (rev 17045)
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+
+import sys
+import dbus
+
+if len(sys.argv < 3:
+	print "Usage %s <name> <mode>" % sys.argv[0
+	sys.exit(1)
+
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object("org.bluez", "/"), "org.bluez.Manager")
+adapter = dbus.Interface(bus.get_object("org.bluez", manager.DefaultAdapter()),
+							"org.bluez.Adapter")
+adapter.SetProperty("Name", sys.argv[1])
+
+if sys.argv[2] == "off":
+	adapter.SetProperty("Powered", False)
+	sys.exit(0)
+
+adapter.SetProperty("Powered", True)
+
+if sys.argv[2] == "discoverable":
+	adapter.SetProperty("Discoverable", True)
+elif sys.argv[2] == "connectable":
+	adapter.SetProperty("Discoverable", False)
+


Property changes on: projects/connectivity/osso-bluez-compat/trunk/src/maemo-bluez-restore
___________________________________________________________________
Name: svn:executable
   + *

Added: projects/connectivity/osso-bluez-compat/trunk/src/maemo-bluez-rfs
===================================================================
--- projects/connectivity/osso-bluez-compat/trunk/src/maemo-bluez-rfs	2008-12-29 13:27:20 UTC (rev 17044)
+++ projects/connectivity/osso-bluez-compat/trunk/src/maemo-bluez-rfs	2009-01-02 12:58:46 UTC (rev 17045)
@@ -0,0 +1,20 @@
+#!/usr/bin/python
+
+import dbus
+import sys
+
+if len(sys.argv) < 2:
+	print "Usage: %s <product name>" % sys.argv[0]
+	sys.exit(1)
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object("org.bluez", "/"), "org.bluez.Manager")
+adapter = dbus.Interface(bus.get_object("org.bluez", manager.DefaultAdapter()),
+							"org.bluez.Adapter")
+adapter.SetProperty("Powered", True)
+adapter.SetProperty("Discoverable", False)
+adapter.SetProperty("DiscoverableTimeout", 0)
+adapter.SetProperty("Name", sys.argv[1])
+adapter.SetProperty("Powered", False)
+


Property changes on: projects/connectivity/osso-bluez-compat/trunk/src/maemo-bluez-rfs
___________________________________________________________________
Name: svn:executable
   + *


