Merge branch 'assorted-cleanups' into 'master'

Assorted cleanups

See merge request GNOME/tracker!414

2 files changed, 14 insertions, 14 deletions

diff --git a/src/libtracker-common/tracker-enum-types.c.template b/src/libtracker-common/tracker-enum-types.c.template
index 4e6b3007d..097a659be 100644
--- a/src/libtracker-common/tracker-enum-types.c.template
+++ b/src/libtracker-common/tracker-enum-types.c.template
@@ -15,9 +15,9 @@
 GType
 @enum_name@_get_type (void)
 {
-  static volatile gsize g_define_type_id__volatile = 0;
- 
-  if (g_once_init_enter (&g_define_type_id__volatile)) {
+  static gsize g_define_type_id = 0;
+
+  if (g_once_init_enter (&g_define_type_id)) {
     static const G@Type@Value values[] = {
 /*** END value-header ***/
 
@@ -28,13 +28,13 @@ GType
 /*** BEGIN value-tail ***/
       { 0, NULL, NULL }
     };
-    GType g_define_type_id = 
+    GType type =
        g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
-      
-    g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+
+    g_once_init_leave (&g_define_type_id, type);
   }
-    
-  return g_define_type_id__volatile;
+
+  return g_define_type_id;
 }
 
 /*** END value-tail ***/
diff --git a/src/libtracker-common/tracker-locale.c b/src/libtracker-common/tracker-locale.c
index 0d2af23cb..816bb8d69 100644
--- a/src/libtracker-common/tracker-locale.c
+++ b/src/libtracker-common/tracker-locale.c
@@ -26,12 +26,12 @@
 
 #include "tracker-locale.h"
 
-static const gchar *locale_names[TRACKER_LOCALE_LAST] = {
-	"LANG",
-	"LC_TIME",
-	"LC_COLLATE",
-	"LC_NUMERIC",
-	"LC_MONETARY"
+static const gchar *locale_names[] = {
+	[TRACKER_LOCALE_LANGUAGE] = "LANG",
+	[TRACKER_LOCALE_TIME]     = "LC_TIME",
+	[TRACKER_LOCALE_COLLATE]  = "LC_COLLATE",
+	[TRACKER_LOCALE_NUMERIC]  = "LC_NUMERIC",
+	[TRACKER_LOCALE_MONETARY] = "LC_MONETARY"
 };
 
 static GRecMutex locales_mutex;