[gnome-bluetooth] Remove some dead code and sync strings
- From: Bastien Nocera <hadess src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-bluetooth] Remove some dead code and sync strings
- Date: Tue, 16 Jun 2009 12:49:06 -0400 (EDT)
commit 0ec82e44f461d53388a12e79187b92c54901ef10
Author: Bastien Nocera <hadess hadess net>
Date: Tue Jun 16 17:48:51 2009 +0100
Remove some dead code and sync strings
wizard/main.c | 20 +++++---------------
wizard/wizard.ui | 3 ++-
2 files changed, 7 insertions(+), 16 deletions(-)
---
diff --git a/wizard/main.c b/wizard/main.c
index 8effa1a..372337f 100644
--- a/wizard/main.c
+++ b/wizard/main.c
@@ -539,24 +539,14 @@ void prepare_callback (GtkWidget *assistant,
complete = FALSE;
if (automatic_pincode == FALSE && target_ssp == FALSE) {
- gtk_widget_show (label_passkey_help);
- gtk_widget_show (label_passkey);
-
- gtk_label_set_markup(GTK_LABEL(label_passkey_help), _("Please enter the following passkey:"));
- set_large_label (GTK_LABEL (label_passkey), pincode);
- } else {
char *text;
- gtk_widget_show (label_passkey_help);
- gtk_widget_hide (label_passkey);
-
- /* translators:
- * The '%s' is the device name, for example:
- * Please wait whilst 'Sony Bluetooth Headset' is being paired
- */
- text = g_strdup_printf(_("Please wait whilst '%s' is being paired"), target_name);
+ text = g_strdup_printf (_("Please enter the following passkey on '%s':"), target_name);
gtk_label_set_markup(GTK_LABEL(label_passkey_help), text);
- g_free(text);
+ g_free (text);
+ set_large_label (GTK_LABEL (label_passkey), pincode);
+ } else {
+ g_assert_not_reached ();
}
}
diff --git a/wizard/wizard.ui b/wizard/wizard.ui
index 168fd60..c4e8b3c 100644
--- a/wizard/wizard.ui
+++ b/wizard/wizard.ui
@@ -168,7 +168,7 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label"></property>
+ <property name="label">Please enter the following passkey on 'Foobar':</property>
</object>
<packing>
<property name="expand">False</property>
@@ -179,6 +179,7 @@
<object class="GtkLabel" id="label_passkey">
<property name="label"><span font_desc="50" color="black" bgcolor="white"> 123456 </span></property>
<property name="use_markup">True</property>
+ <property name="visible">True</property>
</object>
<packing>
<property name="expand">False</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]