ChangeLog: ChangeLog surgery.

Original commit message from CVS:
* ChangeLog:
ChangeLog surgery.
* tests/examples/seek/seek.c:
Move variable into ifdef too.
This commit is contained in:
Stefan Kost 2008-06-27 07:55:40 +00:00
parent 724c8a3711
commit 2734b6da77
2 changed files with 14 additions and 2 deletions

View file

@ -1,7 +1,17 @@
2008-06-27 Stefan Kost <ensonic@users.sf.net>
* ChangeLog:
ChangeLog surgery.
* tests/examples/seek/seek.c:
Move variable into ifdef too.
2008-06-27 Stefan Kost <ensonic@users.sf.net> 2008-06-27 Stefan Kost <ensonic@users.sf.net>
* tests/examples/seek/seek.c: * 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 <sebastian.droege@collabora.co.uk> 2008-06-26 Sebastian Dröge <sebastian.droege@collabora.co.uk>

View file

@ -107,7 +107,6 @@ static GtkWidget *video_combo, *audio_combo, *text_combo, *vis_combo;
static GtkWidget *vis_checkbox, *video_checkbox, *audio_checkbox; static GtkWidget *vis_checkbox, *video_checkbox, *audio_checkbox;
static GtkWidget *text_checkbox, *mute_checkbox, *volume_spinbutton; static GtkWidget *text_checkbox, *mute_checkbox, *volume_spinbutton;
static GtkWidget *video_window; static GtkWidget *video_window;
static guint embed_xid = 0;
GList *paths = NULL, *l = NULL; GList *paths = NULL, *l = NULL;
@ -2097,6 +2096,9 @@ msg_buffering (GstBus * bus, GstMessage * message, GstPipeline * data)
} }
#ifdef HAVE_X #ifdef HAVE_X
static guint embed_xid = 0;
static GstBusSyncReply static GstBusSyncReply
bus_sync_handler (GstBus * bus, GstMessage * message, GstPipeline * data) bus_sync_handler (GstBus * bus, GstMessage * message, GstPipeline * data)
{ {