[SCM] calf/master: + GUI: make 'text' attribute for labels higher-priority than 'param' attribute

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ad9708ec0c6c5a0bec61116fbcf7f996293a5cea
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Sun Nov 15 18:55:18 2009 +0000

    + GUI: make 'text' attribute for labels higher-priority than 'param' attribute

diff --git a/src/gui_controls.cpp b/src/gui_controls.cpp
index 7c8896e..8de4591 100644
--- a/src/gui_controls.cpp
+++ b/src/gui_controls.cpp
@@ -253,7 +253,7 @@ GtkWidget *label_param_control::create(plugin_gui *_gui, int _param_no)
 {
     gui = _gui, param_no = _param_no;
     string text;
-    if (param_no != -1)
+    if (param_no != -1 && !attribs.count("text"))
         text = get_props().name;
     else
         text = attribs["text"];

-- 
calf audio plugins packaging