libtracker-common: Make locale readonly

There's no reasonable situation why we should change this from
a library. Initialization (and shutdown) was also mostly useless
as it would just set the same settings that it just retrieved.
It's been turned into a sanity check for the relevant places.

2 files changed, 5 insertions, 6 deletions

diff --git a/tests/libtracker-common/tracker-file-utils-test.c b/tests/libtracker-common/tracker-file-utils-test.c
index d50cbb255..1575c40ac 100644
--- a/tests/libtracker-common/tracker-file-utils-test.c
+++ b/tests/libtracker-common/tracker-file-utils-test.c
@@ -21,6 +21,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <locale.h>
 
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -431,7 +432,8 @@ main (int argc, char **argv)
 
 	g_test_init (&argc, &argv, NULL);
 
-	tracker_locale_init ();
+	setlocale (LC_ALL, "");
+
         ensure_file_exists (TEST_FILENAME);
         ensure_file_exists (TEST_HIDDEN_FILENAME);
 
@@ -470,7 +472,5 @@ main (int argc, char **argv)
         remove_file (TEST_FILENAME);
         remove_file (TEST_HIDDEN_FILENAME);
 
-	tracker_locale_shutdown ();
-
 	return result;
 }
diff --git a/tests/libtracker-common/tracker-utils-test.c b/tests/libtracker-common/tracker-utils-test.c
index 81c9b753f..8025af8c7 100644
--- a/tests/libtracker-common/tracker-utils-test.c
+++ b/tests/libtracker-common/tracker-utils-test.c
@@ -24,6 +24,7 @@
 #include <libtracker-common/tracker-file-utils.h>
 #include <libtracker-common/tracker-utils.h>
 #include <libtracker-common/tracker-locale.h>
+#include <locale.h>
 
 static void
 test_seconds_to_string ()
@@ -139,7 +140,7 @@ main (int argc, char **argv)
 
 	g_test_init (&argc, &argv, NULL);
 
-	tracker_locale_init ();
+	setlocale (LC_ALL, "");
 
 	g_test_add_func ("/libtracker-common/tracker-utils/seconds_to_string",
 	                 test_seconds_to_string);
@@ -161,7 +162,5 @@ main (int argc, char **argv)
 
 	ret = g_test_run ();
 
-	tracker_locale_shutdown ();
-
 	return ret;
 }