projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
24814d2
)
gst: Use GError boxed type from GObject 2.25.2 instead of our own if possible
author
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Fri, 23 Apr 2010 04:24:56 +0000
(06:24 +0200)
committer
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Thu, 29 Apr 2010 16:18:37 +0000
(18:18 +0200)
gst/gsterror.c
patch
|
blob
|
history
diff --git
a/gst/gsterror.c
b/gst/gsterror.c
index
cf9f7bf
..
ec99322
100644
(file)
--- a/
gst/gsterror.c
+++ b/
gst/gsterror.c
@@
-114,15
+114,20
@@
GQuark gst_ ## string ## _error_quark (void) { \
quark = g_quark_from_static_string ("gst-" # string "-error-quark"); \
return quark; }
+/* FIXME: Deprecate when we depend on GLib 2.26 */
GType
gst_g_error_get_type (void)
{
+#if GLIB_CHECK_VERSION(2,25,2)
+ return g_error_get_type ();
+#else
static GType type = 0;
if (G_UNLIKELY (type == 0))
type = g_boxed_type_register_static ("GstGError",
(GBoxedCopyFunc) g_error_copy, (GBoxedFreeFunc) g_error_free);
return type;
+#endif
}
#define FILE_A_BUG " Please file a bug at " PACKAGE_BUGREPORT "."