[gthumb] removed incorrect cast from GthViewerPage to GtkWidget
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] removed incorrect cast from GthViewerPage to GtkWidget
- Date: Wed, 17 Aug 2016 17:31:03 +0000 (UTC)
commit 56be007b299b97790308fbfa01779bc4f40a485c
Author: Paolo Bacchilega <paobac src gnome org>
Date: Wed Aug 17 19:28:22 2016 +0200
removed incorrect cast from GthViewerPage to GtkWidget
extensions/desktop_background/actions.c | 2 +-
.../file_tools/gth-file-tool-adjust-colors.c | 8 ++--
.../file_tools/gth-file-tool-adjust-contrast.c | 10 +++---
extensions/file_tools/gth-file-tool-crop.c | 6 ++--
extensions/file_tools/gth-file-tool-curves.c | 10 +++---
extensions/file_tools/gth-file-tool-effects.c | 10 +++---
extensions/file_tools/gth-file-tool-flip.c | 6 ++--
extensions/file_tools/gth-file-tool-grayscale.c | 12 +++---
extensions/file_tools/gth-file-tool-mirror.c | 6 ++--
extensions/file_tools/gth-file-tool-redo.c | 8 ++--
extensions/file_tools/gth-file-tool-resize.c | 8 ++--
extensions/file_tools/gth-file-tool-rotate-left.c | 6 ++--
extensions/file_tools/gth-file-tool-rotate-right.c | 6 ++--
extensions/file_tools/gth-file-tool-rotate.c | 34 ++++++++++----------
extensions/file_tools/gth-file-tool-save-as.c | 8 ++--
extensions/file_tools/gth-file-tool-save.c | 6 ++--
extensions/file_tools/gth-file-tool-sharpen.c | 2 +-
extensions/file_tools/gth-file-tool-undo.c | 8 ++--
extensions/image_print/actions.c | 2 +-
extensions/image_rotation/callbacks.c | 12 +++---
extensions/image_viewer/gth-image-histogram.c | 2 +-
.../image_viewer/gth-image-viewer-page-tool.c | 10 +++---
.../image_viewer/gth-image-viewer-page-tool.h | 2 +-
extensions/red_eye_removal/gth-file-tool-red-eye.c | 8 ++--
gthumb/gth-browser-actions-callbacks.c | 18 +++++-----
gthumb/gth-browser.c | 4 +-
gthumb/gth-browser.h | 3 +-
gthumb/gth-viewer-page.h | 3 +-
28 files changed, 111 insertions(+), 109 deletions(-)
---
diff --git a/extensions/desktop_background/actions.c b/extensions/desktop_background/actions.c
index a927590..10a54a7 100644
--- a/extensions/desktop_background/actions.c
+++ b/extensions/desktop_background/actions.c
@@ -380,7 +380,7 @@ gth_browser_activate_set_desktop_background (GSimpleAction *action,
if (gth_main_extension_is_active ("image_viewer")
&& (gth_browser_get_file_modified (browser) || ! _gdk_pixbuf_mime_type_is_readable (mime_type)))
{
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
viewer_page = gth_browser_get_viewer_page (browser);
if (viewer_page != NULL) {
diff --git a/extensions/file_tools/gth-file-tool-adjust-colors.c
b/extensions/file_tools/gth-file-tool-adjust-colors.c
index f8a4109..26242f5 100644
--- a/extensions/file_tools/gth-file-tool-adjust-colors.c
+++ b/extensions/file_tools/gth-file-tool-adjust-colors.c
@@ -285,7 +285,7 @@ image_task_completed_cb (GthTask *task,
if (self->priv->apply_to_original) {
if (self->priv->destination != NULL) {
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
viewer_page = gth_image_viewer_page_tool_get_page (GTH_IMAGE_VIEWER_PAGE_TOOL (self));
gth_image_viewer_page_set_image (GTH_IMAGE_VIEWER_PAGE (viewer_page),
self->priv->destination, TRUE);
@@ -390,7 +390,7 @@ static GtkWidget *
gth_file_tool_adjust_colors_get_options (GthFileTool *base)
{
GthFileToolAdjustColors *self;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
GtkWidget *viewer;
cairo_surface_t *source;
GtkWidget *options;
@@ -506,7 +506,7 @@ static void
gth_file_tool_adjust_colors_destroy_options (GthFileTool *base)
{
GthFileToolAdjustColors *self;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
self = (GthFileToolAdjustColors *) base;
@@ -517,7 +517,7 @@ gth_file_tool_adjust_colors_destroy_options (GthFileTool *base)
viewer_page = gth_image_viewer_page_tool_get_page (GTH_IMAGE_VIEWER_PAGE_TOOL (self));
gth_image_viewer_page_reset_viewer_tool (GTH_IMAGE_VIEWER_PAGE (viewer_page));
- gth_viewer_page_update_sensitivity (GTH_VIEWER_PAGE (viewer_page));
+ gth_viewer_page_update_sensitivity (viewer_page);
_cairo_clear_surface (&self->priv->preview);
_cairo_clear_surface (&self->priv->destination);
diff --git a/extensions/file_tools/gth-file-tool-adjust-contrast.c
b/extensions/file_tools/gth-file-tool-adjust-contrast.c
index f413ac2..392ba62 100644
--- a/extensions/file_tools/gth-file-tool-adjust-contrast.c
+++ b/extensions/file_tools/gth-file-tool-adjust-contrast.c
@@ -359,8 +359,8 @@ image_task_completed_cb (GthTask *task,
if (self->priv->apply_to_original) {
if (self->priv->destination != NULL) {
- GtkWidget *window;
- GtkWidget *viewer_page;
+ GtkWidget *window;
+ GthViewerPage *viewer_page;
window = gth_file_tool_get_window (GTH_FILE_TOOL (self));
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
@@ -487,7 +487,7 @@ gth_file_tool_adjust_contrast_get_options (GthFileTool *base)
{
GthFileToolAdjustContrast *self;
GtkWidget *window;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
GtkWidget *viewer;
cairo_surface_t *source;
GtkWidget *options;
@@ -566,7 +566,7 @@ gth_file_tool_adjust_contrast_destroy_options (GthFileTool *base)
{
GthFileToolAdjustContrast *self;
GtkWidget *window;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
self = (GthFileToolAdjustContrast *) base;
@@ -578,7 +578,7 @@ gth_file_tool_adjust_contrast_destroy_options (GthFileTool *base)
window = gth_file_tool_get_window (GTH_FILE_TOOL (self));
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
gth_image_viewer_page_reset_viewer_tool (GTH_IMAGE_VIEWER_PAGE (viewer_page));
- gth_viewer_page_update_sensitivity (GTH_VIEWER_PAGE (viewer_page));
+ gth_viewer_page_update_sensitivity (viewer_page);
_g_clear_object (&self->priv->builder);
diff --git a/extensions/file_tools/gth-file-tool-crop.c b/extensions/file_tools/gth-file-tool-crop.c
index 5295f50..32586a8 100644
--- a/extensions/file_tools/gth-file-tool-crop.c
+++ b/extensions/file_tools/gth-file-tool-crop.c
@@ -85,7 +85,7 @@ image_task_completed_cb (GthTask *task,
{
GthFileToolCrop *self = user_data;
cairo_surface_t *destination;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
if (error != NULL) {
g_object_unref (task);
@@ -401,7 +401,7 @@ gth_file_tool_crop_get_options (GthFileTool *base)
{
GthFileToolCrop *self;
GtkWidget *window;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
GtkWidget *viewer;
cairo_surface_t *source;
GtkWidget *options;
@@ -571,7 +571,7 @@ gth_file_tool_crop_destroy_options (GthFileTool *base)
{
GthFileToolCrop *self;
GtkWidget *window;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
GtkWidget *viewer;
GSettings *viewer_settings;
diff --git a/extensions/file_tools/gth-file-tool-curves.c b/extensions/file_tools/gth-file-tool-curves.c
index f1827ab..1dc1841 100644
--- a/extensions/file_tools/gth-file-tool-curves.c
+++ b/extensions/file_tools/gth-file-tool-curves.c
@@ -218,8 +218,8 @@ image_task_completed_cb (GthTask *task,
if (self->priv->apply_to_original) {
if (self->priv->destination != NULL) {
- GtkWidget *window;
- GtkWidget *viewer_page;
+ GtkWidget *window;
+ GthViewerPage *viewer_page;
window = gth_file_tool_get_window (GTH_FILE_TOOL (self));
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
@@ -600,7 +600,7 @@ static GtkWidget *
gth_file_tool_curves_get_options (GthFileTool *base)
{
GthFileToolCurves *self;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
GtkWidget *viewer;
cairo_surface_t *source;
GtkWidget *options;
@@ -756,7 +756,7 @@ static void
gth_file_tool_curves_destroy_options (GthFileTool *base)
{
GthFileToolCurves *self;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
self = (GthFileToolCurves *) base;
@@ -767,7 +767,7 @@ gth_file_tool_curves_destroy_options (GthFileTool *base)
viewer_page = gth_image_viewer_page_tool_get_page (GTH_IMAGE_VIEWER_PAGE_TOOL (self));
gth_image_viewer_page_reset_viewer_tool (GTH_IMAGE_VIEWER_PAGE (viewer_page));
- gth_viewer_page_update_sensitivity (GTH_VIEWER_PAGE (viewer_page));
+ gth_viewer_page_update_sensitivity (viewer_page);
_cairo_clear_surface (&self->priv->preview);
_cairo_clear_surface (&self->priv->destination);
diff --git a/extensions/file_tools/gth-file-tool-effects.c b/extensions/file_tools/gth-file-tool-effects.c
index 3652cb3..8d03516 100644
--- a/extensions/file_tools/gth-file-tool-effects.c
+++ b/extensions/file_tools/gth-file-tool-effects.c
@@ -93,8 +93,8 @@ image_task_completed_cb (GthTask *task,
if (self->priv->apply_to_original) {
if (self->priv->destination != NULL) {
- GtkWidget *window;
- GtkWidget *viewer_page;
+ GtkWidget *window;
+ GthViewerPage *viewer_page;
window = gth_file_tool_get_window (GTH_FILE_TOOL (self));
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
@@ -202,7 +202,7 @@ gth_file_tool_effects_get_options (GthFileTool *base)
{
GthFileToolEffects *self;
GtkWidget *window;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
GtkWidget *viewer;
cairo_surface_t *source;
GtkWidget *options;
@@ -264,7 +264,7 @@ gth_file_tool_effects_destroy_options (GthFileTool *base)
{
GthFileToolEffects *self;
GtkWidget *window;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
self = (GthFileToolEffects *) base;
@@ -276,7 +276,7 @@ gth_file_tool_effects_destroy_options (GthFileTool *base)
window = gth_file_tool_get_window (GTH_FILE_TOOL (self));
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
gth_image_viewer_page_reset_viewer_tool (GTH_IMAGE_VIEWER_PAGE (viewer_page));
- gth_viewer_page_update_sensitivity (GTH_VIEWER_PAGE (viewer_page));
+ gth_viewer_page_update_sensitivity (viewer_page);
_g_clear_object (&self->priv->builder);
diff --git a/extensions/file_tools/gth-file-tool-flip.c b/extensions/file_tools/gth-file-tool-flip.c
index f5f40f4..ebad985 100644
--- a/extensions/file_tools/gth-file-tool-flip.c
+++ b/extensions/file_tools/gth-file-tool-flip.c
@@ -50,9 +50,9 @@ flip_exec (GthAsyncTask *task,
static void
gth_file_tool_flip_activate (GthFileTool *base)
{
- GtkWidget *window;
- GtkWidget *viewer_page;
- GthTask *task;
+ GtkWidget *window;
+ GthViewerPage *viewer_page;
+ GthTask *task;
window = gth_file_tool_get_window (base);
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
diff --git a/extensions/file_tools/gth-file-tool-grayscale.c b/extensions/file_tools/gth-file-tool-grayscale.c
index 30cb79e..be1a845 100644
--- a/extensions/file_tools/gth-file-tool-grayscale.c
+++ b/extensions/file_tools/gth-file-tool-grayscale.c
@@ -197,8 +197,8 @@ image_task_completed_cb (GthTask *task,
if (self->priv->apply_to_original) {
if (self->priv->destination != NULL) {
- GtkWidget *window;
- GtkWidget *viewer_page;
+ GtkWidget *window;
+ GthViewerPage *viewer_page;
window = gth_file_tool_get_window (GTH_FILE_TOOL (self));
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
@@ -324,7 +324,7 @@ gth_file_tool_grayscale_get_options (GthFileTool *base)
{
GthFileToolGrayscale *self;
GtkWidget *window;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
GtkWidget *viewer;
cairo_surface_t *source;
GtkWidget *options;
@@ -402,8 +402,8 @@ static void
gth_file_tool_grayscale_destroy_options (GthFileTool *base)
{
GthFileToolGrayscale *self;
- GtkWidget *window;
- GtkWidget *viewer_page;
+ GtkWidget *window;
+ GthViewerPage *viewer_page;
self = (GthFileToolGrayscale *) base;
@@ -415,7 +415,7 @@ gth_file_tool_grayscale_destroy_options (GthFileTool *base)
window = gth_file_tool_get_window (GTH_FILE_TOOL (self));
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
gth_image_viewer_page_reset_viewer_tool (GTH_IMAGE_VIEWER_PAGE (viewer_page));
- gth_viewer_page_update_sensitivity (GTH_VIEWER_PAGE (viewer_page));
+ gth_viewer_page_update_sensitivity (viewer_page);
_g_clear_object (&self->priv->builder);
diff --git a/extensions/file_tools/gth-file-tool-mirror.c b/extensions/file_tools/gth-file-tool-mirror.c
index cdc8017..650ea48 100644
--- a/extensions/file_tools/gth-file-tool-mirror.c
+++ b/extensions/file_tools/gth-file-tool-mirror.c
@@ -50,9 +50,9 @@ mirror_exec (GthAsyncTask *task,
static void
gth_file_tool_mirror_activate (GthFileTool *base)
{
- GtkWidget *window;
- GtkWidget *viewer_page;
- GthTask *task;
+ GtkWidget *window;
+ GthViewerPage *viewer_page;
+ GthTask *task;
window = gth_file_tool_get_window (base);
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
diff --git a/extensions/file_tools/gth-file-tool-redo.c b/extensions/file_tools/gth-file-tool-redo.c
index 4d95d4c..cf004f5 100644
--- a/extensions/file_tools/gth-file-tool-redo.c
+++ b/extensions/file_tools/gth-file-tool-redo.c
@@ -31,8 +31,8 @@ G_DEFINE_TYPE (GthFileToolRedo, gth_file_tool_redo, GTH_TYPE_FILE_TOOL)
static void
gth_file_tool_redo_update_sensitivity (GthFileTool *base)
{
- GtkWidget *window;
- GtkWidget *viewer_page;
+ GtkWidget *window;
+ GthViewerPage *viewer_page;
window = gth_file_tool_get_window (base);
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
@@ -46,8 +46,8 @@ gth_file_tool_redo_update_sensitivity (GthFileTool *base)
static void
gth_file_tool_redo_activate (GthFileTool *base)
{
- GtkWidget *window;
- GtkWidget *viewer_page;
+ GtkWidget *window;
+ GthViewerPage *viewer_page;
window = gth_file_tool_get_window (base);
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
diff --git a/extensions/file_tools/gth-file-tool-resize.c b/extensions/file_tools/gth-file-tool-resize.c
index a626f07..dac0379 100644
--- a/extensions/file_tools/gth-file-tool-resize.c
+++ b/extensions/file_tools/gth-file-tool-resize.c
@@ -88,7 +88,7 @@ resize_task_completed_cb (GthTask *task,
{
GthFileToolResize *self = user_data;
GtkWidget *window;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
self->priv->resize_task = NULL;
@@ -121,7 +121,7 @@ resize_task_completed_cb (GthTask *task,
self->priv->new_image,
-1,
TRUE);
- gth_viewer_page_focus (GTH_VIEWER_PAGE (viewer_page));
+ gth_viewer_page_focus (viewer_page);
gth_file_tool_hide_options (GTH_FILE_TOOL (self));
}
else {
@@ -513,7 +513,7 @@ gth_file_tool_resize_get_options (GthFileTool *base)
GthFileToolResize *self = (GthFileToolResize *) base;
cairo_surface_t *source;
GtkWidget *window;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
GtkWidget *viewer;
GtkAllocation allocation;
int preview_width;
@@ -672,7 +672,7 @@ gth_file_tool_resize_destroy_options (GthFileTool *base)
{
GthFileToolResize *self;
GtkWidget *window;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
GtkWidget *viewer;
GSettings *viewer_settings;
diff --git a/extensions/file_tools/gth-file-tool-rotate-left.c
b/extensions/file_tools/gth-file-tool-rotate-left.c
index d44edca..7f3f1a1 100644
--- a/extensions/file_tools/gth-file-tool-rotate-left.c
+++ b/extensions/file_tools/gth-file-tool-rotate-left.c
@@ -50,9 +50,9 @@ rotate_left_exec (GthAsyncTask *task,
static void
gth_file_tool_rotate_left_activate (GthFileTool *base)
{
- GtkWidget *window;
- GtkWidget *viewer_page;
- GthTask *task;
+ GtkWidget *window;
+ GthViewerPage *viewer_page;
+ GthTask *task;
window = gth_file_tool_get_window (base);
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
diff --git a/extensions/file_tools/gth-file-tool-rotate-right.c
b/extensions/file_tools/gth-file-tool-rotate-right.c
index 83d59dd..2f7dd0f 100644
--- a/extensions/file_tools/gth-file-tool-rotate-right.c
+++ b/extensions/file_tools/gth-file-tool-rotate-right.c
@@ -50,9 +50,9 @@ rotate_right_exec (GthAsyncTask *task,
static void
gth_file_tool_rotate_right_activate (GthFileTool *base)
{
- GtkWidget *window;
- GtkWidget *viewer_page;
- GthTask *task;
+ GtkWidget *window;
+ GthViewerPage *viewer_page;
+ GthTask *task;
window = gth_file_tool_get_window (base);
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
diff --git a/extensions/file_tools/gth-file-tool-rotate.c b/extensions/file_tools/gth-file-tool-rotate.c
index 9292b1e..fdffe7d 100644
--- a/extensions/file_tools/gth-file-tool-rotate.c
+++ b/extensions/file_tools/gth-file-tool-rotate.c
@@ -145,12 +145,12 @@ static void
alignment_changed_cb (GthImageLineTool *line_tool,
GthFileToolRotate *self)
{
- GtkWidget *window;
- GtkWidget *viewer_page;
- GtkWidget *viewer;
- GdkPoint p1;
- GdkPoint p2;
- double angle;
+ GtkWidget *window;
+ GthViewerPage *viewer_page;
+ GtkWidget *viewer;
+ GdkPoint p1;
+ GdkPoint p2;
+ double angle;
window = gth_file_tool_get_window (GTH_FILE_TOOL (self));
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
@@ -177,9 +177,9 @@ static void
alignment_cancel_button_clicked_cb (GtkButton *button,
GthFileToolRotate *self)
{
- GtkWidget *window;
- GtkWidget *viewer_page;
- GtkWidget *viewer;
+ GtkWidget *window;
+ GthViewerPage *viewer_page;
+ GtkWidget *viewer;
window = gth_file_tool_get_window (GTH_FILE_TOOL (self));
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
@@ -193,9 +193,9 @@ static void
align_button_clicked_cb (GtkButton *button,
GthFileToolRotate *self)
{
- GtkWidget *window;
- GtkWidget *viewer_page;
- GtkWidget *viewer;
+ GtkWidget *window;
+ GthViewerPage *viewer_page;
+ GtkWidget *viewer;
window = gth_file_tool_get_window (GTH_FILE_TOOL (self));
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
@@ -353,7 +353,7 @@ gth_file_tool_rotate_get_options (GthFileTool *base)
{
GthFileToolRotate *self;
GtkWidget *window;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
GtkWidget *viewer;
char *color_spec;
GdkRGBA background_color;
@@ -436,7 +436,7 @@ gth_file_tool_rotate_get_options (GthFileTool *base)
gth_image_viewer_page_set_image (GTH_IMAGE_VIEWER_PAGE (viewer_page), self->priv->image, FALSE);
viewer = gth_image_viewer_page_get_image_viewer (GTH_IMAGE_VIEWER_PAGE (viewer_page));
gth_image_viewer_set_tool (GTH_IMAGE_VIEWER (viewer), self->priv->rotator);
- gth_viewer_page_update_sensitivity (GTH_VIEWER_PAGE (viewer_page));
+ gth_viewer_page_update_sensitivity (viewer_page);
self->priv->crop_enabled = TRUE;
self->priv->crop_region.x = 0;
@@ -518,7 +518,7 @@ gth_file_tool_rotate_destroy_options (GthFileTool *base)
{
GthFileToolRotate *self;
GtkWidget *window;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
self = (GthFileToolRotate *) base;
@@ -542,7 +542,7 @@ gth_file_tool_rotate_destroy_options (GthFileTool *base)
window = gth_file_tool_get_window (GTH_FILE_TOOL (self));
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
gth_image_viewer_page_reset_viewer_tool (GTH_IMAGE_VIEWER_PAGE (viewer_page));
- gth_viewer_page_update_sensitivity (GTH_VIEWER_PAGE (viewer_page));
+ gth_viewer_page_update_sensitivity (viewer_page);
cairo_surface_destroy (self->priv->image);
self->priv->image = NULL;
@@ -557,7 +557,7 @@ gth_file_tool_rotate_apply_options (GthFileTool *base)
{
GthFileToolRotate *self;
GtkWidget *window;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
GthTask *task;
self = (GthFileToolRotate *) base;
diff --git a/extensions/file_tools/gth-file-tool-save-as.c b/extensions/file_tools/gth-file-tool-save-as.c
index d177da5..6bfe899 100644
--- a/extensions/file_tools/gth-file-tool-save-as.c
+++ b/extensions/file_tools/gth-file-tool-save-as.c
@@ -35,7 +35,7 @@ gth_file_tool_save_as_update_sensitivity (GthFileTool *base)
window = gth_file_tool_get_window (base);
- can_save = gth_viewer_page_can_save (GTH_VIEWER_PAGE (gth_browser_get_viewer_page (GTH_BROWSER
(window))));
+ can_save = gth_viewer_page_can_save (gth_browser_get_viewer_page (GTH_BROWSER (window)));
can_save = can_save && (gth_browser_get_current_file (GTH_BROWSER (window)) != NULL);
gtk_widget_set_sensitive (GTK_WIDGET (base), can_save);
}
@@ -44,12 +44,12 @@ gth_file_tool_save_as_update_sensitivity (GthFileTool *base)
static void
gth_file_tool_save_as_activate (GthFileTool *tool)
{
- GtkWidget *window;
- GtkWidget *viewer_page;
+ GtkWidget *window;
+ GthViewerPage *viewer_page;
window = gth_file_tool_get_window (tool);
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
- gth_viewer_page_save_as (GTH_VIEWER_PAGE (viewer_page), NULL, NULL);
+ gth_viewer_page_save_as (viewer_page, NULL, NULL);
}
diff --git a/extensions/file_tools/gth-file-tool-save.c b/extensions/file_tools/gth-file-tool-save.c
index a9c5850..7475063 100644
--- a/extensions/file_tools/gth-file-tool-save.c
+++ b/extensions/file_tools/gth-file-tool-save.c
@@ -40,12 +40,12 @@ gth_file_tool_save_update_sensitivity (GthFileTool *base)
static void
gth_file_tool_save_activate (GthFileTool *tool)
{
- GtkWidget *window;
- GtkWidget *viewer_page;
+ GtkWidget *window;
+ GthViewerPage *viewer_page;
window = gth_file_tool_get_window (tool);
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
- gth_viewer_page_save (GTH_VIEWER_PAGE (viewer_page), NULL, NULL, NULL);
+ gth_viewer_page_save (viewer_page, NULL, NULL, NULL);
}
diff --git a/extensions/file_tools/gth-file-tool-sharpen.c b/extensions/file_tools/gth-file-tool-sharpen.c
index a3a500c..cbd6938 100644
--- a/extensions/file_tools/gth-file-tool-sharpen.c
+++ b/extensions/file_tools/gth-file-tool-sharpen.c
@@ -313,7 +313,7 @@ static void
gth_file_tool_sharpen_apply_options (GthFileTool *base)
{
GthFileToolSharpen *self;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
SharpenData *sharpen_data;
GthTask *task;
diff --git a/extensions/file_tools/gth-file-tool-undo.c b/extensions/file_tools/gth-file-tool-undo.c
index 001ca70..7a485a7 100644
--- a/extensions/file_tools/gth-file-tool-undo.c
+++ b/extensions/file_tools/gth-file-tool-undo.c
@@ -31,8 +31,8 @@ G_DEFINE_TYPE (GthFileToolUndo, gth_file_tool_undo, GTH_TYPE_FILE_TOOL)
static void
gth_file_tool_undo_update_sensitivity (GthFileTool *base)
{
- GtkWidget *window;
- GtkWidget *viewer_page;
+ GtkWidget *window;
+ GthViewerPage *viewer_page;
window = gth_file_tool_get_window (base);
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
@@ -46,8 +46,8 @@ gth_file_tool_undo_update_sensitivity (GthFileTool *base)
static void
gth_file_tool_undo_activate (GthFileTool *base)
{
- GtkWidget *window;
- GtkWidget *viewer_page;
+ GtkWidget *window;
+ GthViewerPage *viewer_page;
window = gth_file_tool_get_window (base);
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
diff --git a/extensions/image_print/actions.c b/extensions/image_print/actions.c
index ed6ecfe..f2799f3 100644
--- a/extensions/image_print/actions.c
+++ b/extensions/image_print/actions.c
@@ -41,7 +41,7 @@ gth_browser_activate_print (GSimpleAction *action,
file_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items);
if (file_list != NULL) {
cairo_surface_t *current_image;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
GthImagePrintJob *print_job;
GError *error = NULL;
diff --git a/extensions/image_rotation/callbacks.c b/extensions/image_rotation/callbacks.c
index 6a5186f..e5b219b 100644
--- a/extensions/image_rotation/callbacks.c
+++ b/extensions/image_rotation/callbacks.c
@@ -144,8 +144,8 @@ viewer_image_changed_cb (GtkWidget *widget,
return;
if ((data->buttons[0] != NULL) && (data->buttons[1] != NULL)) {
- GtkWidget *viewer_page = gth_browser_get_viewer_page (browser);
- gboolean visible = FALSE;
+ GthViewerPage *viewer_page = gth_browser_get_viewer_page (browser);
+ gboolean visible = FALSE;
if (GTH_IS_IMAGE_VIEWER_PAGE (viewer_page)) {
GtkWidget *image_viewer = gth_image_viewer_page_get_image_viewer
(GTH_IMAGE_VIEWER_PAGE (viewer_page));
@@ -161,8 +161,8 @@ viewer_image_changed_cb (GtkWidget *widget,
void
ir__gth_browser_activate_viewer_page_cb (GthBrowser *browser)
{
- BrowserData *data;
- GtkWidget *viewer_page;
+ BrowserData *data;
+ GthViewerPage *viewer_page;
data = g_object_get_data (G_OBJECT (browser), BROWSER_DATA_KEY);
g_return_if_fail (data != NULL);
@@ -197,8 +197,8 @@ ir__gth_browser_activate_viewer_page_cb (GthBrowser *browser)
void
ir__gth_browser_deactivate_viewer_page_cb (GthBrowser *browser)
{
- BrowserData *data;
- GtkWidget *viewer_page;
+ BrowserData *data;
+ GthViewerPage *viewer_page;
data = g_object_get_data (G_OBJECT (browser), BROWSER_DATA_KEY);
g_return_if_fail (data != NULL);
diff --git a/extensions/image_viewer/gth-image-histogram.c b/extensions/image_viewer/gth-image-histogram.c
index fc1a4fb..c6766b4 100644
--- a/extensions/image_viewer/gth-image-histogram.c
+++ b/extensions/image_viewer/gth-image-histogram.c
@@ -56,7 +56,7 @@ gth_image_histogram_real_set_file (GthPropertyView *base,
{
GthImageHistogram *self = GTH_IMAGE_HISTOGRAM (base);
GthBrowser *browser;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
if (file_data == NULL) {
gth_histogram_calculate_for_image (self->priv->histogram, NULL);
diff --git a/extensions/image_viewer/gth-image-viewer-page-tool.c
b/extensions/image_viewer/gth-image-viewer-page-tool.c
index 4d55b96..c82b7ed 100644
--- a/extensions/image_viewer/gth-image-viewer-page-tool.c
+++ b/extensions/image_viewer/gth-image-viewer-page-tool.c
@@ -66,7 +66,7 @@ gth_image_viewer_page_tool_activate (GthFileTool *base)
{
GthImageViewerPageTool *self = (GthImageViewerPageTool *) base;
GtkWidget *window;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
/* load the original image */
@@ -103,7 +103,7 @@ gth_image_viewer_page_tool_cancel (GthFileTool *base)
static void
gth_image_viewer_page_tool_update_sensitivity (GthFileTool *base)
{
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
viewer_page = gth_image_viewer_page_tool_get_page (GTH_IMAGE_VIEWER_PAGE_TOOL (base));
gtk_widget_set_sensitive (GTK_WIDGET (base), viewer_page != NULL);
@@ -185,11 +185,11 @@ gth_image_viewer_page_tool_get_task (GthImageViewerPageTool *self)
}
-GtkWidget *
+GthViewerPage *
gth_image_viewer_page_tool_get_page (GthImageViewerPageTool *self)
{
- GtkWidget *window;
- GtkWidget *viewer_page;
+ GtkWidget *window;
+ GthViewerPage *viewer_page;
window = gth_file_tool_get_window (GTH_FILE_TOOL (self));
viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
diff --git a/extensions/image_viewer/gth-image-viewer-page-tool.h
b/extensions/image_viewer/gth-image-viewer-page-tool.h
index 52b4a89..1f38e74 100644
--- a/extensions/image_viewer/gth-image-viewer-page-tool.h
+++ b/extensions/image_viewer/gth-image-viewer-page-tool.h
@@ -55,7 +55,7 @@ struct _GthImageViewerPageToolClass {
GType gth_image_viewer_page_tool_get_type (void);
cairo_surface_t * gth_image_viewer_page_tool_get_source (GthImageViewerPageTool *self);
GthTask * gth_image_viewer_page_tool_get_task (GthImageViewerPageTool *self);
-GtkWidget * gth_image_viewer_page_tool_get_page (GthImageViewerPageTool *self);
+GthViewerPage * gth_image_viewer_page_tool_get_page (GthImageViewerPageTool
*self);
void gth_image_viewer_page_tool_reset_image (GthImageViewerPageTool *self);
G_END_DECLS
diff --git a/extensions/red_eye_removal/gth-file-tool-red-eye.c
b/extensions/red_eye_removal/gth-file-tool-red-eye.c
index 27152dc..8e9db65 100644
--- a/extensions/red_eye_removal/gth-file-tool-red-eye.c
+++ b/extensions/red_eye_removal/gth-file-tool-red-eye.c
@@ -306,7 +306,7 @@ selector_selected_cb (GthImageSelector *selector,
int y,
GthFileToolRedEye *self)
{
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
viewer_page = gth_image_viewer_page_tool_get_page (GTH_IMAGE_VIEWER_PAGE_TOOL (self));
@@ -334,7 +334,7 @@ gth_file_tool_red_eye_get_options (GthFileTool *base)
{
GthFileToolRedEye *self;
GtkWidget *window;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
GtkWidget *viewer;
GtkWidget *options;
@@ -373,7 +373,7 @@ gth_file_tool_red_eye_destroy_options (GthFileTool *base)
{
GthFileToolRedEye *self;
GtkWidget *window;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
self = (GthFileToolRedEye *) base;
@@ -394,7 +394,7 @@ static void
gth_file_tool_red_eye_apply_options (GthFileTool *base)
{
GthFileToolRedEye *self;
- GtkWidget *viewer_page;
+ GthViewerPage *viewer_page;
GtkWidget *viewer;
self = (GthFileToolRedEye *) base;
diff --git a/gthumb/gth-browser-actions-callbacks.c b/gthumb/gth-browser-actions-callbacks.c
index d2eb68e..9ff0c59 100644
--- a/gthumb/gth-browser-actions-callbacks.c
+++ b/gthumb/gth-browser-actions-callbacks.c
@@ -334,14 +334,14 @@ gth_browser_activate_revert_to_saved (GSimpleAction *action,
GVariant *parameter,
gpointer user_data)
{
- GthBrowser *browser = user_data;
- GtkWidget *viewer_page;
+ GthBrowser *browser = user_data;
+ GthViewerPage *viewer_page;
viewer_page = gth_browser_get_viewer_page (browser);
if (viewer_page == NULL)
return;
- gth_viewer_page_revert (GTH_VIEWER_PAGE (viewer_page));
+ gth_viewer_page_revert (viewer_page);
}
@@ -350,14 +350,14 @@ gth_browser_activate_save (GSimpleAction *action,
GVariant *parameter,
gpointer user_data)
{
- GthBrowser *browser = user_data;
- GtkWidget *viewer_page;
+ GthBrowser *browser = user_data;
+ GthViewerPage *viewer_page;
viewer_page = gth_browser_get_viewer_page (browser);
if (viewer_page == NULL)
return;
- gth_viewer_page_save (GTH_VIEWER_PAGE (viewer_page), NULL, NULL, browser);
+ gth_viewer_page_save (viewer_page, NULL, NULL, browser);
}
@@ -366,14 +366,14 @@ gth_browser_activate_save_as (GSimpleAction *action,
GVariant *parameter,
gpointer user_data)
{
- GthBrowser *browser = user_data;
- GtkWidget *viewer_page;
+ GthBrowser *browser = user_data;
+ GthViewerPage *viewer_page;
viewer_page = gth_browser_get_viewer_page (browser);
if (viewer_page == NULL)
return;
- gth_viewer_page_save_as (GTH_VIEWER_PAGE (viewer_page), NULL, NULL);
+ gth_viewer_page_save_as (viewer_page, NULL, NULL);
}
diff --git a/gthumb/gth-browser.c b/gthumb/gth-browser.c
index d2bd61c..6f65bf0 100644
--- a/gthumb/gth-browser.c
+++ b/gthumb/gth-browser.c
@@ -5814,10 +5814,10 @@ gth_browser_get_viewer_widget (GthBrowser *browser)
}
-GtkWidget *
+GthViewerPage *
gth_browser_get_viewer_page (GthBrowser *browser)
{
- return (GtkWidget *) browser->priv->viewer_page;
+ return browser->priv->viewer_page;
}
diff --git a/gthumb/gth-browser.h b/gthumb/gth-browser.h
index 57aef12..2c4c06e 100644
--- a/gthumb/gth-browser.h
+++ b/gthumb/gth-browser.h
@@ -28,6 +28,7 @@
#include "gth-image.h"
#include "gth-menu-manager.h"
#include "gth-task.h"
+#include "gth-viewer-page.h"
#include "gth-window.h"
#include "typedefs.h"
@@ -221,7 +222,7 @@ gboolean gth_browser_viewer_key_press_cb (GthBrowser *browser,
void gth_browser_set_viewer_widget (GthBrowser *browser,
GtkWidget *widget);
GtkWidget * gth_browser_get_viewer_widget (GthBrowser *browser);
-GtkWidget * gth_browser_get_viewer_page (GthBrowser *browser);
+GthViewerPage * gth_browser_get_viewer_page (GthBrowser *browser);
GtkWidget * gth_browser_get_viewer_sidebar (GthBrowser *browser);
gboolean gth_browser_show_next_image (GthBrowser *browser,
gboolean skip_broken,
diff --git a/gthumb/gth-viewer-page.h b/gthumb/gth-viewer-page.h
index 9e912ab..02ee2c8 100644
--- a/gthumb/gth-viewer-page.h
+++ b/gthumb/gth-viewer-page.h
@@ -23,11 +23,12 @@
#define GTH_VIEWER_PAGE_H
#include <gtk/gtk.h>
-#include "gth-browser.h"
#include "gth-file-data.h"
G_BEGIN_DECLS
+typedef struct _GthBrowser GthBrowser;
+
#define GTH_TYPE_VIEWER_PAGE (gth_viewer_page_get_type ())
#define GTH_VIEWER_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_VIEWER_PAGE, GthViewerPage))
#define GTH_IS_VIEWER_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_VIEWER_PAGE))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
