-
Committer:
Michael Terry
-
Date:
2012-08-28 13:38:05 UTC
-
mfrom:
(542.1.1 unity-greeter)
-
Revision ID:
michael.terry@canonical.com-20120828133805-x8rg6zggkw6z1d9p
Revert "remove dead code" by Robert
This is needed to match dbus API of the methods
Otherwise you get
[+18.36s] CRITICAL: g_variant_get_variant: assertion `g_variant_is_of_type (value, G_VARIANT_TYPE_VARIANT)' failed
[+18.36s] CRITICAL: g_variant_iter_loop: assertion `g_variant_is_of_type (GVSI(iter)->value, G_VARIANT_TYPE_ARRAY)' failed
[+18.36s] CRITICAL: g_variant_get_variant: assertion `g_variant_is_of_type (value, G_VARIANT_TYPE_VARIANT)' failed
[+18.36s] CRITICAL: g_variant_iter_loop: assertion `g_variant_is_of_type (GVSI(iter)->value, G_VARIANT_TYPE_ARRAY)' failed
[+18.36s] CRITICAL: g_variant_get_variant: assertion `g_variant_is_of_type (value, G_VARIANT_TYPE_VARIANT)' failed
[+18.36s] CRITICAL: g_variant_iter_loop: assertion `g_variant_is_of_type (GVSI(iter)->value, G_VARIANT_TYPE_ARRAY)' failed
But with the unused DBus bits back, you get warnings, which Robert was trying
to avoid. So mark those DBus structs as protected to shut the compiler up,
and fix some array usage that vala does not allow on public/protected fields.