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



commit c853f46669bb05e72b23ec76270cf40f78a49351
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Wed Apr 8 10:09:34 2015 +0200

    fixup! editor: Add support for creating Bluetooth connections

 src/connection-editor/page-bluetooth.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/connection-editor/page-bluetooth.c b/src/connection-editor/page-bluetooth.c
index 3fa07ee..fea6218 100644
--- a/src/connection-editor/page-bluetooth.c
+++ b/src/connection-editor/page-bluetooth.c
@@ -31,7 +31,7 @@
 
 #include "page-bluetooth.h"
 #include "nm-connection-editor.h"
-#include "nm-mobile-wizard.h"
+#include "nma-mobile-wizard.h"
 
 G_DEFINE_TYPE (CEPageBluetooth, ce_page_bluetooth, CE_TYPE_PAGE)
 
@@ -175,7 +175,7 @@ ce_page_bluetooth_class_init (CEPageBluetoothClass *bluetooth_class)
 }
 
 typedef struct {
-       NMRemoteSettings *settings;
+       NMClient *client;
        PageNewConnectionResultFunc result_func;
        gpointer user_data;
        const gchar *type;
@@ -232,7 +232,7 @@ new_connection_mobile_wizard_done (NMAMobileWizard *wizard,
        connection = ce_page_new_connection (detail,
                                             NM_SETTING_BLUETOOTH_SETTING_NAME,
                                             FALSE,
-                                            info->settings,
+                                            info->client,
                                             user_data);
        g_free (detail);
        nm_connection_add_setting (connection, nm_setting_bluetooth_new ());
@@ -250,14 +250,14 @@ out:
        if (wizard)
                nma_mobile_wizard_destroy (wizard);
 
-       g_object_unref (info->settings);
+       g_object_unref (info->client);
        g_free (info);
 }
 
 void
 bluetooth_connection_new (GtkWindow *parent,
                           const char *detail,
-                          NMRemoteSettings *settings,
+                          NMClient *client,
                           PageNewConnectionResultFunc result_func,
                           gpointer user_data)
 {
@@ -268,7 +268,7 @@ bluetooth_connection_new (GtkWindow *parent,
 
        info = g_malloc0 (sizeof (WizardInfo));
        info->result_func = result_func;
-       info->settings = g_object_ref (settings);
+       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;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]