/pidgin/main: b0659f31989d: Update debug categories for new file...
Ankit Vani
a at nevitus.org
Sun Jan 19 21:09:43 EST 2014
Changeset: b0659f31989df53bda37eba64d27fe89a9f94bc4
Author: Ankit Vani <a at nevitus.org>
Date: 2014-01-20 07:39 +0530
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/b0659f31989d
Description:
Update debug categories for new filenames
diffstat:
libpurple/accounts.c | 12 ++++++------
libpurple/blistnodetypes.c | 4 ++--
libpurple/buddylist.c | 6 +++---
libpurple/conversationtypes.c | 8 ++++----
libpurple/presence.c | 2 +-
libpurple/xfer.c | 12 ++++++------
pidgin/gtkxfer.c | 12 ++++++------
7 files changed, 28 insertions(+), 28 deletions(-)
diffs (257 lines):
diff --git a/libpurple/accounts.c b/libpurple/accounts.c
--- a/libpurple/accounts.c
+++ b/libpurple/accounts.c
@@ -67,7 +67,7 @@ sync_accounts(void)
if (!accounts_loaded)
{
- purple_debug_error("account", "Attempted to save accounts before "
+ purple_debug_error("accounts", "Attempted to save accounts before "
"they were read!\n");
return;
}
@@ -368,7 +368,7 @@ parse_proxy_info(PurpleXmlNode *node, Pu
purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_USE_ENVVAR);
else
{
- purple_debug_error("account", "Invalid proxy type found when "
+ purple_debug_error("accounts", "Invalid proxy type found when "
"loading account information for %s\n",
purple_account_get_username(account));
}
@@ -437,7 +437,7 @@ parse_current_error(PurpleXmlNode *node,
if (type > PURPLE_CONNECTION_ERROR_OTHER_ERROR)
{
- purple_debug_error("account",
+ purple_debug_error("accounts",
"Invalid PurpleConnectionError value %d found when "
"loading account information for %s\n",
type, purple_account_get_username(account));
@@ -570,7 +570,7 @@ parse_account(PurpleXmlNode *node)
if (result == TRUE || purple_keyring_get_inuse() == NULL) {
purple_account_set_remember_password(ret, TRUE);
} else {
- purple_debug_error("account", "Failed to import password.\n");
+ purple_debug_error("accounts", "Failed to import password.\n");
}
purple_str_wipe(data);
}
@@ -730,7 +730,7 @@ purple_accounts_reorder(PurpleAccount *a
index = g_list_index(accounts, account);
if (index < 0) {
- purple_debug_error("account",
+ purple_debug_error("accounts",
"Unregistered account (%s) discovered during reorder!\n",
purple_account_get_username(account));
return;
@@ -810,7 +810,7 @@ purple_accounts_restore_current_statuses
/* If we're not connected to the Internet right now, we bail on this */
if (!purple_network_is_available())
{
- purple_debug_warning("account", "Network not connected; skipping reconnect\n");
+ purple_debug_warning("accounts", "Network not connected; skipping reconnect\n");
return;
}
diff --git a/libpurple/blistnodetypes.c b/libpurple/blistnodetypes.c
--- a/libpurple/blistnodetypes.c
+++ b/libpurple/blistnodetypes.c
@@ -457,7 +457,7 @@ purple_buddy_update_status(PurpleBuddy *
status = purple_presence_get_active_status(priv->presence);
- purple_debug_info("blist", "Updating buddy status for %s (%s)\n",
+ purple_debug_info("blistnodetypes", "Updating buddy status for %s (%s)\n",
priv->name, purple_account_get_protocol_name(priv->account));
if (purple_status_is_online(status) &&
@@ -1494,7 +1494,7 @@ void purple_group_set_name(PurpleGroup *
purple_blist_add_chat((PurpleChat *)child, dest, prev);
prev = child;
} else {
- purple_debug(PURPLE_DEBUG_ERROR, "blist",
+ purple_debug(PURPLE_DEBUG_ERROR, "blistnodetypes",
"Unknown child type in group %s\n", priv->name);
}
child = next;
diff --git a/libpurple/buddylist.c b/libpurple/buddylist.c
--- a/libpurple/buddylist.c
+++ b/libpurple/buddylist.c
@@ -382,7 +382,7 @@ purple_blist_sync(void)
if (!blist_loaded)
{
- purple_debug_error("blist", "Attempted to save buddy list before it "
+ purple_debug_error("buddylist", "Attempted to save buddy list before it "
"was read!\n");
return;
}
@@ -1861,7 +1861,7 @@ purple_blist_set_ui_ops(PurpleBlistUiOps
if (overrode && (ops->save_node != purple_blist_save_node ||
ops->remove_node != purple_blist_save_node ||
ops->save_account != purple_blist_save_account)) {
- purple_debug_warning("blist", "Only some of the blist saving UI ops "
+ purple_debug_warning("buddylist", "Only some of the blist saving UI ops "
"were overridden. This probably is not what you want!\n");
}
}
@@ -1990,7 +1990,7 @@ purple_blist_uninit(void)
purple_blist_sync();
}
- purple_debug(PURPLE_DEBUG_INFO, "blist", "Destroying\n");
+ purple_debug(PURPLE_DEBUG_INFO, "buddylist", "Destroying\n");
if (ops && ops->destroy)
ops->destroy(purplebuddylist);
diff --git a/libpurple/conversationtypes.c b/libpurple/conversationtypes.c
--- a/libpurple/conversationtypes.c
+++ b/libpurple/conversationtypes.c
@@ -168,7 +168,7 @@ send_typed_cb(gpointer data)
serv_send_typing(gc, name, PURPLE_IM_TYPED);
- purple_debug(PURPLE_DEBUG_MISC, "conversation", "typed...\n");
+ purple_debug(PURPLE_DEBUG_MISC, "conversationtypes", "typed...\n");
}
return FALSE;
@@ -1634,9 +1634,9 @@ purple_chat_conversation_new(PurpleAccou
if ((chat = purple_conversations_find_chat_with_account(name, account)) != NULL)
{
if (!purple_chat_conversation_has_left(chat)) {
- purple_debug_warning("conversation", "Trying to create multiple "
- "chats (%s) with the same name is deprecated and will be "
- "removed in libpurple 3.0.0", name);
+ purple_debug_warning("conversationtypes", "Trying to create "
+ "multiple chats (%s) with the same name is deprecated and "
+ "will be removed in libpurple 3.0.0", name);
} else {
/*
* This hack is necessary because some prpls (MSN) have unnamed chats
diff --git a/libpurple/presence.c b/libpurple/presence.c
--- a/libpurple/presence.c
+++ b/libpurple/presence.c
@@ -125,7 +125,7 @@ purple_presence_set_status_active(Purple
{
if (!active)
{
- purple_debug_warning("status",
+ purple_debug_warning("presence",
"Attempted to set a non-independent status "
"(%s) inactive. Only independent statuses "
"can be specifically marked inactive.",
diff --git a/libpurple/xfer.c b/libpurple/xfer.c
--- a/libpurple/xfer.c
+++ b/libpurple/xfer.c
@@ -1249,7 +1249,7 @@ purple_xfer_write_file(PurpleXfer *xfer,
fs_known = (purple_xfer_get_size(xfer) > 0);
if (fs_known && (goffset)size > purple_xfer_get_bytes_remaining(xfer)) {
- purple_debug_warning("filetransfer",
+ purple_debug_warning("xfer",
"Got too much data (truncating at %" G_GOFFSET_FORMAT
").\n", purple_xfer_get_size(xfer));
size = purple_xfer_get_bytes_remaining(xfer);
@@ -1259,7 +1259,7 @@ purple_xfer_write_file(PurpleXfer *xfer,
wc = ui_ops->ui_write(xfer, buffer, size);
else {
if (priv->dest_fp == NULL) {
- purple_debug_error("filetransfer",
+ purple_debug_error("xfer",
"File is not opened for writing\n");
purple_xfer_cancel_local(xfer);
return FALSE;
@@ -1268,7 +1268,7 @@ purple_xfer_write_file(PurpleXfer *xfer,
}
if (wc != size) {
- purple_debug_error("filetransfer",
+ purple_debug_error("xfer",
"Unable to write whole buffer.\n");
purple_xfer_cancel_local(xfer);
return FALSE;
@@ -1299,7 +1299,7 @@ purple_xfer_read_file(PurpleXfer *xfer,
if (got_len >= 0 && (gsize)got_len > size) {
g_free(buffer_got);
- purple_debug_error("filetransfer",
+ purple_debug_error("xfer",
"Got too much data from UI.\n");
purple_xfer_cancel_local(xfer);
return -1;
@@ -1310,7 +1310,7 @@ purple_xfer_read_file(PurpleXfer *xfer,
g_free(buffer_got);
} else {
if (priv->dest_fp == NULL) {
- purple_debug_error("filetransfer",
+ purple_debug_error("xfer",
"File is not opened for reading\n");
purple_xfer_cancel_local(xfer);
return -1;
@@ -1319,7 +1319,7 @@ purple_xfer_read_file(PurpleXfer *xfer,
if ((got_len < 0 || (gsize)got_len != size) &&
ferror(priv->dest_fp))
{
- purple_debug_error("filetransfer",
+ purple_debug_error("xfer",
"Unable to read file.\n");
purple_xfer_cancel_local(xfer);
return -1;
diff --git a/pidgin/gtkxfer.c b/pidgin/gtkxfer.c
--- a/pidgin/gtkxfer.c
+++ b/pidgin/gtkxfer.c
@@ -478,7 +478,7 @@ open_button_cb(GtkButton *button, Pidgin
{
purple_notify_error(dialog, NULL,
_("An error occurred while opening the file."), NULL, NULL);
- purple_debug_warning("ft", "filename: %s; code: %d\n",
+ purple_debug_warning("xfer", "filename: %s; code: %d\n",
purple_xfer_get_local_filename(dialog->selected_xfer), code);
}
#else
@@ -1139,7 +1139,7 @@ pidgin_xfer_cancel_remote(PurpleXfer *xf
static void
pidgin_xfer_add_thumbnail(PurpleXfer *xfer, const gchar *formats)
{
- purple_debug_info("ft", "creating thumbnail for transfer\n");
+ purple_debug_info("xfer", "creating thumbnail for transfer\n");
if (purple_xfer_get_size(xfer) <= PIDGIN_XFER_MAX_SIZE_IMAGE_THUMBNAIL) {
GdkPixbuf *thumbnail =
@@ -1157,13 +1157,13 @@ pidgin_xfer_add_thumbnail(PurpleXfer *xf
for (i = 0; formats_split[i]; i++) {
if (purple_strequal(formats_split[i], "jpeg")) {
- purple_debug_info("ft", "creating JPEG thumbnail\n");
+ purple_debug_info("xfer", "creating JPEG thumbnail\n");
option_keys[0] = "quality";
option_values[0] = "90";
format = "jpeg";
break;
} else if (purple_strequal(formats_split[i], "png")) {
- purple_debug_info("ft", "creating PNG thumbnail\n");
+ purple_debug_info("xfer", "creating PNG thumbnail\n");
option_keys[0] = "compression";
option_values[0] = "9";
format = "png";
@@ -1173,7 +1173,7 @@ pidgin_xfer_add_thumbnail(PurpleXfer *xf
/* Try the first format given by the PRPL without options */
if (format == NULL) {
- purple_debug_info("ft",
+ purple_debug_info("xfer",
"creating thumbnail of format %s as demanded by PRPL\n",
formats_split[0]);
format = formats_split[0];
@@ -1184,7 +1184,7 @@ pidgin_xfer_add_thumbnail(PurpleXfer *xf
if (buffer) {
gchar *mimetype = g_strdup_printf("image/%s", format);
- purple_debug_info("ft",
+ purple_debug_info("xfer",
"created thumbnail of %" G_GSIZE_FORMAT " bytes\n",
size);
purple_xfer_set_thumbnail(xfer, buffer, size, mimetype);
More information about the Commits
mailing list