From 0d0308a2b88f98ac15cbc871088454656a2c2164 Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Thu, 4 Feb 2016 23:20:35 +0100 Subject: GTK+3:fix GtkMisc deprecations for < gtk+-3.16 --- mate-volume-control/gvc-channel-bar.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'mate-volume-control/gvc-channel-bar.c') diff --git a/mate-volume-control/gvc-channel-bar.c b/mate-volume-control/gvc-channel-bar.c index 70f17ec..b1b54ae 100644 --- a/mate-volume-control/gvc-channel-bar.c +++ b/mate-volume-control/gvc-channel-bar.c @@ -354,11 +354,14 @@ update_marks (GvcChannelBar *bar) gtk_widget_set_valign (bar->priv->low_image, GTK_ALIGN_START); gtk_widget_set_halign (bar->priv->high_image, GTK_ALIGN_CENTER); gtk_widget_set_valign (bar->priv->high_image, GTK_ALIGN_START); - gtk_label_set_xalign (GTK_LABEL (bar->priv->label), 0.0); - gtk_label_set_yalign (GTK_LABEL (bar->priv->label), 0.0); #else gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0.0); gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 0.0); +#endif +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (bar->priv->label), 0.0); + gtk_label_set_yalign (GTK_LABEL (bar->priv->label), 0.0); +#else gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0.0, 0.0); #endif } else { @@ -369,11 +372,14 @@ update_marks (GvcChannelBar *bar) gtk_widget_set_valign (bar->priv->low_image, GTK_ALIGN_CENTER); gtk_widget_set_halign (bar->priv->high_image, GTK_ALIGN_CENTER); gtk_widget_set_valign (bar->priv->high_image, GTK_ALIGN_CENTER); - gtk_label_set_xalign (GTK_LABEL (bar->priv->label), 0.0); - gtk_label_set_yalign (GTK_LABEL (bar->priv->label), 0.5); #else gtk_misc_set_alignment (GTK_MISC (bar->priv->low_image), 0.5, 0.5); gtk_misc_set_alignment (GTK_MISC (bar->priv->high_image), 0.5, 0.5); +#endif +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (bar->priv->label), 0.0); + gtk_label_set_yalign (GTK_LABEL (bar->priv->label), 0.5); +#else gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0.0, 0.5); #endif } -- cgit v1.2.1