Recursively call store if src type is dbus.Variant

Zack Field · Zack Field · commit eb8912b711e8 · 2019-10-14T17:41:51.000-07:00
diff --git a/dbus.go b/dbus.go
@@ -87,10 +87,15 @@ func setDest(dest, src reflect.Value) error {
 	}
 	if isVariant(src.Type()) && !isVariant(dest.Type()) {
 		src = getVariantValue(src)
+		// not quite ready to directly convert,
+		// since we're dealing with a variant value
+		// which may have a complex type
+		return store(dest, src)
 	}
+
 	if !src.Type().ConvertibleTo(dest.Type()) {
 		return fmt.Errorf(
-			"dbus.Store: type mismatch: cannot convert %s to %s",
+			"dbus.Store: base type mismatch: cannot convert %s to %s",
 			src.Type(), dest.Type())
 	}
 	dest.Set(src.Convert(dest.Type()))

Original file line number	Diff line number	Diff line change
`@@ -87,10 +87,15 @@ func setDest(dest, src reflect.Value) error {`
`87`	`87`	`}`
`88`	`88`	`if isVariant(src.Type()) && !isVariant(dest.Type()) {`
`89`	`89`	`src = getVariantValue(src)`
	`90`	`+ // not quite ready to directly convert,`
	`91`	`+ // since we're dealing with a variant value`
	`92`	`+ // which may have a complex type`
	`93`	`+ return store(dest, src)`
`90`	`94`	`}`
	`95`	`+`
`91`	`96`	`if !src.Type().ConvertibleTo(dest.Type()) {`
`92`	`97`	`return fmt.Errorf(`
`93`		`- "dbus.Store: type mismatch: cannot convert %s to %s",`
	`98`	`+ "dbus.Store: base type mismatch: cannot convert %s to %s",`
`94`	`99`	`src.Type(), dest.Type())`
`95`	`100`	`}`
`96`	`101`	`dest.Set(src.Convert(dest.Type()))`