/pidgin/main: 4ca80adc2a4d: Internal keyring: don't encrypt, whe...

[Tomasz Wasilczyk]

Changeset: 4ca80adc2a4d098940301c51591fa9009679e0e6
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2013-07-18 16:12 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/4ca80adc2a4d

Description:

Internal keyring: don't encrypt, when encryption is off; HTTP: remove unnecessary macros

diffstat:

 libpurple/plugins/keyrings/internalkeyring.c |  5 +++++
 libpurple/proxy.c                            |  3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (28 lines):

diff --git a/libpurple/plugins/keyrings/internalkeyring.c b/libpurple/plugins/keyrings/internalkeyring.c
--- a/libpurple/plugins/keyrings/internalkeyring.c
+++ b/libpurple/plugins/keyrings/internalkeyring.c
@@ -465,6 +465,11 @@ intkeyring_encrypt_password_if_needed(Pu
 	const gchar *plaintext;
 	gchar *ciphertext;
 
+	if (intkeyring_key == NULL) {
+		g_hash_table_remove(intkeyring_ciphertexts, account);
+		return;
+	}
+
 	ciphertext = g_hash_table_lookup(intkeyring_ciphertexts, account);
 	if (ciphertext != NULL)
 		return;
diff --git a/libpurple/proxy.c b/libpurple/proxy.c
--- a/libpurple/proxy.c
+++ b/libpurple/proxy.c
@@ -916,9 +916,6 @@ proxy_do_write(gpointer data, gint sourc
 			PURPLE_INPUT_READ, connect_data->read_cb, connect_data);
 }
 
-#define HTTP_GOODSTRING "HTTP/1.0 200"
-#define HTTP_GOODSTRING2 "HTTP/1.1 200"
-
 /**
  * We're using an HTTP proxy for a non-port 80 tunnel.  Read the
  * response to the CONNECT request.