Merge branch 'debugger'

[empathy.git] / src / empathy.c

diff --git a/src/empathy.c b/src/empathy.c
index fc6b5118c6ca064df0c126621a7cb2440bfe334f..85124d1e9156056ed813130780a670dd6bd61552 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -286,13 +286,13 @@ create_salut_account (void)
 
        account = mc_account_create (profile);
        mc_account_set_display_name (account, _("People nearby"));
 
        account = mc_account_create (profile);
        mc_account_set_display_name (account, _("People nearby"));

-       
+

        nickname = e_contact_get (contact, E_CONTACT_NICKNAME);
        first_name = e_contact_get (contact, E_CONTACT_GIVEN_NAME);
        last_name = e_contact_get (contact, E_CONTACT_FAMILY_NAME);
        email = e_contact_get (contact, E_CONTACT_EMAIL_1);
        jid = e_contact_get (contact, E_CONTACT_IM_JABBER_HOME_1);
        nickname = e_contact_get (contact, E_CONTACT_NICKNAME);
        first_name = e_contact_get (contact, E_CONTACT_GIVEN_NAME);
        last_name = e_contact_get (contact, E_CONTACT_FAMILY_NAME);
        email = e_contact_get (contact, E_CONTACT_EMAIL_1);
        jid = e_contact_get (contact, E_CONTACT_IM_JABBER_HOME_1);

-       
+

        if (!tp_strdiff (nickname, "nickname")) {
                g_free (nickname);
                nickname = NULL;
        if (!tp_strdiff (nickname, "nickname")) {
                g_free (nickname);
                nickname = NULL;


@@ -634,7 +634,7 @@ main (int argc, char *argv[])
                        (idle), TP_CONNECTION_PRESENCE_TYPE_OFFLINE) <= 0) {
                empathy_idle_set_state (idle, MC_PRESENCE_AVAILABLE);
        }
                        (idle), TP_CONNECTION_PRESENCE_TYPE_OFFLINE) <= 0) {
                empathy_idle_set_state (idle, MC_PRESENCE_AVAILABLE);
        }

-       
+

        create_salut_account ();
 
        /* Setting up UI */
        create_salut_account ();
 
        /* Setting up UI */