Hello community, here is the log from the commit of package kdebase3 checked in at Fri Nov 10 19:18:18 CET 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-11-10 15:43:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2006-11-10 18:56:47.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 10 18:56:21 CET 2006 - llunak@suse.cz + +- fix kompmgr leaks (#197990) + +------------------------------------------------------------------- New: ---- 3_5_BRANCH_197990.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.ZDyHOI/_old 2006-11-10 19:17:15.000000000 +0100 +++ /var/tmp/diff_new_pack.ZDyHOI/_new 2006-11-10 19:17:15.000000000 +0100 @@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.5 -Release: 44 +Release: 45 %define kde_version 3.5.5 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -188,6 +188,7 @@ Patch182: 3_5_BRANCH_net_wm_cm_selection.diff Patch183: 3_5_BRANCH_kompmgr_fix_loop.diff Patch184: 3_5_BRANCH_kwin_open_in_bg.diff +Patch185: 3_5_BRANCH_197990.diff %description This package contains kdebase, one of the basic packages of the K @@ -373,7 +374,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 173 +Release: 174 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -535,6 +536,7 @@ %patch182 %patch183 %patch184 +%patch185 cp %SOURCE17 l10n/tw/flag.png . /etc/opt/kde3/common_options cd ../fileshareset2 @@ -1493,6 +1495,8 @@ %changelog -n kdebase3 * Fri Nov 10 2006 - llunak@suse.cz +- fix kompmgr leaks (#197990) +* Fri Nov 10 2006 - llunak@suse.cz - make kompmgr read default settings from /etc/opt/kde3/... . - fix clickraise with compositing (KDE#128648) - fix possible infinite loop in kompmgr ++++++ 3_5_BRANCH_197990.diff ++++++ Index: kompmgr.c =================================================================== --- kwin/kompmgr/kompmgr.c (revision 603871) +++ kwin/kompmgr/kompmgr.c (working copy) @@ -354,6 +354,8 @@ { XRenderFreePicture (dpy, w->shadow); w->shadow = None; + if( w->extents != None ) + XFixesDestroyRegion( dpy, w->extents ); w->extents = win_extents (dpy, w); } } @@ -421,6 +423,8 @@ { XRenderFreePicture (dpy, w->shadow); w->shadow = None; + if( w->extents != None ) + XFixesDestroyRegion( dpy, w->extents ); w->extents = win_extents(dpy, w); } determine_mode (dpy, w); @@ -2034,6 +2038,11 @@ XRenderFreePicture (dpy, w->shadowPict); w->shadowPict = None; } + if (w->shadow) + { + XRenderFreePicture (dpy, w->shadow); + w->shadow = None; + } if (w->damage != None) { set_ignore (dpy, NextRequest (dpy)); @@ -2182,8 +2191,10 @@ default: break; } - printf ("error %d request %d minor %d serial %d\n", +#ifndef NDEBUG + fprintf (stderr,"error %d request %d minor %d serial %d\n", ev->error_code, ev->request_code, ev->minor_code, ev->serial); +#endif /* abort (); this is just annoying to most people */ return 0; @@ -2909,12 +2920,16 @@ } if (oldShadowSize < w->shadowSize) /* this is important to catch size changes on cleanup with determine_mode*/ { + if( w->extents != None ) + XFixesDestroyRegion( dpy, w->extents ); w->extents = win_extents (dpy, w); determine_mode(dpy, w); } else { determine_mode(dpy, w); + if( w->extents != None ) + XFixesDestroyRegion( dpy, w->extents ); w->extents = win_extents (dpy, w); } } @@ -2957,6 +2972,8 @@ XRenderFreePicture (dpy, w->shadow); w->shadow = None; determine_mode(dpy, w); + if( w->extents != None ) + XFixesDestroyRegion( dpy, w->extents ); w->extents = win_extents (dpy, w); } #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org