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/connection-manager.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/connection-manager.c')
| -rw-r--r-- | telepathy-glib/connection-manager.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c index 69d0ff55d..2808a10c1 100644 --- a/telepathy-glib/connection-manager.c +++ b/telepathy-glib/connection-manager.c @@ -1408,7 +1408,7 @@ tp_connection_manager_init_known_interfaces (void) tp_proxy_or_subclass_hook_on_interface_add (tp_type, tp_cli_connection_manager_add_signals); tp_proxy_subclass_add_error_mapping (tp_type, - TP_ERROR_PREFIX, TP_ERRORS, TP_TYPE_ERROR); + TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR); g_once_init_leave (&once, 1); } @@ -1998,14 +1998,14 @@ tp_connection_manager_check_valid_name (const gchar *name, if (tp_str_empty (name)) { - g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, + g_set_error (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "The empty string is not a valid connection manager name"); return FALSE; } if (!g_ascii_isalpha (name[0])) { - g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, + g_set_error (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Not a valid connection manager name because first character " "is not an ASCII letter: %s", name); return FALSE; @@ -2015,7 +2015,7 @@ tp_connection_manager_check_valid_name (const gchar *name, { if (!g_ascii_isalnum (*name_char) && *name_char != '_') { - g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, + g_set_error (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Not a valid connection manager name because character '%c' " "is not an ASCII letter, digit or underscore: %s", *name_char, name); @@ -2047,14 +2047,14 @@ tp_connection_manager_check_valid_protocol_name (const gchar *name, if (name == NULL || name[0] == '\0') { - g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, + g_set_error (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "The empty string is not a valid protocol name"); return FALSE; } if (!g_ascii_isalpha (name[0])) { - g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, + g_set_error (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Not a valid protocol name because first character " "is not an ASCII letter: %s", name); return FALSE; @@ -2064,7 +2064,7 @@ tp_connection_manager_check_valid_protocol_name (const gchar *name, { if (!g_ascii_isalnum (*name_char) && *name_char != '-') { - g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, + g_set_error (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Not a valid protocol name because character '%c' " "is not an ASCII letter, digit or hyphen/minus: %s", *name_char, name); |