diff options
Diffstat (limited to 'meta-gnome/recipes-gnome/gvfs/files/0004-Adapt-to-glib-thread-API-changes.patch')
-rw-r--r-- | meta-gnome/recipes-gnome/gvfs/files/0004-Adapt-to-glib-thread-API-changes.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/gvfs/files/0004-Adapt-to-glib-thread-API-changes.patch b/meta-gnome/recipes-gnome/gvfs/files/0004-Adapt-to-glib-thread-API-changes.patch new file mode 100644 index 000000000..0fac60155 --- /dev/null +++ b/meta-gnome/recipes-gnome/gvfs/files/0004-Adapt-to-glib-thread-API-changes.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From 008031adbe2fd118a4e9a3c7219a9777cab1bb75 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tomas Bzatek <tbzatek@redhat.com> | ||
3 | Date: Wed, 26 Oct 2011 14:12:13 +0200 | ||
4 | Subject: [PATCH 2/2] Adapt to glib thread API changes | ||
5 | |||
6 | Last piece in order to fix https://bugzilla.gnome.org/show_bug.cgi?id=661148 | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | |||
10 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
11 | --- | ||
12 | client/gvfsfusedaemon.c | 2 +- | ||
13 | daemon/trashlib/trashexpunge.c | 2 +- | ||
14 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c | ||
17 | index c986f69..5e79638 100644 | ||
18 | --- a/client/gvfsfusedaemon.c | ||
19 | +++ b/client/gvfsfusedaemon.c | ||
20 | @@ -2358,7 +2358,7 @@ vfs_init (struct fuse_conn_info *conn) | ||
21 | volume_monitor = g_object_new (g_type_from_name ("GDaemonVolumeMonitor"), NULL); | ||
22 | |||
23 | subthread_main_loop = g_main_loop_new (NULL, FALSE); | ||
24 | - subthread = g_thread_create ((GThreadFunc) subthread_main, NULL, FALSE, NULL); | ||
25 | + subthread = g_thread_new ("gvfs-fuse-sub", (GThreadFunc) subthread_main, NULL); | ||
26 | |||
27 | /* Indicate O_TRUNC support for open() */ | ||
28 | conn->want |= FUSE_CAP_ATOMIC_O_TRUNC; | ||
29 | diff --git a/daemon/trashlib/trashexpunge.c b/daemon/trashlib/trashexpunge.c | ||
30 | index a5cf975..677fb81 100644 | ||
31 | --- a/daemon/trashlib/trashexpunge.c | ||
32 | +++ b/daemon/trashlib/trashexpunge.c | ||
33 | @@ -124,7 +124,7 @@ trash_expunge (GFile *directory) | ||
34 | { | ||
35 | GThread *thread; | ||
36 | |||
37 | - thread = g_thread_create (trash_expunge_thread, NULL, FALSE, NULL); | ||
38 | + thread = g_thread_new ("trash-expunge", trash_expunge_thread, NULL); | ||
39 | g_assert (thread != NULL); | ||
40 | trash_expunge_alive = TRUE; | ||
41 | } | ||
42 | -- | ||
43 | 1.7.6.5 | ||
44 | |||