From 0b50cd2fa474342fd670dc53a48d8f31654e6f95 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 5 Feb 2014 14:48:12 +0000
Subject: [PATCH 1/7] mcd_storage_maybe_migrate_parameters: fix error handling

mcp_account_storage_get_parameter() doesn't raise a GError.
---
 src/mcd-storage.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/mcd-storage.c b/src/mcd-storage.c
index 68ccd43..481c3dc 100644
--- a/src/mcd-storage.c
+++ b/src/mcd-storage.c
@@ -2097,7 +2097,6 @@ mcd_storage_maybe_migrate_parameters (McdStorage *self,
       const gchar *param_name = untyped_parameters[i];
       const TpConnectionManagerParam *param = tp_protocol_get_param (protocol,
           param_name);
-      GError *error = NULL;
       GVariantType *type = NULL;
       GVariant *value;
       McpAccountStorageSetResult res;
@@ -2122,10 +2121,7 @@ mcd_storage_maybe_migrate_parameters (McdStorage *self,
 
       if (value == NULL)
         {
-          DEBUG ("cannot migrate parameter '%s': %s #%d: %s",
-              param_name, g_quark_to_string (error->domain), error->code,
-              error->message);
-          g_error_free (error);
+          DEBUG ("cannot migrate parameter '%s'", param_name);
           goto next_param;
         }
 
-- 
1.9.rc1