Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2013-01-21 17:37:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2013-01-19 16:37:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2013-01-21 17:37:56.000000000 +0100 @@ -1,0 +2,11 @@ +Sun Jan 20 19:54:17 UTC 2013 - ctri...@opensuse.org + +- Update patch plasma-branding-defaults-applets.diff to add + kinfocenter to kickoff in the Computer tab + +------------------------------------------------------------------- +Sun Jan 20 11:09:58 UTC 2013 - alinm.el...@gmail.com + +- Add unique names for partitions in kinfocenter (storage.diff) + +------------------------------------------------------------------- New: ---- storage.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.weOZpc/_old 2013-01-21 17:37:59.000000000 +0100 +++ /var/tmp/diff_new_pack.weOZpc/_new 2013-01-21 17:37:59.000000000 +0100 @@ -129,7 +129,8 @@ Patch401: opensuse-homepage.diff # PATCH-FIX-OPENSUSE opensuse-kinfocenter.diff (created by Alin M. Elena to have some openSUSE distro info in kinfocenter) Patch402: opensuse-kinfocenter.diff - +# PATCH-FIX-OPENSUSE storage.diff (created by Alin M. Elena to add unique names for partitions in kinfocenter) +Patch403: storage.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 1200 Requires: %{name}-branding = %{version} @@ -377,6 +378,7 @@ %patch400 -p0 %patch401 -p1 %patch402 -p1 +%patch403 -p1 cp %{SOURCE3} kwin/effects/cube/data/cubecap.png %build ++++++ plasma-branding-defaults-applets.diff ++++++ --- /var/tmp/diff_new_pack.weOZpc/_old 2013-01-21 17:37:59.000000000 +0100 +++ /var/tmp/diff_new_pack.weOZpc/_new 2013-01-21 17:37:59.000000000 +0100 @@ -56,7 +56,7 @@ =================================================================== --- plasma/desktop/applets/kickoff/core/models.cpp.orig +++ plasma/desktop/applets/kickoff/core/models.cpp -@@ -177,7 +177,16 @@ QStringList Kickoff::systemApplicationLi +@@ -177,7 +177,19 @@ QStringList Kickoff::systemApplicationLi { KConfigGroup appsGroup = componentData().config()->group("SystemApplications"); QStringList apps; @@ -68,6 +68,9 @@ + if (QFile::exists("/usr/share/applications/package-manager.desktop")) + apps << "package-manager.desktop"; + ++ if (QFile::exists("/usr/share/applications/kde4/kinfocenter.desktop")) ++ apps << "kinfocenter.desktop"; ++ + if (KService::serviceByStorageId("YaST2/live-installer.desktop")) + apps << "YaST2/live-installer.desktop"; + ++++++ storage.diff ++++++ diff --git a/kinfocenter/Modules/devinfo/soldevice.cpp b/kinfocenter/Modules/devinfo/soldevice.cpp index efe06b0..3f42e32 100644 --- a/kinfocenter/Modules/devinfo/soldevice.cpp +++ b/kinfocenter/Modules/devinfo/soldevice.cpp @@ -69,6 +69,13 @@ void SolDevice::setDefaultDeviceText() QString ddtString = i18nc("unknown device", "Unknown"); if(deviceSet) ddtString = tiedDevice.product(); + + if(tiedDevice.parent().product()==ddtString) { + QString label =tiedDevice.udi().section("/",-1,-1); + if (!label.isEmpty()){ + ddtString = label; + } + } setText(0,ddtString); } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org