summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevron Rees <kevron.m.rees@intel.com>2014-12-12 13:18:27 -0800
committerKevron Rees <kevron.m.rees@intel.com>2014-12-12 13:18:27 -0800
commit8ae9d4a9ec2150f6009c9bed76b3d038c4b12fba (patch)
treee7f940801121a0327bb53047f1177abb073f5dd3
parentcb3c1373816da467a8fd851fec16a932d23ee8f4 (diff)
downloadautomotive-message-broker-8ae9d4a9ec2150f6009c9bed76b3d038c4b12fba.tar.gz
fixed incorrect reporting of zone in dbus signal
-rw-r--r--plugins/dbus/abstractproperty.h8
-rw-r--r--plugins/dbus/dbussignaller.h2
2 files changed, 8 insertions, 2 deletions
diff --git a/plugins/dbus/abstractproperty.h b/plugins/dbus/abstractproperty.h
index fb40fa6b..181375d7 100644
--- a/plugins/dbus/abstractproperty.h
+++ b/plugins/dbus/abstractproperty.h
@@ -88,7 +88,13 @@ public:
}
void setSourceFilter(std::string filter) { mSourceFilter = filter; }
- void setZoneFilter(Zone::Type zone) { mZoneFilter = zone; }
+ void setZoneFilter(Zone::Type zone)
+ {
+ if(mValue)
+ mValue->zone = zone;
+
+ mZoneFilter = zone;
+ }
std::string sourceFilter() { return mSourceFilter; }
Zone::Type zoneFilter() { return mZoneFilter; }
diff --git a/plugins/dbus/dbussignaller.h b/plugins/dbus/dbussignaller.h
index 5cb10f6f..60d25cf4 100644
--- a/plugins/dbus/dbussignaller.h
+++ b/plugins/dbus/dbussignaller.h
@@ -117,7 +117,7 @@ private:
variantMap[property->name()] = val;
variantMap[sequenceName] = g_variant_new("i", property->sequence());
variantMap["Time"] = g_variant_new("d", property->timestamp());
- variantMap["Zone"] = g_variant_new("i", property->value()->zone);
+ variantMap["Zone"] = g_variant_new("i", property->zoneFilter());
}
GVariantBuilder builder;