Update debug/log/warning usage

Signed-off-by: David Zeuthen <davidz@redhat.com>

5 files changed, 29 insertions, 90 deletions

diff --git a/src/daemon/goadaemon.c b/src/daemon/goadaemon.c
index b6f68cc..6577cc9 100644
--- a/src/daemon/goadaemon.c
+++ b/src/daemon/goadaemon.c
@@ -20,12 +20,6 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
-/* TODO:
- *
- * - Document files, directories and file formats somewhere.
- *   - $HOME/.config/goa-1.0/accounts.conf
- */
-
 #include "config.h"
 #include <glib/gi18n.h>
 #include <libnotify/notify.h>
@@ -149,11 +143,10 @@ create_monitor (const gchar *path, gboolean is_dir)
 
   if (monitor == NULL)
     {
-      /* TODO: syslog */
-      g_warning ("Error monitoring %s at %s: %s (%s, %d)",
-                 is_dir ? "directory" : "file",
-                 path,
-                 error->message, g_quark_to_string (error->domain), error->code);
+      goa_warning ("Error monitoring %s at %s: %s (%s, %d)",
+                   is_dir ? "directory" : "file",
+                   path,
+                   error->message, g_quark_to_string (error->domain), error->code);
       g_error_free (error);
     }
   g_object_unref (file);
@@ -224,8 +217,7 @@ goa_daemon_init (GoaDaemon *daemon)
   path = g_strdup_printf ("%s/goa-1.0", g_get_user_config_dir ());
   if (g_mkdir_with_parents (path, 0755) != 0)
     {
-      /* TODO: syslog */
-      g_warning ("Error creating directory %s: %m", path);
+      goa_warning ("Error creating directory %s: %m", path);
     }
   g_free (path);
 
