[Telepathy-commits] [telepathy-gabble/master] stop to use g_warning and use DEBUG instead
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Wed Dec 10 03:45:43 PST 2008
---
src/conn-aliasing.c | 2 +-
src/media-stream.c | 8 ++++----
src/muc-channel.c | 44 ++++++++++++++++++++------------------------
src/presence-cache.c | 4 ++--
src/text-mixin.c | 4 ++--
5 files changed, 29 insertions(+), 33 deletions(-)
diff --git a/src/conn-aliasing.c b/src/conn-aliasing.c
index 87c2383..901dfe2 100644
--- a/src/conn-aliasing.c
+++ b/src/conn-aliasing.c
@@ -449,7 +449,7 @@ nick_publish_msg_reply_cb (GabbleConnection *conn,
{
GabbleXmppError error = gabble_xmpp_error_from_node (error_node);
- g_warning ("%s: can't publish nick using PEP: %s: %s", G_STRFUNC,
+ DEBUG ("can't publish nick using PEP: %s: %s",
gabble_xmpp_error_string (error),
gabble_xmpp_error_description (error));
}
diff --git a/src/media-stream.c b/src/media-stream.c
index 722310a..1e44a92 100644
--- a/src/media-stream.c
+++ b/src/media-stream.c
@@ -1089,8 +1089,8 @@ _add_rtp_candidate_node (GabbleMediaSession *session, LmMessageNode *parent,
type_str = "relay";
break;
default:
- g_warning ("%s: TpMediaStreamTransportType has an invalid value, "
- "ignoring candidate", G_STRFUNC);
+ DEBUG ("TpMediaStreamTransportType has an invalid value, "
+ "ignoring candidate");
goto out;
}
@@ -1106,8 +1106,8 @@ _add_rtp_candidate_node (GabbleMediaSession *session, LmMessageNode *parent,
proto_str = "tcp";
break;
default:
- g_warning ("%s: TpMediaStreamBaseProto has an invalid value, ignoring "
- "candidate", G_STRFUNC);
+ DEBUG ("TpMediaStreamBaseProto has an invalid value, ignoring "
+ "candidate");
goto out;
}
diff --git a/src/muc-channel.c b/src/muc-channel.c
index 94cb49e..bc6e8e9 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -569,7 +569,7 @@ properties_disco_cb (GabbleDisco *disco,
/* Unhandled */
else
{
- g_warning ("%s: unhandled feature '%s'", G_STRFUNC, str);
+ DEBUG ("unhandled feature '%s'", str);
}
}
else if (strcmp (lm_node->name, "x") == 0)
@@ -643,7 +643,7 @@ room_properties_update (GabbleMucChannel *chan)
priv->jid, NULL, properties_disco_cb, chan, G_OBJECT (chan),
&error) == NULL)
{
- g_warning ("%s: disco query failed: '%s'", G_STRFUNC, error->message);
+ DEBUG ("disco query failed: '%s'", error->message);
g_error_free (error);
}
}
@@ -738,7 +738,7 @@ send_join_request (GabbleMucChannel *channel,
ret = _gabble_connection_send (priv->conn, msg, error);
if (!ret)
{
- g_warning ("%s: _gabble_connection_send_with_reply failed", G_STRFUNC);
+ DEBUG ("_gabble_connection_send_with_reply failed");
}
else
{
@@ -776,7 +776,7 @@ send_leave_message (GabbleMucChannel *channel,
ret = _gabble_connection_send (priv->conn, msg, &error);
if (!ret)
{
- g_warning ("%s: _gabble_connection_send_with_reply failed", G_STRFUNC);
+ DEBUG ("_gabble_connection_send_with_reply failed");
g_error_free (error);
}
else
@@ -1398,15 +1398,14 @@ _gabble_muc_channel_presence_error (GabbleMucChannel *chan,
if (strcmp (jid, priv->self_jid->str) != 0)
{
- g_warning ("%s: presence error from other jids than self not handled",
- G_STRFUNC);
+ DEBUG ("presence error from other jids than self not handled");
return;
}
error_node = lm_message_node_get_child (pres_node, "error");
if (error_node == NULL)
{
- g_warning ("%s: missing required node 'error'", G_STRFUNC);
+ DEBUG ("missing required node 'error'");
return;
}
@@ -1414,8 +1413,8 @@ _gabble_muc_channel_presence_error (GabbleMucChannel *chan,
if (priv->state >= MUC_STATE_JOINED)
{
- g_warning ("%s: presence error while already member of the channel "
- "-- NYI", G_STRFUNC);
+ DEBUG ("presence error while already member of the channel "
+ "-- NYI");
return;
}
@@ -1507,8 +1506,7 @@ get_role_from_string (const gchar *role)
}
}
- g_warning ("%s: unknown role '%s' -- defaulting to ROLE_VISITOR",
- G_STRFUNC, role);
+ DEBUG ("unknown role '%s' -- defaulting to ROLE_VISITOR", role);
return ROLE_VISITOR;
}
@@ -1531,8 +1529,8 @@ get_affiliation_from_string (const gchar *affil)
}
}
- g_warning ("%s: unknown affiliation '%s' -- defaulting to "
- "AFFILIATION_NONE", G_STRFUNC, affil);
+ DEBUG ("unknown affiliation '%s' -- defaulting to "
+ "AFFILIATION_NONE", affil);
return AFFILIATION_NONE;
}
@@ -1544,7 +1542,7 @@ room_created_submit_reply_cb (GabbleConnection *conn, LmMessage *sent_msg,
{
if (lm_message_get_sub_type (reply_msg) != LM_MESSAGE_SUB_TYPE_RESULT)
{
- g_warning ("%s: failed to submit room config", G_STRFUNC);
+ DEBUG ("failed to submit room config");
}
return LM_HANDLER_RESULT_REMOVE_MESSAGE;
@@ -1595,8 +1593,8 @@ perms_config_form_reply_cb (GabbleConnection *conn, LmMessage *sent_msg,
if (lm_message_get_sub_type (reply_msg) != LM_MESSAGE_SUB_TYPE_RESULT)
{
- g_warning ("%s: request for config form denied, property permissions "
- "will be inaccurate", G_STRFUNC);
+ DEBUG ("request for config form denied, property permissions "
+ "will be inaccurate");
goto OUT;
}
@@ -1607,8 +1605,7 @@ perms_config_form_reply_cb (GabbleConnection *conn, LmMessage *sent_msg,
form_node = config_form_get_form_node (reply_msg);
if (form_node == NULL)
{
- g_warning ("%s: form node node found, property permissions will be "
- "inaccurate", G_STRFUNC);
+ DEBUG ("form node node found, property permissions will be inaccurate");
goto OUT;
}
@@ -1775,8 +1772,7 @@ update_permissions (GabbleMucChannel *chan)
if (!success)
{
- g_warning ("%s: failed to request config form: %s",
- G_STRFUNC, error->message);
+ DEBUG ("failed to request config form: %s", error->message);
g_error_free (error);
}
}
@@ -1983,8 +1979,8 @@ _gabble_muc_channel_member_presence_updated (GabbleMucChannel *chan,
room_created_submit_reply_cb, G_OBJECT (chan), NULL,
&error))
{
- g_warning ("%s: failed to send submit message: %s",
- G_STRFUNC, error->message);
+ DEBUG ("failed to send submit message: %s",
+ error->message);
g_error_free (error);
lm_message_unref (msg);
@@ -2590,7 +2586,7 @@ kick_request_reply_cb (GabbleConnection *conn, LmMessage *sent_msg,
if (lm_message_get_sub_type (reply_msg) != LM_MESSAGE_SUB_TYPE_RESULT)
{
- g_warning ("%s: Failed to kick user %s from room", G_STRFUNC, jid);
+ DEBUG ("Failed to kick user %s from room", jid);
}
return LM_HANDLER_RESULT_REMOVE_MESSAGE;
@@ -2878,7 +2874,7 @@ request_config_form_reply_cb (GabbleConnection *conn, LmMessage *sent_msg,
}
else
{
- g_warning ("%s: ignoring field '%s'", G_STRFUNC, var);
+ DEBUG ("ignoring field '%s'", var);
}
/* add the corresponding field node to the reply message */
diff --git a/src/presence-cache.c b/src/presence-cache.c
index 304b42a..7d3a179 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -715,7 +715,7 @@ _caps_disco_cb (GabbleDisco *disco,
if (NULL == node)
{
- g_warning ("got disco response with NULL node, ignoring");
+ DEBUG ("got disco response with NULL node, ignoring");
return;
}
@@ -847,7 +847,7 @@ _caps_disco_cb (GabbleDisco *disco,
else
{
/* The received reply does not match the */
- g_warning ("The announced verification string '%s' does not match "
+ DEBUG ("The announced verification string '%s' does not match "
"our hash '%s'.", waiter_self->ver, computed_hash);
trust = 0;
bad_hash = TRUE;
diff --git a/src/text-mixin.c b/src/text-mixin.c
index 07ce42c..e719af5 100644
--- a/src/text-mixin.c
+++ b/src/text-mixin.c
@@ -280,8 +280,8 @@ gabble_text_mixin_parse_incoming_message (LmMessage *message,
p = strptime (stamp_str, "%Y%m%dT%T", &stamp_tm);
if (p == NULL || *p != '\0')
{
- g_warning ("%s: malformed date string '%s' for jabber:x:delay",
- G_STRFUNC, stamp_str);
+ DEBUG ("malformed date string '%s' for jabber:x:delay",
+ stamp_str);
}
else
{
--
1.5.6.5
More information about the Telepathy-commits
mailing list