From 49df40fdffe07292d90ebc937b2996c62e8eb547 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 12 May 2016 09:52:52 -0500 Subject: [PATCH] network: Move network_emit_removed to network.c --- src/network.c | 17 +++++++++++++++++ src/network.h | 1 + src/wiphy.c | 17 ----------------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/network.c b/src/network.c index a97d93f9..3e2b13e8 100644 --- a/src/network.c +++ b/src/network.c @@ -254,6 +254,23 @@ void network_emit_added(struct network *network) l_dbus_send(dbus, signal); } +void network_emit_removed(struct network *network) +{ + struct l_dbus *dbus = dbus_get_bus(); + struct l_dbus_message *signal; + + signal = l_dbus_message_new_signal(dbus, + device_get_path(network->netdev), + IWD_DEVICE_INTERFACE, + "NetworkRemoved"); + + if (!signal) + return; + + l_dbus_message_set_arguments(signal, "o", network->object_path); + l_dbus_send(dbus, signal); +} + void network_init() { networks = l_queue_new(); diff --git a/src/network.h b/src/network.h index 52013090..2821b188 100644 --- a/src/network.h +++ b/src/network.h @@ -50,6 +50,7 @@ const char *network_get_path(struct network *network); enum security network_get_security(struct network *network); void network_emit_added(struct network *network); +void network_emit_removed(struct network *network); void network_init(); void network_exit(); diff --git a/src/wiphy.c b/src/wiphy.c index a5441ea5..1e42b4cf 100644 --- a/src/wiphy.c +++ b/src/wiphy.c @@ -509,23 +509,6 @@ static void setup_network_interface(struct l_dbus_interface *interface) NULL); } -static void network_emit_removed(struct network *network) -{ - struct l_dbus *dbus = dbus_get_bus(); - struct l_dbus_message *signal; - - signal = l_dbus_message_new_signal(dbus, - device_get_path(network->netdev), - IWD_DEVICE_INTERFACE, - "NetworkRemoved"); - - if (!signal) - return; - - l_dbus_message_set_arguments(signal, "o", network->object_path); - l_dbus_send(dbus, signal); -} - static void bss_free(void *data) { struct scan_bss *bss = data;