summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-column-utilities.c
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-11-16 05:08:48 -0800
committerStefano Karapetsas <[email protected]>2012-11-16 05:08:48 -0800
commitdc66bc40724191f0068869773576dc4edf042c6f (patch)
tree74b9684feea188736b21f2c829f29befaaf2e9da /libcaja-private/caja-column-utilities.c
parent935e1fed604f48e68d125d205c890a59f46f8f21 (diff)
parent1466df20591105550738a1d0784a623af9909abf (diff)
downloadcaja-dc66bc40724191f0068869773576dc4edf042c6f.tar.bz2
caja-dc66bc40724191f0068869773576dc4edf042c6f.tar.xz
Merge pull request #42 from jasmineaura/develop
Bring Caja up to speed, stage1
Diffstat (limited to 'libcaja-private/caja-column-utilities.c')
-rw-r--r--libcaja-private/caja-column-utilities.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libcaja-private/caja-column-utilities.c b/libcaja-private/caja-column-utilities.c
index 3b789221..1ba570df 100644
--- a/libcaja-private/caja-column-utilities.c
+++ b/libcaja-private/caja-column-utilities.c
@@ -113,6 +113,7 @@ get_builtin_columns (void)
"label", _("MIME Type"),
"description", _("The mime type of the file."),
NULL));
+#ifdef HAVE_SELINUX
columns = g_list_append (columns,
g_object_new (CAJA_TYPE_COLUMN,
"name", "selinux_context",
@@ -120,13 +121,13 @@ get_builtin_columns (void)
"label", _("SELinux Context"),
"description", _("The SELinux security context of the file."),
NULL));
+#endif
columns = g_list_append (columns,
g_object_new (CAJA_TYPE_COLUMN,
"name", "where",
"attribute", "where",
"label", _("Location"),
- /* TODO: Change after string freeze over */
- "description", _("Location"),
+ "description", _("The location of the file."),
NULL));
return columns;