diff --git a/nautilus-selinux.patch b/nautilus-selinux.patch index 5ec29a9..971888b 100644 --- a/nautilus-selinux.patch +++ b/nautilus-selinux.patch @@ -1,6 +1,6 @@ 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 16:06:37.054993001 -0500 ++++ nautilus-2.91.6/libnautilus-extension/nautilus-column.c 2011-01-07 16:43:53.859993002 -0500 @@ -34,6 +34,7 @@ enum { PROP_LABEL, PROP_DESCRIPTION, @@ -61,7 +61,7 @@ diff -up nautilus-2.91.6/libnautilus-extension/nautilus-column.c.selinux nautilu 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 16:06:37.054993001 -0500 ++++ nautilus-2.91.6/libnautilus-extension/nautilus-column.h 2011-01-07 16:43:53.859993002 -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 @@ -72,7 +72,7 @@ diff -up nautilus-2.91.6/libnautilus-extension/nautilus-column.h.selinux nautilu G_END_DECLS 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 16:06:37.055993001 -0500 ++++ nautilus-2.91.6/libnautilus-private/nautilus-column-utilities.c 2011-01-07 16:43:53.860993002 -0500 @@ -120,6 +120,7 @@ get_builtin_columns (void) "attribute", "selinux_context", "label", _("SELinux Context"), @@ -83,7 +83,7 @@ diff -up nautilus-2.91.6/libnautilus-private/nautilus-column-utilities.c.selinux columns = g_list_append (columns, 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 16:06:37.086993001 -0500 ++++ nautilus-2.91.6/libnautilus-private/nautilus-file.c 2011-01-07 16:43:53.864993002 -0500 @@ -2154,7 +2154,7 @@ update_info_internal (NautilusFile *file } } @@ -228,7 +228,7 @@ diff -up nautilus-2.91.6/libnautilus-private/nautilus-file.c.selinux nautilus-2. { 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 16:06:37.062993001 -0500 ++++ nautilus-2.91.6/libnautilus-private/nautilus-file.h 2011-01-07 16:43:53.867993002 -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); @@ -250,7 +250,7 @@ diff -up nautilus-2.91.6/libnautilus-private/nautilus-file.h.selinux nautilus-2. NautilusFileOperationCallback callback, 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 16:06:37.064993001 -0500 ++++ nautilus-2.91.6/libnautilus-private/nautilus-file-operations.c 2011-01-07 16:43:53.870993002 -0500 @@ -64,6 +64,10 @@ #include "nautilus-file-utilities.h" #include "nautilus-file-conflict-dialog.h" @@ -332,7 +332,7 @@ diff -up nautilus-2.91.6/libnautilus-private/nautilus-file-operations.c.selinux NULL, 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 16:06:37.066993001 -0500 ++++ nautilus-2.91.6/libnautilus-private/nautilus-file-operations.h 2011-01-07 16:43:53.872993001 -0500 @@ -94,6 +94,7 @@ void nautilus_file_set_permissions_recur guint32 file_mask, guint32 folder_permissions, @@ -343,7 +343,7 @@ diff -up nautilus-2.91.6/libnautilus-private/nautilus-file-operations.h.selinux 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 16:06:37.067993001 -0500 ++++ nautilus-2.91.6/src/file-manager/fm-error-reporting.c 2011-01-07 16:43:53.873993001 -0500 @@ -245,6 +245,31 @@ fm_report_error_setting_permissions (Nau g_free (message); } @@ -378,7 +378,7 @@ diff -up nautilus-2.91.6/src/file-manager/fm-error-reporting.c.selinux nautilus- NautilusFileOperationCallback callback; 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 16:06:37.068993001 -0500 ++++ nautilus-2.91.6/src/file-manager/fm-error-reporting.h 2011-01-07 16:43:53.874993001 -0500 @@ -40,8 +40,11 @@ void fm_report_error_setting_permissions GError *error, GtkWindow *parent_window); @@ -394,7 +394,7 @@ diff -up nautilus-2.91.6/src/file-manager/fm-error-reporting.h.selinux nautilus- GtkWindow *parent_window); 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 16:06:37.070993001 -0500 ++++ nautilus-2.91.6/src/file-manager/fm-list-view.c 2011-01-07 16:43:53.875993001 -0500 @@ -1620,13 +1620,15 @@ create_and_set_up_tree_view (FMListView char *name; char *label; @@ -423,7 +423,7 @@ diff -up nautilus-2.91.6/src/file-manager/fm-list-view.c.selinux nautilus-2.91.6 column = gtk_tree_view_column_new_with_attributes (label, 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 16:18:41.247992997 -0500 ++++ nautilus-2.91.6/src/file-manager/fm-properties-window.c 2011-01-07 20:12:02.721992917 -0500 @@ -75,6 +75,9 @@ #define FREE_FILL_G 0.623529412 #define FREE_FILL_B 0.811764706 @@ -1562,7 +1562,39 @@ diff -up nautilus-2.91.6/src/file-manager/fm-properties-window.c.selinux nautilu static guint append_title_and_ellipsizing_value (FMPropertiesWindow *window, GtkTable *table, -@@ -4034,39 +5043,6 @@ append_special_execution_flags (FMProper +@@ -3227,31 +4236,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); +- g_object_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, +@@ -4034,39 +5018,6 @@ append_special_execution_flags (FMProper gtk_table_set_row_spacing (table, nrows - 1, 18); } @@ -1602,7 +1634,7 @@ diff -up nautilus-2.91.6/src/file-manager/fm-properties-window.c.selinux nautilu static GHashTable * get_initial_permissions (GList *file_list) -@@ -4414,7 +5390,9 @@ apply_recursive_clicked (GtkWidget *recu +@@ -4414,7 +5365,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; @@ -1613,7 +1645,7 @@ diff -up nautilus-2.91.6/src/file-manager/fm-properties-window.c.selinux nautilu gboolean active, is_folder, is_special, use_original; GList *l; GtkTreeModel *model; -@@ -4458,9 +5436,9 @@ apply_recursive_clicked (GtkWidget *recu +@@ -4458,9 +5411,9 @@ apply_recursive_clicked (GtkWidget *recu } /* Simple mode, minus exec checkbox */ for (l = window->details->permission_combos; l != NULL; l = l->next) { @@ -1625,7 +1657,7 @@ diff -up nautilus-2.91.6/src/file-manager/fm-properties-window.c.selinux nautilu continue; } -@@ -4468,7 +5446,7 @@ apply_recursive_clicked (GtkWidget *recu +@@ -4468,7 +5421,7 @@ apply_recursive_clicked (GtkWidget *recu is_folder = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo), "is-folder")); @@ -1634,7 +1666,7 @@ diff -up nautilus-2.91.6/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; -@@ -4491,12 +5469,53 @@ apply_recursive_clicked (GtkWidget *recu +@@ -4491,12 +5444,53 @@ apply_recursive_clicked (GtkWidget *recu } } @@ -1688,7 +1720,7 @@ diff -up nautilus-2.91.6/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); -@@ -4507,11 +5526,13 @@ apply_recursive_clicked (GtkWidget *recu +@@ -4507,11 +5501,13 @@ apply_recursive_clicked (GtkWidget *recu file_permission_mask, dir_permission, dir_permission_mask, @@ -1702,7 +1734,7 @@ diff -up nautilus-2.91.6/src/file-manager/fm-properties-window.c.selinux nautilu } static void -@@ -4562,10 +5583,16 @@ create_permissions_page (FMPropertiesWin +@@ -4562,10 +5558,16 @@ create_permissions_page (FMPropertiesWin gtk_table_set_row_spacing (page_table, nrows - 1, 18); #ifdef HAVE_SELINUX