shell: only include items identified as settings panels in the list

Simplify the category requirements and do not include items that are not
settings panels.

7 files changed, 10 insertions, 66 deletions

diff --git a/panels/background/gnome-background-panel.desktop.in.in b/panels/background/gnome-background-panel.desktop.in.in
index 43f3cf59d..1212112bc 100644
--- a/panels/background/gnome-background-panel.desktop.in.in
+++ b/panels/background/gnome-background-panel.desktop.in.in
@@ -6,7 +6,7 @@ Icon=preferences-desktop-wallpaper
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;
+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings
 OnlyShowIn=GNOME;
 X-GNOME-Settings-Panel=background
 # Translators: those are keywords for the background control-center panel
diff --git a/panels/power/gnome-power-panel.desktop.in.in b/panels/power/gnome-power-panel.desktop.in.in
index 51076ae22..ee338f8ac 100644
--- a/panels/power/gnome-power-panel.desktop.in.in
+++ b/panels/power/gnome-power-panel.desktop.in.in
@@ -6,7 +6,7 @@ Icon=gnome-power-manager
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;
+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;HardwareSettings
 OnlyShowIn=GNOME;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
diff --git a/panels/region/gnome-region-panel.desktop.in.in b/panels/region/gnome-region-panel.desktop.in.in
index 1d97b8a89..07b9f1587 100644
--- a/panels/region/gnome-region-panel.desktop.in.in
+++ b/panels/region/gnome-region-panel.desktop.in.in
@@ -6,7 +6,7 @@ Icon=preferences-desktop-locale
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;
+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings
 OnlyShowIn=GNOME;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
diff --git a/panels/screen/gnome-screen-panel.desktop.in.in b/panels/screen/gnome-screen-panel.desktop.in.in
index 3e1e6690a..35696b036 100644
--- a/panels/screen/gnome-screen-panel.desktop.in.in
+++ b/panels/screen/gnome-screen-panel.desktop.in.in
@@ -6,7 +6,7 @@ Icon=system-lock-screen
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;
+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings
 OnlyShowIn=GNOME;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
diff --git a/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in b/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in
index 4dc82ba71..79124f0a4 100644
--- a/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in
+++ b/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in
@@ -6,7 +6,7 @@ Icon=system-users
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=System;Settings;X-GNOME-Settings-Panel;
+Categories=System;Settings;X-GNOME-Settings-Panel;X-GNOME-SystemSettings
 OnlyShowIn=GNOME;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c
index 5fce47463..8c6cf40d2 100644
--- a/shell/gnome-control-center.c
+++ b/shell/gnome-control-center.c
@@ -89,12 +89,8 @@ activate_panel (GnomeControlCenter *shell,
                 const gchar        *icon_name)
 {
   GnomeControlCenterPrivate *priv = shell->priv;
-  GAppInfo *appinfo;
-  GError *err = NULL;
-  GdkAppLaunchContext *ctx;
   GType panel_type = G_TYPE_INVALID;
   GList *panels, *l;
-  GKeyFile *key_file;
 
   /* check if there is an plugin that implements this panel */
   panels = g_io_extension_point_get_extensions (priv->extension_point);
@@ -164,44 +160,6 @@ activate_panel (GnomeControlCenter *shell,
           return;
         }
     }
-
-
-  /* if a plugin was not found, then start app directly */
-
-  if (err)
-    {
-      g_warning ("Error starting \"%s\": %s", desktop_file, err->message);
-
-      g_error_free (err);
-      err = NULL;
-
-      return;
-    }
-
-  key_file = g_key_file_new ();
-  g_key_file_load_from_file (key_file, desktop_file, 0, &err);
-
-  appinfo = (GAppInfo*) g_desktop_app_info_new_from_keyfile (key_file);
-
-  g_key_file_free (key_file);
-  key_file = NULL;
-
-
-  ctx = gdk_app_launch_context_new ();
-  gdk_app_launch_context_set_screen (ctx, gdk_screen_get_default ());
-  gdk_app_launch_context_set_timestamp (ctx, priv->last_time);
-
-  g_app_info_launch (appinfo, NULL, G_APP_LAUNCH_CONTEXT (ctx), &err);
-
-  g_object_unref (appinfo);
-  g_object_unref (ctx);
-
-  if (err)
-    {
-      g_warning ("Error starting \"%s\": %s", desktop_file, err->message);
-      g_error_free (err);
-      err = NULL;
-    }
 }
 
 static void
diff --git a/shell/gnomecc.menu b/shell/gnomecc.menu
index 5ff69ee44..edf829a17 100644
--- a/shell/gnomecc.menu
+++ b/shell/gnomecc.menu
@@ -52,11 +52,6 @@
         <Category>X-GNOME-PersonalSettings</Category>
         <Category>X-GNOME-Settings-Panel</Category>
       </And>
-      <And>
-        <Category>Settings</Category>
-	<Category>DesktopSettings</Category>
-        <Category>X-GNOME-Settings-Panel</Category>
-      </And>
     </Include>
   </Menu> <!-- End Personal -->
 
@@ -80,20 +75,8 @@
     <Include>
       <And>
         <Category>Settings</Category>
+        <Category>X-GNOME-SystemSettings</Category>
         <Category>X-GNOME-Settings-Panel</Category>
-        <Or>
-          <Category>X-GNOME-SystemSettings</Category>
-          <And>
-            <Category>System</Category>
-            <Not>
-              <Or>
-                <Category>X-GNOME-PersonalSettings</Category>
-                <Category>DesktopSettings</Category>
-                <Category>HardwareSettings</Category>
-              </Or>
-            </Not>
-          </And>
-        </Or>
       </And>
     </Include>
   </Menu> <!-- End System -->
@@ -105,9 +88,12 @@
     <Include>
       <And>
         <Category>Settings</Category>
+        <Category>X-GNOME-Settings-Panel</Category>
         <Not>
           <Or>
-            <Category>X-GNOME-Settings-Panel</Category>
+            <Category>X-GNOME-PersonalSettings</Category>
+            <Category>X-GNOME-SystemSettings</Category>
+            <Category>HardwareSettings</Category>
             <Filename>gnome-control-center.desktop</Filename>
           </Or>
         </Not>