diff options
author | Paul Aurich <darkrain42@pidgin.im> | 2009-03-23 04:25:23 +0000 |
---|---|---|
committer | Paul Aurich <darkrain42@pidgin.im> | 2009-03-23 04:25:23 +0000 |
commit | 54f6661c049e74b7a9adb7ee33076104ea17bc00 (patch) | |
tree | d0b35bbc98e6574ed83ed1433697868c9cb432bc | |
parent | e5788e835f27f1c850df50dbf79e1b9c373629b1 (diff) | |
parent | 86541b743b910f52f88b555f2b1b9e6a906d33a2 (diff) | |
download | pidgin-54f6661c049e74b7a9adb7ee33076104ea17bc00.tar.gz |
propagate from branch 'im.pidgin.pidgin' (head 6b26255ac67243ccf22b87cd19a66a275308ccb2)
to branch 'im.pidgin.cpw.darkrain42.buddy-add' (head c5a9a9883bb8e76425713adc63413808180440be)
-rw-r--r-- | libpurple/protocols/msn/notification.c | 4 | ||||
-rw-r--r-- | libpurple/protocols/msn/oim.c | 4 | ||||
-rw-r--r-- | libpurple/protocols/msn/state.c | 4 | ||||
-rw-r--r-- | libpurple/protocols/msn/switchboard.c | 2 | ||||
-rw-r--r-- | libpurple/protocols/msn/userlist.c | 4 | ||||
-rw-r--r-- | pidgin/gtkaccount.c | 8 |
6 files changed, 13 insertions, 13 deletions
diff --git a/libpurple/protocols/msn/notification.c b/libpurple/protocols/msn/notification.c index d941e5f948..c37eb7a240 100644 --- a/libpurple/protocols/msn/notification.c +++ b/libpurple/protocols/msn/notification.c @@ -1609,7 +1609,7 @@ gcf_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload, if ( (root = xmlnode_from_str(cmd->payload, cmd->payload_len)) == NULL) { - purple_debug_error("msn", "Unable to parse GCF payload into a XML tree"); + purple_debug_error("msn", "Unable to parse GCF payload into a XML tree\n"); return; } @@ -1682,7 +1682,7 @@ ubx_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload, user = msn_userlist_find_user(session->userlist, passport); if (user == NULL) { char *str = g_strndup(payload, len); - purple_debug_info("msn", "unknown user %s, payload is %s", + purple_debug_info("msn", "unknown user %s, payload is %s\n", passport, str); g_free(str); return; diff --git a/libpurple/protocols/msn/oim.c b/libpurple/protocols/msn/oim.c index 927c9376aa..9caaef8262 100644 --- a/libpurple/protocols/msn/oim.c +++ b/libpurple/protocols/msn/oim.c @@ -174,7 +174,7 @@ msn_oim_request_cb(MsnSoapMessage *request, MsnSoapMessage *response, gchar *faultcode_str = xmlnode_get_data(faultcode); if (faultcode_str && g_str_equal(faultcode_str, "q0:BadContextToken")) { - purple_debug_warning("msn", "OIM Request Error, Updating token now."); + purple_debug_warning("msn", "OIM Request Error, Updating token now.\n"); msn_nexus_update_token(data->oim->session->nexus, data->send ? MSN_AUTH_LIVE_SECURE : MSN_AUTH_MESSENGER_WEB, (GSourceFunc)msn_oim_request_helper, data); @@ -183,7 +183,7 @@ msn_oim_request_cb(MsnSoapMessage *request, MsnSoapMessage *response, } else if (faultcode_str && g_str_equal(faultcode_str, "q0:AuthenticationFailed")) { if (xmlnode_get_child(fault, "detail/RequiredAuthPolicy") != NULL) { - purple_debug_warning("msn", "OIM Request Error, Updating token now."); + purple_debug_warning("msn", "OIM Request Error, Updating token now.\n"); msn_nexus_update_token(data->oim->session->nexus, data->send ? MSN_AUTH_LIVE_SECURE : MSN_AUTH_MESSENGER_WEB, (GSourceFunc)msn_oim_request_helper, data); diff --git a/libpurple/protocols/msn/state.c b/libpurple/protocols/msn/state.c index e172d880bb..5a77a39999 100644 --- a/libpurple/protocols/msn/state.c +++ b/libpurple/protocols/msn/state.c @@ -169,7 +169,7 @@ msn_get_currentmedia(char *xml_str, gsize len) } currentmediaNode = xmlnode_get_child(payloadNode, "CurrentMedia"); if (currentmediaNode == NULL) { - purple_debug_info("msn", "No CurrentMedia Node"); + purple_debug_info("msn", "No CurrentMedia Node\n"); xmlnode_free(payloadNode); return NULL; } @@ -195,7 +195,7 @@ msn_get_psm(char *xml_str, gsize len) } psmNode = xmlnode_get_child(payloadNode, "PSM"); if (psmNode == NULL) { - purple_debug_info("msn", "No PSM status Node"); + purple_debug_info("msn", "No PSM status Node\n"); xmlnode_free(payloadNode); return NULL; } diff --git a/libpurple/protocols/msn/switchboard.c b/libpurple/protocols/msn/switchboard.c index 0ada2639d1..74fe0a43f3 100644 --- a/libpurple/protocols/msn/switchboard.c +++ b/libpurple/protocols/msn/switchboard.c @@ -590,7 +590,7 @@ release_msg(MsnSwitchBoard *swboard, MsnMessage *msg) payload = msn_message_gen_payload(msg, &payload_len); #ifdef MSN_DEBUG_SB - purple_debug_info("msn", "SB length:{%" G_GSIZE_FORMAT "}", payload_len); + purple_debug_info("msn", "SB length:{%" G_GSIZE_FORMAT "}\n", payload_len); msn_message_show_readable(msg, "SB SEND", FALSE); #endif diff --git a/libpurple/protocols/msn/userlist.c b/libpurple/protocols/msn/userlist.c index a98919d537..ba5cc831c2 100644 --- a/libpurple/protocols/msn/userlist.c +++ b/libpurple/protocols/msn/userlist.c @@ -858,7 +858,7 @@ msn_userlist_add_buddy_to_group(MsnUserList *userlist, const char *who, } if ( (user = msn_userlist_find_user(userlist, who)) == NULL) { - purple_debug_error("msn", "User %s not found!", who); + purple_debug_error("msn", "User %s not found!\n", who); return FALSE; } @@ -887,7 +887,7 @@ msn_userlist_rem_buddy_from_group(MsnUserList *userlist, const char *who, } if ( (user = msn_userlist_find_user(userlist, who)) == NULL) { - purple_debug_error("msn", "User %s not found!", who); + purple_debug_error("msn", "User %s not found!\n", who); return FALSE; } diff --git a/pidgin/gtkaccount.c b/pidgin/gtkaccount.c index a5f0a85fe9..1a6c10793e 100644 --- a/pidgin/gtkaccount.c +++ b/pidgin/gtkaccount.c @@ -756,10 +756,6 @@ add_protocol_options(AccountPrefsDialog *dialog, GtkWidget *parent) dialog->protocol_frame = NULL; } - if (dialog->prpl_info == NULL || - dialog->prpl_info->protocol_options == NULL) - return; - while (dialog->protocol_opt_entries != NULL) { ProtocolOptEntry *opt_entry = dialog->protocol_opt_entries->data; g_free(opt_entry->setting); @@ -767,6 +763,10 @@ add_protocol_options(AccountPrefsDialog *dialog, GtkWidget *parent) dialog->protocol_opt_entries = g_list_delete_link(dialog->protocol_opt_entries, dialog->protocol_opt_entries); } + if (dialog->prpl_info == NULL || + dialog->prpl_info->protocol_options == NULL) + return; + account = dialog->account; /* Build the protocol options frame. */ |