diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2013-08-07 21:08:44 +0200 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2013-08-07 21:08:44 +0200 |
| commit | c6f67e9e05b09d2a1e030f03fbde89a07c1e28f0 (patch) | |
| tree | 16328331559239b47e9bd37874dbfe9e9268cfeb | |
| parent | 24b7f8e49c5a1e7c2a7f851f53fde51ee6373216 (diff) | |
stop using TP_ERRORS
| -rw-r--r-- | src/kindling-connection.c | 4 | ||||
| -rw-r--r-- | src/kindling-muc-manager.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/kindling-connection.c b/src/kindling-connection.c index 6e9a79d..5e6a06d 100644 --- a/src/kindling-connection.c +++ b/src/kindling-connection.c @@ -257,7 +257,7 @@ _soup_get_user_cb (SoupSession *session, SoupMessage *msg, gpointer user_data) { KindlingConnectionPrivate *priv = KINDLING_CONNECTION_GET_PRIVATE(conn); if (msg->status_code != 200) { if (base_conn->status != TP_CONNECTION_STATUS_DISCONNECTED) { - GError *error = g_error_new(TP_ERRORS, TP_ERROR_PERMISSION_DENIED, "non 200 status code %d", msg->status_code); + GError *error = g_error_new(TP_ERROR, TP_ERROR_PERMISSION_DENIED, "non 200 status code %d", msg->status_code); _connection_disconnect_with_gerror(conn, TP_CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED, @@ -294,7 +294,7 @@ _soup_get_user_cb (SoupSession *session, SoupMessage *msg, gpointer user_data) { if (priv->api_token == NULL) { if (base_conn->status != TP_CONNECTION_STATUS_DISCONNECTED) { - GError *error = g_error_new(TP_ERRORS, TP_ERROR_PERMISSION_DENIED, "no api token"); + GError *error = g_error_new(TP_ERROR, TP_ERROR_PERMISSION_DENIED, "no api token"); _connection_disconnect_with_gerror(conn, TP_CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED, diff --git a/src/kindling-muc-manager.c b/src/kindling-muc-manager.c index 51e56dd..5d9c8f4 100644 --- a/src/kindling-muc-manager.c +++ b/src/kindling-muc-manager.c @@ -155,7 +155,7 @@ static gboolean kindling_muc_manager_handle_channel(TpChannelManager *manager, channel = g_hash_table_lookup (priv->channels, GINT_TO_POINTER(handle)); if (channel != NULL) { if (require_new) { - g_set_error ( &error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE, "That channel has already been created"); + g_set_error ( &error, TP_ERROR, TP_ERROR_NOT_AVAILABLE, "That channel has already been created"); tp_channel_manager_emit_request_failed (manager, request_token, error->domain, error->code, error->message); g_error_free(error); return TRUE; |