diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-01 21:21:29 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-01 21:21:29 +0800 |
| commit | 0a41b6b31705626c71047261b91afdac711dead7 (patch) | |
| tree | e51c864f00c5966a5bcb903d2b4c35324bf968b7 /src/empathy.c | |
| parent | a980a2b3eaa634981b0ebfe950f50b515e43cf4a (diff) | |
| parent | 1a74f07d19bdbdbf0aa62587343b64f636ec7b20 (diff) | |
| download | gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.gz gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.bz2 gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.lz gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.xz gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.tar.zst gsoc2013-empathy-0a41b6b31705626c71047261b91afdac711dead7.zip | |
Merge branch 'empathy-account'
Diffstat (limited to 'src/empathy.c')
| -rw-r--r-- | src/empathy.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/empathy.c b/src/empathy.c index 85124d1e9..40626b532 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -40,7 +40,6 @@ #include <telepathy-glib/dbus.h> #include <telepathy-glib/util.h> -#include <libmissioncontrol/mc-account.h> #include <libmissioncontrol/mission-control.h> #include <libempathy/empathy-idle.h> @@ -107,7 +106,7 @@ dispatch_cb (EmpathyDispatcher *dispatcher, if (id) { EmpathyAccountManager *manager; TpConnection *connection; - McAccount *account; + EmpathyAccount *account; manager = empathy_account_manager_dup_singleton (); connection = empathy_tp_chat_get_connection (tp_chat); @@ -227,7 +226,8 @@ create_salut_account (void) McProfile *profile; McProtocol *protocol; gboolean salut_created = FALSE; - McAccount *account; + EmpathyAccount *account; + EmpathyAccountManager *account_manager; GList *accounts; EBook *book; EContact *contact; @@ -284,8 +284,10 @@ create_salut_account (void) return; } - account = mc_account_create (profile); - mc_account_set_display_name (account, _("People nearby")); + account_manager = empathy_account_manager_dup_singleton (); + account = empathy_account_manager_create (account_manager, profile); + empathy_account_set_display_name (account, _("People nearby")); + g_object_unref (account_manager); nickname = e_contact_get (contact, E_CONTACT_NICKNAME); first_name = e_contact_get (contact, E_CONTACT_GIVEN_NAME); @@ -302,11 +304,11 @@ create_salut_account (void) "last-name=%s\nemail=%s\njid=%s\n", nickname, first_name, last_name, email, jid); - mc_account_set_param_string (account, "nickname", nickname ? nickname : ""); - mc_account_set_param_string (account, "first-name", first_name ? first_name : ""); - mc_account_set_param_string (account, "last-name", last_name ? last_name : ""); - mc_account_set_param_string (account, "email", email ? email : ""); - mc_account_set_param_string (account, "jid", jid ? jid : ""); + empathy_account_set_param_string (account, "nickname", nickname ? nickname : ""); + empathy_account_set_param_string (account, "first-name", first_name ? first_name : ""); + empathy_account_set_param_string (account, "last-name", last_name ? last_name : ""); + empathy_account_set_param_string (account, "email", email ? email : ""); + empathy_account_set_param_string (account, "jid", jid ? jid : ""); g_free (nickname); g_free (first_name); |