summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWolfgang Ulbrich <[email protected]>2016-01-26 10:33:14 +0100
committerWolfgang Ulbrich <[email protected]>2016-01-26 10:33:14 +0100
commit3ccd1dd7e006e32c78b14f8c00946d5cdeacc3ae (patch)
treea4944709b8d96ddfd43b55c9cfc281ced6cd334e /src
parent5401618f546c8486c99491f32139638ffb3ea45d (diff)
downloadmate-screensaver-3ccd1dd7e006e32c78b14f8c00946d5cdeacc3ae.tar.bz2
mate-screensaver-3ccd1dd7e006e32c78b14f8c00946d5cdeacc3ae.tar.xz
GTK3: fix GtkMisc decperation commit
Diffstat (limited to 'src')
-rw-r--r--src/copy-theme-dialog.c8
-rw-r--r--src/gs-lock-plug.c38
-rw-r--r--src/gs-window-x11.c6
3 files changed, 26 insertions, 26 deletions
diff --git a/src/copy-theme-dialog.c b/src/copy-theme-dialog.c
index bbde2c6..69db9a3 100644
--- a/src/copy-theme-dialog.c
+++ b/src/copy-theme-dialog.c
@@ -221,7 +221,7 @@ copy_theme_dialog_init (CopyThemeDialog *dlg)
gtk_label_set_markup (GTK_LABEL (dlg->priv->status), markup);
g_free (markup);
-#if GTK_CHECK_VERSION (3, 14, 0)
+#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);
#else
@@ -258,7 +258,7 @@ copy_theme_dialog_init (CopyThemeDialog *dlg)
dlg->priv->current = gtk_label_new ("");
gtk_box_pack_start (GTK_BOX (progress_vbox),
dlg->priv->current, FALSE, FALSE, 0);
-#if GTK_CHECK_VERSION (3, 14, 0)
+#if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_halign (dlg->priv->current, GTK_ALIGN_START);
#else
gtk_misc_set_alignment (GTK_MISC (dlg->priv->current), 0.0, 0.5);
@@ -541,7 +541,7 @@ create_titled_label (GtkTable *table,
{
*title_widget = gtk_label_new ("");
eel_gtk_label_make_bold (GTK_LABEL (*title_widget));
-#if GTK_CHECK_VERSION (3, 14, 0)
+#if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_halign (*title_widget, GTK_ALIGN_END);
gtk_widget_set_valign (*title_widget, GTK_ALIGN_START);
#else
@@ -562,7 +562,7 @@ create_titled_label (GtkTable *table,
GTK_FILL | GTK_EXPAND, 0,
0, 0);
gtk_widget_show (*label_text_widget);
-#if GTK_CHECK_VERSION (3, 14, 0)
+#if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_halign (*label_text_widget, GTK_ALIGN_START);
gtk_widget_set_valign (*label_text_widget, GTK_ALIGN_START);
#else
diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index 0660882..67decba 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -1960,9 +1960,9 @@ create_page_one (GSLockPlug *plug)
str = g_strdup ("<span size=\"xx-large\" weight=\"ultrabold\">%s</span>");
plug->priv->auth_time_label = gtk_label_new (str);
g_free (str);
-#if GTK_CHECK_VERSION (3, 14, 0)
- gtk_widget_set_halign (plug->priv->auth_time_label, GTK_ALIGN_CENTER);
- gtk_widget_set_valign (plug->priv->auth_time_label, GTK_ALIGN_CENTER);
+#if GTK_CHECK_VERSION (3, 16, 0)
+ gtk_label_set_xalign (GTK_LABEL (plug->priv->auth_time_label), 0.5);
+ gtk_label_set_xalign (GTK_LABEL (plug->priv->auth_time_label), 0.5);
#else
gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_time_label), 0.5, 0.5);
#endif
@@ -1972,9 +1972,9 @@ create_page_one (GSLockPlug *plug)
str = g_strdup ("<span size=\"large\">%s</span>");
plug->priv->auth_date_label = gtk_label_new (str);
g_free (str);
-#if GTK_CHECK_VERSION (3, 14, 0)
- gtk_widget_set_halign (plug->priv->auth_date_label, GTK_ALIGN_CENTER);
- gtk_widget_set_valign (plug->priv->auth_date_label, GTK_ALIGN_CENTER);
+#if GTK_CHECK_VERSION (3, 16, 0)
+ gtk_label_set_xalign (GTK_LABEL (plug->priv->auth_date_label), 0.5);
+ gtk_label_set_xalign (GTK_LABEL (plug->priv->auth_date_label), 0.5);
#else
gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_date_label), 0.5, 0.5);
#endif
@@ -1983,7 +1983,7 @@ create_page_one (GSLockPlug *plug)
plug->priv->auth_face_image = gtk_image_new ();
gtk_box_pack_start (GTK_BOX (vbox), plug->priv->auth_face_image, TRUE, TRUE, 0);
-#if GTK_CHECK_VERSION (3, 14, 0)
+#if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_halign (plug->priv->auth_face_image, GTK_ALIGN_CENTER);
gtk_widget_set_valign (plug->priv->auth_face_image, GTK_ALIGN_END);
#else
@@ -1997,9 +1997,9 @@ create_page_one (GSLockPlug *plug)
plug->priv->auth_realname_label = gtk_label_new (str);
g_free (str);
expand_string_for_label (plug->priv->auth_realname_label);
-#if GTK_CHECK_VERSION (3, 14, 0)
- gtk_widget_set_halign (plug->priv->auth_realname_label, GTK_ALIGN_CENTER);
- gtk_widget_set_valign (plug->priv->auth_realname_label, GTK_ALIGN_CENTER);
+#if GTK_CHECK_VERSION (3, 16, 0)
+ gtk_label_set_xalign (GTK_LABEL (plug->priv->auth_realname_label), 0.5);
+ gtk_label_set_xalign (GTK_LABEL (plug->priv->auth_realname_label), 0.5);
#else
gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_realname_label), 0.5, 0.5);
#endif
@@ -2011,9 +2011,9 @@ create_page_one (GSLockPlug *plug)
plug->priv->auth_username_label = gtk_label_new (str);
g_free (str);
expand_string_for_label (plug->priv->auth_username_label);
-#if GTK_CHECK_VERSION (3, 14, 0)
- gtk_widget_set_halign (plug->priv->auth_username_label, GTK_ALIGN_CENTER);
- gtk_widget_set_valign (plug->priv->auth_username_label, GTK_ALIGN_CENTER);
+#if GTK_CHECK_VERSION (3, 16, 0)
+ gtk_label_set_xalign (GTK_LABEL (plug->priv->auth_realname_label), 0.5);
+ gtk_label_set_xalign (GTK_LABEL (plug->priv->auth_realname_label), 0.5);
#else
gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_username_label), 0.5, 0.5);
#endif
@@ -2027,10 +2027,10 @@ create_page_one (GSLockPlug *plug)
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
plug->priv->auth_prompt_label = gtk_label_new_with_mnemonic (_("_Password:"));
-#if GTK_CHECK_VERSION (3, 14, 0)
- gtk_widget_set_halign (plug->priv->auth_prompt_label, GTK_ALIGN_START);
+#if GTK_CHECK_VERSION (3, 16, 0)
+ gtk_label_set_xalign (GTK_LABEL (plug->priv->auth_prompt_label), 0.0);
#else
- gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_prompt_label), 0, 0.5);
+ gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_prompt_label), 0.0, 0.5);
#endif
gtk_box_pack_start (GTK_BOX (hbox), plug->priv->auth_prompt_label, FALSE, FALSE, 0);
@@ -2041,9 +2041,9 @@ create_page_one (GSLockPlug *plug)
plug->priv->auth_prompt_entry);
plug->priv->auth_capslock_label = gtk_label_new ("");
-#if GTK_CHECK_VERSION (3, 14, 0)
- gtk_widget_set_halign (plug->priv->auth_capslock_label, GTK_ALIGN_CENTER);
- gtk_widget_set_valign (plug->priv->auth_capslock_label, GTK_ALIGN_CENTER);
+#if GTK_CHECK_VERSION (3, 16, 0)
+ gtk_label_set_xalign (GTK_LABEL (plug->priv->auth_capslock_label), 0.5);
+ gtk_label_set_xalign (GTK_LABEL (plug->priv->auth_capslock_label), 0.5);
#else
gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_capslock_label), 0.5, 0.5);
#endif
diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
index 066d4a7..6dd6d59 100644
--- a/src/gs-window-x11.c
+++ b/src/gs-window-x11.c
@@ -1125,7 +1125,7 @@ set_info_text_and_icon (GSWindow *window,
image = gtk_image_new_from_stock (icon_stock_id, GTK_ICON_SIZE_DIALOG);
gtk_widget_show (image);
gtk_box_pack_start (GTK_BOX (hbox_content), image, FALSE, FALSE, 0);
-#if GTK_CHECK_VERSION (3, 14, 0)
+#if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_valign (image, GTK_ALIGN_START);
#else
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0);
@@ -1142,7 +1142,7 @@ set_info_text_and_icon (GSWindow *window,
gtk_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0);
gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE);
gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE);
-#if GTK_CHECK_VERSION (3, 14, 0)
+#if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_halign (primary_label, GTK_ALIGN_START);
#else
gtk_misc_set_alignment (GTK_MISC (primary_label), 0, 0.5);
@@ -1158,7 +1158,7 @@ set_info_text_and_icon (GSWindow *window,
gtk_box_pack_start (GTK_BOX (vbox), secondary_label, TRUE, TRUE, 0);
gtk_label_set_use_markup (GTK_LABEL (secondary_label), TRUE);
gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
-#if GTK_CHECK_VERSION (3, 14, 0)
+#if GTK_CHECK_VERSION (3, 0, 0)
gtk_widget_set_halign (secondary_label, GTK_ALIGN_START);
#else
gtk_misc_set_alignment (GTK_MISC (secondary_label), 0, 0.5);
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-18 02:56:35 +0000