On Sun, Sep 14, 2014 at 03:19:19PM +0100, Dominik Vogt wrote:
> On Sun, Sep 14, 2014 at 03:00:44PM +0100, Thomas Adam wrote:
> > On Sun, Sep 14, 2014 at 08:27:07AM -0500, c...@math.uh.edu wrote:
> > > CVSROOT:  /home/cvs/fvwm
> > > Module name:      fvwm
> > > Changes by:       domivogt        14/09/14 08:27:07
> > > 
> > > Modified files:
> > >   fvwm           : Tag: branch-2_6 add_window.c add_window.h 
> > >                    events.c functions.c 
> > > 
> > > Log message:
> > > * Fix handling of XA_WM_NORMAL_HINTS PropertyNotify (see ChangeLog).
> > 
> > Am I being dense, or did you forget the ChangeLog?
> 
> I have a problem with a ChangeLog conflict that does not generate
> conflict markers.  It may take some time to fix that.

I give up, for some reason the ChangeLog takes ages.  Can you
please commit the following changes:

--
2014-09-14  Dominik Vogt  <dominik(dot)vogt(at)gmx(dot)de>

        * fvwm/events.c (HandlePropertyNotify):
        * fvwm/add_window.c (GetWindowSizeHintsWithCheck):
        (GetWindowSizeHints):
        (is_geometry_valid_with_new_hints):
        * fvwm/add_window.h (CaptureAllWindows):
        Ignore new WmNormalHints if they would make the window's current
        geometry (or its normal geomatry in case it is maximized) invalid.  In
        that case, the hints are applied when the window generates a
        ConfigureRequest event.

2014-09-12  Dominik Vogt  <dominik(dot)vogt(at)gmx(dot)de>

        * fvwm/functions.c (__execute_function):
        Treat resizemaximize command like resizemovemaximize

--

Ciao

Dominik ^_^  ^_^

-- 

Dominik Vogt

Reply via email to