diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2007-12-03 06:38:02 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-12-03 06:38:02 +0800 |
| commit | 7bf5562a19ecac3c59dc23ebe507112e2745b635 (patch) | |
| tree | 9fccd6613f968d0fc40b518399d7858cb3c609fe /src | |
| parent | d54baf1615b3d019878f7dac66303de77737a6f0 (diff) | |
| download | gsoc2013-empathy-7bf5562a19ecac3c59dc23ebe507112e2745b635.tar gsoc2013-empathy-7bf5562a19ecac3c59dc23ebe507112e2745b635.tar.gz gsoc2013-empathy-7bf5562a19ecac3c59dc23ebe507112e2745b635.tar.bz2 gsoc2013-empathy-7bf5562a19ecac3c59dc23ebe507112e2745b635.tar.lz gsoc2013-empathy-7bf5562a19ecac3c59dc23ebe507112e2745b635.tar.xz gsoc2013-empathy-7bf5562a19ecac3c59dc23ebe507112e2745b635.tar.zst gsoc2013-empathy-7bf5562a19ecac3c59dc23ebe507112e2745b635.zip | |
Conflicts:
ChangeLog
svn path=/trunk/; revision=455
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/empathy.c b/src/empathy.c index fef01b808..cbb81931f 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -31,6 +31,7 @@ #include <libebook/e-book.h> #include <libgnomevfs/gnome-vfs.h> +#include <telepathy-glib/util.h> #include <libmissioncontrol/mc-account.h> #include <libmissioncontrol/mc-account-monitor.h> #include <libmissioncontrol/mission-control.h> @@ -157,7 +158,7 @@ create_salut_account (void) email = e_contact_get (contact, E_CONTACT_EMAIL_1); jid = e_contact_get (contact, E_CONTACT_IM_JABBER_HOME_1); - if (G_STR_EMPTY (nickname) || !empathy_strdiff (nickname, "nickname")) { + if (G_STR_EMPTY (nickname) || !tp_strdiff (nickname, "nickname")) { g_free (nickname); nickname = g_strdup (g_get_user_name ()); } |