[Telepathy-commits] [telepathy-salut/master] tubes-manager: factor out tubes_capabilities_free
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Thu Feb 26 11:20:24 PST 2009
---
src/salut-tubes-manager.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/salut-tubes-manager.c b/src/salut-tubes-manager.c
index 87c14c0..6b37d17 100644
--- a/src/salut-tubes-manager.c
+++ b/src/salut-tubes-manager.c
@@ -138,7 +138,7 @@ feature_free (gpointer feat)
return;
if (feature->ns != NULL)
- g_free (feature->ns);
+ g_free (feature->ns);
g_slice_free (Feature, feature);
}
@@ -158,6 +158,14 @@ tubes_capabilities_new (void)
}
static void
+tubes_capabilities_free (TubesCapabilities *caps)
+{
+ g_hash_table_destroy (caps->stream_tube_caps);
+ g_hash_table_destroy (caps->dbus_tube_caps);
+ g_slice_free (TubesCapabilities, caps);
+}
+
+static void
salut_tubes_manager_init (SalutTubesManager *self)
{
SalutTubesManagerPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
@@ -1311,9 +1319,7 @@ salut_tubes_manager_free_caps (
gpointer data)
{
TubesCapabilities *caps = data;
- g_hash_table_destroy (caps->stream_tube_caps);
- g_hash_table_destroy (caps->dbus_tube_caps);
- g_slice_free (TubesCapabilities, caps);
+ tubes_capabilities_free (caps);
}
static void
--
1.5.6.5
More information about the telepathy-commits
mailing list