diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-01-22 01:39:49 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-01-22 15:16:14 +0000 |
| commit | 1654b7f1d7ca07702e2bfaf9a1e120e5aed0df60 (patch) | |
| tree | 64457e971ad7827e42fab3b2dd23ad8db7129088 /gst/gstmessage.c | |
| parent | 58a4d806d1ae19968c128bf218a8a4c0db8677e0 (diff) | |
Use GLib's type for GError instead of our own
We introduced our own when GLib didn't want to add a GType
for GError. But now that there is one, we can use GLib's
unconditionally and remove our version.
Diffstat (limited to 'gst/gstmessage.c')
| -rw-r--r-- | gst/gstmessage.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gst/gstmessage.c b/gst/gstmessage.c index 9bbbbd5df..9c28a3afb 100644 --- a/gst/gstmessage.c +++ b/gst/gstmessage.c @@ -386,7 +386,7 @@ gst_message_new_error (GstObject * src, GError * error, const gchar * debug) GstStructure *structure; structure = gst_structure_new_id (GST_QUARK (MESSAGE_ERROR), - GST_QUARK (GERROR), GST_TYPE_G_ERROR, error, + GST_QUARK (GERROR), G_TYPE_ERROR, error, GST_QUARK (DEBUG), G_TYPE_STRING, debug, NULL); message = gst_message_new_custom (GST_MESSAGE_ERROR, src, structure); @@ -413,7 +413,7 @@ gst_message_new_warning (GstObject * src, GError * error, const gchar * debug) GstStructure *structure; structure = gst_structure_new_id (GST_QUARK (MESSAGE_WARNING), - GST_QUARK (GERROR), GST_TYPE_G_ERROR, error, + GST_QUARK (GERROR), G_TYPE_ERROR, error, GST_QUARK (DEBUG), G_TYPE_STRING, debug, NULL); message = gst_message_new_custom (GST_MESSAGE_WARNING, src, structure); @@ -442,7 +442,7 @@ gst_message_new_info (GstObject * src, GError * error, const gchar * debug) GstStructure *structure; structure = gst_structure_new_id (GST_QUARK (MESSAGE_INFO), - GST_QUARK (GERROR), GST_TYPE_G_ERROR, error, + GST_QUARK (GERROR), G_TYPE_ERROR, error, GST_QUARK (DEBUG), G_TYPE_STRING, debug, NULL); message = gst_message_new_custom (GST_MESSAGE_INFO, src, structure); @@ -1335,7 +1335,7 @@ gst_message_parse_error (GstMessage * message, GError ** gerror, gchar ** debug) structure = GST_MESSAGE_STRUCTURE (message); error_gvalue = gst_structure_id_get_value (structure, GST_QUARK (GERROR)); g_return_if_fail (error_gvalue != NULL); - g_return_if_fail (G_VALUE_TYPE (error_gvalue) == GST_TYPE_G_ERROR); + g_return_if_fail (G_VALUE_TYPE (error_gvalue) == G_TYPE_ERROR); error_val = (GError *) g_value_get_boxed (error_gvalue); if (error_val) @@ -1375,7 +1375,7 @@ gst_message_parse_warning (GstMessage * message, GError ** gerror, structure = GST_MESSAGE_STRUCTURE (message); error_gvalue = gst_structure_id_get_value (structure, GST_QUARK (GERROR)); g_return_if_fail (error_gvalue != NULL); - g_return_if_fail (G_VALUE_TYPE (error_gvalue) == GST_TYPE_G_ERROR); + g_return_if_fail (G_VALUE_TYPE (error_gvalue) == G_TYPE_ERROR); error_val = (GError *) g_value_get_boxed (error_gvalue); if (error_val) @@ -1416,7 +1416,7 @@ gst_message_parse_info (GstMessage * message, GError ** gerror, gchar ** debug) structure = GST_MESSAGE_STRUCTURE (message); error_gvalue = gst_structure_id_get_value (structure, GST_QUARK (GERROR)); g_return_if_fail (error_gvalue != NULL); - g_return_if_fail (G_VALUE_TYPE (error_gvalue) == GST_TYPE_G_ERROR); + g_return_if_fail (G_VALUE_TYPE (error_gvalue) == G_TYPE_ERROR); error_val = (GError *) g_value_get_boxed (error_gvalue); if (error_val) |