GNOME.org
 

[gnome-control-center/wip/gbsneto/remove-old-shell: 2/4] shell-model: Remove old categories

commit 051e69de68a0574a8378a686ea20b7636e3008b5
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Sat Nov 11 00:54:10 2017 -0200

    shell-model: Remove old categories
    
    Since we don't maintain two different shells anymore, there
    is no need to maintain the two different sets of categories
    in the desktop files.
    
    This commit also drops the "#ifdef CC_ENABLE_ALT_CATEGORIES"
    blocks, since the previous commit removed that define.

 .../gnome-background-panel.desktop.in.in           |    2 +-
 panels/datetime/gnome-datetime-panel.desktop.in.in |    2 +-
 panels/info/gnome-default-apps-panel.desktop.in.in |    2 +-
 .../info/gnome-info-overview-panel.desktop.in.in   |    2 +-
 panels/info/gnome-info-panel.desktop.in.in         |    2 +-
 .../info/gnome-removable-media-panel.desktop.in.in |    2 +-
 .../gnome-notifications-panel.desktop.in.in        |    2 +-
 .../gnome-online-accounts-panel.desktop.in.in      |    2 +-
 panels/privacy/gnome-privacy-panel.desktop.in.in   |    2 +-
 panels/region/gnome-region-panel.desktop.in.in     |    2 +-
 panels/search/gnome-search-panel.desktop.in.in     |    2 +-
 panels/sharing/gnome-sharing-panel.desktop.in.in   |    2 +-
 .../gnome-universal-access-panel.desktop.in.in     |    2 +-
 .../data/gnome-user-accounts-panel.desktop.in.in   |    2 +-
 shell/cc-panel-loader.c                            |   11 -----------
 shell/cc-shell-model.h                             |    7 -------
 16 files changed, 14 insertions(+), 32 deletions(-)
---
diff --git a/panels/background/gnome-background-panel.desktop.in.in 
b/panels/background/gnome-background-panel.desktop.in.in
index 2b665f2..8d38d5e 100644
--- a/panels/background/gnome-background-panel.desktop.in.in
+++ b/panels/background/gnome-background-panel.desktop.in.in
@@ -8,7 +8,7 @@ Terminal=false
 Type=Application
 NoDisplay=true
 StartupNotify=true
-Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;X-GNOME-PersonalizationSettings;
+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalizationSettings;
 OnlyShowIn=GNOME;
 # Translators: those are keywords for the background control-center panel
 _Keywords=Wallpaper;Screen;Desktop;
diff --git a/panels/datetime/gnome-datetime-panel.desktop.in.in 
b/panels/datetime/gnome-datetime-panel.desktop.in.in
index 446b23e..5884db2 100644
--- a/panels/datetime/gnome-datetime-panel.desktop.in.in
+++ b/panels/datetime/gnome-datetime-panel.desktop.in.in
@@ -8,7 +8,7 @@ Terminal=false
 Type=Application
 NoDisplay=true
 StartupNotify=true
-Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings;
+Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings;
 OnlyShowIn=GNOME;
 # Translators: those are keywords for the date and time control-center panel
 _Keywords=Clock;Timezone;Location;
diff --git a/panels/info/gnome-default-apps-panel.desktop.in.in 
b/panels/info/gnome-default-apps-panel.desktop.in.in
index 0154f34..7c8e97b 100644
--- a/panels/info/gnome-default-apps-panel.desktop.in.in
+++ b/panels/info/gnome-default-apps-panel.desktop.in.in
@@ -8,7 +8,7 @@ Terminal=false
 Type=Application
 NoDisplay=true
 StartupNotify=true
-Categories=GNOME;GTK;Settings;X-GNOME-Hidden;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings;
+Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings;
 OnlyShowIn=GNOME;Unity;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
diff --git a/panels/info/gnome-info-overview-panel.desktop.in.in 
b/panels/info/gnome-info-overview-panel.desktop.in.in
index 8742709..8c44e10 100644
--- a/panels/info/gnome-info-overview-panel.desktop.in.in
+++ b/panels/info/gnome-info-overview-panel.desktop.in.in
@@ -8,7 +8,7 @@ Terminal=false
 Type=Application
 NoDisplay=true
 StartupNotify=true
-Categories=GNOME;GTK;Settings;X-GNOME-Hidden;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings;
+Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings;
 OnlyShowIn=GNOME;Unity;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
diff --git a/panels/info/gnome-info-panel.desktop.in.in b/panels/info/gnome-info-panel.desktop.in.in
index 22714aa..cb4f0a6 100644
--- a/panels/info/gnome-info-panel.desktop.in.in
+++ b/panels/info/gnome-info-panel.desktop.in.in
@@ -8,7 +8,7 @@ Terminal=false
 Type=Application
 NoDisplay=true
 StartupNotify=true
-Categories=GNOME;GTK;Settings;X-GNOME-AltHidden;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings;
+Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings;
 OnlyShowIn=GNOME;Unity;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
diff --git a/panels/info/gnome-removable-media-panel.desktop.in.in 
b/panels/info/gnome-removable-media-panel.desktop.in.in
index bc4675e..7acec64 100644
--- a/panels/info/gnome-removable-media-panel.desktop.in.in
+++ b/panels/info/gnome-removable-media-panel.desktop.in.in
@@ -8,7 +8,7 @@ Terminal=false
 Type=Application
 NoDisplay=true
 StartupNotify=true
-Categories=GNOME;GTK;Settings;X-GNOME-Hidden;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;X-GNOME-DevicesSettings;
+Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-DevicesSettings;
 OnlyShowIn=GNOME;Unity;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
diff --git a/panels/notifications/gnome-notifications-panel.desktop.in.in 
b/panels/notifications/gnome-notifications-panel.desktop.in.in
index 1d9bc56..c1191c9 100644
--- a/panels/notifications/gnome-notifications-panel.desktop.in.in
+++ b/panels/notifications/gnome-notifications-panel.desktop.in.in
@@ -8,7 +8,7 @@ Terminal=false
 Type=Application
 NoDisplay=true
 StartupNotify=true
-Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;X-GNOME-PersonalizationSettings;
+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalizationSettings;
 OnlyShowIn=GNOME;Unity;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
diff --git a/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in 
b/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in
index 271d939..800dceb 100644
--- a/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in
+++ b/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in
@@ -8,7 +8,7 @@ Terminal=false
 Type=Application
 NoDisplay=true
 StartupNotify=true
-Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;X-GNOME-AccountSettings;
+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-AccountSettings;
 OnlyShowIn=GNOME;Unity;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
diff --git a/panels/privacy/gnome-privacy-panel.desktop.in.in 
b/panels/privacy/gnome-privacy-panel.desktop.in.in
index ca8b53a..c098c97 100644
--- a/panels/privacy/gnome-privacy-panel.desktop.in.in
+++ b/panels/privacy/gnome-privacy-panel.desktop.in.in
@@ -9,7 +9,7 @@ Terminal=false
 Type=Application
 NoDisplay=true
 StartupNotify=true
-Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;X-GNOME-AccountSettings;
+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-AccountSettings;
 OnlyShowIn=GNOME;Unity;
 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 79d1e12..4a6c27c 100644
--- a/panels/region/gnome-region-panel.desktop.in.in
+++ b/panels/region/gnome-region-panel.desktop.in.in
@@ -8,7 +8,7 @@ Terminal=false
 Type=Application
 NoDisplay=true
 StartupNotify=true
-Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;X-GNOME-PersonalizationSettings;
+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalizationSettings;
 OnlyShowIn=GNOME;Unity;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
diff --git a/panels/search/gnome-search-panel.desktop.in.in b/panels/search/gnome-search-panel.desktop.in.in
index 5679dbb..95834d8 100644
--- a/panels/search/gnome-search-panel.desktop.in.in
+++ b/panels/search/gnome-search-panel.desktop.in.in
@@ -8,7 +8,7 @@ Terminal=false
 Type=Application
 NoDisplay=true
 StartupNotify=true
-Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;X-GNOME-PersonalizationSettings;
+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalizationSettings;
 OnlyShowIn=GNOME;Unity;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
diff --git a/panels/sharing/gnome-sharing-panel.desktop.in.in 
b/panels/sharing/gnome-sharing-panel.desktop.in.in
index c27d266..8f2d26a 100644
--- a/panels/sharing/gnome-sharing-panel.desktop.in.in
+++ b/panels/sharing/gnome-sharing-panel.desktop.in.in
@@ -8,7 +8,7 @@ Terminal=false
 Type=Application
 NoDisplay=true
 StartupNotify=true
-Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;X-GNOME-AccountSettings;
+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-AccountSettings;
 OnlyShowIn=GNOME;Unity;
 X-GNOME-Settings-Panel=sharing
 # Translators: those are keywords for the sharing control-center panel
diff --git a/panels/universal-access/gnome-universal-access-panel.desktop.in.in 
b/panels/universal-access/gnome-universal-access-panel.desktop.in.in
index 5df2358..7f7b115 100644
--- a/panels/universal-access/gnome-universal-access-panel.desktop.in.in
+++ b/panels/universal-access/gnome-universal-access-panel.desktop.in.in
@@ -8,7 +8,7 @@ Terminal=false
 Type=Application
 NoDisplay=true
 StartupNotify=true
-Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalizationSettings;
+Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-PersonalizationSettings;
 OnlyShowIn=GNOME;Unity;
 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 5b35f2f..3399a4f 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
@@ -7,7 +7,7 @@ Terminal=false
 Type=Application
 NoDisplay=true
 StartupNotify=true
-Categories=System;Settings;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;X-GNOME-DetailsSettings;
+Categories=System;Settings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings;
 OnlyShowIn=GNOME;Unity;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
index 8be3bb9..a7b88cb 100644
--- a/shell/cc-panel-loader.c
+++ b/shell/cc-panel-loader.c
@@ -134,16 +134,6 @@ parse_categories (GDesktopAppInfo *app)
 
 #define const_strv(s) ((const gchar* const*) s)
 
-#ifdef CC_ENABLE_ALT_CATEGORIES
-  if (g_strv_contains (const_strv (split), "X-GNOME-Hidden"))
-    retval = CC_CATEGORY_HIDDEN;
-  else if (g_strv_contains (const_strv (split), "HardwareSettings"))
-    retval = CC_CATEGORY_HARDWARE;
-  else if (g_strv_contains (const_strv (split), "X-GNOME-PersonalSettings"))
-    retval = CC_CATEGORY_PERSONAL;
-  else if (g_strv_contains (const_strv (split), "X-GNOME-SystemSettings"))
-    retval = CC_CATEGORY_SYSTEM;
-#else
   if (g_strv_contains (const_strv (split), "X-GNOME-AltHidden"))
     retval = CC_CATEGORY_HIDDEN;
   else if (g_strv_contains (const_strv (split), "X-GNOME-ConnectivitySettings"))
@@ -158,7 +148,6 @@ parse_categories (GDesktopAppInfo *app)
     retval = CC_CATEGORY_DETAILS;
   else if (g_strv_contains (const_strv (split), "HardwareSettings"))
     retval = CC_CATEGORY_HARDWARE;
-#endif
 
 #undef const_strv
 
diff --git a/shell/cc-shell-model.h b/shell/cc-shell-model.h
index 8c0ff28..21ab1f4 100644
--- a/shell/cc-shell-model.h
+++ b/shell/cc-shell-model.h
@@ -53,19 +53,12 @@ typedef struct _CcShellModelClass CcShellModelClass;
 typedef struct _CcShellModelPrivate CcShellModelPrivate;
 
 typedef enum {
-#ifdef CC_ENABLE_ALT_CATEGORIES
-  CC_CATEGORY_PERSONAL,
-  CC_CATEGORY_SYSTEM,
-  CC_CATEGORY_HARDWARE,
-#else
   CC_CATEGORY_CONNECTIVITY,
   CC_CATEGORY_PERSONALIZATION,
   CC_CATEGORY_ACCOUNT,
   CC_CATEGORY_HARDWARE,
   CC_CATEGORY_DEVICES,
   CC_CATEGORY_DETAILS,
-#endif
-
   CC_CATEGORY_HIDDEN,
   CC_CATEGORY_LAST
 } CcPanelCategory;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]