Merge branch 'master' into next

3 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 2608ac1..516c4f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 This file contains information about the changes done to
 the ODR-DabMux in this repository
 
+2015-07-03: Matthias P. Braendli <matthias@mpb.li>
+	(v0.7.4):
+		Allow empty component labels
+		Fix compilation with ZeroMQ 4.1.x
+
 2015-04-10: Matthias P. Braendli <matthias@mpb.li>
 	(v0.7.3):
 		Security: RC only listens on localhost.
diff --git a/configure.ac b/configure.ac
index cd34dd5..a24258b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 # along with ODR-DabMux.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.61)
-AC_INIT([ODR-DabMux], [0.7.3], [matthias.braendli@mpb.li])
+AC_INIT([ODR-DabMux], [0.7.4], [matthias.braendli@mpb.li])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE([-Wall subdir-objects foreign])
diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp
index 89f6d87..6092e66 100644
--- a/src/ConfigParser.cpp
+++ b/src/ConfigParser.cpp
@@ -395,15 +395,17 @@ void parse_ptree(boost::property_tree::ptree& pt,
         component->type = component_type;
 
         int success = -5;
-        string componentlabel = pt_comp.get<string>("label");
+        string componentlabel = pt_comp.get("label", "");
         string componentshortlabel(componentlabel);
         try {
             componentshortlabel = pt_comp.get<string>("shortlabel");
             success = component->label.setLabel(componentlabel, componentshortlabel);
         }
         catch (ptree_error &e) {
-            etiLog.level(warn) << "Component short label undefined, "
-                "truncating label " << componentlabel;
+            if (not componentlabel.empty()) {
+                etiLog.level(warn) << "Component short label undefined, "
+                    "truncating label " << componentlabel;
+            }
 
             success = component->label.setLabel(componentlabel);
         }