From 2734b6da779662022ed29d229c26862f30fb32e3 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Fri, 27 Jun 2008 07:55:40 +0000 Subject: [PATCH] ChangeLog: ChangeLog surgery. Original commit message from CVS: * ChangeLog: ChangeLog surgery. * tests/examples/seek/seek.c: Move variable into ifdef too. --- ChangeLog | 12 +++++++++++- tests/examples/seek/seek.c | 4 +++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d39b52586..de4d49bd5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,17 @@ +2008-06-27 Stefan Kost + + * ChangeLog: + ChangeLog surgery. + + * tests/examples/seek/seek.c: + Move variable into ifdef too. + + 2008-06-27 Stefan Kost * tests/examples/seek/seek.c: - Include config.h and check if we have X. Fixes: #540334. + Include config.h and check if we have X. Remove XInitThread(), don't + think its needed. Fixes: #540334. 2008-06-26 Sebastian Dröge diff --git a/tests/examples/seek/seek.c b/tests/examples/seek/seek.c index a03b5fc24c..cdce6376e9 100644 --- a/tests/examples/seek/seek.c +++ b/tests/examples/seek/seek.c @@ -107,7 +107,6 @@ static GtkWidget *video_combo, *audio_combo, *text_combo, *vis_combo; static GtkWidget *vis_checkbox, *video_checkbox, *audio_checkbox; static GtkWidget *text_checkbox, *mute_checkbox, *volume_spinbutton; static GtkWidget *video_window; -static guint embed_xid = 0; GList *paths = NULL, *l = NULL; @@ -2097,6 +2096,9 @@ msg_buffering (GstBus * bus, GstMessage * message, GstPipeline * data) } #ifdef HAVE_X + +static guint embed_xid = 0; + static GstBusSyncReply bus_sync_handler (GstBus * bus, GstMessage * message, GstPipeline * data) {