diff options
| author | Wolfgang Ulbrich <[email protected]> | 2016-01-26 13:00:17 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2016-01-26 13:00:17 +0100 |
| commit | 9c22af1831f1e150aac020c0f27d1510d0aecee9 (patch) | |
| tree | fd6a0f5d90e132bdeda67c7fa066ab3c22da63ff /capplets | |
| parent | 94f5031d58bc9f6cbb2911d1c6a3a5d16a69af45 (diff) | |
| download | mate-control-center-9c22af1831f1e150aac020c0f27d1510d0aecee9.tar.bz2 mate-control-center-9c22af1831f1e150aac020c0f27d1510d0aecee9.tar.xz | |
GTK3: improve GtkMisc deprecation commit
Diffstat (limited to 'capplets')
| -rw-r--r-- | capplets/about-me/eel-alert-dialog.c | 18 | ||||
| -rw-r--r-- | capplets/appearance/appearance-style.c | 6 | ||||
| -rw-r--r-- | capplets/appearance/appearance-themes.c | 6 | ||||
| -rw-r--r-- | capplets/common/file-transfer-dialog.c | 6 | ||||
| -rw-r--r-- | capplets/keybindings/eggcellrendererkeys.c | 6 |
5 files changed, 21 insertions, 21 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 |