Backport from Bacula Enterprise

[bacula/bacula] / bacula / src / qt-console / tray-monitor / tray-monitor.h

diff --git a/bacula/src/qt-console/tray-monitor/tray-monitor.h b/bacula/src/qt-console/tray-monitor/tray-monitor.h
index 33f111b8cbfa5430321134ded94ecba2724c9bfa..0e03420a901f965f51569a0e2af7fee1f47de5e3 100644 (file)
--- a/bacula/src/qt-console/tray-monitor/tray-monitor.h
+++ b/bacula/src/qt-console/tray-monitor/tray-monitor.h
@@ -1,17 +1,21 @@
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
+   Copyright (C) 2000-2015 Kern Sibbald
    Copyright (C) 2004-2014 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.
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
 
    You may use this file and others of this release according to the
    license defined in the LICENSE file, which includes the Affero General
    Public License, v3.0 ("AGPLv3") and some additional permissions and
    terms pursuant to its AGPLv3 Section 7.
 
-   Bacula® is a registered trademark of Kern Sibbald.
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
 /*
  * Includes specific to the tray monitor
@@ -117,7 +121,7 @@ public:
          /* Pointer to default value */
          *def++ = 0;
          strip_trailing_junk(def);
-
+         
          if (strcmp(dircomm->msg, "job") == 0) {
             if (strcmp(def, job_defs.job_name.toUtf8().data()) != 0) {
                goto bail_out;