File kvirc.diff of Package kde3-kvirc

Index: po/kvirc/Makefile.am
===================================================================
--- po/kvirc/Makefile.am.orig	2008-10-14 11:03:33.000000000 +0200
+++ po/kvirc/Makefile.am	2010-04-22 11:05:56.000000000 +0200
@@ -18,7 +18,6 @@ tmp_DATA  = kvirc_bg.mo \
 	kvirc_pt_BR.mo \
 	kvirc_ru.mo \
 	kvirc_sr.mo \
-	kvirc_hu.mo \
 	kvirc_hr.mo \
 	kvirc_fi.mo \
 	kvirc_uk.mo
@@ -39,7 +38,6 @@ POFILES = kvirc_bg.po \
 	kvirc_pt_BR.po \
 	kvirc_ru.po \
 	kvirc_sr.po \
-	kvirc_hu.po \
 	kvirc_hr.po \
 	kvirc_fi.po \
 	kvirc_uk.po
Index: src/kvilib/net/kvi_ssl.cpp
===================================================================
--- src/kvilib/net/kvi_ssl.cpp.orig	2008-10-14 11:02:12.000000000 +0200
+++ src/kvilib/net/kvi_ssl.cpp	2010-04-22 11:10:53.000000000 +0200
@@ -473,7 +473,7 @@ KviSSLCertificate * KviSSL::getPeerCerti
 KviSSLCipherInfo * KviSSL::getCurrentCipherInfo()
 {
 	if(!m_pSSL)return 0;
-	SSL_CIPHER * c = SSL_get_current_cipher(m_pSSL);
+	ssl_cipher_type * c = SSL_get_current_cipher(m_pSSL);
 	if(!c)return 0;
 	return new KviSSLCipherInfo(c);
 }
@@ -652,7 +652,7 @@ const char * KviSSLCertificate::verify()
 */
 
 
-KviSSLCipherInfo::KviSSLCipherInfo(SSL_CIPHER * c)
+KviSSLCipherInfo::KviSSLCipherInfo(ssl_cipher_type * c)
 {
 	m_szVersion = SSL_CIPHER_get_version(c);
 	m_iNumBitsUsed = SSL_CIPHER_get_bits(c,&m_iNumBits);
Index: src/kvilib/net/kvi_ssl.h
===================================================================
--- src/kvilib/net/kvi_ssl.h.orig	2008-10-14 11:02:12.000000000 +0200
+++ src/kvilib/net/kvi_ssl.h	2010-04-22 11:10:13.000000000 +0200
@@ -33,6 +33,11 @@
 
 #include <openssl/ssl.h>
 
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
+typedef const SSL_CIPHER ssl_cipher_type;
+#else
+typedef SSL_CIPHER ssl_cipher_type;
+#endif
 
 class KVILIB_API KviSSLCertificate
 {
@@ -98,7 +103,7 @@ public:
 class KVILIB_API KviSSLCipherInfo
 {
 public:
-	KviSSLCipherInfo(SSL_CIPHER * c);
+	KviSSLCipherInfo(ssl_cipher_type * c);
 	~KviSSLCipherInfo();
 protected:
 	KviStr       m_szVersion;