[network-manager-applet/polkit1: 42/42] Merge commit 'origin/master' into polkit1

[Dan Williams <dcbw src gnome org>]

commit 279bbcb0e1f453c80d4fe55accf6b3380c66900e
Merge: 0282bb3... 82452d7...
Author: Dan Williams <dcbw redhat com>
Date:   Sat Aug 22 11:11:02 2009 -0500

    Merge commit 'origin/master' into polkit1

 configure.ac                                   |    2 +-
 po/LINGUAS                                     |    4 +
 po/POTFILES.in                                 |    4 +
 po/be.po                                       | 2183 +++++++++++++++++++++++
 po/de.po                                       | 1050 +++++++-----
 po/es.po                                       |  385 +++--
 po/et.po                                       |  151 +--
 po/hu.po                                       | 1191 ++++++++------
 po/it.po                                       | 1271 +++++++++-----
 po/kn.po                                       | 2013 ++++++++++++++++++++++
 po/lt.po                                       | 1225 +++++++++-----
 po/ml.po                                       | 2191 ++++++++++++++++++++++++
 po/nb.po                                       |  408 +++--
 po/pa.po                                       |  312 ++--
 po/ru.po                                       | 1087 +++++++-----
 po/sv.po                                       |  407 +++--
 po/ta.po                                       |  150 ++-
 po/te.po                                       | 2168 +++++++++++++++++++++++
 po/vi.po                                       |  263 ++--
 src/applet.glade                               |    2 +-
 src/connection-editor/Makefile.am              |    5 +
 src/connection-editor/ce-page-ip6.glade        |  456 +++++
 src/connection-editor/ip4-routes-dialog.c      |    2 +-
 src/connection-editor/ip6-routes-dialog.c      |  617 +++++++
 src/connection-editor/ip6-routes-dialog.h      |   35 +
 src/connection-editor/nm-connection-editor.c   |    6 +
 src/connection-editor/page-ip4.c               |    2 +-
 src/connection-editor/page-ip6.c               |  883 ++++++++++
 src/connection-editor/page-ip6.h               |   53 +
 src/connection-editor/page-wireless-security.c |    4 +-
 src/gconf-helpers/gconf-helpers.c              |  493 ++++++
 src/gconf-helpers/gconf-helpers.h              |   42 +
 src/gnome-bluetooth/Makefile.am                |    2 +-
 src/gnome-bluetooth/network-manager-applet.c   |    2 +-
 src/wireless-dialog.c                          |   67 +-
 src/wireless-security/eap-method-leap.c        |    3 +-
 src/wireless-security/eap-method-peap.c        |   43 +-
 src/wireless-security/eap-method-simple.c      |    6 +-
 src/wireless-security/eap-method-simple.h      |    1 +
 src/wireless-security/eap-method-tls.c         |    3 +-
 src/wireless-security/eap-method-ttls.c        |    5 +-
 src/wireless-security/eap-method.c             |    4 +-
 src/wireless-security/eap-method.h             |    4 +-
 src/wireless-security/wireless-security.c      |   12 +-
 src/wireless-security/wireless-security.h      |    4 +-
 src/wireless-security/ws-dynamic-wep.c         |    3 +-
 src/wireless-security/ws-leap.c                |    3 +-
 src/wireless-security/ws-wep-key.c             |   19 +-
 src/wireless-security/ws-wep-key.h             |    3 +-
 src/wireless-security/ws-wpa-eap.c             |    3 +-
 src/wireless-security/ws-wpa-psk.c             |    4 +-
 51 files changed, 16006 insertions(+), 3250 deletions(-)
---
diff --cc src/connection-editor/Makefile.am
index 465d748,3eea3ee..1e503f7
--- a/src/connection-editor/Makefile.am
+++ b/src/connection-editor/Makefile.am
@@@ -46,8 -54,12 +48,10 @@@ nm_connection_editor_SOURCES = 
  	vpn-helpers.c \
  	ip4-routes-dialog.h \
  	ip4-routes-dialog.c \
+ 	ip6-routes-dialog.h \
+ 	ip6-routes-dialog.c \
  	ppp-auth-methods-dialog.c \
 -	ppp-auth-methods-dialog.h \
 -	polkit-helpers.c \
 -	polkit-helpers.h
 +	ppp-auth-methods-dialog.h
  
  nm-connection-editor-service-glue.h: $(top_srcdir)/src/connection-editor/nm-connection-editor-service.xml
  	dbus-binding-tool --prefix=nm_connection_editor_service --mode=glib-server --output=$@ $<
diff --cc src/connection-editor/nm-connection-editor.c
index 6ce6601,90135b5..3f5d3c5
--- a/src/connection-editor/nm-connection-editor.c
+++ b/src/connection-editor/nm-connection-editor.c
@@@ -40,8 -40,15 +40,9 @@@
  #include <gdk/gdkx.h>
  #include <glib/gi18n.h>
  
 -#ifdef NO_POLKIT_GNOME
 -#include "polkit-gnome.h"
 -#else
 -#include <polkit-gnome/polkit-gnome.h>
 -#endif
 -
  #include <nm-setting-connection.h>
  #include <nm-setting-ip4-config.h>
+ #include <nm-setting-ip6-config.h>
  #include <nm-setting-wired.h>
  #include <nm-setting-8021x.h>
  #include <nm-setting-wireless.h>