[Pkg-kde-commits] rev 1613 -
branches/kde-3.4.0/packages/kdenetwork/debian/patches
Luk Claes
luk at costa.debian.org
Tue Aug 30 16:45:10 UTC 2005
Author: luk
Date: 2005-08-30 16:45:09 +0000 (Tue, 30 Aug 2005)
New Revision: 1613
Added:
branches/kde-3.4.0/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r455059.diff
Log:
Forget to add this
Added: branches/kde-3.4.0/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r455059.diff
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r455059.diff 2005-08-30 15:38:20 UTC (rev 1612)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r455059.diff 2005-08-30 16:45:09 UTC (rev 1613)
@@ -0,0 +1,861 @@
+#DPATCHLEVEL=0
+--- krfb/krfb/krfb.desktop (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ krfb/krfb/krfb.desktop (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -8,6 +8,7 @@
+ Name=Krfb
+ GenericName=Desktop Sharing
+ GenericName[bg]=Споделяне на раб. място
++GenericName[br]=Rannañ ar vurev
+ GenericName[ca]=Compartició de l'escriptori
+ GenericName[cs]=Sdílení pracovní plochy
+ GenericName[cy]=Rhannu Penbwrdd
+--- krfb/krfb/eventsrc (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ krfb/krfb/eventsrc (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -4,6 +4,7 @@
+ Comment[af]=Werkskerm Deeling
+ Comment[ar]=مشاركة سطح المكتب
+ Comment[bg]=Споделяне на работно място
++Comment[br]=Rannañ ar vurev
+ Comment[bs]=Dijeljenje desktopa
+ Comment[ca]=Compartició de l'escriptori
+ Comment[cs]=Sdílení pracovní plochy
+@@ -568,7 +569,7 @@
+ Comment[cy]=Anfonodd y person gwahodd cyfrinair annilys. Gwrthodwyd y cysylltiad.
+ Comment[da]=Den inviterede part sendte et ugyldigt kodeord. Forbindelse afslået.
+ Comment[de]=Die eingeladene Partei hat ein ungültiges Passwort gesendet: Verbindung abgelehnt.
+-Comment[el]=Η προσκαλεσμένη ομάδα έστειλε άκυρο κωδικό πρόσβασης. Η σύνδεση απορρίφθηκε.
++Comment[el]=Η προσκαλεσμένη ομάδα έστειλε μη έγκυρο κωδικό πρόσβασης. Η σύνδεση απορρίφθηκε.
+ Comment[eo]=La invitita kliento sendis nevalidan pasvorton. Konekto rifuzita.
+ Comment[es]=La parte invitada envió una contraseña incorrecta. Conexión rechazada.
+ Comment[et]=Kutsutu saatis vigase parooli. Ühendusest keelduti.
+--- krfb/kcm_krfb/kcmkrfb.desktop (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ krfb/kcm_krfb/kcmkrfb.desktop (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -12,6 +12,7 @@
+ Name=Desktop Sharing
+ Name[af]=Werkskerm Deeling
+ Name[ar]=مشاركة سطح المكتب
++Name[br]=Rannañ ar vurev
+ Name[bs]=Dijeljenje desktopa
+ Name[ca]=Compartició de l'escriptori
+ Name[cs]=Sdílení pracovní plochy
+--- lanbrowsing/kcmlisa/portsettingsbar.cpp (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ lanbrowsing/kcmlisa/portsettingsbar.cpp (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -34,7 +34,7 @@
+ m_box->insertItem(i18n("Always"));
+ m_box->insertItem(i18n("Never"));
+
+- connect(m_box,SIGNAL(activated()),this,SIGNAL(changed()));
++ connect(m_box,SIGNAL(activated(int)),this,SIGNAL(changed()));
+ }
+
+ int PortSettingsBar::selected() const
+--- kopete/plugins/nowlistening/nowlisteningguiclient.cpp (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/plugins/nowlistening/nowlisteningguiclient.cpp (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -44,6 +44,11 @@
+ void NowListeningGUIClient::slotAdvertToCurrentChat()
+ {
+ kdDebug( 14307 ) << k_funcinfo << endl;
++
++ // Sanity check - don't crash if the plugin is unloaded and we get called.
++ if (!NowListeningPlugin::plugin())
++ return;
++
+ QString message = NowListeningPlugin::plugin()->allPlayerAdvert();
+
+ // We warn in a mode appropriate to the mode the user invoked the plugin - GUI on menu action, in message if they typed '/media'
+--- kopete/plugins/alias/kopete_alias.desktop (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/plugins/alias/kopete_alias.desktop (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -18,6 +18,7 @@
+ Name[ar]=اسم مستعار
+ Name[be]=Псэўданім
+ Name[bg]=Запазени думи
++Name[br]=Lesanv
+ Name[ca]=Àlies
+ Name[cy]=Ffugenw
+ Name[el]=Αντιστοίχηση
+--- kopete/plugins/alias/kopete_alias_config.desktop (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/plugins/alias/kopete_alias_config.desktop (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -14,6 +14,7 @@
+ Name[ar]=اسم مستعار
+ Name[be]=Псэўданім
+ Name[bg]=Запазени думи
++Name[br]=Lesanv
+ Name[ca]=Àlies
+ Name[cy]=Ffugenw
+ Name[el]=Αντιστοίχηση
+--- kopete/plugins/contactnotes/kopete_contactnotes.desktop (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/plugins/contactnotes/kopete_contactnotes.desktop (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -17,6 +17,7 @@
+ Name=Contact Notes
+ Name[ar]=ملاحظات الاتصال
+ Name[bg]=Бележки за контактите
++Name[br]=Notennoù an darempred
+ Name[bs]=Kontakt informacije
+ Name[ca]=Notes del contacte
+ Name[cs]=Poznámky ke kontaktu
+--- kopete/plugins/highlight/kopete_highlight.desktop (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/plugins/highlight/kopete_highlight.desktop (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -18,6 +18,7 @@
+ Name[ar]=تمييز
+ Name[be]=Падсьветка
+ Name[bg]=Открояване
++Name[br]=Splannadur
+ Name[bs]=Isticanje
+ Name[ca]=Ressaltat
+ Name[cs]=Zvýraznění
+--- kopete/plugins/highlight/kopete_highlight_config.desktop (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/plugins/highlight/kopete_highlight_config.desktop (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -14,6 +14,7 @@
+ Name[ar]=تمييز
+ Name[be]=Падсьветка
+ Name[bg]=Открояване
++Name[br]=Splannadur
+ Name[bs]=Isticanje
+ Name[ca]=Ressaltat
+ Name[cs]=Zvýraznění
+--- kopete/plugins/latex/kopete_latex_config.desktop (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/plugins/latex/kopete_latex_config.desktop (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -14,6 +14,7 @@
+ Name[ar]=تمييز
+ Name[be]=Падсьветка
+ Name[bg]=Открояване
++Name[br]=Splannadur
+ Name[bs]=Isticanje
+ Name[ca]=Ressaltat
+ Name[cs]=Zvýraznění
+--- kopete/protocols/gadu/libgadu/libgadu.h (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/protocols/gadu/libgadu/libgadu.h (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -33,6 +33,10 @@
+ extern "C" {
+ #endif
+
++#ifdef HAVE_STDINT_H
++#include <stdint.h>
++#endif
++
+ #include <libgadu-config.h>
+ #include <sys/types.h>
+ #include <stdio.h>
+--- kopete/protocols/groupwise/gwprotocol.cpp (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/protocols/groupwise/gwprotocol.cpp (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -48,14 +48,14 @@
+ i18n( "Offline" ), i18n( "O&ffline" ), Kopete::OnlineStatusManager::Offline ),
+ groupwiseAvailable ( Kopete::OnlineStatus::Online, 25, this, GroupWise::Available, QString::null,
+ i18n( "Available" ), i18n( "A&vailable" ), Kopete::OnlineStatusManager::Online ),
+- groupwiseBusy ( Kopete::OnlineStatus::Away, 18, this, GroupWise::Busy, "contact_busy_overlay",
++ groupwiseBusy ( Kopete::OnlineStatus::Away, 18, this, GroupWise::Busy, "groupwise_busy",
+ i18n( "Busy" ), i18n( "&Busy" ), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage ),
+- groupwiseAway ( Kopete::OnlineStatus::Away, 20, this, GroupWise::Away, "contact_away_overlay",
++ groupwiseAway ( Kopete::OnlineStatus::Away, 20, this, GroupWise::Away, "groupwise_away",
+ i18n( "Away" ), i18n( "&Away" ), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasAwayMessage ),
+- groupwiseAwayIdle ( Kopete::OnlineStatus::Away, 15, this, GroupWise::AwayIdle, "contact_away_overlay",
++ groupwiseAwayIdle ( Kopete::OnlineStatus::Away, 15, this, GroupWise::AwayIdle, "groupwise_away",
+ i18n( "Idle" ), "FIXME: Make groupwiseAwayIdle unselectable", Kopete::OnlineStatusManager::Busy,
+ Kopete::OnlineStatusManager::HideFromMenu ),
+- groupwiseAppearOffline( Kopete::OnlineStatus::Invisible, 2, this, 98, "contact_invisible_overlay",
++ groupwiseAppearOffline( Kopete::OnlineStatus::Invisible, 2, this, 98, "groupwise_invisible",
+ i18n( "Appear Offline" ), i18n( "A&ppear Offline" ), Kopete::OnlineStatusManager::Invisible ),
+ /* initialise Kopete::OnlineStatus used by the protocol, but that are not user selectable */
+ groupwiseUnknown ( Kopete::OnlineStatus::Unknown, 25, this, GroupWise::Unknown, "status_unknown",
+--- kopete/protocols/groupwise/gwmessagemanager.cpp (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/protocols/groupwise/gwmessagemanager.cpp (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -199,6 +199,7 @@
+ Kopete::Message failureNotify = Kopete::Message( myself(), members(), i18n("An error occurred when trying to start a chat: %1").arg( statusCode ), Kopete::Message::Internal, Kopete::Message::PlainText);
+ appendMessage( failureNotify );
+ setClosed();
++ messageSucceeded();
+ }
+ }
+
+--- kopete/protocols/groupwise/gwaccount.cpp (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/protocols/groupwise/gwaccount.cpp (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -356,9 +356,8 @@
+ {
+ kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl;
+ if ( status == protocol()->groupwiseUnknown
+- || status == protocol()->groupwiseConnecting
+- || status == protocol()->groupwiseInvalid
+- || status == protocol()->groupwiseAwayIdle )
++ || status == protocol()->groupwiseConnecting
++ || status == protocol()->groupwiseInvalid )
+ {
+ kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " called with invalid status \""
+ << status.description() << "\"" << endl;
+@@ -749,7 +748,7 @@
+ arg(server).
+ arg(accountId).
+ arg(validityString),
+- i18n("Jabber Connection Certificate Problem"),
++ i18n("GroupWise Connection Certificate Problem"),
+ KStdGuiItem::cont(),
+ QString("KopeteTLSWarning") + server + code);
+ }
+@@ -1146,10 +1145,20 @@
+ }
+ else
+ {
+- // delete the contact created optimistically the supplied userid;
+- Kopete::Contact * c = contacts()[ cct->userId() ];
++ // delete the contact created optimistically using the supplied userid;
++ Kopete::Contact * c = contacts()[ protocol()->dnToDotted( cct->userId() ) ];
+ if ( c )
+- delete c;
++ {
++ if ( c->metaContact()->contacts().count() == 1 )
++ Kopete::ContactList::self()->removeMetaContact( c->metaContact() );
++ else
++ delete c;
++ }
++
++ KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget (), KMessageBox::Error,
++ i18n ("The contact %1 could not be added to the contact list, with error message: %2").
++ arg(cct->userId() ).arg( cct->statusString() ),
++ i18n ("Error adding contact") );
+ }
+ }
+
+--- kopete/protocols/groupwise/libgroupwise/task.cpp (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/protocols/groupwise/libgroupwise/task.cpp (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -74,6 +74,7 @@
+ d->autoDelete = false;
+ d->done = false;
+ d->transfer = 0;
++ d->statusCode = 0;
+ }
+
+ Task *Task::parent() const
+--- kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -75,6 +75,7 @@
+ void onGo();
+ protected slots:
+ void slotContactAdded( const ContactItem & );
++ void slotCheckContactInstanceCreated();
+ private:
+ int m_firstSequenceNumber;
+ QString m_userId;
+--- kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -77,6 +77,7 @@
+ // CreateContactInstanceTask signals these changes, so we propagate the signal via the Client, to the GroupWiseAccount
+ // This updates our local versions of those contacts using the same mechanism by which they are updated at login.
+ connect( ccit, SIGNAL( gotContactAdded( const ContactItem & ) ), SLOT( slotContactAdded( const ContactItem & ) ) );
++ connect( ccit, SIGNAL( finished() ), SLOT( slotCheckContactInstanceCreated() ) );
+ if ( (*it).id == 0 ) // caller asserts that this isn't on the server...
+ {
+ ccit->contactFromDNAndFolder( m_userId, m_displayName, m_firstSequenceNumber++, ( *it ).name );
+@@ -92,6 +93,7 @@
+ client()->debug( " - contact is in top level folder " );
+ CreateContactInstanceTask * ccit = new CreateContactInstanceTask( client()->rootTask() );
+ connect( ccit, SIGNAL( gotContactAdded( const ContactItem & ) ), SLOT( slotContactAdded( const ContactItem & ) ) );
++ connect( ccit, SIGNAL( finished() ), SLOT( slotCheckContactInstanceCreated() ) );
+ ccit->contactFromDN( m_userId, m_displayName, 0 );
+ ccit->go( true );
+ }
+@@ -139,5 +141,13 @@
+ setSuccess();
+ }
+ }
++void CreateContactTask::slotCheckContactInstanceCreated()
++{
++ CreateContactInstanceTask * ccit = ( CreateContactInstanceTask * )sender();
++ if ( !ccit->success() )
++ {
++ setError( ccit->statusCode(), ccit->statusString() );
++ }
++}
+
+ #include "createcontacttask.moc"
+--- kopete/protocols/groupwise/libgroupwise/client.cpp (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/protocols/groupwise/libgroupwise/client.cpp (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -68,7 +68,7 @@
+ d->osname = "N/A";
+ d->clientName = "N/A";
+ d->clientVersion = "0.0";
+-
++ d->id_seed = 0xaaaa;
+ d->root = new Task(this, true);
+ d->requestFactory = new RequestFactory;
+ d->userDetailsMgr = new UserDetailsManager( this, "userdetailsmgr" );
+@@ -329,13 +329,10 @@
+ ConferenceEvent transformedEvent = messageEvent;
+ RTF2HTML parser;
+ QString rtf = messageEvent.message;
+- //QRegExp rx( "&(?!amp;)" ); // match ampersands but not & (?! is negative lookahead
+-// QRegExp rx( "(\\u\d+) (\?)"
+-// QString line1 = "This & that";
+-// line1.replace( rx, "&" );
+ if ( !rtf.isEmpty() )
+ transformedEvent.message = parser.Parse( rtf.latin1(), "" );
+-
++ QRegExp rx(" </span> </span> </span><br>$");
++ transformedEvent.message.replace( rx, "</span></span></span>" );
+ emit messageReceived( transformedEvent );
+ }
+
+--- kopete/protocols/oscar/liboscar/ssimodifytask.cpp (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/protocols/oscar/liboscar/ssimodifytask.cpp (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -152,6 +152,8 @@
+
+ bool SSIModifyTask::renameGroup( const QString& oldName, const QString & newName )
+ {
++ return false; //rename group is unimplemented
++
+ m_opType = Rename;
+ m_opSubject = Group;
+ if ( oldName == newName )
+--- kopete/protocols/irc/ircaccount.h (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/protocols/irc/ircaccount.h (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -118,7 +118,8 @@
+ Ignore = 5
+ };
+
+- IRCAccount(IRCProtocol *p, const QString &accountid, const QString &autoConnect = QString::null);
++ IRCAccount(IRCProtocol *p, const QString &accountid, const QString &autoConnect = QString::null,
++ const QString& networkName = QString::null, const QString &nickName = QString::null);
+ ~IRCAccount();
+
+ void setNickName( const QString & );
+--- kopete/protocols/irc/irccontactmanager.cpp (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/protocols/irc/irccontactmanager.cpp (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -46,7 +46,7 @@
+
+ Kopete::MetaContact *m = new Kopete::MetaContact();
+ // m->setTemporary( true );
+- m_myServer = new IRCServerContact(this, account->engine()->currentHost(), m);
++ m_myServer = new IRCServerContact(this, account->networkName(), m);
+
+ QObject::connect(account->engine(), SIGNAL(incomingMessage(const QString &, const QString &, const QString &)),
+ this, SLOT(slotNewMessage(const QString &, const QString &, const QString &)));
+--- kopete/protocols/irc/ircaccount.cpp (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/protocols/irc/ircaccount.cpp (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -93,7 +93,7 @@
+ const QString IRCAccount::CONFIG_USERNAME = QString::fromLatin1("UserName");
+ const QString IRCAccount::CONFIG_REALNAME = QString::fromLatin1("RealName");
+
+-IRCAccount::IRCAccount(IRCProtocol *protocol, const QString &accountId, const QString &autoChan )
++IRCAccount::IRCAccount(IRCProtocol *protocol, const QString &accountId, const QString &autoChan, const QString& netName, const QString &nickName)
+ : Kopete::PasswordedAccount(protocol, accountId, 0, true), autoConnect( autoChan )
+ {
+ m_manager = 0L;
+@@ -146,8 +146,16 @@
+ currentHost = 0;
+
+ KConfigGroup *config = configGroup();
+- QString networkName = config->readEntry(CONFIG_NETWORKNAME);
+- mNickName = config->readEntry(CONFIG_NICKNAME);
++
++ QString networkName = netName;
++ if (networkName.isNull())
++ networkName = config->readEntry(CONFIG_NETWORKNAME);
++
++ if (!nickName.isNull())
++ setNickName(nickName);
++ else
++ mNickName = config->readEntry(CONFIG_NICKNAME);
++
+ QString codecMib = config->readEntry(CONFIG_CODECMIB);
+ // int codecMib = config->readNumEntry(CONFIG_CODECMIB, UTF-8);
+
+--- kopete/protocols/irc/libkirc/kircengine.cpp (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/protocols/irc/libkirc/kircengine.cpp (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -1,10 +1,11 @@
+ /*
+ kirc.cpp - IRC Client
+
++ Copyright (c) 2005 by Tommi Rantala <tommi.rantala at cs.helsinki.fi>
+ Copyright (c) 2003-2004 by Michel Hermier <michel.hermier at wanadoo.fr>
+ Copyright (c) 2002 by Nick Betcher <nbetcher at kde.org>
+
+- Kopete (c) 2002-2004 by the Kopete developers <kopete-devel at kde.org>
++ Kopete (c) 2002-2005 by the Kopete developers <kopete-devel at kde.org>
+
+ *************************************************************************
+ * *
+@@ -108,6 +109,10 @@
+ #ifdef KIRC_SSL_SUPPORT
+ m_sock = new KSSLSocket;
+ m_sock->setSocketFlags( KExtendedSocket::inetSocket );
++
++ connect(m_sock, SIGNAL(certificateAccepted()), SLOT(slotConnected()));
++ connect(m_sock, SIGNAL(certificateRejected()), SLOT(slotConnectionClosed()));
++ connect(m_sock, SIGNAL(sslFailure()), SLOT(slotConnectionClosed()));
+ }
+ else
+ #else
+@@ -118,16 +123,13 @@
+ {
+ m_sock = new KExtendedSocket;
+ m_sock->setSocketFlags( KExtendedSocket::inputBufferedSocket | KExtendedSocket::inetSocket );
++
++ connect(m_sock, SIGNAL(connectionSuccess()), SLOT(slotConnected()));
++ connect(m_sock, SIGNAL(connectionFailed(int)), SLOT(error(int)));
+ }
+
+- QObject::connect(m_sock, SIGNAL(closed(int)),
+- this, SLOT(slotConnectionClosed()));
+- QObject::connect(m_sock, SIGNAL(readyRead()),
+- this, SLOT(slotReadyRead()));
+- QObject::connect(m_sock, SIGNAL(connectionSuccess()),
+- this, SLOT(slotConnected()));
+- QObject::connect(m_sock, SIGNAL(connectionFailed(int)),
+- this, SLOT(error(int)));
++ connect(m_sock, SIGNAL(closed(int)), SLOT(slotConnectionClosed()));
++ connect(m_sock, SIGNAL(readyRead()), SLOT(slotReadyRead()));
+ }
+ }
+
+@@ -459,3 +461,5 @@
+ }
+
+ #include "kircengine.moc"
++
++// vim: set noet ts=4 sts=4 sw=4:
+--- kopete/protocols/irc/libkirc/ksslsocket.cpp (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/protocols/irc/libkirc/ksslsocket.cpp (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -1,9 +1,10 @@
+ /*
+ ksslsocket.cpp - KDE SSL Socket
+
++ Copyright (c) 2005 by Tommi Rantala <tommi.rantala at cs.helsinki.fi>
+ Copyright (c) 2004 by Jason Keirstead <jason at keirstead.org>
+
+- Kopete (c) 2002-2003 by the Kopete developers <kopete-devel at kde.org>
++ Kopete (c) 2002-2005 by the Kopete developers <kopete-devel at kde.org>
+
+ *************************************************************************
+ * *
+@@ -127,51 +128,41 @@
+
+ void KSSLSocket::slotConnected()
+ {
+- if( KSSL::doesSSLWork() )
+- {
+- if( d->kssl )
+- {
+- kdDebug(14120) << k_funcinfo << "ReInitialize SSL connection..." << endl;
+- d->kssl->reInitialize();
+- }
+- else
+- {
+- kdDebug(14120) << k_funcinfo << "Trying SSL connection..." << endl;
++ if (!KSSL::doesSSLWork()) {
++ kdError(14120) << k_funcinfo << "SSL not functional!" << endl;
+
+- d->kssl = new KSSL();
+- if( d->kssl->connect( sockfd ) == 1)
+- {
+- //Disconnect the KExtSocket notifier slot, we use our own
+- QObject::disconnect( readNotifier(), SIGNAL(activated( int )),
+- this, SLOT( socketActivityRead() ) );
+-
+- QObject::connect( readNotifier(), SIGNAL(activated( int )),
+- this, SLOT( slotReadData() ) );
+- }
+- else
+- {
+- delete d->kssl;
+- d->kssl = 0;
+- }
+- }
++ closeNow();
++ emit sslFailure();
++ return;
+ }
+
+- if( d->kssl )
+- {
+- readNotifier()->setEnabled(true);
++ delete d->kssl;
++ d->kssl = new KSSL();
+
+- if( verifyCertificate() != 1 )
+- {
+- closeNow();
+- }
+- }
+- else
+- {
+- kdError(14120) << k_funcinfo << "SSL not functional!" << endl;
++ if (d->kssl->connect( sockfd ) != 1) {
++ kdError(14120) << k_funcinfo << "SSL connect() failed." << endl;
+
++ closeNow();
+ emit sslFailure();
++ return;
++ }
++
++ //Disconnect the KExtSocket notifier slot, we use our own
++ QObject::disconnect( readNotifier(), SIGNAL(activated( int )),
++ this, SLOT(socketActivityRead()) );
++
++ QObject::connect( readNotifier(), SIGNAL(activated( int )),
++ this, SLOT(slotReadData()) );
++
++ readNotifier()->setEnabled(true);
++
++ if (verifyCertificate() != 1) {
+ closeNow();
++ emit certificateRejected();
++ return;
+ }
++
++ emit certificateAccepted();
+ }
+
+ void KSSLSocket::slotDisconnected()
+--- kopete/protocols/irc/libkirc/ksslsocket.h (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/protocols/irc/libkirc/ksslsocket.h (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -5,9 +5,10 @@
+ /*
+ ksslsocket.h - KDE SSL Socket
+
++ Copyright (c) 2005 by Tommi Rantala <tommi.rantala at cs.helsinki.fi>
+ Copyright (c) 2004 by Jason Keirstead <jason at keirstead.org>
+
+- Kopete (c) 2002-2003 by the Kopete developers <kopete-devel at kde.org>
++ Kopete (c) 2002-2005 by the Kopete developers <kopete-devel at kde.org>
+
+ *************************************************************************
+ * *
+@@ -42,6 +43,8 @@
+
+ signals:
+ void sslFailure();
++ void certificateAccepted();
++ void certificateRejected();
+
+ private slots:
+ void slotConnected();
+--- kopete/protocols/irc/ui/channellist.cpp (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/protocols/irc/ui/channellist.cpp (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -226,8 +226,8 @@
+
+ connect( m_engine, SIGNAL( incomingEndOfList() ), this, SLOT( slotListEnd() ) );
+
+- connect( m_engine, SIGNAL( connectedToServer() ), this, SLOT( reset() ) );
+- connect( m_engine, SIGNAL( disconnected() ), this, SLOT( slotDisconnected() ) );
++ connect( m_engine, SIGNAL( statusChanged(KIRC::Engine::Status) ),
++ this, SLOT( slotStatusChanged(KIRC::Engine::Status) ) );
+
+ show();
+ }
+@@ -242,6 +242,28 @@
+ emit channelSelected( i->text(0) );
+ }
+
++void ChannelList::slotStatusChanged(KIRC::Engine::Status newStatus)
++{
++ switch(newStatus) {
++ case KIRC::Engine::Connected:
++ this->reset();
++ break;
++ case KIRC::Engine::Disconnected:
++ if (mSearching) {
++ KMessageBox::queuedMessageBox(
++ this, KMessageBox::Error,
++ i18n("You have been disconnected from the IRC server."),
++ i18n("Disconnected"), 0
++ );
++ }
++
++ slotListEnd();
++ break;
++ default:
++ break;
++ }
++}
++
+ void ChannelList::reset()
+ {
+ channelCache.clear();
+@@ -314,16 +336,6 @@
+ }
+ }
+
+-void ChannelList::slotDisconnected()
+-{
+- KMessageBox::queuedMessageBox(
+- this, KMessageBox::Error, i18n("You have been disconnected from the IRC server."),
+- i18n("Disconnected"), 0
+- );
+-
+- slotListEnd();
+-}
+-
+ void ChannelList::slotListEnd()
+ {
+ mChannelList->setSorting(0, true);
+--- kopete/protocols/irc/ui/irceditaccountwidget.cpp (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/protocols/irc/ui/irceditaccountwidget.cpp (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -230,17 +230,20 @@
+
+ if( !account() )
+ {
+- setAccount( new IRCAccount( mProtocol, generateAccountId(networkName) ) );
++ setAccount( new IRCAccount( mProtocol, generateAccountId(networkName), QString::null, networkName, nickName ) );
+
+ }
++ else
++ {
++ account()->setNickName( nickName );
++ account()->setNetwork( networkName );
++ }
+
+ mPasswordWidget->save( &account()->password() );
+
+- account()->setNickName( nickName );
+ account()->setAltNick( mAltNickname->text() );
+ account()->setUserName( mUserName->text() );
+ account()->setRealName( m_realNameLineEdit->text() );
+- account()->setNetwork( networkName );
+ account()->setDefaultPart( partMessage->text() );
+ account()->setDefaultQuit( quitMessage->text() );
+ account()->setAutoShowServerWindow( autoShowServerWindow->isChecked() );
+--- kopete/protocols/irc/ui/channellist.h (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/protocols/irc/ui/channellist.h (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -22,10 +22,7 @@
+ #include <qmap.h>
+ #include <qpair.h>
+
+-namespace KIRC
+-{
+-class Engine;
+-}
++#include "kircengine.h"
+
+ class QVBoxLayout;
+ class QHBoxLayout;
+@@ -59,8 +56,8 @@
+ void slotItemSelected( QListViewItem * i );
+ void slotChannelListed( const QString & channel, uint users, const QString & topic );
+ void slotListEnd();
+- void slotDisconnected();
+ void slotSearchCache();
++ void slotStatusChanged( KIRC::Engine::Status );
+
+ private:
+ void checkSearchResult( const QString & channel, uint users, const QString & topic );
+--- kopete/protocols/irc/ui/networkconfig.ui (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/protocols/irc/ui/networkconfig.ui (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -170,7 +170,7 @@
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+- <hsizetype>5</hsizetype>
++ <hsizetype>1</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+@@ -186,7 +186,7 @@
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+- <hsizetype>5</hsizetype>
++ <hsizetype>1</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+@@ -370,9 +370,6 @@
+ <tabstop>saveButton</tabstop>
+ <tabstop>cancelButton</tabstop>
+ </tabstops>
+-<includes>
+- <include location="local" impldecl="in implementation">networkconfig.ui.h</include>
+-</includes>
+ <signals>
+ <signal>accepted()</signal>
+ <signal>rejected()</signal>
+--- kopete/kopete/eventsrc (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/kopete/eventsrc (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -491,6 +491,7 @@
+ Name[ar]=تمييز
+ Name[be]=Падсьветка
+ Name[bg]=Открояване
++Name[br]=Splannadur
+ Name[bs]=Isticanje
+ Name[ca]=Ressaltat
+ Name[cs]=Zvýraznění
+@@ -693,6 +694,7 @@
+ Name[zh_CN]=Yahoo 邮件
+ Comment=New email has arrived in your Yahoo inbox
+ Comment[bg]=Пристигна нова поща в Yahoo
++Comment[br]=Deuet eo ur postel nevez d'em voest degemer Yahoo
+ Comment[bs]=Stigla je nova pošta u vaš Yahoo sandučić
+ Comment[ca]=Ha arribat un nou correu a la vostra bústia de Yahoo
+ Comment[cs]=Přišla nová pošta do vaší Yahoo schránky
+@@ -772,6 +774,7 @@
+ Name[zh_CN]=MSN 邮件
+ Comment=New email has arrived in your MSN inbox
+ Comment[bg]=Пристигна нова поща в MSN
++Comment[br]=Deuet eo ur postel nevez d'em voest degemer MSN
+ Comment[bs]=Stigla je nova pošta u vaš MSN sandučić
+ Comment[ca]=Ha arribat un nou correu a la vostra bústia de MSN
+ Comment[cs]=Přišla nová pošta do vaší MSN schránky
+--- kopete/libkopete/kopetepluginmanager.cpp (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/libkopete/kopetepluginmanager.cpp (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -257,32 +257,46 @@
+ // FIXME: We need session management here - Martijn
+
+ KConfig *config = KGlobal::config();
+- QMap<QString, QString> entries = config->entryMap( QString::fromLatin1( "Plugins" ) );
+- QMap<QString, QString>::Iterator it;
+- for ( it = entries.begin(); it != entries.end(); ++it )
++ if ( config->hasGroup( QString::fromLatin1( "Plugins" ) ) )
+ {
+- QString key = it.key();
+- if ( key.endsWith( QString::fromLatin1( "Enabled" ) ) )
++ QMap<QString, QString> entries = config->entryMap( QString::fromLatin1( "Plugins" ) );
++ QMap<QString, QString>::Iterator it;
++ for ( it = entries.begin(); it != entries.end(); ++it )
+ {
+- key.setLength( key.length() - 7 );
+- //kdDebug(14010) << k_funcinfo << "Set " << key << " to " << it.data() << endl;
+-
+- if ( it.data() == QString::fromLatin1( "true" ) )
++ QString key = it.key();
++ if ( key.endsWith( QString::fromLatin1( "Enabled" ) ) )
+ {
+- if ( !plugin( key ) )
+- d->pluginsToLoad.push( key );
++ key.setLength( key.length() - 7 );
++ //kdDebug(14010) << k_funcinfo << "Set " << key << " to " << it.data() << endl;
++
++ if ( it.data() == QString::fromLatin1( "true" ) )
++ {
++ if ( !plugin( key ) )
++ d->pluginsToLoad.push( key );
++ }
++ else
++ {
++ //This happens if the user unloaded plugins with the config plugin page.
++ // No real need to be assync because the user usualy unload few plugins
++ // compared tto the number of plugin to load in a cold start. - Olivier
++ if ( plugin( key ) )
++ unloadPlugin( key );
++ }
+ }
+- else
+- {
+- //This happens if the user unloaded plugins with the config plugin page.
+- // No real need to be assync because the user usualy unload few plugins
+- // compared tto the number of plugin to load in a cold start. - Olivier
+- if ( plugin( key ) )
+- unloadPlugin( key );
+- }
+ }
+ }
+-
++ else
++ {
++ // we had no config, so we load any plugins that should be loaded by default.
++ QValueList<KPluginInfo *> plugins = availablePlugins( QString::null );
++ QValueList<KPluginInfo *>::ConstIterator it = plugins.begin();
++ QValueList<KPluginInfo *>::ConstIterator end = plugins.end();
++ for ( ; it != end; ++it )
++ {
++ if ( (*it)->isPluginEnabledByDefault() )
++ d->pluginsToLoad.push( (*it)->pluginName() );
++ }
++ }
+ // Schedule the plugins to load
+ QTimer::singleShot( 0, this, SLOT( slotLoadNextPlugin() ) );
+ }
+--- kopete/libkopete/kopetemessage.cpp (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kopete/libkopete/kopetemessage.cpp (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -674,6 +674,7 @@
+ return doc;
+ }
+
++// KDE4: Move that to a utils class/namespace
+ QString Message::decodeString( const QCString &message, const QTextCodec *providedCodec, bool *success )
+ {
+ /*
+@@ -694,7 +695,7 @@
+ charsToCheck = 128 > charsToCheck ? charsToCheck : 128;
+
+ //They are providing a possible codec. Check if it is valid
+- if( providedCodec && providedCodec->heuristicContentMatch( message, charsToCheck ) >= charsToCheck )
++ if( providedCodec && providedCodec->heuristicContentMatch( message, charsToCheck ) >= 0 )
+ {
+ //All chars decodable.
+ return providedCodec->toUnicode( message );
+@@ -709,7 +710,7 @@
+
+ //Try codecForContent - exact match
+ QTextCodec *testCodec = QTextCodec::codecForContent(message, charsToCheck);
+- if( testCodec && testCodec->heuristicContentMatch( message, charsToCheck ) >= charsToCheck )
++ if( testCodec && testCodec->heuristicContentMatch( message, charsToCheck ) >= 0 )
+ {
+ //All chars decodable.
+ return testCodec->toUnicode( message );
+@@ -723,7 +724,7 @@
+
+ //Try local codec
+ testCodec = QTextCodec::codecForLocale();
+- if( testCodec && testCodec->heuristicContentMatch( message, charsToCheck ) >= charsToCheck )
++ if( testCodec && testCodec->heuristicContentMatch( message, charsToCheck ) >= 0 )
+ {
+ //All chars decodable.
+ kdDebug(14000) << k_funcinfo << "Using locale's codec" << endl;
+@@ -732,7 +733,7 @@
+
+ //Try latin1 codec
+ testCodec = QTextCodec::codecForMib(4);
+- if( testCodec && testCodec->heuristicContentMatch( message, charsToCheck ) >= charsToCheck )
++ if( testCodec && testCodec->heuristicContentMatch( message, charsToCheck ) >= 0 )
+ {
+ //All chars decodable.
+ kdDebug(14000) << k_funcinfo << "Using latin1" << endl;
+--- knewsticker/eventsrc (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ knewsticker/eventsrc (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -198,7 +198,7 @@
+ Name[cy]=Ffeil RDF annilys
+ Name[da]=Ugyldig RDF-fil
+ Name[de]=Ungültige RDF-Datei
+-Name[el]=Άκυρο αρχείο RDF
++Name[el]=Μη έγκυρο αρχείο RDF
+ Name[eo]=Nevalida RDF-dosierojn
+ Name[es]=Archivo RDF no válido
+ Name[et]=Vigane RDF-fail
+--- kget/dlgIndividual.cpp (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ kget/dlgIndividual.cpp (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -196,7 +196,7 @@
+ advanced = ksettings.b_advancedIndividual;
+ slotToggleAdvanced();
+
+- resize( sizeHint() );
++ resize( minimumSizeHint() );
+
+ //bool keepOpenChecked = false;
+ //bool noCaptionYet = true;
+--- wifi/kcmwifi/kcmwifi.desktop (.../tags/KDE/3.4.2/kdenetwork) (revision 455059)
++++ wifi/kcmwifi/kcmwifi.desktop (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -9,7 +9,7 @@
+ Name=Wireless Network
+ Name[ar]=شبكة لاسلكية
+ Name[bg]=Безжична мрежа
+-Name[br]=Roueded hep neud
++Name[br]=Rouedad hep neud
+ Name[bs]=Bežična mreža
+ Name[ca]=Xarxa sense fils
+ Name[cs]=Bezdrátová síť
+--- Makefile.cvs (.../tags/KDE/3.4.2/kdenetwork) (revision 0)
++++ Makefile.cvs (.../branches/KDE/3.4/kdenetwork) (revision 455059)
+@@ -0,0 +1,16 @@
++
++all:
++ @echo "This Makefile is only for the CVS repository"
++ @echo "This will be deleted before making the distribution"
++ @echo ""
++ @if test ! -d admin; then \
++ echo "Please recheckout this module!" ;\
++ echo "for cvs: use checkout once and after that update again" ;\
++ echo "for cvsup: checkout kde-common from cvsup and" ;\
++ echo " link kde-common/admin to ./admin" ;\
++ exit 1 ;\
++ fi
++ $(MAKE) -f admin/Makefile.common cvs
++
++.SILENT:
++
More information about the Pkg-kde-commits
mailing list