--- src/Makefile.in.orig	Sun Jul  8 14:22:03 2012
+++ src/Makefile.in	Sun Jul  8 14:22:58 2012
@@ -141,7 +141,7 @@ am__libgnome_shell_la_SOURCES_DIST = shell-enum-types.
 	shell-generic-container.c shell-gtk-embed.c shell-global.c \
 	shell-idle-monitor.c shell-keyring-prompt.h \
 	shell-keyring-prompt.c shell-mobile-providers.c \
-	shell-mount-operation.c shell-network-agent.c shell-perf-log.c \
+	shell-mount-operation.c shell-perf-log.c \
 	shell-polkit-authentication-agent.h \
 	shell-polkit-authentication-agent.c shell-screenshot.c \
 	shell-screen-grabber.c shell-secure-text-buffer.c \
@@ -173,7 +173,6 @@ am_libgnome_shell_la_OBJECTS = $(am__objects_2) $(am__
 	libgnome_shell_la-shell-keyring-prompt.lo \
 	libgnome_shell_la-shell-mobile-providers.lo \
 	libgnome_shell_la-shell-mount-operation.lo \
-	libgnome_shell_la-shell-network-agent.lo \
 	libgnome_shell_la-shell-perf-log.lo \
 	libgnome_shell_la-shell-polkit-authentication-agent.lo \
 	libgnome_shell_la-shell-screenshot.lo \
@@ -850,7 +849,6 @@ shell_public_headers_h = \
 	shell-idle-monitor.h		\
 	shell-mobile-providers.h	\
 	shell-mount-operation.h		\
-	shell-network-agent.h		\
 	shell-perf-log.h		\
 	shell-screenshot.h		\
 	shell-screen-grabber.h		\
@@ -878,7 +876,7 @@ libgnome_shell_la_SOURCES = $(shell_built_sources) \
 	shell-generic-container.c shell-gtk-embed.c shell-global.c \
 	shell-idle-monitor.c shell-keyring-prompt.h \
 	shell-keyring-prompt.c shell-mobile-providers.c \
-	shell-mount-operation.c shell-network-agent.c shell-perf-log.c \
+	shell-mount-operation.c shell-perf-log.c \
 	shell-polkit-authentication-agent.h \
 	shell-polkit-authentication-agent.c shell-screenshot.c \
 	shell-screen-grabber.c shell-secure-text-buffer.c \
@@ -952,7 +950,7 @@ libgnome_shell_la_LIBADD = \
 	$(NULL)
 
 libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
-Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0 Folks-0.6
+Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 Folks-0.6
 Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
 Shell_0_1_gir_LIBS = libgnome-shell.la
 Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
@@ -1234,7 +1232,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-keyring-prompt.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-mobile-providers.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-mount-operation.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-network-agent.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-perf-log.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-polkit-authentication-agent.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-recorder-src.Plo@am__quote@
--- js/ui/statusIconDispatcher.js.orig	Sun Jul  8 15:26:54 2012
+++ js/ui/statusIconDispatcher.js	Sun Jul  8 15:26:59 2012
@@ -13,7 +13,6 @@ const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
     'gnome-volume-control-applet': 'volume', // renamed to gnome-sound-applet
                                              // when moved to control center
     'gnome-sound-applet': 'volume',
-    'nm-applet': 'network',
     'gnome-power-manager': 'battery',
     'keyboard': 'keyboard',
     'a11y-keyboard': 'a11y',
--- js/ui/panel.js.orig	Sun Jul  8 15:40:27 2012
+++ js/ui/panel.js	Sun Jul  8 15:40:35 2012
@@ -32,7 +32,7 @@ const BUTTON_DND_ACTIVATION_TIMEOUT = 250;
 const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
 const SPINNER_ANIMATION_TIME = 0.2;
 
-const STANDARD_STATUS_AREA_ORDER = ['a11y', 'keyboard', 'volume', 'bluetooth', 'network', 'battery', 'userMenu'];
+const STANDARD_STATUS_AREA_ORDER = ['a11y', 'keyboard', 'volume', 'bluetooth', 'battery', 'userMenu'];
 const STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION = {
     'a11y': imports.ui.status.accessibility.ATIndicator,
     'volume': imports.ui.status.volume.Indicator,
@@ -44,11 +44,11 @@ const STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION = {
 if (Config.HAVE_BLUETOOTH)
     STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator;
 
-try {
-    STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet;
-} catch(e) {
-    log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
-}
+//try {
+//    STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet;
+//} catch(e) {
+//    log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
+//}
 
 const GDM_STATUS_AREA_ORDER = ['a11y', 'display', 'keyboard', 'volume', 'battery', 'powerMenu'];
 const GDM_STATUS_AREA_SHELL_IMPLEMENTATION = {
--- js/ui/main.js.orig	Sun Jul  8 15:24:59 2012
+++ js/ui/main.js	Sun Jul  8 15:25:24 2012
@@ -26,7 +26,6 @@ const PlaceDisplay = imports.ui.placeDisplay;
 const RunDialog = imports.ui.runDialog;
 const Layout = imports.ui.layout;
 const LookingGlass = imports.ui.lookingGlass;
-const NetworkAgent = imports.ui.networkAgent;
 const NotificationDaemon = imports.ui.notificationDaemon;
 const WindowAttentionHandler = imports.ui.windowAttentionHandler;
 const Scripting = imports.ui.scripting;
@@ -85,7 +84,6 @@ function _createUserSession() {
     telepathyClient = new TelepathyClient.Client();
     automountManager = new AutomountManager.AutomountManager();
     autorunManager = new AutorunManager.AutorunManager();
-    networkAgent = new NetworkAgent.NetworkAgent();
 }
 
 function _createGDMSession() {
--- configure.ac.orig	Tue Apr 17 19:20:06 2012
+++ configure.ac	Fri Jul 13 09:42:16 2012
@@ -94,7 +94,6 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MI
                                telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
                                telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
                                polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
-                               libnm-glib libnm-util gnome-keyring-1
                                gcr-3 >= $GCR_MIN_VERSION)
 
 PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
