Review Request 127166: Fix xcb port of klauncher and clean up the code.

[Xuetian Weng]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/127166/
-----------------------------------------------------------

(Updated March 8, 2016, 12:17 a.m.)


Status
------

This change has been marked as submitted.


Review request for KDE Frameworks, David Faure and Martin Gräßlin.


Changes
-------

Submitted with commit d154b4c0d85c1616c512cabdf5bf9919a9a9191d by Weng Xuetian to branch master.


Repository: kinit


Description
-------

The ported klauncher at least has two bugs:
1. IMHO, it should compare the cached display string with == instead of != (though != has been there since the old kdelibs, but it just doesn't look correct to me, what's the point of assign dpy = mCached_dpy when dpy_str != XDisplayString(dpy)? And what's the point use == in one place and != in other two places? ).
2. it might free the cached connection without setting mCached.conn back to nullptr, which could lead to double free or freeze when system logout.

This patch refactor the code a little bit with a helper function to update the cached connection instead of duplicate the same logic everywhere. getXCBConnection() will make sure the returned connection is error-free, reuse the cached connection if possible, and update the cached connection if needed.


Diffs
-----

  src/klauncher/klauncher.h 31bfaaa 
  src/klauncher/klauncher.cpp 7ea9da9 

Diff: https://git.reviewboard.kde.org/r/127166/diff/


Testing
-------

Compiles, startup notify works.


Thanks,

Xuetian Weng

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20160308/32f68c96/attachment-0001.html>