X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=fb84d70a8e78dc6838678038bcfedd9e88ecb0c1;hb=7aa09b00585d5214cd91e77f1f1611e69f93d711;hp=31b8f0a2f03a5907656c910cbcd70cbc2be4a427;hpb=b213ef0991a13af0c74ffe5c54382c5c455c5496;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 31b8f0a..fb84d70 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -76,7 +76,7 @@ LogicSignal::~LogicSignal()
 {
 }
 
-boost::shared_ptr<pv::data::Logic> LogicSignal::data() const
+boost::shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
 {
 	return _data;
 }
@@ -238,8 +238,8 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 
 	// Add the trigger actions
 	const sr_dev_inst *const sdi = _session.get_device();
-	if (sr_config_list(sdi->driver, SR_CONF_TRIGGER_TYPE,
-		&gvar, sdi) == SR_OK)
+	if (sr_config_list(sdi->driver, sdi, NULL, SR_CONF_TRIGGER_TYPE,
+		&gvar) == SR_OK)
 	{
 		const char *const trig_types =
 			g_variant_get_string(gvar, NULL);