[gnome-online-accounts] Replace GOA logging with GLib logging
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-online-accounts] Replace GOA logging with GLib logging
- Date: Mon, 10 Feb 2014 10:39:41 +0000 (UTC)
commit 7c9408a6c79e8ef356c5113d651ec0de71805e0c
Author: Giovanni Campagna <gcampagna src gnome org>
Date: Sat Feb 8 22:18:53 2014 +0100
Replace GOA logging with GLib logging
In addition to simplifying the code, this ensures that
G_MESSAGES_DEBUG is honored, which in turn shuts up the
logging of debug messages by default, and avoids filling
the journal of everyone who's running a recent dbus-daemon.
The following map was used when converting log levels:
- debug -> debug
- notice -> message
- info -> info
- warning -> warning
- error -> critical (because g_error() aborts the application)
https://bugzilla.gnome.org/show_bug.cgi?id=723926
doc/goa-docs.xml | 1 -
doc/goa-sections.txt | 13 --
src/daemon/goadaemon.c | 53 +++---
src/daemon/goatpaccountlinker.c | 53 +++---
src/daemon/main.c | 21 +--
src/goabackend/Makefile.am | 1 -
src/goabackend/goaewsclient.c | 1 -
src/goabackend/goaexchangeprovider.c | 1 -
src/goabackend/goafacebookprovider.c | 13 +-
src/goabackend/goaflickrprovider.c | 17 +-
src/goabackend/goagoogleprovider.c | 11 +-
src/goabackend/goahttpclient.c | 1 -
src/goabackend/goaimapsmtpprovider.c | 1 -
src/goabackend/goakerberosprovider.c | 1 -
src/goabackend/goalogging.c | 227 --------------------------
src/goabackend/goalogging.h | 85 ----------
src/goabackend/goamailclient.c | 33 ++--
src/goabackend/goaoauth2provider.c | 21 +--
src/goabackend/goaoauthprovider.c | 7 +-
src/goabackend/goapocketprovider.c | 1 -
src/goabackend/goaprovider.c | 35 ++--
src/goabackend/goatwitterprovider.c | 13 +-
src/goabackend/goautils.c | 51 +++---
src/goabackend/goawindowsliveprovider.c | 13 +-
src/goabackend/goayahooprovider.c | 25 ++--
src/goaidentity/goaalarm.c | 32 ++--
src/goaidentity/goaidentity.c | 1 -
src/goaidentity/goaidentityinquiry.c | 1 -
src/goaidentity/goaidentitymanager.c | 1 -
src/goaidentity/goaidentityservice.c | 97 ++++++------
src/goaidentity/goaidentityutils.c | 5 +-
src/goaidentity/goakerberosidentity.c | 29 ++--
src/goaidentity/goakerberosidentityinquiry.c | 3 +-
src/goaidentity/goakerberosidentitymanager.c | 73 ++++----
34 files changed, 290 insertions(+), 651 deletions(-)
---
diff --git a/doc/goa-docs.xml b/doc/goa-docs.xml
index ecc51c4..03b3ed4 100644
--- a/doc/goa-docs.xml
+++ b/doc/goa-docs.xml
@@ -158,7 +158,6 @@
<title>Backend Library API Reference</title>
<chapter>
<title>Core</title>
- <xi:include href="xml/goalog.xml"/>
<xi:include href="xml/goautil.xml"/>
<xi:include href="xml/goaprovider.xml"/>
<xi:include href="xml/goaproviderfactory.xml"/>
diff --git a/doc/goa-sections.txt b/doc/goa-sections.txt
index 3208631..92beb27 100644
--- a/doc/goa-sections.txt
+++ b/doc/goa-sections.txt
@@ -1061,19 +1061,6 @@ goa_ticketing_skeleton_get_type
</SECTION>
<SECTION>
-<FILE>goalog</FILE>
-GoaLogLevel
-goa_log
-<SUBSECTION>
-goa_debug
-goa_info
-goa_notice
-goa_warning
-goa_error
-<SUBSECTION Standard>
-</SECTION>
-
-<SECTION>
<FILE>goautil</FILE>
goa_util_add_row_widget
goa_util_lookup_keyfile_boolean
diff --git a/src/daemon/goadaemon.c b/src/daemon/goadaemon.c
index 0fa922a..993a0b4 100644
--- a/src/daemon/goadaemon.c
+++ b/src/daemon/goadaemon.c
@@ -26,7 +26,6 @@
#include "goadaemon.h"
#include "goabackend/goabackend.h"
-#include "goabackend/goalogging.h"
#include "goabackend/goautils.h"
#ifdef GOA_KERBEROS_ENABLED
#include "goaidentity/goaidentityservice.h"
@@ -138,10 +137,10 @@ create_monitor (const gchar *path, gboolean is_dir)
if (monitor == NULL)
{
- 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_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);
@@ -155,7 +154,7 @@ on_config_file_monitor_timeout (gpointer user_data)
GoaDaemon *daemon = GOA_DAEMON (user_data);
daemon->config_timeout_id = 0;
- goa_info ("Reloading configuration files\n");
+ g_info ("Reloading configuration files\n");
goa_daemon_reload_configuration (daemon);
return FALSE;
@@ -213,7 +212,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)
{
- goa_warning ("Error creating directory %s: %m", path);
+ g_warning ("Error creating directory %s: %m", path);
}
g_free (path);
@@ -235,7 +234,7 @@ goa_daemon_init (GoaDaemon *daemon)
if (!goa_identity_service_activate (daemon->identity_service,
&error))
{
- goa_warning ("Error activating identity service: %s", error->message);
+ g_warning ("Error activating identity service: %s", error->message);
g_error_free (error);
g_clear_object (&daemon->identity_service);
}
@@ -353,9 +352,9 @@ add_config_file (GoaDaemon *daemon,
{
if (!(error->domain == G_FILE_ERROR && error->code == G_FILE_ERROR_NOENT))
{
- goa_warning ("Error loading %s: %s (%s, %d)",
- path,
- error->message, g_quark_to_string (error->domain), error->code);
+ g_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);
@@ -392,8 +391,8 @@ add_config_file (GoaDaemon *daemon,
if (session_id != NULL &&
g_strcmp0 (session_id, guid) != 0)
{
- goa_debug ("ignoring account \"%s\" in file %s because it's stale",
- groups[n], path);
+ g_debug ("ignoring account \"%s\" in file %s because it's stale",
+ groups[n], path);
g_free (groups[n]);
g_free (session_id);
continue;
@@ -411,7 +410,7 @@ add_config_file (GoaDaemon *daemon,
}
else
{
- goa_warning ("Unexpected group \"%s\" in file %s", groups[n], path);
+ g_warning ("Unexpected group \"%s\" in file %s", groups[n], path);
g_free (groups[n]);
}
}
@@ -456,7 +455,7 @@ update_account_object (GoaDaemon *daemon,
icon = NULL;
serialized_icon = NULL;
- goa_debug ("updating %s %d", g_dbus_object_get_object_path (G_DBUS_OBJECT (object)), just_added);
+ g_debug ("updating %s %d", g_dbus_object_get_object_path (G_DBUS_OBJECT (object)), just_added);
type = g_key_file_get_string (key_file, group, "Provider", NULL);
identity = g_key_file_get_string (key_file, group, "Identity", NULL);
@@ -474,7 +473,7 @@ update_account_object (GoaDaemon *daemon,
provider = goa_provider_get_for_provider_type (type);
if (provider == NULL)
{
- goa_warning ("Unsupported account type %s for identity %s (no provider)", type, identity);
+ g_warning ("Unsupported account type %s for identity %s (no provider)", type, identity);
goto out;
}
@@ -486,8 +485,8 @@ update_account_object (GoaDaemon *daemon,
error = NULL;
if (!goa_provider_build_object (provider, object, key_file, group, daemon->connection, just_added, &error))
{
- goa_warning ("Error parsing account: %s (%s, %d)",
- error->message, g_quark_to_string (error->domain), error->code);
+ g_warning ("Error parsing account: %s (%s, %d)",
+ error->message, g_quark_to_string (error->domain), error->code);
g_error_free (error);
goto out;
}
@@ -561,7 +560,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))
{
- goa_warning ("`%s' is not a valid account identifier", id);
+ g_warning ("`%s' is not a valid account identifier", id);
g_free (object_path);
continue;
}
@@ -587,7 +586,7 @@ process_config_entries (GoaDaemon *daemon,
g_signal_handlers_disconnect_by_func (goa_object_peek_account (object),
G_CALLBACK (on_account_handle_remove),
daemon);
- goa_debug ("removing %s", object_path);
+ g_debug ("removing %s", object_path);
g_warn_if_fail (g_dbus_object_manager_server_unexport (daemon->object_manager, object_path));
}
for (l = added; l != NULL; l = l->next)
@@ -596,7 +595,7 @@ process_config_entries (GoaDaemon *daemon,
GoaObjectSkeleton *object;
gchar *group;
- goa_debug ("adding %s", object_path);
+ g_debug ("adding %s", object_path);
group = object_path_to_group (object_path);
key_file_data = g_hash_table_lookup (group_name_to_key_file_data, group);
@@ -629,7 +628,7 @@ process_config_entries (GoaDaemon *daemon,
GoaObject *object;
gchar *group;
- goa_debug ("unchanged %s", object_path);
+ g_debug ("unchanged %s", object_path);
group = object_path_to_group (object_path);
key_file_data = g_hash_table_lookup (group_name_to_key_file_data, group);
@@ -1129,9 +1128,9 @@ ensure_credentials_cb (GoaProvider *provider,
{
goa_account_set_attention_needed (account, TRUE);
g_dbus_interface_skeleton_flush (G_DBUS_INTERFACE_SKELETON (account));
- 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_message ("%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);
@@ -1147,8 +1146,8 @@ ensure_credentials_cb (GoaProvider *provider,
{
goa_account_set_attention_needed (account, FALSE);
g_dbus_interface_skeleton_flush (G_DBUS_INTERFACE_SKELETON (account));
- goa_notice ("%s: Setting AttentionNeeded to FALSE because EnsureCredentials() succeded\n",
- g_dbus_object_get_object_path (G_DBUS_OBJECT (data->object)));
+ g_message ("%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,
diff --git a/src/daemon/goatpaccountlinker.c b/src/daemon/goatpaccountlinker.c
index 1f02d3b..b0a75e3 100644
--- a/src/daemon/goatpaccountlinker.c
+++ b/src/daemon/goatpaccountlinker.c
@@ -31,7 +31,6 @@
#include "goatpaccountlinker.h"
#include "goa/goa.h"
-#include "goabackend/goalogging.h"
#include "goabackend/goautils.h"
#define GOA_TP_ACCOUNT_LINKER_GET_PRIVATE(obj) \
@@ -90,7 +89,7 @@ goa_account_chat_disabled_changed_cb (GoaAccount *goa_account,
tp_enabled = tp_account_is_enabled (tp_account);
if (tp_enabled != goa_enabled)
{
- goa_info ("The GOA account %s (Telepathy object path: %s) has been %s, "
+ g_info ("The GOA account %s (Telepathy object path: %s) has been %s, "
"propagating to Telepathy",
goa_account_get_id (goa_account), id,
goa_enabled ? "enabled" : "disabled");
@@ -120,7 +119,7 @@ tp_account_chat_enabled_changed_cb (TpAccount *tp_account,
tp_enabled = tp_account_is_enabled (tp_account);
if (tp_enabled != goa_enabled)
{
- goa_info ("The Telepathy account %s has been %s, propagating to GOA",
+ g_info ("The Telepathy account %s has been %s, propagating to GOA",
id, tp_enabled ? "enabled" : "disabled");
/* When we set this property, the autogenerated code emits a notify
* signal immediately even if the property hasn't changed, so
@@ -148,7 +147,7 @@ goa_account_created_cb (GoaManager *manager,
if (!goa_manager_call_add_account_finish (manager,
&goa_account_object_path, res, &error))
{
- goa_error ("Failed to create a GOA account for %s: %s (%s, %d)",
+ g_critical ("Failed to create a GOA account for %s: %s (%s, %d)",
get_id_from_tp_account (tp_account),
error->message,
g_quark_to_string (error->domain),
@@ -157,7 +156,7 @@ goa_account_created_cb (GoaManager *manager,
goto out;
}
- goa_info ("Created new %s GOA account for Telepathy account %s",
+ g_info ("Created new %s GOA account for Telepathy account %s",
goa_account_object_path, get_id_from_tp_account (tp_account));
out:
@@ -173,7 +172,7 @@ create_goa_account (GoaTpAccountLinker *self,
GVariantBuilder details;
gchar *provider;
- goa_info ("Creating new GOA account for Telepathy account %s",
+ g_info ("Creating new GOA account for Telepathy account %s",
get_id_from_tp_account (tp_account));
g_variant_builder_init (&credentials, G_VARIANT_TYPE_VARDICT);
@@ -226,17 +225,17 @@ tp_account_added (GoaTpAccountLinker *self,
if (g_strcmp0 (tp_account_get_storage_provider (tp_account),
"org.gnome.OnlineAccounts") == 0)
{
- goa_debug ("Skipping Telepathy account %s as it's handled directly by GOA", id);
+ g_debug ("Skipping Telepathy account %s as it's handled directly by GOA", id);
return;
}
if (is_account_filtered (tp_account))
{
- goa_debug ("The account %s is ignored for debugging reasons", id);
+ g_debug ("The account %s is ignored for debugging reasons", id);
return;
}
- goa_debug ("Telepathy account found: %s", id);
+ g_debug ("Telepathy account found: %s", id);
g_hash_table_replace (priv->tp_accounts, g_strdup (id),
g_object_ref (tp_account));
@@ -248,13 +247,13 @@ tp_account_added (GoaTpAccountLinker *self,
goa_object = g_hash_table_lookup (priv->goa_accounts, id);
if (goa_object == NULL)
{
- goa_debug ("Found a Telepathy account with no corresponding "
+ g_debug ("Found a Telepathy account with no corresponding "
"GOA account: %s", id);
create_goa_account (self, tp_account);
}
else
{
- goa_debug ("Found a Telepathy account with a matching "
+ g_debug ("Found a Telepathy account with a matching "
"GOA account: %s", id);
/* Make sure the initial state is synced. */
tp_account_chat_enabled_changed_cb (tp_account, NULL, self);
@@ -272,7 +271,7 @@ goa_account_removed_by_us_cb (GObject *object,
if (!goa_account_call_remove_finish (goa_account, res, &error))
{
- goa_error ("Error removing GOA account %s (Telepathy object path: %s): "
+ g_critical ("Error removing GOA account %s (Telepathy object path: %s): "
"%s (%s, %d)",
goa_account_get_id (goa_account),
get_id_from_goa_account (goa_account),
@@ -301,18 +300,18 @@ tp_account_removed_cb (TpAccountManager *manager,
* 3 - "account-removed" is emitted by the account manager
* 4 - tp_account_removed_cb is called for an unknown account
*/
- goa_debug ("Ignoring removal of Telepathy account we asked to "
+ g_debug ("Ignoring removal of Telepathy account we asked to "
"remove (%s)", id);
return;
}
- goa_info ("Telepathy account %s removed, removing corresponding "
+ g_info ("Telepathy account %s removed, removing corresponding "
"GOA account", id);
goa_object = g_hash_table_lookup (priv->goa_accounts, id);
if (goa_object == NULL)
{
- goa_error ("There is no GOA account for removed Telepathy "
+ g_critical ("There is no GOA account for removed Telepathy "
"account %s", id);
return;
}
@@ -349,7 +348,7 @@ goa_account_added_cb (GoaClient *client,
return;
id = get_id_from_goa_account (goa_account);
- goa_debug ("GOA account %s for Telepathy account %s added",
+ g_debug ("GOA account %s for Telepathy account %s added",
goa_account_get_id (goa_account), id);
g_signal_connect_object (goa_account, "notify::chat-disabled",
@@ -378,7 +377,7 @@ tp_account_removed_by_us_cb (GObject *object,
if (!tp_account_remove_finish (tp_account, res, &error))
{
- goa_error ("Error removing Telepathy account %s: %s (%s, %d)",
+ g_critical ("Error removing Telepathy account %s: %s (%s, %d)",
get_id_from_tp_account (tp_account),
error->message,
g_quark_to_string (error->domain),
@@ -410,21 +409,21 @@ goa_account_removed_cb (GoaClient *client,
* 3 - "account-removed" is emitted by the GOA client
* 4 - goa_account_removed_cb is called for an unknown account
*/
- goa_debug ("Ignoring removal of GOA account we asked to remove "
+ g_debug ("Ignoring removal of GOA account we asked to remove "
"(%s, Telepathy object path: %s)",
goa_account_get_id (goa_account),
id);
return;
}
- goa_info ("GOA account %s for Telepathy account %s removed, "
+ g_info ("GOA account %s for Telepathy account %s removed, "
"removing Telepathy account",
goa_account_get_id (goa_account), id);
tp_account = g_hash_table_lookup (priv->tp_accounts, id);
if (tp_account == NULL)
{
- goa_error ("There is no Telepathy account for removed GOA "
+ g_critical ("There is no Telepathy account for removed GOA "
"account %s (Telepathy object path: %s)",
goa_account_get_id (goa_account), id);
return;
@@ -452,7 +451,7 @@ start_if_ready (GoaTpAccountLinker *self)
return;
}
- goa_debug ("Both GOA and Tp are ready, starting tracking of accounts");
+ g_debug ("Both GOA and Tp are ready, starting tracking of accounts");
/* GOA */
goa_accounts = goa_client_get_accounts (priv->goa_client);
@@ -486,7 +485,7 @@ start_if_ready (GoaTpAccountLinker *self)
if (!g_hash_table_lookup (priv->tp_accounts, id))
{
- goa_warning ("The Telepathy account %s was removed while the daemon "
+ g_warning ("The Telepathy account %s was removed while the daemon "
"was not running, removing the corresponding GOA account", id);
goa_account_call_remove (goa_object_peek_account (goa_object),
NULL, /* cancellable */
@@ -506,12 +505,12 @@ account_manager_prepared_cb (GObject *object,
if (!tp_proxy_prepare_finish (object, res, &error))
{
- goa_error ("Error preparing AM: %s", error->message);
+ g_critical ("Error preparing AM: %s", error->message);
g_clear_error (&error);
return;
}
- goa_debug("Telepathy account manager prepared");
+ g_debug("Telepathy account manager prepared");
start_if_ready (self);
}
@@ -527,12 +526,12 @@ goa_client_new_cb (GObject *object,
priv->goa_client = goa_client_new_finish (result, &error);
if (priv->goa_client == NULL)
{
- goa_error ("Error connecting to GOA: %s", error->message);
+ g_critical ("Error connecting to GOA: %s", error->message);
g_clear_error (&error);
return;
}
- goa_debug("GOA client ready");
+ g_debug("GOA client ready");
start_if_ready (self);
}
@@ -556,7 +555,7 @@ goa_tp_account_linker_init (GoaTpAccountLinker *self)
{
GoaTpAccountLinkerPrivate *priv;
- goa_debug ("Starting GOA <-> Telepathy account linker");
+ g_debug ("Starting GOA <-> Telepathy account linker");
self->priv = GOA_TP_ACCOUNT_LINKER_GET_PRIVATE (self);
priv = self->priv;
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 621280a..15d05f5 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -26,8 +26,6 @@
#include <signal.h>
#include <gio/gio.h>
-#include <goabackend/goalogging.h>
-
#include "goadaemon.h"
#include "goatpaccountlinker.h"
@@ -37,12 +35,10 @@
static GMainLoop *loop = NULL;
static gboolean opt_replace = FALSE;
static gboolean opt_no_sigint = FALSE;
-static gboolean opt_no_color = FALSE;
static GOptionEntry opt_entries[] =
{
{"replace", 0, 0, G_OPTION_ARG_NONE, &opt_replace, "Replace existing daemon", NULL},
{"no-sigint", 0, 0, G_OPTION_ARG_NONE, &opt_no_sigint, "Do not handle SIGINT for controlled shutdown",
NULL},
- {"no-color", 0, 0, G_OPTION_ARG_NONE, &opt_no_color, "Do not display colors in output", NULL},
{NULL }
};
static GoaDaemon *the_daemon = NULL;
@@ -55,7 +51,7 @@ on_bus_acquired (GDBusConnection *connection,
{
if (connection != NULL)
the_daemon = goa_daemon_new ();
- goa_debug ("Connected to the session bus");
+ g_debug ("Connected to the session bus");
}
static void
@@ -63,7 +59,7 @@ on_name_lost (GDBusConnection *connection,
const gchar *name,
gpointer user_data)
{
- goa_info ("Lost (or failed to acquire) the name %s on the session message bus", name);
+ g_info ("Lost (or failed to acquire) the name %s on the session message bus", name);
g_main_loop_quit (loop);
}
@@ -72,7 +68,7 @@ on_name_acquired (GDBusConnection *connection,
const gchar *name,
gpointer user_data)
{
- goa_debug ("Acquired the name %s on the session message bus", name);
+ g_debug ("Acquired the name %s on the session message bus", name);
tp_linker = goa_tp_account_linker_new ();
}
@@ -80,7 +76,7 @@ on_name_acquired (GDBusConnection *connection,
static gboolean
on_sigint (gpointer user_data)
{
- goa_info ("Caught SIGINT. Initiating shutdown.");
+ g_info ("Caught SIGINT. Initiating shutdown.");
g_main_loop_quit (loop);
return FALSE;
}
@@ -106,13 +102,12 @@ main (int argc,
error = NULL;
if (!g_option_context_parse (opt_context, &argc, &argv, &error))
{
- goa_error ("Error parsing options: %s", error->message);
+ g_critical ("Error parsing options: %s", error->message);
g_error_free (error);
goto out;
}
- goa_log_init (opt_no_color);
- goa_notice ("goa-daemon version %s starting", PACKAGE_VERSION);
+ g_message ("goa-daemon version %s starting", PACKAGE_VERSION);
loop = g_main_loop_new (NULL, FALSE);
@@ -132,7 +127,7 @@ main (int argc,
NULL,
NULL);
- goa_debug ("Entering main event loop");
+ g_debug ("Entering main event loop");
g_main_loop_run (loop);
@@ -152,7 +147,7 @@ main (int argc,
if (opt_context != NULL)
g_option_context_free (opt_context);
- goa_notice ("goa-daemon version %s exiting", PACKAGE_VERSION);
+ g_message ("goa-daemon version %s exiting", PACKAGE_VERSION);
return ret;
}
diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am
index c36bfef..183223d 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -66,7 +66,6 @@ libgoa_backend_1_0_la_SOURCES = \
goasmtpauth.h goasmtpauth.c \
goamailclient.h goamailclient.c \
goaexchangeprovider.h goaexchangeprovider.c \
- goalogging.h goalogging.c \
goaoauthprovider.h goaoauthprovider.c \
goaoauth2provider.h goaoauth2provider.c \
goagoogleprovider.h goagoogleprovider.c \
diff --git a/src/goabackend/goaewsclient.c b/src/goabackend/goaewsclient.c
index 3b00ebd..795bac2 100644
--- a/src/goabackend/goaewsclient.c
+++ b/src/goabackend/goaewsclient.c
@@ -31,7 +31,6 @@
#include <libsoup/soup.h>
#include <libxml/xmlIO.h>
-#include "goalogging.h"
#include "goaewsclient.h"
#include "goautils.h"
diff --git a/src/goabackend/goaexchangeprovider.c b/src/goabackend/goaexchangeprovider.c
index efdca8e..b6dd2c2 100644
--- a/src/goabackend/goaexchangeprovider.c
+++ b/src/goabackend/goaexchangeprovider.c
@@ -22,7 +22,6 @@
#include <glib/gi18n-lib.h>
#include "goaewsclient.h"
-#include "goalogging.h"
#include "goaprovider.h"
#include "goaprovider-priv.h"
#include "goaexchangeprovider.h"
diff --git a/src/goabackend/goafacebookprovider.c b/src/goabackend/goafacebookprovider.c
index 6673d21..481b6aa 100644
--- a/src/goabackend/goafacebookprovider.c
+++ b/src/goabackend/goafacebookprovider.c
@@ -25,7 +25,6 @@
#include <rest/rest-proxy.h>
#include <json-glib/json-glib.h>
-#include "goalogging.h"
#include "goaprovider.h"
#include "goaprovider-priv.h"
#include "goaoauth2provider.h"
@@ -225,10 +224,10 @@ get_identity_sync (GoaOAuth2Provider *provider,
rest_proxy_call_get_payload_length (call),
&identity_error))
{
- goa_warning ("json_parser_load_from_data() failed: %s (%s, %d)",
- identity_error->message,
- g_quark_to_string (identity_error->domain),
- identity_error->code);
+ g_warning ("json_parser_load_from_data() failed: %s (%s, %d)",
+ identity_error->message,
+ g_quark_to_string (identity_error->domain),
+ identity_error->code);
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
@@ -240,7 +239,7 @@ get_identity_sync (GoaOAuth2Provider *provider,
id = g_strdup (json_object_get_string_member (json_object, "id"));
if (id == NULL)
{
- goa_warning ("Did not find id in JSON data");
+ g_warning ("Did not find id in JSON data");
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
@@ -250,7 +249,7 @@ get_identity_sync (GoaOAuth2Provider *provider,
presentation_identity = g_strdup (json_object_get_string_member (json_object, "email"));
if (presentation_identity == NULL)
{
- goa_warning ("Did not find email in JSON data");
+ g_warning ("Did not find email in JSON data");
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
diff --git a/src/goabackend/goaflickrprovider.c b/src/goabackend/goaflickrprovider.c
index 7a49c8d..12d9257 100644
--- a/src/goabackend/goaflickrprovider.c
+++ b/src/goabackend/goaflickrprovider.c
@@ -26,7 +26,6 @@
#include <rest/oauth-proxy.h>
#include <json-glib/json-glib.h>
-#include "goalogging.h"
#include "goaprovider.h"
#include "goaprovider-priv.h"
#include "goaoauthprovider.h"
@@ -196,10 +195,10 @@ get_identity_sync (GoaOAuthProvider *provider,
rest_proxy_call_get_payload_length (call),
&identity_error))
{
- goa_warning ("json_parser_load_from_data() failed: %s (%s, %d)",
- identity_error->message,
- g_quark_to_string (identity_error->domain),
- identity_error->code);
+ g_warning ("json_parser_load_from_data() failed: %s (%s, %d)",
+ identity_error->message,
+ g_quark_to_string (identity_error->domain),
+ identity_error->code);
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
@@ -211,7 +210,7 @@ get_identity_sync (GoaOAuthProvider *provider,
json_object = json_object_get_object_member (json_object, "user");
if (json_object == NULL)
{
- goa_warning ("Did not find user in JSON data");
+ g_warning ("Did not find user in JSON data");
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
@@ -221,7 +220,7 @@ get_identity_sync (GoaOAuthProvider *provider,
id = g_strdup (json_object_get_string_member (json_object, "id"));
if (id == NULL)
{
- goa_warning ("Did not find user.id in JSON data");
+ g_warning ("Did not find user.id in JSON data");
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
@@ -231,7 +230,7 @@ get_identity_sync (GoaOAuthProvider *provider,
json_object = json_object_get_object_member (json_object, "username");
if (json_object == NULL)
{
- goa_warning ("Did not find user.username in JSON data");
+ g_warning ("Did not find user.username in JSON data");
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
@@ -241,7 +240,7 @@ get_identity_sync (GoaOAuthProvider *provider,
presentation_identity = g_strdup (json_object_get_string_member (json_object, "_content"));
if (presentation_identity == NULL)
{
- goa_warning ("Did not find user.username._content in JSON data");
+ g_warning ("Did not find user.username._content in JSON data");
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
diff --git a/src/goabackend/goagoogleprovider.c b/src/goabackend/goagoogleprovider.c
index 12bacbb..22933ea 100644
--- a/src/goabackend/goagoogleprovider.c
+++ b/src/goabackend/goagoogleprovider.c
@@ -25,7 +25,6 @@
#include <rest/oauth-proxy.h>
#include <json-glib/json-glib.h>
-#include "goalogging.h"
#include "goaprovider.h"
#include "goaprovider-priv.h"
#include "goaoauth2provider.h"
@@ -224,10 +223,10 @@ get_identity_sync (GoaOAuth2Provider *provider,
rest_proxy_call_get_payload_length (call),
&identity_error))
{
- goa_warning ("json_parser_load_from_data() failed: %s (%s, %d)",
- identity_error->message,
- g_quark_to_string (identity_error->domain),
- identity_error->code);
+ g_warning ("json_parser_load_from_data() failed: %s (%s, %d)",
+ identity_error->message,
+ g_quark_to_string (identity_error->domain),
+ identity_error->code);
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
@@ -239,7 +238,7 @@ get_identity_sync (GoaOAuth2Provider *provider,
email = g_strdup (json_object_get_string_member (json_object, "email"));
if (email == NULL)
{
- goa_warning ("Did not find email in JSON data");
+ g_warning ("Did not find email in JSON data");
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
diff --git a/src/goabackend/goahttpclient.c b/src/goabackend/goahttpclient.c
index ab2e636..1b48616 100644
--- a/src/goabackend/goahttpclient.c
+++ b/src/goabackend/goahttpclient.c
@@ -24,7 +24,6 @@
#include <libsoup/soup.h>
-#include "goalogging.h"
#include "goahttpclient.h"
#include "goautils.h"
diff --git a/src/goabackend/goaimapsmtpprovider.c b/src/goabackend/goaimapsmtpprovider.c
index 22d24c9..5ee5d6c 100644
--- a/src/goabackend/goaimapsmtpprovider.c
+++ b/src/goabackend/goaimapsmtpprovider.c
@@ -26,7 +26,6 @@
#include "goaimapauthlogin.h"
#include "goamailclient.h"
#include "goaimapsmtpprovider.h"
-#include "goalogging.h"
#include "goaprovider.h"
#include "goaprovider-priv.h"
#include "goasmtpauth.h"
diff --git a/src/goabackend/goakerberosprovider.c b/src/goabackend/goakerberosprovider.c
index e3229ee..c2eb143 100644
--- a/src/goabackend/goakerberosprovider.c
+++ b/src/goabackend/goakerberosprovider.c
@@ -23,7 +23,6 @@
#include "config.h"
#include <glib/gi18n-lib.h>
-#include "goalogging.h"
#include "goaprovider.h"
#include "goaprovider-priv.h"
#include "goakerberosprovider.h"
diff --git a/src/goabackend/goamailclient.c b/src/goabackend/goamailclient.c
index 3241e5a..43b02c7 100644
--- a/src/goabackend/goamailclient.c
+++ b/src/goabackend/goamailclient.c
@@ -24,7 +24,6 @@
#include <glib/gi18n-lib.h>
#include "goamailclient.h"
-#include "goalogging.h"
#include "goautils.h"
/* The timeout used for non-IDLE commands */
@@ -148,10 +147,10 @@ mail_client_check_auth_run_cb (GObject *source_object, GAsyncResult *res, gpoint
error = NULL;
if (!goa_mail_auth_run_finish (data->auth, res, &error))
{
- goa_warning ("goa_mail_auth_run() failed: %s (%s, %d)",
- error->message,
- g_quark_to_string (error->domain),
- error->code);
+ g_warning ("goa_mail_auth_run() failed: %s (%s, %d)",
+ error->message,
+ g_quark_to_string (error->domain),
+ error->code);
g_simple_async_result_take_error (data->res, error);
goto out;
}
@@ -181,10 +180,10 @@ mail_client_check_tls_conn_handshake_cb (GObject *source_object, GAsyncResult *r
error = NULL;
if (!g_tls_connection_handshake_finish (G_TLS_CONNECTION (data->tls_conn), res, &error))
{
- goa_warning ("g_tls_connection_handshake() failed: %s (%s, %d)",
- error->message,
- g_quark_to_string (error->domain),
- error->code);
+ g_warning ("g_tls_connection_handshake() failed: %s (%s, %d)",
+ error->message,
+ g_quark_to_string (error->domain),
+ error->code);
/* GIO sets G_TLS_ERROR_BAD_CERTIFICATE when it should be
* setting G_TLS_ERROR_HANDSHAKE. Hence, lets check the
* GTlsCertificate flags to accommodate future GIO fixes.
@@ -247,10 +246,10 @@ mail_client_check_auth_starttls_cb (GObject *source_object, GAsyncResult *res, g
error = NULL;
if (!goa_mail_auth_starttls_finish (data->auth, res, &error))
{
- goa_warning ("goa_mail_auth_starttls() failed: %s (%s, %d)",
- error->message,
- g_quark_to_string (error->domain),
- error->code);
+ g_warning ("goa_mail_auth_starttls() failed: %s (%s, %d)",
+ error->message,
+ g_quark_to_string (error->domain),
+ error->code);
g_simple_async_result_take_error (data->res, error);
goto error;
}
@@ -310,10 +309,10 @@ mail_client_check_connect_cb (GObject *source_object, GAsyncResult *res, gpointe
data->conn = g_socket_client_connect_to_host_finish (data->sc, res, &error);
if (data->conn == NULL)
{
- goa_warning ("g_socket_client_connect_to_host() failed: %s (%s, %d)",
- error->message,
- g_quark_to_string (error->domain),
- error->code);
+ g_warning ("g_socket_client_connect_to_host() failed: %s (%s, %d)",
+ error->message,
+ g_quark_to_string (error->domain),
+ error->code);
/* GIO sets G_TLS_ERROR_BAD_CERTIFICATE when it should be
* setting G_TLS_ERROR_HANDSHAKE. Hence, lets check the
* GTlsCertificate flags to accommodate future GIO fixes.
diff --git a/src/goabackend/goaoauth2provider.c b/src/goabackend/goaoauth2provider.c
index 1518ce5..6da63b1 100644
--- a/src/goabackend/goaoauth2provider.c
+++ b/src/goabackend/goaoauth2provider.c
@@ -27,7 +27,6 @@
#include <libsoup/soup.h>
#include <json-glib/json-glib.h>
-#include "goalogging.h"
#include "goaprovider.h"
#include "goautils.h"
#include "goawebview.h"
@@ -716,13 +715,13 @@ get_tokens_sync (GoaOAuth2Provider *provider,
GHashTable *hash;
const gchar *expires_in_str;
- goa_debug ("Response is not JSON - possibly old OAuth2 implementation");
+ g_debug ("Response is not JSON - possibly old OAuth2 implementation");
hash = soup_form_decode (payload);
ret_access_token = g_strdup (g_hash_table_lookup (hash, "access_token"));
if (ret_access_token == NULL)
{
- goa_warning ("Did not find access_token in non-JSON data");
+ g_warning ("Did not find access_token in non-JSON data");
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
@@ -749,10 +748,10 @@ get_tokens_sync (GoaOAuth2Provider *provider,
parser = json_parser_new ();
if (!json_parser_load_from_data (parser, payload, payload_length, &tokens_error))
{
- goa_warning ("json_parser_load_from_data() failed: %s (%s, %d)",
- tokens_error->message,
- g_quark_to_string (tokens_error->domain),
- tokens_error->code);
+ g_warning ("json_parser_load_from_data() failed: %s (%s, %d)",
+ tokens_error->message,
+ g_quark_to_string (tokens_error->domain),
+ tokens_error->code);
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
@@ -764,7 +763,7 @@ get_tokens_sync (GoaOAuth2Provider *provider,
ret_access_token = g_strdup (json_object_get_string_member (object, "access_token"));
if (ret_access_token == NULL)
{
- goa_warning ("Did not find access_token in JSON data");
+ g_warning ("Did not find access_token in JSON data");
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
@@ -1624,7 +1623,7 @@ goa_oauth2_provider_get_access_token_sync (GoaOAuth2Provider *provider,
/* if we can't refresh the token, just return it no matter what */
if (refresh_token == NULL)
{
- goa_debug ("Returning locally cached credentials that cannot be refreshed");
+ g_debug ("Returning locally cached credentials that cannot be refreshed");
success = TRUE;
goto out;
}
@@ -1635,12 +1634,12 @@ goa_oauth2_provider_get_access_token_sync (GoaOAuth2Provider *provider,
*/
if (!force_refresh && access_token_expires_in > 10*60)
{
- goa_debug ("Returning locally cached credentials (expires in %d seconds)", access_token_expires_in);
+ g_debug ("Returning locally cached credentials (expires in %d seconds)", access_token_expires_in);
success = TRUE;
goto out;
}
- goa_debug ("Refreshing locally cached credentials (expires in %d seconds, force_refresh=%d)",
access_token_expires_in, force_refresh);
+ g_debug ("Refreshing locally cached credentials (expires in %d seconds, force_refresh=%d)",
access_token_expires_in, force_refresh);
/* Otherwise, refresh it */
old_refresh_token = refresh_token; refresh_token = NULL;
diff --git a/src/goabackend/goaoauthprovider.c b/src/goabackend/goaoauthprovider.c
index 974818f..e98cb6e 100644
--- a/src/goabackend/goaoauthprovider.c
+++ b/src/goabackend/goaoauthprovider.c
@@ -26,7 +26,6 @@
#include <libsoup/soup.h>
#include <json-glib/json-glib.h>
-#include "goalogging.h"
#include "goaprovider.h"
#include "goautils.h"
#include "goawebview.h"
@@ -1580,7 +1579,7 @@ goa_oauth_provider_get_access_token_sync (GoaOAuthProvider *provider,
/* if we can't refresh the token, just return it no matter what */
if (session_handle == NULL)
{
- goa_debug ("Returning locally cached credentials that cannot be refreshed");
+ g_debug ("Returning locally cached credentials that cannot be refreshed");
success = TRUE;
goto out;
}
@@ -1591,12 +1590,12 @@ goa_oauth_provider_get_access_token_sync (GoaOAuthProvider *provider,
*/
if (!force_refresh && access_token_expires_in > 10*60)
{
- goa_debug ("Returning locally cached credentials (expires in %d seconds)", access_token_expires_in);
+ g_debug ("Returning locally cached credentials (expires in %d seconds)", access_token_expires_in);
success = TRUE;
goto out;
}
- goa_debug ("Refreshing locally cached credentials (expires in %d seconds, force_refresh=%d)",
access_token_expires_in, force_refresh);
+ g_debug ("Refreshing locally cached credentials (expires in %d seconds, force_refresh=%d)",
access_token_expires_in, force_refresh);
/* Otherwise, refresh it */
access_token_for_refresh = access_token; access_token = NULL;
diff --git a/src/goabackend/goapocketprovider.c b/src/goabackend/goapocketprovider.c
index a1a4d41..860b09f 100644
--- a/src/goabackend/goapocketprovider.c
+++ b/src/goabackend/goapocketprovider.c
@@ -25,7 +25,6 @@
#include <json-glib/json-glib.h>
#include <webkit/webkit.h>
-#include "goalogging.h"
#include "goaprovider.h"
#include "goaprovider-priv.h"
#include "goaoauth2provider.h"
diff --git a/src/goabackend/goaprovider.c b/src/goabackend/goaprovider.c
index 223378b..a06a40a 100644
--- a/src/goabackend/goaprovider.c
+++ b/src/goabackend/goaprovider.c
@@ -23,7 +23,6 @@
#include <glib/gi18n-lib.h>
-#include "goalogging.h"
#include "goaprovider.h"
#include "goaprovider-priv.h"
#include "goaproviderfactory.h"
@@ -950,7 +949,7 @@ get_providers_cb (GObject *source,
if (!goa_provider_factory_get_providers_finish (factory, &providers, res, &error))
{
- goa_error ("Error getting providers from a factory: %s (%s, %d)",
+ g_critical ("Error getting providers from a factory: %s (%s, %d)",
error->message,
g_quark_to_string (error->domain),
error->code);
@@ -1181,9 +1180,9 @@ goa_util_lookup_keyfile_string (GoaObject *object,
G_KEY_FILE_NONE,
&error))
{
- goa_warning ("Error loading keyfile %s: %s (%s, %d)",
- path,
- error->message, g_quark_to_string (error->domain), error->code);
+ g_warning ("Error loading keyfile %s: %s (%s, %d)",
+ path,
+ error->message, g_quark_to_string (error->domain), error->code);
g_error_free (error);
goto out;
}
@@ -1194,11 +1193,11 @@ goa_util_lookup_keyfile_string (GoaObject *object,
if (ret == NULL)
{
/* this is not fatal (think upgrade-path) */
- goa_debug ("Error getting value for key %s in group `%s' from keyfile %s: %s (%s, %d)",
- key,
- group,
- path,
- error->message, g_quark_to_string (error->domain), error->code);
+ g_debug ("Error getting value for key %s in group `%s' from keyfile %s: %s (%s, %d)",
+ key,
+ group,
+ path,
+ error->message, g_quark_to_string (error->domain), error->code);
g_error_free (error);
goto out;
}
@@ -1233,9 +1232,9 @@ goa_util_lookup_keyfile_boolean (GoaObject *object,
G_KEY_FILE_NONE,
&error))
{
- goa_warning ("Error loading keyfile %s: %s (%s, %d)",
- path,
- error->message, g_quark_to_string (error->domain), error->code);
+ g_warning ("Error loading keyfile %s: %s (%s, %d)",
+ path,
+ error->message, g_quark_to_string (error->domain), error->code);
g_error_free (error);
goto out;
}
@@ -1246,11 +1245,11 @@ goa_util_lookup_keyfile_boolean (GoaObject *object,
if (error != NULL)
{
/* this is not fatal (think upgrade-path) */
- goa_debug ("Error getting boolean value for key %s in group `%s' from keyfile %s: %s (%s, %d)",
- key,
- group,
- path,
- error->message, g_quark_to_string (error->domain), error->code);
+ g_debug ("Error getting boolean value for key %s in group `%s' from keyfile %s: %s (%s, %d)",
+ key,
+ group,
+ path,
+ error->message, g_quark_to_string (error->domain), error->code);
g_error_free (error);
goto out;
}
diff --git a/src/goabackend/goatwitterprovider.c b/src/goabackend/goatwitterprovider.c
index 502db20..0dfa297 100644
--- a/src/goabackend/goatwitterprovider.c
+++ b/src/goabackend/goatwitterprovider.c
@@ -24,7 +24,6 @@
#include <rest/oauth-proxy.h>
#include <json-glib/json-glib.h>
-#include "goalogging.h"
#include "goaprovider.h"
#include "goaprovider-priv.h"
#include "goaoauthprovider.h"
@@ -173,10 +172,10 @@ get_identity_sync (GoaOAuthProvider *provider,
rest_proxy_call_get_payload_length (call),
&identity_error))
{
- goa_warning ("json_parser_load_from_data() failed: %s (%s, %d)",
- identity_error->message,
- g_quark_to_string (identity_error->domain),
- identity_error->code);
+ g_warning ("json_parser_load_from_data() failed: %s (%s, %d)",
+ identity_error->message,
+ g_quark_to_string (identity_error->domain),
+ identity_error->code);
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
@@ -188,7 +187,7 @@ get_identity_sync (GoaOAuthProvider *provider,
id = g_strdup (json_object_get_string_member (json_object, "id_str"));
if (id == NULL)
{
- goa_warning ("Did not find id_str in JSON data");
+ g_warning ("Did not find id_str in JSON data");
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
@@ -198,7 +197,7 @@ get_identity_sync (GoaOAuthProvider *provider,
presentation_identity = g_strdup (json_object_get_string_member (json_object, "screen_name"));
if (presentation_identity == NULL)
{
- goa_warning ("Did not find screen_name in JSON data");
+ g_warning ("Did not find screen_name in JSON data");
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
diff --git a/src/goabackend/goautils.c b/src/goabackend/goautils.c
index 9c67885..27afe3f 100644
--- a/src/goabackend/goautils.c
+++ b/src/goabackend/goautils.c
@@ -26,7 +26,6 @@
#include <telepathy-glib/telepathy-glib.h>
#include "goaprovider.h"
-#include "goalogging.h"
#include "goautils.h"
static const SecretSchema secret_password_schema =
@@ -177,7 +176,7 @@ goa_utils_delete_credentials_sync (GoaProvider *provider,
NULL);
if (sec_error != NULL)
{
- goa_warning ("secret_password_clear_sync() failed: %s", sec_error->message);
+ g_warning ("secret_password_clear_sync() failed: %s", sec_error->message);
g_set_error_literal (error,
GOA_ERROR,
GOA_ERROR_FAILED, /* TODO: more specific */
@@ -186,7 +185,7 @@ goa_utils_delete_credentials_sync (GoaProvider *provider,
goto out;
}
- goa_debug ("Cleared keyring credentials for id: %s", id);
+ g_debug ("Cleared keyring credentials for id: %s", id);
ret = TRUE;
out:
@@ -229,7 +228,7 @@ goa_utils_lookup_credentials_sync (GoaProvider *provider,
NULL);
if (sec_error != NULL)
{
- goa_warning ("secret_password_lookup_sync() failed: %s", sec_error->message);
+ g_warning ("secret_password_lookup_sync() failed: %s", sec_error->message);
g_set_error_literal (error,
GOA_ERROR,
GOA_ERROR_FAILED, /* TODO: more specific */
@@ -239,7 +238,7 @@ goa_utils_lookup_credentials_sync (GoaProvider *provider,
}
else if (password == NULL)
{
- goa_warning ("secret_password_lookup_sync() returned NULL");
+ g_warning ("secret_password_lookup_sync() returned NULL");
g_set_error_literal (error,
GOA_ERROR,
GOA_ERROR_FAILED, /* TODO: more specific */
@@ -247,7 +246,7 @@ goa_utils_lookup_credentials_sync (GoaProvider *provider,
goto out;
}
- goa_debug ("Retrieved keyring credentials for id: %s", id);
+ g_debug ("Retrieved keyring credentials for id: %s", id);
ret = g_variant_parse (NULL, /* GVariantType */
password,
@@ -312,7 +311,7 @@ goa_utils_store_credentials_for_id_sync (GoaProvider *provider,
"goa-identity", password_key,
NULL))
{
- goa_warning ("secret_password_store_sync() failed: %s", sec_error->message);
+ g_warning ("secret_password_store_sync() failed: %s", sec_error->message);
g_set_error_literal (error,
GOA_ERROR,
GOA_ERROR_FAILED, /* TODO: more specific */
@@ -321,7 +320,7 @@ goa_utils_store_credentials_for_id_sync (GoaProvider *provider,
goto out;
}
- goa_debug ("Stored keyring credentials for identity: %s", id);
+ g_debug ("Stored keyring credentials for identity: %s", id);
ret = TRUE;
out:
@@ -372,11 +371,11 @@ goa_utils_keyfile_remove_key (GoaAccount *account, const gchar *key)
G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS,
&error))
{
- goa_warning ("Error loading keyfile %s: %s (%s, %d)",
- path,
- error->message,
- g_quark_to_string (error->domain),
- error->code);
+ g_warning ("Error loading keyfile %s: %s (%s, %d)",
+ path,
+ error->message,
+ g_quark_to_string (error->domain),
+ error->code);
g_error_free (error);
goto out;
}
@@ -388,7 +387,7 @@ goa_utils_keyfile_remove_key (GoaAccount *account, const gchar *key)
if (!g_file_set_contents (path, contents, length, &error))
{
g_prefix_error (&error, "Error writing key-value-file %s: ", path);
- goa_warning ("%s (%s, %d)", error->message, g_quark_to_string (error->domain), error->code);
+ g_warning ("%s (%s, %d)", error->message, g_quark_to_string (error->domain), error->code);
g_error_free (error);
goto out;
}
@@ -422,11 +421,11 @@ goa_utils_keyfile_set_boolean (GoaAccount *account, const gchar *key, gboolean v
G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS,
&error))
{
- goa_warning ("Error loading keyfile %s: %s (%s, %d)",
- path,
- error->message,
- g_quark_to_string (error->domain),
- error->code);
+ g_warning ("Error loading keyfile %s: %s (%s, %d)",
+ path,
+ error->message,
+ g_quark_to_string (error->domain),
+ error->code);
g_error_free (error);
goto out;
}
@@ -438,7 +437,7 @@ goa_utils_keyfile_set_boolean (GoaAccount *account, const gchar *key, gboolean v
if (!g_file_set_contents (path, contents, length, &error))
{
g_prefix_error (&error, "Error writing key-value-file %s: ", path);
- goa_warning ("%s (%s, %d)", error->message, g_quark_to_string (error->domain), error->code);
+ g_warning ("%s (%s, %d)", error->message, g_quark_to_string (error->domain), error->code);
g_error_free (error);
goto out;
}
@@ -472,11 +471,11 @@ goa_utils_keyfile_set_string (GoaAccount *account, const gchar *key, const gchar
G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS,
&error))
{
- goa_warning ("Error loading keyfile %s: %s (%s, %d)",
- path,
- error->message,
- g_quark_to_string (error->domain),
- error->code);
+ g_warning ("Error loading keyfile %s: %s (%s, %d)",
+ path,
+ error->message,
+ g_quark_to_string (error->domain),
+ error->code);
g_error_free (error);
goto out;
}
@@ -488,7 +487,7 @@ goa_utils_keyfile_set_string (GoaAccount *account, const gchar *key, const gchar
if (!g_file_set_contents (path, contents, length, &error))
{
g_prefix_error (&error, "Error writing key-value-file %s: ", path);
- goa_warning ("%s (%s, %d)", error->message, g_quark_to_string (error->domain), error->code);
+ g_warning ("%s (%s, %d)", error->message, g_quark_to_string (error->domain), error->code);
g_error_free (error);
goto out;
}
diff --git a/src/goabackend/goawindowsliveprovider.c b/src/goabackend/goawindowsliveprovider.c
index 25cece4..db46271 100644
--- a/src/goabackend/goawindowsliveprovider.c
+++ b/src/goabackend/goawindowsliveprovider.c
@@ -27,7 +27,6 @@
#include <json-glib/json-glib.h>
#include <webkit/webkit.h>
-#include "goalogging.h"
#include "goaprovider.h"
#include "goaprovider-priv.h"
#include "goaoauth2provider.h"
@@ -204,10 +203,10 @@ get_identity_sync (GoaOAuth2Provider *provider,
rest_proxy_call_get_payload_length (call),
&identity_error))
{
- goa_warning ("json_parser_load_from_data() failed: %s (%s, %d)",
- identity_error->message,
- g_quark_to_string (identity_error->domain),
- identity_error->code);
+ g_warning ("json_parser_load_from_data() failed: %s (%s, %d)",
+ identity_error->message,
+ g_quark_to_string (identity_error->domain),
+ identity_error->code);
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
@@ -219,7 +218,7 @@ get_identity_sync (GoaOAuth2Provider *provider,
id = g_strdup (json_object_get_string_member (json_object, "id"));
if (id == NULL)
{
- goa_warning ("Did not find id in JSON data");
+ g_warning ("Did not find id in JSON data");
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
@@ -231,7 +230,7 @@ get_identity_sync (GoaOAuth2Provider *provider,
presentation_identity = g_strdup (json_object_get_string_member (json_object, "account"));
if (presentation_identity == NULL)
{
- goa_warning ("Did not find emails.account in JSON data");
+ g_warning ("Did not find emails.account in JSON data");
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
diff --git a/src/goabackend/goayahooprovider.c b/src/goabackend/goayahooprovider.c
index dac4b5f..2881002 100644
--- a/src/goabackend/goayahooprovider.c
+++ b/src/goabackend/goayahooprovider.c
@@ -24,7 +24,6 @@
#include <rest/oauth-proxy.h>
#include <json-glib/json-glib.h>
-#include "goalogging.h"
#include "goaprovider.h"
#include "goaprovider-priv.h"
#include "goaoauthprovider.h"
@@ -194,10 +193,10 @@ get_identity_sync (GoaOAuthProvider *provider,
rest_proxy_call_get_payload_length (call),
&identity_error))
{
- goa_warning ("json_parser_load_from_data() failed: %s (%s, %d)",
- identity_error->message,
- g_quark_to_string (identity_error->domain),
- identity_error->code);
+ g_warning ("json_parser_load_from_data() failed: %s (%s, %d)",
+ identity_error->message,
+ g_quark_to_string (identity_error->domain),
+ identity_error->code);
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
@@ -209,7 +208,7 @@ get_identity_sync (GoaOAuthProvider *provider,
json_data_object = json_object_get_object_member (json_object, "guid");
if (json_data_object == NULL)
{
- goa_warning ("Did not find guid in JSON data");
+ g_warning ("Did not find guid in JSON data");
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
@@ -220,7 +219,7 @@ get_identity_sync (GoaOAuthProvider *provider,
guid = g_strdup (json_object_get_string_member (json_data_object, "value"));
if (guid == NULL)
{
- goa_warning ("Did not find value in JSON data");
+ g_warning ("Did not find value in JSON data");
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
@@ -263,10 +262,10 @@ get_identity_sync (GoaOAuthProvider *provider,
rest_proxy_call_get_payload_length (call),
&identity_error))
{
- goa_warning ("json_parser_load_from_data() failed: %s (%s, %d)",
- identity_error->message,
- g_quark_to_string (identity_error->domain),
- identity_error->code);
+ g_warning ("json_parser_load_from_data() failed: %s (%s, %d)",
+ identity_error->message,
+ g_quark_to_string (identity_error->domain),
+ identity_error->code);
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
@@ -278,7 +277,7 @@ get_identity_sync (GoaOAuthProvider *provider,
json_data_object = json_object_get_object_member (json_object, "profile");
if (json_data_object == NULL)
{
- goa_warning ("Did not find profile in JSON data");
+ g_warning ("Did not find profile in JSON data");
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
@@ -289,7 +288,7 @@ get_identity_sync (GoaOAuthProvider *provider,
presentation_identity = g_strdup (json_object_get_string_member (json_data_object, "nickname"));
if (presentation_identity == NULL)
{
- goa_warning ("Did not find nickname in JSON data");
+ g_warning ("Did not find nickname in JSON data");
g_set_error (error,
GOA_ERROR,
GOA_ERROR_FAILED,
diff --git a/src/goaidentity/goaalarm.c b/src/goaidentity/goaalarm.c
index a90de2f..983c640 100644
--- a/src/goaidentity/goaalarm.c
+++ b/src/goaidentity/goaalarm.c
@@ -35,8 +35,6 @@
#include <gio/gio.h>
#include <gio/gunixinputstream.h>
-#include "goalogging.h"
-
#define MAX_TIMEOUT_INTERVAL (10 *1000)
typedef enum
@@ -107,7 +105,7 @@ clear_scheduled_wakeups (GoaAlarm *self, GSource *source, GInputStream *stream)
if (!is_closed)
{
- goa_warning ("GoaAlarm: could not close timer stream: %s", error->message);
+ g_warning ("GoaAlarm: could not close timer stream: %s", error->message);
g_error_free (error);
}
@@ -367,16 +365,16 @@ on_timer_source_ready (GObject *stream, GTask *task)
if (self->priv->type == GOA_ALARM_TYPE_UNSCHEDULED)
{
- goa_debug ("GoaAlarm: timer source was unscheduled after "
- "callback was invoked, but before callback got "
- "the lock.");
+ g_debug ("GoaAlarm: timer source was unscheduled after "
+ "callback was invoked, but before callback got "
+ "the lock.");
goto out;
}
else if (self->priv->type != GOA_ALARM_TYPE_TIMER)
{
- goa_warning ("GoaAlarm: timer source ready callback called "
- "when timer source isn't supposed to be used. "
- "Current timer type is %u", self->priv->type);
+ g_warning ("GoaAlarm: timer source ready callback called "
+ "when timer source isn't supposed to be used. "
+ "Current timer type is %u", self->priv->type);
goto out;
}
@@ -390,8 +388,8 @@ on_timer_source_ready (GObject *stream, GTask *task)
if (bytes_read < 0)
{
- goa_warning ("GoaAlarm: failed to read from timer fd: %s\n",
- error->message);
+ g_warning ("GoaAlarm: failed to read from timer fd: %s\n",
+ error->message);
g_error_free (error);
goto out;
}
@@ -400,8 +398,8 @@ on_timer_source_ready (GObject *stream, GTask *task)
{
if (number_of_fires < 0 || number_of_fires > 1)
{
- goa_warning ("GoaAlarm: expected timerfd to report firing once,"
- "but it reported firing %ld times\n", (long) number_of_fires);
+ g_warning ("GoaAlarm: expected timerfd to report firing once,"
+ "but it reported firing %ld times\n", (long) number_of_fires);
}
}
@@ -426,7 +424,7 @@ schedule_wakeups_with_timerfd (GoaAlarm *self)
if (!seen_before)
{
- goa_debug ("GoaAlarm: trying to use kernel timer");
+ g_debug ("GoaAlarm: trying to use kernel timer");
seen_before = TRUE;
}
@@ -434,7 +432,7 @@ schedule_wakeups_with_timerfd (GoaAlarm *self)
if (fd < 0)
{
- goa_debug ("GoaAlarm: could not create timer fd: %m");
+ g_debug ("GoaAlarm: could not create timer fd: %m");
return FALSE;
}
@@ -447,7 +445,7 @@ schedule_wakeups_with_timerfd (GoaAlarm *self)
if (result < 0)
{
- goa_debug ("GoaAlarm: could not set timer: %m");
+ g_debug ("GoaAlarm: could not set timer: %m");
return FALSE;
}
@@ -551,7 +549,7 @@ schedule_wakeups (GoaAlarm *self)
if (!seen_before)
{
- goa_debug ("GoaAlarm: falling back to polling timeout");
+ g_debug ("GoaAlarm: falling back to polling timeout");
seen_before = TRUE;
}
schedule_wakeups_with_timeout_source (self);
diff --git a/src/goaidentity/goaidentity.c b/src/goaidentity/goaidentity.c
index 82fedb0..2fc491b 100644
--- a/src/goaidentity/goaidentity.c
+++ b/src/goaidentity/goaidentity.c
@@ -22,7 +22,6 @@
#include <glib/gi18n.h>
#include "goaidentity.h"
-#include "goalogging.h"
G_DEFINE_INTERFACE (GoaIdentity, goa_identity, G_TYPE_OBJECT);
diff --git a/src/goaidentity/goaidentityinquiry.c b/src/goaidentity/goaidentityinquiry.c
index 1979ab2..ab7f7e1 100644
--- a/src/goaidentity/goaidentityinquiry.c
+++ b/src/goaidentity/goaidentityinquiry.c
@@ -22,7 +22,6 @@
#include "goaidentityinquiry.h"
#include "goaidentityinquiryprivate.h"
-#include "goalogging.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/src/goaidentity/goaidentitymanager.c b/src/goaidentity/goaidentitymanager.c
index 6290b68..40d2225 100644
--- a/src/goaidentity/goaidentitymanager.c
+++ b/src/goaidentity/goaidentitymanager.c
@@ -24,7 +24,6 @@
#include "goaidentitymanager.h"
#include "goaidentitymanagerprivate.h"
-#include "goalogging.h"
enum
{
diff --git a/src/goaidentity/goaidentityservice.c b/src/goaidentity/goaidentityservice.c
index 9d011b1..cb48168 100644
--- a/src/goaidentity/goaidentityservice.c
+++ b/src/goaidentity/goaidentityservice.c
@@ -37,7 +37,6 @@
#include "goaidentityutils.h"
#include "goakerberosidentitymanager.h"
-#include "goalogging.h"
struct _GoaIdentityServicePrivate
{
@@ -249,16 +248,16 @@ on_credentials_ensured (GoaAccount *account,
result,
&error))
{
- goa_debug ("GoaIdentityService: could not ensure credentials for account %s: %s",
- account_identity,
- error->message);
+ g_debug ("GoaIdentityService: could not ensure credentials for account %s: %s",
+ account_identity,
+ error->message);
g_error_free (error);
return;
}
- goa_debug ("GoaIdentityService: credentials for account %s ensured for %d seconds",
- account_identity,
- expires_in);
+ g_debug ("GoaIdentityService: credentials for account %s ensured for %d seconds",
+ account_identity,
+ expires_in);
}
static gboolean
@@ -446,8 +445,8 @@ on_identity_signed_out (GoaIdentityManager *manager,
if (error != NULL)
{
- goa_debug ("GoaIdentityService: Identity could not be signed out: %s",
- error->message);
+ g_debug ("GoaIdentityService: Identity could not be signed out: %s",
+ error->message);
g_simple_async_result_take_error (operation_result, error);
}
@@ -477,8 +476,8 @@ on_got_identity_for_sign_out (GoaIdentityManager *manager,
if (error != NULL)
{
- goa_debug ("GoaIdentityService: Identity could not be signed out: %s",
- error->message);
+ g_debug ("GoaIdentityService: Identity could not be signed out: %s",
+ error->message);
return;
}
@@ -661,7 +660,7 @@ goa_identity_service_init (GoaIdentityService *self)
GOA_TYPE_IDENTITY_SERVICE,
GoaIdentityServicePrivate);
- goa_debug ("GoaIdentityService: initializing");
+ g_debug ("GoaIdentityService: initializing");
self->priv->watched_client_connections = g_hash_table_new_full (g_str_hash,
g_str_equal,
(GDestroyNotify)
@@ -691,7 +690,7 @@ goa_identity_service_finalize (GObject *object)
g_return_if_fail (object != NULL);
g_return_if_fail (GOA_IS_IDENTITY_SERVICE (object));
- goa_debug ("GoaIdentityService: finalizing");
+ g_debug ("GoaIdentityService: finalizing");
self = GOA_IDENTITY_SERVICE (object);
@@ -721,13 +720,13 @@ on_identity_renewed (GoaIdentityManager *manager,
if (error != NULL)
{
- goa_debug ("GoaIdentityService: could not renew identity: %s",
+ g_debug ("GoaIdentityService: could not renew identity: %s",
error->message);
g_error_free (error);
return;
}
- goa_debug ("GoaIdentityService: identity renewed");
+ g_debug ("GoaIdentityService: identity renewed");
}
static void
@@ -740,7 +739,7 @@ on_identity_needs_renewal (GoaIdentityManager *identity_manager,
principal = goa_identity_get_identifier (identity);
- goa_debug ("GoaIdentityService: identity %s needs renewal", principal);
+ g_debug ("GoaIdentityService: identity %s needs renewal", principal);
object = find_object_with_principal (self, principal, TRUE);
@@ -772,8 +771,8 @@ on_identity_signed_in (GoaIdentityManager *manager,
if (error != NULL)
{
- goa_debug ("GoaIdentityService: could not sign in identity: %s",
- error->message);
+ g_debug ("GoaIdentityService: could not sign in identity: %s",
+ error->message);
g_simple_async_result_take_error (operation_result, error);
}
else
@@ -786,7 +785,7 @@ on_identity_signed_in (GoaIdentityManager *manager,
g_simple_async_result_complete_in_idle (operation_result);
g_object_unref (operation_result);
- goa_debug ("GoaIdentityService: identity signed in");
+ g_debug ("GoaIdentityService: identity signed in");
}
static void
@@ -808,9 +807,9 @@ on_temporary_account_created_for_identity (GoaIdentityService *self,
const char *identifier;
identifier = goa_identity_get_identifier (identity);
- goa_debug ("Could not add temporary account for identity %s: %s",
- identifier,
- error->message);
+ g_debug ("Could not add temporary account for identity %s: %s",
+ identifier,
+ error->message);
g_error_free (error);
return;
}
@@ -850,7 +849,7 @@ on_account_added (GoaManager *manager,
if (object_path != NULL && object_path[0] != '\0')
{
- goa_debug ("Created account for identity with object path %s", object_path);
+ g_debug ("Created account for identity with object path %s", object_path);
object_manager = goa_client_get_object_manager (self->priv->client);
object = GOA_OBJECT (g_dbus_object_manager_get_object (object_manager,
@@ -889,11 +888,11 @@ add_temporary_account (GoaIdentityService *self,
if (object != NULL)
{
- goa_debug ("GoaIdentityService: would add temporary identity %s, but it's already pending", principal);
+ g_debug ("GoaIdentityService: would add temporary identity %s, but it's already pending", principal);
return;
}
- goa_debug ("GoaIdentityService: adding temporary identity %s", principal);
+ g_debug ("GoaIdentityService: adding temporary identity %s", principal);
/* If there's no account for this identity then create a temporary one.
*/
@@ -910,7 +909,7 @@ add_temporary_account (GoaIdentityService *self,
g_variant_builder_add (&details, "{ss}", "TicketingEnabled", "true");
- goa_debug ("GoaIdentityService: asking to sign back in");
+ g_debug ("GoaIdentityService: asking to sign back in");
operation_result = g_simple_async_result_new (G_OBJECT (self),
(GAsyncReadyCallback)
@@ -1048,7 +1047,7 @@ close_system_prompt (GoaIdentityManager *manager,
{
if (error != NULL)
{
- goa_debug ("GoaIdentityService: could not close system prompt: %s",
+ g_debug ("GoaIdentityService: could not close system prompt: %s",
error->message);
g_error_free (error);
}
@@ -1075,7 +1074,7 @@ on_password_system_prompt_answered (GcrPrompt *prompt,
{
if (error != NULL)
{
- goa_debug ("GoaIdentityService: could not get password from user: %s",
+ g_debug ("GoaIdentityService: could not get password from user: %s",
error->message);
g_error_free (error);
}
@@ -1215,7 +1214,7 @@ on_system_prompt_open (GcrSystemPrompt *system_prompt,
{
if (error != NULL)
{
- goa_debug ("GoaIdentityService: could not open system prompt: %s",
+ g_debug ("GoaIdentityService: could not open system prompt: %s",
error->message);
g_error_free (error);
}
@@ -1274,7 +1273,7 @@ sign_in (GoaIdentityService *self,
{
GSimpleAsyncResult *operation_result;
- goa_debug ("GoaIdentityService: asking to sign in");
+ g_debug ("GoaIdentityService: asking to sign in");
operation_result = g_simple_async_result_new (G_OBJECT (self),
callback,
@@ -1314,7 +1313,7 @@ on_identity_expiring (GoaIdentityManager *identity_manager,
principal = goa_identity_get_identifier (identity);
- goa_debug ("GoaIdentityService: identity %s expiring", principal);
+ g_debug ("GoaIdentityService: identity %s expiring", principal);
object = find_object_with_principal (self, principal, TRUE);
@@ -1334,7 +1333,7 @@ on_identity_expired (GoaIdentityManager *identity_manager,
principal = goa_identity_get_identifier (identity);
- goa_debug ("GoaIdentityService: identity %s expired", principal);
+ g_debug ("GoaIdentityService: identity %s expired", principal);
object = find_object_with_principal (self, principal, TRUE);
@@ -1352,12 +1351,12 @@ on_sign_out_for_account_change_done (GoaIdentityService *self,
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), &error))
{
- goa_debug ("Log out failed: %s", error->message);
+ g_debug ("Log out failed: %s", error->message);
g_error_free (error);
}
else
{
- goa_debug ("Log out complete");
+ g_debug ("Log out complete");
}
}
@@ -1391,9 +1390,9 @@ on_got_ticket (GoaTicketing *ticketing,
result,
&error))
{
- goa_debug ("GoaIdentityService: could not get ticket for account %s: %s",
- account_identity,
- error->message);
+ g_debug ("GoaIdentityService: could not get ticket for account %s: %s",
+ account_identity,
+ error->message);
g_error_free (error);
g_simple_async_result_complete_in_idle (operation_result);
@@ -1401,8 +1400,8 @@ on_got_ticket (GoaTicketing *ticketing,
return;
}
- goa_debug ("GoaIdentityService: got ticket for account %s",
- account_identity);
+ g_debug ("GoaIdentityService: got ticket for account %s",
+ account_identity);
g_simple_async_result_complete_in_idle (operation_result);
g_object_unref (operation_result);
}
@@ -1498,7 +1497,7 @@ on_account_interface_removed (GDBusObjectManager *manager,
account_identity = goa_account_get_identity (account);
- goa_debug ("Kerberos account %s was disabled and should now be signed out", account_identity);
+ g_debug ("Kerberos account %s was disabled and should now be signed out", account_identity);
result = g_simple_async_result_new (G_OBJECT (self),
(GAsyncReadyCallback)
@@ -1536,7 +1535,7 @@ on_account_removed (GoaClient *client,
account_identity = goa_account_get_identity (account);
- goa_debug ("Kerberos account %s removed and should now be signed out", account_identity);
+ g_debug ("Kerberos account %s removed and should now be signed out", account_identity);
result = g_simple_async_result_new (G_OBJECT (self),
(GAsyncReadyCallback)
@@ -1596,7 +1595,7 @@ on_identities_listed (GoaIdentityManager *manager,
{
if (error != NULL)
{
- goa_warning ("Could not list identities: %s", error->message);
+ g_warning ("Could not list identities: %s", error->message);
g_error_free (error);
}
return;
@@ -1680,7 +1679,7 @@ on_got_client (GoaClient *client,
if (self->priv->client == NULL)
{
- goa_warning ("Could not create client: %s", error->message);
+ g_warning ("Could not create client: %s", error->message);
return;
}
@@ -1690,7 +1689,7 @@ on_got_client (GoaClient *client,
if (self->priv->identity_manager == NULL)
{
- goa_warning ("Could not create identity manager: %s", error->message);
+ g_warning ("Could not create identity manager: %s", error->message);
return;
}
@@ -1708,7 +1707,7 @@ on_session_bus_acquired (GDBusConnection *connection,
const char *unique_name,
GoaIdentityService *self)
{
- goa_debug ("GoaIdentityService: Connected to session bus");
+ g_debug ("GoaIdentityService: Connected to session bus");
if (self->priv->connection == NULL)
{
@@ -1730,7 +1729,7 @@ on_name_acquired (GDBusConnection *connection,
GoaIdentityService *self)
{
if (g_strcmp0 (name, "org.gnome.Identity") == 0)
- goa_debug ("GoaIdentityService: Acquired name org.gnome.Identity");
+ g_debug ("GoaIdentityService: Acquired name org.gnome.Identity");
}
static void
@@ -1739,7 +1738,7 @@ on_name_lost (GDBusConnection *connection,
GoaIdentityService *self)
{
if (g_strcmp0 (name, "org.gnome.Identity") == 0)
- goa_debug ("GoaIdentityService: Lost name org.gnome.Identity");
+ g_debug ("GoaIdentityService: Lost name org.gnome.Identity");
}
gboolean
@@ -1750,7 +1749,7 @@ goa_identity_service_activate (GoaIdentityService *self,
g_return_val_if_fail (GOA_IS_IDENTITY_SERVICE (self), FALSE);
- goa_debug ("GoaIdentityService: Activating identity service");
+ g_debug ("GoaIdentityService: Activating identity service");
self->priv->cancellable = g_cancellable_new ();
@@ -1781,7 +1780,7 @@ goa_identity_service_activate (GoaIdentityService *self,
void
goa_identity_service_deactivate (GoaIdentityService *self)
{
- goa_debug ("GoaIdentityService: Deactivating identity service");
+ g_debug ("GoaIdentityService: Deactivating identity service");
if (self->priv->realmd_watch == 0)
g_bus_unwatch_name (self->priv->realmd_watch);
diff --git a/src/goaidentity/goaidentityutils.c b/src/goaidentity/goaidentityutils.c
index 798fb5e..82db181 100644
--- a/src/goaidentity/goaidentityutils.c
+++ b/src/goaidentity/goaidentityutils.c
@@ -21,7 +21,6 @@
#include "config.h"
#include "goaidentityutils.h"
-#include "goalogging.h"
#include <string.h>
@@ -190,7 +189,7 @@ goa_identity_utils_register_error_domain (GQuark error_domain,
if (type_class == NULL)
{
- goa_warning ("GoaIdentityUtils: Could not identity type %s", type_name);
+ g_warning ("GoaIdentityUtils: Could not identity type %s", type_name);
return;
}
@@ -206,7 +205,7 @@ goa_identity_utils_register_error_domain (GQuark error_domain,
enum_class->values[i].
value_nick);
- goa_debug ("GoaIdentityUtils: Registering dbus error %s", dbus_error_string);
+ g_debug ("GoaIdentityUtils: Registering dbus error %s", dbus_error_string);
g_dbus_error_register_error (error_domain,
enum_class->values[i].value, dbus_error_string);
g_free (dbus_error_string);
diff --git a/src/goaidentity/goakerberosidentity.c b/src/goaidentity/goakerberosidentity.c
index 2b296ca..e9917bf 100644
--- a/src/goaidentity/goakerberosidentity.c
+++ b/src/goaidentity/goakerberosidentity.c
@@ -24,7 +24,6 @@
#include "goakerberosidentity.h"
#include "goakerberosidentityinquiry.h"
#include "goaalarm.h"
-#include "goalogging.h"
#include <netinet/in.h>
#include <arpa/nameser.h>
@@ -284,7 +283,7 @@ get_identifier (GoaKerberosIdentity *self,
error_message =
krb5_get_error_message (self->priv->kerberos_context, error_code);
- goa_debug ("GoaKerberosIdentity: Error parsing principal identity name: %s",
+ g_debug ("GoaKerberosIdentity: Error parsing principal identity name: %s",
error_message);
krb5_free_error_message (self->priv->kerberos_context, error_message);
return NULL;
@@ -356,7 +355,7 @@ goa_kerberos_identity_get_principal_name (GoaKerberosIdentity *self)
const char *error_message;
error_message =
krb5_get_error_message (self->priv->kerberos_context, error_code);
- goa_debug
+ g_debug
("GoaKerberosIdentity: Error parsing identity %s into kerberos principal: %s",
self->priv->identifier, error_message);
krb5_free_error_message (self->priv->kerberos_context, error_message);
@@ -373,7 +372,7 @@ goa_kerberos_identity_get_principal_name (GoaKerberosIdentity *self)
error_message =
krb5_get_error_message (self->priv->kerberos_context, error_code);
- goa_debug ("GoaKerberosIdentity: Error parsing principal identity name: %s",
+ g_debug ("GoaKerberosIdentity: Error parsing principal identity name: %s",
error_message);
krb5_free_error_message (self->priv->kerberos_context, error_message);
return NULL;
@@ -404,7 +403,7 @@ goa_kerberos_identity_get_realm_name (GoaKerberosIdentity *self)
const char *error_message;
error_message =
krb5_get_error_message (self->priv->kerberos_context, error_code);
- goa_debug
+ g_debug
("GoaKerberosIdentity: Error parsing identity %s into kerberos principal: %s",
self->priv->identifier, error_message);
krb5_free_error_message (self->priv->kerberos_context, error_message);
@@ -480,7 +479,7 @@ get_current_time (GoaKerberosIdentity *self)
error_message =
krb5_get_error_message (self->priv->kerberos_context, error_code);
- goa_debug ("GoaKerberosIdentity: Error getting current time: %s", error_message);
+ g_debug ("GoaKerberosIdentity: Error getting current time: %s", error_message);
krb5_free_error_message (self->priv->kerberos_context, error_message);
return 0;
}
@@ -701,8 +700,8 @@ on_expiration_alarm_fired (GoaAlarm *alarm,
g_return_if_fail (GOA_IS_ALARM (alarm));
g_return_if_fail (GOA_IS_KERBEROS_IDENTITY (self));
- goa_debug ("GoaKerberosIdentity: expiration alarm fired for identity %s",
- goa_identity_get_identifier (GOA_IDENTITY (self)));
+ g_debug ("GoaKerberosIdentity: expiration alarm fired for identity %s",
+ goa_identity_get_identifier (GOA_IDENTITY (self)));
g_signal_emit (G_OBJECT (self), signals[NEEDS_REFRESH], 0);
}
@@ -713,7 +712,7 @@ on_expiration_alarm_rearmed (GoaAlarm *alarm,
g_return_if_fail (GOA_IS_ALARM (alarm));
g_return_if_fail (GOA_IS_KERBEROS_IDENTITY (self));
- goa_debug ("GoaKerberosIdentity: expiration alarm rearmed");
+ g_debug ("GoaKerberosIdentity: expiration alarm rearmed");
g_signal_emit (G_OBJECT (self), signals[NEEDS_REFRESH], 0);
}
@@ -724,7 +723,7 @@ on_renewal_alarm_rearmed (GoaAlarm *alarm,
g_return_if_fail (GOA_IS_ALARM (alarm));
g_return_if_fail (GOA_IS_KERBEROS_IDENTITY (self));
- goa_debug ("GoaKerberosIdentity: renewal alarm rearmed");
+ g_debug ("GoaKerberosIdentity: renewal alarm rearmed");
}
static void
@@ -738,7 +737,7 @@ on_renewal_alarm_fired (GoaAlarm *alarm,
if (self->priv->cached_verification_level == VERIFICATION_LEVEL_SIGNED_IN)
{
- goa_debug ("GoaKerberosIdentity: renewal alarm fired for signed-in identity");
+ g_debug ("GoaKerberosIdentity: renewal alarm fired for signed-in identity");
g_signal_emit (G_OBJECT (self), signals[NEEDS_RENEWAL], 0);
}
}
@@ -750,7 +749,7 @@ on_expiring_alarm_rearmed (GoaAlarm *alarm,
g_return_if_fail (GOA_IS_ALARM (alarm));
g_return_if_fail (GOA_IS_KERBEROS_IDENTITY (self));
- goa_debug ("GoaKerberosIdentity: expiring alarm rearmed");
+ g_debug ("GoaKerberosIdentity: expiring alarm rearmed");
}
static void
@@ -764,7 +763,7 @@ on_expiring_alarm_fired (GoaAlarm *alarm,
if (self->priv->cached_verification_level == VERIFICATION_LEVEL_SIGNED_IN)
{
- goa_debug ("GoaKerberosIdentity: expiring alarm fired for signed-in identity");
+ g_debug ("GoaKerberosIdentity: expiring alarm fired for signed-in identity");
g_signal_emit (G_OBJECT (self), signals[EXPIRING], 0);
}
}
@@ -1260,7 +1259,7 @@ goa_kerberos_identity_sign_in (GoaKerberosIdentity *self,
}
krb5_free_principal (self->priv->kerberos_context, principal);
- goa_debug ("GoaKerberosIdentity: identity signed in");
+ g_debug ("GoaKerberosIdentity: identity signed in");
signed_in = TRUE;
done:
@@ -1399,7 +1398,7 @@ goa_kerberos_identity_renew (GoaKerberosIdentity *self, GError **error)
goto out;
}
- goa_debug ("GoaKerberosIdentity: identity %s renewed", name);
+ g_debug ("GoaKerberosIdentity: identity %s renewed", name);
renewed = TRUE;
out:
g_free (name);
diff --git a/src/goaidentity/goakerberosidentityinquiry.c b/src/goaidentity/goakerberosidentityinquiry.c
index 535c91f..3324d17 100644
--- a/src/goaidentity/goakerberosidentityinquiry.c
+++ b/src/goaidentity/goakerberosidentityinquiry.c
@@ -22,7 +22,6 @@
#include "goakerberosidentityinquiry.h"
#include "goaidentityinquiryprivate.h"
-#include "goalogging.h"
#include <string.h>
#include <glib/gi18n.h>
@@ -179,7 +178,7 @@ goa_kerberos_identity_inquiry_new (GoaKerberosIdentity * identity,
error = NULL;
if (!g_initable_init (G_INITABLE (self), NULL, &error))
{
- goa_debug ("%s", error->message);
+ g_debug ("%s", error->message);
g_error_free (error);
g_object_unref (self);
return NULL;
diff --git a/src/goaidentity/goakerberosidentitymanager.c b/src/goaidentity/goakerberosidentitymanager.c
index 260f299..d6d9421 100644
--- a/src/goaidentity/goakerberosidentitymanager.c
+++ b/src/goaidentity/goakerberosidentitymanager.c
@@ -24,7 +24,6 @@
#include "goaidentitymanager.h"
#include "goaidentitymanagerprivate.h"
#include "goakerberosidentityinquiry.h"
-#include "goalogging.h"
#include <fcntl.h>
#include <string.h>
@@ -206,7 +205,7 @@ static void
on_identity_unexpired (GoaIdentity *identity,
GoaKerberosIdentityManager *self)
{
- goa_debug ("GoaKerberosIdentityManager: identity unexpired");
+ g_debug ("GoaKerberosIdentityManager: identity unexpired");
/* If an identity is now unexpired, that means some sort of weird
* clock skew happened and we should just do a full refresh, since it's
* probably affected more than one identity
@@ -218,7 +217,7 @@ static void
on_identity_expiring (GoaIdentity *identity,
GoaKerberosIdentityManager *self)
{
- goa_debug ("GoaKerberosIdentityManager: identity about to expire");
+ g_debug ("GoaKerberosIdentityManager: identity about to expire");
_goa_identity_manager_emit_identity_expiring (GOA_IDENTITY_MANAGER (self),
identity);
}
@@ -227,7 +226,7 @@ static void
on_identity_needs_renewal (GoaIdentity *identity,
GoaKerberosIdentityManager *self)
{
- goa_debug ("GoaKerberosIdentityManager: identity needs renewal");
+ g_debug ("GoaKerberosIdentityManager: identity needs renewal");
_goa_identity_manager_emit_identity_needs_renewal (GOA_IDENTITY_MANAGER (self),
identity);
}
@@ -236,7 +235,7 @@ static void
on_identity_needs_refresh (GoaIdentity *identity,
GoaKerberosIdentityManager *self)
{
- goa_debug ("GoaKerberosIdentityManager: needs refresh");
+ g_debug ("GoaKerberosIdentityManager: needs refresh");
schedule_refresh (self);
}
@@ -429,7 +428,7 @@ update_identity (GoaKerberosIdentityManager *self,
IdentitySignalWork *work;
/* if it's not expired, send out a refresh signal */
- goa_debug ("GoaKerberosIdentityManager: identity '%s' refreshed",
+ g_debug ("GoaKerberosIdentityManager: identity '%s' refreshed",
goa_identity_get_identifier (identity));
work = identity_signal_work_new (self, identity);
@@ -486,7 +485,7 @@ refresh_identity (GoaKerberosIdentityManager *self,
if (old_identity != NULL)
{
- goa_debug ("GoaKerberosIdentityManager: refreshing identity '%s'", identifier);
+ g_debug ("GoaKerberosIdentityManager: refreshing identity '%s'", identifier);
update_identity (self, operation, old_identity, identity);
/* Reuse the old identity, so any object data set up on it doesn't
@@ -497,7 +496,7 @@ refresh_identity (GoaKerberosIdentityManager *self,
}
else
{
- goa_debug ("GoaKerberosIdentityManager: adding new identity '%s'", identifier);
+ g_debug ("GoaKerberosIdentityManager: adding new identity '%s'", identifier);
add_identity (self, operation, identity, identifier);
}
@@ -526,7 +525,7 @@ refresh_identities (GoaKerberosIdentityManager *self,
return FALSE;
}
- goa_debug ("GoaKerberosIdentityManager: Refreshing identities");
+ g_debug ("GoaKerberosIdentityManager: Refreshing identities");
refreshed_identities = g_hash_table_new_full (g_str_hash,
g_str_equal,
(GDestroyNotify)
@@ -538,8 +537,8 @@ refresh_identities (GoaKerberosIdentityManager *self,
{
error_message =
krb5_get_error_message (self->priv->kerberos_context, error_code);
- goa_debug ("GoaKerberosIdentityManager: Error looking up available credential caches: %s",
- error_message);
+ g_debug ("GoaKerberosIdentityManager: Error looking up available credential caches: %s",
+ error_message);
krb5_free_error_message (self->priv->kerberos_context, error_message);
goto done;
}
@@ -568,8 +567,8 @@ refresh_identities (GoaKerberosIdentityManager *self,
{
error_message =
krb5_get_error_message (self->priv->kerberos_context, error_code);
- goa_debug ("GoaKerberosIdentityManager: Error iterating over available credential caches: %s",
- error_message);
+ g_debug ("GoaKerberosIdentityManager: Error iterating over available credential caches: %s",
+ error_message);
krb5_free_error_message (self->priv->kerberos_context, error_message);
}
@@ -602,7 +601,7 @@ list_identities (GoaKerberosIdentityManager *self,
{
GList *identities;
- goa_debug ("GoaKerberosIdentityManager: Listing identities");
+ g_debug ("GoaKerberosIdentityManager: Listing identities");
identities = g_hash_table_get_values (self->priv->identities);
identities = g_list_sort (identities, (GCompareFunc) identity_sort_func);
@@ -624,7 +623,7 @@ renew_identity (GoaKerberosIdentityManager *self,
identity_name =
goa_kerberos_identity_get_principal_name (GOA_KERBEROS_IDENTITY
(operation->identity));
- goa_debug ("GoaKerberosIdentityManager: renewing identity %s", identity_name);
+ g_debug ("GoaKerberosIdentityManager: renewing identity %s", identity_name);
g_free (identity_name);
error = NULL;
@@ -634,7 +633,7 @@ renew_identity (GoaKerberosIdentityManager *self,
if (!was_renewed)
{
- goa_debug ("GoaKerberosIdentityManager: could not renew identity: %s",
+ g_debug ("GoaKerberosIdentityManager: could not renew identity: %s",
error->message);
g_simple_async_result_set_from_error (operation->result, error);
@@ -737,7 +736,7 @@ get_identity (GoaKerberosIdentityManager *self,
{
GoaIdentity *identity;
- goa_debug ("GoaKerberosIdentityManager: get identity %s", operation->identifier);
+ g_debug ("GoaKerberosIdentityManager: get identity %s", operation->identifier);
identity = g_hash_table_lookup (self->priv->identities, operation->identifier);
if (identity == NULL)
@@ -765,18 +764,18 @@ get_new_credentials_cache (GoaKerberosIdentityManager *self,
if (g_strcmp0 (self->priv->credentials_cache_type, "FILE") == 0)
{
- goa_debug ("GoaKerberosIdentityManager: credential cache type %s doesn't supports cache collections",
self->priv->credentials_cache_type);
+ g_debug ("GoaKerberosIdentityManager: credential cache type %s doesn't supports cache collections",
self->priv->credentials_cache_type);
supports_multiple_identities = FALSE;
}
else if (g_strcmp0 (self->priv->credentials_cache_type, "DIR") == 0 ||
g_strcmp0 (self->priv->credentials_cache_type, "KEYRING") == 0)
{
- goa_debug ("GoaKerberosIdentityManager: credential cache type %s supports cache collections",
self->priv->credentials_cache_type);
+ g_debug ("GoaKerberosIdentityManager: credential cache type %s supports cache collections",
self->priv->credentials_cache_type);
supports_multiple_identities = TRUE;
}
else
{
- goa_debug ("GoaKerberosIdentityManager: don't know if credential cache type %s supports cache
collections, assuming yes", self->priv->credentials_cache_type);
+ g_debug ("GoaKerberosIdentityManager: don't know if credential cache type %s supports cache
collections, assuming yes", self->priv->credentials_cache_type);
supports_multiple_identities = TRUE;
}
@@ -818,8 +817,8 @@ sign_in_identity (GoaKerberosIdentityManager *self,
GError *error;
krb5_error_code error_code;
- goa_debug ("GoaKerberosIdentityManager: signing in identity %s",
- operation->identifier);
+ g_debug ("GoaKerberosIdentityManager: signing in identity %s",
+ operation->identifier);
error = NULL;
identity = g_hash_table_lookup (self->priv->identities, operation->identifier);
if (identity == NULL)
@@ -834,8 +833,8 @@ sign_in_identity (GoaKerberosIdentityManager *self,
error_message =
krb5_get_error_message (self->priv->kerberos_context, error_code);
- goa_debug ("GoaKerberosIdentityManager: Error creating new cache for identity credentials:
%s",
- error_message);
+ g_debug ("GoaKerberosIdentityManager: Error creating new cache for identity credentials:
%s",
+ error_message);
krb5_free_error_message (self->priv->kerberos_context, error_message);
g_simple_async_result_set_error (operation->result,
@@ -909,7 +908,7 @@ sign_out_identity (GoaKerberosIdentityManager *self,
identity_name =
goa_kerberos_identity_get_principal_name (GOA_KERBEROS_IDENTITY
(operation->identity));
- goa_debug ("GoaKerberosIdentityManager: signing out identity %s", identity_name);
+ g_debug ("GoaKerberosIdentityManager: signing out identity %s", identity_name);
g_free (identity_name);
error = NULL;
@@ -919,7 +918,7 @@ sign_out_identity (GoaKerberosIdentityManager *self,
if (!was_signed_out)
{
- goa_debug ("GoaKerberosIdentityManager: could not sign out identity: %s",
+ g_debug ("GoaKerberosIdentityManager: could not sign out identity: %s",
error->message);
g_error_free (error);
}
@@ -1027,12 +1026,12 @@ on_job_scheduled (GIOSchedulerJob *job,
*/
g_assert (operation->result != NULL);
- goa_debug
+ g_debug
("GoaKerberosIdentityManager: Blocking until identities list processed");
block_scheduler_job (self);
g_object_weak_ref (G_OBJECT (operation->result),
(GWeakNotify) stop_blocking_scheduler_job, self);
- goa_debug ("GoaKerberosIdentityManager: Continuing");
+ g_debug ("GoaKerberosIdentityManager: Continuing");
break;
case OPERATION_TYPE_SIGN_IN:
sign_in_identity (operation->manager, operation);
@@ -1064,7 +1063,7 @@ on_job_scheduled (GIOSchedulerJob *job,
* was a no-op, since the debug spew probably already says the message
*/
if (processed_operation)
- goa_debug ("GoaKerberosIdentityManager: Waiting for next operation");
+ g_debug ("GoaKerberosIdentityManager: Waiting for next operation");
}
g_async_queue_unref (pending_operations);
@@ -1387,8 +1386,8 @@ monitor_credentials_cache (GoaKerberosIdentityManager *self,
if (strcmp (cache_type, "FILE") != 0 && strcmp (cache_type, "DIR") != 0)
{
- goa_warning ("GoaKerberosIdentityManager: Using polling for change notification for credential cache
type '%s'",
- cache_type);
+ g_warning ("GoaKerberosIdentityManager: Using polling for change notification for credential cache
type '%s'",
+ cache_type);
can_monitor = FALSE;
}
@@ -1446,10 +1445,10 @@ monitor_credentials_cache (GoaKerberosIdentityManager *self,
{
if (monitoring_error != NULL)
{
- goa_warning ("GoaKerberosIdentityManager: Could not monitor credentials for %s (type %s),
reverting to polling: %s",
- cache_path,
- cache_type,
- monitoring_error != NULL? monitoring_error->message : "");
+ g_warning ("GoaKerberosIdentityManager: Could not monitor credentials for %s (type %s), reverting
to polling: %s",
+ cache_path,
+ cache_type,
+ monitoring_error != NULL? monitoring_error->message : "");
g_clear_error (&monitoring_error);
}
can_monitor = FALSE;
@@ -1517,8 +1516,8 @@ goa_kerberos_identity_manager_initable_init (GInitable *initable,
monitoring_error = NULL;
if (!monitor_credentials_cache (self, &monitoring_error))
{
- goa_warning ("GoaKerberosIdentityManager: Could not monitor credentials: %s",
- monitoring_error->message);
+ g_warning ("GoaKerberosIdentityManager: Could not monitor credentials: %s",
+ monitoring_error->message);
g_error_free (monitoring_error);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
