From 75c23479902fd63a9b3bd81e25598ac8c6f22c2a Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Thu, 3 Dec 2015 11:43:21 +0100 Subject: [PATCH] bearer-list: no need for the method to remove all bearers --- src/mm-bearer-list.c | 16 ++++------------ src/mm-bearer-list.h | 1 - 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/mm-bearer-list.c b/src/mm-bearer-list.c index 14477419..a57fa851 100644 --- a/src/mm-bearer-list.c +++ b/src/mm-bearer-list.c @@ -131,17 +131,6 @@ mm_bearer_list_delete_bearer (MMBearerList *self, return FALSE; } -void -mm_bearer_list_delete_all_bearers (MMBearerList *self) -{ - if (!self->priv->bearers) - return; - - g_list_free_full (self->priv->bearers, (GDestroyNotify) g_object_unref); - self->priv->bearers = NULL; - g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_NUM_BEARERS]); -} - GStrv mm_bearer_list_get_paths (MMBearerList *self) { @@ -344,7 +333,10 @@ dispose (GObject *object) { MMBearerList *self = MM_BEARER_LIST (object); - mm_bearer_list_delete_all_bearers (self); + if (self->priv->bearers) { + g_list_free_full (self->priv->bearers, (GDestroyNotify) g_object_unref); + self->priv->bearers = NULL; + } G_OBJECT_CLASS (mm_bearer_list_parent_class)->dispose (object); } diff --git a/src/mm-bearer-list.h b/src/mm-bearer-list.h index a9698958..43f15801 100644 --- a/src/mm-bearer-list.h +++ b/src/mm-bearer-list.h @@ -65,7 +65,6 @@ gboolean mm_bearer_list_add_bearer (MMBearerList *self, gboolean mm_bearer_list_delete_bearer (MMBearerList *self, const gchar *path, GError **error); -void mm_bearer_list_delete_all_bearers (MMBearerList *self); typedef void (*MMBearerListForeachFunc) (MMBaseBearer *bearer, gpointer user_data);