/pidgin/main: 3949b825f4bf: Compile with older GnuTLS versions, ...

[Tomasz Wasilczyk]

Changeset: 3949b825f4bfdba9ed69844f2f8a73d38ae6bbfa
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2013-08-20 14:04 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/3949b825f4bf

Description:

Compile with older GnuTLS versions, without GNUTLS_E_PREMATURE_TERMINATION; GTK: don't let inline images overflow the window

diffstat:

 libpurple/plugins/ssl/ssl-gnutls.c        |  2 ++
 pidgin/themes/Contents/Resources/main.css |  6 ++++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diffs (31 lines):

diff --git a/libpurple/plugins/ssl/ssl-gnutls.c b/libpurple/plugins/ssl/ssl-gnutls.c
--- a/libpurple/plugins/ssl/ssl-gnutls.c
+++ b/libpurple/plugins/ssl/ssl-gnutls.c
@@ -471,9 +471,11 @@ ssl_gnutls_read(PurpleSslConnection *gsc
 	if(s == GNUTLS_E_AGAIN || s == GNUTLS_E_INTERRUPTED) {
 		s = -1;
 		errno = EAGAIN;
+#ifdef GNUTLS_E_PREMATURE_TERMINATION
 	} else if (s == GNUTLS_E_PREMATURE_TERMINATION) {
 		purple_debug_warning("gnutls", "premature termination\n");
 		s = 0;
+#endif
 	} else if(s < 0) {
 		purple_debug_error("gnutls", "receive failed: %s\n",
 				gnutls_strerror(s));
diff --git a/pidgin/themes/Contents/Resources/main.css b/pidgin/themes/Contents/Resources/main.css
--- a/pidgin/themes/Contents/Resources/main.css
+++ b/pidgin/themes/Contents/Resources/main.css
@@ -39,6 +39,12 @@ body {
 	display: inline;
 }
 
+/* Don't let inline images overflow the window */
+img
+{
+	max-width: 100%
+}
+
 /* Colour-ify things */
 
 #Chat:not(.groupchat) .x-container.incoming .x-header