fixup! Track killswitch change signals from urfkill

3 files changed, 3 insertions, 8 deletions

diff --git a/src/nm-manager.c b/src/nm-manager.c
index 3ea25d348a..20dfca0ad0 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -4846,7 +4846,6 @@ urfkill_wlan_state_changed_cb (NMUrfkillManager *mgr,
 {
 	NMManager *self = NM_MANAGER (user_data);
 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
-	GError *error = NULL;
 
 	nm_log_dbg (LOGD_RFKILL, "urfkill wlan state changed to %s",
 	            enabled ? "enabled" : "disabled");
@@ -4869,7 +4868,6 @@ urfkill_wwan_state_changed_cb (NMUrfkillManager *mgr,
 {
 	NMManager *self = NM_MANAGER (user_data);
 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
-	GError *error = NULL;
 
 	nm_log_dbg (LOGD_RFKILL, "urfkill wwan state changed to %s",
 	            enabled ? "enabled" : "disabled");
@@ -4946,6 +4944,7 @@ nm_manager_new (NMSettings *settings,
 	NMManagerPrivate *priv;
 	DBusConnection *dbus_connection;
 	NMConfigData *config_data;
+	KillState *kill_state;
 
 	g_assert (settings);
 
@@ -5046,7 +5045,7 @@ nm_manager_new (NMSettings *settings,
 	 * changes to the WirelessEnabled/WWANEnabled properties which toggle kernel
 	 * rfkill.
 	 */
-	KillState *kill_state = g_slice_new0 (KillState);
+	kill_state = g_slice_new0 (KillState);
 	kill_state->manager = g_object_ref (singleton);
 	kill_state->wlan_enabled = initial_wifi_enabled;
 	kill_state->wwan_enabled = initial_wwan_enabled;
diff --git a/src/nm-urfkill-manager.c b/src/nm-urfkill-manager.c
index 2c039e865e..9074c36746 100644
--- a/src/nm-urfkill-manager.c
+++ b/src/nm-urfkill-manager.c
@@ -63,7 +63,6 @@ wlan_state_changed (GDBusProxy *proxy,
                     gpointer             user_data)
 {
 	NMUrfkillManager *self = NM_URFKILL_MANAGER (user_data);
-	GVariant *state;
 	gboolean enabled;
 
 	enabled = nm_urfkill_get_wlan_state (self);
@@ -81,7 +80,6 @@ wwan_state_changed (GDBusProxy *proxy,
                     gpointer             user_data)
 {
 	NMUrfkillManager *self = NM_URFKILL_MANAGER (user_data);
-	GVariant *state = NULL;
 	gboolean enabled;
 
 	enabled = nm_urfkill_get_wwan_state (self);
@@ -234,8 +232,6 @@ on_urfkill_vanished (GDBusConnection *connection,
 static void
 nm_urfkill_manager_init (NMUrfkillManager *self)
 {
-	DBusGConnection *bus;
-
 	self->urfkill_watch = g_bus_watch_name (G_BUS_TYPE_SYSTEM,
 	                                        "org.freedesktop.URfkill",
 	                                        0,
diff --git a/src/nm-urfkill-manager.h b/src/nm-urfkill-manager.h
index 97151e88b7..da8772d513 100644
--- a/src/nm-urfkill-manager.h
+++ b/src/nm-urfkill-manager.h
@@ -39,7 +39,7 @@ typedef struct _NMUrfkillManager NMUrfkillManager;
 
 GType nm_urfkill_manager_get_type (void);
 
-NMUrfkillManager *nm_urfkill_manager_new ();
+NMUrfkillManager *nm_urfkill_manager_new (void);
 
 gboolean nm_urfkill_get_wlan_state (NMUrfkillManager *self);
 gboolean nm_urfkill_get_wwan_state (NMUrfkillManager *self);