From ee675a9236288a7ffeddb5d1c034837ce8fd4456 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 15 Oct 2010 12:25:49 -0500 Subject: [PATCH] - backport configChanged() for wallpaper --- ...4.5.2-plasma_wallpaper_configchanged.patch | 36 +++++++++++++++++++ kdelibs.spec | 8 ++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 kdelibs-4.5.2-plasma_wallpaper_configchanged.patch diff --git a/kdelibs-4.5.2-plasma_wallpaper_configchanged.patch b/kdelibs-4.5.2-plasma_wallpaper_configchanged.patch new file mode 100644 index 0000000..d709e4a --- /dev/null +++ b/kdelibs-4.5.2-plasma_wallpaper_configchanged.patch @@ -0,0 +1,36 @@ +--- trunk/KDE/kdelibs/plasma/containment.cpp 2010/10/14 15:42:21 1185911 ++++ trunk/KDE/kdelibs/plasma/containment.cpp 2010/10/14 15:46:05 1185912 +@@ -2079,6 +2079,17 @@ + Applet::showConfigurationInterface(); + } + ++void Containment::configChanged() ++{ ++ if (d->drawWallpaper) { ++ KConfigGroup group = config(); ++ setWallpaper(group.readEntry("wallpaperplugin", defaultWallpaper), ++ group.readEntry("wallpaperpluginmode", defaultWallpaperMode)); ++ } ++ ++ Applet::configChanged(); ++} ++ + void ContainmentPrivate::requestConfiguration() + { + emit q->configureRequested(q); +--- trunk/KDE/kdelibs/plasma/containment.h 2010/10/14 15:42:21 1185911 ++++ trunk/KDE/kdelibs/plasma/containment.h 2010/10/14 15:46:05 1185912 +@@ -527,6 +527,13 @@ + */ + void showConfigurationInterface(); + ++ /** ++ * Called when applet configuration values have changed. ++ * @reimp ++ * @sa Applet::configChanged() ++ */ ++ void configChanged(); ++ + protected: + /** + * Sets the type of this containment. diff --git a/kdelibs.spec b/kdelibs.spec index fe0efbc..5663bc5 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -12,7 +12,7 @@ Summary: KDE Libraries Version: 4.5.2 -Release: 6%{?dist} +Release: 7%{?dist} Name: kdelibs Epoch: 6 @@ -96,6 +96,8 @@ Patch101: kdelibs-4.5.2-kio_krun_services.patch ## trunk upstream Patch150: kdelibs-4.5.2-krun-kde#253294.patch +# http://websvn.kde.org/?view=revision&revision=1185912 +Patch151: kdelibs-4.5.2-plasma_wallpaper_configchanged.patch ## security fix # Not Upstreamed? why not ? -- Rex @@ -265,6 +267,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch100 -p4 -b .comic_applet_kde253387 %patch101 -p4 -b .kio_krun_services %patch150 -p1 -b .kde#253294 +%patch151 -p3 -b .plasma_wallpaper_configchanged # security fix %patch200 -p1 -b .CVE-2009-2702 @@ -509,6 +512,9 @@ rm -rf %{buildroot} %changelog +* Fri Oct 15 2010 Rex Dieter - 4.5.2-7 +- backport configChanged() for wallpaper + * Fri Oct 15 2010 Rex Dieter - 4.5.2-6 - kio/krun patch so kde services can open urls directly too