Use first valid category listed in Desktop Entry

src/xdgmenumaker

@@ -347,32 +347,25 @@ def remove_command_keys(command, desktopfile, icon):
 def clean_up_categories(categories):
     # cleaning up categories and keeping only registered freedesktop.org main
     # categories
-    if 'AudioVideo' in categories:
+    category_menus = {
-        category = multimedia
+        "AudioVideo":   multimedia,
-    elif 'Audio' in categories:
+        "Audio":        multimedia,
-        category = multimedia
+        "Video":        multimedia,
-    elif 'Video' in categories:
+        "Development":  development,
-        category = multimedia
+        "Education":    education,
-    elif 'Development' in categories:
+        "Game":         games,
-        category = development
+        "Graphics":     graphics,
-    elif 'Education' in categories:
+        "Network":      network,
-        category = education
+        "Office":       office,
-    elif 'Game' in categories:
+        "System":       system,
-        category = games
+        "Settings":     settings,
-    elif 'Graphics' in categories:
+        "Utility":      accessories
-        category = graphics
+    }
-    elif 'Network' in categories:
-        category = network
-    elif 'Office' in categories:
-        category = office
-    elif 'System' in categories:
-        category = system
-    elif 'Settings' in categories:
-        category = settings
-    elif 'Utility' in categories:
-        category = accessories
-    else:
     category = other
+    for candidate in categories:
+        if category_menus.has_key(candidate):
+            category = category_menus.get(candidate)
+            break
     return category
 
 def get_entry_info(desktopfile, ico_paths=True):