diff options
| author | Vincent Untz <vuntz@gnome.org> | 2012-10-11 14:49:13 +0200 |
|---|---|---|
| committer | Vincent Untz <vuntz@gnome.org> | 2012-10-11 15:26:40 +0200 |
| commit | 7a647466f4455c289549e399b20f86bd50190df3 (patch) | |
| tree | 68f85d85dc79a831f98eb6394c760fab8ce42861 | |
| parent | 055c439fade52e30f3c3a866881f6a2890c2a331 (diff) | |
| download | desktop-file-utils-7a647466f4455c289549e399b20f86bd50190df3.tar.gz | |
validate: Change some related categories from "and" to "or"
https://bugs.freedesktop.org/show_bug.cgi?id=35844
See http://lists.freedesktop.org/archives/xdg/2012-October/012526.html
| -rw-r--r-- | src/validate.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/validate.c b/src/validate.c index 37d875b..3b5a471 100644 --- a/src/validate.c +++ b/src/validate.c @@ -406,13 +406,13 @@ static struct { { "Calendar", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } }, { "ContactManagement", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } }, { "Database", FALSE, FALSE, FALSE, { NULL }, { "Office", "Development", "AudioVideo", NULL } }, - { "Dictionary", FALSE, FALSE, FALSE, { NULL }, { "Office;TextTools", NULL } }, + { "Dictionary", FALSE, FALSE, FALSE, { NULL }, { "Office", "TextTools", NULL } }, { "Chart", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } }, - { "Email", FALSE, FALSE, FALSE, { NULL }, { "Office;Network", NULL } }, + { "Email", FALSE, FALSE, FALSE, { NULL }, { "Office", "Network", NULL } }, { "Finance", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } }, { "FlowChart", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } }, { "PDA", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } }, - { "ProjectManagement", FALSE, FALSE, FALSE, { NULL }, { "Office;Development", NULL } }, + { "ProjectManagement", FALSE, FALSE, FALSE, { NULL }, { "Office", "Development", NULL } }, { "Presentation", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } }, { "Spreadsheet", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } }, { "WordProcessor", FALSE, FALSE, FALSE, { NULL }, { "Office", NULL } }, @@ -467,30 +467,30 @@ static struct { { "StrategyGame", FALSE, FALSE, FALSE, { NULL }, { "Game", NULL } }, { "Art", FALSE, FALSE, FALSE, { NULL }, { "Education", NULL } }, { "Construction", FALSE, FALSE, FALSE, { NULL }, { "Education", NULL } }, - { "Music", FALSE, FALSE, FALSE, { NULL }, { "AudioVideo;Education", NULL } }, + { "Music", FALSE, FALSE, FALSE, { NULL }, { "AudioVideo", "Education", NULL } }, { "Languages", FALSE, FALSE, FALSE, { NULL }, { "Education", NULL } }, { "Science", FALSE, FALSE, FALSE, { NULL }, { "Education", NULL } }, - { "ArtificialIntelligence", FALSE, FALSE, FALSE, { NULL }, { "Education;Science", NULL } }, - { "Astronomy", FALSE, FALSE, FALSE, { NULL }, { "Education;Science", NULL } }, - { "Biology", FALSE, FALSE, FALSE, { NULL }, { "Education;Science", NULL } }, - { "Chemistry", FALSE, FALSE, FALSE, { NULL }, { "Education;Science", NULL } }, - { "ComputerScience", FALSE, FALSE, FALSE, { NULL }, { "Education;Science", NULL } }, - { "DataVisualization", FALSE, FALSE, FALSE, { NULL }, { "Education;Science", NULL } }, + { "ArtificialIntelligence", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Astronomy", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Biology", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Chemistry", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "ComputerScience", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "DataVisualization", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, { "Economy", FALSE, FALSE, FALSE, { NULL }, { "Education", NULL } }, - { "Electricity", FALSE, FALSE, FALSE, { NULL }, { "Education;Science", NULL } }, + { "Electricity", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, { "Geography", FALSE, FALSE, FALSE, { NULL }, { "Education", NULL } }, - { "Geology", FALSE, FALSE, FALSE, { NULL }, { "Education;Science", NULL } }, - { "Geoscience", FALSE, FALSE, FALSE, { NULL }, { "Education;Science", NULL } }, + { "Geology", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Geoscience", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, { "History", FALSE, FALSE, FALSE, { NULL }, { "Education", NULL } }, - { "ImageProcessing", FALSE, FALSE, FALSE, { NULL }, { "Education;Science", NULL } }, + { "ImageProcessing", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, { "Literature", FALSE, FALSE, FALSE, { NULL }, { "Education", NULL } }, - { "Math", FALSE, FALSE, FALSE, { NULL }, { "Education;Science", NULL } }, - { "NumericalAnalysis", FALSE, FALSE, FALSE, { NULL }, { "Education;Science;Math", NULL } }, - { "MedicalSoftware", FALSE, FALSE, FALSE, { NULL }, { "Education;Science", NULL } }, - { "Physics", FALSE, FALSE, FALSE, { NULL }, { "Education;Science", NULL } }, - { "Robotics", FALSE, FALSE, FALSE, { NULL }, { "Education;Science", NULL } }, + { "Math", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "NumericalAnalysis", FALSE, FALSE, FALSE, { NULL }, { "Education;Math", "Science;Math", NULL } }, + { "MedicalSoftware", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Physics", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, + { "Robotics", FALSE, FALSE, FALSE, { NULL }, { "Education", "Science", NULL } }, { "Sports", FALSE, FALSE, FALSE, { NULL }, { "Education", NULL } }, - { "ParallelComputing", FALSE, FALSE, FALSE, { NULL }, { "Education;Science;ComputerScience", NULL } }, + { "ParallelComputing", FALSE, FALSE, FALSE, { NULL }, { "Education;ComputerScience", "Science;ComputerScience", NULL } }, { "Amusement", FALSE, FALSE, FALSE, { NULL }, { NULL } }, { "Archiving", FALSE, FALSE, FALSE, { NULL }, { "Utility", NULL } }, { "Compression", FALSE, FALSE, FALSE, { NULL }, { "Utility;Archiving", NULL } }, |