[gst-cvs] gst-plugins-base: jsseek: Don't use deprecated GLib API

[Sebastian Dröge]

Module: gst-plugins-base
Branch: master
Commit: 29fe8adea8e96d5b4522fc83e38525b74fd7a6ce
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=29fe8adea8e96d5b4522fc83e38525b74fd7a6ce

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Mon Jun 14 11:20:00 2010 +0200

jsseek: Don't use deprecated GLib API

Fixes once again bug #605100.

---

 tests/examples/seek/jsseek.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/examples/seek/jsseek.c b/tests/examples/seek/jsseek.c
index 16167e4..7f7928d 100644
--- a/tests/examples/seek/jsseek.c
+++ b/tests/examples/seek/jsseek.c
@@ -2626,12 +2626,18 @@ read_joystick (GIOChannel * source, GIOCondition condition, gpointer user_data)
 {
   gchar buf[sizeof (struct js_event)];
   struct js_event *js = (struct js_event *) buf;
+  GError *err = NULL;
   gsize bytes_read = 0;
   GIOStatus result;
 
   result =
-      g_io_channel_read (source, buf, sizeof (struct js_event), &bytes_read);
-  if (bytes_read != sizeof (struct js_event)) {
+      g_io_channel_read_chars (source, buf, sizeof (struct js_event),
+      &bytes_read, &err);
+  if (err) {
+    g_print ("error reading from joystick: %s", err->message);
+    g_error_free (err);
+    return FALSE;
+  } else if (bytes_read != sizeof (struct js_event)) {
     g_print ("error reading joystick, read %u bytes of %u\n",
         (guint) bytes_read, (guint) sizeof (struct js_event));
     return TRUE;