diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-04-05 19:05:15 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-04-05 19:05:15 +0000 |
| commit | 748b8497c9e78aec67cee0cb26bff26373b7d103 (patch) | |
| tree | 1814d2f569d190ebe039c3a19c0be09737becd9e | |
| parent | 0ca573142a74f6feaa12f7b9124c46f4c0d6f02e (diff) | |
| parent | 303ff60d5e90e667cc7f6da17f363b745437238a (diff) | |
| download | gtk+-748b8497c9e78aec67cee0cb26bff26373b7d103.tar.gz | |
Merge branch 'matthiasc/for-master' into 'master'
window: Actually enable the inspector by default
Closes #3831
See merge request GNOME/gtk!3401
| -rw-r--r-- | gtk/gtkmodelbutton.c | 3 | ||||
| -rw-r--r-- | gtk/gtkwindow.c | 4 |
2 files changed, 4 insertions, 3 deletions
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); } } 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", |