diff options
Diffstat (limited to 'libempathy/empathy-utils.c')
| -rw-r--r-- | libempathy/empathy-utils.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index 47746f536..fd54c9a98 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -193,7 +193,7 @@ empathy_xml_node_get_child_content (xmlNodePtr node, if (l) { return xmlNodeGetContent (l); } - + return NULL; } @@ -220,35 +220,26 @@ empathy_xml_node_find_child_prop_value (xmlNodePtr node, if (prop && strcmp (prop, prop_value) == 0) { found = l; } - + xmlFree (prop); } - + return found; } guint empathy_account_hash (gconstpointer key) { - g_return_val_if_fail (MC_IS_ACCOUNT (key), 0); + g_return_val_if_fail (EMPATHY_IS_ACCOUNT (key), 0); - return g_str_hash (mc_account_get_unique_name (MC_ACCOUNT (key))); + return g_str_hash (empathy_account_get_unique_name (EMPATHY_ACCOUNT (key))); } gboolean empathy_account_equal (gconstpointer a, gconstpointer b) { - const gchar *name_a; - const gchar *name_b; - - g_return_val_if_fail (MC_IS_ACCOUNT (a), FALSE); - g_return_val_if_fail (MC_IS_ACCOUNT (b), FALSE); - - name_a = mc_account_get_unique_name (MC_ACCOUNT (a)); - name_b = mc_account_get_unique_name (MC_ACCOUNT (b)); - - return g_str_equal (name_a, name_b); + return a == b; } MissionControl * |