Change copyright as per agreement with FSFE

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

diff --git a/bacula/src/qt-console/medialist/medialist.cpp b/bacula/src/qt-console/medialist/medialist.cpp
index 8b1c9a2e67959178a26255fcd7a5a895725322c0..b8a255f1a57984508f4b732b80b35e2317c0c3af 100644 (file)
--- a/bacula/src/qt-console/medialist/medialist.cpp
+++ b/bacula/src/qt-console/medialist/medialist.cpp
@@ -1,29 +1,20 @@
 /*
-   Bacula® - The Network Backup Solution
-
-   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.
-   This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version three of the GNU Affero General Public
-   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
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-   Bacula® is a registered trademark of Kern Sibbald.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
+   Bacula(R) - The Network Backup Solution
+
+   Copyright (C) 2000-2016 Kern Sibbald
+
+   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.
+
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
  
 /*
@@ -45,7 +36,7 @@
 #include "run/run.h"
 #include "util/fmtwidgetitem.h"
 
-MediaList::MediaList()
+MediaList::MediaList() : Pages()
 {
    setupUi(this);
    m_name = tr("Pools");
@@ -74,8 +65,11 @@ MediaList::~MediaList()
  */
 void MediaList::populateTree()
 {
-   if (m_populated)
+   QTreeWidgetItem *pooltreeitem = NULL;
+
+   if (m_populated) {
       writeExpandedSettings();
+   }
    m_populated = true;
 
    Freeze frz(*mp_treeWidget); /* disable updating*/
@@ -102,7 +96,6 @@ void MediaList::populateTree()
    settings.beginGroup("MediaListTreeExpanded");
    QString query;
 
-   QTreeWidgetItem *pooltreeitem;
 
    /* Comma separated list of pools first */
    bool first = true;
@@ -165,9 +158,10 @@ void MediaList::populateTree()
                pooltreeitem->setExpanded(true);
             }
 
-            if (fieldlist.size() < 18)
+            if (fieldlist.size() < 21) { // Handle recyclepool specifically, and pool is already removed
+               Pmsg2(000, "Unexpected line %s %d", resultline.toUtf8().data(), fieldlist.size());
                continue; // some fields missing, ignore row
-
+            }
             int index = 0;
             TreeItemFormatter mediaitem(*pooltreeitem, 2);
   
@@ -243,7 +237,11 @@ void MediaList::populateTree()
             mediaitem.setNumericFld(index++, fld.next()); 
 
             /* recycle pool */
-            mediaitem.setTextFld(index++, fld.next()); 
+            if (fld.hasNext()) {
+               mediaitem.setTextFld(index++, fld.next());
+            } else {
+               mediaitem.setTextFld(index++, "");
+            }
 
          } /* foreach resultline */
          counter += 1;