[tracker/tracker-0.6] Fixes NB#125128, junk characters are shown in artist field of some of the

[Mikael Ottela <mottela src gnome org>]

commit b88eb2a051a89902999753a8cd07831d2608a61e
Author: Mikael Ottela <mikael ottela ixonos com>
Date:   Tue Jul 7 12:28:22 2009 +0300

    Fixes NB#125128, junk characters are shown in artist field of some of the
    audio files.
    
    Use enca only when the encoding hasn't been set to anything or is unknown.

 src/tracker-extract/tracker-extract-mp3.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-mp3.c b/src/tracker-extract/tracker-extract-mp3.c
index 26f0fd8..c7b0a71 100644
--- a/src/tracker-extract/tracker-extract-mp3.c
+++ b/src/tracker-extract/tracker-extract-mp3.c
@@ -1055,14 +1055,14 @@ get_id3v24_tags (const gchar *data,
 							  NULL, NULL, NULL);
 					break;
 				case 0x01 :
-					word = t_convert (&data[pos + 11],
+					word = g_convert (&data[pos + 11],
 							  csize - 1,
 							  "UTF-8",
 							  info->encoding ? info->encoding : "UTF-16",
 							  NULL, NULL, NULL);
 					break;
 				case 0x02 :
-					word = t_convert (&data[pos + 11],
+					word = g_convert (&data[pos + 11],
 							  csize - 1,
 							  "UTF-8",
 							  info->encoding ? info->encoding : "UTF-16BE",
@@ -1167,14 +1167,14 @@ get_id3v24_tags (const gchar *data,
 						  NULL, NULL, NULL);
 				break;
 			case 0x01:
-				word = t_convert (text,
+				word = g_convert (text,
 						  csize - offset,
 						  "UTF-8",
 						  info->encoding ? info->encoding : "UTF-16",
 						  NULL, NULL, NULL);
 				break;
 			case 0x02:
-				word = t_convert (text,
+				word = g_convert (text,
 						  csize-offset,
 						  "UTF-8",
 						  info->encoding ? info->encoding : "UTF-16BE",