[network-manager-applet/lr/bluetooth] fixup! editor: Add support for creating Bluetooth connections

[Jiří Klimeš <jklimes src gnome org>]

commit fed6ae9346c334f914c92eb8b0d2c7e7795e5c3d
Author: Jiří Klimeš <jklimes redhat com>
Date:   Wed Apr 15 11:19:22 2015 +0200

    fixup! editor: Add support for creating Bluetooth connections

 src/connection-editor/page-bluetooth.c |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/src/connection-editor/page-bluetooth.c b/src/connection-editor/page-bluetooth.c
index fea6218..aa20f06 100644
--- a/src/connection-editor/page-bluetooth.c
+++ b/src/connection-editor/page-bluetooth.c
@@ -17,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright 2014 Red Hat, Inc.
+ * Copyright 2014 - 2015 Red Hat, Inc.
  */
 
 #include "config.h"
@@ -237,7 +237,7 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
        g_free (detail);
        nm_connection_add_setting (connection, nm_setting_bluetooth_new ());
        g_object_set (nm_connection_get_setting_bluetooth (connection),
-               NM_SETTING_BLUETOOTH_TYPE, info->type, NULL);
+                     NM_SETTING_BLUETOOTH_TYPE, info->type, NULL);
 
        if (type_setting) {
                nm_connection_add_setting (connection, type_setting);
@@ -271,10 +271,8 @@ bluetooth_connection_new (GtkWindow *parent,
        info->client = g_object_ref (client);
        info->user_data = user_data;
        info->type = NM_SETTING_BLUETOOTH_TYPE_PANU;
-       info->type = NM_SETTING_BLUETOOTH_TYPE_DUN;
 
-
-       dialog = gtk_dialog_new_with_buttons (_("Select Bluetooth Connection Profile"),
+       dialog = gtk_dialog_new_with_buttons (_("Bluetooth Type"),
                                              parent,
                                              GTK_DIALOG_MODAL,
                                              GTK_STOCK_CANCEL,
@@ -292,17 +290,17 @@ bluetooth_connection_new (GtkWindow *parent,
        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
        gtk_container_add (GTK_CONTAINER (alignment), vbox);
 
-       label = gtk_label_new (_("Select the Bluetooth Profile your device uses."));
+       label = gtk_label_new (_("Select the type of the Bluetooth connection profile."));
        gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
        gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
        gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 12);
 
-       panu_radio = gtk_radio_button_new_with_mnemonic (NULL, _("Personal Area Network"));
+       panu_radio = gtk_radio_button_new_with_mnemonic (NULL, _("_Personal Area Network"));
        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (panu_radio), TRUE);
        gtk_box_pack_start (GTK_BOX (vbox), panu_radio, FALSE, FALSE, 6);
 
        dun_radio = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (panu_radio),
-                                                                   _("Dial-Up Network"));
+                                                                   _("_Dial-Up Network"));
        gtk_box_pack_start (GTK_BOX (vbox), dun_radio, FALSE, FALSE, 6);
 
        gtk_widget_show_all (dialog);
@@ -318,10 +316,8 @@ bluetooth_connection_new (GtkWindow *parent,
        }
        gtk_widget_destroy (dialog);
 
-       if (wizard) {
+       if (wizard)
                nma_mobile_wizard_present (wizard);
-               return;
-       } else {
+       else
                new_connection_mobile_wizard_done (NULL, (response != GTK_RESPONSE_OK), NULL, info);
-       }
 }