From d62e47b12e49500884839a14bb816babbf3ecdd7 Mon Sep 17 00:00:00 2001
From: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date: Wed, 2 Dec 2015 22:42:21 +0100
Subject: GTK3: fix GtkMisc deprecation fixes for gtk+-3.14

---
 src/ui/menu.c           | 2 +-
 src/ui/metaaccellabel.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/menu.c b/src/ui/menu.c
index e989b526..b53ff3bc 100644
--- a/src/ui/menu.c
+++ b/src/ui/menu.c
@@ -305,7 +305,7 @@ static GtkWidget* menu_item_new(MenuItem* menuitem, int workspace_id)
 
 	accel_label = meta_accel_label_new_with_mnemonic (i18n_label);
 #if GTK_CHECK_VERSION (3, 14, 0)
-	gtk_label_set_xalign (GTK_LABEL (accel_label), 0.0);
+	gtk_widget_set_halign (accel_label, GTK_ALIGN_START);
 #else
 	gtk_misc_set_alignment (GTK_MISC (accel_label), 0.0, 0.5);
 #endif
diff --git a/src/ui/metaaccellabel.c b/src/ui/metaaccellabel.c
index d752678a..2e738c7c 100644
--- a/src/ui/metaaccellabel.c
+++ b/src/ui/metaaccellabel.c
@@ -330,7 +330,7 @@ meta_accel_label_draw (GtkWidget *widget,
                        cairo_t   *cr)
 {
   MetaAccelLabel *accel_label = META_ACCEL_LABEL (widget);
-#if !GTK_CHECK_VERSION (3, 14, 0)
+#if !GTK_CHECK_VERSION (3, 16, 0)
   GtkMisc *misc = GTK_MISC (accel_label);
 #endif
   GtkTextDirection direction;
@@ -351,7 +351,7 @@ meta_accel_label_draw (GtkWidget *widget,
       PangoLayout *accel_layout;
       GtkLabel *label = GTK_LABEL (widget);
       gint x, y, xpad, ypad;
-#if GTK_CHECK_VERSION (3, 14, 0)
+#if GTK_CHECK_VERSION (3, 16, 0)
       gint margin_start, margin_end, margin_top, margin_bottom;
       gfloat yalign;
 #else
@@ -359,7 +359,7 @@ meta_accel_label_draw (GtkWidget *widget,
 #endif
 
       label_layout = gtk_label_get_layout (GTK_LABEL (accel_label));
-#if GTK_CHECK_VERSION (3, 14, 0)
+#if GTK_CHECK_VERSION (3, 16, 0)
       yalign = gtk_label_get_yalign (GTK_LABEL (accel_label));
 #else
       gtk_misc_get_alignment (misc, &xalign, &yalign);
@@ -390,7 +390,7 @@ meta_accel_label_draw (GtkWidget *widget,
 
       cairo_restore (cr);
 
-#if GTK_CHECK_VERSION (3, 14, 0)
+#if GTK_CHECK_VERSION (3, 16, 0)
       margin_start = gtk_widget_get_margin_start (widget);
       margin_end = gtk_widget_get_margin_end (widget);
       margin_top = gtk_widget_get_margin_top (widget);
-- 
cgit v1.2.1