telepathy-mission-control: mcd_storage_maybe_migrate_parameters: fix error handling

Simon McVittie smcv at kemper.freedesktop.org
Thu Feb 6 05:06:51 PST 2014


Module: telepathy-mission-control
Branch: master
Commit: 0cfbd8ff018ce0387a6c517428cc1bd762d450b1
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=0cfbd8ff018ce0387a6c517428cc1bd762d450b1

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Feb  5 14:48:12 2014 +0000

mcd_storage_maybe_migrate_parameters: fix error handling

mcp_account_storage_get_parameter() doesn't raise a GError.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71093
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>

---

 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;
         }
 



More information about the telepathy-commits mailing list