$OpenBSD: patch-plugins_otr_authenticationwizard_cpp,v 1.1.1.1 2013/12/08 18:39:44 zhuk Exp $
Support for libotr-4.0, from upstream.
--- plugins/otr/authenticationwizard.cpp.orig	Fri Jun 28 22:08:21 2013
+++ plugins/otr/authenticationwizard.cpp	Sat Oct  5 05:10:45 2013
@@ -1,5 +1,5 @@
 /*************************************************************************
- * Copyright <2007>  <Michael Zanetti> <michael_zanetti@gmx.net>         *
+ * Copyright <2007 - 2013>  <Michael Zanetti> <mzanetti@kde.org>         *
  *                                                                       *
  * This program is free software; you can redistribute it and/or         *
  * modify it under the terms of the GNU General Public License as        *
@@ -47,9 +47,9 @@ AuthenticationWizard::AuthenticationWizard(QWidget *pa
 	setAttribute(Qt::WA_DeleteOnClose);
 
 	setPage(Page_SelectMethod, createIntroPage());
- 	setPage(Page_QuestionAnswer, createQAPage());
- 	setPage(Page_SharedSecret, createSSPage());
- 	setPage(Page_ManualVerification, createMVPage());
+	setPage(Page_QuestionAnswer, createQAPage());
+	setPage(Page_SharedSecret, createSSPage());
+	setPage(Page_ManualVerification, createMVPage());
 	setPage(Page_Wait1, new WaitPage(i18n("Waiting for %1...", OtrlChatInterface::self()->formatContact(session->members().first()->contactId()))));
 	setPage(Page_Wait2, new WaitPage(i18n("Checking if answers match...")));
 	setPage(Page_Final, createFinalPage());
@@ -72,8 +72,9 @@ AuthenticationWizard::AuthenticationWizard(QWidget *pa
 	if ( session->account()->isBusy() )
 		return;
 
+	resize(rbMV->width() * 1.5, rbMV->width() * 0.75);
 	show();
-	
+
 	if ( !session->view()->mainWidget() || !session->view()->mainWidget()->isActiveWindow() ) {
 		KNotification *notification = new KNotification( "kopete_info_event", KNotification::CloseWhenWidgetActivated | KNotification::CloseOnTimeout );
 		notification->setText( i18n( "Incoming authentication request from %1", OtrlChatInterface::self()->formatContact( session->members().first()->contactId() ) ) );
@@ -83,7 +84,7 @@ AuthenticationWizard::AuthenticationWizard(QWidget *pa
 		connect( notification, SIGNAL(activated(uint)), SLOT(notificationActivated(uint)) );
 		notification->sendEvent();
 	}
-	
+
 }
 
 
@@ -97,7 +98,7 @@ AuthenticationWizard *AuthenticationWizard::findWizard
 			return wizardList.at(i);
 		}
 	}
-        return 0;
+	return 0;
 }
 
 QWizardPage *AuthenticationWizard::createIntroPage(){
@@ -108,7 +109,7 @@ QWizardPage *AuthenticationWizard::createIntroPage(){
 	rbQA = new QRadioButton(i18n("Question and Answer"));
 	rbSS = new QRadioButton(i18n("Shared Secret"));
 	rbMV = new QRadioButton(i18n("Manual fingerprint verification"));
-	
+
 	QGroupBox *frame = new QGroupBox();
 	QVBoxLayout *frameLayout = new QVBoxLayout();
 	frame->setLayout(frameLayout);
@@ -117,8 +118,8 @@ QWizardPage *AuthenticationWizard::createIntroPage(){
 	frameLayout->addWidget(infoLabel);
 
 	QVBoxLayout *layout = new QVBoxLayout();
-	layout->addWidget(rbQA);	
-	layout->addWidget(rbSS);	
+	layout->addWidget(rbQA);
+	layout->addWidget(rbSS);
 	layout->addWidget(rbMV);
 
 	layout->addSpacing(30);
@@ -126,7 +127,7 @@ QWizardPage *AuthenticationWizard::createIntroPage(){
 
 	page->setLayout(layout);
 
-	rbQA->setChecked(true);	
+	rbQA->setChecked(true);
 
 	return page;
 }
@@ -176,7 +177,7 @@ QWizardPage *AuthenticationWizard::createSSPage(){
 		layout->addWidget(new QLabel(i18nc("@info", "Enter the secret passphrase known only to you and %1:", session->members().first()->contactId())));
 	}
 	leSecret = new QLineEdit();
-	layout->addWidget(leSecret);	
+	layout->addWidget(leSecret);
 
 	page->setLayout(layout);
 	page->setCommitPage(true);
@@ -192,7 +193,7 @@ QWizardPage *AuthenticationWizard::createMVPage(){
 	QLabel *lMessage1 = new QLabel(i18nc("@info", "Contact %1 via another secure channel and verify that the following fingerprint is correct:", session->members().first()->contactId()));
 	lMessage1->setWordWrap(true);
 	layout->addWidget(lMessage1);
-	layout->addWidget(new QLabel(OtrlChatInterface::self()->findActiveFingerprint(session)));
+	layout->addWidget(new QLabel(OtrlChatInterface::self()->fingerprint(session)));
 
 	cbManualAuth = new QComboBox();
 	cbManualAuth->addItem(i18nc("@item:inlistbox ...verified that", "I have not"));
@@ -330,9 +331,9 @@ void AuthenticationWizard::finished(bool success, bool
 			lFinal->setText(i18n("The authentication with %1 failed. To make sure you are not talking to an imposter, try again using the manual fingerprint verification method. Note that the conversation is now insecure.", OtrlChatInterface::self()->formatContact(session->members().first()->contactId())));
 		}
 	}
-	
+
 	setOption(QWizard::NoCancelButton, true);
-	
+
 }
 
 void AuthenticationWizard::aborted(){
@@ -347,7 +348,7 @@ void AuthenticationWizard::aborted(){
 	}
 	currentPage()->setTitle(i18n("Authentication aborted"));
 	lFinal->setText(i18n("%1 has aborted the authentication process. To make sure you are not talking to an imposter, try again using the manual fingerprint verification method.", OtrlChatInterface::self()->formatContact(session->members().first()->contactId())));
-	
+
 	setOption(QWizard::NoCancelButton, true);
 }
 
