GNOME.org
 

[gnome-control-center/extensible-shell] Revert to showing the capplets in the menu by default

commit 4a119076646c0d19c3fe1d9538b937de2a3cb4ac
Author: Thomas Wood <thomas wood intel com>
Date:   Wed Feb 17 14:51:00 2010 +0000

    Revert to showing the capplets in the menu by default
    
    Show the normal capplets by default, since some capplets really do need
    hiding by default.
    
    
    Revert "Switch to only showing the shell menu item by default and hiding capplets"
    
    This reverts commit 9ec8f36679d31cdc404c1e66f5cbd8563f6bdbb7.
    
    Revert "Include "NoDisplay" items in the shell view"
    
    This reverts commit 2fb9e62d07c6420cc6cec9b003359cb81e2c0727.

 capplets/about-me/gnome-about-me.desktop.in.in     |    1 -
 .../at-properties/at-properties.desktop.in.in      |    1 -
 .../data/gnome-appearance-properties.desktop.in.in |    1 -
 .../default-applications.desktop.in.in             |    1 -
 .../gnome-at-session.desktop.in.in                 |    1 -
 capplets/display/display-properties.desktop.in.in  |    1 -
 capplets/keyboard/keyboard.desktop.in.in           |    1 -
 capplets/localization/localization.desktop.in.in   |    1 -
 capplets/mouse/gnome-settings-mouse.desktop.in.in  |    1 -
 .../network/gnome-network-properties.desktop.in.in |    1 -
 capplets/windows/window-properties.desktop.in.in   |    1 -
 shell/control-center.c                             |    3 +--
 shell/gnome-control-center.desktop.in.in           |    2 +-
 13 files changed, 2 insertions(+), 14 deletions(-)
---
diff --git a/capplets/about-me/gnome-about-me.desktop.in.in b/capplets/about-me/gnome-about-me.desktop.in.in
index 9f64496..95afabf 100644
--- a/capplets/about-me/gnome-about-me.desktop.in.in
+++ b/capplets/about-me/gnome-about-me.desktop.in.in
@@ -8,7 +8,6 @@ Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;
 OnlyShowIn=GNOME;
-NoDisplay=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=about-me
diff --git a/capplets/accessibility/at-properties/at-properties.desktop.in.in b/capplets/accessibility/at-properties/at-properties.desktop.in.in
index 2205aeb..714ce8f 100644
--- a/capplets/accessibility/at-properties/at-properties.desktop.in.in
+++ b/capplets/accessibility/at-properties/at-properties.desktop.in.in
@@ -8,7 +8,6 @@ Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;
 OnlyShowIn=GNOME;
-NoDisplay=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=Assistive Technology Preferences
diff --git a/capplets/appearance/data/gnome-appearance-properties.desktop.in.in b/capplets/appearance/data/gnome-appearance-properties.desktop.in.in
index ce2c4e3..a85eac7 100644
--- a/capplets/appearance/data/gnome-appearance-properties.desktop.in.in
+++ b/capplets/appearance/data/gnome-appearance-properties.desktop.in.in
@@ -8,7 +8,6 @@ Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;
 OnlyShowIn=GNOME;
-NoDisplay=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=Appearance
diff --git a/capplets/default-applications/default-applications.desktop.in.in b/capplets/default-applications/default-applications.desktop.in.in
index 214a7e6..677eedc 100644
--- a/capplets/default-applications/default-applications.desktop.in.in
+++ b/capplets/default-applications/default-applications.desktop.in.in
@@ -8,7 +8,6 @@ Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;
 OnlyShowIn=GNOME;
-NoDisplay=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=Preferred applications
diff --git a/capplets/default-applications/gnome-at-session.desktop.in.in b/capplets/default-applications/gnome-at-session.desktop.in.in
index 9a31b7d..9480ad9 100644
--- a/capplets/default-applications/gnome-at-session.desktop.in.in
+++ b/capplets/default-applications/gnome-at-session.desktop.in.in
@@ -7,7 +7,6 @@ Terminal=false
 Type=Application
 StartupNotify=false
 OnlyShowIn=GNOME;
