From: skeezix <skeezix@flotsam-vm.(none)>
Date: Thu, 15 Apr 2010 14:19:07 +0000 (-0400)
Subject: Move /usr/pandora/apps to menu instead of desktop; change pnd doc viewer to Arora... 
X-Git-Tag: Release-2010-05/1~17
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-libraries.git;a=commitdiff_plain;h=499532c4023eec58f630a59b6d7506353ea3e292

Move /usr/pandora/apps to menu instead of desktop; change pnd doc viewer to Arora instead of 'midori -a'
---

diff --git a/deployment/etc/pandora/conf/desktop b/deployment/etc/pandora/conf/desktop
index 62e5c3e..a43e22a 100644
--- a/deployment/etc/pandora/conf/desktop
+++ b/deployment/etc/pandora/conf/desktop
@@ -3,12 +3,12 @@
 # Desktop configuration
 
 [desktop]
-searchpath	/media/*/pandora/desktop:/media/*/pandora/apps:/usr/pandora/apps	# path to depth-search for PXMLs and pnd-files
+searchpath	/media/*/pandora/desktop:/media/*/pandora/apps	# path to depth-search for PXMLs and pnd-files
 dotdesktoppath	~/Desktop/	# path for pndnotifyd to spit .desktop files into (run as root)
 iconpath	/tmp	# path for pndnotifyd to drop icons into (can be same as dotdesktoppath if WM permits)
 
 [menu]
-searchpath	/media/*/pandora/menu:/media/*/pandora/apps	# path to depth-search for PXMLs and pnd-files
+searchpath	/media/*/pandora/menu:/media/*/pandora/apps:/usr/pandora/apps	# path to depth-search for PXMLs and pnd-files
 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)
 
@@ -21,6 +21,6 @@ iconpath	/tmp	# path for pndnotifyd to drop icons into (can be same as dotdeskto
 [info]
 emit_info	1			# 0->no info .desktop; !0->yes to info .desktop
 dotdesktoppath	/usr/share/applications	# path for pndnotifyd to spit .desktop files into
-viewer		../../../usr/bin/midori	# sh-script or prog to run. Use wrapper sh if needed.
-viewer_args	-a			# args. <- plus filename will be passed. ie: "-a filename.html"
+viewer		../../../usr/bin/arora	# sh-script or prog to run. Use wrapper sh if needed.
+viewer_args				# args. <- plus filename will be passed. ie: "-a filename.html"
 category	Documentation		# freedesktop standard category to use
diff --git a/include/pnd_io_evdev.h b/include/pnd_io_evdev.h
index 3503a9d..450733c 100644
--- a/include/pnd_io_evdev.h
+++ b/include/pnd_io_evdev.h
@@ -58,7 +58,7 @@ unsigned char pnd_evdev_catchup ( unsigned char blockp ); // will do all open de
 
 // fetch dpad state -- a mask of what buttons are pressed currently
 // return -1 if device not open
-int pnd_evdev_dpad_state ( pnd_evdev_e device ); // returns bitmask of pnd_evdev_dpad_e
+unsigned int pnd_evdev_dpad_state ( pnd_evdev_e device ); // returns bitmask of pnd_evdev_dpad_e
 
 // try to obtain X/Y axis for the requested nub
 // r_nubstate best not be null or the behaviour is undefined. (Well, it is defined .. *catch fire*)
diff --git a/lib/pnd_io_evdev.c b/lib/pnd_io_evdev.c
index c57392e..98a8550 100644
--- a/lib/pnd_io_evdev.c
+++ b/lib/pnd_io_evdev.c
@@ -284,7 +284,7 @@ unsigned char pnd_evdev_catchup ( unsigned char blockp ) {
   return ( 1 );
 }
 
-int pnd_evdev_dpad_state ( pnd_evdev_e device ) {
+unsigned int pnd_evdev_dpad_state ( pnd_evdev_e device ) {
   if ( evmap [ device ].fd < 0 ) {
     return ( -1 );
   }