[network-manager-netbook: 3/3] Merge branch 'wireless-dialogs'.

[Tambet Ingo <tambeti src gnome org>]

commit 0b60d2bb34a1556e66a7a789178dbf2f660278d5
Merge: 7f9f8dd... ff8b2ca...
Author: Tambet Ingo <tambet gmail com>
Date:   Thu Jul 23 11:58:58 2009 +0300

    Merge branch 'wireless-dialogs'.
    
    Conflicts:
    	src/wireless-security.ui

 src/main.c                                |    8 +
 src/wireless-dialog.c                     |   12 +-
 src/wireless-security.ui                  | 1413 -----------------------------
 src/wireless-security/Makefile.am         |   17 +-
 src/wireless-security/ca-nag-dialog.ui    |  191 ++++
 src/wireless-security/dynamic-wep.ui      |   85 ++
 src/wireless-security/eap-leap.ui         |  102 +++
 src/wireless-security/eap-method-leap.c   |   23 +-
 src/wireless-security/eap-method-leap.h   |    3 +-
 src/wireless-security/eap-method-peap.c   |   45 +-
 src/wireless-security/eap-method-peap.h   |    3 +-
 src/wireless-security/eap-method-simple.c |   24 +-
 src/wireless-security/eap-method-simple.h |    3 +-
 src/wireless-security/eap-method-tls.c    |   29 +-
 src/wireless-security/eap-method-tls.h    |    3 +-
 src/wireless-security/eap-method-ttls.c   |   47 +-
 src/wireless-security/eap-method-ttls.h   |    3 +-
 src/wireless-security/eap-method.c        |   80 ++-
 src/wireless-security/eap-method.h        |   16 +-
 src/wireless-security/eap-peap.ui         |  188 ++++
 src/wireless-security/eap-simple.ui       |  102 +++
 src/wireless-security/eap-tls.ui          |  180 ++++
 src/wireless-security/eap-ttls.ui         |  138 +++
 src/wireless-security/leap.ui             |  102 +++
 src/wireless-security/wep-key.ui          |  185 ++++
 src/wireless-security/wireless-security.c |   44 +-
 src/wireless-security/wireless-security.h |   15 +-
 src/wireless-security/wpa-eap.ui          |   85 ++
 src/wireless-security/wpa-psk.ui          |  112 +++
 src/wireless-security/ws-dynamic-wep.c    |   22 +-
 src/wireless-security/ws-dynamic-wep.h    |    3 +-
 src/wireless-security/ws-leap.c           |   23 +-
 src/wireless-security/ws-leap.h           |    3 +-
 src/wireless-security/ws-wep-key.c        |   23 +-
 src/wireless-security/ws-wep-key.h        |    3 +-
 src/wireless-security/ws-wpa-eap.c        |   22 +-
 src/wireless-security/ws-wpa-eap.h        |    3 +-
 src/wireless-security/ws-wpa-psk.c        |   23 +-
 src/wireless-security/ws-wpa-psk.h        |    3 +-
 39 files changed, 1712 insertions(+), 1674 deletions(-)
---