Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2013-01-24 10:00:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2013-01-22 15:42:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2013-01-24 10:00:25.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 22 15:28:59 UTC 2013 - [email protected] + +- changed plasma-kickoff-newly-collapsing.diff: + * don't set name to null if it is equal to genericName or + genericName is empty. Fixes bnc#725829 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-kickoff-newly-collapsing.diff ++++++ --- /var/tmp/diff_new_pack.gmoDYv/_old 2013-01-24 10:00:28.000000000 +0100 +++ /var/tmp/diff_new_pack.gmoDYv/_new 2013-01-24 10:00:28.000000000 +0100 @@ -280,7 +280,7 @@ } if (systemApplicationPolicy == ApplicationModel::ShowSystemOnlyPolicy && -@@ -213,9 +257,40 @@ void ApplicationModelPrivate::fillNode(c +@@ -213,9 +257,33 @@ void ApplicationModelPrivate::fillNode(c continue; } @@ -300,13 +300,6 @@ + name = service->name(); + + QString genericName = service->genericName(); -+ if (genericName.isEmpty()) { -+ genericName = name; -+ name = QString::null; -+ } -+ -+ if (name==genericName) -+ name = QString::null; + + addAppNode(icon, name, genericName, _relPath, service->entryPath(), false, node); } else if (p->isType(KST_KServiceGroup)) { @@ -323,7 +316,7 @@ if (serviceGroup->noDisplay() || serviceGroup->childCount() == 0) { continue; -@@ -224,41 +299,42 @@ void ApplicationModelPrivate::fillNode(c +@@ -224,41 +292,42 @@ void ApplicationModelPrivate::fillNode(c kDebug(250) << "Service group" << serviceGroup->entryPath() << serviceGroup->icon() << serviceGroup->relPath() << serviceGroup->directoryEntryPath(); @@ -381,7 +374,7 @@ } // set the subTitleMandatory field for nodes that do not provide a unique generic -@@ -273,6 +349,20 @@ void ApplicationModelPrivate::fillNode(c +@@ -273,6 +342,20 @@ void ApplicationModelPrivate::fillNode(c } } @@ -402,7 +395,7 @@ ApplicationModel::ApplicationModel(QObject *parent, bool allowSeparators) : KickoffAbstractModel(parent), d(new ApplicationModelPrivate(this, allowSeparators)) -@@ -282,6 +372,7 @@ ApplicationModel::ApplicationModel(QObje +@@ -282,6 +365,7 @@ ApplicationModel::ApplicationModel(QObje QDBusConnection::sessionBus().registerObject("/kickoff", this); dbus.connect(QString(), "/kickoff", "org.kde.plasma", "reloadMenu", this, SLOT(reloadMenu())); connect(KSycoca::self(), SIGNAL(databaseChanged(QStringList)), this, SLOT(checkSycocaChange(QStringList))); @@ -410,7 +403,7 @@ } ApplicationModel::~ApplicationModel() -@@ -308,6 +399,32 @@ DisplayOrder ApplicationModel::nameDispl +@@ -308,6 +392,32 @@ DisplayOrder ApplicationModel::nameDispl return d->displayOrder; } @@ -443,7 +436,7 @@ int ApplicationModel::columnCount(const QModelIndex &parent) const { Q_UNUSED(parent) -@@ -515,8 +632,9 @@ void ApplicationModel::reloadMenu() +@@ -515,8 +625,9 @@ void ApplicationModel::reloadMenu() { delete d->root; d->root = new AppNode(); @@ -454,7 +447,7 @@ } void ApplicationModel::checkSycocaChange(const QStringList &changes) -@@ -536,6 +654,104 @@ ApplicationModel::SystemApplicationPolic +@@ -536,6 +647,104 @@ ApplicationModel::SystemApplicationPolic return d->systemApplicationPolicy; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
