diff options
author | Ernestas Kulik <ernestask@gnome.org> | 2018-10-30 11:02:30 +0100 |
---|---|---|
committer | Ernestas Kulik <ernestask@gnome.org> | 2018-10-30 11:02:30 +0100 |
commit | 3332de3026846ee6d0cae9bd203f1ec9311d21cc (patch) | |
tree | 4cdc5f1805b8b02f603687635da6d8acb0f861b7 /src/nautilus-application.c | |
parent | 7d5b6012ae274f6ea97ed4886e36707066ecaf26 (diff) | |
download | nautilus-3332de3026846ee6d0cae9bd203f1ec9311d21cc.tar.gz |
general: Kill off NAUTILUS_WINDOW_OPEN_FLAG_CLOSE_BEHIND
bb884cb6151a10523276c2888011692877c686a3 changed the accelerator for
open-file-and-close-window from alt-shift-down to ctrl-shift-down, which
now conflicts with keyboard rubberbanding in the canvas view.
Additionally, it’s nothing more than a relict from a more spatial time.
https://bugzilla.gnome.org/show_bug.cgi?id=765526
Fixes https://gitlab.gnome.org/GNOME/nautilus/issues/701
Diffstat (limited to 'src/nautilus-application.c')
-rw-r--r-- | src/nautilus-application.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/nautilus-application.c b/src/nautilus-application.c index b0893f344..498f7a147 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -337,20 +337,6 @@ get_window_slot_for_location (NautilusApplication *self, return slot; } -static void -new_window_show_callback (GtkWidget *widget, - gpointer user_data) -{ - NautilusWindow *window; - - window = NAUTILUS_WINDOW (user_data); - nautilus_window_close (window); - - g_signal_handlers_disconnect_by_func (widget, - G_CALLBACK (new_window_show_callback), - user_data); -} - void nautilus_application_open_location_full (NautilusApplication *self, GFile *location, @@ -463,23 +449,6 @@ real_open_location_full (NautilusApplication *self, g_assert (target_window != NULL); - /* close the current window if the flags say so */ - if ((flags & NAUTILUS_WINDOW_OPEN_FLAG_CLOSE_BEHIND) != 0) - { - if (gtk_widget_get_visible (GTK_WIDGET (target_window))) - { - nautilus_window_close (active_window); - } - else - { - g_signal_connect_object (target_window, - "show", - G_CALLBACK (new_window_show_callback), - active_window, - G_CONNECT_AFTER); - } - } - /* Application is the one that manages windows, so this flag shouldn't use * it anymore by any client */ flags &= ~NAUTILUS_WINDOW_OPEN_FLAG_NEW_WINDOW; |