From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Mon, 26 Sep 2011 17:25:22 +0000 (+0200)
Subject: Merge branch 'master' into 0.11
X-Git-Tag: RELEASE-0.11.1~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52cb649834fbd57f110475f85281d3c0ac7e008f;p=platform%2Fupstream%2Fgstreamer.git

Merge branch 'master' into 0.11
---

52cb649834fbd57f110475f85281d3c0ac7e008f
diff --cc gst/gststructure.c
index 7c402de,271ef87..ca16622
--- a/gst/gststructure.c
+++ b/gst/gststructure.c
@@@ -171,13 -163,14 +171,13 @@@ gst_structure_validate_name (const gcha
      return FALSE;
    }
  
 -  /* FIXME 0.11: don't allow spaces */
    /* FIXME: test name string more */
    s = &name[1];
 -  while (*s && (g_ascii_isalnum (*s) || strchr ("/-_.:+ ", *s) != NULL))
 +  while (*s && (g_ascii_isalnum (*s) || strchr ("/-_.:+", *s) != NULL))
      s++;
    if (G_UNLIKELY (*s != '\0')) {
-     GST_WARNING ("Invalid character '%c' at offset %lu in structure name: %s",
-         *s, ((gulong) s - (gulong) name), name);
+     GST_WARNING ("Invalid character '%c' at offset %" G_GUINTPTR_FORMAT " in"
+         " structure name: %s", *s, ((guintptr) s - (guintptr) name), name);
      return FALSE;
    }