Merge lp:~seb128/unity-control-center/bluetooth-ssp-signature into lp:unity-control-center

[Sebastien Bacher]

[bluetooth] restore the ssp pairing signature fix which was applied to our
gnome-bluetooth package but got discarded by error when updating ucc to the
new bluez version

[bluetooth] restore the ssp pairing signature fix which was applied to our
gnome-bluetooth package but got discarded by error when updating ucc to the
new bluez version

[Sebastien Bacher (seb128)]

that basically restore the patch from https://launchpad.net/ubuntu/+source/gnome-bluetooth/3.8.2.1-0ubuntu4.2

[Mathieu Trudel-Lapierre (cyphermox)]

Yes please! :)

review: Approve

=== modified file 'panels/bluetooth/gnome-bluetooth/lib/bluetooth-agent.c'
--- panels/bluetooth/gnome-bluetooth/lib/bluetooth-agent.c	2015-03-03 11:08:17 +0000
+++ panels/bluetooth/gnome-bluetooth/lib/bluetooth-agent.c	2015-09-18 16:47:30 +0000
@@ -51,7 +51,7 @@
 "    <method name='DisplayPasskey'>"
 "      <arg type='o' name='device' direction='in'/>"
 "      <arg type='u' name='passkey' direction='in'/>"
-"      <arg type='y' name='entered' direction='in'/>"
+"      <arg type='q' name='entered' direction='in'/>"
 "    </method>"
 "    <method name='DisplayPinCode'>"
 "      <arg type='o' name='device' direction='in'/>"
@@ -167,7 +167,7 @@
 }
 
 static gboolean bluetooth_agent_display_passkey(BluetoothAgent *agent,
-			const char *path, guint passkey, guint8 entered,
+			const char *path, guint passkey, guint16 entered,
 						GDBusMethodInvocation *invocation)
 {
 	BluetoothAgentPrivate *priv = BLUETOOTH_AGENT_GET_PRIVATE(agent);
@@ -388,9 +388,9 @@
 	} else if (g_strcmp0 (method_name, "DisplayPasskey") == 0) {
 		char *path;
 		guint32 passkey;
-		guint8 entered;
+		guint16 entered;
 
-		g_variant_get (parameters, "(ouy)", &path, &passkey, &entered);
+		g_variant_get (parameters, "(ouq)", &path, &passkey, &entered);
 		bluetooth_agent_display_passkey (agent, path, passkey, entered, invocation);
 		g_free (path);
 	} else if (g_strcmp0 (method_name, "DisplayPinCode") == 0) {
 
=== modified file 'panels/bluetooth/gnome-bluetooth/wizard/main.c'
--- panels/bluetooth/gnome-bluetooth/wizard/main.c	2015-03-03 11:08:17 +0000
+++ panels/bluetooth/gnome-bluetooth/wizard/main.c	2015-09-18 16:47:30 +0000
@@ -442,7 +442,7 @@
 		  guint entered,
 		  gpointer user_data)
 {
-	gchar *text, *done, *code;
+	gchar *text, *done, *code, *label;
 
 	display_called = TRUE;
 	gtk_assistant_set_current_page (window_assistant, PAGE_SSP_SETUP);
@@ -469,18 +469,27 @@
 
 		done = g_string_free (str, FALSE);
 	} else {
-		done = g_strdup ("");
-	}
-
-	gtk_widget_show (label_pin_help);
-
-	gtk_label_set_markup(GTK_LABEL(label_ssp_pin_help), _("Please enter the following PIN:"));
-	text = g_strdup_printf("%s%s", done, code + entered);
+		done = g_strdup_printf("%s", code);
+	}
+
+	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⏎", done);
+	}
+	else {
+		label = g_strdup_printf (_("Please enter the following PIN on '%s':"), target_name);
+		text = g_strdup_printf("%s", done);
+	}
+
+	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(done);
 	g_free(code);
+	g_free(label);
 
 	g_dbus_method_invocation_return_value (invocation, NULL);
 }