r25163 - in /desktop/unstable/nautilus/debian: changelog patches/14_dont_show_umount.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Sep 18 12:31:50 UTC 2010
Author: joss
Date: Sat Sep 18 12:31:49 2010
New Revision: 25163
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25163
Log:
14_dont_show_umount.patch: stolen from upstream git. Don’t show both
“unmount” and “safe removal”/“eject” entries. Closes: #564859.
Added:
desktop/unstable/nautilus/debian/patches/14_dont_show_umount.patch
Modified:
desktop/unstable/nautilus/debian/changelog
desktop/unstable/nautilus/debian/patches/series
Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=25163&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog [utf-8] (original)
+++ desktop/unstable/nautilus/debian/changelog [utf-8] Sat Sep 18 12:31:49 2010
@@ -1,12 +1,14 @@
-nautilus (2.30.1-2) UNRELEASED; urgency=low
+nautilus (2.30.1-2) unstable; urgency=low
* Drop type-handling usage. Closes: #587872.
* Bump standards version accordingly.
* 13_shortcuts.patch: stolen from upstream git. Fix an annoying bug
that makes a number of keyboard shortcuts inoperant the first time.
Closes: #592016.
-
- -- Josselin Mouette <joss at debian.org> Fri, 02 Jul 2010 18:30:53 +0200
+ * 14_dont_show_umount.patch: stolen from upstream git. Don’t show both
+ “unmount” and “safe removal”/“eject” entries. Closes: #564859.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 18 Sep 2010 14:31:36 +0200
nautilus (2.30.1-1) unstable; urgency=low
Added: desktop/unstable/nautilus/debian/patches/14_dont_show_umount.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/14_dont_show_umount.patch?rev=25163&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/14_dont_show_umount.patch (added)
+++ desktop/unstable/nautilus/debian/patches/14_dont_show_umount.patch [utf-8] Sat Sep 18 12:31:49 2010
@@ -1,0 +1,92 @@
+From 9bdd0ef925a1e660031917746f8914a38e352576 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt at 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
Modified: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=25163&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/series [utf-8] Sat Sep 18 12:31:49 2010
@@ -3,6 +3,7 @@
10_load_session.patch
12_list-view_expand.patch
13_shortcuts.patch
+14_dont_show_umount.patch
20_open-with_install.patch
90_relibtoolize.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list