From 067dbe7b68fa625ea87ef6e259539fff2baaeaf7 Mon Sep 17 00:00:00 2001
From: Roy Zhang <pudh4418@gmail.com>
Date: Mon, 4 Jan 2016 14:05:03 +0800
Subject: Gtk3: Don't use deprecated gtk_misc_set_alignment

---
 mate-panel/menu.c               | 5 +++++
 mate-panel/panel-addto.c        | 5 +++++
 mate-panel/panel-ditem-editor.c | 5 +++++
 mate-panel/panel-force-quit.c   | 5 +++++
 mate-panel/panel-menu-bar.c     | 5 +++++
 5 files changed, 25 insertions(+)

(limited to 'mate-panel')

diff --git a/mate-panel/menu.c b/mate-panel/menu.c
index dfffce66..3d71bca2 100644
--- a/mate-panel/menu.c
+++ b/mate-panel/menu.c
@@ -832,7 +832,12 @@ setup_menuitem (GtkWidget   *menuitem,
 
 	gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menuitem);
 
+#if GTK_CHECK_VERSION (3, 16, 0)
+	gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+	gtk_label_set_yalign (GTK_LABEL (label), 0.5);
+#else
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+#endif
 	gtk_widget_show (label);
 
 	gtk_container_add (GTK_CONTAINER (menuitem), label);
diff --git a/mate-panel/panel-addto.c b/mate-panel/panel-addto.c
index 09d4bcd9..eac9be93 100644
--- a/mate-panel/panel-addto.c
+++ b/mate-panel/panel-addto.c
@@ -1260,7 +1260,12 @@ panel_addto_dialog_new (PanelWidget *panel_widget)
 	gtk_box_pack_start (GTK_BOX (inner_vbox), find_hbox, FALSE, FALSE, 0);
 
 	dialog->label = gtk_label_new_with_mnemonic ("");
+#if GTK_CHECK_VERSION (3, 16, 0)
+	gtk_label_set_xalign (GTK_LABEL (dialog->label), 0.0);
+	gtk_label_set_yalign (GTK_LABEL (dialog->label), 0.5);
+#else
 	gtk_misc_set_alignment (GTK_MISC (dialog->label), 0.0, 0.5);
+#endif
 	gtk_label_set_use_markup (GTK_LABEL (dialog->label), TRUE);
 
 	gtk_box_pack_start (GTK_BOX (find_hbox), dialog->label,
diff --git a/mate-panel/panel-ditem-editor.c b/mate-panel/panel-ditem-editor.c
index e641e4d3..c8bb3d76 100644
--- a/mate-panel/panel-ditem-editor.c
+++ b/mate-panel/panel-ditem-editor.c
@@ -507,7 +507,12 @@ label_new_with_mnemonic (const char *text)
 	g_free (bold);
 
 	gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+#if GTK_CHECK_VERSION (3, 16, 0)
+	gtk_label_set_xalign (GTK_LABEL (label), 1.0);
+	gtk_label_set_yalign (GTK_LABEL (label), 0.5);
+#else
 	gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+#endif
 
 	gtk_widget_show (label);
 
diff --git a/mate-panel/panel-force-quit.c b/mate-panel/panel-force-quit.c
index f0374e2f..e8832214 100644
--- a/mate-panel/panel-force-quit.c
+++ b/mate-panel/panel-force-quit.c
@@ -76,7 +76,12 @@ display_popup_window (GdkScreen *screen)
 
 	image = gtk_image_new_from_icon_name (PANEL_ICON_FORCE_QUIT,
 					      GTK_ICON_SIZE_DIALOG);
+#if GTK_CHECK_VERSION (3, 0, 0)
+	gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
+	gtk_widget_set_valign (image, GTK_ALIGN_CENTER);
+#else
 	gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.5);
+#endif
 	gtk_box_pack_start (GTK_BOX (vbox), image, TRUE, TRUE, 4);
 	gtk_widget_show (image);
 
diff --git a/mate-panel/panel-menu-bar.c b/mate-panel/panel-menu-bar.c
index a5ca9b11..26e83c29 100644
--- a/mate-panel/panel-menu-bar.c
+++ b/mate-panel/panel-menu-bar.c
@@ -512,7 +512,12 @@ static void set_item_text_angle_and_alignment(GtkWidget* item, double text_angle
 
 	gtk_label_set_angle (GTK_LABEL (label), text_angle);
 
+#if GTK_CHECK_VERSION (3, 16, 0)
+	gtk_label_set_xalign (GTK_LABEL (label), xalign);
+	gtk_label_set_yalign (GTK_LABEL (label), yalign);
+#else
 	gtk_misc_set_alignment (GTK_MISC (label), xalign, yalign);
+#endif
 }
 
 static void panel_menu_bar_update_orientation(PanelMenuBar* menubar)
-- 
cgit v1.2.1