Fix bug #1486 -- bat doesn't show any errors on command-line

[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 b34b49755c276d7eaf8e3f14d3bb5cab8d436dd3..f212c03b19adba81c3a6704458e6cbfa8447fa35 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-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2010 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.
@@ -26,8 +26,6 @@
    Switzerland, email:ftf@fsfeurope.org.
 */
 /*
- *   Version $Id$
- *
  *  Main program for bat (qt-console)
  *
  *   Kern Sibbald, January MMVII
@@ -48,6 +46,8 @@ static void usage();
 static int check_resources();
 
 extern bool parse_bat_config(CONFIG *config, const char *configfile, int exit_code);
+extern void message_callback(int /* type */, char *msg);
+
 
 #define CONFIG_FILE "bat.conf"     /* default configuration file */
 
@@ -58,7 +58,6 @@ static char *configfile = NULL;
 int main(int argc, char *argv[])
 {
    int ch;
-   int rc;
    bool no_signals = true;
    bool test_config = false;
 
@@ -75,7 +74,7 @@ int main(int argc, char *argv[])
    batTranslator.load(QString("bat_") + QLocale::system().name());
    app->installTranslator(&batTranslator);
 
-
+   register_message_callback(message_callback);
 
 #ifdef xENABLE_NLS
    setlocale(LC_ALL, "");
@@ -85,6 +84,7 @@ int main(int argc, char *argv[])
 
    init_stack_dump();
    my_name_is(argc, argv, "bat");
+   lmgr_init_thread();
    init_msg(NULL, NULL);
    working_directory  = "/tmp";
 
@@ -159,9 +159,7 @@ int main(int argc, char *argv[])
    mainWin = new MainWin;
    mainWin->show();
 
-   rc = app->exec();
-// sm_dump(false);
-   return rc;
+   return app->exec();
 }
 
 void terminate_console(int /*sig*/)