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/dbus-daemon.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/dbus-daemon.c')
-rw-r--r-- | telepathy-glib/dbus-daemon.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/telepathy-glib/dbus-daemon.c b/telepathy-glib/dbus-daemon.c index 478ff3b29..f98236ffa 100644 --- a/telepathy-glib/dbus-daemon.c +++ b/telepathy-glib/dbus-daemon.c @@ -805,7 +805,7 @@ tp_dbus_daemon_request_name (TpDBusDaemon *self, } else { - g_set_error (error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE, + g_set_error (error, TP_ERROR, TP_ERROR_NOT_AVAILABLE, "Name '%s' already in use by this process", well_known_name); return FALSE; } @@ -813,18 +813,18 @@ tp_dbus_daemon_request_name (TpDBusDaemon *self, case DBUS_REQUEST_NAME_REPLY_EXISTS: case DBUS_REQUEST_NAME_REPLY_IN_QUEUE: /* the latter shouldn't actually happen since we said DO_NOT_QUEUE */ - g_set_error (error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE, + g_set_error (error, TP_ERROR, TP_ERROR_NOT_AVAILABLE, "Name '%s' already in use by another process", well_known_name); return FALSE; case -1: - g_set_error (error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE, + g_set_error (error, TP_ERROR, TP_ERROR_NOT_AVAILABLE, "%s: %s", dbus_error.name, dbus_error.message); dbus_error_free (&dbus_error); return FALSE; default: - g_set_error (error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE, + g_set_error (error, TP_ERROR, TP_ERROR_NOT_AVAILABLE, "RequestName('%s') returned %d and I don't know what that means", well_known_name, result); return FALSE; @@ -883,23 +883,23 @@ tp_dbus_daemon_release_name (TpDBusDaemon *self, return TRUE; case DBUS_RELEASE_NAME_REPLY_NOT_OWNER: - g_set_error (error, TP_ERRORS, TP_ERROR_NOT_YOURS, + g_set_error (error, TP_ERROR, TP_ERROR_NOT_YOURS, "Name '%s' owned by another process", well_known_name); return FALSE; case DBUS_RELEASE_NAME_REPLY_NON_EXISTENT: - g_set_error (error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE, + g_set_error (error, TP_ERROR, TP_ERROR_NOT_AVAILABLE, "Name '%s' not owned", well_known_name); return FALSE; case -1: - g_set_error (error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE, + g_set_error (error, TP_ERROR, TP_ERROR_NOT_AVAILABLE, "%s: %s", dbus_error.name, dbus_error.message); dbus_error_free (&dbus_error); return FALSE; default: - g_set_error (error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE, + g_set_error (error, TP_ERROR, TP_ERROR_NOT_AVAILABLE, "ReleaseName('%s') returned %d and I don't know what that means", well_known_name, result); return FALSE; |