summaryrefslogtreecommitdiff
path: root/src/gs-window-x11.c
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-06-30 15:55:55 +0300
committermonsta <[email protected]>2016-06-30 15:55:55 +0300
commitdd837483d4435bfac418ef9c006cff642990a83f (patch)
treea74b4fd0dd864f231e340568c4d28ebdaa9a8da2 /src/gs-window-x11.c
parent38d5cd1e7b60611e57bf8690f01d6f3baf030029 (diff)
downloadmate-screensaver-dd837483d4435bfac418ef9c006cff642990a83f.tar.bz2
mate-screensaver-dd837483d4435bfac418ef9c006cff642990a83f.tar.xz
fix UI issues introduced in 296b056
Diffstat (limited to 'src/gs-window-x11.c')
-rw-r--r--src/gs-window-x11.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
index 6861508..41adbb6 100644
--- a/src/gs-window-x11.c
+++ b/src/gs-window-x11.c
@@ -62,11 +62,6 @@ enum
#define GS_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GS_TYPE_WINDOW, GSWindowPrivate))
-#if !GTK_CHECK_VERSION (3, 0, 0)
-#define gtk_box_new(GTK_ORIENTATION_HORIZONTAL, b) gtk_hbox_new(FALSE, b)
-#define gtk_box_new(GTK_ORIENTATION_VERTICAL, b) gtk_vbox_new(FALSE, b)
-#endif
-
struct GSWindowPrivate
{
int monitor;
@@ -1120,7 +1115,11 @@ set_info_text_and_icon (GSWindow *window,
GtkWidget *primary_label;
GtkWidget *secondary_label;
+#if GTK_CHECK_VERSION (3, 0, 0)
hbox_content = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+#else
+ hbox_content = gtk_hbox_new (FALSE, 8);
+#endif
gtk_widget_show (hbox_content);
image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_DIALOG);
@@ -1132,7 +1131,11 @@ set_info_text_and_icon (GSWindow *window,
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0);
#endif
+#if GTK_CHECK_VERSION (3, 0, 0)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+#else
+ vbox = gtk_vbox_new (FALSE, 6);
+#endif
gtk_widget_show (vbox);
gtk_box_pack_start (GTK_BOX (hbox_content), vbox, FALSE, FALSE, 0);
@@ -2799,7 +2802,11 @@ gs_window_init (GSWindow *window)
| GDK_ENTER_NOTIFY_MASK
| GDK_LEAVE_NOTIFY_MASK);
+#if GTK_CHECK_VERSION (3, 0, 0)
window->priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+#else
+ window->priv->vbox = gtk_vbox_new (FALSE, 12);
+#endif
gtk_widget_show (window->priv->vbox);
gtk_container_add (GTK_CONTAINER (window), window->priv->vbox);