diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-30 02:38:13 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-30 02:38:13 +0800 |
| commit | 97d122d36a2e387ccdba9689052b0397bbe42a76 (patch) | |
| tree | 11c26f3a385a00220ae289ab8d47b2ca7d5dd513 /libempathy | |
| parent | a5a46b1dc612eb29b86f4bdfa3b3d80cb35f8893 (diff) | |
| download | gsoc2013-empathy-97d122d36a2e387ccdba9689052b0397bbe42a76.tar gsoc2013-empathy-97d122d36a2e387ccdba9689052b0397bbe42a76.tar.gz gsoc2013-empathy-97d122d36a2e387ccdba9689052b0397bbe42a76.tar.bz2 gsoc2013-empathy-97d122d36a2e387ccdba9689052b0397bbe42a76.tar.lz gsoc2013-empathy-97d122d36a2e387ccdba9689052b0397bbe42a76.tar.xz gsoc2013-empathy-97d122d36a2e387ccdba9689052b0397bbe42a76.tar.zst gsoc2013-empathy-97d122d36a2e387ccdba9689052b0397bbe42a76.zip | |
remove usage of empathy_account_equal
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-chatroom-manager.c | 11 | ||||
| -rw-r--r-- | libempathy/empathy-chatroom.c | 3 | ||||
| -rw-r--r-- | libempathy/empathy-utils.c | 7 | ||||
| -rw-r--r-- | libempathy/empathy-utils.h | 2 |
4 files changed, 5 insertions, 18 deletions
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c index 649dcc9cf..c5f9864a1 100644 --- a/libempathy/empathy-chatroom-manager.c +++ b/libempathy/empathy-chatroom-manager.c @@ -580,9 +580,8 @@ empathy_chatroom_manager_find (EmpathyChatroomManager *manager, this_account = empathy_chatroom_get_account (chatroom); this_room = empathy_chatroom_get_room (chatroom); - if (this_account && this_room && - empathy_account_equal (account, this_account) && - strcmp (this_room, room) == 0) { + if (this_account && this_room && account == this_account + && strcmp (this_room, room) == 0) { return chatroom; } } @@ -611,8 +610,7 @@ empathy_chatroom_manager_get_chatrooms (EmpathyChatroomManager *manager, chatroom = l->data; - if (empathy_account_equal (account, - empathy_chatroom_get_account (chatroom))) { + if (account == empathy_chatroom_get_account (chatroom)) { chatrooms = g_list_append (chatrooms, chatroom); } } @@ -641,8 +639,7 @@ empathy_chatroom_manager_get_count (EmpathyChatroomManager *manager, chatroom = l->data; - if (empathy_account_equal (account, - empathy_chatroom_get_account (chatroom))) { + if (account == empathy_chatroom_get_account (chatroom)) { count++; } } diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c index b62d6ad77..33df9a3d6 100644 --- a/libempathy/empathy-chatroom.c +++ b/libempathy/empathy-chatroom.c @@ -480,8 +480,7 @@ empathy_chatroom_equal (gconstpointer v1, room_a = empathy_chatroom_get_room (EMPATHY_CHATROOM (v1)); room_b = empathy_chatroom_get_room (EMPATHY_CHATROOM (v2)); - return empathy_account_equal (account_a, account_b) && - !tp_strdiff (room_a, room_b); + return account_a == account_b && !tp_strdiff (room_a, room_b); } EmpathyTpChat * diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index 1e1377a8d..db35e94dd 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -227,13 +227,6 @@ empathy_xml_node_find_child_prop_value (xmlNodePtr node, return found; } -gboolean -empathy_account_equal (gconstpointer a, - gconstpointer b) -{ - return a == b; -} - const gchar * empathy_presence_get_default_message (TpConnectionPresenceType presence) { diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h index 3ab4077f5..c6aebb4f2 100644 --- a/libempathy/empathy-utils.h +++ b/libempathy/empathy-utils.h @@ -62,8 +62,6 @@ xmlNodePtr empathy_xml_node_find_child_prop_value (xmlNodePtr node, const gchar *prop_value); /* Others */ -gboolean empathy_account_equal (gconstpointer a, - gconstpointer b); const gchar * empathy_presence_get_default_message (TpConnectionPresenceType presence); const gchar * empathy_presence_to_str (TpConnectionPresenceType presence); TpConnectionPresenceType empathy_presence_from_str (const gchar *str); |