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-07 17:10:17 +0800 |
| commit | d0193ecc58b6eab69b4c4d3c9667c50bfc033b49 (patch) | |
| tree | 7de875e06499adace751f64d27b16d614a009f84 /libempathy-gtk | |
| parent | 9923159863e58051f64cc7a60b3fa16184526db8 (diff) | |
| download | gsoc2013-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.
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 4 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contact-blocking-dialog.c | 2 |
2 files changed, 3 insertions, 3 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"); |