[eog: 2/2] Merge branch 'conditional-groups' into 'master'

[Felix Riemann <friemann src gnome org>]

commit 049984eb3c0cb588ef2cc5aaf6adead3e3cde838
Merge: fd28d1ec a4a9c3e5
Author: Felix Riemann <friemann gnome org>
Date:   Mon Jul 15 19:23:51 2019 +0000

    Merge branch 'conditional-groups' into 'master'
    
    build: Use #ifdef consistently
    
    See merge request GNOME/eog!22

 meson.build                 |  8 ++++----
 src/eog-application.c       |  2 +-
 src/eog-image-jpeg.c        |  8 ++++----
 src/eog-image-jpeg.h        |  2 +-
 src/eog-image.h             |  2 +-
 src/eog-metadata-details.c  |  4 ++--
 src/eog-metadata-details.h  |  8 ++++----
 src/eog-metadata-reader.h   |  6 +++---
 src/eog-metadata-sidebar.c  | 16 ++++++++--------
 src/eog-properties-dialog.c | 34 +++++++++++++++++-----------------
 10 files changed, 45 insertions(+), 45 deletions(-)
---