diff options
| author | Jonny Lamb <jonnylamb@gnome.org> | 2009-11-02 18:41:20 +0800 |
|---|---|---|
| committer | Jonny Lamb <jonnylamb@gnome.org> | 2009-11-02 18:41:20 +0800 |
| commit | 8c4fe70aad3622138957c49732fa612b1e2e9eb7 (patch) | |
| tree | 2f80938787489bc774bf8849a14a2ad24354f978 /libempathy-gtk/empathy-contact-dialogs.c | |
| parent | 1b4acf8fcf47d928f525a4640f27323e13fd25ea (diff) | |
| parent | b6bb173fe0840ec0857a145e265853e2a9083ee6 (diff) | |
| download | gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.tar gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.tar.gz gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.tar.bz2 gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.tar.lz gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.tar.xz gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.tar.zst gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.zip | |
Merge branch 'accountz'
Diffstat (limited to 'libempathy-gtk/empathy-contact-dialogs.c')
| -rw-r--r-- | libempathy-gtk/empathy-contact-dialogs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c index 6c15dd876..b7108d8f3 100644 --- a/libempathy-gtk/empathy-contact-dialogs.c +++ b/libempathy-gtk/empathy-contact-dialogs.c @@ -27,8 +27,9 @@ #include <gtk/gtk.h> #include <glib/gi18n-lib.h> +#include <telepathy-glib/account-manager.h> + #include <libempathy/empathy-contact-manager.h> -#include <libempathy/empathy-account-manager.h> #include <libempathy/empathy-contact-list.h> #include <libempathy/empathy-utils.h> @@ -327,14 +328,14 @@ empathy_contact_personal_dialog_show (GtkWindow *parent) */ static gboolean -can_add_contact_to_account (EmpathyAccount *account, +can_add_contact_to_account (TpAccount *account, gpointer user_data) { EmpathyContactManager *contact_manager; TpConnection *connection; gboolean result; - connection = empathy_account_get_connection (account); + connection = tp_account_get_connection (account); if (connection == NULL) return FALSE; |