diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-07 17:10:17 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-09 19:54:17 +0800 |
| commit | 5cdb08a0601008eb6fa3402d7a34406e358ccdf7 (patch) | |
| tree | d9dbe02d4fbc841e267279fd74b3d504f2b8b2e0 /src | |
| parent | 689ad874fb13b6485e7f7c3a1c93bfb8e50b34e9 (diff) | |
| download | gsoc2013-empathy-5cdb08a0601008eb6fa3402d7a34406e358ccdf7.tar gsoc2013-empathy-5cdb08a0601008eb6fa3402d7a34406e358ccdf7.tar.gz gsoc2013-empathy-5cdb08a0601008eb6fa3402d7a34406e358ccdf7.tar.bz2 gsoc2013-empathy-5cdb08a0601008eb6fa3402d7a34406e358ccdf7.tar.lz gsoc2013-empathy-5cdb08a0601008eb6fa3402d7a34406e358ccdf7.tar.xz gsoc2013-empathy-5cdb08a0601008eb6fa3402d7a34406e358ccdf7.tar.zst gsoc2013-empathy-5cdb08a0601008eb6fa3402d7a34406e358ccdf7.zip | |
Use TP_ERROR instead of TP_ERRORS
The latter has been deprecated in tp-glib master.
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-call-factory.c | 2 | ||||
| -rw-r--r-- | src/empathy-call-observer.c | 2 | ||||
| -rw-r--r-- | src/empathy-event-manager.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c index 95c828d94..783c44e95 100644 --- a/src/empathy-call-factory.c +++ b/src/empathy-call-factory.c @@ -268,7 +268,7 @@ approve_channels (TpBaseClient *client, EmpathyCallFactory *self = EMPATHY_CALL_FACTORY (client); TpCallChannel *channel; guint handle; - GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "" }; + GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "" }; gboolean handled = FALSE; channel = find_call_channel (channels); diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c index 2019cd02f..35ceeb046 100644 --- a/src/empathy-call-observer.c +++ b/src/empathy-call-observer.c @@ -252,7 +252,7 @@ observe_channels (TpSimpleObserver *observer, channel = find_main_channel (channels); if (channel == NULL) { - GError err = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, + GError err = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Unknown channel type" }; DEBUG ("Didn't find any Call or StreamedMedia channel; ignoring"); diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index c6b3e29ed..33854974b 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -294,7 +294,7 @@ handle_with_time_cb (GObject *source, if (!tp_channel_dispatch_operation_handle_with_time_finish (cdo, result, &error)) { - if (g_error_matches (error, TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED)) + if (g_error_matches (error, TP_ERROR, TP_ERROR_NOT_IMPLEMENTED)) { EventManagerApproval *approval = user_data; @@ -1011,7 +1011,7 @@ approve_channels (TpSimpleApprover *approver, channel = find_main_channel (channels); if (channel == NULL) { - GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, + GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Unknown channel type" }; DEBUG ("Failed to find the main channel; ignoring"); @@ -1148,7 +1148,7 @@ approve_channels (TpSimpleApprover *approver, } else { - GError error = { TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED, + GError error = { TP_ERROR, TP_ERROR_NOT_IMPLEMENTED, "Support only X-TELEPATHY-PASSWORD auth method" }; tp_add_dispatch_operation_context_fail (context, &error); @@ -1157,7 +1157,7 @@ approve_channels (TpSimpleApprover *approver, } else { - GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, + GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Invalid channel type" }; DEBUG ("Unknown channel type (%s), ignoring..", |