@@ -353,10 +345,9 @@ add_config_file (const gchar   *path,
     {
       if (!(error->domain == G_FILE_ERROR && error->code == G_FILE_ERROR_NOENT))
         {
-          /* TODO: syslog */
-          g_warning ("Error loading %s: %s (%s, %d)",
-                     path,
-                     error->message, g_quark_to_string (error->domain), error->code);
+          goa_warning ("Error loading %s: %s (%s, %d)",
+                       path,
+                       error->message, g_quark_to_string (error->domain), error->code);
         }
       g_error_free (error);
       g_key_file_free (key_file);
@@ -378,8 +369,7 @@ add_config_file (const gchar   *path,
             }
           else
             {
-              /* TODO: syslog */
-              g_warning ("Unexpected group \"%s\" in file %s", groups[n], path);
+              goa_warning ("Unexpected group \"%s\" in file %s", groups[n], path);
               g_free (groups[n]);
             }
         }
@@ -442,7 +432,6 @@ update_account_object (GoaDaemon           *daemon,
   provider = goa_provider_get_for_provider_type (type);
   if (provider == NULL)
     {
-      /* TODO: syslog */
       goa_warning ("Unsupported account type %s for identity %s (no provider)", type, identity);
       goto out;
     }
@@ -461,9 +450,8 @@ update_account_object (GoaDaemon           *daemon,
   error = NULL;
   if (!goa_provider_build_object (provider, object, key_file, group, &error))
     {
-      /* TODO: syslog */
-      g_warning ("Error parsing account: %s (%s, %d)",
-                 error->message, g_quark_to_string (error->domain), error->code);
+      goa_warning ("Error parsing account: %s (%s, %d)",
+                   error->message, g_quark_to_string (error->domain), error->code);
       g_error_free (error);
       goto out;
     }
@@ -530,8 +518,7 @@ process_config_entries (GoaDaemon  *daemon,
       object_path = g_strdup_printf ("/org/gnome/OnlineAccounts/Accounts/%s", id + sizeof "Account " - 1);
       if (strstr (id + sizeof "Account " - 1, "/") != NULL || !g_variant_is_object_path (object_path))
         {
-          /* TODO: syslog */
-          g_warning ("`%s' is not a valid account identifier", id);
+          goa_warning ("`%s' is not a valid account identifier", id);
           g_free (object_path);
           continue;
         }
@@ -833,8 +820,8 @@ notification_cb (NotifyNotification *notification,
                           ctx,
                           &error))
     {
-      g_warning ("Error launching: %s (%s, %d)",
-                 error->message, g_quark_to_string (error->domain), error->code);
+      goa_warning ("Error launching: %s (%s, %d)",
+                   error->message, g_quark_to_string (error->domain), error->code);
       g_error_free (error);
     }
   g_object_unref (app);
@@ -898,8 +885,8 @@ goa_daemon_update_notifications (GoaDaemon *daemon)
           error = NULL;
           if (!notify_notification_show (daemon->notification, &error))
             {
-              g_warning ("Error showing notification: %s (%s, %d)",
-                         error->message, g_quark_to_string (error->domain), error->code);
+              goa_warning ("Error showing notification: %s (%s, %d)",
+                           error->message, g_quark_to_string (error->domain), error->code);
               g_error_free (error);
               g_object_unref (daemon->notification);
               daemon->notification = NULL;
@@ -921,8 +908,8 @@ goa_daemon_update_notifications (GoaDaemon *daemon)
           error = NULL;
           if (!notify_notification_close (daemon->notification, &error))
             {
-              g_warning ("Error closing notification: %s (%s, %d)",
-                         error->message, g_quark_to_string (error->domain), error->code);
+              goa_warning ("Error closing notification: %s (%s, %d)",
+                           error->message, g_quark_to_string (error->domain), error->code);
               g_error_free (error);
             }
           g_signal_handlers_disconnect_by_func (daemon->notification,
@@ -1101,10 +1088,9 @@ ensure_credentials_cb (GoaProvider   *provider,
             {
               goa_account_set_attention_needed (account, TRUE);
               g_dbus_interface_skeleton_flush (G_DBUS_INTERFACE_SKELETON (account));
-              /* TODO: syslog */
-              g_print ("%s: Setting AttentionNeeded to TRUE because EnsureCredentials() failed with: %s (%s, %d)\n",
-                       g_dbus_object_get_object_path (G_DBUS_OBJECT (data->object)),
-                       error->message, g_quark_to_string (error->domain), error->code);
+              goa_notice ("%s: Setting AttentionNeeded to TRUE because EnsureCredentials() failed with: %s (%s, %d)",
+                          g_dbus_object_get_object_path (G_DBUS_OBJECT (data->object)),
+                          error->message, g_quark_to_string (error->domain), error->code);
             }
         }
       g_dbus_method_invocation_return_gerror (data->invocation, error);
@@ -1120,9 +1106,8 @@ ensure_credentials_cb (GoaProvider   *provider,
         {
           goa_account_set_attention_needed (account, FALSE);
           g_dbus_interface_skeleton_flush (G_DBUS_INTERFACE_SKELETON (account));
-          /* TODO: syslog */
-          g_print ("%s: Setting AttentionNeeded to FALSE because EnsureCredentials() succeded\n",
-                   g_dbus_object_get_object_path (G_DBUS_OBJECT (data->object)));
+          goa_notice ("%s: Setting AttentionNeeded to FALSE because EnsureCredentials() succeded\n",
+                      g_dbus_object_get_object_path (G_DBUS_OBJECT (data->object)));
         }
       goa_account_complete_ensure_credentials (goa_object_peek_account (data->object),
                                                data->invocation,
@@ -1144,7 +1129,6 @@ on_account_handle_ensure_credentials (GoaAccount            *account,
   provider = goa_provider_get_for_provider_type (goa_account_get_provider_type (account));
   if (provider == NULL)
     {
-      /* TODO: syslog */
       g_dbus_method_invocation_return_error (invocation,
                                              GOA_ERROR,
                                              GOA_ERROR_FAILED,
diff --git a/src/goabackend/goaoauth2provider.c b/src/goabackend/goaoauth2provider.c
index 937966f..f81d80e 100644
--- a/src/goabackend/goaoauth2provider.c
+++ b/src/goabackend/goaoauth2provider.c
@@ -547,7 +547,6 @@ on_web_view_navigation_policy_decision_requested (WebKitWebView             *web
   /* TODO: use oauth2_proxy_extract_access_token() */
 
   requested_uri = webkit_network_request_get_uri (request);
-  //g_debug ("requested_uri is %s", requested_uri);
   redirect_uri = goa_oauth2_provider_get_redirect_uri (data->provider);
   if (g_str_has_prefix (requested_uri, redirect_uri))
     {
@@ -640,7 +639,6 @@ get_tokens_and_identity (GoaOAuth2Provider  *provider,
                                                      escaped_redirect_uri,
                                                      escaped_client_id,
                                                      escaped_scope);
-  //g_debug ("url = %s", url);
 
   if (goa_oauth2_provider_get_use_external_browser (provider))
     {
diff --git a/src/goabackend/goaoauthprovider.c b/src/goabackend/goaoauthprovider.c
index 184704c..64e20fd 100644
--- a/src/goabackend/goaoauthprovider.c
+++ b/src/goabackend/goaoauthprovider.c
@@ -86,47 +86,6 @@ is_authorization_error (GError *error)
   return ret;
 }
 
-G_GNUC_UNUSED static void
-print_header (const gchar *name,
-              const gchar *value,
-              gpointer     user_data)
-{
-  g_print ("header: `%s' -> `%s'\n", name, value);
-}
-
-G_GNUC_UNUSED static void
-_print_response (RestProxyCall *call)
-{
-  GHashTable *headers;
-  GHashTable *form;
-  GHashTableIter iter;
-  const gchar *key;
-  const gchar *value;
-  const gchar *payload;
-
-  headers = rest_proxy_call_get_response_headers (call);
-  if (headers != NULL)
-    {
-      g_hash_table_iter_init (&iter, headers);
-      while (g_hash_table_iter_next (&iter, (gpointer) &key, (gpointer) &value))
-        g_print ("Header %s: %s\n", key, value);
-      g_hash_table_unref (headers);
-    }
-
-  payload = rest_proxy_call_get_payload (call);
-  if (payload != NULL)
-    {
-      form = soup_form_decode (payload);
-      if (form != NULL)
-        {
-          g_hash_table_iter_init (&iter, form);
-          while (g_hash_table_iter_next (&iter, (gpointer) &key, (gpointer) &value))
-            g_print ("Form   %s: %s\n", key, value);
-          g_hash_table_unref (form);
-        }
-    }
-}
-
 /* ---------------------------------------------------------------------------------------------------- */
 
 static gboolean
@@ -794,8 +753,6 @@ get_tokens_and_identity (GoaOAuthProvider *provider,
    */
   gtk_widget_hide (GTK_WIDGET (dialog));
 
-  g_print ("woot verifier is %s\n", data.oauth_verifier);
-
   /* OK, we now have the request token... we can exchange that for a
    * (short-lived) access token and session_handle (used to refresh the
    * access token)..
diff --git a/src/panel/goapanel.c b/src/panel/goapanel.c
index 1d593a1..005e6d4 100644
--- a/src/panel/goapanel.c
+++ b/src/panel/goapanel.c
@@ -107,8 +107,8 @@ goa_panel_init (GoaPanel *panel)
                                  PACKAGE_DATA_DIR "/goa/goapanel.ui",
                                  &error) == 0)
     {
-      g_warning ("Error loading UI file: %s (%s, %d)",
-                 error->message, g_quark_to_string (error->domain), error->code);
+      goa_warning ("Error loading UI file: %s (%s, %d)",
+                   error->message, g_quark_to_string (error->domain), error->code);
       g_error_free (error);
       goto out;
     }
@@ -146,8 +146,8 @@ goa_panel_init (GoaPanel *panel)
   panel->client = goa_client_new_sync (NULL /* GCancellable */, &error);
   if (panel->client == NULL)
     {
-      g_warning ("Error getting a GoaClient: %s (%s, %d)",
-                 error->message, g_quark_to_string (error->domain), error->code);
+      goa_warning ("Error getting a GoaClient: %s (%s, %d)",
+                   error->message, g_quark_to_string (error->domain), error->code);
       g_error_free (error);
       goto out;
     }
diff --git a/src/panel/goapanelaccountsmodel.c b/src/panel/goapanelaccountsmodel.c
index 0833168..48f8fb4 100644
--- a/src/panel/goapanelaccountsmodel.c
+++ b/src/panel/goapanelaccountsmodel.c
@@ -367,7 +367,7 @@ remove_account (GoaPanelAccountsModel  *model,
   GtkTreeIter iter;
   if (!find_iter_for_object (model, object, &iter))
     {
-      g_warning ("Error removing object %s - not in tree", g_dbus_object_get_object_path (G_DBUS_OBJECT (object)));
+      goa_warning ("Error removing object %s - not in tree", g_dbus_object_get_object_path (G_DBUS_OBJECT (object)));
     }
   else
     {
@@ -382,7 +382,7 @@ update_account (GoaPanelAccountsModel  *model,
   GtkTreeIter iter;
   if (!find_iter_for_object (model, object, &iter))
     {
-      g_warning ("Error updating object %s - not in tree", g_dbus_object_get_object_path (G_DBUS_OBJECT (object)));
+      goa_warning ("Error updating object %s - not in tree", g_dbus_object_get_object_path (G_DBUS_OBJECT (object)));
     }
   else
     {