code freeze break request: menu system patches

[Colin Walters <walters verbum org>]

Hi,

Two patches - these fix "application tracking" for
gnome-control-center and others.

The full story lives in
https://bugzilla.gnome.org/show_bug.cgi?id=645063 - basically we are
currently reading a menu file that doesn't exist on anything except
Red Hat Linux derived systems.

Second, in the current gnome-menus, System Settings (control center)
doesn't show up because we simply don't show "Settings;" categorized
apps in our menus.  The fix is to change them to "System;" for now.

How critical are these patches?  The first I would say is important,
since we know it's just obviously broken for anyone not on RHL.  The
second is low risk of regression, and fixes a notable (but not in any
way critical) bug in interaction with control center, which is
obviously a flagship.

From 34bb3232107d3674c0e0734000019e47430de041 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters verbum org>
Date: Thu, 17 Mar 2011 16:26:49 -0400
Subject: [PATCH] ShellAppSystem: Only search gnomecc.menu for preferences

settings.menu was removed in gnome-menus commit
b68bcd27f44ce2c494f6e3cd9695890b9c02af04; gnomecc.menu is the intended
replacement.

(On Red Hat Linux derived systems, settings.menu continues to exist)

https://bugzilla.gnome.org/show_bug.cgi?id=645063
---
 src/shell-app-system.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/shell-app-system.c b/src/shell-app-system.c
index 7bd4b12..b52625a 100644
--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@@ -200,7 +200,7 @@ shell_app_system_init (ShellAppSystem *self)
    * case by case.
    */
   priv->apps_tree = gmenu_tree_lookup ("applications.menu", GMENU_TREE_FLAGS_INCLUDE_NODISPLAY);
-  priv->settings_tree = gmenu_tree_lookup ("settings.menu", GMENU_TREE_FLAGS_NONE);
+  priv->settings_tree = gmenu_tree_lookup ("gnomecc.menu", GMENU_TREE_FLAGS_INCLUDE_NODISPLAY);
 
   priv->app_change_timeout_id = 0;
 
-- 
1.7.4.1

From 29cc323a2e6c1bcc7943cabbb291456a2d847912 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters verbum org>
Date: Wed, 23 Mar 2011 11:43:13 -0400
Subject: [PATCH] gnome-control-center.desktop: Ensure we're in the menu

If we're not categorized, the shell won't pick us up, and that's
a problem for application tracking.  Per IRC discussion, go
into System Settings for now.
---
 shell/gnome-control-center.desktop.in.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/shell/gnome-control-center.desktop.in.in b/shell/gnome-control-center.desktop.in.in
index b4182f6..38be8ea 100644
--- a/shell/gnome-control-center.desktop.in.in
+++ b/shell/gnome-control-center.desktop.in.in
@@ -5,7 +5,7 @@ Exec=gnome-control-center --overview
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;GTK;Settings;
+Categories=GNOME;GTK;System;
 OnlyShowIn=GNOME;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
-- 
1.7.4.1