[kdelibs] - switching comic in commic applet crashes plasma (kde#253387, rh#640619)

[Rex Dieter]

commit e00a432d21d82416c659feec247a0367b73ae4fa
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 8 07:21:16 2010 -0500

    - switching comic in commic applet crashes plasma (kde#253387,rh#640619)

 kdelibs-4.5.2-comic_applet_kde253387.patch |   19 +++++++++++++++++++
 kdelibs.spec                               |   11 ++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)
---
diff --git a/kdelibs-4.5.2-comic_applet_kde253387.patch b/kdelibs-4.5.2-comic_applet_kde253387.patch
new file mode 100644
index 0000000..420a119
--- /dev/null
+++ b/kdelibs-4.5.2-comic_applet_kde253387.patch
@@ -0,0 +1,19 @@
+--- branches/KDE/4.5/kdelibs/plasma/tooltipmanager.cpp	2010/09/28 01:19:58	1180436
++++ branches/KDE/4.5/kdelibs/plasma/tooltipmanager.cpp	2010/10/08 11:35:52	1183776
+@@ -236,10 +236,12 @@
+             }
+         }
+ 
+-        d->tipWidget->setContent(widget, data);
+-        d->tipWidget->prepareShowing();
+-        if (m_corona) {
+-            d->tipWidget->moveTo(m_corona->popupPosition(widget, d->tipWidget->size(), Qt::AlignCenter));
++        if (d->tipWidget) {
++            d->tipWidget->setContent(widget, data);
++            d->tipWidget->prepareShowing();
++            if (m_corona) {
++                d->tipWidget->moveTo(m_corona->popupPosition(widget, d->tipWidget->size(), Qt::AlignCenter));
++            }
+         }
+     }
+ }
diff --git a/kdelibs.spec b/kdelibs.spec
index 79d3dd5..d74762f 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -12,7 +12,7 @@
 
 Summary: KDE Libraries
 Version: 4.5.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -90,9 +90,10 @@ Patch27: kdelibs-4.4.80-no_rpath.patch
 Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
 
 ## 4.5 upstream
+Patch100:  kdelibs-4.5.2-comic_applet_kde253387.patch 
 
 ## trunk upstream
-Patch100: kdelibs-4.5.2-krun-kde#253294.patch
+Patch150: kdelibs-4.5.2-krun-kde#253294.patch
 
 ## security fix
 # Not Upstreamed? why not ? -- Rex
@@ -257,7 +258,8 @@ format for use with the Qt 4 Assistant or KDevelop 4.
 %patch50 -p1 -b .knewstuff_gpg2
 
 # upstream patches
-%patch100 -p1 -b .kde#253294
+%patch100 -p1 -b .comic_applet_kde253387
+%patch150 -p1 -b .kde#253294
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -505,6 +507,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-5
+- switching comic in commic applet crashes plasma (kde#253387,rh#640619)
+
 * Thu Oct 07 2010 Than Ngo <than at redhat.com> - 4.5.2-4
 - kde253294, KMail and Kopete download and open https url instead of only opening