From d01ea186be7abed6593d95dc234c6d0ea88916ca Mon Sep 17 00:00:00 2001
From: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date: Mon, 25 Jan 2016 21:26:11 +0100
Subject: [PATCH] fix dprecated GtkMisc

---
 src/ui/fixedtip.c     | 6 +++---
 src/ui/menu.c         | 2 +-
 src/ui/tabpopup.c     | 2 +-
 src/ui/theme-viewer.c | 5 +++++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/ui/fixedtip.c b/src/ui/fixedtip.c
index cc8f7b057..7cdf014e8 100644
--- a/src/ui/fixedtip.c
+++ b/src/ui/fixedtip.c
@@ -154,9 +154,9 @@ meta_fixed_tip_show (int screen_number,
 
       label = gtk_label_new (NULL);
       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-#if GTK_CHECK_VERSION (3, 14, 0)
-      gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+#if GTK_CHECK_VERSION (3, 16, 0)
+      gtk_label_set_xalign (GTK_LABEL (label), 0.5);
+      gtk_label_set_yalign (GTK_LABEL (label), 0.5);
 #else
       gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
 #endif
diff --git a/src/ui/menu.c b/src/ui/menu.c
index b53ff3bc6..54e1d6ddd 100644
--- a/src/ui/menu.c
+++ b/src/ui/menu.c
@@ -304,7 +304,7 @@ static GtkWidget* menu_item_new(MenuItem* menuitem, int workspace_id)
 	meta_core_get_menu_accelerator (menuitem->op, workspace_id, &key, &mods);
 
 	accel_label = meta_accel_label_new_with_mnemonic (i18n_label);
-#if GTK_CHECK_VERSION (3, 14, 0)
+#if GTK_CHECK_VERSION (3, 0, 0)
 	gtk_widget_set_halign (accel_label, GTK_ALIGN_START);
 #else
 	gtk_misc_set_alignment (GTK_MISC (accel_label), 0.0, 0.5);
diff --git a/src/ui/tabpopup.c b/src/ui/tabpopup.c
index 6a0d3dfbf..eb555e90f 100644
--- a/src/ui/tabpopup.c
+++ b/src/ui/tabpopup.c
@@ -417,7 +417,7 @@ meta_ui_tab_popup_new (const MetaTabEntry *entries,
               gtk_misc_set_padding (GTK_MISC (image),
                                     INSIDE_SELECT_RECT + OUTSIDE_SELECT_RECT + 1,
                                     INSIDE_SELECT_RECT + OUTSIDE_SELECT_RECT + 1);
-#if GTK_CHECK_VERSION (3, 14, 0)
+#if GTK_CHECK_VERSION (3, 0, 0)
               gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
               gtk_widget_set_valign (image, GTK_ALIGN_CENTER);
 #else
diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c
index fa981fab1..fc4ba3e9e 100644
--- a/src/ui/theme-viewer.c
+++ b/src/ui/theme-viewer.c
@@ -350,7 +350,12 @@ menu_contents (void)
     {
       char *str = g_strdup_printf (_("Fake menu item %d\n"), i + 1);
       mi = gtk_label_new (str);
+#if GTK_CHECK_VERSION (3, 0, 0)
+      gtk_widget_set_halign (image, GTK_ALIGN_START);
+      gtk_widget_set_valign (image, GTK_ALIGN_CENTER);
+#else
       gtk_misc_set_alignment (GTK_MISC (mi), 0.0, 0.5);
+#endif
       g_free (str);
       gtk_box_pack_start (GTK_BOX (vbox), mi, FALSE, FALSE, 0);