Merge lp:~kaihengfeng/unity-control-center/fix-bt-keyboard-pairing into lp:unity-control-center

[Kai-Heng Feng]

bluetooh: fix keyboard pairing issue.
Maurizio Gobbo (gibbio) is the original author.

bluetooh: fix Bluetooth 2.1 keyboard pairing issue.
Maurizio Gobbo (gibbio) is the original author.

[Sebastien Bacher (seb128)]

Looks good, thanks

[Sebastien Bacher (seb128)]

that fixes bug #1492443 right?

[Kai-Heng Feng (kaihengfeng)]

Yes, kudos to Maurizio.

=== modified file 'panels/bluetooth/gnome-bluetooth/wizard/main.c'
--- panels/bluetooth/gnome-bluetooth/wizard/main.c	2015-09-18 16:40:51 +0000
+++ panels/bluetooth/gnome-bluetooth/wizard/main.c	2016-05-19 11:49:25 +0000
@@ -500,13 +500,31 @@
 			  const char *pincode,
 			  gpointer user_data)
 {
-	g_debug ("Reject bluetoothd PIN %s", pincode);
-
-	/* Reject all the calls here, so that we'll get asked about the
-	 * pincode instead of being told the pincode */
-	g_dbus_method_invocation_return_dbus_error (invocation,
-						    "org.bluez.Error.Rejected",
-						    "Rejected bluetoothd generated PIN code");
+	gchar *text, *label;
+
+	display_called = TRUE;
+	gtk_assistant_set_current_page (window_assistant, PAGE_SSP_SETUP);
+
+	replace_target_properties_for_device (device);
+
+	gtk_widget_show (label_ssp_pin);
+
+	if (target_ui_behaviour == PAIRING_UI_KEYBOARD) {
+		label = g_strdup_printf (_("Please enter the following PIN on '%s' and press “Enter” on the keyboard:"), target_name);
+		text = g_strdup_printf("%s⏎", pincode);
+	}
+	else {
+		label = g_strdup_printf (_("Please enter the following PIN on '%s':"), target_name);
+		text = g_strdup_printf("%s", pincode);
+	}
+
+	gtk_label_set_markup(GTK_LABEL(label_ssp_pin_help), label);
+	set_large_label (GTK_LABEL (label_ssp_pin), text);
+
+	g_free(text);
+	g_free(label);
+
+	g_dbus_method_invocation_return_value (invocation, NULL);
 }
 
 static gboolean