diff --git a/nautilus-selinux.patch b/nautilus-selinux.patch index 5c7bbdb..6ea37be 100644 --- a/nautilus-selinux.patch +++ b/nautilus-selinux.patch @@ -1,6 +1,6 @@ -diff -up nautilus-2.91.1/libnautilus-extension/nautilus-column.c.selinux nautilus-2.91.1/libnautilus-extension/nautilus-column.c ---- nautilus-2.91.1/libnautilus-extension/nautilus-column.c.selinux 2009-04-17 09:12:30.000000000 -0400 -+++ nautilus-2.91.1/libnautilus-extension/nautilus-column.c 2010-11-01 16:25:40.836410004 -0400 +diff -up nautilus-2.91.6/libnautilus-extension/nautilus-column.c.selinux nautilus-2.91.6/libnautilus-extension/nautilus-column.c +--- nautilus-2.91.6/libnautilus-extension/nautilus-column.c.selinux 2010-11-30 12:20:09.000000000 -0500 ++++ nautilus-2.91.6/libnautilus-extension/nautilus-column.c 2011-01-07 15:54:02.731993002 -0500 @@ -34,6 +34,7 @@ enum { PROP_LABEL, PROP_DESCRIPTION, @@ -59,9 +59,9 @@ diff -up nautilus-2.91.1/libnautilus-extension/nautilus-column.c.selinux nautilu + G_PARAM_READWRITE)); } -diff -up nautilus-2.91.1/libnautilus-extension/nautilus-column.h.selinux nautilus-2.91.1/libnautilus-extension/nautilus-column.h ---- nautilus-2.91.1/libnautilus-extension/nautilus-column.h.selinux 2009-04-17 09:12:30.000000000 -0400 -+++ nautilus-2.91.1/libnautilus-extension/nautilus-column.h 2010-11-01 16:25:40.836410004 -0400 +diff -up nautilus-2.91.6/libnautilus-extension/nautilus-column.h.selinux nautilus-2.91.6/libnautilus-extension/nautilus-column.h +--- nautilus-2.91.6/libnautilus-extension/nautilus-column.h.selinux 2010-11-30 12:20:09.000000000 -0500 ++++ nautilus-2.91.6/libnautilus-extension/nautilus-column.h 2011-01-07 15:54:02.732993002 -0500 @@ -64,6 +64,7 @@ NautilusColumn * nautilus_column_new * label (string) - the user-visible label for the column * description (string) - a user-visible description of the column @@ -70,9 +70,9 @@ diff -up nautilus-2.91.1/libnautilus-extension/nautilus-column.h.selinux nautilu */ G_END_DECLS -diff -up nautilus-2.91.1/libnautilus-private/nautilus-column-utilities.c.selinux nautilus-2.91.1/libnautilus-private/nautilus-column-utilities.c ---- nautilus-2.91.1/libnautilus-private/nautilus-column-utilities.c.selinux 2010-10-13 12:50:49.000000000 -0400 -+++ nautilus-2.91.1/libnautilus-private/nautilus-column-utilities.c 2010-11-01 16:28:30.986410074 -0400 +diff -up nautilus-2.91.6/libnautilus-private/nautilus-column-utilities.c.selinux nautilus-2.91.6/libnautilus-private/nautilus-column-utilities.c +--- nautilus-2.91.6/libnautilus-private/nautilus-column-utilities.c.selinux 2010-11-30 12:20:09.000000000 -0500 ++++ nautilus-2.91.6/libnautilus-private/nautilus-column-utilities.c 2011-01-07 15:54:02.733993002 -0500 @@ -120,6 +120,7 @@ get_builtin_columns (void) "attribute", "selinux_context", "label", _("SELinux Context"), @@ -81,10 +81,10 @@ diff -up nautilus-2.91.1/libnautilus-private/nautilus-column-utilities.c.selinux NULL)); #endif columns = g_list_append (columns, -diff -up nautilus-2.91.1/libnautilus-private/nautilus-file.c.selinux nautilus-2.91.1/libnautilus-private/nautilus-file.c ---- nautilus-2.91.1/libnautilus-private/nautilus-file.c.selinux 2010-10-31 10:18:21.000000000 -0400 -+++ nautilus-2.91.1/libnautilus-private/nautilus-file.c 2010-11-01 16:25:40.869410003 -0400 -@@ -2170,7 +2170,7 @@ update_info_internal (NautilusFile *file +diff -up nautilus-2.91.6/libnautilus-private/nautilus-file.c.selinux nautilus-2.91.6/libnautilus-private/nautilus-file.c +--- nautilus-2.91.6/libnautilus-private/nautilus-file.c.selinux 2010-12-13 13:22:48.000000000 -0500 ++++ nautilus-2.91.6/libnautilus-private/nautilus-file.c 2011-01-07 15:54:02.736993002 -0500 +@@ -2173,7 +2173,7 @@ update_info_internal (NautilusFile *file file->details->is_mountpoint = is_mountpoint; has_permissions = g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_UNIX_MODE); @@ -93,7 +93,7 @@ diff -up nautilus-2.91.1/libnautilus-private/nautilus-file.c.selinux nautilus-2. if (file->details->has_permissions != has_permissions || file->details->permissions != permissions) { changed = TRUE; -@@ -5075,7 +5075,7 @@ nautilus_file_can_get_selinux_context (N +@@ -5087,7 +5087,7 @@ nautilus_file_can_get_selinux_context (N * context * @file: NautilusFile representing the file in question. * @@ -102,7 +102,7 @@ diff -up nautilus-2.91.1/libnautilus-private/nautilus-file.c.selinux nautilus-2. * **/ char * -@@ -5108,6 +5108,114 @@ nautilus_file_get_selinux_context (Nauti +@@ -5120,6 +5120,114 @@ nautilus_file_get_selinux_context (Nauti return translated; } @@ -217,10 +217,10 @@ diff -up nautilus-2.91.1/libnautilus-private/nautilus-file.c.selinux nautilus-2. static char * get_real_name (const char *name, const char *gecos) { -diff -up nautilus-2.91.1/libnautilus-private/nautilus-file.h.selinux nautilus-2.91.1/libnautilus-private/nautilus-file.h ---- nautilus-2.91.1/libnautilus-private/nautilus-file.h.selinux 2010-10-05 20:11:55.000000000 -0400 -+++ nautilus-2.91.1/libnautilus-private/nautilus-file.h 2010-11-01 16:25:40.891410004 -0400 -@@ -245,6 +245,7 @@ GList * nautilus_get_all +diff -up nautilus-2.91.6/libnautilus-private/nautilus-file.h.selinux nautilus-2.91.6/libnautilus-private/nautilus-file.h +--- nautilus-2.91.6/libnautilus-private/nautilus-file.h.selinux 2010-11-30 12:20:09.000000000 -0500 ++++ nautilus-2.91.6/libnautilus-private/nautilus-file.h 2011-01-07 15:54:02.739993002 -0500 +@@ -241,6 +241,7 @@ GList * nautilus_get_all GList * nautilus_file_get_settable_group_names (NautilusFile *file); gboolean nautilus_file_can_get_selinux_context (NautilusFile *file); char * nautilus_file_get_selinux_context (NautilusFile *file); @@ -228,7 +228,7 @@ diff -up nautilus-2.91.1/libnautilus-private/nautilus-file.h.selinux nautilus-2. /* "Capabilities". */ gboolean nautilus_file_can_read (NautilusFile *file); -@@ -305,6 +306,10 @@ void nautilus_file_se +@@ -301,6 +302,10 @@ void nautilus_file_se guint32 permissions, NautilusFileOperationCallback callback, gpointer callback_data); @@ -239,10 +239,10 @@ diff -up nautilus-2.91.1/libnautilus-private/nautilus-file.h.selinux nautilus-2. void nautilus_file_rename (NautilusFile *file, const char *new_name, NautilusFileOperationCallback callback, -diff -up nautilus-2.91.1/libnautilus-private/nautilus-file-operations.c.selinux nautilus-2.91.1/libnautilus-private/nautilus-file-operations.c ---- nautilus-2.91.1/libnautilus-private/nautilus-file-operations.c.selinux 2010-10-31 10:16:36.000000000 -0400 -+++ nautilus-2.91.1/libnautilus-private/nautilus-file-operations.c 2010-11-01 16:25:40.910410003 -0400 -@@ -66,6 +66,10 @@ +diff -up nautilus-2.91.6/libnautilus-private/nautilus-file-operations.c.selinux nautilus-2.91.6/libnautilus-private/nautilus-file-operations.c +--- nautilus-2.91.6/libnautilus-private/nautilus-file-operations.c.selinux 2010-12-13 13:22:48.000000000 -0500 ++++ nautilus-2.91.6/libnautilus-private/nautilus-file-operations.c 2011-01-07 15:54:02.741993002 -0500 +@@ -64,6 +64,10 @@ #include "nautilus-file-utilities.h" #include "nautilus-file-conflict-dialog.h" @@ -261,7 +261,7 @@ diff -up nautilus-2.91.1/libnautilus-private/nautilus-file-operations.c.selinux } SetPermissionsJob; typedef enum { -@@ -5408,6 +5413,10 @@ set_permissions_job_done (gpointer user_ +@@ -5460,6 +5465,10 @@ set_permissions_job_done (gpointer user_ job->done_callback (job->done_callback_data); } @@ -272,7 +272,7 @@ diff -up nautilus-2.91.1/libnautilus-private/nautilus-file-operations.c.selinux finalize_common ((CommonJob *)job); return FALSE; } -@@ -5463,6 +5472,14 @@ set_permissions_file (SetPermissionsJob +@@ -5515,6 +5524,14 @@ set_permissions_file (SetPermissionsJob current, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, common->cancellable, NULL); } @@ -287,7 +287,7 @@ diff -up nautilus-2.91.1/libnautilus-private/nautilus-file-operations.c.selinux if (!job_aborted (common) && g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) { -@@ -5526,6 +5543,7 @@ nautilus_file_set_permissions_recursive +@@ -5578,6 +5595,7 @@ nautilus_file_set_permissions_recursive guint32 file_mask, guint32 dir_permissions, guint32 dir_mask, @@ -295,7 +295,7 @@ diff -up nautilus-2.91.1/libnautilus-private/nautilus-file-operations.c.selinux NautilusOpCallback callback, gpointer callback_data) { -@@ -5539,7 +5557,24 @@ nautilus_file_set_permissions_recursive +@@ -5591,7 +5609,24 @@ nautilus_file_set_permissions_recursive job->dir_mask = dir_mask; job->done_callback = callback; job->done_callback_data = callback_data; @@ -321,10 +321,10 @@ diff -up nautilus-2.91.1/libnautilus-private/nautilus-file-operations.c.selinux g_io_scheduler_push_job (set_permissions_job, job, NULL, -diff -up nautilus-2.91.1/libnautilus-private/nautilus-file-operations.h.selinux nautilus-2.91.1/libnautilus-private/nautilus-file-operations.h ---- nautilus-2.91.1/libnautilus-private/nautilus-file-operations.h.selinux 2010-08-02 19:35:56.000000000 -0400 -+++ nautilus-2.91.1/libnautilus-private/nautilus-file-operations.h 2010-11-01 16:25:40.929410004 -0400 -@@ -87,6 +87,7 @@ void nautilus_file_set_permissions_recur +diff -up nautilus-2.91.6/libnautilus-private/nautilus-file-operations.h.selinux nautilus-2.91.6/libnautilus-private/nautilus-file-operations.h +--- nautilus-2.91.6/libnautilus-private/nautilus-file-operations.h.selinux 2010-12-07 05:11:45.000000000 -0500 ++++ nautilus-2.91.6/libnautilus-private/nautilus-file-operations.h 2011-01-07 15:54:02.744993002 -0500 +@@ -94,6 +94,7 @@ void nautilus_file_set_permissions_recur guint32 file_mask, guint32 folder_permissions, guint32 folder_mask, @@ -332,10 +332,10 @@ diff -up nautilus-2.91.1/libnautilus-private/nautilus-file-operations.h.selinux NautilusOpCallback callback, gpointer callback_data); -diff -up nautilus-2.91.1/src/file-manager/fm-error-reporting.c.selinux nautilus-2.91.1/src/file-manager/fm-error-reporting.c ---- nautilus-2.91.1/src/file-manager/fm-error-reporting.c.selinux 2009-04-17 09:12:31.000000000 -0400 -+++ nautilus-2.91.1/src/file-manager/fm-error-reporting.c 2010-11-01 16:25:40.944410004 -0400 -@@ -238,6 +238,31 @@ fm_report_error_setting_permissions (Nau +diff -up nautilus-2.91.6/src/file-manager/fm-error-reporting.c.selinux nautilus-2.91.6/src/file-manager/fm-error-reporting.c +--- nautilus-2.91.6/src/file-manager/fm-error-reporting.c.selinux 2010-12-17 20:59:41.000000000 -0500 ++++ nautilus-2.91.6/src/file-manager/fm-error-reporting.c 2011-01-07 15:54:02.744993002 -0500 +@@ -245,6 +245,31 @@ fm_report_error_setting_permissions (Nau g_free (message); } @@ -367,9 +367,9 @@ diff -up nautilus-2.91.1/src/file-manager/fm-error-reporting.c.selinux nautilus- typedef struct _FMRenameData { char *name; NautilusFileOperationCallback callback; -diff -up nautilus-2.91.1/src/file-manager/fm-error-reporting.h.selinux nautilus-2.91.1/src/file-manager/fm-error-reporting.h ---- nautilus-2.91.1/src/file-manager/fm-error-reporting.h.selinux 2009-04-17 09:12:31.000000000 -0400 -+++ nautilus-2.91.1/src/file-manager/fm-error-reporting.h 2010-11-01 16:25:40.986410004 -0400 +diff -up nautilus-2.91.6/src/file-manager/fm-error-reporting.h.selinux nautilus-2.91.6/src/file-manager/fm-error-reporting.h +--- nautilus-2.91.6/src/file-manager/fm-error-reporting.h.selinux 2010-11-30 12:20:10.000000000 -0500 ++++ nautilus-2.91.6/src/file-manager/fm-error-reporting.h 2011-01-07 15:54:02.745993002 -0500 @@ -40,8 +40,11 @@ void fm_report_error_setting_permissions GError *error, GtkWindow *parent_window); @@ -383,10 +383,10 @@ diff -up nautilus-2.91.1/src/file-manager/fm-error-reporting.h.selinux nautilus- void fm_report_error_setting_group (NautilusFile *file, GError *error, GtkWindow *parent_window); -diff -up nautilus-2.91.1/src/file-manager/fm-list-view.c.selinux nautilus-2.91.1/src/file-manager/fm-list-view.c ---- nautilus-2.91.1/src/file-manager/fm-list-view.c.selinux 2010-10-31 10:22:24.000000000 -0400 -+++ nautilus-2.91.1/src/file-manager/fm-list-view.c 2010-11-01 16:25:41.000410004 -0400 -@@ -1582,13 +1582,15 @@ create_and_set_up_tree_view (FMListView +diff -up nautilus-2.91.6/src/file-manager/fm-list-view.c.selinux nautilus-2.91.6/src/file-manager/fm-list-view.c +--- nautilus-2.91.6/src/file-manager/fm-list-view.c.selinux 2010-12-22 11:00:53.000000000 -0500 ++++ nautilus-2.91.6/src/file-manager/fm-list-view.c 2011-01-07 15:54:02.747993002 -0500 +@@ -1620,13 +1620,15 @@ create_and_set_up_tree_view (FMListView char *name; char *label; float xalign; @@ -403,7 +403,7 @@ diff -up nautilus-2.91.1/src/file-manager/fm-list-view.c.selinux nautilus-2.91.1 column_num = fm_list_model_add_column (view->details->model, nautilus_column); -@@ -1633,6 +1635,8 @@ create_and_set_up_tree_view (FMListView +@@ -1671,6 +1673,8 @@ create_and_set_up_tree_view (FMListView } else { cell = gtk_cell_renderer_text_new (); g_object_set (cell, "xalign", xalign, NULL); @@ -412,21 +412,10 @@ diff -up nautilus-2.91.1/src/file-manager/fm-list-view.c.selinux nautilus-2.91.1 view->details->cells = g_list_append (view->details->cells, cell); column = gtk_tree_view_column_new_with_attributes (label, -diff -up nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux nautilus-2.91.1/src/file-manager/fm-properties-window.c ---- nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux 2010-10-31 10:23:53.000000000 -0400 -+++ nautilus-2.91.1/src/file-manager/fm-properties-window.c 2010-11-01 16:25:41.021410004 -0400 -@@ -76,6 +76,10 @@ - #define FREE_FILL_B (0.811764706 * 65535) - - -+#ifdef HAVE_SELINUX -+# include -+#endif -+ - #define PREVIEW_IMAGE_WIDTH 96 - - #define ROW_PAD 6 -@@ -115,12 +119,15 @@ struct FMPropertiesWindowDetails { +diff -up nautilus-2.91.6/src/file-manager/fm-properties-window.c.selinux nautilus-2.91.6/src/file-manager/fm-properties-window.c +--- nautilus-2.91.6/src/file-manager/fm-properties-window.c.selinux 2010-12-22 11:00:53.000000000 -0500 ++++ nautilus-2.91.6/src/file-manager/fm-properties-window.c 2011-01-07 15:54:02.751993002 -0500 +@@ -115,12 +115,15 @@ struct FMPropertiesWindowDetails { unsigned int owner_change_timeout; GList *permission_buttons; @@ -443,7 +432,7 @@ diff -up nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux nautilu GList *mime_list; gboolean deep_count_finished; -@@ -203,6 +210,10 @@ static void permission_combo_update +@@ -203,6 +206,10 @@ static void permission_combo_update GtkComboBox *combo); static void value_field_update (FMPropertiesWindow *window, GtkLabel *field); @@ -454,7 +443,7 @@ diff -up nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux nautilu static void properties_window_update (FMPropertiesWindow *window, GList *files); static void is_directory_ready_callback (NautilusFile *file, -@@ -232,10 +243,36 @@ static GtkLabel *attach_ellipsizing_valu +@@ -232,10 +239,36 @@ static GtkLabel *attach_ellipsizing_valu const char *initial_text); static GtkWidget* create_pie_widget (FMPropertiesWindow *window); @@ -491,7 +480,7 @@ diff -up nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux nautilu static gboolean is_multi_file_window (FMPropertiesWindow *window) { -@@ -256,6 +293,111 @@ is_multi_file_window (FMPropertiesWindow +@@ -256,6 +289,111 @@ is_multi_file_window (FMPropertiesWindow return FALSE; } @@ -603,7 +592,7 @@ diff -up nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux nautilu static int get_not_gone_original_file_count (FMPropertiesWindow *window) { -@@ -631,11 +773,7 @@ set_name_field (FMPropertiesWindow *wind +@@ -631,11 +769,7 @@ set_name_field (FMPropertiesWindow *wind * currently showing. This causes minimal ripples (e.g. * selection change). */ @@ -616,7 +605,7 @@ diff -up nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux nautilu } } } -@@ -715,7 +853,6 @@ static void +@@ -715,7 +849,6 @@ static void name_field_restore_original_name (NautilusEntry *name_field) { const char *original_name; @@ -624,7 +613,7 @@ diff -up nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux nautilu original_name = (const char *) g_object_get_data (G_OBJECT (name_field), "original_name"); -@@ -724,14 +861,8 @@ name_field_restore_original_name (Nautil +@@ -724,14 +857,8 @@ name_field_restore_original_name (Nautil return; } @@ -640,7 +629,7 @@ diff -up nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux nautilu } static void -@@ -1027,6 +1158,14 @@ properties_window_update (FMPropertiesWi +@@ -1027,6 +1154,14 @@ properties_window_update (FMPropertiesWi for (l = window->details->value_fields; l != NULL; l = l->next) { value_field_update (window, GTK_LABEL (l->data)); } @@ -655,7 +644,7 @@ diff -up nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux nautilu } mime_list = get_mime_list (window); -@@ -1197,6 +1336,164 @@ value_field_update (FMPropertiesWindow * +@@ -1197,6 +1332,164 @@ value_field_update (FMPropertiesWindow * window->details->target_files)); } @@ -820,7 +809,7 @@ diff -up nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux nautilu static GtkLabel * attach_label (GtkTable *table, int row, -@@ -1251,6 +1548,47 @@ attach_value_label (GtkTable *table, +@@ -1251,6 +1544,47 @@ attach_value_label (GtkTable *table, return attach_label (table, row, column, initial_text, FALSE, FALSE, FALSE, TRUE, FALSE); } @@ -868,7 +857,7 @@ diff -up nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux nautilu static GtkLabel * attach_ellipsizing_value_label (GtkTable *table, int row, -@@ -1309,6 +1647,647 @@ attach_value_field (FMPropertiesWindow * +@@ -1309,6 +1643,647 @@ attach_value_field (FMPropertiesWindow * FALSE); } @@ -1516,7 +1505,7 @@ diff -up nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux nautilu static GtkWidget* attach_ellipsizing_value_field (FMPropertiesWindow *window, GtkTable *table, -@@ -2302,6 +3281,37 @@ append_title_value_pair (FMPropertiesWin +@@ -2302,6 +3277,37 @@ append_title_value_pair (FMPropertiesWin return last_row; } @@ -1554,39 +1543,7 @@ diff -up nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux nautilu static guint append_title_and_ellipsizing_value (FMPropertiesWindow *window, GtkTable *table, -@@ -3248,31 +4258,6 @@ files_has_file (FMPropertiesWindow *wind - } - - static void --start_long_operation (FMPropertiesWindow *window) --{ -- if (window->details->long_operation_underway == 0) { -- /* start long operation */ -- GdkCursor * cursor; -- -- cursor = gdk_cursor_new (GDK_WATCH); -- gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (window)), cursor); -- gdk_cursor_unref (cursor); -- } -- window->details->long_operation_underway ++; --} -- --static void --end_long_operation (FMPropertiesWindow *window) --{ -- if (gtk_widget_get_window (GTK_WIDGET (window)) != NULL && -- window->details->long_operation_underway == 1) { -- /* finished !! */ -- gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (window)), NULL); -- } -- window->details->long_operation_underway--; --} -- --static void - permission_change_callback (NautilusFile *file, - GFile *res_loc, - GError *error, -@@ -4055,39 +5040,6 @@ append_special_execution_flags (FMProper +@@ -4034,39 +5040,6 @@ append_special_execution_flags (FMProper gtk_table_set_row_spacing (table, nrows - 1, 18); } @@ -1626,7 +1583,7 @@ diff -up nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux nautilu static GHashTable * get_initial_permissions (GList *file_list) -@@ -4435,7 +5387,9 @@ apply_recursive_clicked (GtkWidget *recu +@@ -4414,7 +5387,9 @@ apply_recursive_clicked (GtkWidget *recu guint32 file_permission, file_permission_mask; guint32 dir_permission, dir_permission_mask; guint32 vfs_mask, vfs_new_perm, p; @@ -1637,7 +1594,7 @@ diff -up nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux nautilu gboolean active, is_folder, is_special, use_original; GList *l; GtkTreeModel *model; -@@ -4479,9 +5433,9 @@ apply_recursive_clicked (GtkWidget *recu +@@ -4458,9 +5433,9 @@ apply_recursive_clicked (GtkWidget *recu } /* Simple mode, minus exec checkbox */ for (l = window->details->permission_combos; l != NULL; l = l->next) { @@ -1649,7 +1606,7 @@ diff -up nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux nautilu continue; } -@@ -4489,7 +5443,7 @@ apply_recursive_clicked (GtkWidget *recu +@@ -4468,7 +5443,7 @@ apply_recursive_clicked (GtkWidget *recu is_folder = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo), "is-folder")); @@ -1658,7 +1615,7 @@ diff -up nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux nautilu gtk_tree_model_get (model, &iter, 1, &new_perm, 2, &use_original, -1); if (use_original) { continue; -@@ -4512,12 +5466,53 @@ apply_recursive_clicked (GtkWidget *recu +@@ -4491,12 +5466,53 @@ apply_recursive_clicked (GtkWidget *recu } } @@ -1712,7 +1669,7 @@ diff -up nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux nautilu if (nautilus_file_is_directory (file) && nautilus_file_can_set_permissions (file)) { uri = nautilus_file_get_uri (file); -@@ -4528,11 +5523,13 @@ apply_recursive_clicked (GtkWidget *recu +@@ -4507,11 +5523,13 @@ apply_recursive_clicked (GtkWidget *recu file_permission_mask, dir_permission, dir_permission_mask, @@ -1726,7 +1683,7 @@ diff -up nautilus-2.91.1/src/file-manager/fm-properties-window.c.selinux nautilu } static void -@@ -4583,10 +5580,16 @@ create_permissions_page (FMPropertiesWin +@@ -4562,10 +5580,16 @@ create_permissions_page (FMPropertiesWin gtk_table_set_row_spacing (page_table, nrows - 1, 18); #ifdef HAVE_SELINUX