ChangeLog: ChangeLog surgery.

Original commit message from CVS:
* ChangeLog:
ChangeLog surgery.
* tests/examples/seek/seek.c:
Move variable into ifdef too.

diff --git a/ChangeLog b/ChangeLog
index 2d39b52..de4d49b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
+
        * 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>
 

diff --git a/tests/examples/seek/seek.c b/tests/examples/seek/seek.c
index a03b5fc..cdce637 100644 (file)
--- 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)
 {