From b79eb55b34c9f3126450ee23f876f0b36d9b19fa Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 5 Apr 2021 11:53:09 -0400 Subject: window: Actually enable the inspector by default 427d216081ea0fd9e2045e changed the default in the schema, but didn't handle cases where the schema isn't found. --- gtk/gtkwindow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 2aa6053494..7b1eaa860d 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -6120,8 +6120,8 @@ inspector_keybinding_enabled (gboolean *warn) GSettings *settings; gboolean enabled; - enabled = FALSE; - *warn = FALSE; + enabled = TRUE; + *warn = TRUE; schema = g_settings_schema_source_lookup (g_settings_schema_source_get_default (), "org.gtk.gtk4.Settings.Debug", -- cgit v1.2.1 From 303ff60d5e90e667cc7f6da17f363b745437238a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 5 Apr 2021 14:06:42 -0400 Subject: modelbutton: Avoid a crash We may not have a popover menu ancestor. The check for this was forgotten in one of the branches here. Fixes: #3831 --- gtk/gtkmodelbutton.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c index aa376d8945..531fa25dea 100644 --- a/gtk/gtkmodelbutton.c +++ b/gtk/gtkmodelbutton.c @@ -1404,7 +1404,8 @@ pointer_cb (GObject *object, GtkModelButton *button = data; stop_open (button); - gtk_popover_menu_set_active_item (GTK_POPOVER_MENU (popover), NULL); + if (popover) + gtk_popover_menu_set_active_item (GTK_POPOVER_MENU (popover), NULL); } } -- cgit v1.2.1