Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
DISCONTINUED:openSUSE:11.1:Update
kdelibs3
kde4-applications.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File kde4-applications.diff of Package kdelibs3
--- kio/kio/kservice.cpp +++ kio/kio/kservice.cpp @@ -97,6 +97,7 @@ m_bValid = true; bool absPath = !QDir::isRelativePath(entryPath()); + bool kde4application = config->fileName().startsWith("/usr/share/applications/kde4/"); config->setDesktopGroup(); @@ -130,6 +131,8 @@ if (i != -1) m_strName = m_strName.left(i); } + if (kde4application) + m_strName += "/KDE4"; m_strType = config->readEntry( "Type" ); entryMap.remove("Type"); @@ -192,6 +195,8 @@ name = name.left(pos); m_strExec = config->readPathEntry( "Exec" ); + if (kde4application && !m_strExec.startsWith("/")) + m_strExec = "/usr/bin/"+m_strExec; entryMap.remove("Exec"); m_strIcon = config->readEntry( "Icon", "unknown" ); @@ -246,6 +246,8 @@ m_DCOPServiceType = DCOP_None; m_strDesktopEntryName = name.lower(); + if (kde4application) + m_strDesktopEntryName = "kde4-" + m_strDesktopEntryName; m_bAllowAsDefault = config->readBoolEntry( "AllowDefault", true ); entryMap.remove("AllowDefault"); @@ -264,7 +266,10 @@ for( ; it != entryMap.end();++it) { //qDebug(" Key = %s Data = %s", it.key().latin1(), it.data().latin1()); - m_mapProps.insert( it.key(), QVariant( it.data())); + QString key = it.key(); + if (kde4application && key=="OnlyShowIn" && it.data()=="KDE;") + key = "NotShowIn"; + m_mapProps.insert( key, QVariant( it.data())); } } --- kio/kio/kservice.cpp 1.107 +++ kio/kio/kservice.cpp @@ -197,6 +197,16 @@ m_strExec = config->readPathEntry( "Exec" ); if (kde4application && !m_strExec.startsWith("/")) m_strExec = "/usr/bin/"+m_strExec; + else if (config->readBoolEntry("X-KDE-SubstituteUID")) { + int space = m_strExec.find(" "); + if (space==-1) + m_strExec = KStandardDirs::findExe(m_strExec); + else { + const QString command = m_strExec.left(space); + m_strExec.replace(command,KStandardDirs::findExe(command)); + } + } + entryMap.remove("Exec"); m_strIcon = config->readEntry( "Icon", "unknown" ); --- kio/kio/kservice.cpp 2008/04/10 14:01:04 1.107 +++ kio/kio/kservice.cpp 2008/04/10 14:08:59 @@ -271,6 +271,8 @@ if ( m_initialPreference == 1 ) m_initialPreference = config->readNumEntry( "InitialPreference", 1 ); entryMap.remove("InitialPreference"); + if (kde4application) + m_initialPreference = 1; // Store all additional entries in the property map. // A QMap<QString,QString> would be easier for this but we can't
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor