[jhbuild] 3.16, 3.18: Re-add network-manager-applet to core

[Bastien Nocera <hadess src gnome org>]

commit 115210aa35756d74868d7fe26cb7701dc897893a
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Sep 23 13:16:08 2015 +0200

    3.16, 3.18: Re-add network-manager-applet to core
    
    It's required for gnome-control-center on Linux, either as a soft
    dependency in GNOME 3.16, or as a hard dependency in GNOME 3.18 (since
    commit 159cf52303 in gnome-control-center).
    
    https://bugzilla.gnome.org/show_bug.cgi?id=755345

 modulesets/gnome-suites-core-3.16.modules |   20 ++++++++++++++++++++
 modulesets/gnome-suites-core-3.18.modules |   20 ++++++++++++++++++++
 modulesets/gnome-world.modules            |   20 --------------------
 3 files changed, 40 insertions(+), 20 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.16.modules b/modulesets/gnome-suites-core-3.16.modules
index 6d97086..3a5391d 100644
--- a/modulesets/gnome-suites-core-3.16.modules
+++ b/modulesets/gnome-suites-core-3.16.modules
@@ -120,6 +120,26 @@
     </dependencies>
   </autotools>
 
+  <autotools id="network-manager-applet"
+             autogenargs="--enable-more-warnings=no --disable-migration --without-bluetooth">
+    <branch revision="nma-1-0"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="dbus-glib"/>
+      <dep package="gnome-bluetooth"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+"/>
+      <dep package="gudev"/>
+      <dep package="iso-codes"/>
+      <dep package="libsecret"/>
+      <dep package="NetworkManager"/>
+      <dep package="libnotify"/>
+    </dependencies>
+    <suggests>
+      <dep package="mobile-broadband-provider-info"/>
+    </suggests>
+  </autotools>
+
   <autotools id="gnome-control-center" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-suites-core-3.18.modules b/modulesets/gnome-suites-core-3.18.modules
index 82c6407..57d4d0c 100644
--- a/modulesets/gnome-suites-core-3.18.modules
+++ b/modulesets/gnome-suites-core-3.18.modules
@@ -120,6 +120,26 @@
     </dependencies>
   </autotools>
 
+  <autotools id="network-manager-applet"
+             autogenargs="--enable-more-warnings=no --disable-migration --without-bluetooth">
+    <branch revision="nma-1-0"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="dbus-glib"/>
+      <dep package="gnome-bluetooth"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtk+"/>
+      <dep package="gudev"/>
+      <dep package="iso-codes"/>
+      <dep package="libsecret"/>
+      <dep package="NetworkManager"/>
+      <dep package="libnotify"/>
+    </dependencies>
+    <suggests>
+      <dep package="mobile-broadband-provider-info"/>
+    </suggests>
+  </autotools>
+
   <autotools id="gnome-control-center" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 937d6bf..86826b5 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -3224,26 +3224,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="network-manager-applet"
-             autogenargs="--enable-more-warnings=no --disable-migration --without-bluetooth">
-    <branch revision="nma-1-0"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="dbus-glib"/>
-      <dep package="gnome-bluetooth"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
-      <dep package="gudev"/>
-      <dep package="iso-codes"/>
-      <dep package="libsecret"/>
-      <dep package="NetworkManager"/>
-      <dep package="libnotify"/>
-    </dependencies>
-    <suggests>
-      <dep package="mobile-broadband-provider-info"/>
-    </suggests>
-  </autotools>
-
   <autotools id="gnome-games"
              autogenargs="--enable-vala">
     <branch repo="github.com"