cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From upstream git:

Browse Source 
Dot not show both Unmount and Eject/Safe Removal; too confusing to have
too many menu entries.
This commit is contained in:
ajacoutot 2010-05-18 14:37:01 +00:00
parent 48039b2356
commit 51219631b3
3 changed files with 81 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome/nautilus/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.63 2010/04/27 17:28:03 jasper Exp $
# $OpenBSD: Makefile,v 1.64 2010/05/18 14:37:01 ajacoutot Exp $
COMMENT= GNOME shell and file manager
@ -15,7 +15,7 @@ COMMENT= GNOME shell and file manager
GNOME_PROJECT= nautilus
GNOME_VERSION= 2.30.1
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
SHARED_LIBS += nautilus-extension 2.0 # .2.0

54
x11/gnome/nautilus/patches/patch-src_file-manager_fm-directory-view_c Normal file
View File

@ -0,0 +1,54 @@
$OpenBSD: patch-src_file-manager_fm-directory-view_c,v 1.1 2010/05/18 14:37:02 ajacoutot Exp $
Merged from upstream git.
--- src/file-manager/fm-directory-view.c.orig Mon Apr 26 09:50:42 2010
+++ src/file-manager/fm-directory-view.c Tue May 18 16:08:32 2010
@@ -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;
}
@@ -7872,6 +7870,12 @@ file_should_show_self (NautilusFile *file,
if (nautilus_file_can_stop (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)) {

25
x11/gnome/nautilus/patches/patch-src_nautilus-places-sidebar_c Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-src_nautilus-places-sidebar_c,v 1.1 2010/05/18 14:37:02 ajacoutot Exp $
Merged from upstream git.
--- src/nautilus-places-sidebar.c.orig Wed Mar 10 14:28:38 2010
+++ src/nautilus-places-sidebar.c Tue May 18 16:08:36 2010
@@ -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) {