[gthumb: 14/15] Merge branch 'grid-view'

[Paolo Bacchilega <paobac src gnome org>]

commit 8b8142bff203da5eb9da0cd9461d595028e8460c
Merge: 5717e7a d0b2ca8
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Wed Nov 23 10:28:50 2011 +0100

    Merge branch 'grid-view'

 data/Makefile.am                                   |    4 +
 data/filmholes.png                                 |  Bin 0 -> 173 bytes
 extensions/catalogs/gth-organize-task.c            |    2 +-
 extensions/edit_metadata/gth-edit-comment-page.c   |    2 +-
 extensions/facebook/dlg-export-to-facebook.c       |    3 +-
 extensions/find_duplicates/gth-find-duplicates.c   |    2 +-
 extensions/flicker_utils/dlg-export-to-flickr.c    |    3 +-
 extensions/flicker_utils/dlg-import-from-flickr.c  |    3 +-
 extensions/photo_importer/dlg-photo-importer.c     |    2 +-
 extensions/photobucket/dlg-export-to-photobucket.c |    3 +-
 extensions/picasaweb/dlg-export-to-picasaweb.c     |    3 +-
 extensions/picasaweb/dlg-import-from-picasaweb.c   |    3 +-
 gthumb/Makefile.am                                 |   18 +-
 gthumb/cairo-utils.c                               |   12 +
 gthumb/cairo-utils.h                               |    5 +-
 gthumb/gth-browser-actions-entries.h               |    2 +-
 gthumb/gth-browser.c                               |   18 +-
 gthumb/gth-cell-renderer-caption.c                 |  374 --
 gthumb/gth-cell-renderer-caption.h                 |   55 -
 gthumb/gth-cell-renderer-thumbnail.c               |  483 ---
 gthumb/gth-cell-renderer-thumbnail.h               |   54 -
 gthumb/gth-file-list.c                             |  201 +-
 gthumb/gth-file-list.h                             |    4 +-
 gthumb/gth-file-store.c                            |  117 +-
 gthumb/gth-file-store.h                            |   12 +-
 gthumb/gth-file-view.c                             |  175 +-
 gthumb/gth-file-view.h                             |   48 +-
 gthumb/gth-grid-view.c                             | 3731 ++++++++++++++++++++
 gthumb/gth-grid-view.h                             |   94 +
 gthumb/gth-icon-view.c                             |  939 -----
 gthumb/gth-icon-view.h                             |   59 -
 gthumb/gth-list-view.c                             |  605 ----
 gthumb/gth-list-view.h                             |   59 -
 gthumb/gth-marshal.list                            |    3 +
 gthumb/main.c                                      |   38 +-
 35 files changed, 4111 insertions(+), 3025 deletions(-)
---