[Telepathy-commits] [telepathy-mission-control/master] Remove G_STRFUNC from DEBUG() parameters
Alberto Mardegan
alberto.mardegan at nokia.com
Thu Feb 26 04:31:30 PST 2009
---
src/mcd-account-compat.c | 4 +-
src/mcd-account-manager-query.c | 4 +-
src/mcd-account-manager.c | 20 ++++-----
src/mcd-account-requests.c | 12 +++---
src/mcd-account.c | 60 ++++++++++++-------------
src/mcd-channel.c | 17 +++----
src/mcd-connection.c | 95 +++++++++++++++++++--------------------
src/mcd-dbusprop.c | 8 ++--
src/mcd-dispatch-operation.c | 8 ++--
src/mcd-dispatcher.c | 29 +++++-------
src/mcd-manager.c | 16 +++---
src/mcd-master.c | 26 +++++-----
src/mcd-mission.c | 4 +-
src/mcd-presence-frame.c | 14 +++---
src/mcd-service.c | 10 ++--
15 files changed, 159 insertions(+), 168 deletions(-)
diff --git a/src/mcd-account-compat.c b/src/mcd-account-compat.c
index 3cd9168..8e6fdd1 100644
--- a/src/mcd-account-compat.c
+++ b/src/mcd-account-compat.c
@@ -248,7 +248,7 @@ process_channel_request (McdAccount *account, gpointer userdata,
g_object_unref (channel);
return;
}
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
connection = mcd_account_get_connection (account);
g_return_if_fail (connection != NULL);
g_return_if_fail (mcd_connection_get_connection_status (connection)
@@ -263,7 +263,7 @@ on_channel_status_changed (McdChannel *channel, McdChannelStatus status,
{
McdAccountCompatReq *req_data;
- DEBUG ("%s (%u)", G_STRFUNC, status);
+ DEBUG ("%u", status);
g_return_if_fail (MCD_IS_ACCOUNT (account));
if (status == MCD_CHANNEL_STATUS_FAILED &&
diff --git a/src/mcd-account-manager-query.c b/src/mcd-account-manager-query.c
index 8298d32..51382b1 100644
--- a/src/mcd-account-manager-query.c
+++ b/src/mcd-account-manager-query.c
@@ -196,7 +196,7 @@ find_accounts (gpointer key, gpointer value, gpointer userdata)
const gchar *object_path, *string, *status, *message;
guint i;
- DEBUG ("%s: %s", G_STRFUNC, (gchar *)key);
+ DEBUG ("%s", (gchar *)key);
if (fd->manager)
{
string = mcd_account_get_manager_name (account);
@@ -308,7 +308,7 @@ account_manager_find_accounts (McSvcAccountManagerInterfaceQuery *self,
McdFindData fd;
guint i;
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
memset (&fd, 0, sizeof (fd));
fd.params = g_array_new (FALSE, FALSE, sizeof (McdFindParam));
fd.properties = g_array_new (FALSE, FALSE, sizeof (McdIfaceProperty));
diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
index 0f86ef5..d2dfe9f 100644
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@ -169,8 +169,7 @@ recover_connection (McdAccountManager *account_manager, gchar *file_contents,
if (!account || !mcd_account_is_enabled (account))
goto err_account;
- DEBUG ("%s: account is %s", G_STRFUNC,
- mcd_account_get_unique_name (account));
+ DEBUG ("account is %s", mcd_account_get_unique_name (account));
manager_name = mcd_account_get_manager_name (account);
master = mcd_master_get_default ();
@@ -190,7 +189,7 @@ recover_connection (McdAccountManager *account_manager, gchar *file_contents,
&error);
if (G_UNLIKELY (error))
{
- DEBUG ("%s: got error: %s", G_STRFUNC, error->message);
+ DEBUG ("got error: %s", error->message);
g_error_free (error);
goto err_connection;
}
@@ -218,7 +217,7 @@ list_connection_names_cb (const gchar * const *names, gsize n,
gchar *contents = NULL;
guint i;
- DEBUG ("%s called, %u connections", G_STRFUNC, n);
+ DEBUG ("%u connections", n);
g_file_get_contents (priv->account_connections_file, &contents, NULL, NULL);
for (i = 0; i < n; i++)
@@ -277,8 +276,7 @@ unref_account (gpointer data)
McdAccount *account = MCD_ACCOUNT (data);
McdAccountManager *account_manager;
- DEBUG ("%s called for %s", G_STRFUNC,
- mcd_account_get_unique_name (account));
+ DEBUG ("called for %s", mcd_account_get_unique_name (account));
account_manager = mcd_account_get_account_manager (account);
g_signal_handlers_disconnect_by_func (account, on_account_validity_changed,
account_manager);
@@ -404,7 +402,7 @@ mcd_account_manager_create_account (McdAccountManager *account_manager,
McdAccount *account;
gchar *unique_name;
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
if (G_UNLIKELY (manager == NULL || manager[0] == 0 ||
protocol == NULL || protocol[0] == 0))
{
@@ -527,7 +525,7 @@ get_valid_accounts (TpSvcDBusProperties *self, const gchar *name,
McdAccountManager *account_manager = MCD_ACCOUNT_MANAGER (self);
McdAccountManagerPrivate *priv = account_manager->priv;
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
accounts_to_gvalue (priv->accounts, TRUE, value);
}
@@ -538,7 +536,7 @@ get_invalid_accounts (TpSvcDBusProperties *self, const gchar *name,
McdAccountManager *account_manager = MCD_ACCOUNT_MANAGER (self);
McdAccountManagerPrivate *priv = account_manager->priv;
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
accounts_to_gvalue (priv->accounts, FALSE, value);
}
@@ -589,7 +587,7 @@ write_conf (gpointer userdata)
gchar *filename, *data;
gsize len;
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
write_conf_id = 0;
data = g_key_file_to_data (keyfile, &len, &error);
@@ -617,7 +615,7 @@ release_load_accounts_lock (McdLoadAccountsData *lad)
{
g_return_if_fail (lad->account_lock > 0);
lad->account_lock--;
- DEBUG ("%s called, count is now %d", G_STRFUNC, lad->account_lock);
+ DEBUG ("called, count is now %d", lad->account_lock);
if (lad->account_lock == 0)
{
register_dbus_service (lad->account_manager);
diff --git a/src/mcd-account-requests.c b/src/mcd-account-requests.c
index 0daa178..4789644 100644
--- a/src/mcd-account-requests.c
+++ b/src/mcd-account-requests.c
@@ -49,12 +49,12 @@ online_request_cb (McdAccount *account, gpointer userdata, const GError *error)
if (error)
{
- g_warning ("%s: got error: %s", G_STRFUNC, error->message);
+ g_warning ("got error: %s", error->message);
mcd_channel_take_error (channel, g_error_copy (error));
g_object_unref (channel);
return;
}
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
connection = mcd_account_get_connection (account);
g_return_if_fail (connection != NULL);
g_return_if_fail (mcd_connection_get_connection_status (connection)
@@ -62,7 +62,7 @@ online_request_cb (McdAccount *account, gpointer userdata, const GError *error)
if (mcd_channel_get_status (channel) == MCD_CHANNEL_STATUS_FAILED)
{
- DEBUG ("%s: channel %p is failed", G_STRFUNC, channel);
+ DEBUG ("channel %p is failed", channel);
g_object_unref (channel);
return;
}
@@ -176,7 +176,7 @@ create_request (McdAccount *account, GHashTable *properties,
_mcd_account_online_request (account, online_request_cb, channel, error);
if (*error)
{
- g_warning ("%s: _mcd_account_online_request: %s", G_STRFUNC,
+ g_warning ("_mcd_account_online_request: %s",
(*error)->message);
mcd_channel_take_error (channel, g_error_copy (*error));
/* no unref here, as this will invoke our handler which will
@@ -216,7 +216,7 @@ account_request_common (McdAccount *account, GHashTable *properties,
return;
}
request_id = _mcd_channel_get_request_path (channel);
- DEBUG ("%s: returning %s", G_STRFUNC, request_id);
+ DEBUG ("returning %s", request_id);
if (use_existing)
mc_svc_account_interface_channelrequests_return_from_ensure_channel
(context, request_id);
@@ -257,7 +257,7 @@ account_request_cancel (McSvcAccountInterfaceChannelRequests *self,
McdChannel *channel;
McdChannelStatus status;
- DEBUG ("%s called for %s", G_STRFUNC, request_id);
+ DEBUG ("called for %s", request_id);
g_return_if_fail (request_id != NULL);
channel = get_channel_from_request (MCD_ACCOUNT (self), request_id);
if (!channel)
diff --git a/src/mcd-account.c b/src/mcd-account.c
index dd7c770..ff817fe 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -173,7 +173,7 @@ _mcd_account_maybe_autoconnect (McdAccount *account)
McdMaster *master = mcd_master_get_default ();
if (_mcd_master_account_conditions_satisfied (master, account))
{
- DEBUG ("%s: connecting account %s", G_STRFUNC, priv->unique_name);
+ DEBUG ("connecting account %s", priv->unique_name);
_mcd_account_request_connection (account);
}
}
@@ -325,7 +325,7 @@ static void on_manager_ready (McdManager *manager, const GError *error,
if (error)
{
- DEBUG ("%s: got error: %s", G_STRFUNC, error->message);
+ DEBUG ("got error: %s", error->message);
}
else
{
@@ -424,8 +424,7 @@ on_connection_abort (McdConnection *connection, McdAccount *account)
{
McdAccountPrivate *priv = MCD_ACCOUNT_PRIV (account);
- DEBUG ("%s called (%p, account %s)", G_STRFUNC,
- connection, priv->unique_name);
+ DEBUG ("called (%p, account %s)", connection, priv->unique_name);
_mcd_account_set_connection (account, NULL);
}
@@ -500,7 +499,7 @@ emit_property_changed (gpointer userdata)
McdAccount *account = MCD_ACCOUNT (userdata);
McdAccountPrivate *priv = account->priv;
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
mc_svc_account_emit_account_property_changed (account,
priv->changed_properties);
@@ -528,7 +527,7 @@ mcd_account_changed_property (McdAccount *account, const gchar *key,
McdAccountPrivate *priv = account->priv;
GValue *val;
- DEBUG ("%s called: %s", G_STRFUNC, key);
+ DEBUG ("called: %s", key);
if (priv->changed_properties &&
g_hash_table_lookup (priv->changed_properties, key))
{
@@ -565,7 +564,7 @@ mcd_account_changed_property (McdAccount *account, const gchar *key,
#else
GHashTable *properties;
- DEBUG ("%s called: %s", G_STRFUNC, key);
+ DEBUG ("called: %s", key);
properties = g_hash_table_new (g_str_hash, g_str_equal);
g_hash_table_insert (properties, (gpointer)key, (gpointer)value);
mc_svc_account_emit_account_property_changed (account,
@@ -627,7 +626,7 @@ set_display_name (TpSvcDBusProperties *self, const gchar *name,
McdAccount *account = MCD_ACCOUNT (self);
McdAccountPrivate *priv = account->priv;
- DEBUG ("%s called for %s", G_STRFUNC, priv->unique_name);
+ DEBUG ("called for %s", priv->unique_name);
mcd_account_set_string_val (account, name, value);
}
@@ -645,7 +644,7 @@ set_icon (TpSvcDBusProperties *self, const gchar *name, const GValue *value)
McdAccount *account = MCD_ACCOUNT (self);
McdAccountPrivate *priv = account->priv;
- DEBUG ("%s called for %s", G_STRFUNC, priv->unique_name);
+ DEBUG ("called for %s", priv->unique_name);
mcd_account_set_string_val (account, name, value);
}
@@ -674,7 +673,7 @@ set_enabled (TpSvcDBusProperties *self, const gchar *name, const GValue *value)
McdAccountPrivate *priv = account->priv;
gboolean enabled;
- DEBUG ("%s called for %s", G_STRFUNC, priv->unique_name);
+ DEBUG ("called for %s", priv->unique_name);
enabled = g_value_get_boolean (value);
if (priv->enabled != enabled)
{
@@ -708,7 +707,7 @@ set_nickname (TpSvcDBusProperties *self, const gchar *name, const GValue *value)
McdAccount *account = MCD_ACCOUNT (self);
McdAccountPrivate *priv = account->priv;
- DEBUG ("%s called for %s", G_STRFUNC, priv->unique_name);
+ DEBUG ("called for %s", priv->unique_name);
if (mcd_account_set_string_val (account, name, value))
g_signal_emit (account, _mcd_account_signals[ALIAS_CHANGED], 0,
g_value_get_string (value));
@@ -733,7 +732,7 @@ set_avatar (TpSvcDBusProperties *self, const gchar *name, const GValue *value)
GError *error = NULL;
gboolean changed;
- DEBUG ("%s called for %s", G_STRFUNC, priv->unique_name);
+ DEBUG ("called for %s", priv->unique_name);
va = g_value_get_boxed (value);
avatar = g_value_get_boxed (va->values);
mime_type = g_value_get_string (va->values + 1);
@@ -796,7 +795,7 @@ set_automatic_presence (TpSvcDBusProperties *self,
gboolean changed = FALSE;
GValueArray *va;
- DEBUG ("%s called for %s", G_STRFUNC, priv->unique_name);
+ DEBUG ("called for %s", priv->unique_name);
va = g_value_get_boxed (value);
type = g_value_get_uint (va->values);
status = g_value_get_string (va->values + 1);
@@ -878,7 +877,7 @@ set_connect_automatically (TpSvcDBusProperties *self,
McdAccountPrivate *priv = account->priv;
gboolean connect_automatically;
- DEBUG ("%s called for %s", G_STRFUNC, priv->unique_name);
+ DEBUG ("called for %s", priv->unique_name);
connect_automatically = g_value_get_boolean (value);
if (priv->connect_automatically != connect_automatically)
{
@@ -898,7 +897,7 @@ get_connect_automatically (TpSvcDBusProperties *self,
McdAccount *account = MCD_ACCOUNT (self);
McdAccountPrivate *priv = account->priv;
- DEBUG ("%s called for %s", G_STRFUNC, priv->unique_name);
+ DEBUG ("called for %s", priv->unique_name);
g_value_init (value, G_TYPE_BOOLEAN);
g_value_set_boolean (value, priv->connect_automatically);
}
@@ -986,7 +985,7 @@ set_requested_presence (TpSvcDBusProperties *self,
gint type;
GValueArray *va;
- DEBUG ("%s called for %s", G_STRFUNC, priv->unique_name);
+ DEBUG ("called for %s", priv->unique_name);
va = g_value_get_boxed (value);
type = (gint)g_value_get_uint (va->values);
status = g_value_get_string (va->values + 1);
@@ -1091,7 +1090,7 @@ mc_param_type (const TpConnectionManagerParam *param)
case DBUS_TYPE_BOOLEAN:
return G_TYPE_BOOLEAN;
default:
- g_warning ("%s: skipping parameter %s, unknown type %s", G_STRFUNC,
+ g_warning ("skipping parameter %s, unknown type %s",
param->name, param->dbus_signature);
}
return G_TYPE_INVALID;
@@ -1108,7 +1107,7 @@ account_remove (McSvcAccount *self, DBusGMethodInvocation *context)
{
GError *error = NULL;
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
if (!mcd_account_delete (MCD_ACCOUNT (self), &error))
{
if (!error)
@@ -1129,7 +1128,7 @@ mcd_account_check_parameters (McdAccount *account)
const TpConnectionManagerParam *param;
gboolean valid;
- DEBUG ("%s called for %s", G_STRFUNC, priv->unique_name);
+ DEBUG ("called for %s", priv->unique_name);
param = mcd_manager_get_parameters (priv->manager, priv->protocol_name);
if (!param) return FALSE;
valid = TRUE;
@@ -1179,7 +1178,7 @@ mcd_account_set_parameters (McdAccount *account, GHashTable *params,
GSList *dbus_properties = NULL;
gboolean reset_connection;
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
if (G_UNLIKELY (!priv->manager && !load_manager (account)))
{
g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
@@ -1304,7 +1303,7 @@ account_update_parameters (McSvcAccount *self, GHashTable *set,
GValue value = { 0 };
GError *error = NULL;
- DEBUG ("%s called for %s", G_STRFUNC, priv->unique_name);
+ DEBUG ("called for %s", priv->unique_name);
if (!mcd_account_set_parameters (account, set, &error))
{
@@ -1465,7 +1464,7 @@ _mcd_account_finalize (GObject *object)
{
McdAccountPrivate *priv = MCD_ACCOUNT_PRIV (object);
- DEBUG ("%s called for %s", G_STRFUNC, priv->unique_name);
+ DEBUG ("called for %s", priv->unique_name);
if (priv->changed_properties)
g_hash_table_destroy (priv->changed_properties);
if (priv->property_values)
@@ -1495,7 +1494,7 @@ _mcd_account_dispose (GObject *object)
{
McdAccountPrivate *priv = MCD_ACCOUNT_PRIV (object);
- DEBUG ("%s called for %s", G_STRFUNC, priv->unique_name);
+ DEBUG ("called for %s", priv->unique_name);
if (priv->online_requests)
{
GError *error;
@@ -1765,7 +1764,7 @@ mcd_account_get_parameters (McdAccount *account)
const TpConnectionManagerParam *param;
GHashTable *params;
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
if (!priv->manager && !load_manager (account)) return NULL;
params = g_hash_table_new_full (g_str_hash, g_str_equal,
@@ -1960,7 +1959,7 @@ mcd_account_set_normalized_name (McdAccount *account, const gchar *name)
{
McdAccountPrivate *priv = account->priv;
- DEBUG ("%s called (%s)", G_STRFUNC, name);
+ DEBUG ("called (%s)", name);
if (name)
g_key_file_set_string (priv->keyfile, priv->unique_name,
MC_ACCOUNTS_KEY_NORMALIZED_NAME, name);
@@ -1984,7 +1983,7 @@ mcd_account_set_avatar_token (McdAccount *account, const gchar *token)
{
McdAccountPrivate *priv = account->priv;
- DEBUG ("%s called (%s)", G_STRFUNC, token);
+ DEBUG ("called (%s)", token);
if (token)
g_key_file_set_string (priv->keyfile, priv->unique_name,
MC_ACCOUNTS_KEY_AVATAR_TOKEN, token);
@@ -2011,7 +2010,7 @@ mcd_account_set_avatar (McdAccount *account, const GArray *avatar,
McdAccountPrivate *priv = MCD_ACCOUNT_PRIV (account);
gchar *data_dir, *filename;
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
data_dir = get_account_data_path (priv);
filename = g_build_filename (data_dir, MC_AVATAR_FILENAME, NULL);
if (!g_file_test (data_dir, G_FILE_TEST_EXISTS))
@@ -2091,8 +2090,7 @@ mcd_account_get_avatar (McdAccount *account, GArray **avatar,
}
else
{
- DEBUG ("%s: error reading %s: %s", G_STRFUNC,
- filename, error->message);
+ DEBUG ("error reading %s: %s", filename, error->message);
g_error_free (error);
}
}
@@ -2313,8 +2311,8 @@ _mcd_account_online_request (McdAccount *account,
McdAccountPrivate *priv = account->priv;
GError *error = NULL;
- DEBUG ("%s: connection status for %s is %d",
- G_STRFUNC, priv->unique_name, priv->conn_status);
+ DEBUG ("connection status for %s is %d",
+ priv->unique_name, priv->conn_status);
if (priv->conn_status == TP_CONNECTION_STATUS_CONNECTED)
{
/* invoke the callback now */
diff --git a/src/mcd-channel.c b/src/mcd-channel.c
index 4841bd8..edab637 100644
--- a/src/mcd-channel.c
+++ b/src/mcd-channel.c
@@ -115,7 +115,7 @@ channel_request_data_free (McdChannelRequestData *crd)
{
GList *list;
- DEBUG ("%s called for %p", G_STRFUNC, crd);
+ DEBUG ("called for %p", crd);
g_hash_table_unref (crd->properties);
g_free (crd->preferred_handler);
list = crd->paths;
@@ -137,7 +137,7 @@ on_members_changed (TpChannel *proxy, const gchar *message,
TpHandle self_handle;
guint i;
- DEBUG ("%s called (actor %u, reason %u, self_handle %u)", G_STRFUNC,
+ DEBUG ("called (actor %u, reason %u, self_handle %u)",
actor, reason, tp_channel_group_get_self_handle (proxy));
self_handle = tp_channel_group_get_self_handle (proxy);
@@ -216,7 +216,7 @@ on_channel_ready (TpChannel *tp_chan, const GError *error, gpointer user_data)
g_slice_free (McdChannel *, channel_ptr);
if (error)
{
- DEBUG ("%s got error: %s", G_STRFUNC, error->message);
+ DEBUG ("got error: %s", error->message);
return;
}
@@ -246,7 +246,7 @@ mcd_channel_close (McdChannel *channel)
tp_channel_get_channel_type_id (priv->tp_chan) !=
TP_IFACE_QUARK_CHANNEL_TYPE_CONTACT_LIST)
{
- DEBUG ("%s: Requesting telepathy to close the channel", G_STRFUNC);
+ DEBUG ("Requesting telepathy to close the channel");
tp_cli_channel_call_close (priv->tp_chan, -1, NULL, NULL, NULL, NULL);
}
}
@@ -352,7 +352,7 @@ _mcd_channel_dispose (GObject * object)
{
McdChannelPrivate *priv = MCD_CHANNEL_PRIV (object);
- DEBUG ("\n\n%s for %p (is disposed = %d)", G_STRFUNC, object, priv->is_disposed);
+ DEBUG ("%p (is disposed = %d)", object, priv->is_disposed);
if (priv->is_disposed)
return;
@@ -375,7 +375,7 @@ mcd_channel_abort (McdMission *mission)
McdChannel *channel = MCD_CHANNEL (mission);
McdChannelPrivate *priv = channel->priv;
- DEBUG ("%s: %p", G_STRFUNC, mission);
+ DEBUG ("%p", mission);
if (priv->is_aborted)
{
DEBUG ("Already aborted");
@@ -626,7 +626,7 @@ _mcd_channel_create_proxy (McdChannel *channel, TpConnection *connection,
void
mcd_channel_set_status (McdChannel *channel, McdChannelStatus status)
{
- DEBUG ("%s: %p, %u", G_STRFUNC, channel, status);
+ DEBUG ("%p, %u", channel, status);
g_return_if_fail(MCD_IS_CHANNEL(channel));
if (status != channel->priv->status)
@@ -1172,8 +1172,7 @@ copy_status (McdChannel *source, McdChannel *dest)
dst_priv = dest->priv;
if (dst_priv->status != src_priv->status)
{
- DEBUG ("%s: source is %d, dest is %d", G_STRFUNC,
- src_priv->status, dst_priv->status);
+ DEBUG ("source is %d, dest is %d", src_priv->status, dst_priv->status);
if (src_priv->status == MCD_CHANNEL_STATUS_FAILED)
{
const GError *error;
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index 0001397..2543f1a 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -271,8 +271,8 @@ _check_presence (McdConnectionPrivate *priv, TpConnectionPresenceType presence,
if (*fallbacks == NULL)
*fallbacks = "available";
- DEBUG ("%s: account %s: presence %s not supported, setting %s",
- G_STRFUNC, mcd_account_get_unique_name (priv->account),
+ DEBUG ("account %s: presence %s not supported, setting %s",
+ mcd_account_get_unique_name (priv->account),
*status, *fallbacks);
*status = *fallbacks;
return TRUE;
@@ -328,8 +328,7 @@ presence_get_statuses_cb (TpProxy *proxy, const GValue *v_statuses,
g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
(GDestroyNotify)mcd_presence_info_free);
- DEBUG ("%s: account %s:",
- G_STRFUNC, mcd_account_get_unique_name (priv->account));
+ DEBUG ("account %s:", mcd_account_get_unique_name (priv->account));
statuses = g_value_get_boxed (v_statuses);
g_hash_table_iter_init (&iter, statuses);
while (g_hash_table_iter_next (&iter, &ht_key, &ht_value))
@@ -524,8 +523,8 @@ on_capabilities_changed (TpConnection *proxy, const GPtrArray *caps,
TpProxyPendingCall *call;
guint i;
- DEBUG ("%s: got capabilities for channel %p handle %d, type %s",
- G_STRFUNC, channel, mcd_channel_get_handle (channel),
+ DEBUG ("got capabilities for channel %p handle %d, type %s",
+ channel, mcd_channel_get_handle (channel),
mcd_channel_get_channel_type (channel));
type = dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, G_TYPE_STRING,
G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT,
@@ -552,8 +551,8 @@ on_capabilities_changed (TpConnection *proxy, const GPtrArray *caps,
if (g_object_get_data (G_OBJECT (channel), "tp_chan_call") != NULL)
goto done;
chan_handle_type = mcd_channel_get_handle_type (channel);
- DEBUG ("%s: requesting channel again (type = %s, handle_type = %u, handle = %u)",
- G_STRFUNC, chan_type, chan_handle_type, chan_handle);
+ DEBUG ("requesting channel again (type = %s, handle_type = %u, handle = %u)",
+ chan_type, chan_handle_type, chan_handle);
call = tp_cli_connection_call_request_channel (priv->tp_conn, -1,
chan_type,
chan_handle_type,
@@ -578,7 +577,7 @@ on_channel_capabilities_timeout (McdChannel *channel,
/* We reach this point if this channel was waiting for capabilities; we
* abort it and return the original error */
- DEBUG ("%s: channel %p timed out, returning error!", G_STRFUNC, channel);
+ DEBUG ("channel %p timed out, returning error!", channel);
mc_error = map_tp_error_to_mc_error (channel, cwd->error);
mcd_channel_take_error (channel, mc_error);
@@ -596,7 +595,7 @@ on_capabilities_timeout (McdConnection *connection)
McdConnectionPrivate *priv = MCD_CONNECTION_PRIV (connection);
const GList *list, *list_curr;
- DEBUG ("%s: got_capabilities is %d", G_STRFUNC, priv->got_capabilities);
+ DEBUG ("got_capabilities is %d", priv->got_capabilities);
priv->got_capabilities = TRUE;
list = mcd_operation_get_missions ((McdOperation *)connection);
while (list)
@@ -642,14 +641,14 @@ _mcd_connection_setup_capabilities (McdConnection *connection)
if (!priv->has_capabilities_if)
{
- DEBUG ("%s: connection does not support capabilities interface", G_STRFUNC);
+ DEBUG ("connection does not support capabilities interface");
priv->got_capabilities = TRUE;
return;
}
protocol_name = mcd_account_get_protocol_name (priv->account);
capabilities = mcd_dispatcher_get_channel_capabilities (priv->dispatcher,
protocol_name);
- DEBUG ("%s: advertising capabilities", G_STRFUNC);
+ DEBUG ("advertising capabilities");
tp_cli_connection_interface_capabilities_call_advertise_capabilities (priv->tp_conn, -1,
capabilities,
&removed,
@@ -681,14 +680,14 @@ _mcd_connection_setup_contact_capabilities (McdConnection *connection)
if (!priv->has_contact_capabilities_if)
{
- DEBUG ("%s: connection does not support contact capabilities interface", G_STRFUNC);
+ DEBUG ("connection does not support contact capabilities interface");
priv->got_contact_capabilities = TRUE;
return;
}
contact_capabilities = mcd_dispatcher_get_channel_enhanced_capabilities
(priv->dispatcher);
- DEBUG ("%s: advertising capabilities", G_STRFUNC);
+ DEBUG ("advertising capabilities");
mc_cli_connection_interface_contact_capabilities_call_set_self_capabilities
(priv->tp_conn, -1, contact_capabilities, NULL, NULL, NULL, NULL);
@@ -749,7 +748,7 @@ avatars_set_avatar_cb (TpConnection *proxy, const gchar *token,
g_warning ("%s: error: %s", G_STRFUNC, error->message);
return;
}
- DEBUG ("%s: received token: %s", G_STRFUNC, token);
+ DEBUG ("received token: %s", token);
mcd_account_set_avatar_token (priv->account, token);
}
@@ -759,7 +758,7 @@ avatars_clear_avatar_cb (TpConnection *proxy, const GError *error,
{
if (!error)
{
- DEBUG ("%s: Clear avatar succeeded", G_STRFUNC);
+ DEBUG ("Clear avatar succeeded");
}
else
{
@@ -780,12 +779,12 @@ on_avatar_retrieved (TpConnection *proxy, guint contact_id, const gchar *token,
/* if we are setting the avatar, we must ignore this signal */
if (priv->setting_avatar) return;
- DEBUG ("%s: Avatar retrieved for contact %d, token: %s", G_STRFUNC, contact_id, token);
+ DEBUG ("Avatar retrieved for contact %d, token: %s", contact_id, token);
prev_token = mcd_account_get_avatar_token (priv->account);
if (!prev_token || strcmp (token, prev_token) != 0)
{
- DEBUG ("%s: received mime-type: %s", G_STRFUNC, mime_type);
+ DEBUG ("received mime-type: %s", mime_type);
mcd_account_set_avatar (priv->account, avatar, mime_type, token, NULL);
}
g_free (prev_token);
@@ -814,13 +813,13 @@ on_avatar_updated (TpConnection *proxy, guint contact_id, const gchar *token,
/* if we are setting the avatar, we must ignore this signal */
if (priv->setting_avatar) return;
- DEBUG ("%s: contact %d, token: %s", G_STRFUNC, contact_id, token);
+ DEBUG ("contact %d, token: %s", contact_id, token);
prev_token = mcd_account_get_avatar_token (priv->account);
if (!prev_token || strcmp (token, prev_token) != 0)
{
GArray handles;
- DEBUG ("%s: avatar has changed", G_STRFUNC);
+ DEBUG ("avatar has changed");
/* the avatar has changed, let's retrieve the new one */
handles.len = 1;
handles.data = (gchar *)&contact_id;
@@ -839,7 +838,7 @@ _mcd_connection_set_avatar (McdConnection *connection, const GArray *avatar,
{
McdConnectionPrivate *priv = connection->priv;
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
if (avatar->len > 0 && avatar->len < G_MAXUINT)
{
tp_cli_connection_interface_avatars_call_set_avatar (priv->tp_conn, -1,
@@ -961,7 +960,7 @@ on_aliases_changed (TpConnection *proxy, const GPtrArray *aliases,
guint contact;
guint i;
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
type = dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, G_TYPE_STRING,
G_TYPE_INVALID);
for (i = 0; i < aliases->len; i++)
@@ -1005,7 +1004,7 @@ _mcd_connection_set_alias (McdConnection *connection,
GHashTable *aliases;
TpHandle self_handle;
- DEBUG ("%s: setting alias '%s'", G_STRFUNC, alias);
+ DEBUG ("setting alias '%s'", alias);
aliases = g_hash_table_new (NULL, NULL);
self_handle = tp_connection_get_self_handle (priv->tp_conn);
@@ -1049,7 +1048,7 @@ _mcd_connection_setup_alias (McdConnection *connection)
static gboolean
mcd_connection_reconnect (McdConnection *connection)
{
- DEBUG ("%s: %p", G_STRFUNC, connection);
+ DEBUG ("%p", connection);
mcd_connection_connect (connection, NULL);
return FALSE;
}
@@ -1066,7 +1065,7 @@ on_connection_status_changed (TpConnection *tp_conn, GParamSpec *pspec,
"status", &conn_status,
"status-reason", &conn_reason,
NULL);
- DEBUG ("%s: status_changed called from tp (%d)", G_STRFUNC, conn_status);
+ DEBUG ("status_changed called from tp (%d)", conn_status);
switch (conn_status)
{
@@ -1154,7 +1153,7 @@ connect_cb (TpConnection *tp_conn, const GError *error,
{
McdConnection *connection = MCD_CONNECTION (weak_object);
- DEBUG ("%s called for connection %p", G_STRFUNC, connection);
+ DEBUG ("called for connection %p", connection);
if (error)
{
@@ -1170,7 +1169,7 @@ request_unrequested_channels (McdConnection *connection)
channels = mcd_operation_get_missions ((McdOperation *)connection);
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
/* go through the channels that were requested while the connection was not
* ready, and process them */
while (channels)
@@ -1195,7 +1194,7 @@ dispatch_undispatched_channels (McdConnection *connection)
priv->can_dispatch = TRUE;
channels = mcd_operation_get_missions ((McdOperation *)connection);
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
while (channels)
{
McdChannel *channel = MCD_CHANNEL (channels->data);
@@ -1313,7 +1312,7 @@ mcd_connection_recover_channel (McdConnection *connection,
McdConnectionPrivate *priv = connection->priv;
McdChannel *channel;
- DEBUG ("%s called for %s", G_STRFUNC, object_path);
+ DEBUG ("called for %s", object_path);
channel = mcd_channel_new_from_properties (priv->tp_conn, object_path,
properties);
if (G_UNLIKELY (!channel)) return;
@@ -1447,13 +1446,13 @@ on_connection_ready (TpConnection *tp_conn, const GError *error,
g_slice_free (McdConnection *, connection_ptr);
if (error)
{
- DEBUG ("%s got error: %s", G_STRFUNC, error->message);
+ DEBUG ("got error: %s", error->message);
return;
}
if (!connection) return;
- DEBUG ("%s: connection is ready", G_STRFUNC);
+ DEBUG ("connection is ready");
priv = MCD_CONNECTION_PRIV (connection);
_mcd_connection_get_normalized_name (connection);
@@ -1538,8 +1537,8 @@ _mcd_connection_connect_with_params (McdConnection *connection,
protocol_name = mcd_account_get_protocol_name (priv->account);
- DEBUG ("%s: Trying connect account: %s",
- G_STRFUNC, mcd_account_get_unique_name (priv->account));
+ DEBUG ("Trying connect account: %s",
+ mcd_account_get_unique_name (priv->account));
mcd_account_set_connection_status (priv->account,
TP_CONNECTION_STATUS_CONNECTING,
@@ -1571,7 +1570,7 @@ _mcd_connection_release_tp_connection (McdConnection *connection)
{
McdConnectionPrivate *priv = MCD_CONNECTION_PRIV (connection);
- DEBUG ("%s(%p) called", G_STRFUNC, connection);
+ DEBUG ("%p", connection);
mcd_account_set_current_presence (priv->account,
TP_CONNECTION_PRESENCE_TYPE_OFFLINE,
"offline", NULL);
@@ -1617,7 +1616,7 @@ _mcd_connection_dispose (GObject * object)
McdConnection *connection = MCD_CONNECTION (object);
McdConnectionPrivate *priv = MCD_CONNECTION_PRIV (connection);
- DEBUG ("%s called for object %p", G_STRFUNC, object);
+ DEBUG ("called for object %p", object);
if (priv->is_disposed)
{
@@ -2023,7 +2022,7 @@ remove_capabilities_refs (gpointer data)
{
struct capabilities_wait_data *cwd = data;
- DEBUG ("\n\n\n%s called\n\n\n", G_STRFUNC);
+ DEBUG ("called");
tp_proxy_signal_connection_disconnect (cwd->signal_connection);
g_error_free (cwd->error);
g_free (cwd);
@@ -2063,7 +2062,7 @@ request_channel_cb (TpConnection *proxy, const gchar *channel_path,
if (tp_error != NULL)
{
- DEBUG ("%s: Got error: %s", G_STRFUNC, tp_error->message);
+ DEBUG ("got error: %s", tp_error->message);
if (error_on_creation != NULL)
{
/* replace the error, so that the initial one is reported */
@@ -2082,8 +2081,8 @@ request_channel_cb (TpConnection *proxy, const gchar *channel_path,
/* the channel request has failed probably because we are just
* connected and we didn't recive the contact capabilities yet. In
* this case, wait for this contact's capabilities to arrive */
- DEBUG ("%s: listening for remote capabilities on channel handle %d, type %d",
- G_STRFUNC, chan_handle, mcd_channel_get_handle_type (channel));
+ DEBUG ("listening for remote capabilities on channel handle %d, type %d",
+ chan_handle, mcd_channel_get_handle_type (channel));
/* Store the error, we might need it later */
cwd = g_malloc (sizeof (struct capabilities_wait_data));
cwd->error = g_error_copy (tp_error);
@@ -2187,7 +2186,7 @@ request_handles_cb (TpConnection *proxy, const GArray *handles,
chan_handle_type == mcd_channel_get_handle_type (existing_channel) &&
chan_type == mcd_channel_get_channel_type_quark (existing_channel))
{
- DEBUG ("%s: Channel already existing, returning old one", G_STRFUNC);
+ DEBUG ("Channel already existing, returning old one");
/* FIXME: this situation is weird. We should have checked for the
* existance of the channel _before_ getting here, already when
* creating the request */
@@ -2225,13 +2224,13 @@ common_request_channel_cb (TpConnection *proxy, gboolean yours,
/* No special handling of "no capabilities" error: being confident that
* https://bugs.freedesktop.org/show_bug.cgi?id=15769 will be fixed
* soon :-) */
- DEBUG ("%s: Got error: %s", G_STRFUNC, error->message);
+ DEBUG ("got error: %s", error->message);
mc_error = map_tp_error_to_mc_error (channel, error);
mcd_channel_take_error (channel, mc_error);
mcd_mission_abort ((McdMission *)channel);
return;
}
- DEBUG ("%s: %p, object %s", G_STRFUNC, channel, channel_path);
+ DEBUG ("%p, object %s", channel, channel_path);
/* if this was a call to EnsureChannel, it can happen that the returned
* channel was already created before; in that case we keep the McdChannel
@@ -2406,14 +2405,14 @@ mcd_connection_cancel_channel_request (McdConnection *connection,
if (chan_requestor_serial == operation_id &&
strcmp (chan_requestor_client_id, requestor_client_id) == 0)
{
- DEBUG ("%s: requested channel found (%p)", G_STRFUNC, channel);
+ DEBUG ("requested channel found (%p)", channel);
mcd_mission_abort (MCD_MISSION (channel));
g_free (chan_requestor_client_id);
return TRUE;
}
g_free (chan_requestor_client_id);
}
- DEBUG ("%s: requested channel not found!", G_STRFUNC);
+ DEBUG ("requested channel not found!");
return FALSE;
}
@@ -2433,7 +2432,7 @@ gboolean mcd_connection_remote_avatar_changed (McdConnection *connection,
guint contact_id,
const gchar *token)
{
- DEBUG ("%s called, but it's a stub", G_STRFUNC);
+ DEBUG ("called, but it's a stub");
return FALSE;
}
@@ -2463,7 +2462,7 @@ mcd_connection_connect (McdConnection *connection, GHashTable *params)
g_return_if_fail (priv->tp_conn_mgr);
g_return_if_fail (priv->account);
- DEBUG ("%s called for %p, account %s", G_STRFUNC, connection,
+ DEBUG ("called for %p, account %s", connection,
mcd_account_get_unique_name (priv->account));
if (priv->reconnect_timer)
@@ -2485,8 +2484,8 @@ mcd_connection_connect (McdConnection *connection, GHashTable *params)
}
else
{
- DEBUG ("%s: Not connecting because not disconnected (%i)",
- G_STRFUNC, mcd_connection_get_connection_status (connection));
+ DEBUG ("Not connecting because not disconnected (%i)",
+ mcd_connection_get_connection_status (connection));
}
}
diff --git a/src/mcd-dbusprop.c b/src/mcd-dbusprop.c
index 2e0bd53..4fb2d24 100644
--- a/src/mcd-dbusprop.c
+++ b/src/mcd-dbusprop.c
@@ -77,7 +77,7 @@ mcd_dbusprop_set_property (TpSvcDBusProperties *self,
{
const McdDBusProp *prop_array, *property;
- DEBUG ("%s: %s, %s", G_STRFUNC, interface_name, property_name);
+ DEBUG ("%s, %s", interface_name, property_name);
prop_array = get_interface_properties (self, interface_name);
if (!prop_array)
@@ -176,7 +176,7 @@ dbusprop_get (TpSvcDBusProperties *self,
GValue value = { 0 };
GError *error = NULL;
- DEBUG ("%s: %s, %s", G_STRFUNC, interface_name, property_name);
+ DEBUG ("%s, %s", interface_name, property_name);
mcd_dbusprop_get_property (self, interface_name, property_name,
&value, &error);
@@ -209,7 +209,7 @@ dbusprop_get_all (TpSvcDBusProperties *self,
GHashTable *properties;
GError *error = NULL;
- DEBUG ("%s: %s", G_STRFUNC, interface_name);
+ DEBUG ("%s", interface_name);
prop_array = get_interface_properties (self, interface_name);
if (!prop_array)
@@ -277,7 +277,7 @@ mcd_dbus_get_interfaces (TpSvcDBusProperties *self, const gchar *name,
GPtrArray *a_ifaces;
GType type;
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
a_ifaces = g_ptr_array_new ();
diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index bdde624..389ab6f 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -98,7 +98,7 @@ get_connection (TpSvcDBusProperties *self, const gchar *name, GValue *value)
McdDispatchOperationPrivate *priv = MCD_DISPATCH_OPERATION_PRIV (self);
const gchar *object_path;
- DEBUG ("%s called for %s", G_STRFUNC, priv->unique_name);
+ DEBUG ("called for %s", priv->unique_name);
g_value_init (value, DBUS_TYPE_G_OBJECT_PATH);
if (priv->connection &&
(object_path = mcd_connection_get_object_path (priv->connection)))
@@ -114,7 +114,7 @@ get_account (TpSvcDBusProperties *self, const gchar *name, GValue *value)
McdAccount *account;
const gchar *object_path;
- DEBUG ("%s called for %s", G_STRFUNC, priv->unique_name);
+ DEBUG ("called for %s", priv->unique_name);
g_value_init (value, DBUS_TYPE_G_OBJECT_PATH);
if (priv->connection &&
(account = mcd_connection_get_account (priv->connection)) &&
@@ -131,7 +131,7 @@ get_channels (TpSvcDBusProperties *self, const gchar *name, GValue *value)
GPtrArray *channel_array;
GList *list;
- DEBUG ("%s called for %s", G_STRFUNC, priv->unique_name);
+ DEBUG ("called for %s", priv->unique_name);
channel_array = g_ptr_array_sized_new (g_list_length (priv->channels));
for (list = priv->channels; list != NULL; list = list->next)
@@ -163,7 +163,7 @@ get_possible_handlers (TpSvcDBusProperties *self, const gchar *name,
{
McdDispatchOperationPrivate *priv = MCD_DISPATCH_OPERATION_PRIV (self);
- DEBUG ("%s called for %s", G_STRFUNC, priv->unique_name);
+ DEBUG ("called for %s", priv->unique_name);
g_value_init (value, G_TYPE_STRV);
g_warning ("%s not implemented", G_STRFUNC);
g_value_set_static_boxed (value, NULL);
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 8462d99..8ba8ac1 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -259,8 +259,7 @@ static inline void
mcd_dispatcher_context_ref (McdDispatcherContext *context)
{
g_return_if_fail (context != NULL);
- DEBUG ("%s called on %p (ref = %d)", G_STRFUNC,
- context, context->ref_count);
+ DEBUG ("called on %p (ref = %d)", context, context->ref_count);
context->ref_count++;
}
@@ -302,7 +301,7 @@ mcd_dispatcher_context_handler_done (McdDispatcherContext *context)
* re-dispatch them to another handler */
}
- DEBUG ("%s: %d channels still dispatching", G_STRFUNC, channels_left);
+ DEBUG ("%d channels still dispatching", channels_left);
if (channels_left == 0)
{
g_signal_emit (context->dispatcher,
@@ -401,7 +400,7 @@ _mcd_dispatcher_get_filter_chain (McdDispatcher * dispatcher,
if (iface_chains == NULL)
{
- DEBUG ("%s: No chains for interface %s", G_STRFUNC,
+ DEBUG ("No chains for interface %s",
g_quark_to_string (channel_type_quark));
}
else
@@ -696,7 +695,7 @@ cancel_proxy_call (McdChannel *channel, struct cancel_call_data *call_data)
dbus_g_proxy_cancel_call (call_data->handler_proxy, call_data->call);
- DEBUG ("%s: signalling Handle channel failed", G_STRFUNC);
+ DEBUG ("signalling Handle channel failed");
/* We can't reliably map channel handler error codes to MC error
* codes. So just using generic error message.
@@ -1339,8 +1338,7 @@ static void
mcd_dispatcher_context_release_client_lock (McdDispatcherContext *context)
{
g_return_if_fail (context->client_locks > 0);
- DEBUG ("%s called on %p, locks = %d", G_STRFUNC,
- context, context->client_locks);
+ DEBUG ("called on %p, locks = %d", context, context->client_locks);
context->client_locks--;
if (context->client_locks == 0)
{
@@ -2324,7 +2322,7 @@ new_names_cb (McdDispatcher *self,
continue;
}
- DEBUG ("%s: Register client %s", G_STRFUNC, name);
+ DEBUG ("Register client %s", name);
g_hash_table_insert (priv->clients, g_strdup (name),
create_mcd_client (self, name, activatable));
@@ -2628,12 +2626,11 @@ mcd_dispatcher_context_unref (McdDispatcherContext * context)
g_return_if_fail (context);
g_return_if_fail (context->ref_count > 0);
- DEBUG ("%s called on %p (ref = %d)", G_STRFUNC,
- context, context->ref_count);
+ DEBUG ("called on %p (ref = %d)", context, context->ref_count);
context->ref_count--;
if (context->ref_count == 0)
{
- DEBUG ("%s: freeing the context %p", G_STRFUNC, context);
+ DEBUG ("freeing the context %p", context);
for (list = context->channels; list != NULL; list = list->next)
{
McdChannel *channel = MCD_CHANNEL (list->data);
@@ -2922,7 +2919,7 @@ on_request_status_changed (McdChannel *channel, McdChannelStatus status,
status != MCD_CHANNEL_STATUS_DISPATCHED)
return;
- DEBUG ("%s called, %u", G_STRFUNC, status);
+ DEBUG ("called, %u", status);
if (status == MCD_CHANNEL_STATUS_FAILED)
{
const GError *error;
@@ -3206,7 +3203,7 @@ get_handled_channels_cb (TpProxy *proxy, const GValue *v_channels,
{
McdClient *client = user_data;
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
client->got_handled_channels = TRUE;
if (G_LIKELY (!error))
@@ -3241,7 +3238,7 @@ mcd_client_call_when_got_handled_channels (McdClient *client,
McdReadyCb callback,
gpointer user_data)
{
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
if (client->got_handled_channels)
callback (client, NULL, user_data);
else
@@ -3261,7 +3258,7 @@ mcd_client_call_when_got_handled_channels (McdClient *client,
static void
channel_recover_release_lock (McdChannelRecover *cr)
{
- DEBUG ("%s called on %p (locks = %d)", G_STRFUNC, cr, cr->handler_locks);
+ DEBUG ("called on %p (locks = %d)", cr, cr->handler_locks);
cr->handler_locks--;
if (cr->handler_locks == 0)
{
@@ -3289,7 +3286,7 @@ check_handled_channels (gpointer object, const GError *error,
McdClient *client = object;
McdChannelRecover *cr = user_data;
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
if (G_LIKELY (!error) && client->handled_channels != NULL)
{
const gchar *path;
diff --git a/src/mcd-manager.c b/src/mcd-manager.c
index f40cd26..ea19633 100644
--- a/src/mcd-manager.c
+++ b/src/mcd-manager.c
@@ -139,7 +139,7 @@ on_presence_requested_idle (gpointer data)
TpConnectionPresenceType actual_presence =
mcd_presence_frame_get_actual_presence (priv->presence_frame);
- DEBUG ("%s: %d, %d", G_STRFUNC, requested_presence, actual_presence);
+ DEBUG ("%d, %d", requested_presence, actual_presence);
if ((actual_presence == TP_CONNECTION_PRESENCE_TYPE_OFFLINE
|| actual_presence == TP_CONNECTION_PRESENCE_TYPE_UNSET)
&& (requested_presence != TP_CONNECTION_PRESENCE_TYPE_OFFLINE
@@ -160,7 +160,7 @@ on_presence_requested (McdPresenceFrame * presence_frame,
{
McdManagerPrivate *priv;
- DEBUG ("%s: Current connectivity status is %d", G_STRFUNC,
+ DEBUG ("Current connectivity status is %d",
mcd_mission_is_connected (MCD_MISSION (data)));
if (mcd_mission_is_connected (MCD_MISSION (data)))
@@ -170,7 +170,7 @@ on_presence_requested (McdPresenceFrame * presence_frame,
else
{
priv = MCD_MANAGER_PRIV(data);
- DEBUG ("%s: Delaying call to on_presence_requested_idle", G_STRFUNC);
+ DEBUG ("Delaying call to on_presence_requested_idle");
priv->delay_presence_request = TRUE;
}
}
@@ -253,12 +253,12 @@ _mcd_manager_connect (McdMission * mission)
{
McdManagerPrivate *priv = MCD_MANAGER_PRIV (mission);
- DEBUG ("%s: delay_presence_request = %d", G_STRFUNC, priv->delay_presence_request);
+ DEBUG ("delay_presence_request = %d", priv->delay_presence_request);
if (priv->delay_presence_request)
{
priv->delay_presence_request = FALSE;
g_idle_add (on_presence_requested_idle, mission);
- DEBUG ("%s: Added idle func on_presence_requested_idle", G_STRFUNC);
+ DEBUG ("Added idle func on_presence_requested_idle");
}
MCD_MISSION_CLASS (mcd_manager_parent_class)->connect (mission);
}
@@ -268,7 +268,7 @@ _mcd_manager_disconnect (McdMission * mission)
{
GList *connections;
- DEBUG ("%s(%p)", G_STRFUNC, mission);
+ DEBUG ("%p", mission);
MCD_MISSION_CLASS (mcd_manager_parent_class)->disconnect (mission);
/* We now call mcd_mission_abort() on all child connections; but since this
@@ -304,7 +304,7 @@ mcd_manager_setup (McdManager *manager)
g_signal_connect (priv->tp_conn_mgr, "got-info", G_CALLBACK (on_got_info),
manager);
- DEBUG ("%s: Manager %s created", G_STRFUNC, priv->name);
+ DEBUG ("Manager %s created", priv->name);
return TRUE;
error:
@@ -595,7 +595,7 @@ mcd_manager_create_connection (McdManager *manager, McdAccount *account)
(manager, account);
mcd_operation_take_mission (MCD_OPERATION (manager),
MCD_MISSION (connection));
- DEBUG ("%s: Created a connection %p for account: %s", G_STRFUNC,
+ DEBUG ("Created a connection %p for account: %s",
connection, mcd_account_get_unique_name (account));
return connection;
diff --git a/src/mcd-master.c b/src/mcd-master.c
index 28323c8..7bf6908 100644
--- a/src/mcd-master.c
+++ b/src/mcd-master.c
@@ -145,8 +145,8 @@ check_account_transport (gpointer key, gpointer value, gpointer userdata)
TP_CONNECTION_STATUS_CONNECTED)
return;
- DEBUG ("%s: account %s would like to connect",
- G_STRFUNC, mcd_account_get_unique_name (account));
+ DEBUG ("account %s would like to connect",
+ mcd_account_get_unique_name (account));
conditions = mcd_account_get_conditions (account);
if (mcd_transport_plugin_check_conditions (td->plugin, td->transport,
conditions))
@@ -167,7 +167,7 @@ mcd_master_transport_connected (McdMaster *master, McdTransportPlugin *plugin,
GHashTable *accounts;
TransportData td;
- DEBUG ("%s: %s", G_STRFUNC, mcd_transport_get_name (plugin, transport));
+ DEBUG ("%s", mcd_transport_get_name (plugin, transport));
td.master = master;
td.plugin = plugin;
@@ -187,8 +187,8 @@ disconnect_account_transport (gpointer key, gpointer value, gpointer userdata)
{
McdConnection *connection;
- DEBUG ("%s: account %s must disconnect",
- G_STRFUNC, mcd_account_get_unique_name (account));
+ DEBUG ("account %s must disconnect",
+ mcd_account_get_unique_name (account));
connection = mcd_account_get_connection (account);
if (connection)
mcd_connection_close (connection);
@@ -212,7 +212,7 @@ mcd_master_transport_disconnected (McdMaster *master, McdTransportPlugin *plugin
GHashTable *accounts;
TransportData td;
- DEBUG ("%s: %s", G_STRFUNC, mcd_transport_get_name (plugin, transport));
+ DEBUG ("%s", mcd_transport_get_name (plugin, transport));
td.master = master;
td.plugin = plugin;
@@ -370,7 +370,7 @@ dbus_filter_func (DBusConnection *connection,
&new_owner,
DBUS_TYPE_INVALID)) {
- DEBUG ("%s: error: %s", G_STRFUNC, error.message);
+ DEBUG ("error: %s", error.message);
dbus_error_free (&error);
return result;
@@ -408,7 +408,7 @@ _mcd_master_connect (McdMission * mission)
static void
_mcd_master_disconnect (McdMission * mission)
{
- DEBUG ("%s", G_STRFUNC);
+ DEBUG ("called");
MCD_MISSION_CLASS (mcd_master_parent_class)->disconnect (mission);
}
@@ -770,7 +770,7 @@ mcd_master_set_offline_on_idle (McdMaster *master, gboolean offline_on_idle)
{
McdMasterPrivate *priv = MCD_MASTER_PRIV (master);
- DEBUG ("%s: setting offline_on_idle to %d", G_STRFUNC, offline_on_idle);
+ DEBUG ("setting offline_on_idle to %d", offline_on_idle);
priv->offline_on_idle = offline_on_idle;
}
@@ -851,8 +851,8 @@ mcd_master_set_default_presence (McdMaster * master, const gchar *client_id)
mcd_presence_frame_get_requested_presence (priv->presence_frame)
>= TP_CONNECTION_PRESENCE_TYPE_AVAILABLE))
{
- DEBUG ("%s: Default presence requested while connected or "
- "already connecting", G_STRFUNC);
+ DEBUG ("Default presence requested while connected or "
+ "already connecting");
return FALSE;
}
mcd_master_set_offline_on_idle (master, TRUE);
@@ -1234,7 +1234,7 @@ mcd_plugin_register_transport (McdPlugin *plugin,
{
McdMasterPrivate *priv = MCD_MASTER_PRIV (plugin);
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
g_signal_connect (transport_plugin, "status-changed",
G_CALLBACK (on_transport_status_changed),
MCD_MASTER (plugin));
@@ -1251,7 +1251,7 @@ mcd_plugin_register_account_connection (McdPlugin *plugin,
McdAccountConnectionData *acd;
GList *list;
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
acd = g_malloc (sizeof (McdAccountConnectionData));
acd->priority = priority;
acd->func = func;
diff --git a/src/mcd-mission.c b/src/mcd-mission.c
index 25ef524..94fa55b 100644
--- a/src/mcd-mission.c
+++ b/src/mcd-mission.c
@@ -182,7 +182,7 @@ _mcd_mission_get_mode (McdMission * mission)
static void
on_parent_abort (McdMission *parent, McdMission *mission)
{
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
mcd_mission_set_parent (mission, NULL);
}
@@ -196,7 +196,7 @@ _mcd_mission_set_parent (McdMission * mission, McdMission * parent)
priv = MCD_MISSION_PRIV (mission);
- DEBUG ("%s: child = %p, parent = %p", G_STRFUNC, mission, parent);
+ DEBUG ("child = %p, parent = %p", mission, parent);
if (priv->parent)
{
diff --git a/src/mcd-presence-frame.c b/src/mcd-presence-frame.c
index b720320..c3119bf 100644
--- a/src/mcd-presence-frame.c
+++ b/src/mcd-presence-frame.c
@@ -342,7 +342,7 @@ _mcd_presence_frame_request_presence (McdPresenceFrame * presence_frame,
priv->requested_presence = mcd_presence_new (presence, presence_message,
status,
TP_CONNECTION_STATUS_REASON_REQUESTED);
- DEBUG ("%s: Presence %d is being requested", G_STRFUNC, presence);
+ DEBUG ("Presence %d is being requested", presence);
g_signal_emit_by_name (presence_frame, "presence-requested",
presence, presence_message);
@@ -364,9 +364,9 @@ mcd_presence_frame_request_presence (McdPresenceFrame * presence_frame,
}
priv->last_presence = mcd_presence_copy (priv->actual_presence);
- DEBUG ("%s: updated last_presence = %d, msg = %s", G_STRFUNC,
- priv->last_presence->presence,
- priv->last_presence->message);
+ DEBUG ("updated last_presence = %d, msg = %s",
+ priv->last_presence->presence,
+ priv->last_presence->message);
if (priv->last_presence->presence == TP_CONNECTION_PRESENCE_TYPE_UNSET)
{
@@ -459,7 +459,7 @@ _mcd_presence_frame_update_actual_presence (McdPresenceFrame * presence_frame,
TpConnectionStatusReason connection_reason;
gboolean changed;
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
pi.presence = TP_CONNECTION_PRESENCE_TYPE_UNSET;
pi.requested_presence = mcd_presence_frame_get_requested_presence (presence_frame);
@@ -480,7 +480,7 @@ _mcd_presence_frame_update_actual_presence (McdPresenceFrame * presence_frame,
connection_status,
connection_reason);
- DEBUG ("%s: presence actual: %d", G_STRFUNC, pi.presence);
+ DEBUG ("presence actual: %d", pi.presence);
if (changed)
{
g_signal_emit_by_name (G_OBJECT (presence_frame),
@@ -608,7 +608,7 @@ mcd_presence_frame_remove_account (McdPresenceFrame * presence_frame,
pos = g_list_find (priv->accounts, account);
if (!pos) return FALSE;
- DEBUG ("%s: removing account %s", G_STRFUNC, mcd_account_get_unique_name (account));
+ DEBUG ("removing account %s", mcd_account_get_unique_name (account));
/*_mcd_presence_frame_update_actual_presence (presence_frame, NULL);*/
g_signal_handlers_disconnect_by_func (account,
on_account_current_presence_changed,
diff --git a/src/mcd-service.c b/src/mcd-service.c
index c6f0068..3de9149 100644
--- a/src/mcd-service.c
+++ b/src/mcd-service.c
@@ -263,7 +263,7 @@ mcd_service_cancel_channel_request (GObject * obj, guint operation_id,
{
GError *err = NULL;
gchar *sender = dbus_g_method_get_sender (mi);
- DEBUG ("%s (%u)", G_STRFUNC, operation_id);
+ DEBUG ("%u", operation_id);
if (!mcd_master_cancel_channel_request (MCD_MASTER (obj), operation_id,
sender, &err))
{
@@ -462,7 +462,7 @@ _on_filter_proxy_destroy (DBusGProxy *proxy)
(GHRFunc) _ctx_table_remove_foreach,
NULL);
- DEBUG ("%s: Unregistering filter", G_STRFUNC);
+ DEBUG ("Unregistering filter");
mcd_dispatcher_unregister_filter (dispatcher,
(McdFilterFunc) _on_filter_new_channel,
quark, flags);
@@ -485,7 +485,7 @@ mcd_service_register_filter(GObject *obj,
static gboolean initialized = FALSE;
guint quark = g_quark_from_string (channel_type);
- DEBUG ("%s: Registering new filter", G_STRFUNC);
+ DEBUG ("Registering new filter");
if (!initialized)
{
@@ -819,7 +819,7 @@ mcd_service_constructed (GObject *obj)
{
McdServicePrivate *priv = MCD_OBJECT_PRIV (obj);
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
g_object_get (obj,
"presence-frame", &priv->presence_frame,
"dispatcher", &priv->dispatcher,
@@ -860,7 +860,7 @@ mcd_service_init (McdService * obj)
obj->main_loop = g_main_loop_new (NULL, FALSE);
priv->last_status = -1;
- DEBUG ("%s called", G_STRFUNC);
+ DEBUG ("called");
}
static void
--
1.5.6.5
More information about the telepathy-commits
mailing list