Merge branch 'matthiasc/for-master' into 'master'

window: Actually enable the inspector by default

Closes #3831

See merge request GNOME/gtk!3401
This commit is contained in:
Matthias Clasen 2021-04-05 19:05:15 +00:00
commit 748b8497c9
2 changed files with 4 additions and 3 deletions

View File

@ -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);
}
}

View File

@ -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",