[gnome-applets] netspeed: use g_list_free_full
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-applets] netspeed: use g_list_free_full
- Date: Fri, 3 Apr 2020 20:16:03 +0000 (UTC)
commit 6c962d8c3be18a60be52584c219d7b2a8923cbff
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Fri Apr 3 23:07:39 2020 +0300
netspeed: use g_list_free_full
gnome-applets/netspeed/backend.c | 9 ---------
gnome-applets/netspeed/backend.h | 3 ---
gnome-applets/netspeed/netspeed-applet.c | 5 +++--
gnome-applets/netspeed/preferences.c | 10 ++++++++--
4 files changed, 11 insertions(+), 16 deletions(-)
---
diff --git a/gnome-applets/netspeed/backend.c b/gnome-applets/netspeed/backend.c
index aa9b1bbe9..ab970c1b2 100644
--- a/gnome-applets/netspeed/backend.c
+++ b/gnome-applets/netspeed/backend.c
@@ -117,15 +117,6 @@ get_default_route(void)
return NULL;
}
-
-void
-free_devices_list(GList *list)
-{
- g_list_foreach(list, (GFunc)g_free, NULL);
- g_list_free(list);
-}
-
-
/* Frees a DevInfo struct and all the stuff it contains
*/
void
diff --git a/gnome-applets/netspeed/backend.h b/gnome-applets/netspeed/backend.h
index b60c6157a..99fd5a01f 100644
--- a/gnome-applets/netspeed/backend.h
+++ b/gnome-applets/netspeed/backend.h
@@ -79,9 +79,6 @@ get_default_route(void);
gboolean
is_dummy_device(const char* device);
-void
-free_devices_list(GList *list);
-
void
free_device_info(DevInfo *devinfo);
diff --git a/gnome-applets/netspeed/netspeed-applet.c b/gnome-applets/netspeed/netspeed-applet.c
index d6db60f1e..2cbffc392 100644
--- a/gnome-applets/netspeed/netspeed-applet.c
+++ b/gnome-applets/netspeed/netspeed-applet.c
@@ -418,7 +418,8 @@ search_for_up_if(NetspeedApplet *applet)
if (set_applet_devinfo(applet, tmp->data))
break;
}
- free_devices_list(devices);
+
+ g_list_free_full (devices, g_free);
}
/* Here happens the really interesting stuff */
@@ -1503,7 +1504,7 @@ netspeed_applet_get_auto_device_name (void)
}
}
- free_devices_list (devices);
+ g_list_free_full (devices, g_free);
if (device != NULL)
return device;
diff --git a/gnome-applets/netspeed/preferences.c b/gnome-applets/netspeed/preferences.c
index 605356d7b..404da8f01 100644
--- a/gnome-applets/netspeed/preferences.c
+++ b/gnome-applets/netspeed/preferences.c
@@ -135,10 +135,16 @@ device_settings_changed (GSettings *settings,
g_settings_set_boolean (settings, "auto-change-device", TRUE);
}
- free_devices_list (devices);
+ g_list_free_full (devices, g_free);
g_free (device);
}
+static void
+free_devices (gpointer data)
+{
+ g_list_free_full (data, g_free);
+}
+
GtkWidget *
create_network_hbox (NetspeedPreferences *preferences)
{
@@ -180,7 +186,7 @@ create_network_hbox (NetspeedPreferences *preferences)
g_object_set_data_full (G_OBJECT (network_device_combo),
"devices", devices,
- (GDestroyNotify) free_devices_list);
+ free_devices);
g_signal_connect (network_device_combo, "changed",
G_CALLBACK (device_change_cb), preferences);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]