← Back to branch summary

~ubuntu-branches/ubuntu/karmic/kdebase-workspace/karmic-updates

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_100_fix_systray_crash_without_render.diff

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas
  • Date: 2009-10-14 22:50:36 UTC
  • Revision ID: james.westby@ubuntu.com-20091014225036-nm2nmci67lg7ln0z
Tags: 4:4.3.2-0ubuntu4
https://launchpad.net/bugs/397374
Add kubuntu_100_fix_systray_crash_without_render.diff from upstream
to fix a plasma crash when the XRENDER extension is unavailable. Can be
dropped in KDE 4.4. (B.K.O. #209271, LP: #397374)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_100_fix_systray_crash_without_render.diff
 
1
Index: kdebase-workspace-4.3.2/plasma/applets/systemtray/protocols/fdo/fdoselectionmanager.cpp
 
2
===================================================================
 
3
--- kdebase-workspace-4.3.2.orig/plasma/applets/systemtray/protocols/fdo/fdoselectionmanager.cpp        2009-10-14 22:48:24.000000000 -0400
 
4
+++ kdebase-workspace-4.3.2/plasma/applets/systemtray/protocols/fdo/fdoselectionmanager.cpp     2009-10-14 22:49:44.000000000 -0400
 
5
@@ -278,7 +278,7 @@
 
6
                              &templ, &nvi);
 
7
         for (int i = 0; i < nvi; i++) {
 
8
             XRenderPictFormat *format = XRenderFindVisualFormat(d->display, xvi[i].visual);
 
9
-            if (format->type == PictTypeDirect && format->direct.alphaMask) {
 
10
+            if (format && format->type == PictTypeDirect && format->direct.alphaMask) {
 
11
                 visual = xvi[i].visualid;
 
12
                 break;
 
13
             }