[network-manager-applet/jk/bluetoth-editor: 2/3] fixup! editor: Add support for editing Bluetooth connections

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

commit 68da027d1850a4b5c39a3b578e582ce85f87330d
Author: Jiří Klimeš <jklimes redhat com>
Date:   Mon Sep 29 10:38:40 2014 +0200

    fixup! editor: Add support for editing Bluetooth connections

 src/connection-editor/ce-page-bluetooth.ui |    2 +-
 src/connection-editor/page-bluetooth.c     |   28 +++++++++++++---------------
 src/connection-editor/page-bluetooth.h     |    2 +-
 3 files changed, 15 insertions(+), 17 deletions(-)
---
diff --git a/src/connection-editor/ce-page-bluetooth.ui b/src/connection-editor/ce-page-bluetooth.ui
index b378586..f67ef9b 100644
--- a/src/connection-editor/ce-page-bluetooth.ui
+++ b/src/connection-editor/ce-page-bluetooth.ui
@@ -25,7 +25,7 @@
       </packing>
     </child>
     <child>
-      <object class="GtkLabel" id="label26">
+      <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="xalign">0</property>
diff --git a/src/connection-editor/page-bluetooth.c b/src/connection-editor/page-bluetooth.c
index cfce857..b1fa0a1 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.
  *
- * (C) Copyright 2014 Red Hat, Inc.
+ * Copyright 2014 Red Hat, Inc.
  */
 
 #include "config.h"
@@ -29,8 +29,6 @@
 
 #include <nm-setting-connection.h>
 #include <nm-setting-bluetooth.h>
-#include <nm-setting-ppp.h>
-#include <nm-setting-wired.h>
 
 #include "page-bluetooth.h"
 #include "nm-connection-editor.h"
@@ -91,23 +89,23 @@ finish_setup (CEPageBluetooth *self, gpointer unused, GError *error, gpointer us
 
 CEPage *
 ce_page_bluetooth_new (NMConnection *connection,
-                 GtkWindow *parent_window,
-                 NMClient *client,
-                 NMRemoteSettings *settings,
-                 const char **out_secrets_setting_name,
-                 GError **error)
+                       GtkWindow *parent_window,
+                       NMClient *client,
+                       NMRemoteSettings *settings,
+                       const char **out_secrets_setting_name,
+                       GError **error)
 {
        CEPageBluetooth *self;
        CEPageBluetoothPrivate *priv;
 
        self = CE_PAGE_BLUETOOTH (ce_page_new (CE_TYPE_PAGE_BLUETOOTH,
-                                        connection,
-                                        parent_window,
-                                        client,
-                                        settings,
-                                        UIDIR "/ce-page-bluetooth.ui",
-                                        "BluetoothPage",
-                                        _("Bluetooth")));
+                                 connection,
+                                 parent_window,
+                                 client,
+                                 settings,
+                                 UIDIR "/ce-page-bluetooth.ui",
+                                 "BluetoothPage",
+                                 _("Bluetooth")));
        if (!self) {
                g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("Could not load Bluetooth user 
interface."));
                return NULL;
diff --git a/src/connection-editor/page-bluetooth.h b/src/connection-editor/page-bluetooth.h
index 202d0c9..fb98865 100644
--- a/src/connection-editor/page-bluetooth.h
+++ b/src/connection-editor/page-bluetooth.h
@@ -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.
  *
- * (C) Copyright 2014 Red Hat, Inc.
+ * Copyright 2014 Red Hat, Inc.
  */
 
 #ifndef __PAGE_BLUETOOTH_H__