[PC-BSD Commits] r21691 - pcbsd-projects/PCDM

svn at pcbsd.org svn at pcbsd.org
Mon Mar 4 09:38:12 PST 2013


Author: kenmoore
Date: 2013-03-04 17:38:12 +0000 (Mon, 04 Mar 2013)
New Revision: 21691

Modified:
   pcbsd-projects/PCDM/pcdm-backend.cpp
Log:
Have PCDM only check the "tryexec" line for existance in an xsessions file. This will allow for special "exec" lines for the DE to start up properly



Modified: pcbsd-projects/PCDM/pcdm-backend.cpp
===================================================================
--- pcbsd-projects/PCDM/pcdm-backend.cpp	2013-03-04 15:27:50 UTC (rev 21690)
+++ pcbsd-projects/PCDM/pcdm-backend.cpp	2013-03-04 17:38:12 UTC (rev 21691)
@@ -367,13 +367,15 @@
   //Read each file to see if that desktop is installed
   for(int i=0; i<deFiles.length(); i++){
     QStringList tmp = readXSessionsFile(xDir+deFiles[i],localeCode);
+    //tmp[exec, name, comment, icon, tryexec]
     if(!tmp.isEmpty()){
       //Complete file paths if necessary
-      if(!tmp[0].startsWith("/")){ tmp[0] = "/usr/local/bin/"+tmp[0]; }
+      //if(!tmp[0].startsWith("/")){ tmp[0] = "/usr/local/bin/"+tmp[0]; }
       if(!tmp[3].startsWith("/")&&!tmp[3].startsWith(":")&&!tmp[3].isEmpty()){ tmp[3] = xIconDir+tmp[3]; }
       if(!tmp[4].startsWith("/")){ tmp[4] = "/usr/local/bin/"+tmp[4]; }
-      //Check for valid DE
-      if(QFile::exists(tmp[0]) && QFile::exists(tmp[4])){
+      //Check for valid DE using the "tryexec" line
+        //this allows for special startup commands on the "exec" line
+      if(QFile::exists(tmp[4])){
         //Add the DE to list of installed xsessions
 	instXBinList << tmp[0];
 	instXNameList << tmp[1];



More information about the Commits mailing list