> On Jan. 8, 2014, 8:10 a.m., Martin Gräßlin wrote: > > If you have the possibility (build setup) please merge to master and fix > > the merge conflict I expect to see :-) I merged 4.11 into master yesterday > > so there should no be anything else which could conflict. > > Wolfgang Bauer wrote: > I have committed to 4.11, but I don't have a KF5/PW2 build setup at the > moment. > > Martin Gräßlin wrote: > I just merged it to master and pushed as > http://commits.kde.org/kde-workspace/98768f680480df64a60fbe1802ca8ee05fb28887
OK, thank you! - Wolfgang ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/114841/#review47020 ----------------------------------------------------------- On Jan. 8, 2014, 9:59 a.m., Wolfgang Bauer wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/114841/ > ----------------------------------------------------------- > > (Updated Jan. 8, 2014, 9:59 a.m.) > > > Review request for kde-workspace and Martin Gräßlin. > > > Bugs: 311571 and 316459 > http://bugs.kde.org/show_bug.cgi?id=311571 > http://bugs.kde.org/show_bug.cgi?id=316459 > > > Repository: kde-workspace > > > Description > ------- > > Setting the cursor to ArrowCursor when calling XGrabPointer() prevents the > Screen savers from blanking the mouse cursor. > > I don't know why this has been done in the first place, but I couldn't see > any negative effect by setting it to None. Now the mouse cursor even changes > to the IBeam again when over the password field, which I find more intuitive. > > > Diffs > ----- > > ksmserver/screenlocker/ksldapp.cpp f0526cf > > Diff: https://git.reviewboard.kde.org/r/114841/diff/ > > > Testing > ------- > > Configure a Screen saver in systemsettings and wait for it to kick in (or > lock the screen manually). > Previously (since 4.10) the mouse cursor stayed visible, now it is blanked > like it was the case before 4.10. > Moving the mouse/pressing a key (to quit the Screen saver) makes the mouse > cursor appear again as it should, regardless of whether the screen is locked > or not. > > > Thanks, > > Wolfgang Bauer > >