From 6e66d8dab193d64b35a64bc0b651eae10e846e4d Mon Sep 17 00:00:00 2001 From: Matias De lellis Date: Thu, 10 Nov 2016 12:39:25 -0300 Subject: [PATCH] Fix compilation on 3.14 --- xfce4-notifyd-config/main.c | 4 ++++ xfce4-notifyd/xfce-notify-window.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/xfce4-notifyd-config/main.c b/xfce4-notifyd-config/main.c index 1ec1d39..c81e25c 100644 --- a/xfce4-notifyd-config/main.c +++ b/xfce4-notifyd-config/main.c @@ -385,7 +385,11 @@ xfce4_notifyd_known_applications_changed (XfconfChannel *channel, known_application = g_ptr_array_index (known_applications, i); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); label = gtk_label_new (g_value_get_string (known_application)); +#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (label), 0); +#else + gtk_widget_set_halign (label, GTK_ALIGN_START); +#endif mute_switch = gtk_switch_new (); gtk_switch_set_active (GTK_SWITCH (mute_switch), TRUE); gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 3); diff --git a/xfce4-notifyd/xfce-notify-window.c b/xfce4-notifyd/xfce-notify-window.c index fa54325..7671f3d 100644 --- a/xfce4-notifyd/xfce-notify-window.c +++ b/xfce4-notifyd/xfce-notify-window.c @@ -239,14 +239,22 @@ xfce_notify_window_init(XfceNotifyWindow *window) gtk_widget_set_name (window->summary, "summary"); gtk_label_set_max_width_chars (GTK_LABEL(window->summary), screen_width); gtk_label_set_line_wrap(GTK_LABEL(window->summary), TRUE); +#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL(window->summary), 0); +#else + gtk_widget_set_halign (window->summary, GTK_ALIGN_START); +#endif gtk_box_pack_start(GTK_BOX(vbox), window->summary, FALSE, FALSE, 0); window->body = gtk_label_new(NULL); gtk_widget_set_name (window->body, "body"); gtk_label_set_max_width_chars (GTK_LABEL(window->body), screen_width); gtk_label_set_line_wrap(GTK_LABEL(window->body), TRUE); +#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL(window->body), 0); +#else + gtk_widget_set_halign (window->body, GTK_ALIGN_START); +#endif gtk_box_pack_start(GTK_BOX(vbox), window->body, TRUE, TRUE, 0); window->button_box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); -- 2.1.4