Hello community,
here is the log from the commit of package kcall
checked in at Fri Nov 24 19:19:39 CET 2006.
--------
--- KDE/kcall/kcall.changes 2006-05-30 07:45:49.000000000 +0200
+++ /mounts/work_src_done/STABLE/kcall/kcall.changes 2006-11-24 18:04:09.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Nov 24 18:03:56 CET 2006 - dmueller@suse.de
+
+- fix stale auth data popup (#183329)
+
+-------------------------------------------------------------------
New:
----
fix-auth-request.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kcall.spec ++++++
--- /var/tmp/diff_new_pack.CMHdzH/_old 2006-11-24 19:19:34.000000000 +0100
+++ /var/tmp/diff_new_pack.CMHdzH/_new 2006-11-24 19:19:34.000000000 +0100
@@ -16,15 +16,16 @@
BuildRequires: openssl-devel
%endif
URL: http://www.basyskom.de/index.pl/kcall
-License: GPL
+License: GNU General Public License (GPL)
Group: Productivity/Telephony/SIP/Clients
Summary: SIP (Voice over IP) Solution for KDE and Kontact
Version: 0.5.2svn20060206
-Release: 16
+Release: 48
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
Source0: %name-%version.tar.bz2
Patch0: kcall_dont_kill_kontact.diff
+Patch1: fix-auth-request.diff
%description
KCall is the telephony application of Kontact. It supports computer
@@ -43,6 +44,7 @@
%prep
%setup -q
%patch0
+%patch1
. /etc/opt/kde3/common_options
update_admin
@@ -83,6 +85,8 @@
/opt/kde3/share/services/kontact/kcallplugin.desktop
%changelog -n kcall
+* Fri Nov 24 2006 - dmueller@suse.de
+- fix stale auth data popup (#183329)
* Tue May 30 2006 - adrian@suse.de
- fix build for < 10.1
* Tue Feb 21 2006 - wstephenson@suse.de
++++++ fix-auth-request.diff ++++++
--- kcall/applet/audio/dspaudio.cpp
+++ kcall/applet/audio/dspaudio.cpp
@@ -100,5 +100,6 @@
void DspAudio::setCodec( const codecType newCodec, int newCodecNum )
{
- ((DspOutRtp *)input)->setCodec( newCodec, newCodecNum );
+ if (dynamic_cast(input))
+ static_cast(input)->setCodec( newCodec, newCodecNum );
}
--- kcall/applet/kcall/kcall.cpp
+++ kcall/applet/kcall/kcall.cpp
@@ -52,9 +52,9 @@
this, SLOT(slotRegistrationChanged(int)));
incomingdlg = new IncomingDialog(this);
- connect(incomingdlg, SIGNAL(accept(QString)), this, SLOT(acceptCall(QString)));
- connect(incomingdlg, SIGNAL(reject(QString)), this, SLOT(rejectCall(QString)));
- connect(incomingdlg, SIGNAL(hangup(QString)), this, SLOT(hangupCall(QString)));
+ connect(incomingdlg, SIGNAL(accept(QString)), SLOT(acceptCall(QString)));
+ connect(incomingdlg, SIGNAL(reject(QString)), SLOT(rejectCall(QString)));
+ connect(incomingdlg, SIGNAL(hangup(QString)), SLOT(hangupCall(QString)));
connect(incomingdlg, SIGNAL(dial()), this, SLOT(slotDialDlg()));
@@ -113,15 +113,15 @@
{
kdDebug() << "KCall::showDialList()" << endl;
- KPopupMenu *dialListMenu = new KPopupMenu();
- dialListMenu->insertTitle(i18n("Call List"));
+ KPopupMenu dialListMenu;
+ dialListMenu.insertTitle(i18n("Call List"));
QStringList lastCalls = mkcall->mDialList->getLastCallsAsString();
QStringList::ConstIterator end( lastCalls.end() );
for(QStringList::ConstIterator it = lastCalls.begin(); it != end; ++it)
{
QString tmpCallTypeIcon = "forward";
- dialListMenu->insertItem(SmallIcon(tmpCallTypeIcon), *it, this, SLOT(slotDialDlg()));
+ dialListMenu.insertItem(SmallIcon(tmpCallTypeIcon), *it, this, SLOT(slotDialDlg()));
}
/*for(int i = 0; i < mkcall->dialListLength; i++)
@@ -171,7 +171,7 @@
i = mkcall->dialListLength;
}
}*/
- dialListMenu->popup( pos->globalPos() );
+ dialListMenu.popup( pos->globalPos() );
}
@@ -295,7 +295,7 @@
{
kdDebug() << "KCall::slotDialDlg()" << endl;
- DialDialog *dialdlg = new DialDialog;
+ DialDialog dialdlg;
/*if(num != "")
{
dialdlg->nrInput->setText(num);
@@ -303,11 +303,11 @@
*/
bool res;
- res = dialdlg->exec();
+ res = dialdlg.exec();
// @FIXME Mike: what is this about? why is your name within the code?
if(res){
- QString callId = mkcall->dial(dialdlg->nrInput->text());
+ QString callId = mkcall->dial(dialdlg.nrInput->text());
QString caller = "Mike Hauth";
QString subject = "Hallo Welt!";
slotStartIncomingCall(callId, caller, subject);
--- kcall/applet/kcall/kcallcore.cpp
+++ kcall/applet/kcall/kcallcore.cpp
@@ -85,13 +85,15 @@
kdDebug() << "KCallCore::cleanupCallManagers()" << endl;
QMap::Iterator it;
- QMap::Iterator end(callManagerMap.end() ) ;
-
- for( it = callManagerMap.begin(); it != end; ++it )
+ for( it = callManagerMap.begin(); it != callManagerMap.end(); ++it )
(*it)->hangupCall();
- for( it = callManagerMap.begin(); it != end; ++it )
- delete *it;
+ for( it = callManagerMap.begin(); it != callManagerMap.end(); )
+ {
+ CallManager* current = (*it);
+ ++it;
+ delete current;
+ }
callManagerMap.clear();
}
@@ -306,7 +308,9 @@
//authreq.setUsername( username );
if( password.isEmpty() || reg->getRegisterState() == SipRegister::AuthenticationRequiredWithNewPassword )
{
- QStringList authdata = sipauthentication->newAuthData( server, sipuri, "Wrong authentication data" );
+ QStringList authdata = sipauthentication->authData( server, sipuri,
+ tr("Wrong authentication data"));
+
if( authdata.count()==2 )
{
username = authdata[0];
@@ -554,7 +558,7 @@
registrate();
}
-void KCallCore::hangUp(QString callid)
+void KCallCore::hangUp(const QString& callid)
{
kdDebug() << "void KCallCore::hangUp()" << endl;
@@ -562,7 +566,7 @@
callManagerMap[callid]->hangupCall();
}
-void KCallCore::acceptCall(QString callid)
+void KCallCore::acceptCall(const QString& callid)
{
kdDebug() << "void KCallCore::acceptCall()" << endl;
@@ -572,7 +576,7 @@
}
-void KCallCore::rejectCall(QString callid)
+void KCallCore::rejectCall(const QString& callid)
{
kdDebug() << "void KCallCore::rejectCall()" << endl;
@@ -630,7 +634,7 @@
kdDebug() << "KCallCore::ringAction:ring!" << endl;
// KNotifyClient::event(winId(),"incoming-call");
- KNotifyClient::userEvent("Gestartet",1,1,"/opt/kde3/share/sounds/KDE_Beep_Phone_2.ogg","a");
+ KNotifyClient::userEvent("Gestartet",1,1,"KDE_Beep_Phone_2.ogg","a");
}
ringTimer->start(ringTime_2, true);
--- kcall/applet/kcall/kcallcore.h
+++ kcall/applet/kcall/kcallcore.h
@@ -102,9 +102,9 @@
void unregistrate();
QString dial(const QString& num);
- void hangUp(QString callid);
- void acceptCall(QString callid);
- void rejectCall(QString callid);
+ void hangUp(const QString& callid);
+ void acceptCall(const QString& callid);
+ void rejectCall(const QString& callid);
bool getRegistration();
void quit();
--- kcall/applet/kcall/ksipauthentication.cpp
+++ kcall/applet/kcall/ksipauthentication.cpp
@@ -127,17 +127,13 @@
QStringList KSipAuthentication::newAuthData(const QString &server, const QString &sipuri, const QString &caption)
{
QStringList auth;
- KSipAuthenticationRequest* dialog = new KSipAuthenticationRequest( server, sipuri, caption );
- dialog->setUsername( username );
- dialog->setPassword( password );
- if( !dialog->exec() )
- {
- delete dialog;
- return auth;
- }
- username = dialog->username();
- password = dialog->password();
- delete dialog;
+ KSipAuthenticationRequest dialog( server, sipuri, caption );
+ dialog.setUsername( username );
+ dialog.setPassword( password );
+ if( !dialog.exec() )
+ return auth;
+ username = dialog.username();
+ password = dialog.password();
if( username.isEmpty() || password.isEmpty() )
return auth;
auth << username << password;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org