sys/ximage/gstximagesrc.c: Actually use the display_name property so that we can...

Original commit message from CVS:
Patch by: daniel fischer <dan at f3c dot com>
* sys/ximage/gstximagesrc.c: (gst_ximage_src_start),
(gst_ximage_src_get_caps):
Actually use the display_name property so that we can dump any
available X display. Fixes #445905.

diff --git a/ChangeLog b/ChangeLog
index a736215..afff6d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2007-06-11  Wim Taymans  <wim@fluendo.com>
 
+       Patch by: daniel fischer <dan at f3c dot com>
+
+       * sys/ximage/gstximagesrc.c: (gst_ximage_src_start),
+       (gst_ximage_src_get_caps):
+       Actually use the display_name property so that we can dump any
+       available X display. Fixes #445905.
+
+2007-06-11  Wim Taymans  <wim@fluendo.com>
+
        Patch by: Tommi Myöhänen  <ext-tommi dot myohanen at nokia dot com>
 
        * gst/rtp/gstrtppcmadepay.c: (gst_rtp_pcma_depay_setcaps):

diff --git a/sys/ximage/gstximagesrc.c b/sys/ximage/gstximagesrc.c
index 115a48b..115d271 100644 (file)
--- a/sys/ximage/gstximagesrc.c
+++ b/sys/ximage/gstximagesrc.c
@@ -207,7 +207,7 @@ gst_ximage_src_start (GstBaseSrc * basesrc)
 #ifdef HAVE_XDAMAGE
   s->last_ximage = NULL;
 #endif
-  return gst_ximage_src_open_display (s, NULL);
+  return gst_ximage_src_open_display (s, s->display_name);
 }
 
 static gboolean
@@ -903,7 +903,7 @@ gst_ximage_src_get_caps (GstBaseSrc * bs)
   GstXContext *xcontext;
   gint x, y, width, height;
 
-  if ((!s->xcontext) && (!gst_ximage_src_open_display (s, NULL)))
+  if ((!s->xcontext) && (!gst_ximage_src_open_display (s, s->display_name)))
     return gst_caps_copy (gst_pad_get_pad_template_caps (GST_BASE_SRC (s)->
             srcpad));