[gnome-terminal] nautilus: Fix duplicated open menus
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-terminal] nautilus: Fix duplicated open menus
- Date: Tue, 31 Oct 2017 12:02:14 +0000 (UTC)
commit 28011c9167b0b3401e04e2f4946aa3c3f5b79df3
Author: Jason Crain <jason inspiresomeone us>
Date: Tue Oct 31 13:01:59 2017 +0100
nautilus: Fix duplicated open menus
"OTHER" type URIs which have a local mapping would incorrectly show two
"Open in Terminal" menu entries
https://bugzilla.gnome.org/show_bug.cgi?id=771276
src/terminal-nautilus.c | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/src/terminal-nautilus.c b/src/terminal-nautilus.c
index 94b410f..fb52bf4 100644
--- a/src/terminal-nautilus.c
+++ b/src/terminal-nautilus.c
@@ -705,24 +705,22 @@ terminal_nautilus_get_background_items (NautilusMenuProvider *provider,
terminal_file_info = get_terminal_file_info_from_uri (uri);
- if (terminal_file_info == FILE_INFO_SFTP ||
- terminal_file_info == FILE_INFO_DESKTOP ||
- uri_has_local_path (uri)) {
- /* local locations or SSH */
+
+ if (terminal_file_info == FILE_INFO_SFTP) {
+ /* remote SSH location */
item = terminal_nautilus_menu_item_new (nautilus,
file_info,
terminal_file_info,
gtk_widget_get_screen (window),
FALSE,
- terminal_file_info == FILE_INFO_SFTP,
+ TRUE,
FALSE);
items = g_list_append (items, item);
}
- if ((terminal_file_info == FILE_INFO_SFTP ||
- terminal_file_info == FILE_INFO_OTHER) &&
+ if (terminal_file_info == FILE_INFO_DESKTOP ||
uri_has_local_path (uri)) {
- /* remote locations that offer local back-mapping */
+ /* local locations and remote locations that offer local back-mapping */
item = terminal_nautilus_menu_item_new (nautilus,
file_info,
terminal_file_info,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]