[gthumb: 2/2] Merge branch 'ext-categories'

[Paolo Bacchilega <paobac src gnome org>]

commit d00eda7ab883e919b8cb2bd31e7634167e6c408a
Merge: c9c8cef f08a06d
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sat Mar 13 20:31:41 2010 +0100

    Merge branch 'ext-categories'

 data/ui/extensions.ui                              |  162 +++++++++++++++----
 extensions/bookmarks/bookmarks.extension.in.in     |    1 +
 extensions/burn_disc/burn_disc.extension.in.in     |    1 +
 extensions/catalogs/catalogs.extension.in.in       |    1 +
 extensions/change_date/change_date.extension.in.in |    1 +
 extensions/comments/comments.extension.in.in       |    1 +
 .../convert_format/convert_format.extension.in.in  |    1 +
 .../desktop_background.extension.in.in             |    1 +
 .../edit_metadata/edit_metadata.extension.in.in    |    1 +
 extensions/exiv2_tools/exiv2_tools.extension.in.in |    1 +
 .../file_manager/file_manager.extension.in.in      |    1 +
 extensions/file_tools/file_tools.extension.in.in   |    1 +
 extensions/flicker/flicker.extension.in.in         |    1 +
 .../gstreamer_tools.extension.in.in                |    1 +
 extensions/image_print/image_print.extension.in.in |    1 +
 .../image_rotation/image_rotation.extension.in.in  |    1 +
 .../image_viewer/image_viewer.extension.in.in      |    1 +
 extensions/list_tools/list_tools.extension.in.in   |    1 +
 .../photo_importer/photo_importer.extension.in.in  |    1 +
 extensions/picasaweb/picasaweb.extension.in.in     |    1 +
 .../pixbuf_savers/pixbuf_savers.extension.in.in    |    1 +
 extensions/raw_files/raw_files.extension.in.in     |    1 +
 .../red_eye_removal.extension.in.in                |    1 +
 .../rename_series/rename_series.extension.in.in    |    1 +
 .../resize_images/resize_images.extension.in.in    |    1 +
 extensions/search/search.extension.in.in           |    1 +
 extensions/slideshow/slideshow.extension.in.in     |    1 +
 gthumb/dlg-extensions.c                            |  148 +++++++++++++++++-
 gthumb/gth-extensions.c                            |    2 +
 gthumb/gth-extensions.h                            |    1 +
 30 files changed, 297 insertions(+), 42 deletions(-)
---