From ba34b15fddcd16b82338a2d88b7aee8a1654af1f Mon Sep 17 00:00:00 2001
From: Nils Schwabe
Date: Wed, 19 Mar 2014 17:48:16 +0100
Subject: removed the file and path option for XMLs

---
 src/main.cpp | 41 +++--------------------------------------
 1 file changed, 3 insertions(+), 38 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 207f36e..9acc10e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,10 +20,6 @@
 #include "xsession.h"
 #include "httpxmldownloader.h"
 
-bool myLessThan(Session* a, Session* b) {
-    return *a < *b;
-}
-
 int main(int argc, char *argv[]) {
     QApplication a(argc, argv);
 
@@ -39,8 +35,7 @@ int main(int argc, char *argv[]) {
             "  -d, --default    name of default session\n"
             "  -c, --config     alternative config file\n"
             "  -e, --env        name of the environment\n"
-            "  -f, --file       direct boot FILE\n"
-            "  -p, --path       path to vmware .xml files\n"
+            "  -f, --file       direct boot .desktop file\n"
             "  -x, --xpath      path of X Session .desktop files\n"
             "  -u, --url        url of vmware .xml file\n"
             "  -s, --size       window size <width>x<height>\n"
@@ -80,17 +75,6 @@ int main(int argc, char *argv[]) {
                     "vmchooser: failed to run session").toUtf8().data() <<
                     std::endl;
             return EXIT_FAILURE;
-        } else if (file.endsWith(".xml")) {
-            // our XML-files can contain multiple sessions
-            // let's just take the first one
-            Session* s(VSession::readXmlFile(file).value(0));
-            if (s && s->run()) {
-                return EXIT_SUCCESS;
-            }
-            std::cerr << a.translate(
-                    "Console",
-                    "vmchooser: failed to run session").toUtf8().data() <<
-                    std::endl;
         } else {
             std::cerr << a.translate(
                     "Console",
@@ -103,7 +87,7 @@ int main(int argc, char *argv[]) {
     // read configuration file:
     //   file supplied as command line option or
     //   user vmchooser.conf or
-    //   globel vmchooser.conf
+    //   global vmchooser.conf
     QString confFile;
     if (cmdOptions.contains("config")) {
         confFile = cmdOptions.value("config");
@@ -185,7 +169,6 @@ int main(int argc, char *argv[]) {
 
     /* read session files */
     QList<Session*> xsessions(XSession::readSessions(xSessionPath));
-    QList<Session*> vsessions(VSession::readXmlDir(vSessionPath));
 
     Dialog w;
 
@@ -211,13 +194,7 @@ int main(int argc, char *argv[]) {
         w.showSettingsPVS();
 
     w.resize(width, height);
-    if (xsessions.empty() && vsessions.empty()) {
-        std::cerr << a.translate(
-                "Console",
-                "vmchooser: no sessions found").toUtf8().data()
-                << std::endl;
-        return EXIT_FAILURE;
-    }
+
     if (xsessions.size()) {
         qSort(xsessions.begin(), xsessions.end(), myLessThan);
         w.addItems(xsessions, a.translate("Dialog", "X Sessions"));
@@ -226,18 +203,6 @@ int main(int argc, char *argv[]) {
     if (!vSessionUrl.isEmpty()) {
     	w.addLabelItem(a.translate("Dialog", "Loading..."), a.translate("Dialog", "Virtual Sessions"));
     }
-    if (vsessions.size()) {
-    	if (!(QFile::permissions(runVmScript) & QFile::ExeUser)) {
-            std::cerr << a.translate(
-                    "Console",
-                    "vmchooser: external script %1 is not executable")
-                    .arg(runVmScript).toUtf8().data()
-                    << std::endl;
-            return EXIT_FAILURE;
-        }
-        qSort(vsessions.begin(), vsessions.end(), myLessThan);
-        w.addItems(vsessions, a.translate("Dialog", "Virtual Sessions"));
-    }
 
     QSettings SLXsettings(OPENSLXCONFIG, QSettings::NativeFormat);
     if ( SLXsettings.contains("SLX_BENCHMARK_VM") ) {
-- 
cgit v1.2.3-55-g7522