dhb forgot to remove a couple of debugging printf's

[bacula/bacula] / bacula / src / qt-console / main.cpp

diff --git a/bacula/src/qt-console/main.cpp b/bacula/src/qt-console/main.cpp
index 1933a0b94989232ef0f8543a83a77bdcb19438ef..9c04b22997e29c878e990cd724a86e35d38bfaf9 100644 (file)
--- a/bacula/src/qt-console/main.cpp
+++ b/bacula/src/qt-console/main.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2007 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -25,30 +25,34 @@
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
 */
+/*
+ *   Version $Id$
+ *
+ *  Main program for bat (qt-console)
+ *
+ *   Kern Sibbald, January MMVII
+ *
+ */ 
+
 
-#include "mainwindow.h"
 #include <QApplication>
-#include "config.h"
-#include "bacula.h"
-#include "console_conf.h"
-#include "jcr.h"
+#include "bat.h"
 
+bool commDebug = false;
+MainWin *mainWin;
+QApplication *app;
 
-/* Imported functions */
-int authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons);
 
 /* Forward referenced functions */
 void terminate_console(int sig);                                
 static void usage();
 static int check_resources();
 
-#define CONFIG_FILE "./qt-console.conf"   /* default configuration file */
+#define CONFIG_FILE "./bat.conf"   /* default configuration file */
 
 /* Static variables */
 static char *configfile = NULL;
 
-MainWindow *mainWin;
-
 int main(int argc, char *argv[])
 {
 
@@ -57,12 +61,9 @@ int main(int argc, char *argv[])
    bool test_config = false;
 
 
-   QApplication app(argc, argv);        
-   app.setQuitOnLastWindowClosed(true);
-
-   mainWin = new MainWindow;
+   app = new QApplication(argc, argv);        
+   app->setQuitOnLastWindowClosed(true);
 
-   mainWin->show();
 
 #ifdef ENABLE_NLS
    setlocale(LC_ALL, "");
@@ -126,7 +127,6 @@ int main(int argc, char *argv[])
    }
 
    parse_config(configfile);
-   set_text("Configuration read.\n");
 
    if (init_crypto() != 0) {
       Emsg0(M_ERROR_TERM, 0, _("Cryptography library initialization failed.\n"));
@@ -136,7 +136,10 @@ int main(int argc, char *argv[])
       Emsg1(M_ERROR_TERM, 0, _("Please correct configuration file: %s\n"), configfile);
    }
 
-   return app.exec();
+   mainWin = new MainWin;
+   mainWin->show();
+
+   return app->exec();
 }
 
 void terminate_console(int sig)
@@ -150,7 +153,7 @@ static void usage()
    fprintf(stderr, _(
 PROG_COPYRIGHT
 "\nVersion: %s (%s) %s %s %s\n\n"
-"Usage: qt-console [-s] [-c config_file] [-d debug_level] [config_file]\n"
+"Usage: bat [-s] [-c config_file] [-d debug_level] [config_file]\n"
 "       -c <file>   set configuration file to file\n"
 "       -dnn        set debug level to nn\n"
 "       -s          no signals\n"
@@ -161,6 +164,7 @@ PROG_COPYRIGHT
    exit(1);
 }
 
+#ifdef xxx
 /*
  * Call-back for reading a passphrase for an encrypted PEM file
  * This function uses getpass(), which uses a static buffer and is NOT thread-safe.
@@ -179,6 +183,7 @@ static int tls_pem_callback(char *buf, int size, const void *userdata)
    return 0;
 #endif
 }
+#endif
 
 
 /*