From f390cc946b33d2a22a2c47ec0f9b7470f254853e Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Fri, 12 Feb 2010 11:44:12 +0000 Subject: Remove weird maybe-null account special case. I'm pretty sure this is unnecessary. Consider the four cases: value of data->account | 0 | x | value of account | 0 | y | 0 | y | a. data->account == NULL | t | f | t | f | b. account == NULL | t | t | f | f | c. a != b | f | t | t | f | d. data->account == account | t | f | f | x == y | e. equal | t | f | f | x == y | In all cases, the value of equal is identical to what it would have been if the else branch were always taken. So... let's just always take the else branch. --- libempathy-gtk/empathy-account-chooser.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c index bd46efc16..1b5ddeb19 100644 --- a/libempathy-gtk/empathy-account-chooser.c +++ b/libempathy-gtk/empathy-account-chooser.c @@ -786,13 +786,7 @@ account_chooser_set_account_foreach (GtkTreeModel *model, gtk_tree_model_get (model, iter, COL_ACCOUNT_POINTER, &account, -1); - /* Special case so we can make it possible to select the All option */ - if ((data->account == NULL) != (account == NULL)) { - equal = FALSE; - } - else { - equal = (data->account == account); - } + equal = (data->account == account); if (account) { g_object_unref (account); -- cgit v1.2.3