[libgit2-glib] convert: minor cleanup

[Ignacio Casal Quinteiro <icq src gnome org>]

commit df8c785c7676d6cfa6113a0551321e5f0cd2277d
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sat Aug 29 18:54:42 2015 +0200

    convert: minor cleanup

 libgit2-glib/ggit-convert.c |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/libgit2-glib/ggit-convert.c b/libgit2-glib/ggit-convert.c
index 9540f0d..c0cec9f 100644
--- a/libgit2-glib/ggit-convert.c
+++ b/libgit2-glib/ggit-convert.c
@@ -125,19 +125,18 @@ ggit_convert_utf8 (const gchar *str,
                }
        }
 
-       if (from_charset != NULL &&
-           g_ascii_strcasecmp (from_charset, "UTF-8") == 0)
-       {
-               gchar *ret = g_strndup (str, size);
-               utf8_validate_fallback (ret, size);
-
-               return ret;
-       }
-       else if (from_charset)
+       if (from_charset != NULL)
        {
                gchar *ret;
 
-               if (convert_and_check (str, size, from_charset, &ret))
+               if (g_ascii_strcasecmp (from_charset, "UTF-8") == 0)
+               {
+                       ret = g_strndup (str, size);
+                       utf8_validate_fallback (ret, size);
+
+                       return ret;
+               }
+               else if (convert_and_check (str, size, from_charset, &ret))
                {
                        return ret;
                }