-NoDisplay=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=other capplets
diff --git a/capplets/display/display-properties.desktop.in.in b/capplets/display/display-properties.desktop.in.in
index 716582c..21bd949 100644
--- a/capplets/display/display-properties.desktop.in.in
+++ b/capplets/display/display-properties.desktop.in.in
@@ -8,7 +8,6 @@ Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;Settings;HardwareSettings;
 OnlyShowIn=GNOME;
-NoDisplay=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=Screen resolution
diff --git a/capplets/keyboard/keyboard.desktop.in.in b/capplets/keyboard/keyboard.desktop.in.in
index 0353abb..97f9f87 100644
--- a/capplets/keyboard/keyboard.desktop.in.in
+++ b/capplets/keyboard/keyboard.desktop.in.in
@@ -8,7 +8,6 @@ Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;Settings;HardwareSettings;
 OnlyShowIn=GNOME;
-NoDisplay=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=keyboard
diff --git a/capplets/localization/localization.desktop.in.in b/capplets/localization/localization.desktop.in.in
index 6d2b77a..6f2c755 100644
--- a/capplets/localization/localization.desktop.in.in
+++ b/capplets/localization/localization.desktop.in.in
@@ -8,7 +8,6 @@ Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;
 OnlyShowIn=GNOME;
-NoDisplay=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=Localization
diff --git a/capplets/mouse/gnome-settings-mouse.desktop.in.in b/capplets/mouse/gnome-settings-mouse.desktop.in.in
index 7fed8ab..35796d3 100644
--- a/capplets/mouse/gnome-settings-mouse.desktop.in.in
+++ b/capplets/mouse/gnome-settings-mouse.desktop.in.in
@@ -8,7 +8,6 @@ Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;Settings;HardwareSettings;
 OnlyShowIn=GNOME;
-NoDisplay=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=mouse
diff --git a/capplets/network/gnome-network-properties.desktop.in.in b/capplets/network/gnome-network-properties.desktop.in.in
index c8109f6..4091c20 100644
--- a/capplets/network/gnome-network-properties.desktop.in.in
+++ b/capplets/network/gnome-network-properties.desktop.in.in
@@ -8,7 +8,6 @@ Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings;
 OnlyShowIn=GNOME;
-NoDisplay=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=network preferences
diff --git a/capplets/windows/window-properties.desktop.in.in b/capplets/windows/window-properties.desktop.in.in
index 8c3849e..5f92c99 100644
--- a/capplets/windows/window-properties.desktop.in.in
+++ b/capplets/windows/window-properties.desktop.in.in
@@ -8,7 +8,6 @@ Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;
 OnlyShowIn=GNOME;
-NoDisplay=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=Window preferences
diff --git a/shell/control-center.c b/shell/control-center.c
index 790a03f..6a18ba5 100644
--- a/shell/control-center.c
+++ b/shell/control-center.c
@@ -281,8 +281,7 @@ fill_model (ShellData *data)
 
   vbox = W (data->builder, "main-vbox");
 
-  tree = gmenu_tree_lookup (MENUDIR "/gnomecc.menu",
-                            GMENU_TREE_FLAGS_INCLUDE_NODISPLAY);
+  tree = gmenu_tree_lookup (MENUDIR "/gnomecc.menu", 0);
 
   if (!tree)
     {
diff --git a/shell/gnome-control-center.desktop.in.in b/shell/gnome-control-center.desktop.in.in
index 4577d4c..4b082e7 100644
--- a/shell/gnome-control-center.desktop.in.in
+++ b/shell/gnome-control-center.desktop.in.in
@@ -12,4 +12,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=shell
 X-GNOME-Bugzilla-Version= VERSION@
-NoDisplay=false
+NoDisplay=true
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]