patches/nautilus-09-trusted-extensions.diff
changeset 15621 b447de05cc21
parent 15579 d26c3d31b0bd
child 16101 727cd929058f
--- a/patches/nautilus-09-trusted-extensions.diff	Wed Apr 15 06:11:23 2009 +0000
+++ b/patches/nautilus-09-trusted-extensions.diff	Wed Apr 15 07:01:52 2009 +0000
@@ -10,25 +10,6 @@
  	nautilus-ui-utilities.c \
  	nautilus-ui-utilities.h \
  	nautilus-undo-manager.c \
-diff -urN -x '*.orig' -x '*.rej' naut.orig/libnautilus-private/nautilus-column-utilities.c naut.new/libnautilus-private/nautilus-column-utilities.c
---- naut.orig/libnautilus-private/nautilus-column-utilities.c	2009-03-25 15:48:56.405155840 +0000
-+++ naut.new/libnautilus-private/nautilus-column-utilities.c	2009-03-25 15:50:31.163460018 +0000
-@@ -113,6 +113,7 @@
- 					       "label", _("MIME Type"),
- 					       "description", _("The mime type of the file."),
- 					       NULL));
-+#ifdef HAVE_SELINUX
- 	columns = g_list_append (columns,
- 				 g_object_new (NAUTILUS_TYPE_COLUMN,
- 					       "name", "selinux_context",
-@@ -120,6 +121,7 @@
- 					       "label", _("SELinux Context"),
- 					       "description", _("The SELinux security context of the file."),
- 					       NULL));
-+#endif
- 	
- 	return columns;
- }
 diff -urN -x '*.orig' -x '*.rej' naut.orig/libnautilus-private/nautilus-module.c naut.new/libnautilus-private/nautilus-module.c
 --- naut.orig/libnautilus-private/nautilus-module.c	2009-03-25 15:48:56.426647854 +0000
 +++ naut.new/libnautilus-private/nautilus-module.c	2009-03-31 11:05:33.382333482 +0100
@@ -582,3 +563,21 @@
  }
  
  static void
+--- nautilus-2.26.2/libnautilus-private/nautilus-column-utilities.c.ori	2009-04-15 06:40:35.671068662 +0100
++++ nautilus-2.26.2/libnautilus-private/nautilus-column-utilities.c	2009-04-15 06:42:17.453055378 +0100
+@@ -113,6 +113,7 @@
+ 					       "label", _("MIME Type"),
+ 					       "description", _("The mime type of the file."),
+ 					       NULL));
++#ifdef HAVE_SELINUX
+ 	columns = g_list_append (columns,
+ 				 g_object_new (NAUTILUS_TYPE_COLUMN,
+ 					       "name", "selinux_context",
+@@ -120,6 +121,7 @@
+ 					       "label", _("SELinux Context"),
+ 					       "description", _("The SELinux security context of the file."),
+ 					       NULL));
++#endif
+ 	columns = g_list_append (columns,
+ 				 g_object_new (NAUTILUS_TYPE_COLUMN,
+ 					       "name", "where",