diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-02 19:06:24 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-02 20:19:36 +0100 |
| commit | 9aec808ae99f5b06c816943fc1648358af0d8294 (patch) | |
| tree | ac7f5cd918ca45932fd321648e9f589d35e966c2 /telepathy-glib/presence-mixin.c | |
| parent | 2cc2520bcfa36c834dab111ebf41637bbfc8371f (diff) | |
| download | telepathy-glib-9aec808ae99f5b06c816943fc1648358af0d8294.tar.gz | |
Stop using TP_ERRORS
We deprecated this in 0.11.
Diffstat (limited to 'telepathy-glib/presence-mixin.c')
| -rw-r--r-- | telepathy-glib/presence-mixin.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/telepathy-glib/presence-mixin.c b/telepathy-glib/presence-mixin.c index 6b33d7625..7a4e8dcfe 100644 --- a/telepathy-glib/presence-mixin.c +++ b/telepathy-glib/presence-mixin.c @@ -661,7 +661,7 @@ tp_presence_mixin_add_status (TpSvcConnectionInterfacePresence *iface, DBusGMethodInvocation *context) { TpBaseConnection *conn = TP_BASE_CONNECTION (iface); - GError error = { TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED, + GError error = { TP_ERROR, TP_ERROR_NOT_IMPLEMENTED, "Only one status is possible at a time with this protocol!" }; DEBUG ("called."); @@ -786,7 +786,7 @@ check_status_available (GObject *object, { if (!mixin_cls->statuses[i].self) { - g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, + g_set_error (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "cannot set status '%s' on yourself", mixin_cls->statuses[i].name); return FALSE; @@ -799,7 +799,7 @@ check_status_available (GObject *object, case TP_CONNECTION_PRESENCE_TYPE_OFFLINE: case TP_CONNECTION_PRESENCE_TYPE_UNKNOWN: case TP_CONNECTION_PRESENCE_TYPE_ERROR: - g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, + g_set_error (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "cannot set offline/unknown/error status '%s' on yourself", mixin_cls->statuses[i].name); return FALSE; @@ -814,7 +814,7 @@ check_status_available (GObject *object, { DEBUG ("requested status %s is not available", mixin_cls->statuses[i].name); - g_set_error (error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE, + g_set_error (error, TP_ERROR, TP_ERROR_NOT_AVAILABLE, "requested status '%s' is not available on this connection", mixin_cls->statuses[i].name); return FALSE; @@ -971,7 +971,7 @@ tp_presence_mixin_remove_status (TpSvcConnectionInterfacePresence *iface, } else { - GError nonexistent = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, + GError nonexistent = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Attempting to remove non-existent presence." }; dbus_g_method_return_error (context, &nonexistent); } @@ -1057,7 +1057,7 @@ check_for_status (GObject *object, const gchar *status, GError **error) else { DEBUG ("got unknown status identifier %s", status); - g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, + g_set_error (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "unknown status identifier: %s", status); return -1; } @@ -1167,7 +1167,7 @@ tp_presence_mixin_set_status (TpSvcConnectionInterfacePresence *iface, if (!g_hash_table_iter_next (&iter, &key, &value) || g_hash_table_iter_next (&iter, NULL, NULL)) { - GError invalid = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, + GError invalid = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Only one status may be set at a time in this protocol" }; DEBUG ("got more than one status"); dbus_g_method_return_error (context, &invalid); |