Avoid deprecated GtkMisc

4 files changed, 31 insertions, 3 deletions

diff --git a/src/dlg-add-folder.c b/src/dlg-add-folder.c
index c5b0f04..8ad65d2 100644
--- a/src/dlg-add-folder.c
+++ b/src/dlg-add-folder.c
@@ -242,19 +242,31 @@ add_folder_cb (GtkWidget *widget,
 	data->include_files_entry = gtk_entry_new ();
 	gtk_widget_set_tooltip_text (data->include_files_entry, _("example: *.o; *.bak"));
 	data->include_files_label = gtk_label_new_with_mnemonic (_("Include _files:"));
+#if GTK_CHECK_VERSION (3, 16, 0)
+	gtk_label_set_xalign (GTK_LABEL (data->include_files_label), 0.0);
+#else
 	gtk_misc_set_alignment (GTK_MISC (data->include_files_label), 0.0, 0.5);
+#endif
 	gtk_label_set_mnemonic_widget (GTK_LABEL (data->include_files_label), data->include_files_entry);
 
 	data->exclude_files_entry = gtk_entry_new ();
 	gtk_widget_set_tooltip_text (data->exclude_files_entry, _("example: *.o; *.bak"));
 	data->exclude_files_label = gtk_label_new_with_mnemonic (_("E_xclude files:"));
+#if GTK_CHECK_VERSION (3, 16, 0)
+	gtk_label_set_xalign (GTK_LABEL (data->exclude_files_label), 0.0);
+#else
 	gtk_misc_set_alignment (GTK_MISC (data->exclude_files_label), 0.0, 0.5);
+#endif
 	gtk_label_set_mnemonic_widget (GTK_LABEL (data->exclude_files_label), data->exclude_files_entry);
 
 	data->exclude_folders_entry = gtk_entry_new ();
 	gtk_widget_set_tooltip_text (data->exclude_folders_entry, _("example: *.o; *.bak"));
 	data->exclude_folders_label = gtk_label_new_with_mnemonic (_("_Exclude folders:"));
+#if GTK_CHECK_VERSION (3, 16, 0)
+	gtk_label_set_xalign (GTK_LABEL (data->exclude_folders_label), 0.0);
+#else
 	gtk_misc_set_alignment (GTK_MISC (data->exclude_folders_label), 0.0, 0.5);
+#endif
 	gtk_label_set_mnemonic_widget (GTK_LABEL (data->exclude_folders_label), data->exclude_folders_entry);
 
 	data->load_button = gtk_button_new_with_mnemonic (_("_Load Options"));
diff --git a/src/dlg-extract.c b/src/dlg-extract.c
index 0566b07..27217d2 100644
--- a/src/dlg-extract.c
+++ b/src/dlg-extract.c
@@ -333,7 +333,11 @@ create_extra_widget (DialogData *data)
 	set_bold_label (e_files_label, _("Extract"));
 	gtk_box_pack_start (GTK_BOX (vbox19), e_files_label, FALSE, FALSE, 0);
 	gtk_label_set_justify (GTK_LABEL (e_files_label), GTK_JUSTIFY_LEFT);
+#if GTK_CHECK_VERSION (3, 16, 0)
+	gtk_label_set_xalign (GTK_LABEL (e_files_label), 0);
+#else
 	gtk_misc_set_alignment (GTK_MISC (e_files_label), 0, 0.5);
+#endif
 
 	hbox29 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 	gtk_box_pack_start (GTK_BOX (vbox19), hbox29, TRUE, TRUE, 0);
@@ -375,7 +379,11 @@ create_extra_widget (DialogData *data)
 	gtk_box_pack_start (GTK_BOX (vbox20), e_actions_label, FALSE, FALSE, 0);
 	gtk_label_set_use_markup (GTK_LABEL (e_actions_label), TRUE);
 	gtk_label_set_justify (GTK_LABEL (e_actions_label), GTK_JUSTIFY_LEFT);
+#if GTK_CHECK_VERSION (3, 16, 0)
+	gtk_label_set_xalign (GTK_LABEL (e_actions_label), 0);
+#else
 	gtk_misc_set_alignment (GTK_MISC (e_actions_label), 0, 0.5);
+#endif
 
 	hbox30 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 	gtk_box_pack_start (GTK_BOX (vbox20), hbox30, TRUE, TRUE, 0);
diff --git a/src/fr-window.c b/src/fr-window.c
index e1856ba..0dbd2a6 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -2522,7 +2522,7 @@ create_the_progress_dialog (FrWindow *window)
 	window->priv->pd_icon = gtk_image_new_from_pixbuf (icon);
 	g_object_unref (icon);
 
-	gtk_misc_set_alignment (GTK_MISC (window->priv->pd_icon), 0.5, 0.0);
+	gtk_widget_set_valign (window->priv->pd_icon, GTK_ALIGN_START);
 	gtk_box_pack_start (GTK_BOX (hbox), window->priv->pd_icon, FALSE, FALSE, 0);
 
 	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
@@ -2574,7 +2574,11 @@ create_the_progress_dialog (FrWindow *window)
 	gtk_label_set_attributes (GTK_LABEL (lbl), attr_list);
 	pango_attr_list_unref (attr_list);
 
+#if GTK_CHECK_VERSION (3, 16, 0)
+	gtk_label_set_xalign (GTK_LABEL (lbl), 0.0);
+#else
 	gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);
+#endif
 	gtk_label_set_ellipsize (GTK_LABEL (lbl), PANGO_ELLIPSIZE_END);
 	gtk_box_pack_start (GTK_BOX (progress_vbox), lbl, TRUE, TRUE, 0);
 
@@ -5781,7 +5785,11 @@ fr_window_construct (FrWindow *window)
 	gtk_container_add (GTK_CONTAINER (sidepane_title), sidepane_title_box);
 	sidepane_title_label = gtk_label_new (_("Folders"));
 
+#if GTK_CHECK_VERSION (3, 16, 0)
+	gtk_label_set_xalign (GTK_LABEL (sidepane_title_label), 0.0);
+#else
 	gtk_misc_set_alignment (GTK_MISC (sidepane_title_label), 0.0, 0.5);
+#endif
 	gtk_box_pack_start (GTK_BOX (sidepane_title_box), sidepane_title_label, TRUE, TRUE, 0);
 
 	close_sidepane_button = gtk_button_new ();
diff --git a/src/gtk-utils.c b/src/gtk-utils.c
index ce4758b..56b7add 100644
--- a/src/gtk-utils.c
+++ b/src/gtk-utils.c
@@ -81,7 +81,7 @@ _gtk_message_dialog_new (GtkWindow        *parent,
 	/* Add label and image */
 
 	image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_DIALOG);
-	gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
+	gtk_widget_set_valign (image, GTK_ALIGN_START);
 
 	label = gtk_label_new ("");
 
@@ -301,7 +301,7 @@ _gtk_yesno_dialog_new (GtkWindow        *parent,
 	/* Add label and image */
 
 	image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_DIALOG);
-	gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
+	gtk_widget_set_valign (image, GTK_ALIGN_START);
 
 	label = gtk_label_new (message);
 	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);