From: skeezix <skeezix@flotsam-vm.(none)>
Date: Wed, 1 Apr 2009 13:55:10 +0000 (-0400)
Subject: Added -b UNIQUEID to both .desktop and to pnd_app_exec() -- why don't these two thing... 
X-Git-Tag: Release-2010-05/1~177
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e57d627cb7322af663039434905cfa04f1da5eb5;p=pandora-libraries.git

Added -b UNIQUEID to both .desktop and to pnd_app_exec() -- why don't these two things share common code?
Added /usr/bin/nohup to .desktop
Need to figure out when to use -x to pnd_run to kill X11
---

diff --git a/lib/pnd_apps.c b/lib/pnd_apps.c
index 4a2cf94..d2d2ce6 100644
--- a/lib/pnd_apps.c
+++ b/lib/pnd_apps.c
@@ -57,10 +57,10 @@ unsigned char pnd_apps_exec ( char *pndrun, char *fullpath, char *unique_id,
     argv [ f++ ] = "-s";
     argv [ f++ ] = rel_startdir;
   }
-  // skip -a (arguments) for now
+  argv [ f++ ] = "-b";
+  argv [ f++ ] = unique_id;
 
-  //argv [ f++ ] = "-b";
-  //argv [ f++ ] = baename;
+  // skip -a (arguments) for now
 
   if ( options & PND_EXEC_OPTION_NOUNION ) {
     argv [ f++ ] = "-n"; // no union for now
diff --git a/lib/pnd_desktop.c b/lib/pnd_desktop.c
index 0868629..0c91c74 100644
--- a/lib/pnd_desktop.c
+++ b/lib/pnd_desktop.c
@@ -84,9 +84,11 @@ unsigned char pnd_emit_dotdesktop ( char *targetpath, char *pndrun, pnd_disco_t
 
     // basics
     if ( p -> object_type == pnd_object_type_directory ) {
-      snprintf ( buffer, 1020, "Exec=%s -p %s -e %s -n", pndrun, p -> object_path, p -> exec );
+      snprintf ( buffer, 1020, "Exec=/usr/bin/nohup %s -p %s -e %s -b %s -n",
+		 pndrun, p -> object_path, p -> exec, p -> unique_id );
     } else if ( p -> object_type == pnd_object_type_pnd ) {
-      snprintf ( buffer, 1020, "Exec=%s -p %s/%s -e %s -n", pndrun, p -> object_path, p -> object_filename, p -> exec );
+      snprintf ( buffer, 1020, "Exec=/usr/bin/nohup %s -p %s/%s -e %s -b %s -n",
+		 pndrun, p -> object_path, p -> object_filename, p -> exec, p -> unique_id );
     }
 
     // start dir
diff --git a/testdata/pndsample/x86_echo.pnd b/testdata/pndsample/x86_echo.pnd
index d3891db..1bddde2 100644
Binary files a/testdata/pndsample/x86_echo.pnd and b/testdata/pndsample/x86_echo.pnd differ
diff --git a/testdata/pndsample/x86_ls.pnd b/testdata/pndsample/x86_ls.pnd
index 1cc6c85..db323e1 100644
Binary files a/testdata/pndsample/x86_ls.pnd and b/testdata/pndsample/x86_ls.pnd differ