[network-manager-applet/th/tmp: 9/15] applet-device-wifi: remove unused functions



commit 260bc847e21e31daccfa6a2887e415f32c6b89e1
Author: Beniamino Galvani <bgalvani redhat com>
Date:   Tue Mar 14 14:18:06 2017 +0100

    applet-device-wifi: remove unused functions
    
    They are not needed since commit 9b002809514a ("applet: remove usage
    of dbus-glib and private session D-Bus API").
    
    (cherry picked from commit d1c7f4d61f2eca23d90078c587059e4d8d11d3fc)

 src/applet-device-wifi.c |   68 ----------------------------------------------
 src/applet.h             |    3 --
 2 files changed, 0 insertions(+), 71 deletions(-)
---
diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
index 4bc819d..087b09e 100644
--- a/src/applet-device-wifi.c
+++ b/src/applet-device-wifi.c
@@ -292,74 +292,6 @@ nma_menu_add_create_network_item (GtkWidget *menu, NMApplet *applet)
                gtk_widget_set_sensitive (GTK_WIDGET (menu_item), FALSE);
 }
 
-static void
-dbus_8021x_add_and_activate_cb (GObject *client,
-                                GAsyncResult *result,
-                                gpointer user_data)
-{
-       GError *error = NULL;
-       NMActiveConnection *active;
-
-       active = nm_client_add_and_activate_connection_finish (NM_CLIENT (client), result, &error);
-       if (error)
-               g_warning ("Failed to add/activate connection: (%d) %s", error->code, error->message);
-
-       g_clear_object (&active);
-       g_clear_error (&error);
-}
-
-typedef struct {
-       NMApplet *applet;
-       NMDevice *device;
-       NMAccessPoint *ap;
-} Dbus8021xInfo;
-
-static void
-dbus_connect_8021x_cb (NMConnection *connection,
-                       gboolean auto_created,
-                       gboolean canceled,
-                       gpointer user_data)
-{
-       Dbus8021xInfo *info = user_data;
-
-       if (canceled == FALSE) {
-               g_return_if_fail (connection != NULL);
-
-               /* Ask NM to add the new connection and activate it; NM will fill in the
-                * missing details based on the specific object and the device.
-                */
-               nm_client_add_and_activate_connection_async (info->applet->nm_client,
-                                                            connection,
-                                                            info->device,
-                                                            nm_object_get_path (NM_OBJECT (info->ap)),
-                                                            NULL,
-                                                            dbus_8021x_add_and_activate_cb,
-                                                            info->applet);
-       }
-
-       g_object_unref (info->device);
-       g_object_unref (info->ap);
-       memset (info, 0, sizeof (*info));
-       g_free (info);
-}
-
-gboolean
-applet_wifi_connect_to_8021x_network (NMApplet *applet,
-                                      NMDevice *device,
-                                      NMAccessPoint *ap)
-{
-       Dbus8021xInfo *info;
-
-       info = g_malloc0 (sizeof (*info));
-       info->applet = applet;
-       info->device = g_object_ref (device);
-       info->ap = g_object_ref (ap);
-
-       _do_new_auto_connection (applet, device, ap, dbus_connect_8021x_cb, info);
-       return TRUE;
-}
-
-
 typedef struct {
        NMApplet *applet;
        NMDeviceWifi *device;
diff --git a/src/applet.h b/src/applet.h
index 41e95a1..b28dfa2 100644
--- a/src/applet.h
+++ b/src/applet.h
@@ -285,9 +285,6 @@ GdkPixbuf * nma_icon_check_and_load (const char *name,
                                      NMApplet *applet);
 
 gboolean applet_wifi_connect_to_hidden_network (NMApplet *applet);
-gboolean applet_wifi_connect_to_8021x_network (NMApplet *applet,
-                                               NMDevice *device,
-                                               NMAccessPoint *ap);
 gboolean applet_wifi_create_wifi_network (NMApplet *applet);
 gboolean applet_wifi_can_create_wifi_network (NMApplet *applet);
 


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