/[pkg-src]/trunk/thunar/patches/thunar-1.8.0-replace-gtk_widget_reparent-with-xfce_widget_reparent.patch |
Annotation of /trunk/thunar/patches/thunar-1.8.0-replace-gtk_widget_reparent-with-xfce_widget_reparent.patch
Parent Directory | Revision Log
Revision 3126 -
(hide annotations)
(download)
Tue Jun 12 15:06:08 2018 UTC (6 years, 3 months ago) by niro
File size: 2091 byte(s)
Tue Jun 12 15:06:08 2018 UTC (6 years, 3 months ago) by niro
File size: 2091 byte(s)
-allow thunar build against libxfce4ui-4.12, revert this patch
1 | niro | 3126 | From fbb87f2f1b779182a8802e091ff4fb1175b47326 Mon Sep 17 00:00:00 2001 |
2 | From: Andre Miranda <andreldm@xfce.org> | ||
3 | Date: Sun, 14 Jan 2018 16:25:26 -0300 | ||
4 | Subject: Replace gtk_widget_reparent with xfce_widget_reparent | ||
5 | |||
6 | Requires libxfce4ui >=4.13.2 | ||
7 | --- | ||
8 | configure.ac | 2 +- | ||
9 | thunar/thunar-progress-dialog.c | 6 ++++-- | ||
10 | 2 files changed, 5 insertions(+), 3 deletions(-) | ||
11 | |||
12 | diff --git a/configure.ac b/configure.ac | ||
13 | index 9bc80ce..c2d6a80 100644 | ||
14 | --- a/configure.ac | ||
15 | +++ b/configure.ac | ||
16 | @@ -153,7 +153,7 @@ XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.30.0]) | ||
17 | XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.22.0]) | ||
18 | XDT_CHECK_PACKAGE([GDK_PIXBUF], [gdk-pixbuf-2.0], [2.14.0]) | ||
19 | XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0]) | ||
20 | -XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0]) | ||
21 | +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.13.2]) | ||
22 | XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.12.0]) | ||
23 | |||
24 | dnl ****************************** | ||
25 | diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c | ||
26 | index 1a87a38..8ecee40 100644 | ||
27 | --- a/thunar/thunar-progress-dialog.c | ||
28 | +++ b/thunar/thunar-progress-dialog.c | ||
29 | @@ -24,6 +24,8 @@ | ||
30 | |||
31 | #include <gtk/gtk.h> | ||
32 | |||
33 | +#include <libxfce4ui/libxfce4ui.h> | ||
34 | + | ||
35 | #include <thunar/thunar-private.h> | ||
36 | #include <thunar/thunar-progress-dialog.h> | ||
37 | #include <thunar/thunar-progress-view.h> | ||
38 | @@ -253,7 +255,7 @@ thunar_progress_dialog_job_finished (ThunarProgressDialog *dialog, | ||
39 | if (n_views == SCROLLVIEW_THRESHOLD-1) | ||
40 | { | ||
41 | /* reparent the content box */ | ||
42 | - gtk_widget_reparent (dialog->content_box, dialog->vbox); | ||
43 | + xfce_widget_reparent (dialog->content_box, dialog->vbox); | ||
44 | |||
45 | /* destroy the scroll win */ | ||
46 | gtk_widget_destroy (dialog->scrollwin); | ||
47 | @@ -366,7 +368,7 @@ thunar_progress_dialog_add_job (ThunarProgressDialog *dialog, | ||
48 | gtk_widget_show (viewport); | ||
49 | |||
50 | /* move the content box into the viewport */ | ||
51 | - gtk_widget_reparent (dialog->content_box, viewport); | ||
52 | + xfce_widget_reparent (dialog->content_box, viewport); | ||
53 | } | ||
54 | |||
55 | g_signal_connect_swapped (view, "need-attention", | ||
56 | -- | ||
57 | cgit v1.1 | ||
58 |