Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at Tue Feb 3 22:01:27 CET 2009. -------- --- KDE/kdelibs4/kdelibs4.changes 2009-01-22 02:34:33.000000000 +0100 +++ kdelibs4/kdelibs4.changes 2009-02-03 18:23:48.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Feb 3 07:04:34 CET 2009 - stbinner@suse.de + +- update 4_2_BRANCH.diff: + * kdecore: Repair klauncher support for unique-applications + * kdecore: Fix "klauncher hangs when kdeinit4 dies". + * kio: Properly update the directory view when aborting a move + operation, otherwise confusion and data loss could happen. + * kded: directories with desktop files were not watched anymore +- allow creation of Plasma containments without toolbox + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- plasma-libs.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.F22076/_old 2009-02-03 21:57:17.000000000 +0100 +++ /var/tmp/diff_new_pack.F22076/_new 2009-02-03 21:57:17.000000000 +0100 @@ -33,7 +33,7 @@ Summary: KDE Base Libraries Url: http://www.kde.org Version: 4.2.0 -Release: 1 +Release: 2 %if %suse_version > 1010 Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) %else @@ -64,6 +64,7 @@ Patch12: desktop-translations.diff Patch13: kjs-mark-register-stack.diff Patch17: flash-player-non-oss.diff +Patch18: plasma-libs.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?opensuse_bs} %define debug_package_requires %name = %version-%release libqt4-debuginfo @@ -98,6 +99,7 @@ %patch12 %patch13 %patch17 +%patch18 # # define KDE version exactly # @@ -412,6 +414,14 @@ /usr/share/mime/packages/kde.xml %changelog +* Tue Feb 03 2009 stbinner@suse.de +- update 4_2_BRANCH.diff: + * kdecore: Repair klauncher support for unique-applications + * kdecore: Fix "klauncher hangs when kdeinit4 dies". + * kio: Properly update the directory view when aborting a move + operation, otherwise confusion and data loss could happen. + * kded: directories with desktop files were not watched anymore +- allow creation of Plasma containments without toolbox * Thu Jan 22 2009 dmueller@suse.de - update to 4.2.0 * Sat Jan 17 2009 dmueller@suse.de ++++++ 4_2_BRANCH.diff ++++++ ++++ 6146 lines (skipped) ++++ between KDE/kdelibs4/4_2_BRANCH.diff ++++ and kdelibs4/4_2_BRANCH.diff ++++++ plasma-libs.diff ++++++ Index: plasma/corona.cpp =================================================================== --- plasma/corona.cpp (revision 920623) +++ plasma/corona.cpp (working copy) @@ -127,7 +127,9 @@ if (pluginName.isEmpty()) { // default to the desktop containment - pluginName = "desktop"; + KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasmarc"); + KConfigGroup group = KConfigGroup(defaultconfig, "Defaults"); + pluginName = group.readEntry("containment", "desktop"); } if (pluginName != "null") { Index: plasma/private/containment_p.h =================================================================== --- plasma/private/containment_p.h (revision 920623) +++ plasma/private/containment_p.h (working copy) @@ -48,7 +48,8 @@ toolBox(0), con(0), type(Containment::NoContainmentType), - drawWallpaper(true) + drawWallpaper(true), + showToolBox(true) { } @@ -121,6 +122,7 @@ Containment::Type type; static bool s_positioning; bool drawWallpaper; + bool showToolBox; }; } // Plasma namespace Index: plasma/containment.h =================================================================== --- plasma/containment.h (revision 920623) +++ plasma/containment.h (working copy) @@ -123,6 +123,8 @@ */ Containment(QObject *parent, const QVariantList &args); + Containment(QObject *parent, const QVariantList &args, bool showToolBox); + ~Containment(); /** Index: plasma/containment.cpp =================================================================== --- plasma/containment.cpp (revision 920623) +++ plasma/containment.cpp (working copy) @@ -109,6 +109,17 @@ setBackgroundHints(NoBackground); } +Containment::Containment(QObject *parent, const QVariantList &args, bool showToolBox) + : Applet(parent, args), + d(new ContainmentPrivate(this)) +{ + // WARNING: do not access config() OR globalConfig() in this method! + // that requires a scene, which is not available at this point + setPos(0, 0); + setBackgroundHints(NoBackground); + d->showToolBox=showToolBox; +} + Containment::~Containment() { if (Applet::d->transient) { @@ -392,7 +403,7 @@ return; } - if ((type == DesktopContainment || type == PanelContainment)) { + if ((type == DesktopContainment || type == PanelContainment) && d->showToolBox) { d->createToolBox(); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org