[empathy: 27/27] Merge branch 'sasl'

From: Jonny Lamb <jonnylamb src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 27/27] Merge branch 'sasl'
Date: Tue, 7 Dec 2010 11:58:17 +0000 (UTC)

commit 6c5839c976407292715daf22cdddf6aca469fa75
Merge: 9d40a77 eb3f7d2
Author: Jonny Lamb <jonnylamb gnome org>
Date:   Tue Dec 7 11:54:33 2010 +0000

    Merge branch 'sasl'

 configure.ac                             |    2 +-
 data/Empathy.Auth.client                 |    4 +
 libempathy-gtk/Makefile.am               |    2 +
 libempathy-gtk/empathy-password-dialog.c |  325 +++++++++++++++++++++
 libempathy-gtk/empathy-password-dialog.h |   66 +++++
 libempathy/Makefile.am                   |    4 +
 libempathy/empathy-auth-factory.c        |  139 ++++++++-
 libempathy/empathy-debug.c               |    1 +
 libempathy/empathy-debug.h               |    1 +
 libempathy/empathy-keyring.c             |  283 ++++++++++++++++++
 libempathy/empathy-keyring.h             |   50 ++++
 libempathy/empathy-server-sasl-handler.c |  459 ++++++++++++++++++++++++++++++
 libempathy/empathy-server-sasl-handler.h |   82 ++++++
 po/POTFILES.in                           |    1 +
 src/empathy-auth-client.c                |   27 ++-
 15 files changed, 1431 insertions(+), 15 deletions(-)
---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]