--- a/glib/tests/uri-funcs.c	Wed Oct 13 19:39:18 2010 +0530
+++ b/glib/tests/uri-funcs.c	Thu Oct 14 14:15:50 2010 +0530
@@ -16,20 +16,14 @@
 #undef G_DISABLE_ASSERT
 #undef G_LOG_DOMAIN
 
+#include <sys/stat.h>
+#include <stdlib.h>
 #include <glib.h>
 #include <errno.h>
-#define LOG_FILE "c:\\logs\\uri_funcs_log.txt"
-#include "std_log_result.h"
-#define LOG_FILENAME_LINE __FILE__, __LINE__
-
-void create_xml(int result)
-{
-    if(result)
-        assert_failed = 1;
-    
-    testResultXml("uri_funcs_log");
-    close_log_file();
-}
+#include <glib/gprintf.h>
+#ifdef __SYMBIAN32__
+#include "mrt2_glib2_test.h"
+#endif /*__SYMBIAN32__*/
 
 int main (int argc, char *argv[])
 {
@@ -38,21 +32,26 @@
     char *p;
     char *q;
     char *escape_str;
+    #ifdef __SYMBIAN32__
+    g_log_set_handler (NULL,  G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL);
+    g_set_print_handler(mrtPrintHandler);
+    #endif /*__SYMBIAN32__*/
     
+    g_print("Test uri-funcs Start");
     p = g_uri_parse_scheme(uri);
     
     if(p)
         {
         if(strcmp(p, "http"))
             {
-            std_log(LOG_FILENAME_LINE,"g_uri_parse_scheme didnt work as expected");
+            g_print("g_uri_parse_scheme didnt work as expected");
             assert_failed = 1;
             }
         free(p);
         }
     else
         {
-        std_log(LOG_FILENAME_LINE,"g_uri_parse_scheme returnd NULL. errno = %d", errno);
+        g_print("g_uri_parse_scheme returnd NULL. errno = %d", errno);
         assert_failed = 1;
         }
     
@@ -62,23 +61,23 @@
     
     if(escape_str)
         {
-        std_log(LOG_FILENAME_LINE, "escape string %s", escape_str);
+        g_print( "escape string %s", escape_str);
         
         //convert back only a segment
         q = g_uri_unescape_segment(escape_str, escape_str+16, NULL);
         if(q)
             {
-            std_log(LOG_FILENAME_LINE, "unescape segment string %s", q);
+            g_print( "unescape segment string %s", q);
             if(strcmp(q, "http:\\\\www.no!"))
                 {
-                std_log(LOG_FILENAME_LINE,"g_uri_unescape_segment didnt work as expected");
+                g_print("g_uri_unescape_segment didnt work as expected");
                 assert_failed = 1;
                 }
             free(q);
             }
         else
             {
-            std_log(LOG_FILENAME_LINE,"g_uri_unescape_segment returned NULL. errno = %d", errno);
+            g_print("g_uri_unescape_segment returned NULL. errno = %d", errno);
             assert_failed = 1;
             }
         
@@ -86,12 +85,12 @@
         p = g_uri_unescape_string(escape_str, NULL);
         if(p)
             {
-            std_log(LOG_FILENAME_LINE, "unescape string %s", p);
+            g_print( "unescape string %s", p);
             
             //converted string should be same as original uri string
             if(strcmp(p, uri))
                 {
-                std_log(LOG_FILENAME_LINE,"g_uri_unescape_string returned NULL");
+                g_print("g_uri_unescape_string returned NULL");
                 assert_failed = 1;
                 }
             
@@ -99,7 +98,7 @@
             }
         else
             {
-            std_log(LOG_FILENAME_LINE,"g_uri_unescape_string returned NULL. errno = %d", errno);
+            g_print("g_uri_unescape_string returned NULL. errno = %d", errno);
             assert_failed = 1;
             }
         
@@ -107,16 +106,18 @@
         }
     else
         {
-        std_log(LOG_FILENAME_LINE,"g_uri_escape_string returned NULL. errno = %d", errno);
+        g_print("g_uri_escape_string returned NULL. errno = %d", errno);
         assert_failed = 1;
         }
     
 	if(assert_failed)
-          std_log(LOG_FILENAME_LINE,"Test Failed");
+          g_print("Test uri-funcs Failed");
     else
-          std_log(LOG_FILENAME_LINE,"Test Successful");
+          g_print("Test uri-funcs Successful");
 	
-    create_xml(0);
+    #if __SYMBIAN32__
+    testResultXml("uri-funcs");
+    #endif /* EMULATOR */
 
 	return 0;
 }