[network-manager-applet/rm-userset: 46/46] Merge remote branch 'origin/master' into rm-userset

[Dan Williams <dcbw src gnome org>]

commit 10f899c06adc3919772ec787cab86dc11c7cfb80
Merge: ec68a99 ff01aae
Author: Dan Williams <dcbw redhat com>
Date:   Thu Jan 27 11:04:21 2011 -0600

    Merge remote branch 'origin/master' into rm-userset

 configure.ac              |   12 +-
 po/POTFILES.in            |    1 +
 po/ar.po                  | 1816 +++++++++++++++------------
 po/ca.po                  | 2700 +++++++++++++++++++++++++--------------
 po/cs.po                  |  153 ++-
 po/de.po                  |  309 +++--
 po/es.po                  |  312 +++--
 po/et.po                  |  119 ++-
 po/fr.po                  | 1452 +++++++++++----------
 po/gl.po                  | 1965 ++++++++++++++++-------------
 po/he.po                  | 1574 +++++++++++++----------
 po/id.po                  | 1952 +++++++++++++++--------------
 po/nb.po                  | 1656 +++++++++++++-----------
 po/pa.po                  |  455 ++++---
 po/sk.po                  | 3095 ++++++++++++++++++++++++++++++++-------------
 po/sl.po                  |  372 ++++--
 po/sv.po                  | 1691 ++++++++++++++-----------
 po/zh_CN.po               | 1793 +++++++++++++++-----------
 po/zh_HK.po               | 2896 +++++++++++++++++++++++++-----------------
 po/zh_TW.po               | 1939 ++++++++++++++++------------
 src/Makefile.am           |    5 +-
 src/ap-menu-item.c        |    1 +
 src/applet-device-wimax.c |  528 ++++++++
 src/applet-device-wimax.h |   32 +
 src/applet-dialogs.c      |  142 ++-
 src/applet.c              |  322 +++--
 src/applet.h              |    4 +
 src/fallback-icon.h       |  119 ++
 src/mb-menu-item.c        |   23 +-
 src/mobile-helpers.c      |   13 +-
 src/mobile-helpers.h      |    1 +
 src/utils/mobile-wizard.c |    8 +-
 src/utils/utils.c         |   44 +
 33 files changed, 16614 insertions(+), 10890 deletions(-)
---
diff --cc src/applet.c
index 7d3bd5e,928b07f..34b77e8
--- a/src/applet.c
+++ b/src/applet.c
@@@ -73,8 -64,10 +74,9 @@@
  #include "applet-device-gsm.h"
  #include "applet-device-cdma.h"
  #include "applet-device-bt.h"
+ #include "applet-device-wimax.h"
  #include "applet-dialogs.h"
 -#include "vpn-password-dialog.h"
 -#include "applet-dbus-manager.h"
 +#include "applet-vpn-request.h"
  #include "utils.h"
  #include "gconf-helpers.h"
  
@@@ -900,9 -915,13 +924,9 @@@ vpn_connection_state_changed (NMVPNConn
  			msg = g_strdup ("VPN connection has been successfully established.\n");
  
  		title = _("VPN Login Message");
- 		applet_do_notify (applet, NOTIFY_URGENCY_LOW, title, msg,
- 		                  "gnome-lockscreen", NULL, NULL, NULL, NULL);
+ 		applet_do_notify_with_pref (applet, title, msg, "gnome-lockscreen",
+ 		                            PREF_DISABLE_VPN_NOTIFICATIONS);
  		g_free (msg);
 -
 -		connection = applet_get_connection_for_active (applet, NM_ACTIVE_CONNECTION (vpn));
 -		if (connection)
 -			update_connection_timestamp (NM_ACTIVE_CONNECTION (vpn), connection, applet);
  		break;
  	case NM_VPN_CONNECTION_STATE_FAILED:
  		title = _("VPN Connection Failed");
@@@ -2223,6 -2276,8 +2257,7 @@@ foo_client_setup (NMApplet *applet
  	applet->permissions[NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK] = nm_client_get_permission_result (applet->nm_client, NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK);
  	applet->permissions[NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI] = nm_client_get_permission_result (applet->nm_client, NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI);
  	applet->permissions[NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN] = nm_client_get_permission_result (applet->nm_client, NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN);
+ 	applet->permissions[NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX] = nm_client_get_permission_result (applet->nm_client, NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX);
 -	applet->permissions[NM_CLIENT_PERMISSION_USE_USER_CONNECTIONS] = nm_client_get_permission_result (applet->nm_client, NM_CLIENT_PERMISSION_USE_USER_CONNECTIONS);
  
  	if (nm_client_get_manager_running (applet->nm_client))
  		g_idle_add (foo_set_initial_state, applet);
@@@ -3122,9 -3156,16 +3181,12 @@@ constructor (GType type
  	applet->bt_class = applet_device_bt_get_class (applet);
  	g_assert (applet->bt_class);
  
+ 	applet->wimax_class = applet_device_wimax_get_class (applet);
+ 	g_assert (applet->wimax_class);
+ 
  	foo_client_setup (applet);
  
 -	/* timeout to update connection timestamps every 5 minutes */
 -	applet->update_timestamps_id = g_timeout_add_seconds (300,
 -			(GSourceFunc) periodic_update_active_connection_timestamps, applet);
 -
 -	nm_gconf_set_pre_keyring_callback (applet_pre_keyring_callback, applet);
 +	applet_set_pre_keyring_callback (applet_pre_keyring_callback, applet);
  
  	/* Track embedding to help debug issues where user has removed the
  	 * notification area applet from the panel, and thus nm-applet too.