From: Klaus Ethgen <Klaus@Ethgen.de>
Date: Sat, 8 Jul 2017 09:24:19 +0000 (+0100)
Subject: Merge merge-requests '495' and '458'
X-Git-Tag: v1.4~139
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=fa50b16b12ad2ec40db782bb8342d586e30e56e1

Merge merge-requests '495' and '458'

* github/merge-requests/495:
  Avoid c99 feature
  *phew* commented and simplified.
  Hopefully make it not crash
  It compiles!
  Remove all references to "IconData"
  update .gitignore
  Refactor: move view_file implementations to their own subdirectory.

* github/merge-requests/458:
  Add the ability to use regular expressions for Pan View keyword filtering.
  Add pan filtering to all of the pan view modes
  Revamp pan view filtering to support different modes and grouping.
  Move filter code into pan-fiew-filter.{c,h}
  Adds a keyword filtering feature to Timeline PanView.
  Pull the search UI construction code out into a distinct function.
  Start moving pan view search code to its own module
---

fa50b16b12ad2ec40db782bb8342d586e30e56e1