From 31930d0b39b3bf26bcc53b2c20e61ecd4779f397 Mon Sep 17 00:00:00 2001 From: Victor Kareh Date: Fri, 27 Jul 2018 14:08:09 -0400 Subject: applets: Guard against GTK scale-factor fixes on GtkSocket --- libmate-panel-applet/mate-panel-applet.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libmate-panel-applet') diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c index e298b875..0bbd9e6e 100644 --- a/libmate-panel-applet/mate-panel-applet.c +++ b/libmate-panel-applet/mate-panel-applet.c @@ -1059,11 +1059,11 @@ mate_panel_applet_get_preferred_width (GtkWidget *widget, minimum_width, natural_width); -#if !GTK_CHECK_VERSION (3, 23, 0) +#if !GTK_CHECK_VERSION (3, 22, 31) MatePanelApplet *applet = MATE_PANEL_APPLET (widget); if (applet->priv->out_of_process) { /* Out-of-process applets end up scaled up doubly with GTK 3.22. - * For these builds divide by the scale factor to ensure + * For these builds divide by the scale factor to ensure * they are back at their own intended size. */ gint scale; @@ -1082,12 +1082,13 @@ mate_panel_applet_get_preferred_height (GtkWidget *widget, GTK_WIDGET_CLASS (mate_panel_applet_parent_class)->get_preferred_height (widget, minimum_height, natural_height); -#if !GTK_CHECK_VERSION (3, 23, 0) + +#if !GTK_CHECK_VERSION (3, 22, 31) MatePanelApplet *applet = MATE_PANEL_APPLET (widget); if (applet->priv->out_of_process) { gint scale; /* Out-of-process applets end up scaled up doubly with GTK 3.22. - * For these builds divide by the scale factor to ensure + * For these builds divide by the scale factor to ensure * they are back at their own intended size. */ scale = gtk_widget_get_scale_factor (widget); -- cgit v1.2.1