rpms/nautilus
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update to 2.31.1

Browse Source
This commit is contained in:
Tomas Bzatek 2010-05-04 10:47:17 +00:00
parent 2d9e6650c2
commit cb30bf921b
5 changed files with 79 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
nautilus-2.29.91.tar.bz2 nautilus-2.31.1.tar.bz2

92
nautilus-2.30.1-hide-unmount-when-eject.patch
View File

@ -1,92 +0,0 @@
From 9bdd0ef925a1e660031917746f8914a38e352576 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 30 Mar 2010 16:33:51 +0000
Subject: Do not show Unmount when showing Eject/Safe removal
Having three menu entries (unmount/eject/safe removal) in a volume/drive menu
entry is too confusing. Unmount only really makes sense for internal drives,
for external ones it is pretty much a "geek" option. Geeks can use palimpsest
or "unmount /media/foo" from the CLI if they really want to, for everyone else
it is just an unintuitive and hard to to explain menu entry.
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=598690
Bug-Ubuntu: https://launchpad.net/bugs/453072
(cherry picked from commit 0a5cc4c4e5b01eb8aa38dfae926502ce920efc94)
---
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index d8b9050..361b994 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -7782,10 +7782,6 @@ file_should_show_foreach (NautilusFile *file,
*show_eject = TRUE;
}
- if (nautilus_file_can_unmount (file)) {
- *show_unmount = TRUE;
- }
-
if (nautilus_file_can_mount (file)) {
*show_mount = TRUE;
@@ -7805,6 +7801,12 @@ file_should_show_foreach (NautilusFile *file,
*show_stop = TRUE;
}
+ /* Dot not show both Unmount and Eject/Safe Removal; too confusing to
+ * have too many menu entries */
+ if (nautilus_file_can_unmount (file) && !*show_eject && !*show_stop) {
+ *show_unmount = TRUE;
+ }
+
if (nautilus_file_can_poll_for_media (file) && !nautilus_file_is_media_check_automatic (file)) {
*show_poll = TRUE;
}
@@ -7852,10 +7854,6 @@ file_should_show_self (NautilusFile *file,
*show_eject = TRUE;
}
- if (nautilus_file_can_unmount (file)) {
- *show_unmount = TRUE;
- }
-
if (nautilus_file_can_mount (file)) {
*show_mount = TRUE;
}
@@ -7874,6 +7872,12 @@ file_should_show_self (NautilusFile *file,
*show_stop = TRUE;
}
+ /* Dot not show both Unmount and Eject/Safe Removal; too confusing to
+ * have too many menu entries */
+ if (nautilus_file_can_unmount (file) && !*show_eject && !*show_stop) {
+ *show_unmount = TRUE;
+ }
+
if (nautilus_file_can_poll_for_media (file) && !nautilus_file_is_media_check_automatic (file)) {
*show_poll = TRUE;
}
diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
index 95c06eb..6dc2df7 100644
--- a/src/nautilus-places-sidebar.c
+++ b/src/nautilus-places-sidebar.c
@@ -1317,7 +1317,7 @@ check_unmount_and_eject (GMount *mount,
}
if (mount != NULL) {
*show_eject |= g_mount_can_eject (mount);
- *show_unmount = g_mount_can_unmount (mount);
+ *show_unmount = g_mount_can_unmount (mount) && !*show_eject;
}
}
@@ -1349,6 +1349,9 @@ check_visibility (GMount *mount,
*show_start = g_drive_can_start (drive) || g_drive_can_start_degraded (drive);
*show_stop = g_drive_can_stop (drive);
+
+ if (*show_stop)
+ *show_unmount = FALSE;
}
if (volume != NULL) {
--
cgit v0.8.3.1

128
nautilus-2.23.5-selinux.patch → nautilus-2.31.1-selinux.patch
View File

@ -1,6 +1,6 @@
diff -up nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.c.selinux nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.c diff -up nautilus-2.31.1/libnautilus-extension/nautilus-column.c.selinux nautilus-2.31.1/libnautilus-extension/nautilus-column.c
--- nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.c.selinux 2009-02-10 18:49:53.000000000 +0100 --- nautilus-2.31.1/libnautilus-extension/nautilus-column.c.selinux 2009-04-21 14:46:32.000000000 +0200
+++ nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.c 2009-02-16 17:20:33.000000000 +0100 +++ nautilus-2.31.1/libnautilus-extension/nautilus-column.c 2010-05-04 12:38:37.090377546 +0200
@@ -34,6 +34,7 @@ enum { @@ -34,6 +34,7 @@ enum {
PROP_LABEL, PROP_LABEL,
PROP_DESCRIPTION, PROP_DESCRIPTION,
@ -59,9 +59,9 @@ diff -up nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.c.selinux na
+ G_PARAM_READWRITE)); + G_PARAM_READWRITE));
} }
diff -up nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.h.selinux nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.h diff -up nautilus-2.31.1/libnautilus-extension/nautilus-column.h.selinux nautilus-2.31.1/libnautilus-extension/nautilus-column.h
--- nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.h.selinux 2008-09-14 14:14:27.000000000 +0200 --- nautilus-2.31.1/libnautilus-extension/nautilus-column.h.selinux 2009-04-21 14:46:32.000000000 +0200
+++ nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.h 2009-02-16 17:20:33.000000000 +0100 +++ nautilus-2.31.1/libnautilus-extension/nautilus-column.h 2010-05-04 12:38:37.090377546 +0200
@@ -64,6 +64,7 @@ NautilusColumn * nautilus_column_new @@ -64,6 +64,7 @@ NautilusColumn * nautilus_column_new
* label (string) - the user-visible label for the column * label (string) - the user-visible label for the column
* description (string) - a user-visible description of the column * description (string) - a user-visible description of the column
@ -70,9 +70,9 @@ diff -up nautilus-2.25.91-wrk/libnautilus-extension/nautilus-column.h.selinux na
*/ */
G_END_DECLS G_END_DECLS
diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-column-utilities.c.selinux nautilus-2.25.91-wrk/libnautilus-private/nautilus-column-utilities.c diff -up nautilus-2.31.1/libnautilus-private/nautilus-column-utilities.c.selinux nautilus-2.31.1/libnautilus-private/nautilus-column-utilities.c
--- nautilus-2.25.91-wrk/libnautilus-private/nautilus-column-utilities.c.selinux 2008-09-14 14:14:27.000000000 +0200 --- nautilus-2.31.1/libnautilus-private/nautilus-column-utilities.c.selinux 2009-10-07 11:37:17.000000000 +0200
+++ nautilus-2.25.91-wrk/libnautilus-private/nautilus-column-utilities.c 2009-02-16 17:20:33.000000000 +0100 +++ nautilus-2.31.1/libnautilus-private/nautilus-column-utilities.c 2010-05-04 12:38:37.090377546 +0200
@@ -119,6 +119,7 @@ get_builtin_columns (void) @@ -119,6 +119,7 @@ get_builtin_columns (void)
"attribute", "selinux_context", "attribute", "selinux_context",
"label", _("SELinux Context"), "label", _("SELinux Context"),
@ -81,10 +81,10 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-column-utilities.c.se
NULL)); NULL));
columns = g_list_append (columns, columns = g_list_append (columns,
g_object_new (NAUTILUS_TYPE_COLUMN, g_object_new (NAUTILUS_TYPE_COLUMN,
diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c.selinux nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c diff -up nautilus-2.31.1/libnautilus-private/nautilus-file.c.selinux nautilus-2.31.1/libnautilus-private/nautilus-file.c
--- nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c.selinux 2009-02-16 09:45:37.000000000 +0100 --- nautilus-2.31.1/libnautilus-private/nautilus-file.c.selinux 2010-03-10 01:14:58.000000000 +0100
+++ nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c 2009-02-16 17:20:33.000000000 +0100 +++ nautilus-2.31.1/libnautilus-private/nautilus-file.c 2010-05-04 12:38:37.092377543 +0200
@@ -1634,7 +1634,7 @@ update_info_internal (NautilusFile *file @@ -2147,7 +2147,7 @@ update_info_internal (NautilusFile *file
file->details->is_mountpoint = is_mountpoint; file->details->is_mountpoint = is_mountpoint;
has_permissions = g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_UNIX_MODE); has_permissions = g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_UNIX_MODE);
@ -93,7 +93,7 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c.selinux nautil
if (file->details->has_permissions != has_permissions || if (file->details->has_permissions != has_permissions ||
file->details->permissions != permissions) { file->details->permissions != permissions) {
changed = TRUE; changed = TRUE;
@@ -4393,7 +4393,7 @@ nautilus_file_can_get_selinux_context (N @@ -5069,7 +5069,7 @@ nautilus_file_can_get_selinux_context (N
* context * context
* @file: NautilusFile representing the file in question. * @file: NautilusFile representing the file in question.
* *
@ -102,7 +102,7 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c.selinux nautil
* *
**/ **/
char * char *
@@ -4426,6 +4426,114 @@ nautilus_file_get_selinux_context (Nauti @@ -5102,6 +5102,114 @@ nautilus_file_get_selinux_context (Nauti
return translated; return translated;
} }
@ -217,10 +217,10 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.c.selinux nautil
static char * static char *
get_real_name (const char *name, const char *gecos) get_real_name (const char *name, const char *gecos)
{ {
diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.h.selinux nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.h diff -up nautilus-2.31.1/libnautilus-private/nautilus-file.h.selinux nautilus-2.31.1/libnautilus-private/nautilus-file.h
--- nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.h.selinux 2009-02-02 13:28:32.000000000 +0100 --- nautilus-2.31.1/libnautilus-private/nautilus-file.h.selinux 2009-10-07 11:37:17.000000000 +0200
+++ nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.h 2009-02-16 17:20:33.000000000 +0100 +++ nautilus-2.31.1/libnautilus-private/nautilus-file.h 2010-05-04 12:38:37.092377543 +0200
@@ -244,6 +244,7 @@ GList * nautilus_get_all @@ -243,6 +243,7 @@ GList * nautilus_get_all
GList * nautilus_file_get_settable_group_names (NautilusFile *file); GList * nautilus_file_get_settable_group_names (NautilusFile *file);
gboolean nautilus_file_can_get_selinux_context (NautilusFile *file); gboolean nautilus_file_can_get_selinux_context (NautilusFile *file);
char * nautilus_file_get_selinux_context (NautilusFile *file); char * nautilus_file_get_selinux_context (NautilusFile *file);
@ -228,7 +228,7 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.h.selinux nautil
/* "Capabilities". */ /* "Capabilities". */
gboolean nautilus_file_can_read (NautilusFile *file); gboolean nautilus_file_can_read (NautilusFile *file);
@@ -278,6 +279,10 @@ void nautilus_file_se @@ -303,6 +304,10 @@ void nautilus_file_se
guint32 permissions, guint32 permissions,
NautilusFileOperationCallback callback, NautilusFileOperationCallback callback,
gpointer callback_data); gpointer callback_data);
@ -239,12 +239,12 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file.h.selinux nautil
void nautilus_file_rename (NautilusFile *file, void nautilus_file_rename (NautilusFile *file,
const char *new_name, const char *new_name,
NautilusFileOperationCallback callback, NautilusFileOperationCallback callback,
diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c.selinux nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c diff -up nautilus-2.31.1/libnautilus-private/nautilus-file-operations.c.selinux nautilus-2.31.1/libnautilus-private/nautilus-file-operations.c
--- nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c.selinux 2009-02-02 13:28:32.000000000 +0100 --- nautilus-2.31.1/libnautilus-private/nautilus-file-operations.c.selinux 2010-04-28 14:38:01.000000000 +0200
+++ nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c 2009-02-16 17:20:33.000000000 +0100 +++ nautilus-2.31.1/libnautilus-private/nautilus-file-operations.c 2010-05-04 12:38:37.094377488 +0200
@@ -67,6 +67,11 @@ @@ -68,6 +68,11 @@
#include "nautilus-trash-monitor.h"
#include "nautilus-file-utilities.h" #include "nautilus-file-utilities.h"
#include "nautilus-file-conflict-dialog.h"
+#ifdef HAVE_SELINUX +#ifdef HAVE_SELINUX
+ #include <selinux/selinux.h> + #include <selinux/selinux.h>
@ -254,7 +254,7 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c.sel
static gboolean confirm_trash_auto_value; static gboolean confirm_trash_auto_value;
/* TODO: TESTING!!! */ /* TODO: TESTING!!! */
@@ -140,6 +145,7 @@ typedef struct { @@ -152,6 +157,7 @@ typedef struct {
guint32 file_mask; guint32 file_mask;
guint32 dir_permissions; guint32 dir_permissions;
guint32 dir_mask; guint32 dir_mask;
@ -262,7 +262,7 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c.sel
} SetPermissionsJob; } SetPermissionsJob;
typedef enum { typedef enum {
@@ -5141,6 +5147,10 @@ set_permissions_job_done (gpointer user_ @@ -5409,6 +5415,10 @@ set_permissions_job_done (gpointer user_
job->done_callback (job->done_callback_data); job->done_callback (job->done_callback_data);
} }
@ -273,7 +273,7 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c.sel
finalize_common ((CommonJob *)job); finalize_common ((CommonJob *)job);
return FALSE; return FALSE;
} }
@@ -5196,6 +5206,14 @@ set_permissions_file (SetPermissionsJob @@ -5464,6 +5474,14 @@ set_permissions_file (SetPermissionsJob
current, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, current, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
common->cancellable, NULL); common->cancellable, NULL);
} }
@ -288,7 +288,7 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c.sel
if (!job_aborted (common) && if (!job_aborted (common) &&
g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) { g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) {
@@ -5259,6 +5277,7 @@ nautilus_file_set_permissions_recursive @@ -5527,6 +5545,7 @@ nautilus_file_set_permissions_recursive
guint32 file_mask, guint32 file_mask,
guint32 dir_permissions, guint32 dir_permissions,
guint32 dir_mask, guint32 dir_mask,
@ -296,7 +296,7 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c.sel
NautilusOpCallback callback, NautilusOpCallback callback,
gpointer callback_data) gpointer callback_data)
{ {
@@ -5272,7 +5291,24 @@ nautilus_file_set_permissions_recursive @@ -5540,7 +5559,24 @@ nautilus_file_set_permissions_recursive
job->dir_mask = dir_mask; job->dir_mask = dir_mask;
job->done_callback = callback; job->done_callback = callback;
job->done_callback_data = callback_data; job->done_callback_data = callback_data;
@ -322,10 +322,10 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.c.sel
g_io_scheduler_push_job (set_permissions_job, g_io_scheduler_push_job (set_permissions_job,
job, job,
NULL, NULL,
diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.h.selinux nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.h diff -up nautilus-2.31.1/libnautilus-private/nautilus-file-operations.h.selinux nautilus-2.31.1/libnautilus-private/nautilus-file-operations.h
--- nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.h.selinux 2008-09-14 14:14:27.000000000 +0200 --- nautilus-2.31.1/libnautilus-private/nautilus-file-operations.h.selinux 2010-04-28 14:37:36.000000000 +0200
+++ nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.h 2009-02-16 17:20:33.000000000 +0100 +++ nautilus-2.31.1/libnautilus-private/nautilus-file-operations.h 2010-05-04 12:38:37.094377488 +0200
@@ -85,6 +85,7 @@ void nautilus_file_set_permissions_recur @@ -87,6 +87,7 @@ void nautilus_file_set_permissions_recur
guint32 file_mask, guint32 file_mask,
guint32 folder_permissions, guint32 folder_permissions,
guint32 folder_mask, guint32 folder_mask,
@ -333,10 +333,10 @@ diff -up nautilus-2.25.91-wrk/libnautilus-private/nautilus-file-operations.h.sel
NautilusOpCallback callback, NautilusOpCallback callback,
gpointer callback_data); gpointer callback_data);
diff -up nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.c.selinux nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.c diff -up nautilus-2.31.1/src/file-manager/fm-error-reporting.c.selinux nautilus-2.31.1/src/file-manager/fm-error-reporting.c
--- nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.c.selinux 2008-09-14 14:14:22.000000000 +0200 --- nautilus-2.31.1/src/file-manager/fm-error-reporting.c.selinux 2009-04-21 14:46:32.000000000 +0200
+++ nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.c 2009-02-16 17:20:33.000000000 +0100 +++ nautilus-2.31.1/src/file-manager/fm-error-reporting.c 2010-05-04 12:38:37.095377522 +0200
@@ -232,6 +232,31 @@ fm_report_error_setting_permissions (Nau @@ -238,6 +238,31 @@ fm_report_error_setting_permissions (Nau
g_free (message); g_free (message);
} }
@ -368,9 +368,9 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.c.selinux naut
typedef struct _FMRenameData { typedef struct _FMRenameData {
char *name; char *name;
NautilusFileOperationCallback callback; NautilusFileOperationCallback callback;
diff -up nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.h.selinux nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.h diff -up nautilus-2.31.1/src/file-manager/fm-error-reporting.h.selinux nautilus-2.31.1/src/file-manager/fm-error-reporting.h
--- nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.h.selinux 2008-10-06 12:49:08.000000000 +0200 --- nautilus-2.31.1/src/file-manager/fm-error-reporting.h.selinux 2009-04-21 14:46:32.000000000 +0200
+++ nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.h 2009-02-16 17:20:33.000000000 +0100 +++ nautilus-2.31.1/src/file-manager/fm-error-reporting.h 2010-05-04 12:38:37.095377522 +0200
@@ -40,8 +40,11 @@ void fm_report_error_setting_permissions @@ -40,8 +40,11 @@ void fm_report_error_setting_permissions
GError *error, GError *error,
GtkWindow *parent_window); GtkWindow *parent_window);
@ -384,10 +384,10 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-error-reporting.h.selinux naut
void fm_report_error_setting_group (NautilusFile *file, void fm_report_error_setting_group (NautilusFile *file,
GError *error, GError *error,
GtkWindow *parent_window); GtkWindow *parent_window);
diff -up nautilus-2.25.91-wrk/src/file-manager/fm-list-view.c.selinux nautilus-2.25.91-wrk/src/file-manager/fm-list-view.c diff -up nautilus-2.31.1/src/file-manager/fm-list-view.c.selinux nautilus-2.31.1/src/file-manager/fm-list-view.c
--- nautilus-2.25.91-wrk/src/file-manager/fm-list-view.c.selinux 2008-12-09 09:45:47.000000000 +0100 --- nautilus-2.31.1/src/file-manager/fm-list-view.c.selinux 2010-04-15 11:48:49.000000000 +0200
+++ nautilus-2.25.91-wrk/src/file-manager/fm-list-view.c 2009-02-16 17:20:33.000000000 +0100 +++ nautilus-2.31.1/src/file-manager/fm-list-view.c 2010-05-04 12:38:37.095377522 +0200
@@ -1420,13 +1420,15 @@ create_and_set_up_tree_view (FMListView @@ -1482,13 +1482,15 @@ create_and_set_up_tree_view (FMListView
char *name; char *name;
char *label; char *label;
float xalign; float xalign;
@ -404,7 +404,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-list-view.c.selinux nautilus-2
column_num = fm_list_model_add_column (view->details->model, column_num = fm_list_model_add_column (view->details->model,
nautilus_column); nautilus_column);
@@ -1472,6 +1474,8 @@ create_and_set_up_tree_view (FMListView @@ -1533,6 +1535,8 @@ create_and_set_up_tree_view (FMListView
} else { } else {
cell = gtk_cell_renderer_text_new (); cell = gtk_cell_renderer_text_new ();
g_object_set (cell, "xalign", xalign, NULL); g_object_set (cell, "xalign", xalign, NULL);
@ -413,10 +413,10 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-list-view.c.selinux nautilus-2
view->details->cells = g_list_append (view->details->cells, view->details->cells = g_list_append (view->details->cells,
cell); cell);
column = gtk_tree_view_column_new_with_attributes (label, column = gtk_tree_view_column_new_with_attributes (label,
diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c diff -up nautilus-2.31.1/src/file-manager/fm-properties-window.c.selinux nautilus-2.31.1/src/file-manager/fm-properties-window.c
--- nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux 2009-02-16 09:45:36.000000000 +0100 --- nautilus-2.31.1/src/file-manager/fm-properties-window.c.selinux 2010-03-10 01:14:58.000000000 +0100
+++ nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c 2009-02-16 17:20:33.000000000 +0100 +++ nautilus-2.31.1/src/file-manager/fm-properties-window.c 2010-05-04 12:38:37.098377503 +0200
@@ -83,6 +83,10 @@ @@ -80,6 +80,10 @@
#define FREE_FILL_B (0.811764706 * 65535) #define FREE_FILL_B (0.811764706 * 65535)
@ -427,7 +427,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
#define PREVIEW_IMAGE_WIDTH 96 #define PREVIEW_IMAGE_WIDTH 96
#define ROW_PAD 6 #define ROW_PAD 6
@@ -125,12 +129,15 @@ struct FMPropertiesWindowDetails { @@ -122,12 +126,15 @@ struct FMPropertiesWindowDetails {
unsigned int owner_change_timeout; unsigned int owner_change_timeout;
GList *permission_buttons; GList *permission_buttons;
@ -444,7 +444,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
GList *mime_list; GList *mime_list;
gboolean deep_count_finished; gboolean deep_count_finished;
@@ -217,6 +224,10 @@ static void permission_combo_update @@ -214,6 +221,10 @@ static void permission_combo_update
GtkComboBox *combo); GtkComboBox *combo);
static void value_field_update (FMPropertiesWindow *window, static void value_field_update (FMPropertiesWindow *window,
GtkLabel *field); GtkLabel *field);
@ -455,7 +455,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
static void properties_window_update (FMPropertiesWindow *window, static void properties_window_update (FMPropertiesWindow *window,
GList *files); GList *files);
static void is_directory_ready_callback (NautilusFile *file, static void is_directory_ready_callback (NautilusFile *file,
@@ -246,10 +257,36 @@ static GtkLabel *attach_ellipsizing_valu @@ -243,10 +254,36 @@ static GtkLabel *attach_ellipsizing_valu
const char *initial_text); const char *initial_text);
static GtkWidget* create_pie_widget (FMPropertiesWindow *window); static GtkWidget* create_pie_widget (FMPropertiesWindow *window);
@ -492,7 +492,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
static gboolean static gboolean
is_multi_file_window (FMPropertiesWindow *window) is_multi_file_window (FMPropertiesWindow *window)
{ {
@@ -270,6 +307,111 @@ is_multi_file_window (FMPropertiesWindow @@ -267,6 +304,111 @@ is_multi_file_window (FMPropertiesWindow
return FALSE; return FALSE;
} }
@ -604,7 +604,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
static int static int
get_not_gone_original_file_count (FMPropertiesWindow *window) get_not_gone_original_file_count (FMPropertiesWindow *window)
{ {
@@ -502,7 +644,7 @@ fm_properties_window_drag_data_received @@ -499,7 +641,7 @@ fm_properties_window_drag_data_received
return; return;
} }
@ -613,7 +613,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
exactly_one = uris[0] != NULL && (uris[1] == NULL || uris[1][0] == '\0'); exactly_one = uris[0] != NULL && (uris[1] == NULL || uris[1][0] == '\0');
@@ -651,11 +793,7 @@ set_name_field (FMPropertiesWindow *wind @@ -648,11 +790,7 @@ set_name_field (FMPropertiesWindow *wind
* currently showing. This causes minimal ripples (e.g. * currently showing. This causes minimal ripples (e.g.
* selection change). * selection change).
*/ */
@ -626,7 +626,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
} }
} }
} }
@@ -735,7 +873,6 @@ static void @@ -732,7 +870,6 @@ static void
name_field_restore_original_name (NautilusEntry *name_field) name_field_restore_original_name (NautilusEntry *name_field)
{ {
const char *original_name; const char *original_name;
@ -634,7 +634,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
original_name = (const char *) g_object_get_data (G_OBJECT (name_field), original_name = (const char *) g_object_get_data (G_OBJECT (name_field),
"original_name"); "original_name");
@@ -744,14 +881,8 @@ name_field_restore_original_name (Nautil @@ -741,14 +878,8 @@ name_field_restore_original_name (Nautil
return; return;
} }
@ -650,7 +650,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
} }
static void static void
@@ -1213,6 +1344,14 @@ properties_window_update (FMPropertiesWi @@ -1210,6 +1341,14 @@ properties_window_update (FMPropertiesWi
for (l = window->details->value_fields; l != NULL; l = l->next) { for (l = window->details->value_fields; l != NULL; l = l->next) {
value_field_update (window, GTK_LABEL (l->data)); value_field_update (window, GTK_LABEL (l->data));
} }
@ -665,7 +665,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
} }
mime_list = get_mime_list (window); mime_list = get_mime_list (window);
@@ -1383,6 +1522,164 @@ value_field_update (FMPropertiesWindow * @@ -1380,6 +1519,164 @@ value_field_update (FMPropertiesWindow *
window->details->target_files)); window->details->target_files));
} }
@ -830,7 +830,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
static GtkLabel * static GtkLabel *
attach_label (GtkTable *table, attach_label (GtkTable *table,
int row, int row,
@@ -1437,6 +1734,47 @@ attach_value_label (GtkTable *table, @@ -1434,6 +1731,47 @@ attach_value_label (GtkTable *table,
return attach_label (table, row, column, initial_text, FALSE, FALSE, FALSE, TRUE, FALSE); return attach_label (table, row, column, initial_text, FALSE, FALSE, FALSE, TRUE, FALSE);
} }
@ -878,7 +878,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
static GtkLabel * static GtkLabel *
attach_ellipsizing_value_label (GtkTable *table, attach_ellipsizing_value_label (GtkTable *table,
int row, int row,
@@ -1495,6 +1833,649 @@ attach_value_field (FMPropertiesWindow * @@ -1492,6 +1830,649 @@ attach_value_field (FMPropertiesWindow *
FALSE); FALSE);
} }
@ -1528,7 +1528,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
static GtkWidget* static GtkWidget*
attach_ellipsizing_value_field (FMPropertiesWindow *window, attach_ellipsizing_value_field (FMPropertiesWindow *window,
GtkTable *table, GtkTable *table,
@@ -2485,6 +3466,37 @@ append_title_value_pair (FMPropertiesWin @@ -2482,6 +3463,37 @@ append_title_value_pair (FMPropertiesWin
return last_row; return last_row;
} }
@ -1566,7 +1566,7 @@ diff -up nautilus-2.25.91-wrk/src/file-manager/fm-properties-window.c.selinux na
static guint static guint
append_title_and_ellipsizing_value (FMPropertiesWindow *window, append_title_and_ellipsizing_value (FMPropertiesWindow *window,
GtkTable *table, GtkTable *table,
@@ -3504,31 +4516,6 @@ create_emblems_page (FMPropertiesWindow @@ -3501,31 +4513,6 @@ create_emblems_page (FMPropertiesWindow
} }
static void static void

20
nautilus.spec
View File

@ -14,8 +14,8 @@
Name: nautilus Name: nautilus
Summary: File manager for GNOME Summary: File manager for GNOME
Version: 2.30.1 Version: 2.31.1
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: User Interface/Desktops Group: User Interface/Desktops
Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.tar.bz2 Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.tar.bz2
@ -77,7 +77,7 @@ Provides: eel2 = 2.26.0-3
# Some changes to default config # Some changes to default config
Patch1: nautilus-config.patch Patch1: nautilus-config.patch
Patch4: nautilus-2.23.5-selinux.patch Patch4: nautilus-2.31.1-selinux.patch
Patch7: rtl-fix.patch Patch7: rtl-fix.patch
#Patch8: nautilus-2.22.1-hide-white-screen.patch #Patch8: nautilus-2.22.1-hide-white-screen.patch
@ -87,9 +87,6 @@ Patch10: nautilus-gvfs-desktop-key-2.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=519743 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
Patch17: nautilus-filetype-symlink-fix.patch Patch17: nautilus-filetype-symlink-fix.patch
# from upstream
Patch18: nautilus-2.30.1-hide-unmount-when-eject.patch
%description %description
Nautilus is the file manager and graphical shell for the GNOME desktop Nautilus is the file manager and graphical shell for the GNOME desktop
that makes it easy to manage your files and the rest of your system. that makes it easy to manage your files and the rest of your system.
@ -128,7 +125,6 @@ for developing nautilus extensions.
# %patch8 -p1 -b .hide-white-screen # %patch8 -p1 -b .hide-white-screen
%patch10 -p1 -b .gvfs-desktop-key %patch10 -p1 -b .gvfs-desktop-key
%patch17 -p0 -b .symlink %patch17 -p0 -b .symlink
%patch18 -p1 -b .hide-unmount
%build %build
@ -172,6 +168,10 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
## (uncomment when we patch the source to look in the right place) ## (uncomment when we patch the source to look in the right place)
## /bin/rm -rf $RPM_BUILD_ROOT%{_datadir}/nautilus/patterns ## /bin/rm -rf $RPM_BUILD_ROOT%{_datadir}/nautilus/patterns
# remove .desktop entry in applications > system tools
# https://bugzilla.redhat.com/show_bug.cgi?id=583790
rm $RPM_BUILD_ROOT%{_datadir}/applications/nautilus-browser.desktop
desktop-file-install --vendor gnome --delete-original \ desktop-file-install --vendor gnome --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-only-show-in GNOME \ --add-only-show-in GNOME \
@ -261,6 +261,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%changelog %changelog
* Tue May 4 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.31.1-1
- Update to 2.31.1
* Tue May 4 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.30.1-3
- Remove .desktop entry in applications > system tools (#583790)
* Mon Apr 26 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.30.1-2 * Mon Apr 26 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.30.1-2
- Do not show Unmount when showing Eject/Safe removal - Do not show Unmount when showing Eject/Safe removal

2
sources
View File

@ -1 +1 @@
e1bda55f9c6cd223561da066dbc4e863 nautilus-2.30.1.tar.bz2 d5c0200734e6ea4a7234c58a70bbca71 nautilus-2.31.1.tar.bz2