Merge remote-tracking branch 'origin/0.10'

[platform/upstream/gstreamer.git] / gst / gsterror.c

diff --git a/gst/gsterror.c b/gst/gsterror.c
index 0183c34..17ec81f 100644 (file)
--- a/gst/gsterror.c
+++ b/gst/gsterror.c
@@ -122,22 +122,6 @@ 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 "."
 
 static const gchar *
@@ -309,13 +293,13 @@ gst_error_get_message (GQuark domain, gint code)
   const gchar *message = NULL;
 
   if (domain == GST_CORE_ERROR)
-    message = gst_error_get_core_error (code);
+    message = gst_error_get_core_error ((GstCoreError) code);
   else if (domain == GST_LIBRARY_ERROR)
-    message = gst_error_get_library_error (code);
+    message = gst_error_get_library_error ((GstLibraryError) code);
   else if (domain == GST_RESOURCE_ERROR)
-    message = gst_error_get_resource_error (code);
+    message = gst_error_get_resource_error ((GstResourceError) code);
   else if (domain == GST_STREAM_ERROR)
-    message = gst_error_get_stream_error (code);
+    message = gst_error_get_stream_error ((GstStreamError) code);
   else {
     g_warning ("No error messages for domain %s", g_quark_to_string (domain));
     return g_strdup_printf (_("No error message for domain %s."),