gnome-bluetooth r360 - in trunk: common wizard

[hadess svn gnome org]

Author: hadess
Date: Wed Feb 25 15:21:53 2009
New Revision: 360
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=360&view=rev

Log:
Headphones is a single device

2 ears, 2 headphones, the device is "a pair of headphones".

Modified:
   trunk/common/bluetooth-client.c
   trunk/common/bluetooth-enums.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 15:21:53 2009
@@ -97,8 +97,8 @@
 	case BLUETOOTH_TYPE_HEADSET:
 		/* translators: a hands-free headset, a combination of a single speaker with a microphone */
 		return N_("Headset");
-	case BLUETOOTH_TYPE_HEADPHONE:
-		return N_("Headphone");
+	case BLUETOOTH_TYPE_HEADPHONES:
+		return N_("Headphones");
 	case BLUETOOTH_TYPE_OTHER_AUDIO:
 		return N_("Audio device");
 	case BLUETOOTH_TYPE_KEYBOARD:
@@ -172,7 +172,7 @@
 		case 0x02:
 			return BLUETOOTH_TYPE_HEADSET;
 		case 0x06:
-			return BLUETOOTH_TYPE_HEADPHONE;
+			return BLUETOOTH_TYPE_HEADPHONES;
 		default:
 			return BLUETOOTH_TYPE_OTHER_AUDIO;
 		}

Modified: trunk/common/bluetooth-enums.h
==============================================================================
--- trunk/common/bluetooth-enums.h	(original)
+++ trunk/common/bluetooth-enums.h	Wed Feb 25 15:21:53 2009
@@ -41,7 +41,7 @@
 	BLUETOOTH_TYPE_COMPUTER		= 1 << 3,
 	BLUETOOTH_TYPE_NETWORK		= 1 << 4,
 	BLUETOOTH_TYPE_HEADSET		= 1 << 5,
-	BLUETOOTH_TYPE_HEADPHONE	= 1 << 6,
+	BLUETOOTH_TYPE_HEADPHONES	= 1 << 6,
 	BLUETOOTH_TYPE_OTHER_AUDIO	= 1 << 7,
 	BLUETOOTH_TYPE_KEYBOARD		= 1 << 8,
 	BLUETOOTH_TYPE_MOUSE		= 1 << 9,

Modified: trunk/wizard/main.c
==============================================================================
--- trunk/wizard/main.c	(original)
+++ trunk/wizard/main.c	Wed Feb 25 15:21:53 2009
@@ -73,7 +73,7 @@
 	TYPE_IS ("mouse", BLUETOOTH_TYPE_MOUSE);
 	TYPE_IS ("keyboard", BLUETOOTH_TYPE_KEYBOARD);
 	TYPE_IS ("headset", BLUETOOTH_TYPE_HEADSET);
-	TYPE_IS ("headphone", BLUETOOTH_TYPE_HEADPHONE);
+	TYPE_IS ("headphones", BLUETOOTH_TYPE_HEADPHONES);
 	TYPE_IS ("audio", BLUETOOTH_TYPE_OTHER_AUDIO);
 	TYPE_IS ("printer", BLUETOOTH_TYPE_PRINTER);
 	TYPE_IS ("network", BLUETOOTH_TYPE_NETWORK);

Modified: trunk/wizard/pin-code-database.txt
==============================================================================
--- trunk/wizard/pin-code-database.txt	(original)
+++ trunk/wizard/pin-code-database.txt	Wed Feb 25 15:21:53 2009
@@ -60,6 +60,6 @@
 printer			0000
 
 # Headphones and headsets
-headphone			0000
+headphones			0000
 headset			0000
 audio			0000