diff options
Diffstat (limited to 'src/tubes-channel.c')
-rw-r--r-- | src/tubes-channel.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/tubes-channel.c b/src/tubes-channel.c index 988c78eb..c263eb15 100644 --- a/src/tubes-channel.c +++ b/src/tubes-channel.c @@ -1486,7 +1486,7 @@ salut_tubes_channel_offer_d_bus_tube (TpSvcChannelTypeTubes *iface, && !tp_handle_set_is_member (TP_GROUP_MIXIN (self->muc)->members, priv->self_handle)) { - GError error = { TP_ERROR, TP_ERROR_NOT_AVAILABLE, + GError error = { TP_ERRORS, TP_ERROR_NOT_AVAILABLE, "Tube channel isn't connected" }; dbus_g_method_return_error (context, &error); @@ -1535,7 +1535,7 @@ salut_tubes_channel_accept_d_bus_tube (TpSvcChannelTypeTubes *iface, tube = g_hash_table_lookup (priv->tubes, GUINT_TO_POINTER (id)); if (tube == NULL) { - GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Unknown tube" }; + GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "Unknown tube" }; dbus_g_method_return_error (context, &error); @@ -1549,7 +1549,7 @@ salut_tubes_channel_accept_d_bus_tube (TpSvcChannelTypeTubes *iface, if (type != TP_TUBE_TYPE_DBUS) { - GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, + GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "Tube is not a D-Bus tube" }; dbus_g_method_return_error (context, &error); @@ -1558,7 +1558,7 @@ salut_tubes_channel_accept_d_bus_tube (TpSvcChannelTypeTubes *iface, if (state != TP_TUBE_CHANNEL_STATE_LOCAL_PENDING) { - GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, + GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "Tube is not in the local pending state" }; dbus_g_method_return_error (context, &error); @@ -1600,7 +1600,7 @@ salut_tubes_channel_close_tube (TpSvcChannelTypeTubes *iface, tube = g_hash_table_lookup (priv->tubes, GUINT_TO_POINTER (id)); if (tube == NULL) { - GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Unknown tube" }; + GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "Unknown tube" }; dbus_g_method_return_error (context, &error); return; @@ -1637,7 +1637,7 @@ salut_tubes_channel_get_d_bus_tube_address (TpSvcChannelTypeTubes *iface, if (tube == NULL) { - GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Unknown tube" }; + GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "Unknown tube" }; dbus_g_method_return_error (context, &error); return; @@ -1650,7 +1650,7 @@ salut_tubes_channel_get_d_bus_tube_address (TpSvcChannelTypeTubes *iface, if (type != TP_TUBE_TYPE_DBUS) { - GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, + GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "Tube is not a D-Bus tube" }; dbus_g_method_return_error (context, &error); @@ -1659,7 +1659,7 @@ salut_tubes_channel_get_d_bus_tube_address (TpSvcChannelTypeTubes *iface, if (state != TP_TUBE_CHANNEL_STATE_OPEN) { - GError error = { TP_ERROR, TP_ERROR_NOT_AVAILABLE, + GError error = { TP_ERRORS, TP_ERROR_NOT_AVAILABLE, "Tube is not open" }; dbus_g_method_return_error (context, &error); @@ -1716,7 +1716,7 @@ salut_tubes_channel_get_d_bus_names (TpSvcChannelTypeTubes *iface, if (tube == NULL) { - GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Unknown tube" }; + GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "Unknown tube" }; dbus_g_method_return_error (context, &error); return; @@ -1729,7 +1729,7 @@ salut_tubes_channel_get_d_bus_names (TpSvcChannelTypeTubes *iface, if (type != TP_TUBE_TYPE_DBUS) { - GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, + GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "Tube is not a D-Bus tube" }; dbus_g_method_return_error (context, &error); @@ -1738,7 +1738,7 @@ salut_tubes_channel_get_d_bus_names (TpSvcChannelTypeTubes *iface, if (state != TP_TUBE_CHANNEL_STATE_OPEN) { - GError error = { TP_ERROR, TP_ERROR_NOT_AVAILABLE, + GError error = { TP_ERRORS, TP_ERROR_NOT_AVAILABLE, "Tube is not open" }; dbus_g_method_return_error (context, &error); @@ -1968,7 +1968,7 @@ salut_tubes_channel_offer_stream_tube (TpSvcChannelTypeTubes *iface, && !tp_handle_set_is_member (TP_GROUP_MIXIN (self->muc)->members, priv->self_handle)) { - GError err = { TP_ERROR, TP_ERROR_NOT_AVAILABLE, + GError err = { TP_ERRORS, TP_ERROR_NOT_AVAILABLE, "Tube channel isn't connected" }; dbus_g_method_return_error (context, &err); @@ -2039,7 +2039,7 @@ salut_tubes_channel_accept_stream_tube (TpSvcChannelTypeTubes *iface, tube = g_hash_table_lookup (priv->tubes, GUINT_TO_POINTER (id)); if (tube == NULL) { - GError err = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Unknown tube" }; + GError err = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "Unknown tube" }; dbus_g_method_return_error (context, &err); return; @@ -2051,7 +2051,7 @@ salut_tubes_channel_accept_stream_tube (TpSvcChannelTypeTubes *iface, { GError *err = NULL; - err = g_error_new (TP_ERROR, TP_ERROR_NOT_IMPLEMENTED, + err = g_error_new (TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED, "Address type %d not implemented", address_type); dbus_g_method_return_error (context, err); @@ -2064,7 +2064,7 @@ salut_tubes_channel_accept_stream_tube (TpSvcChannelTypeTubes *iface, { GError *err = NULL; - err = g_error_new (TP_ERROR, TP_ERROR_INVALID_ARGUMENT, + err = g_error_new (TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "Unix sockets only support localhost control access"); dbus_g_method_return_error (context, err); @@ -2080,7 +2080,7 @@ salut_tubes_channel_accept_stream_tube (TpSvcChannelTypeTubes *iface, if (type != TP_TUBE_TYPE_STREAM) { - GError err = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, + GError err = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "Tube is not a stream tube" }; dbus_g_method_return_error (context, &err); @@ -2089,7 +2089,7 @@ salut_tubes_channel_accept_stream_tube (TpSvcChannelTypeTubes *iface, if (state != TP_TUBE_CHANNEL_STATE_LOCAL_PENDING) { - GError err = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, + GError err = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "Tube is not in the local pending state" }; dbus_g_method_return_error (context, &err); @@ -2136,7 +2136,7 @@ salut_tubes_channel_get_stream_tube_socket_address (TpSvcChannelTypeTubes *iface tube = g_hash_table_lookup (priv->tubes, GUINT_TO_POINTER (id)); if (tube == NULL) { - GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Unknown tube" }; + GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "Unknown tube" }; dbus_g_method_return_error (context, &error); return; @@ -2149,7 +2149,7 @@ salut_tubes_channel_get_stream_tube_socket_address (TpSvcChannelTypeTubes *iface if (type != TP_TUBE_TYPE_STREAM) { - GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, + GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "Tube is not a Stream tube" }; dbus_g_method_return_error (context, &error); @@ -2158,7 +2158,7 @@ salut_tubes_channel_get_stream_tube_socket_address (TpSvcChannelTypeTubes *iface if (state != TP_TUBE_CHANNEL_STATE_OPEN) { - GError error = { TP_ERROR, TP_ERROR_NOT_AVAILABLE, + GError error = { TP_ERRORS, TP_ERROR_NOT_AVAILABLE, "Tube is not open" }; dbus_g_method_return_error (context, &error); |