[gnome-bluetooth] Remove "finished" case in cancel callback
- From: Bastien Nocera <hadess src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-bluetooth] Remove "finished" case in cancel callback
- Date: Tue, 16 Jun 2009 08:55:39 -0400 (EDT)
commit a1340d146c90d6a498e24ba4580c93102af56769
Author: Bastien Nocera <hadess hadess net>
Date: Tue Jun 16 11:39:02 2009 +0100
Remove "finished" case in cancel callback
Not sure what that was for...
wizard/main.c | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
---
diff --git a/wizard/main.c b/wizard/main.c
index 8f3da96..76194f9 100644
--- a/wizard/main.c
+++ b/wizard/main.c
@@ -249,20 +249,11 @@ static gboolean cancel_callback(DBusGMethodInvocation *context,
gtk_assistant_set_current_page (window_assistant, PAGE_FAILURE);
- if (target_ssp == FALSE) {
- /* translators:
- * The '%s' is the device name, for example:
- * Pairing with 'Sony Bluetooth Headset' cancelled
- */
- text = g_strdup_printf(_("Pairing with '%s' cancelled"), target_name);
- } else {
- //FIXME why finished when it's been cancelled/failed?
- /* translators:
- * The '%s' is the device name, for example:
- * Pairing with 'Sony Bluetooth Headset' finished
- */
- text = g_strdup_printf(_("Pairing with '%s' finished"), target_name);
- }
+ /* translators:
+ * The '%s' is the device name, for example:
+ * Pairing with 'Sony Bluetooth Headset' cancelled
+ */
+ text = g_strdup_printf(_("Pairing with '%s' cancelled"), target_name);
gtk_label_set_text(GTK_LABEL(label_failure), text);
@@ -762,7 +753,6 @@ static GtkAssistant *create_wizard(void)
extra_config_frame = W("extra_config_frame");
/* Set page icons (named icons not supported by Glade) */
- //FIXME move to GtkBuilder
gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, NULL, &height);
pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
"bluetooth", height, 0, NULL);
@@ -775,6 +765,11 @@ static GtkAssistant *create_wizard(void)
if (pixbuf != NULL)
g_object_unref (pixbuf);
+ //FIXME use:
+ // g_signal_connect (G_OBJECT (page), "notify::visible",
+ // G_CALLBACK (on_page_notify_visibility), assistant);
+ //to setup our own buttons
+
/* Passkey dialog */
passkey_dialog = W("passkey_dialog");
radio_auto = W("radio_auto");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]