[Xfce4-commits] [apps/xfce4-screensaver] 01/01: Resolve hidden libxfce4ui 4.13 requirement (bug #14821)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-screensaver.

commit 8c04927e33675e3e76d82b5c0788cb3df97d6584
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Thu Nov 1 18:39:04 2018 -0400

    Resolve hidden libxfce4ui 4.13 requirement (bug #14821)
---
 NEWS                                | 5 +++++
 src/xfce4-screensaver-preferences.c | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/NEWS b/NEWS
index 190a309..8346137 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+0.1.2 (alpha) (UNRELEASED)
+=============
+- Bug Fixes:
+  - Resolve hidden libxfce4ui 4.13 requirement (Xfce #14821)
+
 0.1.1 (alpha)
 =============
 - General:
diff --git a/src/xfce4-screensaver-preferences.c b/src/xfce4-screensaver-preferences.c
index 6ba053d..8057ad6 100644
--- a/src/xfce4-screensaver-preferences.c
+++ b/src/xfce4-screensaver-preferences.c
@@ -1775,7 +1775,15 @@ main (int    argc,
 
         /* Get plug child widget */
         plug_child = gtk_builder_get_object (builder, "plug-child");
+
+#if LIBXFCE4UI_CHECK_VERSION (4, 13, 2)
         xfce_widget_reparent (GTK_WIDGET(plug_child), plug);
+#else
+        G_GNUC_BEGIN_IGNORE_DEPRECATIONS /* GTK 3.14 */
+        gtk_widget_reparent (dialog->content_box, dialog->vbox);
+        G_GNUC_END_IGNORE_DEPRECATIONS
+#endif
+
         gtk_widget_show_all (GTK_WIDGET(plug_child));
 
         /* To prevent the settings dialog to be saved in the session */

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.