Attachment 88349 Details for Bug 71048 – 03/15] _tp_protocol_parse_rcc: produce debug output

[patch] 03/15] _tp_protocol_parse_rcc: produce debug output

0003-_tp_protocol_parse_rcc-produce-debug-output.patch (text/plain), 2.71 KB, created by Simon McVittie on 2013-10-30 12:54:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-10-30 12:54:29 UTC

Size: 2.71 KB

patch

obsolete

>From fdbf575f4fbae4b1613408c708f134f1ab311a64 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 30 Oct 2013 11:59:22 +0000
>Subject: [PATCH 03/15] _tp_protocol_parse_rcc: produce debug output
>
>---
> telepathy-glib/protocol.c | 36 +++++++++++++++++++++++++++++++-----
> 1 file changed, 31 insertions(+), 5 deletions(-)
>
>diff --git a/telepathy-glib/protocol.c b/telepathy-glib/protocol.c
>index caf78ce..b634a7f 100644
>--- a/telepathy-glib/protocol.c
>+++ b/telepathy-glib/protocol.c
>@@ -1465,16 +1465,30 @@ _tp_protocol_parse_channel_class (GKeyFile *file,
> 
>       /* keys without a space are reserved */
>       if (space == NULL)
>-        goto cleanup;
>+        {
>+          DEBUG ("\t'%s' isn't a fixed property", *key);
>+          goto cleanup;
>+        }
> 
>       property = g_strndup (*key, space - *key);
>       dbus_type = space + 1;
> 
>       if (!init_gvalue_from_dbus_sig (dbus_type, v))
>-        goto cleanup;
>+        {
>+          DEBUG ("\tunable to parse D-Bus type '%s' for '%s' in a "
>+              ".manager file", dbus_type, property);
>+          goto cleanup;
>+        }
> 
>       if (!parse_default_value (v, dbus_type, value, file, group, *key))
>-        goto cleanup;
>+        {
>+          DEBUG ("\tunable to parse '%s' as a value of type '%s' for '%s'",
>+              value, dbus_type, property);
>+          goto cleanup;
>+        }
>+
>+      DEBUG ("\tfixed: '%s' of type '%s' = '%s'",
>+          property, dbus_type, value);
> 
>       /* transfer ownership to @ret */
>       g_hash_table_insert (ret, property, v);
>@@ -1500,16 +1514,27 @@ cleanup:
> }
> 
> static GValueArray *
>-_tp_protocol_parse_rcc (GKeyFile *file,
>+_tp_protocol_parse_rcc (const gchar *cm_debug_name,
>+    const gchar *protocol_debug_name,
>+    GKeyFile *file,
>     const gchar *group)
> {
>   GHashTable *fixed;
>   GStrv allowed;
>   GValueArray *ret;
>+  guint i;
>+
>+  DEBUG ("%s/%s: parsing requestable channel class '%s'", cm_debug_name,
>+      protocol_debug_name, group);
> 
>   fixed = _tp_protocol_parse_channel_class (file, group);
>   allowed = g_key_file_get_string_list (file, group, "allowed", NULL, NULL);
> 
>+  for (i = 0; allowed != NULL && allowed[i] != NULL; i++)
>+    {
>+      DEBUG ("\tallowed: '%s'", allowed[i]);
>+    }
>+
>   ret = tp_value_array_build (2,
>       TP_HASH_TYPE_CHANNEL_CLASS, fixed,
>       G_TYPE_STRV, allowed,
>@@ -1709,7 +1734,8 @@ _tp_protocol_parse_manager_file (GKeyFile *file,
>   if (rcc_groups != NULL)
>     {
>       for (rcc_group = rcc_groups; *rcc_group != NULL; rcc_group++)
>-        g_ptr_array_add (rccs, _tp_protocol_parse_rcc (file, *rcc_group));
>+        g_ptr_array_add (rccs,
>+            _tp_protocol_parse_rcc (cm_debug_name, name, file, *rcc_group));
>     }
> 
>   g_strfreev (rcc_groups);
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 71048: 88347 | 88348 | 88349 | 88350 | 88351 | 88352 | 88353 | 88354 | 88355 | 88356 | 88357 | 88358 | 88359 | 88360 | 88361 | 89036 | 89037

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.