--- thunar-git-d2ed981ca.old/thunar/thunar-gio-extensions.c
+++ thunar-git-d2ed981ca/thunar/thunar-gio-extensions.c
@@ -1571,6 +1571,8 @@
                                   const gchar *setting_name,
                                   const gchar *setting_value)
 {
+  gchar **setting_values;
+
   switch (type)
     {
       case THUNAR_GTYPE_STRING:
@@ -1578,7 +1580,6 @@
         break;
 
       case THUNAR_GTYPE_STRINGV:
-        gchar **setting_values;
         setting_values = g_strsplit (setting_value, THUNAR_METADATA_STRING_DELIMETER, 100);
         g_file_info_set_attribute_stringv (info, setting_name, setting_values);
         g_strfreev (setting_values);
@@ -1603,6 +1604,7 @@
         return g_strdup (g_file_info_get_attribute_string (info, setting_name));
 
       case THUNAR_GTYPE_STRINGV:
+      {
         gchar **stringv = g_file_info_get_attribute_stringv (info, setting_name);
         GList  *string_list = NULL;
         gchar  *joined_string = NULL;
@@ -1616,6 +1618,7 @@
         joined_string = thunar_util_strjoin_list (string_list, THUNAR_METADATA_STRING_DELIMETER);
         g_list_free (string_list);
         return joined_string;
+      }
 
       default:
         g_warning ("ThunarGType not supported, skipping");