Hello community,
here is the log from the commit of package kdelibs4
checked in at Wed Mar 5 23:03:34 CET 2008.
--------
--- KDE/kdelibs4/kdelibs4.changes 2008-02-06 13:57:53.000000000 +0100
+++ kdelibs4/kdelibs4.changes 2008-03-05 00:19:33.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Feb 27 15:33:11 CET 2008 - dmueller@suse.de
+
+- update to 4.0.2
+
+-------------------------------------------------------------------
Old:
----
common-symlink-fix.diff
kdelibs-4.0.1.tar.bz2
r769363.diff
New:
----
4_0_BRANCH.diff
kdelibs-4.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs4.spec ++++++
--- /var/tmp/diff_new_pack.X10469/_old 2008-03-05 23:02:26.000000000 +0100
+++ /var/tmp/diff_new_pack.X10469/_new 2008-03-05 23:02:26.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdelibs4 (Version 4.0.1)
+# spec file for package kdelibs4 (Version 4.0.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -9,6 +9,7 @@
#
+
Name: kdelibs4
BuildRequires: alsa-devel aspell-devel cmake cups-devel giflib-devel hicolor-icon-theme
BuildRequires: libattr-devel libpng-devel libqt4-devel libtiff-devel libxslt-devel unzip
@@ -24,9 +25,9 @@
Group: System/GUI/KDE
Summary: KDE Base Libraries
Url: http://www.kde.org
-Version: 4.0.1
-Release: 6
-%define rversion 4.0.1
+Version: 4.0.2
+Release: 2
+%define rversion 4.0.2
Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`)
Requires: libstrigi0 >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`)
Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`)
@@ -37,13 +38,11 @@
Source0: kdelibs-%rversion.tar.bz2
Source1: _upstream
Source2: hidden.desktop
-#Patch0: 4_0_BRANCH.diff
+Patch0: 4_0_BRANCH.diff
Patch1: kde3-applications.diff
Patch2: default-useragent.diff
-Patch3: common-symlink-fix.diff
Patch4: dotkde4.diff
Patch5: clever-menu.diff
-Patch6: r769363.diff
Patch7: kde3-autostart.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -62,14 +61,11 @@
%prep
%setup -q -n kdelibs-%rversion
-#%patch
+%patch
%patch1
%patch2
-# disabled because it causes stale symlinks
-# %patch3
%patch4
%patch5
-%patch6
%patch7
#
# define KDE version exactly
@@ -349,6 +345,8 @@
/usr/share/autostart/kdesktop.desktop
%changelog
+* Wed Feb 27 2008 dmueller@suse.de
+- update to 4.0.2
* Wed Feb 06 2008 stbinner@suse.de
- move Kicker/KDesktop prevention from autostarting in KDE4 here
* Mon Feb 04 2008 stbinner@suse.de
++++++ 4_0_BRANCH.diff ++++++
package: kdelibs-4.0.2.tar.bz2
kdemod: kdelibs
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
+current HEAD: 780996
+svn di between //tags/KDE/4.0.2/kdelibs and //branches/KDE/4.0/kdelibs
--- kate/utils/kateschema.cpp
+++ kate/utils/kateschema.cpp
@@ -32,6 +32,7 @@
#include "ui_schemaconfigcolortab.h"
#include
+#include
#include
#include
#include
@@ -265,9 +266,11 @@
QColor tmp0( schemeView.background().color() );
QColor tmp1( schemeSelection.background().color() );
QColor tmp2( schemeView.background(KColorScheme::AlternateBackground).color() );
- QColor tmp3( schemeView.shade(KColorScheme::LightShade) );
- QColor tmp4( schemeView.shade(KColorScheme::MidShade) );
- QColor tmp5( schemeView.shade(KColorScheme::ShadowShade) );
+ // using KColorUtils::shade wasn't working really well
+ qreal bgLuma = KColorUtils::luma( tmp0 );
+ QColor tmp3( KColorUtils::tint(tmp0, schemeView.decoration(KColorScheme::HoverColor).color()) );
+ QColor tmp4( KColorUtils::shade( tmp0, bgLuma > 0.3 ? -0.15 : 0.03 ) );
+ QColor tmp5( KColorUtils::shade( tmp0, bgLuma > 0.7 ? -0.35 : 0.3 ) );
QColor tmp6( schemeWindow.background().color() );
QColor tmp7( schemeWindow.foreground().color() );
--- kate/utils/kateconfig.cpp
+++ kate/utils/kateconfig.cpp
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1119,9 +1120,11 @@
QColor tmp0( schemeView.background().color() );
QColor tmp1( schemeSelection.background().color() );
QColor tmp2( schemeView.background(KColorScheme::AlternateBackground).color() );
- QColor tmp3( schemeView.shade(KColorScheme::LightShade) );
- QColor tmp4( schemeView.shade(KColorScheme::MidShade) );
- QColor tmp5( schemeView.shade(KColorScheme::ShadowShade) );
+ // using KColorUtils::shade wasn't working really well
+ qreal bgLuma = KColorUtils::luma( tmp0 );
+ QColor tmp3( KColorUtils::tint(tmp0, schemeView.decoration(KColorScheme::HoverColor).color()) );
+ QColor tmp4( KColorUtils::shade( tmp0, bgLuma > 0.3 ? -0.15 : 0.03 ) );
+ QColor tmp5( KColorUtils::shade( tmp0, bgLuma > 0.7 ? -0.35 : 0.3 ) );
QColor tmp6( schemeWindow.background().color() );
QColor tmp7( schemeWindow.foreground().color() );
--- kdoctools/customization/pl/user.entities
+++ kdoctools/customization/pl/user.entities
@@ -9,6 +9,7 @@
<!ENTITY Alt "<keycap>Alt</keycap>">
<!ENTITY Ctrl "<keycap>Ctrl</keycap>"> <!-- English: &Ctrl; -->
<!ENTITY Enter "<keycap>Enter</keycap>"> <!-- English: &Enter; -->
+<!ENTITY Esc "<keycap>Esc</keycap>">
<!ENTITY eg "np.">
<!ENTITY etc "itp.">
<!ENTITY Shift "<keycap>Shift</keycap>"> <!-- English: &Shift; -->
@@ -110,6 +111,7 @@
<!ENTITY kmenu-celownik '&kmenu-mianownik;'>
<!ENTITY kmenu-biernik '&kmenu-mianownik;'>
<!ENTITY kmenu-miejscownik '&kmenu-mianownik;'>
+<!ENTITY kmenu-narzednik '&kmenu-mianownik;'>
<!ENTITY kmenu '&kmenu-mianownik;'>
<!ENTITY knode-mianownik '<application>Knode</application>'>
--- kio/kfile/kopenwithdialog.cpp
+++ kio/kfile/kopenwithdialog.cpp
@@ -39,7 +39,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -432,6 +431,8 @@
*/
void setMimeType(const KUrl::List &_urls);
+ void addToMimeAppsList(const QString& serviceId);
+
/**
* Create a dialog that asks for a application to open a given
* URL(s) with.
@@ -705,7 +706,7 @@
void KOpenWithDialog::slotTextChanged()
{
- kDebug(250)<<"KOpenWithDialog::slotTextChanged";
+ kDebug(250)<<"KOpenWithDialog::slotTextChanged" << d->edit->url();
// Forget about the service
d->curService = 0L;
enableButton(Ok, !d->edit->url().isEmpty());
@@ -736,188 +737,153 @@
d->saveNewApps = b;
}
-void KOpenWithDialogPrivate::_k_slotOK()
+static QString simplifiedExecLineFromService(const QString& fullExec)
{
- QString typedExec(edit->url().pathOrUrl());
- QString fullExec(typedExec);
+ QString exec = fullExec;
+ exec.remove("%u", Qt::CaseInsensitive);
+ exec.remove("%f", Qt::CaseInsensitive);
+ exec.remove("-caption %c");
+ exec.remove("-caption \"%c\"");
+ exec.remove("%i");
+ exec.remove("%m");
+ return exec.simplified();
+}
+
+void KOpenWithDialogPrivate::addToMimeAppsList(const QString& serviceId)
+{
+ KSharedConfig::Ptr profile = KSharedConfig::openConfig("mimeapps.list", KConfig::NoGlobals, "xdgdata-apps");
+ KConfigGroup addedApps(profile, "Added Associations");
+ QStringList apps = addedApps.readXdgListEntry(qMimeType);
+ apps.removeAll(serviceId);
+ apps.prepend(serviceId); // make it the preferred app
+ addedApps.writeXdgListEntry(qMimeType, apps);
+ addedApps.sync();
+
+ // Also make sure the "auto embed" setting for this mimetype is off
+ KSharedConfig::Ptr fileTypesConfig = KSharedConfig::openConfig("filetypesrc", KConfig::NoGlobals);
+ fileTypesConfig->group("EmbedSettings").writeEntry(QString("embed-")+qMimeType, false);
+ fileTypesConfig->sync();
- QString serviceName;
- QString initialServiceName;
- QString preferredTerminal;
- m_pService = curService;
- if (!m_pService) {
- // No service selected - check the command line
-
- // Find out the name of the service from the command line, removing args and paths
- serviceName = KRun::binaryName( typedExec, true );
- if (serviceName.isEmpty())
- {
- // TODO add a KMessageBox::error here after the end of the message freeze
- return;
- }
- initialServiceName = serviceName;
- kDebug(250) << "initialServiceName=" << initialServiceName;
- int i = 1; // We have app, app-2, app-3... Looks better for the user.
- bool ok = false;
- // Check if there's already a service by that name, with the same Exec line
- do {
- kDebug(250) << "looking for service " << serviceName;
- KService::Ptr serv = KService::serviceByDesktopName( serviceName );
- ok = !serv; // ok if no such service yet
- // also ok if we find the exact same service (well, "kwrite" == "kwrite %U"
- if (serv && serv->isApplication())
- {
- QString exec = serv->exec();
- fullExec = exec;
- exec.replace("%u", "", Qt::CaseInsensitive);
- exec.replace("%f", "", Qt::CaseInsensitive);
- exec.replace("-caption %c", "");
- exec.replace("-caption \"%c\"", "");
- exec.replace("%i", "");
- exec.replace("%m", "");
- exec = exec.simplified();
- if (exec == typedExec)
- {
- ok = true;
- m_pService = serv;
- kDebug(250) << "OK, found identical service: " << serv->entryPath();
- }
- }
- if (!ok) // service was found, but it was different -> keep looking
- {
- ++i;
- serviceName = initialServiceName + '-' + QString::number(i);
- }
- }
- while (!ok);
- }
- if ( m_pService )
- {
- // Existing service selected
- serviceName = m_pService->name();
- initialServiceName = serviceName;
- fullExec = m_pService->exec();
- }
+ kDebug(250) << "rebuilding ksycoca...";
- if (terminal->isChecked())
- {
- KConfigGroup confGroup( KGlobal::config(), QString::fromLatin1("General") );
- preferredTerminal = confGroup.readPathEntry("TerminalApplication", QString::fromLatin1("konsole"));
- m_command = preferredTerminal;
- // only add --noclose when we are sure it is konsole we're using
- if (preferredTerminal == "konsole" && nocloseonexit->isChecked())
- m_command += QString::fromLatin1(" --noclose");
- m_command += QString::fromLatin1(" -e ");
- m_command += edit->url().pathOrUrl();
- kDebug(250) << "Setting m_command to " << m_command;
- }
- if ( m_pService && terminal->isChecked() != m_pService->terminal() )
- m_pService = 0L; // It's not exactly this service we're running
+ // kbuildsycoca is the one reading mimeapps.list, so we need to run it now
+ KBuildSycocaProgressDialog::rebuildKSycoca(q);
- bool bRemember = remember && remember->isChecked();
+ m_pService = KService::serviceByMenuId(serviceId);
+ Q_ASSERT( m_pService );
+}
- if ( !bRemember && m_pService)
- {
- q->accept();
- return;
- }
+void KOpenWithDialogPrivate::_k_slotOK()
+{
+ QString typedExec(edit->url().pathOrUrl());
+ if (typedExec.isEmpty())
+ return;
+ QString fullExec(typedExec);
- if (!bRemember && !saveNewApps)
- {
- // Create temp service
- m_pService = new KService(initialServiceName, fullExec, QString());
- if (terminal->isChecked())
- {
- m_pService->setTerminal(true);
- // only add --noclose when we are sure it is konsole we're using
- if (preferredTerminal == "konsole" && nocloseonexit->isChecked())
- m_pService->setTerminalOptions("--noclose");
+ QString serviceName;
+ QString initialServiceName;
+ QString preferredTerminal;
+ m_pService = curService;
+ if (!m_pService) {
+ // No service selected - check the command line
+
+ // Find out the name of the service from the command line, removing args and paths
+ serviceName = KRun::binaryName( typedExec, true );
+ if (serviceName.isEmpty())
+ {
+ // TODO add a KMessageBox::error here after the end of the message freeze
+ return;
+ }
+ initialServiceName = serviceName;
+ kDebug(250) << "initialServiceName=" << initialServiceName;
+ int i = 1; // We have app, app-2, app-3... Looks better for the user.
+ bool ok = false;
+ // Check if there's already a service by that name, with the same Exec line
+ do {
+ kDebug(250) << "looking for service" << serviceName;
+ KService::Ptr serv = KService::serviceByDesktopName( serviceName );
+ ok = !serv; // ok if no such service yet
+ // also ok if we find the exact same service (well, "kwrite" == "kwrite %U")
+ if (serv && serv->isApplication()) {
+ fullExec = serv->exec();
+ if (typedExec == simplifiedExecLineFromService(fullExec)) {
+ ok = true;
+ m_pService = serv;
+ kDebug(250) << "OK, found identical service: " << serv->entryPath();
+ }
+ }
+ if (!ok) { // service was found, but it was different -> keep looking
+ ++i;
+ serviceName = initialServiceName + '-' + QString::number(i);
+ }
+ } while (!ok);
}
- q->accept();
- return;
- }
-
- // if we got here, we can't seem to find a service for what they
- // wanted. The other possibility is that they have asked for the
- // association to be remembered. Create/update service.
-
- QString newPath;
- QString oldPath;
- QString menuId;
- if (m_pService)
- {
- oldPath = m_pService->entryPath();
- newPath = m_pService->locateLocal();
- menuId = m_pService->menuId();
- kDebug(250) << "Updating exitsing service " << m_pService->entryPath() << " ( " << newPath << " ) ";
- }
- else
- {
- newPath = KService::newServicePath(false /* hidden */, serviceName, &menuId);
- kDebug(250) << "Creating new service " << serviceName << " ( " << newPath << " ) ";
- }
-
- int maxPreference = 1;
- if (!qMimeType.isEmpty())
- {
- // Find max highest preference from either initial preference or from profile
- const KServiceOfferList offerList = KMimeTypeTrader::self()->weightedOffers( qMimeType );
- if (!offerList.isEmpty())
- maxPreference = offerList.first().preference();
- }
-
- KDesktopFile *desktop = 0;
- if (!oldPath.isEmpty() && (oldPath != newPath))
- {
- KDesktopFile orig( oldPath );
- desktop = orig.copyTo( newPath );
- }
- else
- {
- desktop = new KDesktopFile(newPath);
- }
- KConfigGroup cg = desktop->desktopGroup();
- cg.writeEntry("Type", "Application");
- cg.writeEntry("Name", initialServiceName);
- cg.writePathEntry("Exec", fullExec);
- if (terminal->isChecked())
- {
- cg.writeEntry("Terminal", true);
- // only add --noclose when we are sure it is konsole we're using
- if (preferredTerminal == "konsole" && nocloseonexit->isChecked())
- cg.writeEntry("TerminalOptions", "--noclose");
- }
- else
- {
- cg.writeEntry("Terminal", false);
- }
- cg.writeEntry("InitialPreference", maxPreference + 1);
+ if ( m_pService ) {
+ // Existing service selected
+ serviceName = m_pService->name();
+ initialServiceName = serviceName;
+ fullExec = m_pService->exec();
+ }
+
+ if (terminal->isChecked()) {
+ KConfigGroup confGroup( KGlobal::config(), QString::fromLatin1("General") );
+ preferredTerminal = confGroup.readPathEntry("TerminalApplication", QString::fromLatin1("konsole"));
+ m_command = preferredTerminal;
+ // only add --noclose when we are sure it is konsole we're using
+ if (preferredTerminal == "konsole" && nocloseonexit->isChecked())
+ m_command += QString::fromLatin1(" --noclose");
+ m_command += QString::fromLatin1(" -e ");
+ m_command += edit->url().pathOrUrl();
+ kDebug(250) << "Setting m_command to" << m_command;
+ }
+ if ( m_pService && terminal->isChecked() != m_pService->terminal() )
+ m_pService = 0; // It's not exactly this service we're running
+
+
+ const bool bRemember = remember && remember->isChecked();
+ kDebug(250) << "bRemember=" << bRemember << "service found=" << m_pService;
+ if (m_pService) {
+ if (bRemember) {
+ // Associate this app with qMimeType in mimeapps.list
+ Q_ASSERT(!qMimeType.isEmpty()); // we don't show the remember checkbox otherwise
+ addToMimeAppsList(m_pService->storageId());
+ }
+ } else {
+ const bool createDesktopFile = bRemember || saveNewApps;
+ if (!createDesktopFile) {
+ // Create temp service
+ m_pService = new KService(initialServiceName, fullExec, QString());
+ if (terminal->isChecked()) {
+ m_pService->setTerminal(true);
+ // only add --noclose when we are sure it is konsole we're using
+ if (preferredTerminal == "konsole" && nocloseonexit->isChecked())
+ m_pService->setTerminalOptions("--noclose");
+ }
+ } else {
+ // If we got here, we can't seem to find a service for what they wanted. Create one.
+ QString menuId;
+ QString newPath = KService::newServicePath(false /* ignored argument */, serviceName, &menuId);
+ kDebug(250) << "Creating new service" << serviceName << "(" << newPath << ")";
+
+ KDesktopFile desktopFile(newPath);
+ KConfigGroup cg = desktopFile.desktopGroup();
+ cg.writeEntry("Type", "Application");
+ cg.writeEntry("Name", initialServiceName);
+ cg.writePathEntry("Exec", fullExec);
+ cg.writeEntry("NoDisplay", true); // don't make it appear in the K menu
+ if (terminal->isChecked()) {
+ cg.writeEntry("Terminal", true);
+ // only add --noclose when we are sure it is konsole we're using
+ if (preferredTerminal == "konsole" && nocloseonexit->isChecked())
+ cg.writeEntry("TerminalOptions", "--noclose");
+ }
+ cg.writeXdgListEntry("MimeType", QStringList() << qMimeType);
+ cg.sync();
- if (bRemember || saveNewApps) {
- // Add mimetype to the service desktop file
- QStringList mimeList = cg.readXdgListEntry("MimeType");
- if (!qMimeType.isEmpty() && !mimeList.contains(qMimeType))
- mimeList.append(qMimeType);
- cg.writeXdgListEntry("MimeType", mimeList);
-
- if ( !qMimeType.isEmpty() ) {
- // Also make sure the "auto embed" setting for this mimetype is off
- KSharedConfig::Ptr fileTypesConfig = KSharedConfig::openConfig("filetypesrc", KConfig::NoGlobals);
- fileTypesConfig->group("EmbedSettings").writeEntry(QString("embed-")+qMimeType, false);
- fileTypesConfig->sync();
+ addToMimeAppsList(menuId);
}
}
-
- // write it all out to the file
- cg.sync();
- delete desktop;
-
- KBuildSycocaProgressDialog::rebuildKSycoca(q);
-
- m_pService = KService::serviceByMenuId( menuId );
- Q_ASSERT( m_pService );
-
q->accept();
}
--- kdecore/tests/kconfigtest.cpp
+++ kdecore/tests/kconfigtest.cpp
@@ -849,6 +849,38 @@
QCOMPARE(basegrp2.readEntry("New Entry Base Only", ""), QString("SomeValue"));
}
+void KConfigTest::testConfigCopyTo()
+{
+ KConfig cf1("kconfigtest");
+ {
+ // Prepare source file
+ KConfigGroup group(&cf1, "CopyToTest");
+ group.writeEntry("Type", "Test");
+ cf1.sync();
+ }
+
+ {
+ // Copy to "destination"
+ const QString destination = KStandardDirs::locateLocal("config", "kconfigcopytotest");
+ QFile::remove(destination);
+ KConfig cf2;
+ cf1.copyTo(destination, &cf2);
+ KConfigGroup group2(&cf2, "CopyToTest");
+ QString testVal = group2.readEntry("Type");
+ QCOMPARE(testVal, QString("Test"));
+ group2.writeEntry("AnotherKey", "Test Worked"); // for sync to have something to sync
+ cf2.sync();
+ QVERIFY(QFile::exists(destination));
+ }
+
+ // Check copied config file on disk
+ KConfig cf3("kconfigcopytotest");
+ KConfigGroup group3(&cf3, "CopyToTest");
+ QString testVal = group3.readEntry("Type");
+ QCOMPARE(testVal, QString("Test"));
+ QCOMPARE(group3.readEntry("AnotherKey"), QString("Test Worked"));
+}
+
void KConfigTest::testKAboutDataOrganizationDomain()
{
KAboutData data( "app", 0, ki18n("program"), "version",
--- kdecore/tests/kconfigtest.h
+++ kdecore/tests/kconfigtest.h
@@ -53,6 +53,7 @@
void testGroupEscape();
void testRevertAllEntries();
void testChangeGroup();
+ void testConfigCopyTo();
void testKdeglobals();
void testSubGroup();
void testAddConfigSources();
--- kdecore/config/kconfig.cpp
+++ kdecore/config/kconfig.cpp
@@ -298,6 +298,10 @@
config->d_func()->entryMap = d->entryMap;
config->d_func()->bFileImmutable = false;
+ const KEntryMapIterator theEnd = config->d_func()->entryMap.end();
+ for (KEntryMapIterator it = config->d_func()->entryMap.begin(); it != theEnd; ++it)
+ it->bDirty = true;
+
return config;
}
Property changes on: .
___________________________________________________________________
Deleted: svn:mergeinfo
Added: svn:externals
+
++++++ clever-menu.diff ++++++
--- /var/tmp/diff_new_pack.X10469/_old 2008-03-05 23:02:26.000000000 +0100
+++ /var/tmp/diff_new_pack.X10469/_new 2008-03-05 23:02:26.000000000 +0100
@@ -20,8 +20,8 @@
+ /**
+ * UNOFFICIAL SuSE special
+ */
-+ virtual KServiceGroup::List SuSEentries(KServiceGroup *group, bool sort, bool excludeNoDisplay, bool allowSeparators, bool sortByGenericName, bool excludeSuSEunimportant = true);
-+ virtual KServiceGroup::List SuSEsortEntries( KServiceGroup *group, KSortableListKServiceGroup::SPtr,QByteArray slist, KSortableListKServiceGroup::SPtr,QByteArray glist, bool excludeNoDisplay, bool allowSeparators );
++ KServiceGroup::List SuSEentries(KServiceGroup *group, bool sort, bool excludeNoDisplay, bool allowSeparators, bool sortByGenericName, bool excludeSuSEunimportant = true);
++ KServiceGroup::List SuSEsortEntries( KServiceGroup *group, KSortableListKServiceGroup::SPtr,QByteArray slist, KSortableListKServiceGroup::SPtr,QByteArray glist, bool excludeNoDisplay, bool allowSeparators );
+
/**
* This function parse attributes into menu
@@ -83,7 +83,7 @@
/**
+ * UNOFFICIAL SuSE special
+ */
-+ virtual KServiceGroup::List SuSEsortEntries( KSortableListKServiceGroup::SPtr,QByteArray slist, KSortableListKServiceGroup::SPtr,QByteArray glist, bool excludeNoDisplay, bool allowSeparators );
++ KServiceGroup::List SuSEsortEntries( KSortableListKServiceGroup::SPtr,QByteArray slist, KSortableListKServiceGroup::SPtr,QByteArray glist, bool excludeNoDisplay, bool allowSeparators );
+
+
+ /**
++++++ kde3-applications.diff ++++++
--- /var/tmp/diff_new_pack.X10469/_old 2008-03-05 23:02:26.000000000 +0100
+++ /var/tmp/diff_new_pack.X10469/_new 2008-03-05 23:02:26.000000000 +0100
@@ -1,8 +1,6 @@
-Index: kdecore/services/kservice.cpp
-===================================================================
---- kdecore/services/kservice.cpp (revision 741745)
-+++ kdecore/services/kservice.cpp (working copy)
-@@ -46,6 +46,8 @@
+--- kdecore/services/kservice.cpp
++++ kdecore/services/kservice.cpp
+@@ -57,6 +57,8 @@ void KServicePrivate::init( const KDeskt
{
const QString entryPath = q->entryPath();
bool absPath = !QDir::isRelativePath(entryPath);
@@ -11,7 +9,7 @@
// TODO: it makes sense to have a KConstConfigGroup I guess
const KConfigGroup desktopGroup = const_cast(config)->desktopGroup();
-@@ -73,6 +76,8 @@
+@@ -84,6 +86,8 @@ void KServicePrivate::init( const KDeskt
if (i != -1)
m_strName = m_strName.left(i);
}
@@ -20,7 +18,7 @@
m_strType = config->readType();
entryMap.remove("Type");
-@@ -96,6 +101,18 @@
+@@ -107,6 +111,18 @@ void KServicePrivate::init( const KDeskt
// NOT readPathEntry, it is not XDG-compliant. Path entries written by
// KDE4 will be still treated as such, though.
m_strExec = desktopGroup.readEntry( "Exec", QString() );
@@ -39,17 +37,17 @@
entryMap.remove("Exec");
if ( m_strType == "Application" ) {
-@@ -179,7 +196,8 @@
+@@ -190,7 +206,8 @@ void KServicePrivate::init( const KDeskt
entryMap.remove("ServiceTypes");
- m_lstServiceTypes += desktopGroup.readEntry( "X-KDE-ServiceTypes", QStringList() );
+ lstServiceTypes += desktopGroup.readEntry( "X-KDE-ServiceTypes", QStringList() );
entryMap.remove("X-KDE-ServiceTypes");
-- m_lstServiceTypes += desktopGroup.readXdgListEntry( "MimeType" );
+- lstServiceTypes += desktopGroup.readXdgListEntry( "MimeType" );
+ if (!kde3application)
-+ m_lstServiceTypes += desktopGroup.readXdgListEntry( "MimeType" );
++ lstServiceTypes += desktopGroup.readXdgListEntry( "MimeType" );
entryMap.remove("MimeType");
- if ( m_strType == "Application" && !m_lstServiceTypes.contains("Application") )
-@@ -208,6 +226,8 @@
+ if ( m_strType == "Application" && !lstServiceTypes.contains("Application") )
+@@ -242,6 +259,8 @@ void KServicePrivate::init( const KDeskt
m_DBUSStartusType = KService::DBusNone;
m_strDesktopEntryName = _name.toLower();
@@ -58,7 +56,7 @@
m_bAllowAsDefault = desktopGroup.readEntry("AllowDefault", true);
entryMap.remove("AllowDefault");
-@@ -221,7 +241,9 @@
+@@ -252,7 +271,9 @@ void KServicePrivate::init( const KDeskt
// qDebug("Path = %s", entryPath.toLatin1().constData());
QMap::ConstIterator it = entryMap.begin();
for( ; it != entryMap.end();++it) {
++++++ kdelibs-4.0.1.tar.bz2 -> kdelibs-4.0.2.tar.bz2 ++++++
KDE/kdelibs4/kdelibs-4.0.1.tar.bz2 kdelibs4/kdelibs-4.0.2.tar.bz2 differ: byte 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org