[gthumb/ext: 19/20] Merge branch 'print' into ext

[Paolo Bacchilega <paobac src gnome org>]

commit 77ad9d63d317c7d9a038221403f921d6fcff77cc
Merge: f029e80... e1c484e...
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Wed Nov 25 17:59:30 2009 +0100

    Merge branch 'print' into ext

 configure.ac                                       |    3 +
 data/ui/preferences.ui                             |  158 ++-
 extensions/Makefile.am                             |    1 +
 .../comments/gth-metadata-provider-comment.c       |    2 +-
 extensions/exiv2/gth-metadata-provider-exiv2.c     |    2 +-
 extensions/image_print/Makefile.am                 |   39 +
 extensions/image_print/actions.c                   |   50 +
 extensions/image_print/actions.h                   |   32 +
 extensions/image_print/callbacks.c                 |  119 ++
 extensions/image_print/callbacks.h                 |   31 +
 extensions/image_print/data/Makefile.am            |   18 +
 .../image_print/data/gthumb_image_print.schemas.in |   31 +
 extensions/image_print/data/ui/Makefile.am         |    5 +
 extensions/image_print/data/ui/print-layout.ui     |  692 ++++++++++
 extensions/image_print/gth-image-info.c            |  171 +++
 extensions/image_print/gth-image-info.h            |   76 +
 extensions/image_print/gth-image-print-job.c       | 1429 ++++++++++++++++++++
 extensions/image_print/gth-image-print-job.h       |   59 +
 extensions/image_print/gth-load-image-info-task.c  |  247 ++++
 extensions/image_print/gth-load-image-info-task.h  |   59 +
 extensions/image_print/image_print.extension.in.in |   10 +
 extensions/image_print/main.c                      |   54 +
 extensions/image_print/preferences.h               |   35 +
 gthumb/Makefile.am                                 |    2 +
 gthumb/dlg-preferences.c                           |  185 +---
 gthumb/glib-utils.c                                |   28 +-
 gthumb/gth-browser.c                               |   66 +-
 gthumb/gth-main-default-metadata.c                 |    4 +-
 gthumb/gth-main.c                                  |   71 +
 gthumb/gth-main.h                                  |    5 +
 gthumb/gth-metadata-chooser.c                      |  521 +++++++
 gthumb/gth-metadata-chooser.h                      |   63 +
 gthumb/gth-metadata.h                              |    3 +-
 gthumb/gth-uri-list.c                              |    4 +-
 gthumb/pixbuf-utils.c                              |   43 +
 gthumb/pixbuf-utils.h                              |    3 +
 gthumb/typedefs.h                                  |    7 +
 37 files changed, 4031 insertions(+), 297 deletions(-)
---