On Sat, 30 Mar 2013, David Bremner <david@tethera.net> wrote:
> Jani Nikula <jani@nikula.org> writes:
>
>> The code filled with #ifdef GMIME_ATLEAST_26 is difficult to
>> read. Abstract the decryption and signature verification into
>> functions, with separate implementations for GMime 2.4 and 2.6, to
>> clarify the code.
>
> This series mostly looks OK, although it's a challenge to track all the
> code movement.

I agree it is. Personally I just tried to look at support for either 2.4
or 2.6 at a time, and compare the old and new code paths, to wrap my
head around it.

BTW I didn't test the 2.4 support, I don't have a system with that
anymore.

> I'd like some way to make it more obvious to the reader which version of
> the functions they are reading (when the #ifdef GMIME_ATLEAST_26 has
> scrolled off screen). The simplest would just be a comment in front of
> each function.

That feels a bit excessive, but perhaps that is just because I'm very
accustomed to this style of conditional build. I can add the comments.

BR,
Jani.