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-gtk | |
| 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-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-account-chooser.c | 8 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-log-window.c | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c index 7c6f52fa5..a91b0eb29 100644 --- a/libempathy-gtk/empathy-account-chooser.c +++ b/libempathy-gtk/empathy-account-chooser.c @@ -545,7 +545,7 @@ account_chooser_find_account_foreach (GtkTreeModel *model, gtk_tree_model_get (model, iter, COL_ACCOUNT_POINTER, &account, -1); - if (empathy_account_equal (account, data->account)) { + if (account == data->account) { data->found = TRUE; *(data->iter) = *iter; g_object_unref (account); @@ -688,10 +688,8 @@ account_chooser_set_account_foreach (GtkTreeModel *model, if ((data->account == NULL) != (account == NULL)) { equal = FALSE; } - else if (data->account == account) { - equal = TRUE; - } else { - equal = empathy_account_equal (data->account, account); + else { + equal = (data->account == account); } if (account) { diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index a8ca745e2..0358b0ada 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -204,7 +204,7 @@ chat_new_connection_cb (EmpathyAccountManager *manager, EmpathyAccount *account; account = empathy_account_manager_get_account (manager, connection); - if (!priv->tp_chat && empathy_account_equal (account, priv->account) && + if (!priv->tp_chat && account == priv->account && priv->handle_type != TP_HANDLE_TYPE_NONE && !EMP_STR_EMPTY (priv->id)) { diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 7add30136..11ddca74b 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -774,7 +774,7 @@ log_window_chats_set_selected (EmpathyLogWindow *window, COL_CHAT_IS_CHATROOM, &this_is_chatroom, -1); - if (empathy_account_equal (this_account, account) && + if (this_account == account && strcmp (this_chat_id, chat_id) == 0 && this_is_chatroom == is_chatroom) { gtk_tree_selection_select_iter (selection, &iter); |