gnome-bluetooth r529 - trunk/wizard

[hadess svn gnome org]

Author: hadess
Date: Mon Mar 23 16:14:19 2009
New Revision: 529
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=529&view=rev

Log:
Use the new bc_connect_service() function, and don't special case device types


Modified:
   trunk/wizard/main.c

Modified: trunk/wizard/main.c
==============================================================================
--- trunk/wizard/main.c	(original)
+++ trunk/wizard/main.c	Mon Mar 23 16:14:19 2009
@@ -308,22 +308,12 @@
 
 		bluetooth_client_set_trusted(client, path, TRUE);
 
-		if (target_type == BLUETOOTH_TYPE_KEYBOARD ||
-					target_type == BLUETOOTH_TYPE_MOUSE) {
-			bluetooth_client_connect_input(client, path,
-						connect_callback, assistant);
-		} else if (target_type == BLUETOOTH_TYPE_HEADSET ||
-					target_type == BLUETOOTH_TYPE_HEADPHONES ||
-					target_type == BLUETOOTH_TYPE_OTHER_AUDIO) {
-			bluetooth_client_connect_audio(client, path,
-						connect_callback, assistant);
-		} else {
-			complete = TRUE;
-		}
-		if (complete == FALSE) {
+		if (bluetooth_client_connect_service(client, path, connect_callback, assistant) != FALSE) {
 			gtk_label_set_text (GTK_LABEL (label_passkey_help),
 					    _("Please wait while setting up the device..."));
 			gtk_widget_show (label_passkey_help);
+		} else {
+			complete = TRUE;
 		}
 	} else {
 		/* translators: