Fix even more leaks

[pandora-libraries.git] / minimenu / freedesktop_cats.c

diff --git a/minimenu/freedesktop_cats.c b/minimenu/freedesktop_cats.c
index 27b6276..f4e7e78 100644 (file)
--- a/minimenu/freedesktop_cats.c
+++ b/minimenu/freedesktop_cats.c
@@ -12,6 +12,8 @@ freedesktop_cat_t freedesktop_complete[] = {
 
   // HACK
   { BADCATNAME,         NULL,           "Lazy PXML dev is lazy." },
+  { "NoParentCategory", NULL,           "To mean no parent category" },
+  { "NoSubcategory",    "NoneParent",   "To mean no subcategory" },
   // HACK
 
   { "AudioVideo",       NULL,           "A multimedia (audio/video) application" },
@@ -36,7 +38,9 @@ freedesktop_cat_t freedesktop_complete[] = {
   { "Translation",      "Development",   "A translation tool " },
   { "Calendar",         "Office",   "Calendar application " },
   { "ContactManagement",    "Office",   "E.g. an address book " },
-  { "Database",         "Office",   "Application to manage a database " },
+  { "Database",         "Office",       "Application to manage a database " },
+  { "Database",         "Development",  "Application to manage a database " },
+  { "Database",         "AudioVideo",   "Application to manage a database " },
   { "Dictionary",       "Office",   "A dictionary  " },
   { "Chart",            "Office",   "Chart application" },
   { "Email",            "Office",   "Email application" },
@@ -76,13 +80,23 @@ freedesktop_cat_t freedesktop_complete[] = {
   { "WebBrowser",       "Network",   "A web browser    " },
   { "WebDevelopment",   "Network",   "A tool for web developers " },
   { "Midi",             "AudioVideo",   "An app related to MIDI    " },
+  { "Midi",             "Audio",     "An app related to MIDI    " },
   { "Mixer",            "AudioVideo",   "Just a mixer  " },
+  { "Mixer",            "Audio",     "Just a mixer  " },
   { "Sequencer",        "AudioVideo",   "A sequencer  " },
+  { "Sequencer",        "Audio",     "A sequencer  " },
   { "Tuner",            "AudioVideo",   "A tuner  " },
+  { "Tuner",            "Audio",        "A tuner  " },
   { "TV",               "AudioVideo",   "A TV application" },
+  { "TV",               "Video",   "A TV application" },
   { "AudioVideoEditing",    "Audio",   "Application to edit audio/video files " },
+  { "AudioVideoEditing",    "Video",   "Application to edit audio/video files " },
+  { "AudioVideoEditing",    "AudioVideo",   "Application to edit audio/video files " },
   { "Player",           "Audio",   "Application to play audio/video files " },
+  { "Player",           "AudioVideo",   "Application to play audio/video files " },
+  { "Player",           "Video",   "Application to play audio/video files " },
   { "Recorder",         "Audio",   "Application to record audio/video files " },
+  { "Recorder",         "AudioVideo",   "Application to record audio/video files " },
   { "DiscBurning",      "AudioVideo",   "Application to burn a disc     " },
   { "ActionGame",       "Game",   "An action game " },
   { "AdventureGame",    "Game",   "Adventure style game" },
@@ -129,6 +143,7 @@ freedesktop_cat_t freedesktop_complete[] = {
   { "Emulator",         "Game",   "Emulator of another platform, such as a DOS emulator " },
   { "Engineering",      NULL, "Engineering software, e.g. CAD programs " },
   { "FileTools",        "Utility",   "A file tool utility " },
+  { "FileTools",        "System",   "A file tool utility " },
   { "FileManager",      "System",   "A file manager " },
   { "TerminalEmulator", "System",   "A terminal emulator application " },
   { "Filesystem",       "System",   "A file system tool  " },
@@ -150,13 +165,36 @@ freedesktop_cat_t freedesktop_complete[] = {
   { NULL,               NULL, NULL }
 };
 
-freedesktop_cat_t *freedesktop_category_query ( char *name ) {
+// return the found category, if ..
+//   name matches catname AND
+//   parent is NULL, or
+//     parent is value and matches cats parent.
+// ex:
+//   If you're looking for Game/NULL, you'll find it.
+//   If you're looking for Game/Emulator, you'll find it.
+//   If you're looking for Emulator/NULL you WILL NOT find it.
+freedesktop_cat_t *freedesktop_category_query ( char *name, char *parentcatname ) {
   freedesktop_cat_t *p = freedesktop_complete;
 
+  // if we're supplied "NoSubcategory" virtual name, then we set it to NULL for the search
+#if 0
+  if ( parentcatname && strcasecmp ( name, freedesktop_complete [ 2 ].cat ) == 0 ) {
+    name = parentcatname;
+    parentcatname = NULL;
+  }
+#endif
+
+  // search for the cat/parent combination
   while ( p -> cat ) {
 
     if ( strcasecmp ( p -> cat, name ) == 0 ) {
-      return ( p );
+
+      if ( parentcatname == NULL && p -> parent_cat == NULL ) {
+       return ( p );
+      } else if ( parentcatname && p -> parent_cat && strcasecmp ( p -> parent_cat, parentcatname ) == 0 ) {
+       return ( p );
+      }
+
     }
 
     p++;
@@ -165,6 +203,16 @@ freedesktop_cat_t *freedesktop_category_query ( char *name ) {
   return ( NULL );
 }
 
+unsigned int freedesktop_count ( void ) {
+  unsigned int i = 0;
+
+  while ( freedesktop_complete [ i ].cat ) {
+    i++;
+  }
+
+  return ( i );
+}
+
 #if 0
 int main ( void ) {