From 7bf5562a19ecac3c59dc23ebe507112e2745b635 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xclaesse@src.gnome.org>
Date: Sun, 2 Dec 2007 22:38:02 +0000
Subject: Conflicts:

	ChangeLog

svn path=/trunk/; revision=455
---
 src/empathy.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

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 ());
 	}
-- 
cgit v1.2.3