From: skeezix <skeezix@flotsam-vm.(none)>
Date: Fri, 18 May 2012 01:30:57 +0000 (-0400)
Subject: mmenu: separate /pandora/mmenu scan from pnd-scan per se .. so if .desktop is scan... 
X-Git-Tag: sz_beta5~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-libraries.git;a=commitdiff_plain;h=3b2c95f59df1a8d24d46179bde3c69fb0db94b18

mmenu: separate /pandora/mmenu scan from pnd-scan per se .. so if .desktop is scan, and .pnd is not, but an aux-pnd searchpath is defined
then attempt to pnd-disco there (regardless of .pnd scan being disabled otherwise.) This will restore expected functionality from previous
(pre-.desktop scan) releases, and generalyl will not bother anyone (few use 'mmenu' specific apps anyway.) For people who do use it, it'll
start working again, though not quite as fast as a pure .desktop scan (since there are no .desktop's for the mmenu-specific pnds, by definition.)
---

diff --git a/minimenu/mmenu.c b/minimenu/mmenu.c
index 919b509..fbfb67f 100644
--- a/minimenu/mmenu.c
+++ b/minimenu/mmenu.c
@@ -555,10 +555,15 @@ void applications_scan ( void ) {
       }
     }
 
-    // aux apps?
+  } // app discovery on pnd-files?
+
+  // aux ("mmenu specific") apps?
+  if ( pnd_conf_get_as_char ( g_conf, "minimenu.aux_searchpath" ) ) {
     char *aux_apps = NULL;
     merge_apps = 0;
+
     aux_apps = pnd_conf_get_as_char ( g_conf, "minimenu.aux_searchpath" );
+
     if ( aux_apps && aux_apps [ 0 ] ) {
       pnd_log ( pndn_debug, "Looking for pnd applications here: %s\n", aux_apps );
       merge_apps = pnd_disco_search ( aux_apps, NULL );
@@ -595,7 +600,7 @@ void applications_scan ( void ) {
       }
     }
 
-  } // app discovery on pnd-files?
+  } // aux apps?
 
   // perform app discovery on .desktop files?
   //