[empathy: 65/65] Merge branch 'tls-connection'

[Cosimo Cecchi <cosimoc src gnome org>]

commit 3bd33b4812d0b909a8a44b12791fcac75fcf365d
Merge: 180d834 dc73f3d
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Aug 24 15:24:38 2010 +0200

    Merge branch 'tls-connection'

 configure.ac                                       |    5 +-
 data/Empathy.Auth.client                           |    6 +
 data/Makefile.am                                   |    9 +-
 ...esktop.Telepathy.Client.Empathy.Auth.service.in |    3 +
 extensions/Authentication_TLS_Certificate.xml      |  304 ++++++++
 extensions/Channel_Type_Server_TLS_Connection.xml  |   69 ++
 extensions/Makefile.am                             |    2 +
 extensions/misc.xml                                |    2 +
 libempathy-gtk/Makefile.am                         |    4 +
 libempathy-gtk/empathy-tls-dialog.c                |  367 ++++++++++
 libempathy-gtk/empathy-tls-dialog.h                |   69 ++
 libempathy-gtk/gcr-simple-certificate.c            |  134 ++++
 libempathy-gtk/gcr-simple-certificate.h            |   61 ++
 libempathy/Makefile.am                             |    8 +
 libempathy/empathy-auth-factory.c                  |  251 +++++++
 libempathy/empathy-auth-factory.h                  |   66 ++
 libempathy/empathy-debug.c                         |    1 +
 libempathy/empathy-debug.h                         |    1 +
 libempathy/empathy-server-tls-handler.c            |  290 ++++++++
 libempathy/empathy-server-tls-handler.h            |   73 ++
 libempathy/empathy-tls-certificate.c               |  537 ++++++++++++++
 libempathy/empathy-tls-certificate.h               |   95 +++
 libempathy/empathy-tls-verifier.c                  |  737 ++++++++++++++++++++
 libempathy/empathy-tls-verifier.h                  |   79 +++
 libempathy/empathy-utils.c                         |   15 +-
 libempathy/empathy-utils.h                         |    3 +-
 po/POTFILES.in                                     |    2 +
 src/Makefile.am                                    |    6 +-
 src/empathy-accounts-dialog.c                      |    4 +-
 src/empathy-auth-client.c                          |  268 +++++++
 src/empathy-main-window.c                          |   11 +-
 31 files changed, 3472 insertions(+), 10 deletions(-)
---