[sane-devel] Allow users to specify the timeout of network operations (PIXMA)

[Olaf Meeuwissen]

Hi Louis,

Louis Lagendijk writes:

> On Wed, 2016-12-28 at 08:15 +1100, Frederick Zhang wrote:
>> Hi SANE developers,
>>
>> I'm using SANE to drive my Canon MG5765 and it is great except the
>> "select timed out" issue occurs quite often. My router is fairly
>> outdated and actually the machine itself lags a lot when scanning
>> with
>> high DPI. I've created a simple patch (and tested) to allow
>> specifying
>> the timeout limit in configuration file, not sure whether it would
>> help
>> or not :)
>>
> I just pushed an extended version of this patch into git. Frederick was
> so kind to test my updated version before I pushed it

Thank you (and Frederick!) for getting this in.

BTW, if you have *unpublished* local commits against origin/master, you
can rebase these with:

  git rebase origin/master master

(and resolve any conflicts that may occur; you'll have to do that when
you merge too so that's nothing extra you need to do).

This will suppress your merge commits from origin/master.

Hope this helps,
--
Olaf Meeuwissen, LPIC-2            FSF Associate Member since 2004-01-27
 GnuPG key: F84A2DD9/B3C0 2F47 EA19 64F4 9F13  F43E B8A4 A88A F84A 2DD9
 Support Free Software                        https://my.fsf.org/donate
 Join the Free Software Foundation              https://my.fsf.org/join