dismissing pw dialog now closes program

[presencevnc] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index ad5ea07..ccb7dc2 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,26 +1,21 @@
-/****************************************************************************
-**
-** Copyright (C) 2008 Urs Wolfer <uwolfer @ kde.org>
-**
-** This file is part of KDE.
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; see the file COPYING. If not, write to
-** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-** Boston, MA 02110-1301, USA.
-**
-****************************************************************************/
+/*
+    Presence VNC
+    Copyright (C) 2010 Christian Pulvermacher
 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 #include <QApplication>
 #include <QInputDialog>
 #include <QString>
@@ -29,7 +24,11 @@
 
 int main(int argc, char *argv[])
 {
+       QCoreApplication::setOrganizationName("Presence VNC");
+       QCoreApplication::setApplicationName("Presence VNC");
+
        QApplication app(argc, argv);
+       //app.setAutoSipEnabled(true);
 
        QString url;
        int quality = 2;
@@ -41,12 +40,6 @@ int main(int argc, char *argv[])
                url = arguments.at(1);
                if(arguments.count() > 2)
                        quality = arguments.at(2).toInt();
-       } else {
-               url = QInputDialog::getText(0, "Connect to Host", "VNC Server:");
-               if(url.isEmpty()) { //dialog dismissed or nothing entered
-                       return 1;
-               }
-               url = "vnc://" + url;
        }
        MainWindow main(url, quality);
        main.show();