[gthumb: 28/129] Merge branch 'rotate'

[Paolo Bacchilega <paobac src gnome org>]

commit c73a4761955d2a4f16407780b6431848da825ce3
Merge: 10f5fec f3d5913
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Fri Apr 15 20:03:36 2011 +0200

    Merge branch 'rotate'

 data/icons/hicolor/16x16/actions/Makefile.am       |    1 +
 data/icons/hicolor/16x16/actions/tool-rotate.png   |  Bin 0 -> 703 bytes
 data/icons/hicolor/22x22/actions/Makefile.am       |    1 +
 data/icons/hicolor/22x22/actions/tool-rotate.png   |  Bin 0 -> 863 bytes
 .../contact_sheet/gth-contact-sheet-creator.c      |    2 +-
 extensions/contact_sheet/gth-contact-sheet-theme.c |    2 +-
 extensions/desktop_background/actions.c            |    2 +-
 extensions/file_tools/Makefile.am                  |    6 +
 extensions/file_tools/data/Makefile.am             |    5 +-
 .../data/gthumb_rotate_options.schemas.in          |   29 +
 extensions/file_tools/data/ui/Makefile.am          |    1 +
 extensions/file_tools/data/ui/rotate-options.ui    |  513 +++++++++++
 .../file_tools/gth-file-tool-adjust-colors.c       |    5 +-
 extensions/file_tools/gth-file-tool-crop.c         |    2 -
 extensions/file_tools/gth-file-tool-desaturate.c   |    1 +
 extensions/file_tools/gth-file-tool-enhance.c      |    3 +-
 extensions/file_tools/gth-file-tool-equalize.c     |    3 +-
 extensions/file_tools/gth-file-tool-flip.c         |    3 +-
 extensions/file_tools/gth-file-tool-mirror.c       |    3 +-
 extensions/file_tools/gth-file-tool-negative.c     |    1 +
 extensions/file_tools/gth-file-tool-resize.c       |    4 +-
 extensions/file_tools/gth-file-tool-rotate-left.c  |    1 +
 extensions/file_tools/gth-file-tool-rotate-right.c |    3 +-
 extensions/file_tools/gth-file-tool-rotate.c       |  568 +++++++++++++
 extensions/file_tools/gth-file-tool-rotate.h       |   53 ++
 extensions/file_tools/gth-file-tool-sharpen.c      |    1 -
 extensions/file_tools/gth-image-rotator.c          |  644 ++++++++++++++
 extensions/file_tools/gth-image-rotator.h          |   80 ++
 extensions/file_tools/gth-transform-resize.c       |  890 ++++++++++++++++++++
 extensions/file_tools/gth-transform-resize.h       |   60 ++
 extensions/file_tools/main.c                       |    7 +-
 extensions/file_tools/preferences.h                |    3 +
 extensions/image_print/actions.c                   |    4 +-
 extensions/image_viewer/gth-image-histogram.c      |   10 +-
 extensions/image_viewer/gth-image-viewer-page.c    |   63 +-
 extensions/image_viewer/gth-image-viewer-page.h    |    4 +
 extensions/red_eye_removal/gth-file-tool-red-eye.c |    8 +-
 gthumb/cairo-utils.c                               |  161 +++-
 gthumb/cairo-utils.h                               |  150 +++-
 gthumb/gth-histogram.c                             |   88 ++-
 gthumb/gth-histogram.h                             |   37 +-
 gthumb/gth-image-dragger.c                         |   16 +-
 gthumb/gth-image-history.c                         |   28 +-
 gthumb/gth-image-history.h                         |   13 +-
 gthumb/gth-image-navigator.c                       |   65 +-
 gthumb/gth-image-selector.c                        |  178 ++--
 gthumb/gth-image-viewer.c                          |  620 +++++++-------
 gthumb/gth-image-viewer.h                          |   17 +-
 gthumb/gtk-utils.c                                 |    3 +-
 gthumb/pixbuf-utils.c                              |   70 +-
 gthumb/pixbuf-utils.h                              |    3 +-
 51 files changed, 3794 insertions(+), 641 deletions(-)
---
diff --cc extensions/red_eye_removal/gth-file-tool-red-eye.c
index 1c615be,0418ea8..1209653
--- a/extensions/red_eye_removal/gth-file-tool-red-eye.c
+++ b/extensions/red_eye_removal/gth-file-tool-red-eye.c
@@@ -365,11 -333,14 +365,11 @@@ selector_selected_cb (GthImageSelecto
  	window = gth_file_tool_get_window (GTH_FILE_TOOL (self));
  	viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
  
 -	new_pixbuf = gth_image_viewer_page_get_pixbuf (GTH_IMAGE_VIEWER_PAGE (viewer_page));
 +	_g_object_unref (self->priv->new_pixbuf);
- 	self->priv->new_pixbuf = gdk_pixbuf_copy (gth_image_viewer_page_get_pixbuf (GTH_IMAGE_VIEWER_PAGE (viewer_page)));
- 	init_is_red (self, self->priv->new_pixbuf);
- 	if (fix_redeye (self->priv->new_pixbuf, self->priv->is_red, x, y))
- 		gth_image_viewer_page_set_pixbuf (GTH_IMAGE_VIEWER_PAGE (viewer_page), self->priv->new_pixbuf, FALSE);
++	self->priv->new_pixbuf = gth_image_viewer_page_get_pixbuf (GTH_IMAGE_VIEWER_PAGE (viewer_page));
+ 	init_is_red (self, new_pixbuf);
 -	if (fix_redeye (new_pixbuf, self->priv->is_red, x, y)) {
++	if (fix_redeye (new_pixbuf, self->priv->is_red, x, y))
+ 		gth_image_viewer_page_set_pixbuf (GTH_IMAGE_VIEWER_PAGE (viewer_page), new_pixbuf, TRUE);
 -		gth_file_tool_hide_options (GTH_FILE_TOOL (self));
 -	}
 -
 -	g_object_unref (new_pixbuf);
  }