Only use the svg files for the generation of the png files.

[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 2da43403c98d96b79c6c7a930a7509a7e676ddf7..1facbaa7bd7123129a4064e9969b733635f44783 100644 (file)
--- a/bacula/src/qt-console/main.cpp
+++ b/bacula/src/qt-console/main.cpp
@@ -1,14 +1,14 @@
 /*
    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.
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation plus additions
-   that are listed in the file LICENSE.
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
 
    This program is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,11 +25,12 @@
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
 */
-
 /*
+ *   Version $Id$
+ *
  *  Main program for bat (qt-console)
  *
- *   Kern Sibbald, January MMVI
+ *   Kern Sibbald, January MMVII
  *
  */ 
 
@@ -37,9 +38,8 @@
 #include <QApplication>
 #include "bat.h"
 
-
-/* Imported functions */
-int authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons);
+MainWin *mainWin;
+QApplication *app;
 
 /* Forward referenced functions */
 void terminate_console(int sig);                                
@@ -51,14 +51,8 @@ static int check_resources();
 /* Static variables */
 static char *configfile = NULL;
 
-MainWindow *mainWin;
-QApplication *app;
-BSOCK *UA_sock = NULL;
-
-
 int main(int argc, char *argv[])
 {
-
    int ch;
    bool no_signals = true;
    bool test_config = false;
@@ -66,10 +60,8 @@ int main(int argc, char *argv[])
 
    app = new QApplication(argc, argv);        
    app->setQuitOnLastWindowClosed(true);
+   QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 
-   mainWin = new MainWindow;
-
-   mainWin->show();
 
 #ifdef ENABLE_NLS
    setlocale(LC_ALL, "");
@@ -78,7 +70,7 @@ int main(int argc, char *argv[])
 #endif
 
    init_stack_dump();
-   my_name_is(argc, argv, "gnome-console");
+   my_name_is(argc, argv, "bat");
    init_msg(NULL, NULL);
    working_directory  = "/tmp";
 
@@ -87,6 +79,8 @@ int main(int argc, char *argv[])
    sigignore.sa_handler = SIG_IGN;
    sigfillset(&sigignore.sa_mask);
    sigaction(SIGPIPE, &sigignore, NULL);
+   sigaction(SIGUSR2, &sigignore, NULL);
+
 
    while ((ch = getopt(argc, argv, "bc:d:r:st?")) != -1) {
       switch (ch) {
@@ -142,6 +136,9 @@ int main(int argc, char *argv[])
       Emsg1(M_ERROR_TERM, 0, _("Please correct configuration file: %s\n"), configfile);
    }
 
+   mainWin = new MainWin;
+   mainWin->show();
+
    return app->exec();
 }
 
@@ -167,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.
@@ -185,6 +183,7 @@ static int tls_pem_callback(char *buf, int size, const void *userdata)
    return 0;
 #endif
 }
+#endif
 
 
 /*