Move /usr/pandora/apps to menu instead of desktop; change pnd doc viewer to Arora...

diff --git a/deployment/etc/pandora/conf/desktop b/deployment/etc/pandora/conf/desktop
index 62e5c3e2dcb4f5683d93f1ab0bf51df797d7ead6..a43e22a2fc2f0d6ce22621d82fda32cb722df0a5 100644 (file)
--- 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 3503a9d44203273c2a37b59d12cf726da41b9754..450733ccef75eeb40a21d144b7204dc8a58803ae 100644 (file)
--- 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 c57392e9de1c0fda19c90c431028c4c920c88188..98a85507bce682f406a3347a55d5f82f10df4263 100644 (file)
--- 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 );
   }