nemo-global-preferences.c: Fix base-2-full size format display.

Spell out the flags for shaping the size format preference, there's
no reason not to be readable.

Fixes #2348.

Author: mtwebster

libnemo-private/nemo-file.c

@@ -6310,10 +6310,8 @@ nemo_file_get_size_as_string_with_real_size (NemoFile *file)
 		return NULL;
 	}
 
-	/* If base-2 or base-2-full, then prefix will be 2 (i.e. base-2), if base-10 or base-10-long
-	   then prefix will be 0 (i.e. base-0). Prefix will be added to LONG_FORMAT */
-	prefix = nemo_global_preferences_get_size_prefix_preference () * 2;
-	return g_format_size_full (file->details->size, G_FORMAT_SIZE_LONG_FORMAT + prefix);
+	prefix = nemo_global_preferences_get_size_prefix_preference ();
+	return g_format_size_full (file->details->size, prefix);
 }
 
 

libnemo-private/nemo-global-preferences.c

@@ -112,7 +112,18 @@ nemo_global_preferences_get_inherit_show_thumbnails_preference (void)
 int
 nemo_global_preferences_get_size_prefix_preference (void)
 {
-    return size_prefixes_preference;
+    switch (size_prefixes_preference) {
+        case 0: // base-10
+            return G_FORMAT_SIZE_DEFAULT;
+        case 1: // base-10 full
+            return G_FORMAT_SIZE_DEFAULT |                           G_FORMAT_SIZE_LONG_FORMAT;
+        case 2: // base-2
+            return G_FORMAT_SIZE_DEFAULT | G_FORMAT_SIZE_IEC_UNITS;
+        case 3: // base-2 full
+            return G_FORMAT_SIZE_DEFAULT | G_FORMAT_SIZE_IEC_UNITS | G_FORMAT_SIZE_LONG_FORMAT;
+    }
+
+    return 0;
 }
 
 char *