[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#598871: marked as done (unblock: nautilus/2.30.1-2)

Your message dated Sun, 03 Oct 2010 16:38:33 +0200
with message-id <4CA89569.2080609@dogguy.org>
and subject line Re: Bug#598871: unblock: nautilus/2.30.1-2
has caused the Debian Bug report #598871,
regarding unblock: nautilus/2.30.1-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
598871: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598871
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception

Hi,

please unblock nautilus for squeeze.

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.
   * 14_dont_show_umount.patch: stolen from upstream git. Don’t show both
     “unmount” and “safe removal”/“eject” entries. Closes: #564859.

Attached are the two patches.

Cheers,
-- 
 .''`.      Josselin Mouette
: :' :
`. `'  “If you behave this way because you are blackmailed by someone,
  `-    […] I will see what I can do for you.”  -- Jörg Schilling



From 8e597d4b4426fb74ee8eb2442ecb43a65c9c8db5 Mon Sep 17 00:00:00 2001
From: Thomas Karpiniec <arctanx@arctanx.id.au>
Date: Tue, 8 Jun 2010 20:57:53 +1000
Subject: [PATCH] Use correct logic for delaying updates while loading

---
 src/file-manager/fm-directory-view.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 24b24a9..171be04 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -3107,7 +3107,7 @@ changes_timeout_callback (gpointer data)
 
 	if (time_delta < UPDATE_INTERVAL_RESET*1000) {
 		if (view->details->update_interval < UPDATE_INTERVAL_MAX &&
-			!view->details->loading) {
+			view->details->loading) {
 			/* Increase */
 			view->details->update_interval += UPDATE_INTERVAL_INC;
 		}
-- 
1.7.1


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

Attachment: signature.asc
Description: This is a digitally signed message part


--- End Message ---
--- Begin Message --- 
On 10/02/2010 07:44 PM, Josselin Mouette wrote:


please unblock nautilus for squeeze.



Unblocked.

Cheers,

--
Mehdi Dogguy مهدي الدڤي
http://dogguy.org/

--- End Message ---
Reply to: