applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shell-model: Remove old categories

Browse source 
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.

https://bugzilla.gnome.org/show_bug.cgi?id=790923
This commit is contained in:
Georges Basile Stavracas Neto 2017-11-11 00:54:10 -02:00
parent 34f1acd078
commit b23ef59926
16 changed files with 14 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
panels/background/gnome-background-panel.desktop.in.in
View file

@ -8,7 +8,7 @@ Terminal=false
Type=Application Type=Application
NoDisplay=true NoDisplay=true
StartupNotify=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; OnlyShowIn=GNOME;
# Translators: those are keywords for the background control-center panel # Translators: those are keywords for the background control-center panel
_Keywords=Wallpaper;Screen;Desktop; _Keywords=Wallpaper;Screen;Desktop;

2
panels/datetime/gnome-datetime-panel.desktop.in.in
View file

@ -8,7 +8,7 @@ Terminal=false
Type=Application Type=Application
NoDisplay=true NoDisplay=true
StartupNotify=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; OnlyShowIn=GNOME;
# Translators: those are keywords for the date and time control-center panel # Translators: those are keywords for the date and time control-center panel
_Keywords=Clock;Timezone;Location; _Keywords=Clock;Timezone;Location;

2
panels/info/gnome-default-apps-panel.desktop.in.in
View file

@ -8,7 +8,7 @@ Terminal=false
Type=Application Type=Application
NoDisplay=true NoDisplay=true
StartupNotify=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; OnlyShowIn=GNOME;Unity;
X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Product=gnome-control-center

2
panels/info/gnome-info-overview-panel.desktop.in.in
View file

@ -8,7 +8,7 @@ Terminal=false
Type=Application Type=Application
NoDisplay=true NoDisplay=true
StartupNotify=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; OnlyShowIn=GNOME;Unity;
X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Product=gnome-control-center

2
panels/info/gnome-info-panel.desktop.in.in
View file

@ -8,7 +8,7 @@ Terminal=false
Type=Application Type=Application
NoDisplay=true NoDisplay=true
StartupNotify=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; OnlyShowIn=GNOME;Unity;
X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Product=gnome-control-center

2
panels/info/gnome-removable-media-panel.desktop.in.in
View file

@ -8,7 +8,7 @@ Terminal=false
Type=Application Type=Application
NoDisplay=true NoDisplay=true
StartupNotify=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; OnlyShowIn=GNOME;Unity;
X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Product=gnome-control-center

2
panels/notifications/gnome-notifications-panel.desktop.in.in
View file

@ -8,7 +8,7 @@ Terminal=false
Type=Application Type=Application
NoDisplay=true NoDisplay=true
StartupNotify=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; OnlyShowIn=GNOME;Unity;
X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Product=gnome-control-center

2
panels/online-accounts/gnome-online-accounts-panel.desktop.in.in
View file

@ -8,7 +8,7 @@ Terminal=false
Type=Application Type=Application
NoDisplay=true NoDisplay=true
StartupNotify=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; OnlyShowIn=GNOME;Unity;
X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Product=gnome-control-center

2
panels/privacy/gnome-privacy-panel.desktop.in.in
View file

@ -9,7 +9,7 @@ Terminal=false
Type=Application Type=Application
NoDisplay=true NoDisplay=true
StartupNotify=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; OnlyShowIn=GNOME;Unity;
X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Product=gnome-control-center

2
panels/region/gnome-region-panel.desktop.in.in
View file

@ -8,7 +8,7 @@ Terminal=false
Type=Application Type=Application
NoDisplay=true NoDisplay=true
StartupNotify=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; OnlyShowIn=GNOME;Unity;
X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Product=gnome-control-center

2
panels/search/gnome-search-panel.desktop.in.in
View file

@ -8,7 +8,7 @@ Terminal=false
Type=Application Type=Application
NoDisplay=true NoDisplay=true
StartupNotify=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; OnlyShowIn=GNOME;Unity;
X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Product=gnome-control-center

2
panels/sharing/gnome-sharing-panel.desktop.in.in
View file

@ -8,7 +8,7 @@ Terminal=false
Type=Application Type=Application
NoDisplay=true NoDisplay=true
StartupNotify=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; OnlyShowIn=GNOME;Unity;
X-GNOME-Settings-Panel=sharing X-GNOME-Settings-Panel=sharing
# Translators: those are keywords for the sharing control-center panel # Translators: those are keywords for the sharing control-center panel

2
panels/universal-access/gnome-universal-access-panel.desktop.in.in
View file

@ -8,7 +8,7 @@ Terminal=false
Type=Application Type=Application
NoDisplay=true NoDisplay=true
StartupNotify=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; OnlyShowIn=GNOME;Unity;
X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Product=gnome-control-center

2
panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in
View file

@ -7,7 +7,7 @@ Terminal=false
Type=Application Type=Application
NoDisplay=true NoDisplay=true
StartupNotify=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; OnlyShowIn=GNOME;Unity;
X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Product=gnome-control-center

11
shell/cc-panel-loader.c
View file

@ -134,16 +134,6 @@ parse_categories (GDesktopAppInfo *app)
#define const_strv(s) ((const gchar* const*) s) #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")) if (g_strv_contains (const_strv (split), "X-GNOME-AltHidden"))
retval = CC_CATEGORY_HIDDEN; retval = CC_CATEGORY_HIDDEN;
else if (g_strv_contains (const_strv (split), "X-GNOME-ConnectivitySettings")) else if (g_strv_contains (const_strv (split), "X-GNOME-ConnectivitySettings"))
@ -158,7 +148,6 @@ parse_categories (GDesktopAppInfo *app)
retval = CC_CATEGORY_DETAILS; retval = CC_CATEGORY_DETAILS;
else if (g_strv_contains (const_strv (split), "HardwareSettings")) else if (g_strv_contains (const_strv (split), "HardwareSettings"))
retval = CC_CATEGORY_HARDWARE; retval = CC_CATEGORY_HARDWARE;
#endif
#undef const_strv #undef const_strv

7
shell/cc-shell-model.h
View file

@ -53,19 +53,12 @@ typedef struct _CcShellModelClass CcShellModelClass;
typedef struct _CcShellModelPrivate CcShellModelPrivate; typedef struct _CcShellModelPrivate CcShellModelPrivate;
typedef enum { typedef enum {
#ifdef CC_ENABLE_ALT_CATEGORIES
CC_CATEGORY_PERSONAL,
CC_CATEGORY_SYSTEM,
CC_CATEGORY_HARDWARE,
#else
CC_CATEGORY_CONNECTIVITY, CC_CATEGORY_CONNECTIVITY,
CC_CATEGORY_PERSONALIZATION, CC_CATEGORY_PERSONALIZATION,
CC_CATEGORY_ACCOUNT, CC_CATEGORY_ACCOUNT,
CC_CATEGORY_HARDWARE, CC_CATEGORY_HARDWARE,
CC_CATEGORY_DEVICES, CC_CATEGORY_DEVICES,
CC_CATEGORY_DETAILS, CC_CATEGORY_DETAILS,
#endif
CC_CATEGORY_HIDDEN, CC_CATEGORY_HIDDEN,
CC_CATEGORY_LAST CC_CATEGORY_LAST
} CcPanelCategory; } CcPanelCategory;