From 8b31b764a1f13c4f1651790157712794c11ea8d4 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 7 Jun 2012 08:57:15 -0500
Subject: improve the variant sanity tests in
 indicator_power_device_new_from_variant()

---
 src/device.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/device.c')

diff --git a/src/device.c b/src/device.c
index c79e145..c22aae8 100644
--- a/src/device.c
+++ b/src/device.c
@@ -641,9 +641,7 @@ indicator_power_device_new (const gchar * object_path,
 IndicatorPowerDevice *
 indicator_power_device_new_from_variant (GVariant * v)
 {
-  g_return_val_if_fail (v != NULL, NULL);
-  g_return_val_if_fail (g_variant_type_is_tuple(g_variant_get_type(v)), NULL);
-  g_return_val_if_fail (g_variant_n_children(v) == 6, NULL);
+  g_return_val_if_fail (g_variant_is_of_type (v, G_VARIANT_TYPE("(susdut)")), NULL);
 
   UpDeviceKind kind = UP_DEVICE_KIND_UNKNOWN;
   UpDeviceState state = UP_DEVICE_STATE_UNKNOWN;
-- 
cgit v1.2.3