Hello community,
here is the log from the commit of package kdenetwork4
checked in at Mon Sep 15 17:56:43 CEST 2008.
--------
--- KDE/kdenetwork4/kdenetwork4.changes 2008-08-28 12:35:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdenetwork4/kdenetwork4.changes 2008-09-08 12:17:00.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Sep 8 12:13:01 CEST 2008 - stbinner@suse.de
+
+- branch diff update
+
+-------------------------------------------------------------------
+Thu Sep 4 13:50:28 CEST 2008 - wstephenson@suse.de
+
+- Comprehensive lockdown (Kiosk) support for Kopete
+
+-------------------------------------------------------------------
New:
----
kopete-kiosk-full.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdenetwork4.spec ++++++
--- /var/tmp/diff_new_pack.Su9021/_old 2008-09-15 17:56:33.000000000 +0200
+++ /var/tmp/diff_new_pack.Su9021/_new 2008-09-15 17:56:33.000000000 +0200
@@ -26,13 +26,15 @@
Summary: KDE Network Base Package
Url: http://www.kde.org
Version: 4.1.1
-Release: 1
+Release: 14
Source0: kdenetwork-%version.tar.bz2
Source1: _upstream
Patch: 4_1_BRANCH.diff
Patch1: disable-kopete.diff
Patch2: knewsticker.diff
Patch4: FIXME.diff
+#remove on 4.1.2 update
+Patch5: kopete-kiosk-full.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
%if %suse_version > 1020
@@ -74,6 +76,7 @@
%endif
%patch2
#%patch4
+%patch5
# icon fixups
pushd kget/ui/icons
# rename ox hi ox*apps-kget.{png,svgz}
@@ -371,6 +374,10 @@
%doc COPYING COPYING.DOC README
%changelog
+* Mon Sep 08 2008 stbinner@suse.de
+- branch diff update
+* Thu Sep 04 2008 wstephenson@suse.de
+- Comprehensive lockdown (Kiosk) support for Kopete
* Thu Aug 28 2008 dmueller@suse.de
- update to 4.1.1
* see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php
++++++ 4_1_BRANCH.diff ++++++
++++ 746 lines (skipped)
++++ between KDE/kdenetwork4/4_1_BRANCH.diff
++++ and /mounts/work_src_done/STABLE/kdenetwork4/4_1_BRANCH.diff
++++++ kopete-kiosk-full.diff ++++++
Index: kopete/protocols/yahoo/yahoocontact.cpp
===================================================================
--- kopete/protocols/yahoo/yahoocontact.cpp (revision 856994)
+++ kopete/protocols/yahoo/yahoocontact.cpp (revision 856995)
@@ -46,6 +46,7 @@
// KDE Includes
#include
#include
+#include <KActionCollection>
#include
#include
#include
@@ -374,7 +375,7 @@
QList *YahooContact::customContextMenuActions()
{
- QList *actionCollection = new QList();
+ QList *actions = new QList();
if ( !m_webcamAction )
{
m_webcamAction = new KAction( KIcon("webcamreceive"), i18n( "View &Webcam" ), this );
@@ -384,8 +385,8 @@
m_webcamAction->setEnabled( true );
else
m_webcamAction->setEnabled( false );
- //actionCollection->addAction( "view_webcam", m_webcamAction );
- actionCollection->append( m_webcamAction );
+ //actions->addAction( "view_webcam", m_webcamAction );
+ actions->append( m_webcamAction );
if( !m_inviteWebcamAction )
{
@@ -396,8 +397,8 @@
m_inviteWebcamAction->setEnabled( true );
else
m_inviteWebcamAction->setEnabled( false );
- //actionCollection->addAction( "invite_webcam", m_inviteWebcamAction );
- actionCollection->append( m_inviteWebcamAction );
+ //actions->addAction( "invite_webcam", m_inviteWebcamAction );
+ actions->append( m_inviteWebcamAction );
if ( !m_buzzAction )
{
@@ -408,8 +409,8 @@
m_buzzAction->setEnabled( true );
else
m_buzzAction->setEnabled( false );
- //actionCollection->addAction( "buzz_contact", m_buzzAction );
- actionCollection->append( m_buzzAction );
+ //actions->addAction( "buzz_contact", m_buzzAction );
+ actions->append( m_buzzAction );
if ( !m_stealthAction )
{
@@ -420,8 +421,8 @@
m_stealthAction->setEnabled( true );
else
m_stealthAction->setEnabled( false );
- //actionCollection->addAction( "stealth_contact", m_stealthAction );
- actionCollection->append( m_stealthAction );
+ //actions->addAction( "stealth_contact", m_stealthAction );
+ actions->append( m_stealthAction );
if ( !m_inviteConferenceAction )
{
@@ -432,8 +433,8 @@
m_inviteConferenceAction->setEnabled( true );
else
m_inviteConferenceAction->setEnabled( false );
- //actionCollection->addAction( "invite_conference", m_inviteConferenceAction );
- actionCollection->append( m_inviteConferenceAction );
+ //actions->addAction( "invite_conference", m_inviteConferenceAction );
+ actions->append( m_inviteConferenceAction );
if ( !m_profileAction )
{
@@ -441,10 +442,18 @@
connect( m_profileAction, SIGNAL( triggered(bool) ), this, SLOT( slotUserProfile() ) );
}
m_profileAction->setEnabled( true );
- //actionCollection->addAction( "profile_contact", m_profileAction );
- actionCollection->append( m_profileAction );
+ //actions->addAction( "profile_contact", m_profileAction );
+ actions->append( m_profileAction );
- return actionCollection;
+ // temporary action collection, used to apply Kiosk policy to the actions
+ KActionCollection tempCollection((QObject*)0);
+ tempCollection.addAction(QLatin1String("contactViewWebcam"), m_webcamAction);
+ tempCollection.addAction(QLatin1String("contactInviteToViewWebcam"), m_inviteWebcamAction);
+ tempCollection.addAction(QLatin1String("contactBuzz"), m_buzzAction);
+ tempCollection.addAction(QLatin1String("yahooContactStealth"), m_stealthAction);
+ tempCollection.addAction(QLatin1String("yahooContactInviteConference"), m_inviteConferenceAction);
+ tempCollection.addAction(QLatin1String("contactViewProfile"), m_profileAction);
+ return actions;
}
void YahooContact::slotUserInfo()
Index: kopete/protocols/groupwise/gwcontact.cpp
===================================================================
--- kopete/protocols/groupwise/gwcontact.cpp (revision 856994)
+++ kopete/protocols/groupwise/gwcontact.cpp (revision 856995)
@@ -29,6 +29,7 @@
#include
#include
+#include <KActionCollection>
#include
#include
#include
@@ -159,7 +160,7 @@
QList *GroupWiseContact::customContextMenuActions()
{
- QList * actionCollection = new QList;
+ QList * actions = new QList;
// Block/unblock contact
QString label = account()->isContactBlocked( m_dn ) ? i18n( "Unblock User" ) : i18n( "Block User" );
@@ -172,9 +173,12 @@
m_actionBlock->setText( label );
m_actionBlock->setEnabled( account()->isConnected() );
- actionCollection->append( m_actionBlock );
+ actions->append( m_actionBlock );
+ // temporary action collection, used to apply Kiosk policy to the actions
+ KActionCollection tempCollection((QObject*)0);
+ tempCollection.addAction(QLatin1String("contactBlock"), m_actionBlock);
- return actionCollection;
+ return actions;
}
void GroupWiseContact::slotUserInfo()
Index: kopete/protocols/jabber/jabbercontact.cpp
===================================================================
--- kopete/protocols/jabber/jabbercontact.cpp (revision 856994)
+++ kopete/protocols/jabber/jabbercontact.cpp (revision 856995)
@@ -31,6 +31,7 @@
#include
#include <QList>
+#include <KActionCollection>
#include
#include
#include
@@ -132,7 +133,7 @@
QList *JabberContact::customContextMenuActions ()
{
- QList *actionCollection = new QList();
+ QList *actions = new QList();
KActionMenu *actionAuthorization = new KActionMenu ( KIcon("network-connect"), i18n ("Authorization"), this);
@@ -241,16 +242,16 @@
}
- actionCollection->append( actionAuthorization );
- actionCollection->append( actionSetAvailability );
- actionCollection->append( actionSelectResource );
+ actions->append( actionAuthorization );
+ actions->append( actionSetAvailability );
+ actions->append( actionSelectResource );
#ifdef SUPPORT_JINGLE
KAction *actionVoiceCall = new KAction( (i18n ("Voice call"), "voicecall", 0, this, SLOT (voiceCall ()), 0, "jabber_voicecall");
actionVoiceCall->setEnabled( false );
- actionCollection->append( actionVoiceCall );
+ actions->append( actionVoiceCall );
// Check if the current contact support Voice calls, also honor lock by default.
JabberResource *bestResource = account()->resourcePool()->bestJabberResource( mRosterItem.jid() );
@@ -259,8 +260,16 @@
actionVoiceCall->setEnabled( true );
}
#endif
-
- return actionCollection;
+
+ // temporary action collection, used to apply Kiosk policy to the actions
+ KActionCollection tempCollection((QObject*)0);
+ tempCollection.addAction(QLatin1String("jabberContactAuthorizationMenu"), actionAuthorization);
+ tempCollection.addAction(QLatin1String("contactSendAuth"), resendAuthAction);
+ tempCollection.addAction(QLatin1String("contactRequestAuth"), requestAuthAction);
+ tempCollection.addAction(QLatin1String("contactRemoveAuth"), removeAuthAction);
+ tempCollection.addAction(QLatin1String("jabberContactSetAvailabilityMenu"), actionSetAvailability);
+ tempCollection.addAction(QLatin1String("jabberContactSelectResource"), actionSelectResource);
+ return actions;
}
void JabberContact::handleIncomingMessage (const XMPP::Message & message)
Index: kopete/protocols/msn/msncontact.cpp
===================================================================
--- kopete/protocols/msn/msncontact.cpp (revision 856994)
+++ kopete/protocols/msn/msncontact.cpp (revision 856995)
@@ -27,6 +27,7 @@
#undef KDE_NO_COMPAT
#include
+#include <KActionCollection>
#include
#include
#include
@@ -132,7 +133,7 @@
QList *MSNContact::customContextMenuActions()
{
- QList *m_actionCollection = new QList;
+ QList *actions = new QList;
// Block/unblock Contact
QString label = isBlocked() ? i18n( "Unblock User" ) : i18n( "Block User" );
@@ -167,14 +168,21 @@
actionSendMail->setEnabled( static_cast(account())->isHotmail());
- m_actionCollection->append( actionBlock );
- m_actionCollection->append( actionShowProfile );
- m_actionCollection->append( actionSendMail );
- m_actionCollection->append( actionWebcamReceive );
- m_actionCollection->append( actionWebcamSend );
+ actions->append( actionBlock );
+ actions->append( actionShowProfile );
+ actions->append( actionSendMail );
+ actions->append( actionWebcamReceive );
+ actions->append( actionWebcamSend );
+ // temporary action collection, used to apply Kiosk policy to the actions
+ KActionCollection tempCollection((QObject*)0);
+ tempCollection.addAction(QLatin1String("contactBlock"), actionBlock);
+ tempCollection.addAction(QLatin1String("contactViewProfile"), actionShowProfile);
+ tempCollection.addAction(QLatin1String("contactMail"), actionSendMail);
+ tempCollection.addAction(QLatin1String("contactInviteToViewWebcam"), actionWebcamSend);
+ tempCollection.addAction(QLatin1String("contactViewWebcam"), actionWebcamReceive);
- return m_actionCollection;
+ return actions;
}
void MSNContact::slotBlockUser()
Index: kopete/protocols/oscar/aim/aimcontact.cpp
===================================================================
--- kopete/protocols/oscar/aim/aimcontact.cpp (revision 856994)
+++ kopete/protocols/oscar/aim/aimcontact.cpp (revision 856995)
@@ -17,6 +17,7 @@
#include "aimcontact.h"
+#include <KActionCollection>
#include
#include
#include
@@ -64,7 +65,7 @@
QList *AIMContact::customContextMenuActions()
{
- QList *actionCollection = new QList();
+ QList *actions = new QList();
if ( !m_warnUserAction )
{
m_warnUserAction = new KAction( i18n( "&Warn User" ), this );
@@ -90,12 +91,18 @@
m_actionVisibleTo->setChecked( ssi->findItem( m_ssiItem.name(), ROSTER_VISIBLE ));
m_actionInvisibleTo->setChecked( ssi->findItem( m_ssiItem.name(), ROSTER_INVISIBLE ));
- actionCollection->append( m_warnUserAction );
+ actions->append( m_warnUserAction );
- actionCollection->append(m_actionVisibleTo);
- actionCollection->append(m_actionInvisibleTo);
+ actions->append(m_actionVisibleTo);
+ actions->append(m_actionInvisibleTo);
- return actionCollection;
+ // temporary action collection, used to apply Kiosk policy to the actions
+ KActionCollection tempCollection((QObject*)0);
+ tempCollection.addAction(QLatin1String("aimContactWarn"), m_warnUserAction);
+ tempCollection.addAction(QLatin1String("oscarContactAlwaysVisibleTo"), m_actionVisibleTo);
+ tempCollection.addAction(QLatin1String("oscarContactAlwaysInvisibleTo"), m_actionInvisibleTo);
+
+ return actions;
}
int AIMContact::warningLevel() const
Index: kopete/protocols/oscar/aim/icqcontact.cpp
===================================================================
--- kopete/protocols/oscar/aim/icqcontact.cpp (revision 856994)
+++ kopete/protocols/oscar/aim/icqcontact.cpp (revision 856995)
@@ -21,6 +21,7 @@
#include
+#include <KActionCollection>
#include
#include
#include
@@ -149,7 +150,7 @@
QList *ICQContact::customContextMenuActions()
{
- QList *actionCollection = new QList();
+ QList *actions = new QList();
m_actionVisibleTo = new KToggleAction(i18n("Always &Visible To"), this );
//, "actionVisibleTo");
@@ -168,10 +169,15 @@
m_actionVisibleTo->setChecked( ssi->findItem( m_ssiItem.name(), ROSTER_VISIBLE ));
m_actionInvisibleTo->setChecked( ssi->findItem( m_ssiItem.name(), ROSTER_INVISIBLE ));
- actionCollection->append(m_actionVisibleTo);
- actionCollection->append(m_actionInvisibleTo);
+ actions->append(m_actionVisibleTo);
+ actions->append(m_actionInvisibleTo);
- return actionCollection;
+ // temporary action collection, used to apply Kiosk policy to the actions
+ KActionCollection tempCollection((QObject*)0);
+ tempCollection.addAction(QLatin1String("oscarContactAlwaysVisibleTo"), m_actionVisibleTo);
+ tempCollection.addAction(QLatin1String("oscarContactAlwaysInvisibleTo"), m_actionInvisibleTo);
+
+ return actions;
}
Index: kopete/protocols/oscar/icq/aimcontact.cpp
===================================================================
--- kopete/protocols/oscar/icq/aimcontact.cpp (revision 856994)
+++ kopete/protocols/oscar/icq/aimcontact.cpp (revision 856995)
@@ -17,6 +17,7 @@
#include "aimcontact.h"
+#include <KActionCollection>
#include
#include
#include
@@ -88,6 +89,12 @@
actionCollection->append(m_actionVisibleTo);
actionCollection->append(m_actionInvisibleTo);
+ // temporary action collection, used to apply Kiosk policy to the actions
+ KActionCollection tempCollection((QObject*)0);
+ tempCollection.addAction(QLatin1String("contactSelectEncoding"), m_selectEncoding);
+ tempCollection.addAction(QLatin1String("contactIgnore"), m_actionIgnore);
+ tempCollection.addAction(QLatin1String("oscarContactAlwaysVisibleTo"), m_actionVisibleTo);
+ tempCollection.addAction(QLatin1String("oscarContactAlwaysInvisibleTo"), m_actionInvisibleTo);
return actionCollection;
}
Index: kopete/protocols/oscar/icq/icqcontact.cpp
===================================================================
--- kopete/protocols/oscar/icq/icqcontact.cpp (revision 856994)
+++ kopete/protocols/oscar/icq/icqcontact.cpp (revision 856995)
@@ -20,6 +20,7 @@
#include "icqcontact.h"
#include
+#include <KActionCollection>
#include
#include
#include
@@ -552,7 +553,7 @@
QList *ICQContact::customContextMenuActions()
{
- QList *actionCollection = new QList();
+ QList *actions = new QList();
actionRequestAuth = new KAction( i18n("&Request Authorization"), this );
//, "actionRequestAuth");
@@ -597,15 +598,23 @@
m_actionVisibleTo->setChecked( ssi->findItem( m_ssiItem.name(), ROSTER_VISIBLE ));
m_actionInvisibleTo->setChecked( ssi->findItem( m_ssiItem.name(), ROSTER_INVISIBLE ));
- actionCollection->append(actionRequestAuth);
- actionCollection->append(actionSendAuth);
- actionCollection->append( m_selectEncoding );
+ actions->append(actionRequestAuth);
+ actions->append(actionSendAuth);
+ actions->append( m_selectEncoding );
- actionCollection->append(m_actionIgnore);
- actionCollection->append(m_actionVisibleTo);
- actionCollection->append(m_actionInvisibleTo);
+ actions->append(m_actionIgnore);
+ actions->append(m_actionVisibleTo);
+ actions->append(m_actionInvisibleTo);
- return actionCollection;
+ // temporary action collection, used to apply Kiosk policy to the actions
+ KActionCollection tempCollection((QObject*)0);
+ tempCollection.addAction(QLatin1String("contactRequestAuth"), actionRequestAuth);
+ tempCollection.addAction(QLatin1String("contactSendAuth"), actionSendAuth);
+ tempCollection.addAction(QLatin1String("contactSelectEncoding"), m_selectEncoding);
+ tempCollection.addAction(QLatin1String("contactIgnore"), m_actionIgnore);
+ tempCollection.addAction(QLatin1String("oscarContactAlwaysVisibleTo"), m_actionVisibleTo);
+ tempCollection.addAction(QLatin1String("oscarContactAlwaysInvisibleTo"), m_actionInvisibleTo);
+ return actions;
}
Index: kopete/libkopete/kopetepluginmanager.cpp
===================================================================
--- kopete/libkopete/kopetepluginmanager.cpp (revision 856994)
+++ kopete/libkopete/kopetepluginmanager.cpp (revision 856995)
@@ -124,7 +124,7 @@
QList<KPluginInfo>::ConstIterator it;
for ( it = _kpmp->plugins.begin(); it != _kpmp->plugins.end(); ++it )
{
- if ( it->category() == category )
+ if ( it->category() == category && !(*it).service()->noDisplay() )
result.append( *it );
}
Index: kopete/libkopete/kopeteaccountmanager.cpp
===================================================================
--- kopete/libkopete/kopeteaccountmanager.cpp (revision 856994)
+++ kopete/libkopete/kopeteaccountmanager.cpp (revision 856995)
@@ -344,12 +344,13 @@
for ( QStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it )
{
KConfigGroup cg( config, *it );
+ KConfigGroup pluginConfig( config, QLatin1String("Plugins") );
QString protocol = cg.readEntry( "Protocol", QString() );
if ( protocol.endsWith( QString::fromLatin1( "Protocol" ) ) )
protocol = QString::fromLatin1( "kopete_" ) + protocol.toLower().remove( QString::fromLatin1( "protocol" ) );
- if ( cg.readEntry( "Enabled", true ) )
+ if ( cg.readEntry( "Enabled", true ) && pluginConfig.readEntry(protocol + QLatin1String("Enabled"), true) )
PluginManager::self()->loadPlugin( protocol, PluginManager::LoadAsync );
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org