# HG changeset patch # User Daniel Atallah # Date 1179452811 0 # Node ID ff7dea1672b3b00297864a383146b0e6820493dd # Parent 97a98ceb5c0622f0db9bf621c9ec7dc00c6d0964 disapproval of revision '1e0f6c89bdf3a21258ac4f64039122a909ac67cc' diff -r 97a98ceb5c06 -r ff7dea1672b3 libpurple/protocols/jabber/auth.c --- a/libpurple/protocols/jabber/auth.c Fri May 18 01:37:27 2007 +0000 +++ b/libpurple/protocols/jabber/auth.c Fri May 18 01:46:51 2007 +0000 @@ -66,10 +66,10 @@ auth = xmlnode_new("auth"); xmlnode_set_namespace(auth, "urn:ietf:params:xml:ns:xmpp-sasl"); - + xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth"); xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true"); - + response = g_string_new(""); response = g_string_append_len(response, "\0", 1); response = g_string_append(response, js->user->node); @@ -202,7 +202,7 @@ return TRUE; } - + static void auth_pass_cb(JabberStream *js, PurpleRequestFields *fields) { @@ -221,7 +221,7 @@ { if (!auth_pass_generic(js, fields)) return; - + /* Restart our connection */ jabber_auth_start_old(js); } @@ -595,7 +595,7 @@ * to OPTIONAL for this protocol. So, we need to do our own * password prompting here */ - + if (!purple_account_get_password(js->gc->account)) { purple_account_request_password(js->gc->account, G_CALLBACK(auth_old_pass_cb), G_CALLBACK(auth_no_pass_cb), js); return; diff -r 97a98ceb5c06 -r ff7dea1672b3 libpurple/protocols/simple/simple.c --- a/libpurple/protocols/simple/simple.c Fri May 18 01:37:27 2007 +0000 +++ b/libpurple/protocols/simple/simple.c Fri May 18 01:46:51 2007 +0000 @@ -277,18 +277,18 @@ auth->nonce, noncecount, NULL, auth->digest_session_key); purple_debug(PURPLE_DEBUG_MISC, "simple", "response %s\n", response); - ret = g_strdup_printf("Digest username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", nc=\"%s\", response=\"%s\"", authuser, auth->realm, auth->nonce, target, noncecount, response); + ret = g_strdup_printf("Digest username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", nc=\"%s\", response=\"%s\"\r\n", authuser, auth->realm, auth->nonce, target, noncecount, response); g_free(response); return ret; } else if(auth->type == 2) { /* NTLM */ if(auth->nc == 3 && auth->nonce) { /* TODO: Don't hardcode "purple" as the hostname */ ret = purple_ntlm_gen_type3(authuser, sip->password, "purple", authdomain, (const guint8 *)auth->nonce, &auth->flags); - tmp = g_strdup_printf("NTLM qop=\"auth\", opaque=\"%s\", realm=\"%s\", targetname=\"%s\", gssapi-data=\"%s\"", auth->opaque, auth->realm, auth->target, ret); + tmp = g_strdup_printf("NTLM qop=\"auth\", opaque=\"%s\", realm=\"%s\", targetname=\"%s\", gssapi-data=\"%s\"\r\n", auth->opaque, auth->realm, auth->target, ret); g_free(ret); return tmp; } - tmp = g_strdup_printf("NTLM qop=\"auth\", realm=\"%s\", targetname=\"%s\", gssapi-data=\"\"", auth->realm, auth->target); + tmp = g_strdup_printf("NTLM qop=\"auth\", realm=\"%s\", targetname=\"%s\", gssapi-data=\"\"\r\n", auth->realm, auth->target); return tmp; } @@ -298,7 +298,7 @@ auth->nonce, noncecount, NULL, auth->digest_session_key); purple_debug(PURPLE_DEBUG_MISC, "simple", "response %s\n", response); - ret = g_strdup_printf("Digest username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", nc=\"%s\", response=\"%s\"", authuser, auth->realm, auth->nonce, target, noncecount, response); + ret = g_strdup_printf("Digest username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", nc=\"%s\", response=\"%s\"\r\n", authuser, auth->realm, auth->nonce, target, noncecount, response); g_free(response); return ret; } @@ -630,12 +630,14 @@ if(addheaders) addh = addheaders; if(sip->registrar.type && !strcmp(method, "REGISTER")) { buf = auth_header(sip, &sip->registrar, method, url); - auth = g_strdup_printf("Authorization: %s\r\n", buf); + auth = g_strdup_printf("Authorization: %s", buf); g_free(buf); purple_debug(PURPLE_DEBUG_MISC, "simple", "header %s", auth); - } else if(sip->proxy.type && strcmp(method, "REGISTER")) { + } + + if(sip->proxy.type && strcmp(method, "REGISTER")) { buf = auth_header(sip, &sip->proxy, method, url); - auth = g_strdup_printf("Proxy-Authorization: %s\r\n", buf); + auth = g_strdup_printf("Proxy-Authorization: %s", buf); g_free(buf); purple_debug(PURPLE_DEBUG_MISC, "simple", "header %s", auth); } @@ -982,8 +984,8 @@ state = xmlnode_get_child(isc, "state"); if(!state) { - purple_debug_info("simple", "process_incoming_message: no state found\n"); - xmlnode_free(isc); + purple_debug_info("simple", "process_incoming_message: no state found\n"); + xmlnode_free(isc); return; } diff -r 97a98ceb5c06 -r ff7dea1672b3 pidgin/gtkconv.c --- a/pidgin/gtkconv.c Fri May 18 01:37:27 2007 +0000 +++ b/pidgin/gtkconv.c Fri May 18 01:46:51 2007 +0000 @@ -235,11 +235,6 @@ return FALSE; } - /* Don't save the window's size if it is maximized. - * It is annoying because the window reopens at that size, but not maximized */ - if (gdk_window_get_state(w->window) & GDK_WINDOW_STATE_MAXIMIZED) - return FALSE; - /* I find that I resize the window when it has a bunch of conversations in it, mostly so that the * tab bar will fit, but then I don't want new windows taking up the entire screen. I check to see * if there is only one conversation in the window. This way we'll be setting new windows to the diff -r 97a98ceb5c06 -r ff7dea1672b3 pidgin/win32/winpidgin.c --- a/pidgin/win32/winpidgin.c Fri May 18 01:37:27 2007 +0000 +++ b/pidgin/win32/winpidgin.c Fri May 18 01:46:51 2007 +0000 @@ -145,7 +145,7 @@ putenv(settingsdir); snprintf(aspelldir, sizeof(aspelldir), "PIDGIN_ASPELL_DIR=%s\\Aspell\\bin", path); - printf("%s\n", aspelldir); + printf("%s", aspelldir); putenv(aspelldir); /* set the GTK+ path to be \\path\to\GTK\bin */