[gthumb: 15/15] Merge branch 'reuse-active-window'

[Paolo Bacchilega <paobac src gnome org>]

commit 8be4b130bfea3eb72e67e20b4fb862a3d52fe38a
Merge: 8b8142b c758a48
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Wed Nov 23 10:29:54 2011 +0100

    Merge branch 'reuse-active-window'

 data/org.gnome.gthumb.gschema.xml.in |    6 ++++-
 data/ui/preferences.ui               |   45 +++++++++++++++++++++++++++-------
 gthumb/dlg-preferences.c             |   14 ++++++++++
 gthumb/gth-file-list.c               |    2 +
 gthumb/gth-preferences.h             |    1 +
 gthumb/main.c                        |   21 +++++++++++++++-
 6 files changed, 78 insertions(+), 11 deletions(-)
---