[network-manager-applet: 19/21] Merge commit 'origin/polkit1'

[Dan Williams <dcbw src gnome org>]

commit ff4b29716cb3dd6879c7fd8c17e2ee8a38a4a896
Merge: 5c98daf... 968616c...
Author: Dan Williams <dcbw redhat com>
Date:   Wed Aug 26 13:11:13 2009 -0500

    Merge commit 'origin/polkit1'

 configure.ac                                     |   64 +-
 src/Makefile.am                                  |    2 +-
 src/applet-device-cdma.c                         |   74 +-
 src/applet-device-gsm.c                          |   72 +-
 src/applet-device-wifi.c                         |  137 +-
 src/applet-device-wired.c                        |  154 +-
 src/applet.c                                     |  166 +-
 src/applet.h                                     |   13 +-
 src/connection-editor/Makefile.am                |   18 +-
 src/connection-editor/ce-page.c                  |  154 +--
 src/connection-editor/ce-polkit-button.c         |  260 +++
 src/connection-editor/ce-polkit-button.h         |   69 +
 src/connection-editor/nm-connection-editor.c     |  320 ++--
 src/connection-editor/nm-connection-editor.glade |    2 +-
 src/connection-editor/nm-connection-editor.h     |   12 +-
 src/connection-editor/nm-connection-list.c       | 1066 ++++-------
 src/connection-editor/nm-connection-list.h       |   13 +-
 src/connection-editor/page-wired-security.c      |    4 +-
 src/connection-editor/polkit-helpers.c           |   86 -
 src/connection-editor/polkit-helpers.h           |   41 -
 src/gconf-helpers/gconf-helpers.c                |   33 +-
 src/gconf-helpers/gconf-helpers.h                |   10 +-
 src/gconf-helpers/nma-gconf-connection.c         |  612 ++++---
 src/gconf-helpers/nma-gconf-connection.h         |   21 +-
 src/gconf-helpers/nma-gconf-settings.c           |  195 +-
 src/gconf-helpers/nma-gconf-settings.h           |   32 +-
 src/gnome-bluetooth/network-manager-applet.c     |   63 +-
 src/marshallers/nma-marshal.list                 |    4 +-
 src/polkit-helpers/Makefile.am                   |   25 -
 src/polkit-helpers/README                        |   24 -
 src/polkit-helpers/polkit-gnome-action.c         | 2093 ----------------------
 src/polkit-helpers/polkit-gnome-action.h         |   92 -
 src/polkit-helpers/polkit-gnome-auth.c           |  165 --
 src/polkit-helpers/polkit-gnome-auth.h           |   51 -
 src/polkit-helpers/polkit-gnome-context.c        |  289 ---
 src/polkit-helpers/polkit-gnome-context.h        |  108 --
 src/polkit-helpers/polkit-gnome.h                |   36 -
 src/utils/utils.c                                |   31 +-
 src/vpn-password-dialog.c                        |   31 +-
 src/vpn-password-dialog.h                        |    8 +-
 src/wired-dialog.c                               |   10 +-
 src/wired-dialog.h                               |    5 +-
 src/wireless-dialog.c                            |   22 +-
 src/wireless-security/helpers.c                  |   25 +-
 src/wireless-security/ws-wep-key.c               |   41 +-
 45 files changed, 1868 insertions(+), 4885 deletions(-)
---