summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Alfarano <cosimo.alfarano@collabora.co.uk>2011-11-18 12:32:18 +0000
committerCosimo Alfarano <cosimo.alfarano@collabora.co.uk>2011-11-18 14:18:43 +0000
commit6b705626d17f05552e518107afbca35012c12b73 (patch)
treea974066b87c46ba04c1a519a589f6f84cfdab227
parent1be52f807c693d2db9de7c0784081dda855e0aee (diff)
downloadtelepathy-logger-6b705626d17f05552e518107afbca35012c12b73.tar.gz
Replace g_hash_table_destroy with g_hash_table_unref
-rw-r--r--telepathy-logger/dbus-service.c4
-rw-r--r--telepathy-logger/debug.c2
-rw-r--r--telepathy-logger/log-store-xml.c2
-rw-r--r--tests/lib/contacts-conn.c30
4 files changed, 19 insertions, 19 deletions
diff --git a/telepathy-logger/dbus-service.c b/telepathy-logger/dbus-service.c
index db41e83..b253bb2 100644
--- a/telepathy-logger/dbus-service.c
+++ b/telepathy-logger/dbus-service.c
@@ -287,7 +287,7 @@ tpl_dbus_service_dispose (GObject *obj)
if (priv->accounts_contacts_map != NULL)
{
- g_hash_table_destroy (priv->accounts_contacts_map);
+ g_hash_table_unref (priv->accounts_contacts_map);
priv->accounts_contacts_map = NULL;
}
@@ -355,7 +355,7 @@ _tpl_dbus_service_init (TplDBusService *self)
self->priv = priv;
priv->manager = tpl_log_manager_dup_singleton ();
priv->accounts_contacts_map = g_hash_table_new_full (g_str_hash, g_str_equal,
- (GDestroyNotify) g_free, (GDestroyNotify) g_hash_table_destroy);
+ (GDestroyNotify) g_free, (GDestroyNotify) g_hash_table_unref);
priv->favourite_contacts_actions = NULL;
}
diff --git a/telepathy-logger/debug.c b/telepathy-logger/debug.c
index 421cd77..6bf370b 100644
--- a/telepathy-logger/debug.c
+++ b/telepathy-logger/debug.c
@@ -81,7 +81,7 @@ _tpl_debug_free (void)
if (flag_to_domains == NULL)
return;
- g_hash_table_destroy (flag_to_domains);
+ g_hash_table_unref (flag_to_domains);
flag_to_domains = NULL;
}
diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c
index 8a86dbc..ce348b7 100644
--- a/telepathy-logger/log-store-xml.c
+++ b/telepathy-logger/log-store-xml.c
@@ -1492,7 +1492,7 @@ log_store_xml_get_events_for_file (TplLogStoreXml *self,
g_free (target_id);
xmlFreeDoc (doc);
xmlFreeParserCtxt (ctxt);
- g_hash_table_destroy (supersedes_links);
+ g_hash_table_unref (supersedes_links);
}
diff --git a/tests/lib/contacts-conn.c b/tests/lib/contacts-conn.c
index f786d52..c2d7cbc 100644
--- a/tests/lib/contacts-conn.c
+++ b/tests/lib/contacts-conn.c
@@ -159,13 +159,13 @@ finalize (GObject *object)
TpTestsContactsConnection *self = TP_TESTS_CONTACTS_CONNECTION (object);
tp_contacts_mixin_finalize (object);
- g_hash_table_destroy (self->priv->aliases);
- g_hash_table_destroy (self->priv->avatars);
- g_hash_table_destroy (self->priv->presence_statuses);
- g_hash_table_destroy (self->priv->presence_messages);
- g_hash_table_destroy (self->priv->locations);
- g_hash_table_destroy (self->priv->capabilities);
- g_hash_table_destroy (self->priv->contact_info);
+ g_hash_table_unref (self->priv->aliases);
+ g_hash_table_unref (self->priv->avatars);
+ g_hash_table_unref (self->priv->presence_statuses);
+ g_hash_table_unref (self->priv->presence_messages);
+ g_hash_table_unref (self->priv->locations);
+ g_hash_table_unref (self->priv->capabilities);
+ g_hash_table_unref (self->priv->contact_info);
if (self->priv->default_contact_info != NULL)
g_ptr_array_unref (self->priv->default_contact_info);
@@ -427,7 +427,7 @@ my_get_contact_statuses (GObject *object,
g_hash_table_insert (result, key,
tp_presence_status_new (index, parameters));
- g_hash_table_destroy (parameters);
+ g_hash_table_unref (parameters);
}
return result;
@@ -573,12 +573,12 @@ tp_tests_contacts_connection_change_presences (
g_hash_table_insert (presences, key, tp_presence_status_new (indexes[i],
parameters));
- g_hash_table_destroy (parameters);
+ g_hash_table_unref (parameters);
}
tp_presence_mixin_emit_presence_update ((GObject *) self,
presences);
- g_hash_table_destroy (presences);
+ g_hash_table_unref (presences);
}
void
@@ -727,7 +727,7 @@ my_get_aliases (TpSvcConnectionInterfaceAliasing *aliasing,
tp_svc_connection_interface_aliasing_return_from_get_aliases (context,
result);
- g_hash_table_destroy (result);
+ g_hash_table_unref (result);
}
static void
@@ -838,7 +838,7 @@ my_get_avatar_tokens (TpSvcConnectionInterfaceAvatars *avatars,
tp_svc_connection_interface_avatars_return_from_get_known_avatar_tokens (
context, result);
- g_hash_table_destroy (result);
+ g_hash_table_unref (result);
}
static void
@@ -878,7 +878,7 @@ my_get_known_avatar_tokens (TpSvcConnectionInterfaceAvatars *avatars,
tp_svc_connection_interface_avatars_return_from_get_known_avatar_tokens (
context, result);
- g_hash_table_destroy (result);
+ g_hash_table_unref (result);
}
static void
@@ -992,7 +992,7 @@ my_get_locations (TpSvcConnectionInterfaceLocation *avatars,
tp_svc_connection_interface_location_return_from_get_locations (
context, result);
- g_hash_table_destroy (result);
+ g_hash_table_unref (result);
}
static void
@@ -1046,7 +1046,7 @@ my_get_contact_capabilities (TpSvcConnectionInterfaceContactCapabilities *obj,
tp_svc_connection_interface_contact_capabilities_return_from_get_contact_capabilities (
context, result);
- g_hash_table_destroy (result);
+ g_hash_table_unref (result);
}
static void