s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-style-provider-crash' into 'master'

Browse Source 
renderer: Disconnect theme change signal handler

See merge request World/Phosh/squeekboard!484
This commit is contained in:
dcz
2021-11-22 17:16:01 +00:00
parent 2169e0393b 379a09e0d6
commit 59662444d7
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
eek/eek-gtk-keyboard.c
View File

@ -316,7 +316,6 @@ eek_gtk_keyboard_dispose (GObject *object)
if (priv->renderer) { if (priv->renderer) {
eek_renderer_free(priv->renderer); eek_renderer_free(priv->renderer);
priv->renderer = NULL; priv->renderer = NULL;
priv->renderer = NULL;
} }
if (priv->keyboard) { if (priv->keyboard) {

6
eek/eek-renderer.c
View File

@ -228,6 +228,8 @@ eek_renderer_free (EekRenderer *self)
g_object_unref(self->css_provider); g_object_unref(self->css_provider);
g_object_unref(self->view_context); g_object_unref(self->view_context);
g_object_unref(self->button_context); g_object_unref(self->button_context);
g_clear_signal_handler (&self->theme_name_id, gtk_settings_get_default());
// this is where renderer-specific surfaces would be released // this is where renderer-specific surfaces would be released
free(self); free(self);
@ -266,7 +268,7 @@ on_gtk_theme_name_changed (GtkSettings *settings, gpointer foo, EekRenderer *sel
g_autofree char *name = NULL; g_autofree char *name = NULL;
g_object_get (settings, "gtk-theme-name", &name, NULL); g_object_get (settings, "gtk-theme-name", &name, NULL);
g_warning ("GTK theme: %s", name); g_debug ("GTK theme: %s", name);
gtk_style_context_remove_provider_for_screen (gdk_screen_get_default (), gtk_style_context_remove_provider_for_screen (gdk_screen_get_default (),
GTK_STYLE_PROVIDER (self->css_provider)); GTK_STYLE_PROVIDER (self->css_provider));
@ -299,7 +301,7 @@ renderer_init (EekRenderer *self)
gtk_settings = gtk_settings_get_default (); gtk_settings = gtk_settings_get_default ();
g_signal_connect (gtk_settings, "notify::gtk-theme-name", self->theme_name_id = g_signal_connect (gtk_settings, "notify::gtk-theme-name",
G_CALLBACK (on_gtk_theme_name_changed), self); G_CALLBACK (on_gtk_theme_name_changed), self);
self->css_provider = squeek_load_style(); self->css_provider = squeek_load_style();

2
eek/eek-renderer.h
View File

@ -39,6 +39,8 @@ typedef struct EekRenderer
GtkStyleContext *button_context; // TODO: maybe move a copy to each button GtkStyleContext *button_context; // TODO: maybe move a copy to each button
/// Style class for rendering the view and button CSS. /// Style class for rendering the view and button CSS.
gchar *extra_style; // owned gchar *extra_style; // owned
// Theme name change signal handler id
gulong theme_name_id;
// Mutable state // Mutable state
gint scale_factor; /* the outputs scale factor */ gint scale_factor; /* the outputs scale factor */