gnome-bluetooth r316 - in trunk: common wizard

[hadess svn gnome org]

Author: hadess
Date: Wed Feb 25 14:37:13 2009
New Revision: 316
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=316&view=rev

Log:
Add other audio devices

And special-case them in the wizard.

Modified:
   trunk/common/bluetooth-client.c
   trunk/common/bluetooth-client.h
   trunk/wizard/main.c
   trunk/wizard/pin-code-database.txt

Modified: trunk/common/bluetooth-client.c
==============================================================================
--- trunk/common/bluetooth-client.c	(original)
+++ trunk/common/bluetooth-client.c	Wed Feb 25 14:37:13 2009
@@ -92,6 +92,8 @@
 		return N_("Headset");
 	case BLUETOOTH_TYPE_HEADPHONE:
 		return N_("Headphone");
+	case BLUETOOTH_TYPE_OTHER_AUDIO:
+		return N_("Audio device");
 	case BLUETOOTH_TYPE_KEYBOARD:
 		return N_("Keyboard");
 	case BLUETOOTH_TYPE_MOUSE:
@@ -134,6 +136,8 @@
 			return BLUETOOTH_TYPE_HEADSET;
 		case 0x06:
 			return BLUETOOTH_TYPE_HEADPHONE;
+		default:
+			return BLUETOOTH_TYPE_OTHER_AUDIO;
 		}
 		break;
 	case 0x05:

Modified: trunk/common/bluetooth-client.h
==============================================================================
--- trunk/common/bluetooth-client.h	(original)
+++ trunk/common/bluetooth-client.h	Wed Feb 25 14:37:13 2009
@@ -112,12 +112,13 @@
 	BLUETOOTH_TYPE_NETWORK		= 1 << 4,
 	BLUETOOTH_TYPE_HEADSET		= 1 << 5,
 	BLUETOOTH_TYPE_HEADPHONE	= 1 << 6,
-	BLUETOOTH_TYPE_KEYBOARD		= 1 << 7,
-	BLUETOOTH_TYPE_MOUSE		= 1 << 8,
-	BLUETOOTH_TYPE_CAMERA		= 1 << 9,
-	BLUETOOTH_TYPE_PRINTER		= 1 << 10,
-	BLUETOOTH_TYPE_JOYPAD		= 1 << 11,
-	BLUETOOTH_TYPE_TABLET		= 1 << 12,
+	BLUETOOTH_TYPE_OTHER_AUDIO	= 1 << 7,
+	BLUETOOTH_TYPE_KEYBOARD		= 1 << 8,
+	BLUETOOTH_TYPE_MOUSE		= 1 << 9,
+	BLUETOOTH_TYPE_CAMERA		= 1 << 10,
+	BLUETOOTH_TYPE_PRINTER		= 1 << 11,
+	BLUETOOTH_TYPE_JOYPAD		= 1 << 12,
+	BLUETOOTH_TYPE_TABLET		= 1 << 13,
 };
 
 #define _BLUETOOTH_TYPE_NUM_TYPES 12

Modified: trunk/wizard/main.c
==============================================================================
--- trunk/wizard/main.c	(original)
+++ trunk/wizard/main.c	Wed Feb 25 14:37:13 2009
@@ -68,6 +68,7 @@
 	TYPE_IS ("keyboard", BLUETOOTH_TYPE_KEYBOARD);
 	TYPE_IS ("headset", BLUETOOTH_TYPE_HEADSET);
 	TYPE_IS ("headphone", BLUETOOTH_TYPE_HEADPHONE);
+	TYPE_IS ("audio", BLUETOOTH_TYPE_OTHER_AUDIO);
 
 	g_warning ("unhandled type '%s'", type);
 	return BLUETOOTH_TYPE_ANY;

Modified: trunk/wizard/pin-code-database.txt
==============================================================================
--- trunk/wizard/pin-code-database.txt	(original)
+++ trunk/wizard/pin-code-database.txt	Wed Feb 25 14:37:13 2009
@@ -22,3 +22,4 @@
 # Headphones and headsets
 headphone			0000
 headset			0000
+audio			0000