summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-08-10 15:45:06 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-17 18:04:19 +0100
commit75bb9025ea7307dedc821875cd0cb1410cb3b420 (patch)
tree0af5df1e77a52698341838f0b83fd23f66896914 /meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
parent38adf05204ddbefd2a3119009646f47f1a5f505b (diff)
downloadpoky-75bb9025ea7307dedc821875cd0cb1410cb3b420.tar.gz
owl-video: patches pushed upstream, so bump srcrev
(From OE-Core rev: 65c62f8734dc56d411d33f638716e99790f2895f) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch')
-rw-r--r--meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch b/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
deleted file mode 100644
index 437f72be86..0000000000
--- a/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1Use gdk_threads_enter/gdk_threads_leave to ensure gtk multithread safe
2
3If the video player tries to play an unknown type file, it will enter
4the error_cb() function, which is called in another thread.
5Use gdk_threads_enter/gdk_threads_leave to ensure the safe of gtk
6multi-thread operation.
7
8Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
9
10Upstream-Status: Pending
11
12diff -ruN video-orig/src/video.c video/src/video.c
13--- video-orig/src/video.c 2010-10-15 16:07:26.522346398 +0800
14+++ video/src/video.c 2010-10-15 16:25:51.780296717 +0800
15@@ -96,6 +96,7 @@
16 {
17 GtkWidget *dialog;
18
19+ gdk_threads_enter();
20 dialog = gtk_message_dialog_new (data->window,
21 GTK_DIALOG_NO_SEPARATOR,
22 GTK_MESSAGE_ERROR,
23@@ -103,6 +104,7 @@
24 error->message);
25 gtk_dialog_run (GTK_DIALOG (dialog));
26 gtk_widget_destroy (dialog);
27+ gdk_threads_leave();
28 }
29
30 /**
31@@ -606,7 +608,9 @@
32
33 gtk_widget_show_all (GTK_WIDGET (data->window));
34
35+ gdk_threads_enter();
36 gtk_main ();
37+ gdk_threads_leave();
38
39 /**
40 * Cleanup.