GTK3: improve GtkMisc deprecation commit

9 files changed, 36 insertions, 36 deletions

diff --git a/capplets/about-me/eel-alert-dialog.c b/capplets/about-me/eel-alert-dialog.c
index 1da1f7d9..1527164a 100644
--- a/capplets/about-me/eel-alert-dialog.c
+++ b/capplets/about-me/eel-alert-dialog.c
@@ -169,27 +169,27 @@ eel_alert_dialog_init (EelAlertDialog *dialog)
 	gtk_label_set_line_wrap (GTK_LABEL (dialog->details->primary_label), TRUE);
 	gtk_label_set_selectable (GTK_LABEL (dialog->details->primary_label), TRUE);
 	gtk_label_set_use_markup (GTK_LABEL (dialog->details->primary_label), TRUE);
-#if GTK_CHECK_VERSION (3, 0, 0)
-	gtk_widget_set_halign (dialog->details->primary_label, GTK_ALIGN_START);
-	gtk_widget_set_valign (dialog->details->primary_label, GTK_ALIGN_CENTER);
+#if GTK_CHECK_VERSION (3, 16, 0)
+	gtk_label_set_xalign (GTK_LABEL (dialog->details->primary_label), 0.0);
+	gtk_label_set_yalign (GTK_LABEL (dialog->details->primary_label), 0.5);
 #else
 	gtk_misc_set_alignment (GTK_MISC (dialog->details->primary_label), 0.0, 0.5);
 #endif
 
 	gtk_label_set_line_wrap (GTK_LABEL (dialog->details->secondary_label), TRUE);
 	gtk_label_set_selectable (GTK_LABEL (dialog->details->secondary_label), TRUE);
-#if GTK_CHECK_VERSION (3, 0, 0)
-	gtk_widget_set_halign (dialog->details->secondary_label, GTK_ALIGN_START);
-	gtk_widget_set_valign (dialog->details->secondary_label, GTK_ALIGN_CENTER);
+#if GTK_CHECK_VERSION (3, 16, 0)
+	gtk_label_set_xalign (GTK_LABEL (dialog->details->secondary_label), 0.0);
+	gtk_label_set_yalign (GTK_LABEL (dialog->details->secondary_label), 0.5);
 #else
 	gtk_misc_set_alignment (GTK_MISC (dialog->details->secondary_label), 0.0, 0.5);
 #endif
 
 	gtk_label_set_line_wrap (GTK_LABEL (dialog->details->details_label), TRUE);
 	gtk_label_set_selectable (GTK_LABEL (dialog->details->details_label), TRUE);
-#if GTK_CHECK_VERSION (3, 0, 0)
-	gtk_widget_set_halign (dialog->details->details_label, GTK_ALIGN_START);
-	gtk_widget_set_valign (dialog->details->details_label, GTK_ALIGN_CENTER);
+#if GTK_CHECK_VERSION (3, 16, 0)
+	gtk_label_set_xalign (GTK_LABEL (dialog->details->details_label), 0.0);
+	gtk_label_set_yalign (GTK_LABEL (dialog->details->details_label), 0.5);
 #else
 	gtk_misc_set_alignment (GTK_MISC (dialog->details->details_label), 0.0, 0.5);
 #endif
diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c
index 39a5b8ab..21fe2002 100644
--- a/capplets/appearance/appearance-style.c
+++ b/capplets/appearance/appearance-style.c
@@ -234,9 +234,9 @@ static void update_message_area(AppearanceData* data)
 
 		data->style_message_label = gtk_label_new (NULL);
 		gtk_label_set_line_wrap (GTK_LABEL (data->style_message_label), TRUE);
-#if GTK_CHECK_VERSION (3, 0, 0)
-		gtk_widget_set_halign (data->style_message_label, GTK_ALIGN_START);
-		gtk_widget_set_valign (data->style_message_label, GTK_ALIGN_CENTER);
+#if GTK_CHECK_VERSION (3, 16, 0)
+		gtk_label_set_xalign (GTK_LABEL (data->style_message_label), 0.0);
+		gtk_label_set_yalign (GTK_LABEL (data->style_message_label), 0.5);
 #else
 		gtk_misc_set_alignment (GTK_MISC (data->style_message_label), 0.0, 0.5);
 #endif
diff --git a/capplets/appearance/appearance-themes.c b/capplets/appearance/appearance-themes.c
index 0fe20ef9..a9b0af30 100644
--- a/capplets/appearance/appearance-themes.c
+++ b/capplets/appearance/appearance-themes.c
@@ -664,9 +664,9 @@ theme_message_area_update (AppearanceData *data)
     data->theme_message_label = gtk_label_new (NULL);
     gtk_widget_show (data->theme_message_label);
     gtk_label_set_line_wrap (GTK_LABEL (data->theme_message_label), TRUE);
-#if GTK_CHECK_VERSION (3, 0, 0)
-    gtk_widget_set_halign (data->theme_message_label, GTK_ALIGN_START);
-    gtk_widget_set_valign (data->theme_message_label, GTK_ALIGN_CENTER);
+#if GTK_CHECK_VERSION (3, 16, 0)
+	gtk_label_set_xalign (GTK_LABEL (data->theme_message_label), 0.0);
+	gtk_label_set_yalign (GTK_LABEL (data->theme_message_label), 0.5);
 #else
     gtk_misc_set_alignment (GTK_MISC (data->theme_message_label), 0.0, 0.5);
 #endif
