Use a for instead of a do while to avoid returning early

So we always free the stuff at the end of the function.

1 files changed, 4 insertions, 5 deletions

diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 60abae2c0..d7d97c24c 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -1888,15 +1888,15 @@ log_window_chats_set_selected (EmpathyLogWindow *window)
   GtkTreeSelection     *selection;
   GtkTreeIter           iter;
   GtkTreePath          *path;
+  gboolean              next;
 
   view = GTK_TREE_VIEW (window->treeview_who);
   model = gtk_tree_view_get_model (view);
   selection = gtk_tree_view_get_selection (view);
 
-  if (!gtk_tree_model_get_iter_first (model, &iter))
-    return;
-
-  do
+  for (next = gtk_tree_model_get_iter_first (model, &iter);
+       next;
+       next = gtk_tree_model_iter_next (model, &iter))
     {
       TpAccount   *this_account;
       TplEntity   *this_target;
@@ -1928,7 +1928,6 @@ log_window_chats_set_selected (EmpathyLogWindow *window)
       g_object_unref (this_account);
       g_object_unref (this_target);
     }
-  while (gtk_tree_model_iter_next (model, &iter));
 
   tp_clear_object (&window->selected_account);
   tp_clear_pointer (&window->selected_chat_id, g_free);