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

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-09-11 17:19:47 +0000 (Tue, 11 Sep 2012)
New Revision: 19049

Added:
   pcbsd-projects/PCDM/PCDM
Modified:
   pcbsd-projects/PCDM/PCDM.pro
   pcbsd-projects/PCDM/main.cpp
   pcbsd-projects/PCDM/pcdm-backend.cpp
Log:
Change out the refresh loop methodology for PCDM, this should now allow us to refresh Xorg between instances



Index: pcbsd-projects/PCDM/PCDM
===================================================================
--- pcbsd-projects/PCDM/PCDM	2012-09-11 17:16:52 UTC (rev 19048)
+++ pcbsd-projects/PCDM/PCDM	2012-09-11 17:19:47 UTC (rev 19049)

Property changes on: pcbsd-projects/PCDM/PCDM
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
Modified: pcbsd-projects/PCDM/PCDM.pro
===================================================================
--- pcbsd-projects/PCDM/PCDM.pro	2012-09-11 17:16:52 UTC (rev 19048)
+++ pcbsd-projects/PCDM/PCDM.pro	2012-09-11 17:19:47 UTC (rev 19049)
@@ -1,5 +1,5 @@
 
-TARGET = PCDM
+TARGET = PCDM-single
 target.path=/usr/local/bin
 TEMPLATE = app
 LIBS += -lpcbsd -lpam
@@ -92,6 +92,9 @@
 dotrans.path=/usr/local/share/PCDM/i18n/
 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm /usr/local/share/pcbsd/i18n/
 
-INSTALLS += dotrans target
+scripts=PCDM
+scripts.path=/usr/local/bin
 
+INSTALLS += scripts dotrans target
+
 RESOURCES += PCDM.qrc

Modified: pcbsd-projects/PCDM/main.cpp
===================================================================
--- pcbsd-projects/PCDM/main.cpp	2012-09-11 17:16:52 UTC (rev 19048)
+++ pcbsd-projects/PCDM/main.cpp	2012-09-11 17:19:47 UTC (rev 19049)
@@ -14,12 +14,10 @@
 
 int main(int argc, char *argv[])
 {
-  bool Debug_Mode = TRUE;
-  bool runRestartLoop = TRUE;
+
   int returnCode;  
   Backend::openLogFile("/usr/local/share/PCDM/PCDM.log");   
   
-  while(runRestartLoop){
     QString changeLang; 
     // Load the configuration file
     Config::loadConfigFile("/usr/local/share/PCDM/pcdm.conf");
@@ -99,12 +97,6 @@
       */
     // Startup the desktop environment if possible
     Backend::startXSession();
-    // Check for whether to stay in the restart loop or not
-    if(Debug_Mode){
-      runRestartLoop = FALSE;	    
-    }
-    if(runRestartLoop){ Backend::log("Restarting PCDM"); }
-    else{ Backend::log("PCDM shutting down"); }
-  }
+
   return returnCode;
 }

Modified: pcbsd-projects/PCDM/pcdm-backend.cpp
===================================================================
--- pcbsd-projects/PCDM/pcdm-backend.cpp	2012-09-11 17:16:52 UTC (rev 19048)
+++ pcbsd-projects/PCDM/pcdm-backend.cpp	2012-09-11 17:19:47 UTC (rev 19049)
@@ -138,6 +138,7 @@
   // Now Wait for the process to finish
   p->waitForFinished(-1);  //do not time-out
   //XSession stopped, now clean up
+  p->close();
   saveUsername.clear(); 
   saveX.clear();
 }