[network-manager-applet: 49/49] Merge remote-tracking branch 'origin/rm-userset'
- From: Dan Williams <dcbw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet: 49/49] Merge remote-tracking branch 'origin/rm-userset'
- Date: Sun, 13 Feb 2011 04:54:43 +0000 (UTC)
commit 425eeecf83ff11c32ba75678ae4cfe9a83165a94
Merge: ba2076a 2297c4d
Author: Dan Williams <dcbw redhat com>
Date: Sat Feb 12 22:48:24 2011 -0600
Merge remote-tracking branch 'origin/rm-userset'
Makefile.am | 20 +-
nm-applet-dbus-126.conf | 42 -
nm-applet-pre-dbus-126.conf | 32 -
po/POTFILES.in | 3 -
src/Makefile.am | 16 +-
src/applet-agent.c | 781 +++++++++++++++
src/applet-agent.h | 68 ++
src/applet-dbus-manager.c | 517 ----------
src/applet-dbus-manager.h | 81 --
src/applet-device-bt.c | 197 ++---
src/applet-device-cdma.c | 190 ++---
src/applet-device-gsm.c | 294 ++----
src/applet-device-wifi.c | 370 ++-----
src/applet-device-wimax.c | 16 +-
src/applet-device-wired.c | 373 ++-----
src/applet-dialogs.c | 20 +-
src/applet-dialogs.h | 3 +-
src/applet-vpn-request.c | 488 +++++++++
...{vpn-password-dialog.h => applet-vpn-request.h} | 20 +-
src/applet.c | 673 +++++++------
src/applet.h | 63 +-
src/connection-editor/Makefile.am | 2 -
src/connection-editor/ce-page.c | 12 +-
src/connection-editor/ce-polkit-button.c | 115 +--
src/connection-editor/ce-polkit-button.h | 8 +-
src/connection-editor/nm-connection-editor.c | 160 ++--
src/connection-editor/nm-connection-editor.h | 14 +-
src/connection-editor/nm-connection-list.c | 294 ++----
src/connection-editor/nm-connection-list.h | 10 +-
src/connection-editor/page-dsl.c | 1 -
src/connection-editor/page-ip4.c | 14 +-
src/connection-editor/page-ip6.c | 12 +-
src/connection-editor/page-mobile.c | 21 +-
src/connection-editor/page-wired-security.c | 1 -
src/connection-editor/page-wireless-security.c | 1 -
src/connection-editor/ppp-auth-methods-dialog.c | 12 +-
src/connection-editor/vpn-helpers.c | 6 +-
src/gconf-helpers/Makefile.am | 16 +-
src/gconf-helpers/gconf-helpers.c | 59 +-
src/gconf-helpers/gconf-helpers.h | 8 +-
src/gconf-helpers/gconf-upgrade.c | 1 -
src/gconf-helpers/nma-gconf-connection.c | 1053 --------------------
src/gconf-helpers/nma-gconf-connection.h | 82 --
src/gconf-helpers/nma-gconf-settings.c | 452 ---------
src/gconf-helpers/nma-gconf-settings.h | 64 --
src/gnome-bluetooth/Makefile.am | 2 -
src/gnome-bluetooth/bt-widget.c | 334 +++++--
src/marshallers/nma-marshal.list | 3 +-
src/utils/utils.c | 45 +-
src/utils/utils.h | 14 +-
src/vpn-password-dialog.c | 337 -------
src/wired-dialog.c | 19 +-
src/wired-dialog.h | 12 +-
src/wireless-dialog.c | 168 ++--
src/wireless-security/eap-method-simple.c | 40 +-
55 files changed, 2821 insertions(+), 4838 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]