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 /libempathy-gtk | |
| 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 '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 14404bfe3..e6019f821 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -3700,7 +3700,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); @@ -3927,7 +3927,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"); |