Mercurial > pidgin
changeset 20512:f489d760121f
explicit merge of '3732a7eabc7ecb0f846edc60f04ec3f6f7779c5b'
and '188ab7cc5918fc23174451f818ad99c84715a36e'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sun, 16 Sep 2007 18:02:50 +0000 |
| parents | bced1f19cb1d (current diff) 941965d6fd88 (diff) |
| children | 8b8effa59cc6 |
| files | libpurple/protocols/msn/msn-utils.c libpurple/protocols/msn/msn-utils.h libpurple/protocols/msn/nexus.c libpurple/protocols/msn/slplink.c libpurple/util.c |
| diffstat | 33 files changed, 57 insertions(+), 57 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/cipher.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/cipher.c Sun Sep 16 18:02:50 2007 +0000 @@ -2021,7 +2021,7 @@ if (client_nonce == NULL) { purple_cipher_context_destroy(context); - purple_debug_error("cipher", "Required client_nonce missing for MD5-sess digest calculation."); + purple_debug_error("cipher", "Required client_nonce missing for MD5-sess digest calculation.\n"); return NULL; } @@ -2091,7 +2091,7 @@ if (entity == NULL) { purple_cipher_context_destroy(context); - purple_debug_error("cipher", "Required entity missing for auth-int digest calculation."); + purple_debug_error("cipher", "Required entity missing for auth-int digest calculation.\n"); return NULL; } @@ -2118,14 +2118,14 @@ if (nonce_count == NULL) { purple_cipher_context_destroy(context); - purple_debug_error("cipher", "Required nonce_count missing for digest calculation."); + purple_debug_error("cipher", "Required nonce_count missing for digest calculation.\n"); return NULL; } if (client_nonce == NULL) { purple_cipher_context_destroy(context); - purple_debug_error("cipher", "Required client_nonce missing for digest calculation."); + purple_debug_error("cipher", "Required client_nonce missing for digest calculation.\n"); return NULL; }
--- a/libpurple/connection.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/connection.c Sun Sep 16 18:02:50 2007 +0000 @@ -436,7 +436,7 @@ g_return_if_fail(gc != NULL); if (text == NULL) { - purple_debug_error("connection", "purple_connection_error: check `text != NULL' failed"); + purple_debug_error("connection", "purple_connection_error: check `text != NULL' failed\n"); text = _("Unknown error"); }
--- a/libpurple/log.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/log.c Sun Sep 16 18:02:50 2007 +0000 @@ -1380,7 +1380,7 @@ written += fprintf(data->file, "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s:</b></font> %s<br/>\n", date, from, msg_fixed); } else { - purple_debug_error("log", "Unhandled message type."); + purple_debug_error("log", "Unhandled message type.\n"); written += fprintf(data->file, "<font size=\"2\">(%s)</font><b> %s:</b></font> %s<br/>\n", date, from, msg_fixed); }
--- a/libpurple/nat-pmp.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/nat-pmp.c Sun Sep 16 18:02:50 2007 +0000 @@ -175,20 +175,20 @@ /* Determine the buffer side needed to get the full routing table */ if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0) { - purple_debug_warning("nat-pmp", "sysctl: net.route.0.0.dump estimate"); + purple_debug_warning("nat-pmp", "sysctl: net.route.0.0.dump estimate\n"); return NULL; } if (!(buf = malloc(needed))) { - purple_debug_warning("nat-pmp", "malloc"); + purple_debug_warning("nat-pmp", "malloc\n"); return NULL; } /* Read the routing table into buf */ if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) { - purple_debug_warning("nat-pmp", "sysctl: net.route.0.0.dump"); + purple_debug_warning("nat-pmp", "sysctl: net.route.0.0.dump\n"); return NULL; } @@ -231,7 +231,7 @@ sin->sin_addr.s_addr = rti_sin->sin_addr.s_addr; memcpy(sin, rti_info[RTAX_GATEWAY], sizeof(struct sockaddr_in)); - purple_debug_info("nat-pmp", "found a default gateway"); + purple_debug_info("nat-pmp", "found a default gateway\n"); found = TRUE; break; } @@ -266,7 +266,7 @@ if ((pmp_info.status == PURPLE_PMP_STATUS_DISCOVERED) && (pmp_info.publicip != NULL)) { #ifdef PMP_DEBUG - purple_debug_info("nat-pmp", "Returning cached publicip %s",pmp_info.publicip); + purple_debug_info("nat-pmp", "Returning cached publicip %s\n",pmp_info.publicip); #endif return pmp_info.publicip; }
--- a/libpurple/network.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/network.c Sun Sep 16 18:02:50 2007 +0000 @@ -357,7 +357,7 @@ if (purple_pmp_create_map(((socket_type == SOCK_STREAM) ? PURPLE_PMP_TYPE_TCP : PURPLE_PMP_TYPE_UDP), actual_port, actual_port, PURPLE_PMP_LIFETIME)) { - purple_debug_info("network", "Created NAT-PMP mapping on port %i",actual_port); + purple_debug_info("network", "Created NAT-PMP mapping on port %i\n",actual_port); /* We want to return listen_data now, and on the next run loop trigger the cb and destroy listen_data */ purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data); }
--- a/libpurple/plugins/offlinemsg.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/plugins/offlinemsg.c Sun Sep 16 18:02:50 2007 +0000 @@ -126,7 +126,7 @@ if (purple_account_supports_offline_message(account, buddy)) { - purple_debug_info("offlinemsg", "Account \"%s\" supports offline message.", + purple_debug_info("offlinemsg", "Account \"%s\" supports offline messages.\n", purple_account_get_username(account)); return; }
--- a/libpurple/plugins/psychic.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/plugins/psychic.c Sun Sep 16 18:02:50 2007 +0000 @@ -49,7 +49,7 @@ } if(FALSE == purple_privacy_check(acct, name)) { - purple_debug_info("psychic", "user %s is blocked", name); + purple_debug_info("psychic", "user %s is blocked\n", name); return; }
--- a/libpurple/protocols/bonjour/jabber.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/bonjour/jabber.c Sun Sep 16 18:02:50 2007 +0000 @@ -537,7 +537,7 @@ /* Look for the buddy that has opened the conversation and fill information */ address_text = inet_ntoa(their_addr.sin_addr); - purple_debug_info("bonjour", "Received incoming connection from %s\n.", address_text); + purple_debug_info("bonjour", "Received incoming connection from %s.\n", address_text); cbba = g_new0(struct _check_buddy_by_address_t, 1); cbba->address = address_text; cbba->pb = &pb;
--- a/libpurple/protocols/bonjour/mdns_avahi.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/bonjour/mdns_avahi.c Sun Sep 16 18:02:50 2007 +0000 @@ -188,7 +188,7 @@ purple_debug_error("bonjour", "Collision registering buddy icon data.\n"); break; case AVAHI_ENTRY_GROUP_FAILURE: - purple_debug_error("bonjour", "Error registering buddy icon data: %s\n.", + purple_debug_error("bonjour", "Error registering buddy icon data: %s.\n", avahi_strerror(avahi_client_errno(avahi_entry_group_get_client(g)))); break; case AVAHI_ENTRY_GROUP_UNCOMMITED: @@ -271,7 +271,7 @@ idata->client = avahi_client_new(poll_api, 0, NULL, data, &error); if (idata->client == NULL) { - purple_debug_error("bonjour", "Error initializing Avahi: %s", avahi_strerror(error)); + purple_debug_error("bonjour", "Error initializing Avahi: %s\n", avahi_strerror(error)); avahi_glib_poll_free(idata->glib_poll); g_free(idata); return FALSE; @@ -354,7 +354,7 @@ if (!idata->sb) { purple_debug_error("bonjour", - "Unable to initialize service browser. Error: %s\n.", + "Unable to initialize service browser. Error: %s.\n", avahi_strerror(avahi_client_errno(idata->client))); return FALSE; } @@ -488,7 +488,7 @@ if (!idata->buddy_icon_rec_browser) { purple_debug_error("bonjour", - "Unable to initialize buddy icon record browser. Error: %s\n.", + "Unable to initialize buddy icon record browser. Error: %s.\n", avahi_strerror(avahi_client_errno(session_idata->client))); }
--- a/libpurple/protocols/bonjour/mdns_common.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/bonjour/mdns_common.c Sun Sep 16 18:02:50 2007 +0000 @@ -207,7 +207,7 @@ /* Advise the daemon that we are waiting for connections */ if (!_mdns_browse(data)) { - purple_debug_error("bonjour", "Unable to get service."); + purple_debug_error("bonjour", "Unable to get service.\n"); return FALSE; }
--- a/libpurple/protocols/bonjour/mdns_win32.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/bonjour/mdns_win32.c Sun Sep 16 18:02:50 2007 +0000 @@ -207,7 +207,7 @@ PurpleBuddy *pb = NULL; if (kDNSServiceErr_NoError != errorCode) - purple_debug_error("bonjour", "service browser - callback error"); + purple_debug_error("bonjour", "service browser - callback error\n"); else if (flags & kDNSServiceFlagsAdd) { /* A presence service instance has been discovered... check it isn't us! */ if (purple_utf8_strcasecmp(serviceName, account->username) != 0) {
--- a/libpurple/protocols/jabber/disco.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/jabber/disco.c Sun Sep 16 18:02:50 2007 +0000 @@ -273,7 +273,7 @@ g_free(js->server_name); js->server_name = g_strdup(name); if (!strcmp(name, "Google Talk")) { - purple_debug_info("jabber", "Google Talk!"); + purple_debug_info("jabber", "Google Talk!\n"); js->googletalk = TRUE; } }
--- a/libpurple/protocols/msn/httpconn.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/msn/httpconn.c Sun Sep 16 18:02:50 2007 +0000 @@ -181,7 +181,7 @@ { msn_session_set_error(httpconn->session, MSN_ERROR_HTTP_MALFORMED, NULL); - purple_debug_error("msn", "Malformed X-MSN-Messenger field.\n{%s}", + purple_debug_error("msn", "Malformed X-MSN-Messenger field.\n{%s}\n", buf); g_free(body);
--- a/libpurple/protocols/msn/slplink.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/msn/slplink.c Sun Sep 16 18:02:50 2007 +0000 @@ -49,7 +49,7 @@ tf = g_fopen(tmp, "wb"); if (tf == NULL) { - purple_debug_error("msn", "could not open debug file"); + purple_debug_error("msn", "could not open debug file\n"); return; } pload = msn_message_gen_payload(msg, &pload_size);
--- a/libpurple/protocols/myspace/markup.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/myspace/markup.c Sun Sep 16 18:02:50 2007 +0000 @@ -321,7 +321,7 @@ color = xmlnode_get_attrib(root, "v"); if (!color) { - purple_debug_info("msim", "msim_markup_c_to_html: <c> tag w/o v attr"); + purple_debug_info("msim", "msim_markup_c_to_html: <c> tag w/o v attr\n"); *begin = g_strdup(""); *end = g_strdup(""); /* TODO: log as unrecognized */ @@ -349,7 +349,7 @@ if (!color) { *begin = g_strdup(""); *end = g_strdup(""); - purple_debug_info("msim", "msim_markup_b_to_html: <b> w/o v attr"); + purple_debug_info("msim", "msim_markup_b_to_html: <b> w/o v attr\n"); /* TODO: log as unrecognized. */ return; } @@ -374,7 +374,7 @@ name = xmlnode_get_attrib(root, "n"); if (!name) { - purple_debug_info("msim", "msim_markup_i_to_html: <i> w/o n"); + purple_debug_info("msim", "msim_markup_i_to_html: <i> w/o n\n"); *begin = g_strdup(""); *end = g_strdup(""); /* TODO: log as unrecognized */
--- a/libpurple/protocols/myspace/myspace.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/myspace/myspace.c Sun Sep 16 18:02:50 2007 +0000 @@ -932,7 +932,7 @@ username = msim_msg_get_string(msg, "user"); if (!username) { - purple_debug_info("msim", "msim_get_info_cb: no 'user' in msg"); + purple_debug_info("msim", "msim_get_info_cb: no 'user' in msg\n"); return; } @@ -1120,7 +1120,7 @@ "locstring", MSIM_TYPE_STRING, g_strdup(""), NULL)) { - purple_debug_info("msim", "msim_set_status: failed to set status"); + purple_debug_info("msim", "msim_set_status: failed to set status\n"); } } @@ -1182,7 +1182,7 @@ if (!buddies) { - purple_debug_info("msim", "msim_uid2username_from_blist: no buddies?"); + purple_debug_info("msim", "msim_uid2username_from_blist: no buddies?\n"); return NULL; } @@ -1542,7 +1542,7 @@ if (msim_msg_get_integer(msg, "uniquenick") == session->userid) { - purple_debug_info("msim_we_are_logged_on", "TODO: pick username"); + purple_debug_info("msim_we_are_logged_on", "TODO: pick username\n"); } body = msim_msg_new(
--- a/libpurple/protocols/myspace/zap.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/myspace/zap.c Sun Sep 16 18:02:50 2007 +0000 @@ -126,7 +126,7 @@ zap_string = g_strdup_printf("!!!ZAP_SEND!!!=RTE_BTN_ZAPS_%d", code); if (!msim_send_bm(session, username, zap_string, MSIM_BM_ACTION)) { - purple_debug_info("msim_send_zap_from_menu", "msim_send_bm failed: zapping %s with %s", + purple_debug_info("msim_send_zap_from_menu", "msim_send_bm failed: zapping %s with %s\n", username, zap_string); rc = FALSE; } else {
--- a/libpurple/protocols/novell/nmrtf.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/novell/nmrtf.c Sun Sep 16 18:02:50 2007 +0000 @@ -233,7 +233,7 @@ if (status == NMRTF_OK) return g_strdup(ctx->output->str); - purple_debug_info("novell", "RTF parser failed with error code %d", status); + purple_debug_info("novell", "RTF parser failed with error code %d\n", status); return NULL; }
--- a/libpurple/protocols/null/nullprpl.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/null/nullprpl.c Sun Sep 16 18:02:50 2007 +0000 @@ -321,7 +321,7 @@ } static void blist_example_menu_item(PurpleBlistNode *node, gpointer userdata) { - purple_debug_info("nullprpl", "example menu item clicked on user", + purple_debug_info("nullprpl", "example menu item clicked on user\n", ((PurpleBuddy *)node)->name); purple_notify_info(NULL, /* plugin handle or PurpleConnection */
--- a/libpurple/protocols/oscar/family_icbm.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/oscar/family_icbm.c Sun Sep 16 18:02:50 2007 +0000 @@ -1461,7 +1461,7 @@ msglen = byte_stream_get16(&mbs); if (msglen > byte_stream_empty(&mbs)) { - purple_debug_misc("oscar", "Received an IM containing an invalid message part from %s. They are probably trying to do something malicious.", userinfo->sn); + purple_debug_misc("oscar", "Received an IM containing an invalid message part from %s. They are probably trying to do something malicious.\n", userinfo->sn); break; }
--- a/libpurple/protocols/oscar/oscar.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Sun Sep 16 18:02:50 2007 +0000 @@ -4346,7 +4346,7 @@ purple_plugin_oscar_convert_to_best_encoding(gc, name, tmp1, (char **)&args.msg, &args.msglen, &args.charset, &args.charsubset); - purple_debug_info("oscar", "Sending %s as %s because the original was too long.", + purple_debug_info("oscar", "Sending %s as %s because the original was too long.\n", message, (char *)args.msg); } @@ -4827,7 +4827,7 @@ "ssi: syncing local list and server list\n"); if ((timestamp == 0) || (numitems == 0)) { - purple_debug_info("oscar", "Got AIM SSI with a 0 timestamp or 0 numitems--not syncing. This probably means your buddy list is empty.", NULL); + purple_debug_info("oscar", "Got AIM SSI with a 0 timestamp or 0 numitems--not syncing. This probably means your buddy list is empty.\n"); return 1; } @@ -5430,14 +5430,14 @@ purple_plugin_oscar_convert_to_best_encoding(gc, NULL, buf, &buf2, &len, &charset, &charsubset); if ((len > c->maxlen) || (len > c->maxvis)) { - purple_debug_warning("oscar", "Could not send %s because (%i > maxlen %i) or (%i > maxvis %i)", + purple_debug_warning("oscar", "Could not send %s because (%i > maxlen %i) or (%i > maxvis %i)\n", buf2, len, c->maxlen, len, c->maxvis); g_free(buf); g_free(buf2); return -E2BIG; } - purple_debug_info("oscar", "Sending %s as %s because the original was too long.", + purple_debug_info("oscar", "Sending %s as %s because the original was too long.\n", message, buf2); }
--- a/libpurple/protocols/silc/ops.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/silc/ops.c Sun Sep 16 18:02:50 2007 +0000 @@ -868,7 +868,7 @@ /* Find buddy by nickname */ b = purple_find_buddy(sg->account, client_entry->nickname); if (!b) { - purple_debug_warning("silc", "WATCH for %s, unknown buddy", + purple_debug_warning("silc", "WATCH for %s, unknown buddy\n", client_entry->nickname); break; }
--- a/libpurple/protocols/silc10/ops.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/silc10/ops.c Sun Sep 16 18:02:50 2007 +0000 @@ -902,7 +902,7 @@ /* Find buddy by nickname */ b = purple_find_buddy(sg->account, client_entry->nickname); if (!b) { - purple_debug_warning("silc", "WATCH for %s, unknown buddy", + purple_debug_warning("silc", "WATCH for %s, unknown buddy\n", client_entry->nickname); break; }
--- a/libpurple/protocols/simple/simple.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/simple/simple.c Sun Sep 16 18:02:50 2007 +0000 @@ -1001,7 +1001,7 @@ found = TRUE; } if(!found) { - purple_debug_info("simple", "got unknown mime-type"); + purple_debug_info("simple", "got unknown mime-type\n"); send_sip_response(sip->gc, msg, 415, "Unsupported media type", NULL); } g_free(from);
--- a/libpurple/protocols/yahoo/yahoo.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo.c Sun Sep 16 18:02:50 2007 +0000 @@ -3446,7 +3446,7 @@ if (!set_cookie) { struct yahoo_data *yd = gc->proto_data; - purple_debug_error("yahoo", "No mail login token; forwarding to login screen."); + purple_debug_error("yahoo", "No mail login token; forwarding to login screen.\n"); url = g_strdup(yd->jp ? YAHOOJP_MAIL_URL : YAHOO_MAIL_URL); }
--- a/libpurple/protocols/yahoo/yahoo_packet.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo_packet.c Sun Sep 16 18:02:50 2007 +0000 @@ -365,7 +365,7 @@ if (ret < 0 && errno == EAGAIN) ret = 0; else if (ret <= 0) { - purple_debug_warning("yahoo", "Only wrote %d of %d bytes!", ret, len); + purple_debug_warning("yahoo", "Only wrote %d of %d bytes!\n", ret, len); g_free(data); return ret; }
--- a/libpurple/protocols/zephyr/zephyr.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/protocols/zephyr/zephyr.c Sun Sep 16 18:02:50 2007 +0000 @@ -1117,7 +1117,7 @@ bufcur++; if ((bufcur - buf) > (bufsize - 1)) { if ((buf = realloc(buf, bufsize * 2)) == NULL) { - purple_debug_error("zephyr","Ran out of memory"); + purple_debug_error("zephyr","Ran out of memory\n"); exit(-1); } else { bufcur = buf + bufsize; @@ -2218,12 +2218,12 @@ notice.z_message_len = strlen(html_buf2) + strlen(sig) + 2; notice.z_message = buf; notice.z_opcode = g_strdup(opcode); - purple_debug_info("zephyr","About to send notice"); + purple_debug_info("zephyr","About to send notice\n"); if (! ZSendNotice(¬ice, ZAUTH) == ZERR_NONE) { /* XXX handle errors here */ return 0; } - purple_debug_info("zephyr","notice sent"); + purple_debug_info("zephyr","notice sent\n"); g_free(buf); } @@ -2815,19 +2815,19 @@ title = g_strdup_printf("Server subscriptions for %s", zephyr->username); if (zephyr->port == 0) { - purple_debug_error("zephyr", "error while retrieving port"); + purple_debug_error("zephyr", "error while retrieving port\n"); return; } if ((retval = ZRetrieveSubscriptions(zephyr->port,&nsubs)) != ZERR_NONE) { /* XXX better error handling */ - purple_debug_error("zephyr", "error while retrieving subscriptions from server"); + purple_debug_error("zephyr", "error while retrieving subscriptions from server\n"); return; } for(i=0;i<nsubs;i++) { one = 1; if ((retval = ZGetSubscriptions(&subs,&one)) != ZERR_NONE) { /* XXX better error handling */ - purple_debug_error("zephyr", "error while retrieving individual subscription"); + purple_debug_error("zephyr", "error while retrieving individual subscription\n"); return; } g_string_append_printf(subout, "Class %s Instance %s Recipient %s<br>",
--- a/libpurple/proxy.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/proxy.c Sun Sep 16 18:02:50 2007 +0000 @@ -420,7 +420,7 @@ if (ret == 0 && error == EINPROGRESS) { /* No worries - we'll be called again later */ /* TODO: Does this ever happen? */ - purple_debug_info("proxy", "(ret == 0 && error == EINPROGRESS)"); + purple_debug_info("proxy", "(ret == 0 && error == EINPROGRESS)\n"); return; }
--- a/libpurple/util.c Sun Sep 16 18:01:18 2007 +0000 +++ b/libpurple/util.c Sun Sep 16 18:02:50 2007 +0000 @@ -656,7 +656,7 @@ locale = g_locale_from_utf8(format, -1, NULL, NULL, &err); if (err != NULL) { - purple_debug_error("util", "Format conversion failed in purple_utf8_strftime(): %s", err->message); + purple_debug_error("util", "Format conversion failed in purple_utf8_strftime(): %s\n", err->message); g_error_free(err); locale = g_strdup(format); } @@ -676,7 +676,7 @@ utf8 = g_locale_to_utf8(buf, len, NULL, NULL, &err); if (err != NULL) { - purple_debug_error("util", "Result conversion failed in purple_utf8_strftime(): %s", err->message); + purple_debug_error("util", "Result conversion failed in purple_utf8_strftime(): %s\n", err->message); g_error_free(err); } else
--- a/pidgin/gtknotify.c Sun Sep 16 18:01:18 2007 +0000 +++ b/pidgin/gtknotify.c Sun Sep 16 18:02:50 2007 +0000 @@ -801,7 +801,7 @@ if(b->label) { button = gtk_button_new_with_label(b->label); } else { - purple_debug_warning("gtknotify", "Missing button label"); + purple_debug_warning("gtknotify", "Missing button label\n"); } break; case PURPLE_NOTIFY_BUTTON_CONTINUE:
--- a/pidgin/plugins/mailchk.c Sun Sep 16 18:01:18 2007 +0000 +++ b/pidgin/plugins/mailchk.c Sun Sep 16 18:02:50 2007 +0000 @@ -118,7 +118,7 @@ void *conn_handle = purple_connections_get_handle(); if (!check_timeout(NULL)) { - purple_debug_warning("mailchk", "Could not read $MAIL or /var/spool/mail/$USER"); + purple_debug_warning("mailchk", "Could not read $MAIL or /var/spool/mail/$USER\n"); return FALSE; }
--- a/pidgin/plugins/musicmessaging/musicmessaging.c Sun Sep 16 18:01:18 2007 +0000 +++ b/pidgin/plugins/musicmessaging/musicmessaging.c Sun Sep 16 18:02:50 2007 +0000 @@ -113,7 +113,7 @@ purple_conv_im_send(PURPLE_CONV_IM(mmconv->conv), to_send->str); - purple_debug_misc("Sent request: %s\n", to_send->str); + purple_debug_misc("musicmessaging", "Sent request: %s\n", to_send->str); } }
--- a/pidgin/win32/gtkdocklet-win32.c Sun Sep 16 18:01:18 2007 +0000 +++ b/pidgin/win32/gtkdocklet-win32.c Sun Sep 16 18:02:50 2007 +0000 @@ -450,7 +450,7 @@ hicon = pixbuf_to_hicon(pixbuf); g_object_unref(pixbuf); } else - purple_debug_error("Unable to load pixbuf for %s.\n", stock); + purple_debug_error("docklet", "Unable to load pixbuf for %s.\n", stock); return hicon; }