Remove next_item marker and goto calls.

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

1 files changed, 8 insertions, 7 deletions

diff --git a/libempathy/empathy-log-store-pidgin.c b/libempathy/empathy-log-store-pidgin.c
index 4ea0f8756..6cb670c2d 100644
--- a/libempathy/empathy-log-store-pidgin.c
+++ b/libempathy/empathy-log-store-pidgin.c
@@ -454,7 +454,8 @@ log_store_pidgin_get_messages_for_files (EmpathyLogStore *self,
       if (!g_file_test (filename, G_FILE_TEST_EXISTS))
         {
           DEBUG ("Filename:'%s' does not exist", filename);
-          goto next_item;
+          g_object_unref (account);
+          continue;
         }
 
       if (!g_file_get_contents (filename, &buffer, &length, &error))
@@ -462,7 +463,8 @@ log_store_pidgin_get_messages_for_files (EmpathyLogStore *self,
           DEBUG ("Failed to read file: %s",
               error ? error->message : "no message");
           g_error_free (error);
-          goto next_item;
+          g_object_unref (account);
+          continue;
         }
 
       lines = g_strsplit (buffer, "\n", -1);
@@ -491,14 +493,16 @@ log_store_pidgin_get_messages_for_files (EmpathyLogStore *self,
       if (hits == NULL)
         {
           g_strfreev (lines);
-          goto next_item;
+          g_object_unref (account);
+          continue;
         }
 
       if (g_strv_length (hits) != 5)
         {
           g_strfreev (lines);
           g_strfreev (hits);
-          goto next_item;
+          g_object_unref (account);
+          continue;
         }
 
       sender_id = g_strdup (hits[1]);
@@ -608,9 +612,6 @@ log_store_pidgin_get_messages_for_files (EmpathyLogStore *self,
       g_free (protocol);
 
       g_strfreev (lines);
-
-next_item:
-      g_object_unref (account);
     }
 
   DEBUG ("Parsed %d messages", g_list_length (messages));