[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: KDE/kdebase/kdesktop/lock
From:       Grzegorz Piotr Jaskiewicz <gj () pointblue ! com ! pl>
Date:       2005-07-02 21:51:18
Message-ID: 200507022351.19312 () gj-laptop
[Download RAW message or body]

On Monday 27 June 2005 11:41, Luboš Luňák wrote:
> SVN commit 429332 by lunakl:
>
> Fix the last commit - check return value, and also add XFree().
> BUG: 73813
Thanks mate.

>
>  M  +11 -8     lockprocess.cc
>
>
> --- trunk/KDE/kdebase/kdesktop/lock/lockprocess.cc #429331:429332
> @@ -402,14 +402,17 @@
>      if( mOpenGLVisual )
>      {
>          int attribs[] = { GLX_RGBA, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE,
> x11Depth(), None }; -        XVisualInfo* i = glXChooseVisual(
> x11Display(), x11Screen(), attribs ); -        visual = i->visual;
> -        static Colormap colormap = 0;
> -        if( colormap != 0 )
> -            XFreeColormap( x11Display(), colormap );
> -        colormap = XCreateColormap( x11Display(), RootWindow(
> x11Display(), x11Screen()), visual, AllocNone ); -        attrs.colormap =
> colormap;
> -        flags |= CWColormap;
> +        if( XVisualInfo* i = glXChooseVisual( x11Display(), x11Screen(),
> attribs )) +        {
> +            visual = i->visual;
> +            static Colormap colormap = 0;
> +            if( colormap != 0 )
> +                XFreeColormap( x11Display(), colormap );
> +            colormap = XCreateColormap( x11Display(), RootWindow(
> x11Display(), x11Screen()), visual, AllocNone ); +           
> attrs.colormap = colormap;
> +            flags |= CWColormap;
> +            XFree( i );
> +        }
>      }
>  #endif
>      Window w = XCreateWindow( x11Display(), RootWindow( x11Display(),
> x11Screen()),

-- 
GJ

[prev in list] [next in list] [prev in thread] [next in thread]