From 3dcd9fa5afca8aa45610776dc67ba388aed03aef Mon Sep 17 00:00:00 2001 From: Andre Miranda <andreldm@xfce.org> Date: Wed, 13 Jun 2018 08:07:15 -0300 Subject: [PATCH] Downgrade libxfce4-ui required version --- configure.ac.in | 2 +- thunar/thunar-progress-dialog.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac.in b/configure.ac.in index 9577e9016..30f7609f2 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -153,7 +153,7 @@ XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.30.0]) XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.22.0]) XDT_CHECK_PACKAGE([GDK_PIXBUF], [gdk-pixbuf-2.0], [2.14.0]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.13.2]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0]) XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE], [libxfce4kbd-private-3], [4.12.0]) XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.12.0]) diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c index 2b202d693..673bc1aa6 100644 --- a/thunar/thunar-progress-dialog.c +++ b/thunar/thunar-progress-dialog.c @@ -260,7 +260,11 @@ thunar_progress_dialog_job_finished (ThunarProgressDialog *dialog, if (n_views == SCROLLVIEW_THRESHOLD-1) { /* reparent the content box */ +#if LIBXFCE4UI_CHECK_VERSION (4, 13, 2) xfce_widget_reparent (dialog->content_box, dialog->vbox); +#else + gtk_widget_reparent (dialog->content_box, dialog->vbox); +#endif /* destroy the scroll win */ gtk_widget_destroy (dialog->scrollwin); @@ -375,7 +379,11 @@ thunar_progress_dialog_add_job (ThunarProgressDialog *dialog, gtk_widget_show (viewport); /* move the content box into the viewport */ +#if LIBXFCE4UI_CHECK_VERSION (4, 13, 2) xfce_widget_reparent (dialog->content_box, viewport); +#else + gtk_widget_reparent (dialog->content_box, viewport); +#endif } g_signal_connect_swapped (view, "need-attention", -- GitLab