Author: arekm Date: Wed Jan 20 08:51:57 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- up to 4.3.95
---- Files affected:
packages/kde4-kdenetwork:
kde4-kdenetwork-branch.diff (1.5 -> 1.6) , kde4-kdenetwork.spec (1.77.2.11
-> 1.77.2.12)
---- Diffs:
================================================================
Index: packages/kde4-kdenetwork/kde4-kdenetwork-branch.diff
diff -u packages/kde4-kdenetwork/kde4-kdenetwork-branch.diff:1.5
packages/kde4-kdenetwork/kde4-kdenetwork-branch.diff:1.6
--- packages/kde4-kdenetwork/kde4-kdenetwork-branch.diff:1.5 Wed Nov 25
11:04:44 2009
+++ packages/kde4-kdenetwork/kde4-kdenetwork-branch.diff Wed Jan 20
09:51:52 2010
@@ -1,1454 +1,250 @@
-Index: krdc/mainwindow.cpp
+Index: krdc/rdp/rdpview.cpp
===================================================================
---- krdc/mainwindow.cpp (.../tags/KDE/4.3.3/kdenetwork) (wersja 1053997)
-+++ krdc/mainwindow.cpp (.../branches/KDE/4.3/kdenetwork) (wersja
1053997)
-@@ -635,6 +635,9 @@
- Settings::setShowStartPage(false);
- m_tabWidget->removeTab(0);
- m_showStartPage = false;
-+ // HACK : call tabChanged since when the start page is closed and
it's called, m_showStartPage is still true
-+ // which lead to a crash if the user click on any button like "grab
all keys"
-+ tabChanged(m_tabWidget->currentIndex());
- updateActionStatus();
- return;
- }
-Index: kopete/plugins/webpresence/kopete_webpresence.desktop
-===================================================================
---- kopete/plugins/webpresence/kopete_webpresence.desktop
(.../tags/KDE/4.3.3/kdenetwork) (wersja 1053997)
-+++ kopete/plugins/webpresence/kopete_webpresence.desktop
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -60,8 +60,8 @@
- Comment[ru]=Отображает состояние вашего списка контактов (или его части) на
странице в Сети
- Comment[sk]=Zobrazenie stavu (časti) zo zoznamu kontaktov na webovej stránke
- Comment[sl]=Pokaže stanje (dela) vašega seznama stikov na spletni strani
--Comment[sr]=Приказивање стања (делова) вашег списка контаката на веб страници
--comment...@latin]=prikazivanje stanja (delova) vašeg spiska kontakata na veb
stranici
-+Comment[sr]=Приказивање стања (делова) ваше листе контаката на веб страници
-+comment...@latin]=prikazivanje stanja (delova) vaše liste kontakata na veb
stranici
- Comment[sv]=Visa status för (delar av) din kontaktlista på en webbsida
- Comment[ta]=இணைய பக்கத்தில் உங்கள் தொடர்பாளரின் நிலைப்பட்டியலை காட்டு
- Comment[tg]=Ҳолати (қисме аз) рӯйхати пайвастшавии шуморо дар саҳифаи шабака
нишон медиҳад
-Index: kopete/plugins/webpresence/kopete_webpresence_config.desktop
-===================================================================
---- kopete/plugins/webpresence/kopete_webpresence_config.desktop
(.../tags/KDE/4.3.3/kdenetwork) (wersja 1053997)
-+++ kopete/plugins/webpresence/kopete_webpresence_config.desktop
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -54,8 +54,8 @@
- Comment[ru]=Отображает состояние вашего списка контактов (или его части) на
странице в Сети
- Comment[sk]=Zobrazenie stavu (časti) zo zoznamu kontaktov na webovej stránke
- Comment[sl]=Pokaže stanje (dela) vašega seznama stikov na spletni strani
--Comment[sr]=Приказивање стања (делова) вашег списка контаката на веб страници
--comment...@latin]=prikazivanje stanja (delova) vašeg spiska kontakata na veb
stranici
-+Comment[sr]=Приказивање стања (делова) ваше листе контаката на веб страници
-+comment...@latin]=prikazivanje stanja (delova) vaše liste kontakata na veb
stranici
- Comment[sv]=Visa status för (delar av) din kontaktlista på en webbsida
- Comment[ta]=இணைய பக்கத்தில் உங்கள் தொடர்பாளரின் நிலைப்பட்டியலை காட்டு
- Comment[tg]=Ҳолати (қисме аз) рӯйхати пайвастшавии шуморо дар саҳифаи шабака
нишон медиҳад
-Index: kopete/protocols/wlm/wlmtransfermanager.cpp
-===================================================================
---- kopete/protocols/wlm/wlmtransfermanager.cpp
(.../tags/KDE/4.3.3/kdenetwork) (wersja 1053997)
-+++ kopete/protocols/wlm/wlmtransfermanager.cpp
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -18,6 +18,7 @@
- #include "wlmcontact.h"
- #include "kopetecontact.h"
- #include "kopeteuiglobal.h"
-+#include "kopetetransfermanager.h"
-
- #include <QObject>
- #include <kmessagebox.h>
-Index: kopete/protocols/wlm/wlmchatsession.cpp
-===================================================================
---- kopete/protocols/wlm/wlmchatsession.cpp (.../tags/KDE/4.3.3/kdenetwork)
(wersja 1053997)
-+++ kopete/protocols/wlm/wlmchatsession.cpp
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -55,6 +55,7 @@
- #include "kopeteview.h"
- #include "kopeteutils.h"
- #include "private/kopeteemoticons.h"
-+#include "kopetetransfermanager.h"
-
- #include "wlmcontact.h"
- #include "wlmprotocol.h"
-Index: kopete/protocols/wlm/wlmtransfermanager.h
-===================================================================
---- kopete/protocols/wlm/wlmtransfermanager.h (.../tags/KDE/4.3.3/kdenetwork)
(wersja 1053997)
-+++ kopete/protocols/wlm/wlmtransfermanager.h
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -18,11 +18,16 @@
- #define WLMTRANSFERMANAGER_H
-
- #include <QObject>
--#include "kopetetransfermanager.h"
-
- #include "wlmaccount.h"
- #include <msn/msn.h>
-
-+namespace Kopete
-+{
-+ class Transfer;
-+ class FileTransferInfo;
-+}
-+
- class WlmTransferManager:public QObject
- {
- Q_OBJECT
-Index: kopete/protocols/wlm/wlmaccount.h
-===================================================================
---- kopete/protocols/wlm/wlmaccount.h (.../tags/KDE/4.3.3/kdenetwork) (wersja
1053997)
-+++ kopete/protocols/wlm/wlmaccount.h (.../branches/KDE/4.3/kdenetwork)
(wersja 1053997)
-@@ -24,7 +24,6 @@
- #include "wlmchatsession.h"
- #include "wlmtransfermanager.h"
- #include "wlmchatmanager.h"
--#include "kopetetransfermanager.h"
-
- class KActionMenu;
- namespace Kopete
-Index: kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp
-===================================================================
---- kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp
(.../tags/KDE/4.3.3/kdenetwork) (wersja 1053997)
-+++ kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -135,6 +135,7 @@
-
- // reset connector
- if(d->bs) {
-+ disconnect(d->bs, 0, this, 0);
- d->bs->close();
- d->bs = 0;
- }
-@@ -296,6 +297,9 @@
-
- void ClientStream::cp_outgoingData( const QByteArray& outgoingBytes )
- {
-+ if ( !d->bs )
-+ return;
-+
- // take formatted bytes from CoreProtocol and put them on the wire
- kDebug(YAHOO_RAW_DEBUG) << "[data size: " << outgoingBytes.size() <<
"]";
- //cs_dump( outgoingBytes );
-Index: kopete/protocols/jabber/jabberprotocol.cpp
-===================================================================
---- kopete/protocols/jabber/jabberprotocol.cpp (.../tags/KDE/4.3.3/kdenetwork)
(wersja 1053997)
-+++ kopete/protocols/jabber/jabberprotocol.cpp
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -65,7 +65,7 @@
- JabberKOSChatty(Kopete::OnlineStatus::Online, 100, this,
JabberFreeForChat, QStringList("jabber_chatty"), i18n ("Free for Chat"), i18n
("Free for Chat"), Kopete::OnlineStatusManager::FreeForChat,
Kopete::OnlineStatusManager::HasStatusMessage ),
- JabberKOSOnline(Kopete::OnlineStatus::Online, 90, this,
JabberOnline, QStringList(), i18n ("Online"), i18n ("Online"),
Kopete::OnlineStatusManager::Online,
Kopete::OnlineStatusManager::HasStatusMessage ),
- JabberKOSAway(Kopete::OnlineStatus::Away, 80, this,
JabberAway, QStringList("contact_away_overlay"), i18n ("Away"), i18n ("Away"),
Kopete::OnlineStatusManager::Away,
Kopete::OnlineStatusManager::HasStatusMessage),
-- JabberKOSXA(Kopete::OnlineStatus::Away, 70, this,
JabberXA, QStringList("contact_xa_overlay"), i18n ("Extended Away"), i18n
("Extended Away"), 0, Kopete::OnlineStatusManager::HasStatusMessage),
-+ JabberKOSXA(Kopete::OnlineStatus::Away, 70, this,
JabberXA, QStringList("contact_xa_overlay"), i18n ("Extended Away"), i18n
("Extended Away"), Kopete::OnlineStatusManager::ExtendedAway,
Kopete::OnlineStatusManager::HasStatusMessage),
- JabberKOSDND(Kopete::OnlineStatus::Away, 60, this,
JabberDND, QStringList("contact_busy_overlay"), i18n ("Do not Disturb"), i18n
("Do not Disturb"), Kopete::OnlineStatusManager::Busy,
Kopete::OnlineStatusManager::HasStatusMessage),
- JabberKOSOffline(Kopete::OnlineStatus::Offline, 50, this,
JabberOffline, QStringList(), i18n ("Offline") ,i18n ("Offline"),
Kopete::OnlineStatusManager::Offline,
Kopete::OnlineStatusManager::HasStatusMessage ),
- JabberKOSInvisible(Kopete::OnlineStatus::Invisible, 40, this,
JabberInvisible, QStringList("contact_invisible_overlay"), i18n ("Invisible")
,i18n ("Invisible"), Kopete::OnlineStatusManager::Invisible),
-@@ -250,6 +250,7 @@
- }
- else
- {
-+ status = JabberKOSOnline; // Assume that contact is
online bug 210558
- kDebug (JABBER_DEBUG_GLOBAL) << "Unknown status <show>"
<< resource.status ().show () << "</show> for contact. One of your contact is
probably using a broken client, ask him to report a bug";
- }
- }
-Index: kopete/protocols/oscar/liboscar/client.cpp
-===================================================================
---- kopete/protocols/oscar/liboscar/client.cpp (.../tags/KDE/4.3.3/kdenetwork)
(wersja 1053997)
-+++ kopete/protocols/oscar/liboscar/client.cpp
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -353,7 +353,8 @@
- }
-
- ProfileTask* pt = new ProfileTask( c->rootTask() );
-- pt->setAwayMessage( msg );
-+ if ( !d->isIcq ) // Don't break EA, DND... for ICQ
-+ pt->setAwayMessage( msg );
-
- if ( d->isIcq && xtrazChanged )
- pt->setXtrazStatus( xtraz );
-Index: kopete/protocols/oscar/icq/icqcontact.cpp
-===================================================================
---- kopete/protocols/oscar/icq/icqcontact.cpp (.../tags/KDE/4.3.3/kdenetwork)
(wersja 1053997)
-+++ kopete/protocols/oscar/icq/icqcontact.cpp
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -628,6 +628,13 @@
-
- void ICQContact::slotUserInfo()
- {
-+ if ( m_infoWidget )
-+ {
-+ m_infoWidget->showNormal();
-+ m_infoWidget->activateWindow();
-+ return;
-+ }
-+
- m_infoWidget = new ICQUserInfoWidget( this,
Kopete::UI::Global::mainWidget() );
- QObject::connect( m_infoWidget, SIGNAL(finished()), this,
SLOT(closeUserInfoDialog()) );
- QObject::connect( m_infoWidget, SIGNAL(okClicked()), this,
SLOT(storeUserInfoDialog()) );
-Index: kopete/protocols/oscar/oscaraccount.cpp
-===================================================================
---- kopete/protocols/oscar/oscaraccount.cpp (.../tags/KDE/4.3.3/kdenetwork)
(wersja 1053997)
-+++ kopete/protocols/oscar/oscaraccount.cpp
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -1260,6 +1260,7 @@
- accountId(), acctType) ;
- }
- break;
-+ case 0x001B:
- case 0x001C:
- OscarVersionUpdater::self()->update( d->versionUpdaterStamp );
- if ( !d->versionAlreadyUpdated )
-Index: kopete/protocols/irc/irctransferhandler.h
-===================================================================
---- kopete/protocols/irc/irctransferhandler.h (.../tags/KDE/4.3.3/kdenetwork)
(wersja 1053997)
-+++ kopete/protocols/irc/irctransferhandler.h
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -18,11 +18,10 @@
- #ifndef IRCTRANSFERHANDLER_H
- #define IRCTRANSFERHANDLER_H
-
--#include <kopetetransfermanager.h>
--
- namespace Kopete
- {
- class Transfer;
-+ class FileTransferInfo;
- }
-
- namespace KIRC
-Index: kopete/kopete/contactlist/kopetelviprops.cpp
-===================================================================
---- kopete/kopete/contactlist/kopetelviprops.cpp
(.../tags/KDE/4.3.3/kdenetwork) (wersja 1053997)
-+++ kopete/kopete/contactlist/kopetelviprops.cpp
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -439,16 +439,12 @@
-
- Kopete::Contact* KopeteMetaLVIProps::selectedNameSourceContact() const
- {
-- Kopete::Contact *c= mMetaContact->contacts().at(
ui_mainWidget->cmbAccountName->currentIndex() );
-- return c ? c : 0L;
-+ return mMetaContact->contacts().value(
ui_mainWidget->cmbAccountName->currentIndex(), 0 );
- }
-
- Kopete::Contact* KopeteMetaLVIProps::selectedPhotoSourceContact() const
- {
-- if (m_withPhotoContacts.isEmpty())
-- return 0L;
-- Kopete::Contact *c =
m_withPhotoContacts[ui_mainWidget->cmbAccountPhoto->currentIndex() ];
-- return c ? c : 0L;
-+ return m_withPhotoContacts.value(
ui_mainWidget->cmbAccountPhoto->currentIndex(), 0 );
- }
-
- void KopeteMetaLVIProps::slotOkClicked()
-Index: kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
-===================================================================
---- kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
(.../tags/KDE/4.3.3/kdenetwork) (wersja 1053997)
-+++ kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -47,8 +47,8 @@
- Name[ro]=Listă de contacte
- Name[ru]=Список контактов
- Name[sl]=Seznam stikov
--Name[sr]=Списак контаката
--name...@latin]=spisak kontakata
-+Name[sr]=Листа контаката
-+name...@latin]=lista kontakata
- Name[sv]=Kontaktlista
- Name[tr]=Kişi Listesi
- Name[uk]=Список контактів
-@@ -92,8 +92,8 @@
- Comment[ro]=Configurați aspectul și comportamentul listei de contacte
- Comment[ru]=Настройка внешнего вида списка контактов
- Comment[sl]=Nastavite seznam stikov ter izgled in občutek
--Comment[sr]=Подесите изглед списка контаката
--comment...@latin]=podesite izgled spiska kontakata
-+Comment[sr]=Подесите изглед листе контаката
-+comment...@latin]=podesite izgled liste kontakata
- Comment[sv]=Anpassa kontaktlistans känsla och utseende
- Comment[tr]=Kişi Listesinin Görünümünü Yapılandır
- Comment[uk]=Налаштувати вигляд і поведінку списку контактів
-Index: kopete/kopete/config/plugins/kopete_pluginconfig.desktop
-===================================================================
---- kopete/kopete/config/plugins/kopete_pluginconfig.desktop
(.../tags/KDE/4.3.3/kdenetwork) (wersja 1053997)
-+++ kopete/kopete/config/plugins/kopete_pluginconfig.desktop
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -59,7 +59,7 @@
- name...@latin]=priključci
- Name[sv]=Insticksprogram
- Name[tr]=Eklentiler
--Name[uk]=Втулки
-+Name[uk]=Додатки
- Name[vi]=Phần bổ sung
- Name[x-test]=xxPluginsxx
- Name[zh_CN]=插件
-@@ -106,7 +106,7 @@
- comment...@latin]=izaberite i podesite priključke
- Comment[sv]=Välj och anpassa insticksprogram
- Comment[tr]=Eklentileri Seç ve Yapılandır
--Comment[uk]=Вибрати і налаштувати втулки
-+Comment[uk]=Вибрати і налаштувати додатки
- Comment[x-test]=xxSelect and Configure Pluginsxx
- Comment[zh_CN]=选择并配置插件
- Comment[zh_TW]=選擇與設定外掛程式
-Index: kopete/kopete/config/chatwindow/chatwindowconfig.h
-===================================================================
---- kopete/kopete/config/chatwindow/chatwindowconfig.h
(.../tags/KDE/4.3.3/kdenetwork) (wersja 1053997)
-+++ kopete/kopete/config/chatwindow/chatwindowconfig.h
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -20,6 +20,8 @@
- #ifndef CHATWINCONF_H
- #define CHATWINCONF_H
-
-+#include <QtCore/QPointer>
-+
- #define KDE3_SUPPORT
- #include <kcmodule.h>
- #undef KDE3_SUPPORT
-@@ -78,7 +80,7 @@
- ChatMessagePart *m_preview;
-
- ChatWindowStyle::StyleVariants m_currentVariantMap;
-- ChatWindowStyle *m_currentStyle;
-+ QPointer<ChatWindowStyle> m_currentStyle;
- bool m_loading;
- bool m_allowDownloadTheme;
- // For style preview
-Index: kopete/kopete/config/chatwindow/chatwindowconfig.cpp
-===================================================================
---- kopete/kopete/config/chatwindow/chatwindowconfig.cpp
(.../tags/KDE/4.3.3/kdenetwork) (wersja 1053997)
-+++ kopete/kopete/config/chatwindow/chatwindowconfig.cpp
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -471,6 +471,7 @@
- {
- KMessageBox::queuedMessageBox(this, KMessageBox::Sorry,
i18nc("@info", "An error occurred while trying to delete the
<resource>%1</resource> Chat Window Style. Your account might not have
permission to remove it.", styleName));
- }
-+ slotUpdateChatPreview();
- }
-
- void ChatWindowConfig::slotGetChatStyles()
-Index: kopete/kopete/chatwindow/kopetechatwindowstyle.cpp
-===================================================================
---- kopete/kopete/chatwindow/kopetechatwindowstyle.cpp
(.../tags/KDE/4.3.3/kdenetwork) (wersja 1053997)
-+++ kopete/kopete/chatwindow/kopetechatwindowstyle.cpp
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -57,13 +57,13 @@
- };
-
- ChatWindowStyle::ChatWindowStyle(const QString &styleName, StyleBuildMode
styleBuildMode)
-- : d(new Private)
-+ : QObject(), d(new Private)
- {
- init(styleName, styleBuildMode);
- }
-
- ChatWindowStyle::ChatWindowStyle(const QString &styleName, const QString
&variantPath, StyleBuildMode styleBuildMode)
-- : d(new Private)
-+ : QObject(), d(new Private)
- {
- d->currentVariantPath = variantPath;
- init(styleName, styleBuildMode);
-Index: kopete/kopete/chatwindow/kopetechatwindowstyle.h
-===================================================================
---- kopete/kopete/chatwindow/kopetechatwindowstyle.h
(.../tags/KDE/4.3.3/kdenetwork) (wersja 1053997)
-+++ kopete/kopete/chatwindow/kopetechatwindowstyle.h
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -27,7 +27,7 @@
- *
- * @author Michaël Larouche <larou...@kde.org>
- */
--class KOPETECHATWINDOW_SHARED_EXPORT ChatWindowStyle
-+class KOPETECHATWINDOW_SHARED_EXPORT ChatWindowStyle : public QObject
- {
- public:
- /**
-Index: kopete/kopete/chatwindow/chatview.cpp
-===================================================================
---- kopete/kopete/chatwindow/chatview.cpp (.../tags/KDE/4.3.3/kdenetwork)
(wersja 1053997)
-+++ kopete/kopete/chatwindow/chatview.cpp
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -533,18 +533,20 @@
- this, SLOT( slotPropertyChanged( Kopete::PropertyContainer *,
const QString &, const QVariant &, const QVariant & ) ) ) ;
- }
-
-- QString contactName = m_messagePart->formatName(contact, Qt::PlainText);
-- if( !suppress && m_manager->members().count() > 1 )
-+ if( !suppress && m_manager->members().count() > 1 ) {
-+ QString contactName = m_messagePart->formatName(contact,
Qt::PlainText);
- sendInternalMessage( i18n("%1 has joined the chat.",
contactName) );
-+ }
-
- if ( m_manager->members().count() == 1 )
-+ {
- connect( m_manager->members().first(),
SIGNAL(canAcceptFilesChanged()), this, SIGNAL(canAcceptFilesChanged()) );
-+ updateChatState();
-+ emit updateStatusIcon( this );
-+ emit canAcceptFilesChanged();
-+ }
- else
- disconnect( m_manager->members().first(),
SIGNAL(canAcceptFilesChanged()), this, SIGNAL(canAcceptFilesChanged()) );
--
-- updateChatState();
-- emit updateStatusIcon( this );
-- emit canAcceptFilesChanged();
- }
-
- void ChatView::slotContactRemoved( const Kopete::Contact *contact, const
QString &reason, Qt::TextFormat format, bool suppressNotification )
-Index: kopete/kopete/chatwindow/chatmessagepart.cpp
-===================================================================
---- kopete/kopete/chatwindow/chatmessagepart.cpp
(.../tags/KDE/4.3.3/kdenetwork) (wersja 1053997)
-+++ kopete/kopete/chatwindow/chatmessagepart.cpp
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -133,8 +133,7 @@
- KAction *closeAction;
- KAction *copyURLAction;
-
-- // We can't use QPointer because ChatWindowStyle is not a QObject
-- ChatWindowStyle *currentChatStyle;
-+ ChatWindowStyle* currentChatStyle;
- QPointer<Kopete::Contact> latestContact;
- Kopete::Message::MessageDirection latestDirection;
- Kopete::Message::MessageType latestType;
-@@ -210,8 +209,9 @@
- {
- d->manager = mgr;
-
-- d->currentChatStyle =
ChatWindowStyleManager::self()->getValidStyleFromPool(
-- KopeteChatWindowSettings::self()->styleName() );
-+ d->currentChatStyle =
ChatWindowStyleManager::self()->getValidStyleFromPool(
KopeteChatWindowSettings::self()->styleName() );
-+ if (d->currentChatStyle)
-+ connect( d->currentChatStyle, SIGNAL(destroyed(QObject*)),
this, SLOT(clearStyle()) );
-
- connect( this, SIGNAL(completed()), this, SLOT(slotRenderingFinished())
);
-
-@@ -406,23 +406,29 @@
- void ChatMessagePart::setStyle( const QString &styleName )
- {
- // Create a new ChatWindowStyle
-- d->currentChatStyle =
ChatWindowStyleManager::self()->getValidStyleFromPool(styleName);
--
-- // Do the actual style switch
-- // Wait for the event loop before switching the style
-- QTimer::singleShot( 0, this, SLOT(changeStyle()) );
-+ setStyle(
ChatWindowStyleManager::self()->getValidStyleFromPool(styleName) );
- }
-
- void ChatMessagePart::setStyle( ChatWindowStyle *style )
- {
- // Change the current style
-+ if (d->currentChatStyle)
-+ disconnect( d->currentChatStyle, SIGNAL(destroyed(QObject*)),
this, SLOT(clearStyle()) );
-+
- d->currentChatStyle = style;
-+ if (d->currentChatStyle)
-+ connect( d->currentChatStyle, SIGNAL(destroyed(QObject*)),
this, SLOT(clearStyle()) );
-
- // Do the actual style switch
- // Wait for the event loop before switching the style
- QTimer::singleShot( 0, this, SLOT(changeStyle()) );
- }
-
-+void ChatMessagePart::clearStyle()
-+{
-+ setStyle( QString() );
-+}
-+
- void ChatMessagePart::setStyleVariant( const QString &variantPath )
- {
- DOM::HTMLElement variantNode = document().getElementById(
QString("mainStyle") );
-Index: kopete/kopete/chatwindow/kopetechatwindow.cpp
-===================================================================
---- kopete/kopete/chatwindow/kopetechatwindow.cpp
(.../tags/KDE/4.3.3/kdenetwork) (wersja 1053997)
-+++ kopete/kopete/chatwindow/kopetechatwindow.cpp
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -351,6 +351,9 @@
-
- void KopeteChatWindow::updateSendKeySequence()
- {
-+ if ( !sendMessage || !m_activeView )
-+ return;
-+
- m_activeView->editPart()->textEdit()->setSendKeySequence(
sendMessage->shortcut() );
- }
-
-@@ -363,6 +366,8 @@
- chatSend = new KAction( KIcon("mail-send"), i18n( "&Send Message" ),
coll );
- //Recuperate the qAction for later
- sendMessage = coll->addAction( "chat_send", chatSend );
-+ //Set up change signal in case the user changer the shortcut later
-+ connect( sendMessage, SIGNAL(changed()), SLOT(updateSendKeySequence())
);
-
- connect( chatSend, SIGNAL( triggered(bool) ), SLOT( slotSendMessage() )
);
- //Default to 'Return' and 'Enter' for sending messages
-@@ -981,9 +986,7 @@
- updateActions();
- slotUpdateSendEnabled();
- m_activeView->loadChatSettings();
-- m_activeView->editPart()->textEdit()->setSendKeySequence(
sendMessage->shortcut() );
-- //Set up change signal in case the user changer the shortcut later
-- connect( sendMessage, SIGNAL(changed()), SLOT(updateSendKeySequence())
);
-+ updateSendKeySequence();
-
- emit chatSessionChanged(m_activeView->msgManager());
- }
-Index: kopete/kopete/chatwindow/chatmessagepart.h
-===================================================================
---- kopete/kopete/chatwindow/chatmessagepart.h (.../tags/KDE/4.3.3/kdenetwork)
(wersja 1053997)
-+++ kopete/kopete/chatwindow/chatmessagepart.h
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -181,6 +181,11 @@
- void changeStyle();
-
- /**
-+ * Clears style when style is deleted.
-+ */
-+ void clearStyle();
-+
-+ /**
- * Update the display in the header template if any.
- */
- void slotUpdateHeaderDisplayName();
-Index: kopete/kopete/chatwindow/chattexteditpart.cpp
-===================================================================
---- kopete/kopete/chatwindow/chattexteditpart.cpp
(.../tags/KDE/4.3.3/kdenetwork) (wersja 1053997)
-+++ kopete/kopete/chatwindow/chattexteditpart.cpp
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -210,8 +210,7 @@
- connect( contact, SIGNAL( propertyChanged( Kopete::PropertyContainer *,
const QString &, const QVariant &, const QVariant & ) ),
- this, SLOT( slotPropertyChanged( Kopete::PropertyContainer *,
const QString &, const QVariant &, const QVariant & ) ) ) ;
-
-- QString contactName =
contact->property(Kopete::Global::Properties::self()->nickName()).value().toString();
-- mComplete->addItem( contactName );
-+ mComplete->addItem( contact->nickName() );
- }
-
- void ChatTextEditPart::slotContactRemoved( const Kopete::Contact *contact )
-Index: kopete/doc/t1/kopete_tutorialplugin.desktop
-===================================================================
---- kopete/doc/t1/kopete_tutorialplugin.desktop
(.../tags/KDE/4.3.3/kdenetwork) (wersja 1053997)
-+++ kopete/doc/t1/kopete_tutorialplugin.desktop
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -46,7 +46,7 @@
- name...@latin]=priključak za učenje
- Name[sv]=Handledningsinsticksprogram
- Name[tr]=Öğretici Eklentisi
--Name[uk]=Втулка інструкції
-+Name[uk]=Додаток інструкції
- Name[vi]=Phần bổ sung trợ lý
- Name[x-test]=xxTutorial Pluginxx
- Name[zh_CN]=教程插件
-@@ -95,7 +95,7 @@
- comment...@latin]=pokazni priključak za učenje programiranja Kopetea
- Comment[sv]=Demonstrationsinsticksprogram för att lära ut utveckling av Kopete
- Comment[tr]=Kopete geliştirmesini öğretmek için örnek eklenti
--Comment[uk]=Демонстраційна втулка для навчання по розробці Kopete
-+Comment[uk]=Демонстраційний додаток для навчання розробці у Kopete
- Comment[vi]=Phần bổ sung minh hoạ để dạy phát triển Kopete
- Comment[x-test]=xxDemonstration plugin for teaching Kopete developmentxx
- Comment[zh_CN]=Kopete 开发教学示范插件
-Index: kopete/doc/t2/kopete_tutorialplugin.desktop
-===================================================================
---- kopete/doc/t2/kopete_tutorialplugin.desktop
(.../tags/KDE/4.3.3/kdenetwork) (wersja 1053997)
-+++ kopete/doc/t2/kopete_tutorialplugin.desktop
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -46,7 +46,7 @@
- name...@latin]=priključak za učenje
- Name[sv]=Handledningsinsticksprogram
- Name[tr]=Öğretici Eklentisi
--Name[uk]=Втулка інструкції
-+Name[uk]=Додаток інструкції
- Name[vi]=Phần bổ sung trợ lý
- Name[x-test]=xxTutorial Pluginxx
- Name[zh_CN]=教程插件
-@@ -95,7 +95,7 @@
- comment...@latin]=pokazni priključak za učenje programiranja Kopetea
- Comment[sv]=Demonstrationsinsticksprogram för att lära ut utveckling av Kopete
- Comment[tr]=Kopete geliştirmesini öğretmek için örnek eklenti
--Comment[uk]=Демонстраційна втулка для навчання по розробці Kopete
-+Comment[uk]=Демонстраційний додаток для навчання розробці у Kopete
- Comment[vi]=Phần bổ sung minh hoạ để dạy phát triển Kopete
- Comment[x-test]=xxDemonstration plugin for teaching Kopete developmentxx
- Comment[zh_CN]=Kopete 开发教学示范插件
-Index: kopete/doc/t3/kopete_tutorialplugin.desktop
-===================================================================
---- kopete/doc/t3/kopete_tutorialplugin.desktop
(.../tags/KDE/4.3.3/kdenetwork) (wersja 1053997)
-+++ kopete/doc/t3/kopete_tutorialplugin.desktop
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -46,7 +46,7 @@
- name...@latin]=priključak za učenje
- Name[sv]=Handledningsinsticksprogram
- Name[tr]=Öğretici Eklentisi
--Name[uk]=Втулка інструкції
-+Name[uk]=Додаток інструкції
- Name[vi]=Phần bổ sung trợ lý
- Name[x-test]=xxTutorial Pluginxx
- Name[zh_CN]=教程插件
-@@ -95,7 +95,7 @@
- comment...@latin]=pokazni priključak za učenje programiranja Kopetea
- Comment[sv]=Demonstrationsinsticksprogram för att lära ut utveckling av Kopete
- Comment[tr]=Kopete geliştirmesini öğretmek için örnek eklenti
--Comment[uk]=Демонстраційна втулка для навчання по розробці Kopete
-+Comment[uk]=Демонстраційний додаток для навчання розробці у Kopete
- Comment[vi]=Phần bổ sung minh hoạ để dạy phát triển Kopete
- Comment[x-test]=xxDemonstration plugin for teaching Kopete developmentxx
- Comment[zh_CN]=Kopete 开发教学示范插件
-Index: kopete/libkopete/kopetechatsession.h
-===================================================================
---- kopete/libkopete/kopetechatsession.h (.../tags/KDE/4.3.3/kdenetwork)
(wersja 1053997)
-+++ kopete/libkopete/kopetechatsession.h
(.../branches/KDE/4.3/kdenetwork) (wersja 1053997)
-@@ -46,6 +46,7 @@
- class OnlineStatus;
- class Account;
- class ChatSessionManager;
-+class PropertyContainer;
- class MessageHandlerChain;
- class TemporaryKMMCallbackAppendMessageHandler;
-
-@@ -229,12 +230,12 @@
- * @brief a new contact is now in the chat
- */
- // FIXME: What's 'suppress'? Shouldn't this be an enum? - Martijn
-- void contactAdded( const Kopete::Contact *contact, bool suppress );
-+ void contactAdded( const Kopete::Contact *contact, bool suppress);
-
- /**
- * @brief a contact is no longer in this chat
- */
-- void contactRemoved( const Kopete::Contact *contact, const QString
&reason, Qt::TextFormat format = Qt::PlainText, bool contactRemoved = false );
-+ void contactRemoved( const Kopete::Contact *contact, const QString
&reason, Qt::TextFormat format = Qt::PlainText, bool suppressNotification =
false);
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdenetwork/kde4-kdenetwork-branch.diff?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdenetwork/kde4-kdenetwork.spec?r1=1.77.2.11&r2=1.77.2.12&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
