Don't bother calling bindtextdomain in the error case

diff --git a/libexif/exif-tag.c b/libexif/exif-tag.c
index b616109..f691985 100644 (file)
--- a/libexif/exif-tag.c
+++ b/libexif/exif-tag.c
@@ -963,14 +963,6 @@ exif_tag_get_title_in_ifd (ExifTag tag, ExifIfd ifd)
        unsigned int i;
        int first;
 
-       /* FIXME: This belongs to somewhere else. */
-       /* libexif should use the default system locale.
-        * If an application specifically requires UTF-8, then we
-        * must give the application a way to tell libexif that.
-        * 
-        * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-        */
-       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        if (ifd >= EXIF_IFD_COUNT)
                return NULL;
        first = exif_tag_table_first(tag);
@@ -984,6 +976,14 @@ exif_tag_get_title_in_ifd (ExifTag tag, ExifIfd ifd)
                } else
                        return NULL; /* Recorded tag not found in the table */
        }
+       /* FIXME: This belongs to somewhere else. */
+       /* libexif should use the default system locale.
+        * If an application specifically requires UTF-8, then we
+        * must give the application a way to tell libexif that.
+        * 
+        * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+        */
+       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        return _(ExifTagTable[i].title);
 }
 
@@ -993,14 +993,6 @@ exif_tag_get_description_in_ifd (ExifTag tag, ExifIfd ifd)
        unsigned int i;
        int first;
 
-       /* libexif should use the default system locale.
-        * If an application specifically requires UTF-8, then we
-        * must give the application a way to tell libexif that.
-        * 
-        * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-        */
-       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-
        if (ifd >= EXIF_IFD_COUNT)
                return NULL;
        first = exif_tag_table_first(tag);
@@ -1018,6 +1010,14 @@ exif_tag_get_description_in_ifd (ExifTag tag, ExifIfd ifd)
        /* GNU gettext acts strangely when given an empty string */
        if (!ExifTagTable[i].description || !*ExifTagTable[i].description)
                return "";
+
+       /* libexif should use the default system locale.
+        * If an application specifically requires UTF-8, then we
+        * must give the application a way to tell libexif that.
+        * 
+        * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+        */
+       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        return _(ExifTagTable[i].description);
 }