bat: Display a nice graphic on media usage depending on the average

[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 ab99bace1bcf61919c2224a1c254370ad6460112..b34b49755c276d7eaf8e3f14d3bb5cab8d436dd3 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-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2009 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.
@@ -49,7 +49,7 @@ static int check_resources();
 
 extern bool parse_bat_config(CONFIG *config, const char *configfile, int exit_code);
 
-#define CONFIG_FILE "./bat.conf"   /* default configuration file */
+#define CONFIG_FILE "bat.conf"     /* default configuration file */
 
 /* Static variables */
 static CONFIG *config;
@@ -58,6 +58,7 @@ static char *configfile = NULL;
 int main(int argc, char *argv[])
 {
    int ch;
+   int rc;
    bool no_signals = true;
    bool test_config = false;
 
@@ -158,7 +159,9 @@ int main(int argc, char *argv[])
    mainWin = new MainWin;
    mainWin->show();
 
-   return app->exec();
+   rc = app->exec();
+// sm_dump(false);
+   return rc;
 }
 
 void terminate_console(int /*sig*/)
@@ -183,28 +186,6 @@ 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.
- */
-static int tls_pem_callback(char *buf, int size, const void *userdata)
-{
-#ifdef HAVE_TLS
-   const char *prompt = (const char *) userdata;
-   char *passwd;
-
-   passwd = getpass(prompt);
-   bstrncpy(buf, passwd, size);
-   return (strlen(buf));
-#else
-   buf[0] = 0;
-   return 0;
-#endif
-}
-#endif
-
-
 /*
  * Make a quick check to see that we have all the
  * resources needed.