From 70604ba4588cf2a58b988a45f76128a9ed0836a5 Mon Sep 17 00:00:00 2001
From: Thomas Wood <thos@gnome.org>
Date: Mon, 20 Dec 2010 14:52:15 +0000
Subject: Remove the "Internet and Network" category

Remove this category as there is only one item in it and move the network
panel to the "Hardware" category.
---
 panels/network/gnome-network-panel.desktop.in.in |  2 +-
 shell/gnomecc.menu                               | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/panels/network/gnome-network-panel.desktop.in.in b/panels/network/gnome-network-panel.desktop.in.in
index 213a26699..f5265da7c 100644
--- a/panels/network/gnome-network-panel.desktop.in.in
+++ b/panels/network/gnome-network-panel.desktop.in.in
@@ -6,7 +6,7 @@ Icon=gnome-network-properties
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings;X-GNOME-Settings-Panel;
+Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;
 OnlyShowIn=GNOME;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
diff --git a/shell/gnomecc.menu b/shell/gnomecc.menu
index e61f6f6a0..5ff69ee44 100644
--- a/shell/gnomecc.menu
+++ b/shell/gnomecc.menu
@@ -15,7 +15,6 @@
    <!-- Sort the control center categories -->
    <Layout>
      <Menuname>Personal</Menuname>
-     <Menuname>Internet and Network</Menuname>
      <Menuname>Hardware</Menuname>
      <Menuname>System</Menuname>
      <Menuname>Other</Menuname>
@@ -30,7 +29,6 @@
         <Or>
           <Category>X-GNOME-PersonalSettings</Category>
           <Category>DesktopSettings</Category>
-          <Category>X-GNOME-NetworkSettings</Category>
           <Category>HardwareSettings</Category>
           <Category>X-GNOME-SystemSettings</Category>
           <Category>System</Category>
@@ -62,19 +60,6 @@
     </Include>
   </Menu> <!-- End Personal -->
 
-  <!-- Internet and Network category -->
-  <Menu>
-    <Name>Internet and Network</Name>
-    <Directory>InternetAndNetwork.directory</Directory>
-    <Include>
-      <And>
-        <Category>Settings</Category>
-        <Category>X-GNOME-NetworkSettings</Category>
-        <Category>X-GNOME-Settings-Panel</Category>
-      </And>
-    </Include>
-  </Menu> <!-- End Internet and Network -->
-
   <!-- Hardware category -->
   <Menu>
     <Name>Hardware</Name>
@@ -105,7 +90,6 @@
                 <Category>X-GNOME-PersonalSettings</Category>
                 <Category>DesktopSettings</Category>
                 <Category>HardwareSettings</Category>
-                <Category>X-GNOME-NetworkSettings</Category>
               </Or>
             </Not>
           </And>
-- 
cgit v1.2.3