From: skeezix <skeezix@flotsam-vm.(none)>
Date: Wed, 9 Dec 2009 04:21:42 +0000 (-0500)
Subject: Misc little fixes of last commits; ie: change interval to 5s default instead of 10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-libraries.git;a=commitdiff_plain;h=710cb5d7f27a08040f5bf18aa41d9a32ccff92cd

Misc little fixes of last commits; ie: change interval to 5s default instead of 10
- change 'apps.autodiscovery.searchpath' to be 'everything' (desktop/menu and apps from prior to recent changes), just to make sure pmenu gets it all
- point deployment menu to correct folder
---

diff --git a/apps/pndnotifyd.c b/apps/pndnotifyd.c
index 4d3d701..31d9c92 100644
--- a/apps/pndnotifyd.c
+++ b/apps/pndnotifyd.c
@@ -82,7 +82,7 @@ unsigned char perform_discoveries ( char *appspath, char *overridespath,
 int main ( int argc, char *argv[] ) {
   // behaviour
   unsigned char scanonlaunch = 1;
-  unsigned int interval_secs = 10;
+  unsigned int interval_secs = 5;
   // misc
   int i;
 
@@ -216,9 +216,11 @@ int main ( int argc, char *argv[] ) {
 	pnd_log ( pndn_rem, "No applications found in desktop search path\n" );
       }
 
-      pnd_log ( pndn_rem, "Scanning menu paths----------------------------\n" );
-      if ( ! perform_discoveries ( menu_appspath, overridespath, menu_dotdesktoppath, menu_iconpath ) ) {
-	pnd_log ( pndn_rem, "No applications found in menu search path\n" );
+      if ( menu_appspath && menu_dotdesktoppath && menu_iconpath ) {
+	pnd_log ( pndn_rem, "Scanning menu paths----------------------------\n" );
+	if ( ! perform_discoveries ( menu_appspath, overridespath, menu_dotdesktoppath, menu_iconpath ) ) {
+	  pnd_log ( pndn_rem, "No applications found in menu search path\n" );
+	}
       }
 
       // if we've got a hup script located, lets invoke it
@@ -235,7 +237,8 @@ int main ( int argc, char *argv[] ) {
     } // need to rediscover?
 
     // lets not eat up all the CPU
-    // should use an alarm or select() or something
+    // should use an alarm or select() or something -- I mean really, why aren't I putting interval_secs into
+    // the select() call above in pnd_notify_whatsitcalled()? -- but lets not break this right before release shall we
     sleep ( interval_secs );
 
   } // while
diff --git a/deployment/etc/pandora/conf/apps b/deployment/etc/pandora/conf/apps
index ecf98e4..1444505 100644
--- a/deployment/etc/pandora/conf/apps
+++ b/deployment/etc/pandora/conf/apps
@@ -4,10 +4,10 @@
 
 [autodiscovery]
 # searchpath is a list of paths (colon separated) in which to look for PXML.xml or .pnd-file applications
-searchpath	/media/*/pandora/apps:/usr/pandora/apps
+searchpath	/media/*/pandora/apps:/media/*/pandora/desktop:/media/*/pandora/menu:/usr/pandora/apps
 # notifypath is a list of paths to monitor; if anything in those paths changes, the searchpath is rescanned
 # note that for each path chunk, all current subdirs of that path are also watched)
-notifypath	/media:/media/*/pandora/apps:/usr/pandora/apps
+notifypath	/media:/media/*/pandora/apps:/media/*/pandora/desktop:/media/*/pandora/menu:/usr/pandora/apps
 
 # PXMLs may be overridden .. ie: overrides are a subset of PXML, where the values are copied over the full PXML
 [overrides]
diff --git a/deployment/etc/pandora/conf/desktop b/deployment/etc/pandora/conf/desktop
index 0fa9ed4..e1626e2 100644
--- a/deployment/etc/pandora/conf/desktop
+++ b/deployment/etc/pandora/conf/desktop
@@ -9,7 +9,7 @@ iconpath	/tmp	# path for pndnotifyd to drop icons into (can be same as dotdeskto
 
 [menu]
 searchpath	/mnt/sd?/pandora/menu	# path to depth-search for PXMLs and pnd-files
-dotdesktoppath	/tmp/menu		# path for pndnotifyd to spit .desktop files into
+dotdesktoppath	/usr/share/applications		# path for pndnotifyd to spit .desktop files into
 iconpath	/tmp	# path for pndnotifyd to drop icons into (can be same as dotdesktoppath if WM permits)
 
 [launcher]