diff options
| author | lukefromdc <[email protected]> | 2016-05-23 21:54:39 -0400 |
|---|---|---|
| committer | lukefromdc <[email protected]> | 2016-05-23 21:54:39 -0400 |
| commit | 628a2b85f1afbd2b8266782c3391d4991a90bd55 (patch) | |
| tree | ad734dbb0c0cdf182a34132abf291e2573e22e26 | |
| parent | 3ddfda988868d95784196ed66a20d199b0173bb9 (diff) | |
| download | mate-settings-daemon-628a2b85f1afbd2b8266782c3391d4991a90bd55.tar.bz2 mate-settings-daemon-628a2b85f1afbd2b8266782c3391d4991a90bd55.tar.xz | |
Fix Gtk3.21 segfault using GtkStyleContext
In GTK 3.21, the msd_osd_window_style_set segfaults on GtkStyle. This really should be updated for all GTK3 versions, so port it to GtkStyleContext. Just this one function for now as it stops the OSD crashes. Test built over GTK 3.21, no apparent problems and ran fine on GTK 3.18 as well, no apparent differences in theming using any theme from 3.18 with master.
| -rw-r--r-- | plugins/common/msd-osd-window.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/plugins/common/msd-osd-window.c b/plugins/common/msd-osd-window.c index 9df23e0..dfbaed9 100644 --- a/plugins/common/msd-osd-window.c +++ b/plugins/common/msd-osd-window.c @@ -495,7 +495,18 @@ msd_osd_window_real_realize (GtkWidget *widget) cairo_destroy (cr); #endif } - +#if GTK_CHECK_VERSION (3, 0, 0) +msd_osd_window_style_set (GtkWidget *widget, + GtkStyleContext *style2) +{ + guint border_width; + style2 = gtk_widget_get_style_context (GTK_WIDGET (msd_osd_window_parent_class)); + gtk_style_context_get_style (style2,"border-width", + &border_width, + NULL); + gtk_container_set_border_width (GTK_CONTAINER (widget), 12 + border_width); +} +#else static void msd_osd_window_style_set (GtkWidget *widget, GtkStyle *previous_style) @@ -512,7 +523,7 @@ msd_osd_window_style_set (GtkWidget *widget, style = gtk_widget_get_style (widget); gtk_container_set_border_width (GTK_CONTAINER (widget), 12 + MAX (style->xthickness, style->ythickness)); } - +#endif #if GTK_CHECK_VERSION (3, 0, 0) static void msd_osd_window_get_preferred_width (GtkWidget *widget, |