diff --git a/capplets/common/file-transfer-dialog.c b/capplets/common/file-transfer-dialog.c
index 01f14cbd..15f39ae7 100644
--- a/capplets/common/file-transfer-dialog.c
+++ b/capplets/common/file-transfer-dialog.c
@@ -318,9 +318,9 @@ file_transfer_dialog_init (FileTransferDialog *dlg)
 	gtk_label_set_markup (GTK_LABEL (dlg->priv->status), markup);
 	g_free (markup);
 
-#if GTK_CHECK_VERSION (3, 0, 0)
-	gtk_widget_set_halign (dlg->priv->status, GTK_ALIGN_START);
-	gtk_widget_set_valign (dlg->priv->status, GTK_ALIGN_START);
+#if GTK_CHECK_VERSION (3, 16, 0)
+	gtk_label_set_xalign (GTK_LABEL (dlg->priv->status), 0.0);
+	gtk_label_set_yalign (GTK_LABEL (dlg->priv->status), 0.0);
 #else
 	gtk_misc_set_alignment (GTK_MISC (dlg->priv->status), 0.0, 0.0);
 #endif
diff --git a/capplets/keybindings/eggcellrendererkeys.c b/capplets/keybindings/eggcellrendererkeys.c
index 98bace56..730931c5 100644
--- a/capplets/keybindings/eggcellrendererkeys.c
+++ b/capplets/keybindings/eggcellrendererkeys.c
@@ -591,9 +591,9 @@ egg_cell_renderer_keys_start_editing (GtkCellRenderer      *cell,
                              (void**) &keys->edit_widget);
 
   label = gtk_label_new (NULL);
-#if GTK_CHECK_VERSION (3, 0, 0)
-  gtk_widget_set_halign (label, GTK_ALIGN_START);
-  gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+#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
diff --git a/font-viewer/font-view.c b/font-viewer/font-view.c
index 359ffcb5..08747f33 100644
--- a/font-viewer/font-view.c
+++ b/font-viewer/font-view.c
@@ -279,9 +279,9 @@ add_row (GtkWidget *table,
         gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
         gtk_label_set_selectable (GTK_LABEL (label), TRUE);
         gtk_widget_set_size_request (label, 200, -1);
-#if GTK_CHECK_VERSION (3, 0, 0)
-        gtk_widget_set_halign (label, GTK_ALIGN_START);
-        gtk_widget_set_valign (label, GTK_ALIGN_START);
+#if GTK_CHECK_VERSION (3, 16, 0)
+        gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+        gtk_label_set_yalign (GTK_LABEL (label), 0.0);
 #else
         gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
 #endif
@@ -320,9 +320,9 @@ add_row (GtkWidget *table,
         gtk_container_add (GTK_CONTAINER (viewport), label);
     } else {
         GtkWidget *label = gtk_label_new (value);
-#if GTK_CHECK_VERSION (3, 0, 0)
-        gtk_widget_set_halign (label, GTK_ALIGN_START);
-        gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+#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
diff --git a/libslab/slab-section.c b/libslab/slab-section.c
index d7dd978c..2f763a6e 100644
--- a/libslab/slab-section.c
+++ b/libslab/slab-section.c
@@ -155,9 +155,9 @@ slab_section_new_with_markup (const gchar * title_markup, SlabStyle style)
 
 	section->title = gtk_label_new (title_markup);
 	gtk_label_set_use_markup (GTK_LABEL (section->title), TRUE);
-#if GTK_CHECK_VERSION (3, 0, 0)
-	gtk_widget_set_halign (section->title, GTK_ALIGN_START);
-	gtk_widget_set_valign (section->title, GTK_ALIGN_CENTER);
+#if GTK_CHECK_VERSION (3, 16, 0)
+	gtk_label_set_xalign (GTK_LABEL (section->title), 0.0);
+	gtk_label_set_yalign (GTK_LABEL (section->title), 0.5);
 #else
 	gtk_misc_set_alignment (GTK_MISC (section->title), 0.0, 0.5);
 #endif
diff --git a/libslab/tile-action.c b/libslab/tile-action.c
index 8066b52f..886dec8a 100644
--- a/libslab/tile-action.c
+++ b/libslab/tile-action.c
@@ -83,9 +83,9 @@ tile_action_set_menu_item_label (TileAction * this, const gchar * markup)
 	{
 		label = gtk_label_new (markup);
 		gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-#if GTK_CHECK_VERSION (3, 0, 0)
-		gtk_widget_set_halign (label, GTK_ALIGN_START);
-		gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+#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
diff --git a/typing-break/drw-break-window.c b/typing-break/drw-break-window.c
index 80f71ef4..5ebe92d7 100644
--- a/typing-break/drw-break-window.c
+++ b/typing-break/drw-break-window.c
@@ -282,9 +282,9 @@ drw_break_window_init (DrwBreakWindow *window)
 
 
 	priv->clock_label = gtk_label_new (NULL);
-#if GTK_CHECK_VERSION (3, 0, 0)
-	gtk_widget_set_halign (priv->clock_label, GTK_ALIGN_CENTER);
-	gtk_widget_set_valign (priv->clock_label, GTK_ALIGN_CENTER);
+#if GTK_CHECK_VERSION (3, 16, 0)
+	gtk_label_set_xalign (GTK_LABEL (priv->clock_label), 0.5);
+	gtk_label_set_yalign (GTK_LABEL (priv->clock_label), 0.5);
 #else
 	gtk_misc_set_alignment (GTK_MISC (priv->clock_label), 0.5, 0.5);
 #endif