improving DEBUG output

2 files changed, 12 insertions, 15 deletions

diff --git a/telepathy-logger/channel-text.c b/telepathy-logger/channel-text.c
index f0baeb0..69b5859 100644
--- a/telepathy-logger/channel-text.c
+++ b/telepathy-logger/channel-text.c
@@ -625,9 +625,8 @@ pendingproc_connect_signals (TplActionChain *ctx)
       on_received_signal_cb, tpl_text, NULL, NULL, &error);
   if (error != NULL)
     {
-      PATH_DEBUG (tpl_text, "received signal connect: %s", error->message);
-      g_error_free (error);
-      error = NULL;
+      PATH_DEBUG (tpl_text, "'received' signal connect: %s", error->message);
+      g_clear_error (&error);
       is_error = TRUE;
     }
 
@@ -635,9 +634,8 @@ pendingproc_connect_signals (TplActionChain *ctx)
       on_sent_signal_cb, tpl_text, NULL, NULL, &error);
   if (error != NULL)
     {
-      PATH_DEBUG (tpl_text, "sent signal connect: %s", error->message);
-      g_error_free (error);
-      error = NULL;
+      PATH_DEBUG (tpl_text, "'sent' signal connect: %s", error->message);
+      g_clear_error (&error);
       is_error = TRUE;
     }
 
@@ -645,9 +643,8 @@ pendingproc_connect_signals (TplActionChain *ctx)
       on_send_error_cb, tpl_text, NULL, NULL, &error);
   if (error != NULL)
     {
-      PATH_DEBUG (tpl_text, "send error signal connect: %s", error->message);
-      g_error_free (error);
-      error = NULL;
+      PATH_DEBUG (tpl_text, "'send error' signal connect: %s", error->message);
+      g_clear_error (&error);
       is_error = TRUE;
     }
 
@@ -655,9 +652,8 @@ pendingproc_connect_signals (TplActionChain *ctx)
       on_lost_message_cb, tpl_text, NULL, NULL, &error);
   if (error != NULL)
     {
-      PATH_DEBUG (tpl_text, "lost message signal connect: %s", error->message);
-      g_error_free (error);
-      error = NULL;
+      PATH_DEBUG (tpl_text, "'lost message' signal connect: %s", error->message);
+      g_clear_error (&error);
       is_error = TRUE;
     }
 
@@ -665,9 +661,8 @@ pendingproc_connect_signals (TplActionChain *ctx)
       tpl_text, NULL, NULL, &error);
   if (error != NULL)
     {
-      PATH_DEBUG (tpl_text, "channel closed signal connect: %s", error->message);
-      g_error_free (error);
-      error = NULL;
+      PATH_DEBUG (tpl_text, "'closed' signal connect: %s", error->message);
+      g_clear_error (&error);
       is_error = TRUE;
     }
 
diff --git a/telepathy-logger/observer.c b/telepathy-logger/observer.c
index fd05ef4..932bc3c 100644
--- a/telepathy-logger/observer.c
+++ b/telepathy-logger/observer.c
@@ -248,6 +248,7 @@ error:
     g_object_unref (tp_bus_daemon);
   g_clear_error (&error);
 
+  DEBUG ("Returning from observe channels");
   tp_svc_client_observer_return_from_observe_channels (dbus_context);
 }
 
@@ -263,6 +264,7 @@ got_tpl_channel_text_ready_cb (GObject *obj,
   observing_ctx->chan_n -= 1;
   if (observing_ctx->chan_n == 0)
     {
+      DEBUG ("Returning from observe channels");
       tp_svc_client_observer_return_from_observe_channels (dbus_ctx);
       g_slice_free (ObservingContext, observing_ctx);
     }