nautilus/6e37d15f.patch
Bjørn Lie 5724de8296 Accepting request 1086647 from GNOME:Next
- Add upstream bug fix patches:
  + 0e5b4c34.patch general: Use GtkSwitch active property
    consistently. app-chooser sets the state instead of active
    property. Similar to d7af60161d30c885ebab69c58b346896f1565387,
    we really meant to set active (whether the switch is toggled)
    and not the state (i.e. the color of the switch). Use
    gtk_switch_set_active().
    In properties we've already fixed this, but there's a lingering
    call to gtk_switch_get_state(). This is probably fine because
    state is in sync with active when the default handler is used,
    but let's get :active, to be consistent and safe.
  + 6e37d15f.patch window-slot: Manage search props set with
    action. Manages search property change through "search-visible"
    action. The action triggers other related functions that if not
    executed will causes buggy behavior.
    Fixes https://gitlab.gnome.org/GNOME/nautilus/-/issues/2875

OBS-URL: https://build.opensuse.org/request/show/1086647
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=376
2023-05-12 05:53:22 +00:00

40 lines
1.6 KiB
Diff

From 6e37d15fe663107d280f6a516232c20f6d6c48fa Mon Sep 17 00:00:00 2001
From: Khalid Abu Shawarib <khalid.shawarib@gmail.com>
Date: Tue, 25 Apr 2023 22:52:24 +0000
Subject: [PATCH] window-slot: Manage search props set with action
Manages search property change thorugh "search-visible"
action. The action triggers other related functions that if not
executed will causes buggy behavior.
Fixes https://gitlab.gnome.org/GNOME/nautilus/-/issues/2875
---
src/nautilus-window-slot.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 785386ea13..1768675fe4 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -738,7 +738,16 @@ nautilus_window_slot_set_property (GObject *object,
case PROP_SEARCHING:
{
- nautilus_window_slot_set_searching (self, g_value_get_boolean (value));
+ /* Should be nautilus_window_slot_set_searching(), but then
+ * the search-visible action would get out of sync with this
+ * property. See discussion in https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/1157
+ */
+ nautilus_window_slot_set_search_visible (self, g_value_get_boolean (value));
+ /* The previous call should have already caused the action
+ * to call nautilus_window_slot_set_searching(), but it
+ * doesn't hurt to make sure we set our boolean propperly.
+ */
+ self->searching = g_value_get_boolean (value);
}
break;
--
GitLab