From d723e8d4ed1e96c889d139a0f8c4cca117137c4a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 2 Mar 2010 16:13:22 -0600 Subject: Creating a field for the user that has the real name in it, and a place for that to conflict. --- src/session-service.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/session-service.c') diff --git a/src/session-service.c b/src/session-service.c index 5746f7d..21c5b8b 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -406,7 +406,15 @@ compare_users_by_username (const gchar *a, UserData *user1 = (UserData *)a; UserData *user2 = (UserData *)b; - return g_strcmp0 (user1->real_name, user2->real_name); + gint retval = g_strcmp0 (user1->real_name, user2->real_name); + + /* If they're the same, they're both in conflict. */ + if (retval == 0) { + user1->real_name_conflict = TRUE; + user2->real_name_conflict = TRUE; + } + + return retval; } /* Builds up the menu for us */ -- cgit v1.2.3