diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-01 21:21:29 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-01 21:21:29 +0800 |
| commit | 0a41b6b31705626c71047261b91afdac711dead7 (patch) | |
| tree | e51c864f00c5966a5bcb903d2b4c35324bf968b7 /libempathy/empathy-utils.c | |
| parent | a980a2b3eaa634981b0ebfe950f50b515e43cf4a (diff) | |
| parent | 1a74f07d19bdbdbf0aa62587343b64f636ec7b20 (diff) | |
| download | gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.gz gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.bz2 gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.lz gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.xz gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.zst gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.zip | |
Merge branch 'empathy-account'
Diffstat (limited to 'libempathy/empathy-utils.c')
| -rw-r--r-- | libempathy/empathy-utils.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index fca7fcb5f..fd54c9a98 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -230,25 +230,16 @@ empathy_xml_node_find_child_prop_value (xmlNodePtr node, 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 * |