pidgin/pidgin

Update debug categories for new filenames

2014-01-20, Ankit Vani
b0659f31989d
Parents 647c1ffb8147
Children cd95ae1faea177664079d0f0ddb4169bacc5
Update debug categories for new filenames
7 files changed, 28 insertions(+), 28 deletions(-)
  • +6 -6
    libpurple/accounts.c
  • +2 -2
    libpurple/blistnodetypes.c
  • +3 -3
    libpurple/buddylist.c
  • +4 -4
    libpurple/conversationtypes.c
  • +1 -1
    libpurple/presence.c
  • +6 -6
    libpurple/xfer.c
  • +6 -6
    pidgin/gtkxfer.c
    • --- a/libpurple/accounts.c Mon Jan 20 03:26:32 2014 +0530
    +++ b/libpurple/accounts.c Mon Jan 20 07:39:26 2014 +0530
    @@ -67,7 +67,7 @@
    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 @@
    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 @@
    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 @@
    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 @@
    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 @@
    /* 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;
    }
    --- a/libpurple/blistnodetypes.c Mon Jan 20 03:26:32 2014 +0530
    +++ b/libpurple/blistnodetypes.c Mon Jan 20 07:39:26 2014 +0530
    @@ -457,7 +457,7 @@
    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 @@
    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;
    --- a/libpurple/buddylist.c Mon Jan 20 03:26:32 2014 +0530
    +++ b/libpurple/buddylist.c Mon Jan 20 07:39:26 2014 +0530
    @@ -382,7 +382,7 @@
    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 @@
    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_sync();
    }
    - purple_debug(PURPLE_DEBUG_INFO, "blist", "Destroying\n");
    + purple_debug(PURPLE_DEBUG_INFO, "buddylist", "Destroying\n");
    if (ops && ops->destroy)
    ops->destroy(purplebuddylist);
    --- a/libpurple/conversationtypes.c Mon Jan 20 03:26:32 2014 +0530
    +++ b/libpurple/conversationtypes.c Mon Jan 20 07:39:26 2014 +0530
    @@ -168,7 +168,7 @@
    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 @@
    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
    --- a/libpurple/presence.c Mon Jan 20 03:26:32 2014 +0530
    +++ b/libpurple/presence.c Mon Jan 20 07:39:26 2014 +0530
    @@ -125,7 +125,7 @@
    {
    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.",
    --- a/libpurple/xfer.c Mon Jan 20 03:26:32 2014 +0530
    +++ b/libpurple/xfer.c Mon Jan 20 07:39:26 2014 +0530
    @@ -1249,7 +1249,7 @@
    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 @@
    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 @@
    }
    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 @@
    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 @@
    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 @@
    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;
    --- a/pidgin/gtkxfer.c Mon Jan 20 03:26:32 2014 +0530
    +++ b/pidgin/gtkxfer.c Mon Jan 20 07:39:26 2014 +0530
    @@ -478,7 +478,7 @@
    {
    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 @@
    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 @@
    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 @@
    /* 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 @@
    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);