aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-05-07 17:10:17 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-05-07 17:10:17 +0800
commitd0193ecc58b6eab69b4c4d3c9667c50bfc033b49 (patch)
tree7de875e06499adace751f64d27b16d614a009f84
parent9923159863e58051f64cc7a60b3fa16184526db8 (diff)
downloadgsoc2013-empathy-d0193ecc58b6eab69b4c4d3c9667c50bfc033b49.tar
gsoc2013-empathy-d0193ecc58b6eab69b4c4d3c9667c50bfc033b49.tar.gz
gsoc2013-empathy-d0193ecc58b6eab69b4c4d3c9667c50bfc033b49.tar.bz2
gsoc2013-empathy-d0193ecc58b6eab69b4c4d3c9667c50bfc033b49.tar.lz
gsoc2013-empathy-d0193ecc58b6eab69b4c4d3c9667c50bfc033b49.tar.xz
gsoc2013-empathy-d0193ecc58b6eab69b4c4d3c9667c50bfc033b49.tar.zst
gsoc2013-empathy-d0193ecc58b6eab69b4c4d3c9667c50bfc033b49.zip
Use TP_ERROR instead of TP_ERRORS
The latter has been deprecated in tp-glib master.
-rw-r--r--libempathy-gtk/empathy-chat.c4
-rw-r--r--libempathy-gtk/empathy-contact-blocking-dialog.c2
-rw-r--r--libempathy/empathy-tp-chat.c2
-rw-r--r--libempathy/empathy-tp-contact-factory.c2
-rw-r--r--src/empathy-call-factory.c2
-rw-r--r--src/empathy-call-observer.c2
-rw-r--r--src/empathy-event-manager.c8
7 files changed, 11 insertions, 11 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 4067a3e4f..b2224c2db 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -3699,7 +3699,7 @@ provide_password_cb (GObject *tp_chat,
DEBUG ("error: %s", error->message);
/* FIXME: what should we do if that's another error? Close the channel?
* Display the raw D-Bus error to the user isn't very useful */
- if (g_error_matches (error, TP_ERRORS, TP_ERROR_AUTHENTICATION_FAILED)) {
+ if (g_error_matches (error, TP_ERROR, TP_ERROR_AUTHENTICATION_FAILED)) {
/* entry */
gtk_entry_set_text (GTK_ENTRY (data->entry), "");
gtk_widget_set_sensitive (data->entry, TRUE);
@@ -3926,7 +3926,7 @@ provide_saved_password_cb (GObject *tp_chat,
DEBUG ("error: %s", error->message);
/* FIXME: what should we do if that's another error? Close the channel?
* Display the raw D-Bus error to the user isn't very useful */
- if (g_error_matches (error, TP_ERRORS, TP_ERROR_AUTHENTICATION_FAILED)) {
+ if (g_error_matches (error, TP_ERROR, TP_ERROR_AUTHENTICATION_FAILED)) {
display_password_info_bar (self);
gtk_widget_set_sensitive (priv->hpaned, FALSE);
}
diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c
index 415aee0b2..f22da44d7 100644
--- a/libempathy-gtk/empathy-contact-blocking-dialog.c
+++ b/libempathy-gtk/empathy-contact-blocking-dialog.c
@@ -256,7 +256,7 @@ contact_blocking_dialog_set_error (EmpathyContactBlockingDialog *self,
{
const char *msg = NULL;
- if (error->domain == TP_ERRORS)
+ if (error->domain == TP_ERROR)
{
if (error->code == TP_ERROR_INVALID_HANDLE)
msg = _("Unknown or invalid identifier");
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 390f9a533..b35290cde 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -494,7 +494,7 @@ message_sent_cb (TpTextChannel *channel,
static TpChannelTextSendError
error_to_text_send_error (GError *error)
{
- if (error->domain != TP_ERRORS)
+ if (error->domain != TP_ERROR)
return TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN;
switch (error->code)
diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c
index 681c882ee..111e3190a 100644
--- a/libempathy/empathy-tp-contact-factory.c
+++ b/libempathy/empathy-tp-contact-factory.c
@@ -298,7 +298,7 @@ get_contact_by_handle_cb (TpConnection *connection,
* so the caller of empathy_tp_contact_factory_get_from_handle can
* rely on the error to check if the operation succeeded or not. */
- err = g_error_new_literal (TP_ERRORS, TP_ERROR_INVALID_HANDLE,
+ err = g_error_new_literal (TP_ERROR, TP_ERROR_INVALID_HANDLE,
"handle is invalid");
}
else {
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 b3465cea1..935941de3 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -293,7 +293,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;
@@ -931,7 +931,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");
@@ -1041,7 +1041,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);
@@ -1050,7 +1050,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..",