summaryrefslogtreecommitdiff
path: root/src/PhotoPage.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-15 20:38:57 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-15 20:38:57 +0100
commitf1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch)
treea1f2ab30332a6383b0677bfcc2aec687b98851d6 /src/PhotoPage.c
parentf8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff)
parentede50c561ec9811704821a9ea0f04c3d6c20b5af (diff)
Merge branch 'release/0.26.4-1'0.26.4-1
Diffstat (limited to 'src/PhotoPage.c')
-rw-r--r--src/PhotoPage.c7320
1 files changed, 3645 insertions, 3675 deletions
diff --git a/src/PhotoPage.c b/src/PhotoPage.c
index 63363e0..65c465c 100644
--- a/src/PhotoPage.c
+++ b/src/PhotoPage.c
@@ -1,4 +1,4 @@
-/* PhotoPage.c generated by valac 0.34.7, the Vala compiler
+/* PhotoPage.c generated by valac 0.36.6, the Vala compiler
* generated from PhotoPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1582,15 +1582,15 @@ GType photo_exception_get_type (void) G_GNUC_CONST;
GType backing_fetch_mode_get_type (void) G_GNUC_CONST;
GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error);
void scaling_for_original (Scaling* result);
-static void zoom_buffer_iso_source_fetch_job_finalize (BackgroundJob* obj);
+static void zoom_buffer_iso_source_fetch_job_finalize (BackgroundJob * obj);
#define ZOOM_BUFFER_TRANSFORMATION_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, ZoomBufferTransformationJobPrivate))
enum {
ZOOM_BUFFER_TRANSFORMATION_JOB_DUMMY_PROPERTY
};
static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base);
void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPixbuf* source, GdkPixbuf* dest, GCancellable* cancellable);
-static void zoom_buffer_transformation_job_finalize (BackgroundJob* obj);
-static void zoom_buffer_finalize (GObject* obj);
+static void zoom_buffer_transformation_job_finalize (BackgroundJob * obj);
+static void zoom_buffer_finalize (GObject * obj);
GType page_window_get_type (void) G_GNUC_CONST;
GType fullscreen_window_get_type (void) G_GNUC_CONST;
gpointer injection_group_ref (gpointer instance);
@@ -1815,7 +1815,7 @@ void editing_host_page_notify_photo_backing_missing (EditingHostPage* self, Phot
GType pixbuf_cache_pixbuf_cache_batch_get_type (void) G_GNUC_CONST;
PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_new (void);
PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_construct (GType object_type);
-gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource** next, DataSource** prev, const gchar* type_selector);
+gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource* * next, DataSource* * prev, const gchar* type_selector);
#define PHOTO_TYPENAME "thumb"
GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource* home, const gchar* typename);
void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch* batch, gboolean force);
@@ -2112,8 +2112,8 @@ cairo_t* single_photo_page_get_cairo_context (SinglePhotoPage* self);
GdkPixbuf* single_photo_page_get_scaled_pixbuf (SinglePhotoPage* self);
EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type, GtkWindow* container, GdkWindow* drawing_window, Photo* photo, cairo_t* default_ctx, Dimensions* surface_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position);
static void editing_host_page_editing_host_canvas_real_repaint (EditingToolsPhotoCanvas* base);
-static void editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCanvas* obj);
-static void editing_host_page_finalize (GObject* obj);
+static void editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCanvas * obj);
+static void editing_host_page_finalize (GObject * obj);
GType library_photo_page_get_type (void) G_GNUC_CONST;
GType raw_developer_get_type (void) G_GNUC_CONST;
GType checkerboard_page_get_type (void) G_GNUC_CONST;
@@ -2243,9 +2243,9 @@ InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_len
InjectionGroup* injection_group_new (const gchar* path);
InjectionGroup* injection_group_construct (GType object_type, const gchar* path);
void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator);
-static void _vala_array_add82 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add83 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add84 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add82 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add83 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add84 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboolean display);
void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, gboolean display);
static void library_photo_page_real_update_actions (Page* base, gint selected_count, gint count);
@@ -2395,7 +2395,7 @@ enum {
};
static gboolean library_photo_page_library_photo_page_view_filter_real_predicate (ViewFilter* base, DataView* view);
ViewFilter* view_filter_construct (GType object_type);
-static void library_photo_page_finalize (GObject* obj);
+static void library_photo_page_finalize (GObject * obj);
static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
@@ -2422,13 +2422,13 @@ static gpointer _g_object_ref0 (gpointer self) {
ZoomBuffer* zoom_buffer_construct (GType object_type, SinglePhotoPage* parent_page, Photo* backing_photo, GdkPixbuf* preview_image) {
ZoomBuffer * self = NULL;
- SinglePhotoPage* _tmp0_ = NULL;
- SinglePhotoPage* _tmp1_ = NULL;
- GdkPixbuf* _tmp2_ = NULL;
- GdkPixbuf* _tmp3_ = NULL;
- Photo* _tmp4_ = NULL;
- Photo* _tmp5_ = NULL;
- Workers* _tmp6_ = NULL;
+ SinglePhotoPage* _tmp0_;
+ SinglePhotoPage* _tmp1_;
+ GdkPixbuf* _tmp2_;
+ GdkPixbuf* _tmp3_;
+ Photo* _tmp4_;
+ Photo* _tmp5_;
+ Workers* _tmp6_;
#line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (parent_page), NULL);
#line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2496,31 +2496,31 @@ static void _zoom_buffer_on_iso_transformation_complete_completion_callback (Bac
static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, BackgroundJob* job) {
ZoomBufferIsoSourceFetchJob* fetch_job = NULL;
- BackgroundJob* _tmp0_ = NULL;
- ZoomBufferIsoSourceFetchJob* _tmp1_ = NULL;
- ZoomBufferIsoSourceFetchJob* _tmp2_ = NULL;
- GdkPixbuf* _tmp3_ = NULL;
- ZoomBufferIsoSourceFetchJob* _tmp4_ = NULL;
- GdkPixbuf* _tmp5_ = NULL;
- GdkPixbuf* _tmp6_ = NULL;
- GdkPixbuf* _tmp7_ = NULL;
- gint _tmp8_ = 0;
- gint _tmp9_ = 0;
- GdkPixbuf* _tmp10_ = NULL;
- gint _tmp11_ = 0;
- gint _tmp12_ = 0;
- gboolean _tmp21_ = FALSE;
+ BackgroundJob* _tmp0_;
+ ZoomBufferIsoSourceFetchJob* _tmp1_;
+ ZoomBufferIsoSourceFetchJob* _tmp2_;
+ GdkPixbuf* _tmp3_;
+ ZoomBufferIsoSourceFetchJob* _tmp4_;
+ GdkPixbuf* _tmp5_;
+ GdkPixbuf* _tmp6_;
+ GdkPixbuf* _tmp7_;
+ gint _tmp8_;
+ gint _tmp9_;
+ GdkPixbuf* _tmp10_;
+ gint _tmp11_;
+ gint _tmp12_;
+ gboolean _tmp21_;
BackgroundJob* transformation_job = NULL;
- GdkPixbuf* _tmp23_ = NULL;
- Photo* _tmp24_ = NULL;
- PixelTransformer* _tmp25_ = NULL;
- PixelTransformer* _tmp26_ = NULL;
- GCancellable* _tmp27_ = NULL;
- GCancellable* _tmp28_ = NULL;
- ZoomBufferTransformationJob* _tmp29_ = NULL;
- BackgroundJob* _tmp30_ = NULL;
- Workers* _tmp31_ = NULL;
- BackgroundJob* _tmp32_ = NULL;
+ GdkPixbuf* _tmp23_;
+ Photo* _tmp24_;
+ PixelTransformer* _tmp25_;
+ PixelTransformer* _tmp26_;
+ GCancellable* _tmp27_;
+ GCancellable* _tmp28_;
+ ZoomBufferTransformationJob* _tmp29_;
+ BackgroundJob* _tmp30_;
+ Workers* _tmp31_;
+ BackgroundJob* _tmp32_;
#line 92 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_ZOOM_BUFFER (self));
#line 92 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2571,14 +2571,14 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou
#line 100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if ((_tmp9_ * _tmp12_) > ZOOM_BUFFER_USE_REDUCED_THRESHOLD) {
#line 2573 "PhotoPage.c"
- GdkPixbuf* _tmp13_ = NULL;
- GdkPixbuf* _tmp14_ = NULL;
- gint _tmp15_ = 0;
- gint _tmp16_ = 0;
- GdkPixbuf* _tmp17_ = NULL;
- gint _tmp18_ = 0;
- gint _tmp19_ = 0;
- GdkPixbuf* _tmp20_ = NULL;
+ GdkPixbuf* _tmp13_;
+ GdkPixbuf* _tmp14_;
+ gint _tmp15_;
+ gint _tmp16_;
+ GdkPixbuf* _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
+ GdkPixbuf* _tmp20_;
#line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp13_ = self->priv->iso_source_image;
#line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2608,7 +2608,7 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou
#line 106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (!_tmp21_) {
#line 2610 "PhotoPage.c"
- SinglePhotoPage* _tmp22_ = NULL;
+ SinglePhotoPage* _tmp22_;
#line 107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp22_ = self->priv->parent_page;
#line 107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2653,19 +2653,19 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou
static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, BackgroundJob* job) {
ZoomBufferTransformationJob* transform_job = NULL;
- BackgroundJob* _tmp0_ = NULL;
- ZoomBufferTransformationJob* _tmp1_ = NULL;
- ZoomBufferTransformationJob* _tmp2_ = NULL;
- GdkPixbuf* _tmp3_ = NULL;
- ZoomBufferTransformationJob* _tmp4_ = NULL;
- GdkPixbuf* _tmp5_ = NULL;
- GdkPixbuf* _tmp6_ = NULL;
- GdkPixbuf* _tmp7_ = NULL;
- gint _tmp8_ = 0;
- gint _tmp9_ = 0;
- GdkPixbuf* _tmp10_ = NULL;
- gint _tmp11_ = 0;
- gint _tmp12_ = 0;
+ BackgroundJob* _tmp0_;
+ ZoomBufferTransformationJob* _tmp1_;
+ ZoomBufferTransformationJob* _tmp2_;
+ GdkPixbuf* _tmp3_;
+ ZoomBufferTransformationJob* _tmp4_;
+ GdkPixbuf* _tmp5_;
+ GdkPixbuf* _tmp6_;
+ GdkPixbuf* _tmp7_;
+ gint _tmp8_;
+ gint _tmp9_;
+ GdkPixbuf* _tmp10_;
+ gint _tmp11_;
+ gint _tmp12_;
#line 115 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_ZOOM_BUFFER (self));
#line 115 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2715,14 +2715,14 @@ static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, Backgr
#line 124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if ((_tmp9_ * _tmp12_) > ZOOM_BUFFER_USE_REDUCED_THRESHOLD) {
#line 2717 "PhotoPage.c"
- GdkPixbuf* _tmp13_ = NULL;
- GdkPixbuf* _tmp14_ = NULL;
- gint _tmp15_ = 0;
- gint _tmp16_ = 0;
- GdkPixbuf* _tmp17_ = NULL;
- gint _tmp18_ = 0;
- gint _tmp19_ = 0;
- GdkPixbuf* _tmp20_ = NULL;
+ GdkPixbuf* _tmp13_;
+ GdkPixbuf* _tmp14_;
+ gint _tmp15_;
+ gint _tmp16_;
+ GdkPixbuf* _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
+ GdkPixbuf* _tmp20_;
#line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp13_ = self->priv->iso_transformed_image;
#line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2755,14 +2755,14 @@ static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, Backgr
static void zoom_buffer_on_demand_transform_complete (ZoomBuffer* self, BackgroundJob* job) {
ZoomBufferTransformationJob* transform_job = NULL;
- BackgroundJob* _tmp0_ = NULL;
- ZoomBufferTransformationJob* _tmp1_ = NULL;
- ZoomBufferTransformationJob* _tmp2_ = NULL;
- GdkPixbuf* _tmp3_ = NULL;
- ZoomBufferTransformationJob* _tmp4_ = NULL;
- GdkPixbuf* _tmp5_ = NULL;
- GdkPixbuf* _tmp6_ = NULL;
- SinglePhotoPage* _tmp7_ = NULL;
+ BackgroundJob* _tmp0_;
+ ZoomBufferTransformationJob* _tmp1_;
+ ZoomBufferTransformationJob* _tmp2_;
+ GdkPixbuf* _tmp3_;
+ ZoomBufferTransformationJob* _tmp4_;
+ GdkPixbuf* _tmp5_;
+ GdkPixbuf* _tmp6_;
+ SinglePhotoPage* _tmp7_;
#line 132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_ZOOM_BUFFER (self));
#line 132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2816,42 +2816,42 @@ static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, Zoom
GdkRectangle view_rect = {0};
GdkRectangle _tmp0_ = {0};
GdkRectangle view_rect_proj = {0};
- GdkPixbuf* _tmp1_ = NULL;
+ GdkPixbuf* _tmp1_;
GdkRectangle _tmp2_ = {0};
GdkPixbuf* sample_source_pixbuf = NULL;
- GdkPixbuf* _tmp3_ = NULL;
- GdkPixbuf* _tmp4_ = NULL;
+ GdkPixbuf* _tmp3_;
+ GdkPixbuf* _tmp4_;
gboolean _tmp5_ = FALSE;
- GdkPixbuf* _tmp6_ = NULL;
- GdkRectangle _tmp14_ = {0};
- gint _tmp15_ = 0;
- gint _tmp16_ = 0;
- GdkRectangle _tmp17_ = {0};
- gint _tmp18_ = 0;
- gint _tmp19_ = 0;
- GdkRectangle _tmp20_ = {0};
- gint _tmp21_ = 0;
- gint _tmp22_ = 0;
- GdkRectangle _tmp23_ = {0};
- gint _tmp24_ = 0;
- gint _tmp25_ = 0;
+ GdkPixbuf* _tmp6_;
+ GdkRectangle _tmp14_;
+ gint _tmp15_;
+ gint _tmp16_;
+ GdkRectangle _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
+ GdkRectangle _tmp20_;
+ gint _tmp21_;
+ gint _tmp22_;
+ GdkRectangle _tmp23_;
+ gint _tmp24_;
+ gint _tmp25_;
GdkPixbuf* proj_subpixbuf = NULL;
- GdkPixbuf* _tmp26_ = NULL;
- GdkRectangle _tmp27_ = {0};
- gint _tmp28_ = 0;
- GdkRectangle _tmp29_ = {0};
- gint _tmp30_ = 0;
- GdkRectangle _tmp31_ = {0};
- gint _tmp32_ = 0;
- GdkRectangle _tmp33_ = {0};
- gint _tmp34_ = 0;
- GdkPixbuf* _tmp35_ = NULL;
+ GdkPixbuf* _tmp26_;
+ GdkRectangle _tmp27_;
+ gint _tmp28_;
+ GdkRectangle _tmp29_;
+ gint _tmp30_;
+ GdkRectangle _tmp31_;
+ gint _tmp32_;
+ GdkRectangle _tmp33_;
+ gint _tmp34_;
+ GdkPixbuf* _tmp35_;
GdkPixbuf* zoomed = NULL;
- GdkRectangle _tmp36_ = {0};
- gint _tmp37_ = 0;
- GdkRectangle _tmp38_ = {0};
- gint _tmp39_ = 0;
- GdkPixbuf* _tmp40_ = NULL;
+ GdkRectangle _tmp36_;
+ gint _tmp37_;
+ GdkRectangle _tmp38_;
+ gint _tmp39_;
+ GdkPixbuf* _tmp40_;
#line 149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL);
#line 149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2881,7 +2881,7 @@ static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, Zoom
#line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp6_ != NULL) {
#line 2883 "PhotoPage.c"
- gdouble _tmp7_ = 0.0;
+ gdouble _tmp7_;
#line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp7_ = zoom_state_get_zoom_factor (zoom_state);
#line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2895,12 +2895,12 @@ static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, Zoom
#line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp5_) {
#line 2897 "PhotoPage.c"
- GdkPixbuf* _tmp8_ = NULL;
- GdkPixbuf* _tmp9_ = NULL;
- gint _tmp10_ = 0;
- gint _tmp11_ = 0;
- gint _tmp12_ = 0;
- gint _tmp13_ = 0;
+ GdkPixbuf* _tmp8_;
+ GdkPixbuf* _tmp9_;
+ gint _tmp10_;
+ gint _tmp11_;
+ gint _tmp12_;
+ gint _tmp13_;
#line 157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp8_ = reduced_pixbuf;
#line 157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3016,11 +3016,11 @@ static void _zoom_buffer_on_demand_transform_complete_completion_callback (Backg
static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffer* self, ZoomState* zoom_state) {
GdkPixbuf* result = NULL;
- GdkPixbuf* _tmp0_ = NULL;
- ZoomBufferTransformationJob* _tmp97_ = NULL;
- ZoomBufferTransformationJob* _tmp119_ = NULL;
- ZoomState _tmp136_ = {0};
- GdkPixbuf* _tmp137_ = NULL;
+ GdkPixbuf* _tmp0_;
+ ZoomBufferTransformationJob* _tmp97_;
+ ZoomBufferTransformationJob* _tmp119_;
+ ZoomState _tmp136_;
+ GdkPixbuf* _tmp137_;
#line 184 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL);
#line 184 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3030,8 +3030,8 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
#line 185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_ != NULL) {
#line 3032 "PhotoPage.c"
- ZoomState _tmp1_ = {0};
- gboolean _tmp2_ = FALSE;
+ ZoomState _tmp1_;
+ gboolean _tmp2_;
#line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = self->priv->demand_transform_zoom_state;
#line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3039,8 +3039,8 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
#line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp2_) {
#line 3041 "PhotoPage.c"
- GdkPixbuf* _tmp3_ = NULL;
- GdkPixbuf* _tmp4_ = NULL;
+ GdkPixbuf* _tmp3_;
+ GdkPixbuf* _tmp4_;
#line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = self->priv->demand_transform_cached_pixbuf;
#line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3051,8 +3051,8 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
return result;
#line 3052 "PhotoPage.c"
} else {
- gdouble _tmp5_ = 0.0;
- gdouble _tmp6_ = 0.0;
+ gdouble _tmp5_;
+ gdouble _tmp6_;
#line 191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = zoom_state_get_zoom_factor (zoom_state);
#line 191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3066,99 +3066,99 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
GdkRectangle _tmp8_ = {0};
GdkRectangle transfer_src_rect = {0};
GdkRectangle transfer_dest_rect = {0};
- GdkRectangle _tmp9_ = {0};
- gint _tmp10_ = 0;
- GdkRectangle _tmp11_ = {0};
- gint _tmp12_ = 0;
- GdkRectangle _tmp13_ = {0};
- gint _tmp14_ = 0;
- gint _tmp15_ = 0;
- GdkRectangle _tmp16_ = {0};
- gint _tmp17_ = 0;
- GdkRectangle _tmp18_ = {0};
- gint _tmp19_ = 0;
- GdkRectangle _tmp20_ = {0};
- gint _tmp21_ = 0;
- gint _tmp22_ = 0;
+ GdkRectangle _tmp9_;
+ gint _tmp10_;
+ GdkRectangle _tmp11_;
+ gint _tmp12_;
+ GdkRectangle _tmp13_;
+ gint _tmp14_;
+ gint _tmp15_;
+ GdkRectangle _tmp16_;
+ gint _tmp17_;
+ GdkRectangle _tmp18_;
+ gint _tmp19_;
+ GdkRectangle _tmp20_;
+ gint _tmp21_;
+ gint _tmp22_;
gint transfer_src_right = 0;
- GdkRectangle _tmp23_ = {0};
- gint _tmp24_ = 0;
- GdkRectangle _tmp25_ = {0};
- gint _tmp26_ = 0;
- GdkRectangle _tmp27_ = {0};
- gint _tmp28_ = 0;
- GdkRectangle _tmp29_ = {0};
- gint _tmp30_ = 0;
- gint _tmp31_ = 0;
- gint _tmp32_ = 0;
- GdkRectangle _tmp33_ = {0};
- gint _tmp34_ = 0;
+ GdkRectangle _tmp23_;
+ gint _tmp24_;
+ GdkRectangle _tmp25_;
+ gint _tmp26_;
+ GdkRectangle _tmp27_;
+ gint _tmp28_;
+ GdkRectangle _tmp29_;
+ gint _tmp30_;
+ gint _tmp31_;
+ gint _tmp32_;
+ GdkRectangle _tmp33_;
+ gint _tmp34_;
gint transfer_src_bottom = 0;
- GdkRectangle _tmp35_ = {0};
- gint _tmp36_ = 0;
- GdkRectangle _tmp37_ = {0};
- gint _tmp38_ = 0;
- GdkRectangle _tmp39_ = {0};
- gint _tmp40_ = 0;
- GdkRectangle _tmp41_ = {0};
- gint _tmp42_ = 0;
- gint _tmp43_ = 0;
- gint _tmp44_ = 0;
- GdkRectangle _tmp45_ = {0};
- gint _tmp46_ = 0;
- GdkRectangle _tmp47_ = {0};
- gint _tmp48_ = 0;
- GdkRectangle _tmp49_ = {0};
- gint _tmp50_ = 0;
- GdkRectangle _tmp51_ = {0};
- gint _tmp52_ = 0;
- gint _tmp53_ = 0;
- GdkRectangle _tmp54_ = {0};
- gint _tmp55_ = 0;
- GdkRectangle _tmp56_ = {0};
- gint _tmp57_ = 0;
- GdkRectangle _tmp58_ = {0};
- gint _tmp59_ = 0;
- gint _tmp60_ = 0;
+ GdkRectangle _tmp35_;
+ gint _tmp36_;
+ GdkRectangle _tmp37_;
+ gint _tmp38_;
+ GdkRectangle _tmp39_;
+ gint _tmp40_;
+ GdkRectangle _tmp41_;
+ gint _tmp42_;
+ gint _tmp43_;
+ gint _tmp44_;
+ GdkRectangle _tmp45_;
+ gint _tmp46_;
+ GdkRectangle _tmp47_;
+ gint _tmp48_;
+ GdkRectangle _tmp49_;
+ gint _tmp50_;
+ GdkRectangle _tmp51_;
+ gint _tmp52_;
+ gint _tmp53_;
+ GdkRectangle _tmp54_;
+ gint _tmp55_;
+ GdkRectangle _tmp56_;
+ gint _tmp57_;
+ GdkRectangle _tmp58_;
+ gint _tmp59_;
+ gint _tmp60_;
gint transfer_dest_right = 0;
- GdkRectangle _tmp61_ = {0};
- gint _tmp62_ = 0;
- GdkRectangle _tmp63_ = {0};
- gint _tmp64_ = 0;
- GdkRectangle _tmp65_ = {0};
- gint _tmp66_ = 0;
- gint _tmp67_ = 0;
- gint _tmp68_ = 0;
- GdkRectangle _tmp69_ = {0};
- gint _tmp70_ = 0;
+ GdkRectangle _tmp61_;
+ gint _tmp62_;
+ GdkRectangle _tmp63_;
+ gint _tmp64_;
+ GdkRectangle _tmp65_;
+ gint _tmp66_;
+ gint _tmp67_;
+ gint _tmp68_;
+ GdkRectangle _tmp69_;
+ gint _tmp70_;
gint transfer_dest_bottom = 0;
- GdkRectangle _tmp71_ = {0};
- gint _tmp72_ = 0;
- GdkRectangle _tmp73_ = {0};
- gint _tmp74_ = 0;
- GdkRectangle _tmp75_ = {0};
- gint _tmp76_ = 0;
- gint _tmp77_ = 0;
- gint _tmp78_ = 0;
- GdkRectangle _tmp79_ = {0};
- gint _tmp80_ = 0;
+ GdkRectangle _tmp71_;
+ gint _tmp72_;
+ GdkRectangle _tmp73_;
+ gint _tmp74_;
+ GdkRectangle _tmp75_;
+ gint _tmp76_;
+ gint _tmp77_;
+ gint _tmp78_;
+ GdkRectangle _tmp79_;
+ gint _tmp80_;
GdkPixbuf* composited_result = NULL;
- ZoomState _tmp81_ = {0};
- GdkPixbuf* _tmp82_ = NULL;
- GdkPixbuf* _tmp83_ = NULL;
- GdkRectangle _tmp84_ = {0};
- gint _tmp85_ = 0;
- GdkRectangle _tmp86_ = {0};
- gint _tmp87_ = 0;
- GdkRectangle _tmp88_ = {0};
- gint _tmp89_ = 0;
- GdkRectangle _tmp90_ = {0};
- gint _tmp91_ = 0;
- GdkPixbuf* _tmp92_ = NULL;
- GdkRectangle _tmp93_ = {0};
- gint _tmp94_ = 0;
- GdkRectangle _tmp95_ = {0};
- gint _tmp96_ = 0;
+ ZoomState _tmp81_;
+ GdkPixbuf* _tmp82_;
+ GdkPixbuf* _tmp83_;
+ GdkRectangle _tmp84_;
+ gint _tmp85_;
+ GdkRectangle _tmp86_;
+ gint _tmp87_;
+ GdkRectangle _tmp88_;
+ gint _tmp89_;
+ GdkRectangle _tmp90_;
+ gint _tmp91_;
+ GdkPixbuf* _tmp92_;
+ GdkRectangle _tmp93_;
+ gint _tmp94_;
+ GdkRectangle _tmp95_;
+ gint _tmp96_;
#line 202 "/home/jens/Source/shotwell/src/PhotoPage.vala"
zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp7_);
#line 202 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3388,8 +3388,8 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
#line 242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp97_ != NULL) {
#line 3390 "PhotoPage.c"
- ZoomState _tmp98_ = {0};
- gboolean _tmp99_ = FALSE;
+ ZoomState _tmp98_;
+ gboolean _tmp99_;
#line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp98_ = self->priv->demand_transform_zoom_state;
#line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3397,8 +3397,8 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
#line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp99_) {
#line 3399 "PhotoPage.c"
- ZoomState _tmp100_ = {0};
- GdkPixbuf* _tmp101_ = NULL;
+ ZoomState _tmp100_;
+ GdkPixbuf* _tmp101_;
#line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp100_ = *zoom_state;
#line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3409,24 +3409,24 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
return result;
#line 3410 "PhotoPage.c"
} else {
- ZoomBufferTransformationJob* _tmp102_ = NULL;
+ ZoomBufferTransformationJob* _tmp102_;
GdkPixbuf* zoomed = NULL;
- ZoomState _tmp103_ = {0};
- GdkPixbuf* _tmp104_ = NULL;
- GdkPixbuf* _tmp105_ = NULL;
- GdkPixbuf* _tmp106_ = NULL;
- GdkPixbuf* _tmp107_ = NULL;
- Photo* _tmp108_ = NULL;
- PixelTransformer* _tmp109_ = NULL;
- PixelTransformer* _tmp110_ = NULL;
- GCancellable* _tmp111_ = NULL;
- GCancellable* _tmp112_ = NULL;
- ZoomBufferTransformationJob* _tmp113_ = NULL;
- ZoomState _tmp114_ = {0};
- Workers* _tmp115_ = NULL;
- ZoomBufferTransformationJob* _tmp116_ = NULL;
- ZoomState _tmp117_ = {0};
- GdkPixbuf* _tmp118_ = NULL;
+ ZoomState _tmp103_;
+ GdkPixbuf* _tmp104_;
+ GdkPixbuf* _tmp105_;
+ GdkPixbuf* _tmp106_;
+ GdkPixbuf* _tmp107_;
+ Photo* _tmp108_;
+ PixelTransformer* _tmp109_;
+ PixelTransformer* _tmp110_;
+ GCancellable* _tmp111_;
+ GCancellable* _tmp112_;
+ ZoomBufferTransformationJob* _tmp113_;
+ ZoomState _tmp114_;
+ Workers* _tmp115_;
+ ZoomBufferTransformationJob* _tmp116_;
+ ZoomState _tmp117_;
+ GdkPixbuf* _tmp118_;
#line 246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp102_ = self->priv->demand_transform_job;
#line 246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3496,22 +3496,22 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
if (_tmp119_ == NULL) {
#line 3497 "PhotoPage.c"
GdkPixbuf* zoomed = NULL;
- ZoomState _tmp120_ = {0};
- GdkPixbuf* _tmp121_ = NULL;
- GdkPixbuf* _tmp122_ = NULL;
- GdkPixbuf* _tmp123_ = NULL;
- GdkPixbuf* _tmp124_ = NULL;
- Photo* _tmp125_ = NULL;
- PixelTransformer* _tmp126_ = NULL;
- PixelTransformer* _tmp127_ = NULL;
- GCancellable* _tmp128_ = NULL;
- GCancellable* _tmp129_ = NULL;
- ZoomBufferTransformationJob* _tmp130_ = NULL;
- ZoomState _tmp131_ = {0};
- Workers* _tmp132_ = NULL;
- ZoomBufferTransformationJob* _tmp133_ = NULL;
- ZoomState _tmp134_ = {0};
- GdkPixbuf* _tmp135_ = NULL;
+ ZoomState _tmp120_;
+ GdkPixbuf* _tmp121_;
+ GdkPixbuf* _tmp122_;
+ GdkPixbuf* _tmp123_;
+ GdkPixbuf* _tmp124_;
+ Photo* _tmp125_;
+ PixelTransformer* _tmp126_;
+ PixelTransformer* _tmp127_;
+ GCancellable* _tmp128_;
+ GCancellable* _tmp129_;
+ ZoomBufferTransformationJob* _tmp130_;
+ ZoomState _tmp131_;
+ Workers* _tmp132_;
+ ZoomBufferTransformationJob* _tmp133_;
+ ZoomState _tmp134_;
+ GdkPixbuf* _tmp135_;
#line 264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp120_ = *zoom_state;
#line 264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3590,35 +3590,35 @@ static void _zoom_buffer_on_iso_source_fetch_complete_completion_callback (Backg
GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomState* zoom_state) {
GdkPixbuf* result = NULL;
- ZoomBufferObjectState _tmp0_ = 0;
+ ZoomBufferObjectState _tmp0_;
GdkRectangle view_rect = {0};
GdkRectangle _tmp5_ = {0};
GdkRectangle view_rect_proj = {0};
- GdkPixbuf* _tmp6_ = NULL;
+ GdkPixbuf* _tmp6_;
GdkRectangle _tmp7_ = {0};
- GdkRectangle _tmp8_ = {0};
- gint _tmp9_ = 0;
- gint _tmp10_ = 0;
- GdkRectangle _tmp11_ = {0};
- gint _tmp12_ = 0;
- gint _tmp13_ = 0;
+ GdkRectangle _tmp8_;
+ gint _tmp9_;
+ gint _tmp10_;
+ GdkRectangle _tmp11_;
+ gint _tmp12_;
+ gint _tmp13_;
GdkPixbuf* proj_subpixbuf = NULL;
- GdkPixbuf* _tmp14_ = NULL;
- GdkRectangle _tmp15_ = {0};
- gint _tmp16_ = 0;
- GdkRectangle _tmp17_ = {0};
- gint _tmp18_ = 0;
- GdkRectangle _tmp19_ = {0};
- gint _tmp20_ = 0;
- GdkRectangle _tmp21_ = {0};
- gint _tmp22_ = 0;
- GdkPixbuf* _tmp23_ = NULL;
+ GdkPixbuf* _tmp14_;
+ GdkRectangle _tmp15_;
+ gint _tmp16_;
+ GdkRectangle _tmp17_;
+ gint _tmp18_;
+ GdkRectangle _tmp19_;
+ gint _tmp20_;
+ GdkRectangle _tmp21_;
+ gint _tmp22_;
+ GdkPixbuf* _tmp23_;
GdkPixbuf* zoomed = NULL;
- GdkRectangle _tmp24_ = {0};
- gint _tmp25_ = 0;
- GdkRectangle _tmp26_ = {0};
- gint _tmp27_ = 0;
- GdkPixbuf* _tmp28_ = NULL;
+ GdkRectangle _tmp24_;
+ gint _tmp25_;
+ GdkRectangle _tmp26_;
+ gint _tmp27_;
+ GdkPixbuf* _tmp28_;
#line 288 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL);
#line 288 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3629,10 +3629,10 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt
if (_tmp0_ == ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_LOADED) {
#line 3629 "PhotoPage.c"
BackgroundJob* iso_source_fetch_job = NULL;
- Photo* _tmp1_ = NULL;
- ZoomBufferIsoSourceFetchJob* _tmp2_ = NULL;
- Workers* _tmp3_ = NULL;
- BackgroundJob* _tmp4_ = NULL;
+ Photo* _tmp1_;
+ ZoomBufferIsoSourceFetchJob* _tmp2_;
+ Workers* _tmp3_;
+ BackgroundJob* _tmp4_;
#line 290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = self->priv->backing_photo;
#line 290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3723,8 +3723,8 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt
Photo* zoom_buffer_get_backing_photo (ZoomBuffer* self) {
Photo* result = NULL;
- Photo* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
+ Photo* _tmp0_;
+ Photo* _tmp1_;
#line 312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL);
#line 313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3740,8 +3740,8 @@ Photo* zoom_buffer_get_backing_photo (ZoomBuffer* self) {
void zoom_buffer_update_preview_image (ZoomBuffer* self, GdkPixbuf* preview_image) {
- GdkPixbuf* _tmp0_ = NULL;
- GdkPixbuf* _tmp1_ = NULL;
+ GdkPixbuf* _tmp0_;
+ GdkPixbuf* _tmp1_;
#line 316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_ZOOM_BUFFER (self));
#line 316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3759,7 +3759,7 @@ void zoom_buffer_update_preview_image (ZoomBuffer* self, GdkPixbuf* preview_imag
void zoom_buffer_flush_demand_cache (ZoomBuffer* self, ZoomState* initial_zoom_state) {
- ZoomState* _tmp0_ = NULL;
+ ZoomState* _tmp0_;
#line 322 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_ZOOM_BUFFER (self));
#line 323 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3771,10 +3771,10 @@ void zoom_buffer_flush_demand_cache (ZoomBuffer* self, ZoomState* initial_zoom_s
#line 324 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_ != NULL) {
#line 3772 "PhotoPage.c"
- ZoomState* _tmp1_ = NULL;
- ZoomState _tmp2_ = {0};
- GdkPixbuf* _tmp3_ = NULL;
- GdkPixbuf* _tmp4_ = NULL;
+ ZoomState* _tmp1_;
+ ZoomState _tmp2_;
+ GdkPixbuf* _tmp3_;
+ GdkPixbuf* _tmp4_;
#line 325 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = initial_zoom_state;
#line 325 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3792,8 +3792,8 @@ void zoom_buffer_flush_demand_cache (ZoomBuffer* self, ZoomState* initial_zoom_s
GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state) {
GdkPixbuf* result = NULL;
- gdouble _tmp0_ = 0.0;
- ZoomBufferObjectState _tmp3_ = 0;
+ gdouble _tmp0_;
+ ZoomBufferObjectState _tmp3_;
#line 328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL);
#line 328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3805,8 +3805,8 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
#line 333 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_ == 0.0) {
#line 3806 "PhotoPage.c"
- ZoomState _tmp1_ = {0};
- GdkPixbuf* _tmp2_ = NULL;
+ ZoomState _tmp1_;
+ GdkPixbuf* _tmp2_;
#line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = *zoom_state;
#line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3827,8 +3827,8 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
case ZOOM_BUFFER_OBJECT_STATE_SOURCE_LOAD_IN_PROGRESS:
#line 3827 "PhotoPage.c"
{
- ZoomState _tmp4_ = {0};
- GdkPixbuf* _tmp5_ = NULL;
+ ZoomState _tmp4_;
+ GdkPixbuf* _tmp5_;
#line 340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = *zoom_state;
#line 340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3843,8 +3843,8 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
case ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED:
#line 3843 "PhotoPage.c"
{
- ZoomState _tmp6_ = {0};
- GdkPixbuf* _tmp7_ = NULL;
+ ZoomState _tmp6_;
+ GdkPixbuf* _tmp7_;
#line 343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_ = *zoom_state;
#line 343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3859,10 +3859,10 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
case ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY:
#line 3859 "PhotoPage.c"
{
- ZoomState _tmp8_ = {0};
- GdkPixbuf* _tmp9_ = NULL;
- GdkPixbuf* _tmp10_ = NULL;
- GdkPixbuf* _tmp11_ = NULL;
+ ZoomState _tmp8_;
+ GdkPixbuf* _tmp9_;
+ GdkPixbuf* _tmp10_;
+ GdkPixbuf* _tmp11_;
#line 348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp8_ = *zoom_state;
#line 348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3879,8 +3879,8 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
}
default:
{
- ZoomState _tmp12_ = {0};
- GdkPixbuf* _tmp13_ = NULL;
+ ZoomState _tmp12_;
+ GdkPixbuf* _tmp13_;
#line 352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_critical ("PhotoPage.vala:352: ZoomBuffer: get_zoomed_image( ): object is an inco" \
"nsistent state");
@@ -3900,8 +3900,8 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
GdkPixbuf* zoom_buffer_get_zoom_preview_image (ZoomBuffer* self, ZoomState* zoom_state) {
GdkPixbuf* result = NULL;
- ZoomState _tmp0_ = {0};
- GdkPixbuf* _tmp1_ = NULL;
+ ZoomState _tmp0_;
+ GdkPixbuf* _tmp1_;
#line 357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL);
#line 357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3922,11 +3922,11 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image (ZoomBuffer* self, ZoomState* zoom
static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_construct (GType object_type, ZoomBuffer* owner, Photo* to_fetch, CompletionCallback completion_callback, void* completion_callback_target) {
ZoomBufferIsoSourceFetchJob* self = NULL;
- ZoomBuffer* _tmp0_ = NULL;
- CompletionCallback _tmp1_ = NULL;
- void* _tmp1__target = NULL;
- Photo* _tmp2_ = NULL;
- Photo* _tmp3_ = NULL;
+ ZoomBuffer* _tmp0_;
+ CompletionCallback _tmp1_;
+ void* _tmp1__target;
+ Photo* _tmp2_;
+ Photo* _tmp3_;
#line 20 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_ZOOM_BUFFER (owner), NULL);
#line 20 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3968,10 +3968,10 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
#line 3966 "PhotoPage.c"
{
GdkPixbuf* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
+ Photo* _tmp1_;
Scaling _tmp2_ = {0};
- GdkPixbuf* _tmp3_ = NULL;
- GdkPixbuf* _tmp4_ = NULL;
+ GdkPixbuf* _tmp3_;
+ GdkPixbuf* _tmp4_;
#line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = self->priv->to_fetch;
#line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3983,7 +3983,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
#line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 3983 "PhotoPage.c"
- goto __catch243_g_error;
+ goto __catch244_g_error;
}
#line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = _tmp0_;
@@ -3997,8 +3997,8 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
_g_object_unref0 (_tmp0_);
#line 3996 "PhotoPage.c"
}
- goto __finally243;
- __catch243_g_error:
+ goto __finally244;
+ __catch244_g_error:
{
GError* fetch_error = NULL;
#line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4012,7 +4012,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
_g_error_free0 (fetch_error);
#line 4010 "PhotoPage.c"
}
- __finally243:
+ __finally244:
#line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4034,7 +4034,7 @@ static void zoom_buffer_iso_source_fetch_job_class_init (ZoomBufferIsoSourceFetc
#line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_type_class_add_private (klass, sizeof (ZoomBufferIsoSourceFetchJobPrivate));
#line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) zoom_buffer_iso_source_fetch_job_real_execute;
+ ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) zoom_buffer_iso_source_fetch_job_real_execute;
#line 4035 "PhotoPage.c"
}
@@ -4048,7 +4048,7 @@ static void zoom_buffer_iso_source_fetch_job_instance_init (ZoomBufferIsoSourceF
}
-static void zoom_buffer_iso_source_fetch_job_finalize (BackgroundJob* obj) {
+static void zoom_buffer_iso_source_fetch_job_finalize (BackgroundJob * obj) {
ZoomBufferIsoSourceFetchJob * self;
#line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, ZoomBufferIsoSourceFetchJob);
@@ -4083,18 +4083,18 @@ static gpointer _pixel_transformer_ref0 (gpointer self) {
static ZoomBufferTransformationJob* zoom_buffer_transformation_job_construct (GType object_type, ZoomBuffer* owner, GdkPixbuf* to_transform, PixelTransformer* transformer, CompletionCallback completion_callback, void* completion_callback_target, GCancellable* cancellable) {
ZoomBufferTransformationJob* self = NULL;
- ZoomBuffer* _tmp0_ = NULL;
- CompletionCallback _tmp1_ = NULL;
- void* _tmp1__target = NULL;
- GCancellable* _tmp2_ = NULL;
- GCancellable* _tmp3_ = NULL;
- GCancellable* _tmp4_ = NULL;
- GdkPixbuf* _tmp5_ = NULL;
- GdkPixbuf* _tmp6_ = NULL;
- PixelTransformer* _tmp7_ = NULL;
- PixelTransformer* _tmp8_ = NULL;
- GdkPixbuf* _tmp9_ = NULL;
- GdkPixbuf* _tmp10_ = NULL;
+ ZoomBuffer* _tmp0_;
+ CompletionCallback _tmp1_;
+ void* _tmp1__target;
+ GCancellable* _tmp2_;
+ GCancellable* _tmp3_;
+ GCancellable* _tmp4_;
+ GdkPixbuf* _tmp5_;
+ GdkPixbuf* _tmp6_;
+ PixelTransformer* _tmp7_;
+ PixelTransformer* _tmp8_;
+ GdkPixbuf* _tmp9_;
+ GdkPixbuf* _tmp10_;
#line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_ZOOM_BUFFER (owner), NULL);
#line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4160,7 +4160,7 @@ static ZoomBufferTransformationJob* zoom_buffer_transformation_job_new (ZoomBuff
static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base) {
ZoomBufferTransformationJob * self;
- PixelTransformer* _tmp0_ = NULL;
+ PixelTransformer* _tmp0_;
#line 59 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, ZoomBufferTransformationJob);
#line 60 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4168,10 +4168,10 @@ static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base) {
#line 60 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_ != NULL) {
#line 4167 "PhotoPage.c"
- PixelTransformer* _tmp1_ = NULL;
- GdkPixbuf* _tmp2_ = NULL;
- GdkPixbuf* _tmp3_ = NULL;
- GCancellable* _tmp4_ = NULL;
+ PixelTransformer* _tmp1_;
+ GdkPixbuf* _tmp2_;
+ GdkPixbuf* _tmp3_;
+ GCancellable* _tmp4_;
#line 61 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = self->priv->transformer;
#line 61 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4195,7 +4195,7 @@ static void zoom_buffer_transformation_job_class_init (ZoomBufferTransformationJ
#line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_type_class_add_private (klass, sizeof (ZoomBufferTransformationJobPrivate));
#line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((BackgroundJobClass *) klass)->execute = (void (*)(BackgroundJob*)) zoom_buffer_transformation_job_real_execute;
+ ((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) zoom_buffer_transformation_job_real_execute;
#line 4196 "PhotoPage.c"
}
@@ -4209,7 +4209,7 @@ static void zoom_buffer_transformation_job_instance_init (ZoomBufferTransformati
}
-static void zoom_buffer_transformation_job_finalize (BackgroundJob* obj) {
+static void zoom_buffer_transformation_job_finalize (BackgroundJob * obj) {
ZoomBufferTransformationJob * self;
#line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, ZoomBufferTransformationJob);
@@ -4279,7 +4279,7 @@ static void zoom_buffer_instance_init (ZoomBuffer * self) {
}
-static void zoom_buffer_finalize (GObject* obj) {
+static void zoom_buffer_finalize (GObject * obj) {
ZoomBuffer * self;
#line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ZOOM_BUFFER, ZoomBuffer);
@@ -4466,101 +4466,99 @@ static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolBut
EditingHostPage* editing_host_page_construct (GType object_type, SourceCollection* sources, const gchar* name) {
EditingHostPage * self = NULL;
- const gchar* _tmp0_ = NULL;
- SourceCollection* _tmp1_ = NULL;
- SourceCollection* _tmp2_ = NULL;
- SourceCollection* _tmp3_ = NULL;
- ViewCollection* _tmp4_ = NULL;
- ViewCollection* _tmp5_ = NULL;
- ViewCollection* _tmp6_ = NULL;
- ViewCollection* _tmp7_ = NULL;
- GtkViewport* _tmp8_ = NULL;
+ const gchar* _tmp0_;
+ SourceCollection* _tmp1_;
+ SourceCollection* _tmp2_;
+ SourceCollection* _tmp3_;
+ ViewCollection* _tmp4_;
+ ViewCollection* _tmp5_;
+ ViewCollection* _tmp6_;
+ ViewCollection* _tmp7_;
+ GtkViewport* _tmp8_;
GtkToolbar* toolbar = NULL;
- GtkToolbar* _tmp9_ = NULL;
- GtkToolButton* _tmp10_ = NULL;
- GtkToolButton* _tmp11_ = NULL;
- GtkToolButton* _tmp12_ = NULL;
- GtkToolButton* _tmp13_ = NULL;
- GtkToolButton* _tmp14_ = NULL;
- GtkToolButton* _tmp15_ = NULL;
+ GtkToolbar* _tmp9_;
+ GtkToolButton* _tmp10_;
+ GtkToolButton* _tmp11_;
+ GtkToolButton* _tmp12_;
+ GtkToolButton* _tmp13_;
+ GtkToolButton* _tmp14_;
+ GtkToolButton* _tmp15_;
GtkBindingSet* binding_set = NULL;
- GtkToolButton* _tmp16_ = NULL;
- GObjectClass* _tmp17_ = NULL;
- GtkBindingSet* _tmp18_ = NULL;
- GtkToggleToolButton* _tmp19_ = NULL;
- GtkToggleToolButton* _tmp20_ = NULL;
- GtkToggleToolButton* _tmp21_ = NULL;
- GtkToggleToolButton* _tmp22_ = NULL;
- GtkToggleToolButton* _tmp23_ = NULL;
- GtkToggleToolButton* _tmp24_ = NULL;
- GtkToggleToolButton* _tmp25_ = NULL;
- GtkToggleToolButton* _tmp26_ = NULL;
- GtkToggleToolButton* _tmp27_ = NULL;
- GtkToggleToolButton* _tmp28_ = NULL;
- GtkToggleToolButton* _tmp29_ = NULL;
- GtkToggleToolButton* _tmp30_ = NULL;
- GtkToggleToolButton* _tmp31_ = NULL;
- GtkToggleToolButton* _tmp32_ = NULL;
- GtkToggleToolButton* _tmp33_ = NULL;
- GtkToggleToolButton* _tmp34_ = NULL;
- GtkToggleToolButton* _tmp35_ = NULL;
- GtkToggleToolButton* _tmp36_ = NULL;
- GtkToggleToolButton* _tmp37_ = NULL;
- GtkToggleToolButton* _tmp38_ = NULL;
- GtkToggleToolButton* _tmp39_ = NULL;
- GtkToggleToolButton* _tmp40_ = NULL;
- GtkToggleToolButton* _tmp41_ = NULL;
- GtkToggleToolButton* _tmp42_ = NULL;
- GtkToggleToolButton* _tmp43_ = NULL;
- GtkToggleToolButton* _tmp44_ = NULL;
- GtkToggleToolButton* _tmp45_ = NULL;
- GtkToggleToolButton* _tmp46_ = NULL;
- GtkToolButton* _tmp47_ = NULL;
- GtkToolButton* _tmp48_ = NULL;
- GtkToolButton* _tmp49_ = NULL;
- GtkToolButton* _tmp50_ = NULL;
- GtkToolButton* _tmp51_ = NULL;
- GtkToolButton* _tmp52_ = NULL;
+ GtkToolButton* _tmp16_;
+ GObjectClass* _tmp17_;
+ GtkBindingSet* _tmp18_;
+ GtkToggleToolButton* _tmp19_;
+ GtkToggleToolButton* _tmp20_;
+ GtkToggleToolButton* _tmp21_;
+ GtkToggleToolButton* _tmp22_;
+ GtkToggleToolButton* _tmp23_;
+ GtkToggleToolButton* _tmp24_;
+ GtkToggleToolButton* _tmp25_;
+ GtkToggleToolButton* _tmp26_;
+ GtkToggleToolButton* _tmp27_;
+ GtkToggleToolButton* _tmp28_;
+ GtkToggleToolButton* _tmp29_;
+ GtkToggleToolButton* _tmp30_;
+ GtkToggleToolButton* _tmp31_;
+ GtkToggleToolButton* _tmp32_;
+ GtkToggleToolButton* _tmp33_;
+ GtkToggleToolButton* _tmp34_;
+ GtkToggleToolButton* _tmp35_;
+ GtkToggleToolButton* _tmp36_;
+ GtkToggleToolButton* _tmp37_;
+ GtkToggleToolButton* _tmp38_;
+ GtkToggleToolButton* _tmp39_;
+ GtkToggleToolButton* _tmp40_;
+ GtkToggleToolButton* _tmp41_;
+ GtkToggleToolButton* _tmp42_;
+ GtkToggleToolButton* _tmp43_;
+ GtkToggleToolButton* _tmp44_;
+ GtkToggleToolButton* _tmp45_;
+ GtkToggleToolButton* _tmp46_;
+ GtkToolButton* _tmp47_;
+ GtkToolButton* _tmp48_;
+ GtkToolButton* _tmp49_;
+ GtkToolButton* _tmp50_;
+ GtkToolButton* _tmp51_;
+ GtkToolButton* _tmp52_;
GtkSeparatorToolItem* separator = NULL;
- GtkSeparatorToolItem* _tmp53_ = NULL;
+ GtkSeparatorToolItem* _tmp53_;
GtkBox* zoom_group = NULL;
- GtkBox* _tmp54_ = NULL;
+ GtkBox* _tmp54_;
GtkImage* zoom_out = NULL;
- GdkPixbuf* _tmp55_ = NULL;
- GdkPixbuf* _tmp56_ = NULL;
- GtkImage* _tmp57_ = NULL;
- GtkImage* _tmp58_ = NULL;
+ GdkPixbuf* _tmp55_;
+ GdkPixbuf* _tmp56_;
+ GtkImage* _tmp57_;
+ GtkImage* _tmp58_;
GtkEventBox* zoom_out_box = NULL;
- GtkEventBox* _tmp59_ = NULL;
- GtkAdjustment* _tmp60_ = NULL;
- GtkAdjustment* _tmp61_ = NULL;
- GtkScale* _tmp62_ = NULL;
- GtkScale* _tmp63_ = NULL;
- GtkScale* _tmp64_ = NULL;
- GtkScale* _tmp65_ = NULL;
- GtkScale* _tmp66_ = NULL;
- GtkScale* _tmp67_ = NULL;
- GtkScale* _tmp68_ = NULL;
- GtkScale* _tmp69_ = NULL;
+ GtkEventBox* _tmp59_;
+ GtkAdjustment* _tmp60_;
+ GtkAdjustment* _tmp61_;
+ GtkScale* _tmp62_;
+ GtkScale* _tmp63_;
+ GtkScale* _tmp64_;
+ GtkScale* _tmp65_;
+ GtkScale* _tmp66_;
+ GtkScale* _tmp67_;
+ GtkScale* _tmp68_;
+ GtkScale* _tmp69_;
GtkImage* zoom_in = NULL;
- GdkPixbuf* _tmp70_ = NULL;
- GdkPixbuf* _tmp71_ = NULL;
- GtkImage* _tmp72_ = NULL;
- GtkImage* _tmp73_ = NULL;
+ GdkPixbuf* _tmp70_;
+ GdkPixbuf* _tmp71_;
+ GtkImage* _tmp72_;
+ GtkImage* _tmp73_;
GtkEventBox* zoom_in_box = NULL;
- GtkEventBox* _tmp74_ = NULL;
+ GtkEventBox* _tmp74_;
GtkToolItem* group_wrapper = NULL;
- GtkToolItem* _tmp75_ = NULL;
- GtkToolButton* _tmp76_ = NULL;
- const gchar* _tmp77_ = NULL;
- GtkToolButton* _tmp78_ = NULL;
- GtkToolButton* _tmp79_ = NULL;
- GtkToolButton* _tmp80_ = NULL;
- GtkToolButton* _tmp81_ = NULL;
- const gchar* _tmp82_ = NULL;
- GtkToolButton* _tmp83_ = NULL;
- GtkToolButton* _tmp84_ = NULL;
- GtkToolButton* _tmp85_ = NULL;
+ GtkToolItem* _tmp75_;
+ GtkToolButton* _tmp76_;
+ GtkToolButton* _tmp77_;
+ GtkToolButton* _tmp78_;
+ GtkToolButton* _tmp79_;
+ GtkToolButton* _tmp80_;
+ GtkToolButton* _tmp81_;
+ GtkToolButton* _tmp82_;
+ GtkToolButton* _tmp83_;
#line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL);
#line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4936,39 +4934,35 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
#line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp76_ = self->priv->prev_button;
#line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp77_ = _ ("Previous photo");
-#line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_tool_item_get_type (), GtkToolItem), _tmp77_);
+ gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_tool_item_get_type (), GtkToolItem), _ ("Previous photo"));
#line 539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp78_ = self->priv->prev_button;
+ _tmp77_ = self->priv->prev_button;
#line 539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- gtk_tool_button_set_icon_name (_tmp78_, "go-previous");
+ gtk_tool_button_set_icon_name (_tmp77_, "go-previous");
#line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp79_ = self->priv->prev_button;
+ _tmp78_ = self->priv->prev_button;
#line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- g_signal_connect_object (_tmp79_, "clicked", (GCallback) _single_photo_page_on_previous_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
+ g_signal_connect_object (_tmp78_, "clicked", (GCallback) _single_photo_page_on_previous_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
#line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp80_ = self->priv->prev_button;
+ _tmp79_ = self->priv->prev_button;
#line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_tool_item_get_type (), GtkToolItem), -1);
+ gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_tool_item_get_type (), GtkToolItem), -1);
#line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp81_ = self->priv->next_button;
-#line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp82_ = _ ("Next photo");
+ _tmp80_ = self->priv->next_button;
#line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_tool_item_get_type (), GtkToolItem), _tmp82_);
+ gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_tool_item_get_type (), GtkToolItem), _ ("Next photo"));
#line 545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp83_ = self->priv->next_button;
+ _tmp81_ = self->priv->next_button;
#line 545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- gtk_tool_button_set_icon_name (_tmp83_, "go-next");
+ gtk_tool_button_set_icon_name (_tmp81_, "go-next");
#line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp84_ = self->priv->next_button;
+ _tmp82_ = self->priv->next_button;
#line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- g_signal_connect_object (_tmp84_, "clicked", (GCallback) _single_photo_page_on_next_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
+ g_signal_connect_object (_tmp82_, "clicked", (GCallback) _single_photo_page_on_next_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
#line 547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp85_ = self->priv->next_button;
+ _tmp83_ = self->priv->next_button;
#line 547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_tool_item_get_type (), GtkToolItem), -1);
+ gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_tool_item_get_type (), GtkToolItem), -1);
#line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (group_wrapper);
#line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4987,16 +4981,16 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
_g_object_unref0 (toolbar);
#line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return self;
-#line 4987 "PhotoPage.c"
+#line 4981 "PhotoPage.c"
}
static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* self) {
ZoomState new_zoom_state = {0};
ZoomState _tmp0_ = {0};
- GtkScale* _tmp1_ = NULL;
- gdouble _tmp2_ = 0.0;
- gboolean _tmp3_ = FALSE;
+ GtkScale* _tmp1_;
+ gdouble _tmp2_;
+ gboolean _tmp3_;
#line 557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5011,9 +5005,9 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel
_tmp3_ = self->priv->enable_interactive_zoom_refresh;
#line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp3_) {
-#line 5011 "PhotoPage.c"
- ZoomState _tmp4_ = {0};
- gboolean _tmp5_ = FALSE;
+#line 5005 "PhotoPage.c"
+ ZoomState _tmp4_;
+ gboolean _tmp5_;
#line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = new_zoom_state;
#line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5022,46 +5016,46 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel
_tmp5_ = zoom_state_is_default (&new_zoom_state);
#line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp5_) {
-#line 5022 "PhotoPage.c"
- ZoomState _tmp6_ = {0};
+#line 5016 "PhotoPage.c"
+ ZoomState _tmp6_;
#line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_ = new_zoom_state;
#line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp6_);
-#line 5028 "PhotoPage.c"
+#line 5022 "PhotoPage.c"
}
} else {
- gboolean _tmp7_ = FALSE;
+ gboolean _tmp7_;
#line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp7_ = zoom_state_is_default (&new_zoom_state);
#line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp7_) {
#line 567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 5038 "PhotoPage.c"
+#line 5032 "PhotoPage.c"
} else {
- ZoomState _tmp8_ = {0};
+ ZoomState _tmp8_;
#line 569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp8_ = new_zoom_state;
#line 569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
-#line 5045 "PhotoPage.c"
+#line 5039 "PhotoPage.c"
}
#line 571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 5049 "PhotoPage.c"
+#line 5043 "PhotoPage.c"
}
#line 574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_update_cursor_for_zoom_context (self);
-#line 5053 "PhotoPage.c"
+#line 5047 "PhotoPage.c"
}
static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* self, GdkEventButton* event) {
gboolean result = FALSE;
- GtkWindow* _tmp0_ = NULL;
- GtkWindow* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ GtkWindow* _tmp0_;
+ GtkWindow* _tmp1_;
+ gboolean _tmp2_;
#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5078,9 +5072,9 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se
_g_object_unref0 (_tmp1_);
#line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp2_) {
-#line 5078 "PhotoPage.c"
- GtkWindow* _tmp3_ = NULL;
- FullscreenWindow* _tmp4_ = NULL;
+#line 5072 "PhotoPage.c"
+ GtkWindow* _tmp3_;
+ FullscreenWindow* _tmp4_;
#line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5089,26 +5083,26 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se
fullscreen_window_disable_toolbar_dismissal (_tmp4_);
#line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp4_);
-#line 5089 "PhotoPage.c"
+#line 5083 "PhotoPage.c"
}
#line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
result = FALSE;
#line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 5095 "PhotoPage.c"
+#line 5089 "PhotoPage.c"
}
static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self, GdkEventButton* event) {
gboolean result = FALSE;
- GtkWindow* _tmp0_ = NULL;
- GtkWindow* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ GtkWindow* _tmp0_;
+ GtkWindow* _tmp1_;
+ gboolean _tmp2_;
ZoomState zoom_state = {0};
ZoomState _tmp5_ = {0};
- GtkScale* _tmp6_ = NULL;
- gdouble _tmp7_ = 0.0;
- ZoomState _tmp8_ = {0};
+ GtkScale* _tmp6_;
+ gdouble _tmp7_;
+ ZoomState _tmp8_;
#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5125,9 +5119,9 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
_g_object_unref0 (_tmp1_);
#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp2_) {
-#line 5125 "PhotoPage.c"
- GtkWindow* _tmp3_ = NULL;
- FullscreenWindow* _tmp4_ = NULL;
+#line 5119 "PhotoPage.c"
+ GtkWindow* _tmp3_;
+ FullscreenWindow* _tmp4_;
#line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5136,7 +5130,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
fullscreen_window_update_toolbar_dismissal (_tmp4_);
#line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp4_);
-#line 5136 "PhotoPage.c"
+#line 5130 "PhotoPage.c"
}
#line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
@@ -5156,7 +5150,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
result = FALSE;
#line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 5156 "PhotoPage.c"
+#line 5150 "PhotoPage.c"
}
@@ -5172,7 +5166,7 @@ static gboolean editing_host_page_on_zoom_out_pressed (EditingHostPage* self, Gd
result = TRUE;
#line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 5172 "PhotoPage.c"
+#line 5166 "PhotoPage.c"
}
@@ -5188,40 +5182,40 @@ static gboolean editing_host_page_on_zoom_in_pressed (EditingHostPage* self, Gdk
result = TRUE;
#line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 5188 "PhotoPage.c"
+#line 5182 "PhotoPage.c"
}
static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, GdkEventScroll* event, GdkPoint* result) {
GdkPoint cursor_wrt_canvas = {0};
GdkPoint _tmp0_ = {0};
- GdkEventScroll* _tmp1_ = NULL;
- gdouble _tmp2_ = 0.0;
- GdkEventScroll* _tmp3_ = NULL;
- gdouble _tmp4_ = 0.0;
+ GdkEventScroll* _tmp1_;
+ gdouble _tmp2_;
+ GdkEventScroll* _tmp3_;
+ gdouble _tmp4_;
GdkRectangle viewport_wrt_canvas = {0};
ZoomState _tmp5_ = {0};
GdkRectangle _tmp6_ = {0};
GdkPoint _result_ = {0};
GdkPoint _tmp7_ = {0};
- GdkPoint _tmp8_ = {0};
- gint _tmp9_ = 0;
- GdkRectangle _tmp10_ = {0};
- gint _tmp11_ = 0;
- GdkPoint _tmp12_ = {0};
- gint _tmp13_ = 0;
- GdkRectangle _tmp14_ = {0};
- gint _tmp15_ = 0;
- gint _tmp16_ = 0;
- GdkPoint _tmp17_ = {0};
- gint _tmp18_ = 0;
- GdkRectangle _tmp19_ = {0};
- gint _tmp20_ = 0;
- GdkPoint _tmp21_ = {0};
- gint _tmp22_ = 0;
- GdkRectangle _tmp23_ = {0};
- gint _tmp24_ = 0;
- gint _tmp25_ = 0;
+ GdkPoint _tmp8_;
+ gint _tmp9_;
+ GdkRectangle _tmp10_;
+ gint _tmp11_;
+ GdkPoint _tmp12_;
+ gint _tmp13_;
+ GdkRectangle _tmp14_;
+ gint _tmp15_;
+ gint _tmp16_;
+ GdkPoint _tmp17_;
+ gint _tmp18_;
+ GdkRectangle _tmp19_;
+ gint _tmp20_;
+ GdkPoint _tmp21_;
+ gint _tmp22_;
+ GdkRectangle _tmp23_;
+ gint _tmp24_;
+ gint _tmp25_;
#line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5300,25 +5294,25 @@ static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, Gd
*result = _result_;
#line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 5300 "PhotoPage.c"
+#line 5294 "PhotoPage.c"
}
static void editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* self, GdkEventScroll* event, GdkPoint* result) {
GdkPoint cursor_wrt_viewport = {0};
- GdkEventScroll* _tmp0_ = NULL;
+ GdkEventScroll* _tmp0_;
GdkPoint _tmp1_ = {0};
GdkRectangle viewport_wrt_canvas = {0};
ZoomState _tmp2_ = {0};
GdkRectangle _tmp3_ = {0};
GdkPoint viewport_center = {0};
GdkPoint _tmp4_ = {0};
- GdkRectangle _tmp5_ = {0};
- gint _tmp6_ = 0;
- GdkRectangle _tmp7_ = {0};
- gint _tmp8_ = 0;
- GdkPoint _tmp9_ = {0};
- GdkPoint _tmp10_ = {0};
+ GdkRectangle _tmp5_;
+ gint _tmp6_;
+ GdkRectangle _tmp7_;
+ gint _tmp8_;
+ GdkPoint _tmp9_;
+ GdkPoint _tmp10_;
GdkPoint _tmp11_ = {0};
#line 625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -5362,7 +5356,7 @@ static void editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* s
*result = _tmp11_;
#line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 5362 "PhotoPage.c"
+#line 5356 "PhotoPage.c"
}
@@ -5371,16 +5365,16 @@ static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self,
ZoomState _tmp0_ = {0};
GdkPoint _tmp1_ = {0};
ZoomState _tmp2_ = {0};
- gdouble _tmp3_ = 0.0;
+ gdouble _tmp3_;
GdkPoint _tmp4_ = {0};
GdkPoint cursor_wrt_center_iso = {0};
- GdkEventScroll* _tmp5_ = NULL;
+ GdkEventScroll* _tmp5_;
GdkPoint _tmp6_ = {0};
ZoomState _tmp7_ = {0};
- gdouble _tmp8_ = 0.0;
+ gdouble _tmp8_;
GdkPoint _tmp9_ = {0};
- GdkPoint _tmp10_ = {0};
- GdkPoint _tmp11_ = {0};
+ GdkPoint _tmp10_;
+ GdkPoint _tmp11_;
GdkPoint _tmp12_ = {0};
#line 636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -5420,14 +5414,14 @@ static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self,
*result = _tmp12_;
#line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 5420 "PhotoPage.c"
+#line 5414 "PhotoPage.c"
}
static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* self, gdouble interp) {
gdouble result = 0.0;
- gdouble _tmp0_ = 0.0;
- gdouble _tmp2_ = 0.0;
+ gdouble _tmp0_;
+ gdouble _tmp2_;
#line 646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), 0.0);
#line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5436,16 +5430,16 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel
if (_tmp0_ < 0.03) {
#line 648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
interp = 0.0;
-#line 5436 "PhotoPage.c"
+#line 5430 "PhotoPage.c"
} else {
- gdouble _tmp1_ = 0.0;
+ gdouble _tmp1_;
#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = interp;
#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp1_ > 0.97) {
#line 650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
interp = 1.0;
-#line 5445 "PhotoPage.c"
+#line 5439 "PhotoPage.c"
}
}
#line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5454,16 +5448,16 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel
result = _tmp2_;
#line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 5454 "PhotoPage.c"
+#line 5448 "PhotoPage.c"
}
static gdouble editing_host_page_adjust_interpolation_factor (EditingHostPage* self, gdouble adjustment) {
gdouble result = 0.0;
ZoomState _tmp0_ = {0};
- gdouble _tmp1_ = 0.0;
- gdouble _tmp2_ = 0.0;
- gdouble _tmp3_ = 0.0;
+ gdouble _tmp1_;
+ gdouble _tmp2_;
+ gdouble _tmp3_;
#line 655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), 0.0);
#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5478,41 +5472,41 @@ static gdouble editing_host_page_adjust_interpolation_factor (EditingHostPage* s
result = _tmp3_;
#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 5478 "PhotoPage.c"
+#line 5472 "PhotoPage.c"
}
static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* self, GdkEventScroll* event, gdouble zoom_increment) {
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
GdkPoint cursor_wrt_viewport_center = {0};
- GdkEventScroll* _tmp1_ = NULL;
+ GdkEventScroll* _tmp1_;
GdkPoint _tmp2_ = {0};
GdkPoint iso_pixel_under_cursor = {0};
- GdkEventScroll* _tmp3_ = NULL;
+ GdkEventScroll* _tmp3_;
GdkPoint _tmp4_ = {0};
gdouble interp = 0.0;
- gdouble _tmp5_ = 0.0;
- gdouble _tmp6_ = 0.0;
- GtkScale* _tmp7_ = NULL;
- guint _tmp8_ = 0U;
- GtkScale* _tmp9_ = NULL;
- gdouble _tmp10_ = 0.0;
- GtkScale* _tmp11_ = NULL;
+ gdouble _tmp5_;
+ gdouble _tmp6_;
+ GtkScale* _tmp7_;
+ guint _tmp8_;
+ GtkScale* _tmp9_;
+ gdouble _tmp10_;
+ GtkScale* _tmp11_;
ZoomState new_zoom_state = {0};
ZoomState _tmp12_ = {0};
- gdouble _tmp13_ = 0.0;
- gboolean _tmp14_ = FALSE;
+ gdouble _tmp13_;
+ gboolean _tmp14_;
GdkPoint new_zoomed_old_cursor = {0};
- GdkPoint _tmp15_ = {0};
- gdouble _tmp16_ = 0.0;
+ GdkPoint _tmp15_;
+ gdouble _tmp16_;
GdkPoint _tmp17_ = {0};
GdkPoint desired_new_viewport_center = {0};
- GdkPoint _tmp18_ = {0};
- GdkPoint _tmp19_ = {0};
+ GdkPoint _tmp18_;
+ GdkPoint _tmp19_;
GdkPoint _tmp20_ = {0};
- ZoomState _tmp21_ = {0};
- GdkPoint _tmp22_ = {0};
- ZoomState _tmp23_ = {0};
+ ZoomState _tmp21_;
+ GdkPoint _tmp22_;
+ ZoomState _tmp23_;
#line 659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5523,7 +5517,7 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se
if (_tmp0_) {
#line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 5523 "PhotoPage.c"
+#line 5517 "PhotoPage.c"
}
#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = event;
@@ -5577,7 +5571,7 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se
single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 5577 "PhotoPage.c"
+#line 5571 "PhotoPage.c"
}
#line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp15_ = iso_pixel_under_cursor;
@@ -5609,39 +5603,39 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se
single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
#line 690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_update_cursor_for_zoom_context (self);
-#line 5609 "PhotoPage.c"
+#line 5603 "PhotoPage.c"
}
void editing_host_page_snap_zoom_to_min (EditingHostPage* self) {
- GtkScale* _tmp0_ = NULL;
+ GtkScale* _tmp0_;
#line 693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = self->priv->zoom_slider;
#line 694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 0.0);
-#line 5621 "PhotoPage.c"
+#line 5615 "PhotoPage.c"
}
void editing_host_page_snap_zoom_to_max (EditingHostPage* self) {
- GtkScale* _tmp0_ = NULL;
+ GtkScale* _tmp0_;
#line 697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = self->priv->zoom_slider;
#line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 1.0);
-#line 5633 "PhotoPage.c"
+#line 5627 "PhotoPage.c"
}
void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self) {
ZoomState iso_state = {0};
ZoomState _tmp0_ = {0};
- GtkScale* _tmp1_ = NULL;
- gdouble _tmp2_ = 0.0;
+ GtkScale* _tmp1_;
+ gdouble _tmp2_;
#line 701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5654,16 +5648,16 @@ void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self) {
_tmp2_ = zoom_state_get_interpolation_factor (&iso_state);
#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange), _tmp2_);
-#line 5654 "PhotoPage.c"
+#line 5648 "PhotoPage.c"
}
static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage* self, GdkEventKey* event) {
gboolean result = FALSE;
- GdkEventKey* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
+ GdkEventKey* _tmp0_;
+ guint _tmp1_;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
GQuark _tmp5_ = 0U;
#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
static GQuark _tmp4_label0 = 0;
@@ -5697,7 +5691,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
if (((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("equal")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("plus"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("KP_Add"))))) {
#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 5697 "PhotoPage.c"
+#line 5691 "PhotoPage.c"
default:
{
#line 711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5706,13 +5700,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
result = TRUE;
#line 712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 5706 "PhotoPage.c"
+#line 5700 "PhotoPage.c"
}
}
} else if (((_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("minus")))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("underscore"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Subtract"))))) {
#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 5712 "PhotoPage.c"
+#line 5706 "PhotoPage.c"
default:
{
#line 717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5721,13 +5715,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
result = TRUE;
#line 718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 5721 "PhotoPage.c"
+#line 5715 "PhotoPage.c"
}
}
} else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("KP_Divide")))) {
#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 5727 "PhotoPage.c"
+#line 5721 "PhotoPage.c"
default:
{
#line 721 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5736,13 +5730,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
result = TRUE;
#line 722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 5736 "PhotoPage.c"
+#line 5730 "PhotoPage.c"
}
}
} else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("KP_Multiply")))) {
#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 5742 "PhotoPage.c"
+#line 5736 "PhotoPage.c"
default:
{
#line 725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5751,7 +5745,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
result = TRUE;
#line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 5751 "PhotoPage.c"
+#line 5745 "PhotoPage.c"
}
}
}
@@ -5759,7 +5753,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
result = FALSE;
#line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 5759 "PhotoPage.c"
+#line 5753 "PhotoPage.c"
}
@@ -5768,20 +5762,20 @@ gboolean editing_host_page_on_zoom_slider_key_press (EditingHostPage* self, GdkE
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
#line 706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return EDITING_HOST_PAGE_GET_CLASS (self)->on_zoom_slider_key_press (self, event);
-#line 5768 "PhotoPage.c"
+#line 5762 "PhotoPage.c"
}
static void editing_host_page_real_on_increase_size (EditingHostPage* self) {
- GtkScale* _tmp0_ = NULL;
- gdouble _tmp1_ = 0.0;
+ GtkScale* _tmp0_;
+ gdouble _tmp1_;
#line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = self->priv->zoom_slider;
#line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = editing_host_page_adjust_interpolation_factor (self, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
#line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_);
-#line 5781 "PhotoPage.c"
+#line 5775 "PhotoPage.c"
}
@@ -5790,20 +5784,20 @@ void editing_host_page_on_increase_size (EditingHostPage* self) {
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
EDITING_HOST_PAGE_GET_CLASS (self)->on_increase_size (self);
-#line 5790 "PhotoPage.c"
+#line 5784 "PhotoPage.c"
}
static void editing_host_page_real_on_decrease_size (EditingHostPage* self) {
- GtkScale* _tmp0_ = NULL;
- gdouble _tmp1_ = 0.0;
+ GtkScale* _tmp0_;
+ gdouble _tmp1_;
#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = self->priv->zoom_slider;
#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = editing_host_page_adjust_interpolation_factor (self, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_);
-#line 5803 "PhotoPage.c"
+#line 5797 "PhotoPage.c"
}
@@ -5812,14 +5806,14 @@ void editing_host_page_on_decrease_size (EditingHostPage* self) {
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
EDITING_HOST_PAGE_GET_CLASS (self)->on_decrease_size (self);
-#line 5812 "PhotoPage.c"
+#line 5806 "PhotoPage.c"
}
static void editing_host_page_real_save_zoom_state (SinglePhotoPage* base) {
EditingHostPage * self;
- GtkScale* _tmp0_ = NULL;
- gdouble _tmp1_ = 0.0;
+ GtkScale* _tmp0_;
+ gdouble _tmp1_;
#line 740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5830,15 +5824,15 @@ static void editing_host_page_real_save_zoom_state (SinglePhotoPage* base) {
_tmp1_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange));
#line 742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self->priv->saved_slider_val = _tmp1_;
-#line 5830 "PhotoPage.c"
+#line 5824 "PhotoPage.c"
}
static ZoomBuffer* editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base) {
EditingHostPage * self;
ZoomBuffer* result = NULL;
- ZoomBuffer* _tmp0_ = NULL;
- ZoomBuffer* _tmp1_ = NULL;
+ ZoomBuffer* _tmp0_;
+ ZoomBuffer* _tmp1_;
#line 745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5849,7 +5843,7 @@ static ZoomBuffer* editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base
result = _tmp1_;
#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 5849 "PhotoPage.c"
+#line 5843 "PhotoPage.c"
}
@@ -5858,8 +5852,8 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
ZoomState _tmp1_ = {0};
- gboolean _tmp2_ = FALSE;
- GdkEventScroll* _tmp5_ = NULL;
+ gboolean _tmp2_;
+ GdkEventScroll* _tmp5_;
#line 749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5872,17 +5866,17 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
if (_tmp2_) {
#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = TRUE;
-#line 5872 "PhotoPage.c"
+#line 5866 "PhotoPage.c"
} else {
- GtkScale* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ GtkScale* _tmp3_;
+ gboolean _tmp4_;
#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = self->priv->zoom_slider;
#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = !_tmp4_;
-#line 5882 "PhotoPage.c"
+#line 5876 "PhotoPage.c"
}
#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
@@ -5890,7 +5884,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
result = FALSE;
#line 751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 5890 "PhotoPage.c"
+#line 5884 "PhotoPage.c"
}
#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = event;
@@ -5900,7 +5894,7 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
result = FALSE;
#line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 5900 "PhotoPage.c"
+#line 5894 "PhotoPage.c"
}
@@ -5909,8 +5903,8 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
ZoomState _tmp1_ = {0};
- gboolean _tmp2_ = FALSE;
- GdkEventScroll* _tmp5_ = NULL;
+ gboolean _tmp2_;
+ GdkEventScroll* _tmp5_;
#line 757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5923,17 +5917,17 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
if (_tmp2_) {
#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = TRUE;
-#line 5923 "PhotoPage.c"
+#line 5917 "PhotoPage.c"
} else {
- GtkScale* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ GtkScale* _tmp3_;
+ gboolean _tmp4_;
#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = self->priv->zoom_slider;
#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = !_tmp4_;
-#line 5933 "PhotoPage.c"
+#line 5927 "PhotoPage.c"
}
#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
@@ -5941,7 +5935,7 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
result = FALSE;
#line 759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 5941 "PhotoPage.c"
+#line 5935 "PhotoPage.c"
}
#line 761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = event;
@@ -5951,17 +5945,17 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
result = FALSE;
#line 762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 5951 "PhotoPage.c"
+#line 5945 "PhotoPage.c"
}
static void editing_host_page_real_restore_zoom_state (SinglePhotoPage* base) {
EditingHostPage * self;
- GtkScale* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- GtkScale* _tmp2_ = NULL;
- gdouble _tmp3_ = 0.0;
- GtkScale* _tmp4_ = NULL;
+ GtkScale* _tmp0_;
+ guint _tmp1_;
+ GtkScale* _tmp2_;
+ gdouble _tmp3_;
+ GtkScale* _tmp4_;
#line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5982,7 +5976,7 @@ static void editing_host_page_real_restore_zoom_state (SinglePhotoPage* base) {
_tmp4_ = self->priv->zoom_slider;
#line 770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
-#line 5982 "PhotoPage.c"
+#line 5976 "PhotoPage.c"
}
@@ -5995,14 +5989,14 @@ static gboolean editing_host_page_real_is_zoom_supported (SinglePhotoPage* base)
result = TRUE;
#line 774 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 5995 "PhotoPage.c"
+#line 5989 "PhotoPage.c"
}
static void editing_host_page_real_set_container (Page* base, GtkWindow* container) {
EditingHostPage * self;
- GtkWindow* _tmp0_ = NULL;
- GtkWindow* _tmp1_ = NULL;
+ GtkWindow* _tmp0_;
+ GtkWindow* _tmp1_;
#line 777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6015,23 +6009,23 @@ static void editing_host_page_real_set_container (Page* base, GtkWindow* contain
_tmp1_ = container;
#line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) {
-#line 6015 "PhotoPage.c"
- DragAndDropHandler* _tmp2_ = NULL;
+#line 6009 "PhotoPage.c"
+ DragAndDropHandler* _tmp2_;
#line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = drag_and_drop_handler_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_drag_and_drop_handler_unref0 (self->priv->dnd_handler);
#line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self->priv->dnd_handler = _tmp2_;
-#line 6023 "PhotoPage.c"
+#line 6017 "PhotoPage.c"
}
}
ViewCollection* editing_host_page_get_parent_view (EditingHostPage* self) {
ViewCollection* result = NULL;
- ViewCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
+ ViewCollection* _tmp0_;
+ ViewCollection* _tmp1_;
#line 785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
#line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6042,15 +6036,15 @@ ViewCollection* editing_host_page_get_parent_view (EditingHostPage* self) {
result = _tmp1_;
#line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 6042 "PhotoPage.c"
+#line 6036 "PhotoPage.c"
}
gboolean editing_host_page_has_photo (EditingHostPage* self) {
gboolean result = FALSE;
- Photo* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ Photo* _tmp0_;
+ Photo* _tmp1_;
+ gboolean _tmp2_;
#line 789 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6065,25 +6059,25 @@ gboolean editing_host_page_has_photo (EditingHostPage* self) {
result = _tmp2_;
#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 6065 "PhotoPage.c"
+#line 6059 "PhotoPage.c"
}
Photo* editing_host_page_get_photo (EditingHostPage* self) {
Photo* result = NULL;
- ViewCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gboolean _tmp3_ = FALSE;
- ViewCollection* _tmp4_ = NULL;
- ViewCollection* _tmp5_ = NULL;
- gint _tmp6_ = 0;
- ViewCollection* _tmp7_ = NULL;
- ViewCollection* _tmp8_ = NULL;
- DataView* _tmp9_ = NULL;
- DataView* _tmp10_ = NULL;
- DataSource* _tmp11_ = NULL;
- Photo* _tmp12_ = NULL;
+ ViewCollection* _tmp0_;
+ ViewCollection* _tmp1_;
+ gint _tmp2_;
+ gboolean _tmp3_;
+ ViewCollection* _tmp4_;
+ ViewCollection* _tmp5_;
+ gint _tmp6_;
+ ViewCollection* _tmp7_;
+ ViewCollection* _tmp8_;
+ DataView* _tmp9_;
+ DataView* _tmp10_;
+ DataSource* _tmp11_;
+ Photo* _tmp12_;
#line 793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6102,7 +6096,7 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) {
result = NULL;
#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 6102 "PhotoPage.c"
+#line 6096 "PhotoPage.c"
}
#line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -6134,14 +6128,14 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) {
result = _tmp12_;
#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 6134 "PhotoPage.c"
+#line 6128 "PhotoPage.c"
}
static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo* new_photo) {
- Photo* _tmp0_ = NULL;
- PhotoFileFormat _tmp1_ = 0;
- gboolean _tmp6_ = FALSE;
+ Photo* _tmp0_;
+ PhotoFileFormat _tmp1_;
+ gboolean _tmp6_;
#line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_PHOTO (new_photo));
#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6152,12 +6146,12 @@ static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo*
if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) {
#line 809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_set_photo_missing (self, FALSE);
-#line 6152 "PhotoPage.c"
+#line 6146 "PhotoPage.c"
} else {
- Photo* _tmp2_ = NULL;
- GFile* _tmp3_ = NULL;
- GFile* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+ Photo* _tmp2_;
+ GFile* _tmp3_;
+ GFile* _tmp4_;
+ gboolean _tmp5_;
#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = new_photo;
#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6170,13 +6164,13 @@ static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo*
editing_host_page_set_photo_missing (self, !_tmp5_);
#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp4_);
-#line 6170 "PhotoPage.c"
+#line 6164 "PhotoPage.c"
}
#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_ = self->priv->photo_missing;
#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_update_ui (self, _tmp6_);
-#line 6176 "PhotoPage.c"
+#line 6170 "PhotoPage.c"
}
@@ -6185,35 +6179,35 @@ void editing_host_page_photo_changing (EditingHostPage* self, Photo* new_photo)
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
EDITING_HOST_PAGE_GET_CLASS (self)->photo_changing (self, new_photo);
-#line 6185 "PhotoPage.c"
+#line 6179 "PhotoPage.c"
}
static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
- GtkScale* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- GtkScale* _tmp2_ = NULL;
- GtkScale* _tmp3_ = NULL;
- Photo* _tmp4_ = NULL;
+ GtkScale* _tmp0_;
+ guint _tmp1_;
+ GtkScale* _tmp2_;
+ GtkScale* _tmp3_;
+ Photo* _tmp4_;
DataView* view = NULL;
- ViewCollection* _tmp5_ = NULL;
- ViewCollection* _tmp6_ = NULL;
- Photo* _tmp7_ = NULL;
- DataView* _tmp8_ = NULL;
- DataView* _tmp9_ = NULL;
- DataView* _tmp10_ = NULL;
- ViewCollection* _tmp11_ = NULL;
- ViewCollection* _tmp12_ = NULL;
+ ViewCollection* _tmp5_;
+ ViewCollection* _tmp6_;
+ Photo* _tmp7_;
+ DataView* _tmp8_;
+ DataView* _tmp9_;
+ DataView* _tmp10_;
+ ViewCollection* _tmp11_;
+ ViewCollection* _tmp12_;
Marker* marker = NULL;
- ViewCollection* _tmp13_ = NULL;
- ViewCollection* _tmp14_ = NULL;
- DataView* _tmp15_ = NULL;
- Marker* _tmp16_ = NULL;
- Marker* _tmp17_ = NULL;
- ViewCollection* _tmp18_ = NULL;
- ViewCollection* _tmp19_ = NULL;
- Marker* _tmp20_ = NULL;
- ViewCollection* _tmp21_ = NULL;
+ ViewCollection* _tmp13_;
+ ViewCollection* _tmp14_;
+ DataView* _tmp15_;
+ Marker* _tmp16_;
+ Marker* _tmp17_;
+ ViewCollection* _tmp18_;
+ ViewCollection* _tmp19_;
+ Marker* _tmp20_;
+ ViewCollection* _tmp21_;
#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6290,13 +6284,13 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
_tmp21_ = self->priv->parent_view;
#line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp21_ != NULL) {
-#line 6290 "PhotoPage.c"
- ViewCollection* _tmp22_ = NULL;
+#line 6284 "PhotoPage.c"
+ ViewCollection* _tmp22_;
DataView* view_in_parent = NULL;
- ViewCollection* _tmp23_ = NULL;
- Photo* _tmp24_ = NULL;
- DataView* _tmp25_ = NULL;
- DataView* _tmp26_ = NULL;
+ ViewCollection* _tmp23_;
+ Photo* _tmp24_;
+ DataView* _tmp25_;
+ DataView* _tmp26_;
#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp22_ = self->priv->parent_view;
#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6313,12 +6307,12 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
_tmp26_ = view_in_parent;
#line 835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (NULL != _tmp26_) {
-#line 6313 "PhotoPage.c"
- ViewCollection* _tmp27_ = NULL;
- ViewCollection* _tmp28_ = NULL;
- DataView* _tmp29_ = NULL;
- Marker* _tmp30_ = NULL;
- Marker* _tmp31_ = NULL;
+#line 6307 "PhotoPage.c"
+ ViewCollection* _tmp27_;
+ ViewCollection* _tmp28_;
+ DataView* _tmp29_;
+ Marker* _tmp30_;
+ Marker* _tmp31_;
#line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp27_ = self->priv->parent_view;
#line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6333,17 +6327,17 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
view_collection_select_marked (_tmp27_, _tmp31_);
#line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp31_);
-#line 6333 "PhotoPage.c"
+#line 6327 "PhotoPage.c"
}
#line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (view_in_parent);
-#line 6337 "PhotoPage.c"
+#line 6331 "PhotoPage.c"
}
#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (marker);
#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (view);
-#line 6343 "PhotoPage.c"
+#line 6337 "PhotoPage.c"
}
@@ -6355,14 +6349,14 @@ static void editing_host_page_real_realize (GtkWidget* base) {
GTK_WIDGET_CLASS (editing_host_page_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget));
#line 843 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_rebuild_caches (self, "realize");
-#line 6355 "PhotoPage.c"
+#line 6349 "PhotoPage.c"
}
static void editing_host_page_real_switched_to (Page* base) {
EditingHostPage * self;
gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
#line 846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6373,23 +6367,23 @@ static void editing_host_page_real_switched_to (Page* base) {
_tmp1_ = editing_host_page_has_photo (self);
#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp1_) {
-#line 6373 "PhotoPage.c"
- gboolean _tmp2_ = FALSE;
+#line 6367 "PhotoPage.c"
+ gboolean _tmp2_;
#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = self->priv->pixbuf_dirty;
#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = _tmp2_;
-#line 6379 "PhotoPage.c"
+#line 6373 "PhotoPage.c"
} else {
#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = FALSE;
-#line 6383 "PhotoPage.c"
+#line 6377 "PhotoPage.c"
}
#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
-#line 6387 "PhotoPage.c"
- Photo* _tmp3_ = NULL;
- Photo* _tmp4_ = NULL;
+#line 6381 "PhotoPage.c"
+ Photo* _tmp3_;
+ Photo* _tmp4_;
#line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = editing_host_page_get_photo (self);
#line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6398,7 +6392,7 @@ static void editing_host_page_real_switched_to (Page* base) {
editing_host_page_replace_photo (self, _tmp4_);
#line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp4_);
-#line 6398 "PhotoPage.c"
+#line 6392 "PhotoPage.c"
}
}
@@ -6407,9 +6401,9 @@ static void editing_host_page_real_switching_from (Page* base) {
EditingHostPage * self;
Dimensions _tmp0_ = {0};
gboolean _tmp1_ = FALSE;
- gboolean _tmp2_ = FALSE;
- ViewCollection* _tmp13_ = NULL;
- ViewCollection* _tmp14_ = NULL;
+ gboolean _tmp2_;
+ ViewCollection* _tmp13_;
+ ViewCollection* _tmp14_;
#line 856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6426,30 +6420,30 @@ static void editing_host_page_real_switching_from (Page* base) {
_tmp2_ = editing_host_page_has_photo (self);
#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp2_) {
-#line 6426 "PhotoPage.c"
- ViewCollection* _tmp3_ = NULL;
+#line 6420 "PhotoPage.c"
+ ViewCollection* _tmp3_;
#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = self->priv->parent_view;
#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = _tmp3_ != NULL;
-#line 6432 "PhotoPage.c"
+#line 6426 "PhotoPage.c"
} else {
#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = FALSE;
-#line 6436 "PhotoPage.c"
+#line 6430 "PhotoPage.c"
}
#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp1_) {
-#line 6440 "PhotoPage.c"
- ViewCollection* _tmp4_ = NULL;
- ViewCollection* _tmp5_ = NULL;
- ViewCollection* _tmp6_ = NULL;
- Photo* _tmp7_ = NULL;
- Photo* _tmp8_ = NULL;
- DataView* _tmp9_ = NULL;
- DataView* _tmp10_ = NULL;
- Marker* _tmp11_ = NULL;
- Marker* _tmp12_ = NULL;
+#line 6434 "PhotoPage.c"
+ ViewCollection* _tmp4_;
+ ViewCollection* _tmp5_;
+ ViewCollection* _tmp6_;
+ Photo* _tmp7_;
+ Photo* _tmp8_;
+ DataView* _tmp9_;
+ DataView* _tmp10_;
+ Marker* _tmp11_;
+ Marker* _tmp12_;
#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = self->priv->parent_view;
#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6476,7 +6470,7 @@ static void editing_host_page_real_switching_from (Page* base) {
_g_object_unref0 (_tmp10_);
#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp8_);
-#line 6476 "PhotoPage.c"
+#line 6470 "PhotoPage.c"
}
#line 873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_data_collection_unref0 (self->priv->parent_view);
@@ -6490,25 +6484,25 @@ static void editing_host_page_real_switching_from (Page* base) {
data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_data_collection_unref0 (_tmp14_);
-#line 6490 "PhotoPage.c"
+#line 6484 "PhotoPage.c"
}
static void _editing_host_page_on_selection_changed_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self) {
#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_selection_changed ((EditingHostPage*) self, selected);
-#line 6497 "PhotoPage.c"
+#line 6491 "PhotoPage.c"
}
static void editing_host_page_real_switching_to_fullscreen (Page* base, FullscreenWindow* fsw) {
EditingHostPage * self;
- FullscreenWindow* _tmp0_ = NULL;
+ FullscreenWindow* _tmp0_;
Dimensions _tmp1_ = {0};
Page* page = NULL;
- FullscreenWindow* _tmp2_ = NULL;
- Page* _tmp3_ = NULL;
- Page* _tmp4_ = NULL;
+ FullscreenWindow* _tmp2_;
+ Page* _tmp3_;
+ Page* _tmp4_;
#line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6535,10 +6529,10 @@ static void editing_host_page_real_switching_to_fullscreen (Page* base, Fullscre
_tmp4_ = page;
#line 886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp4_ != NULL) {
-#line 6535 "PhotoPage.c"
- Page* _tmp5_ = NULL;
- ViewCollection* _tmp6_ = NULL;
- ViewCollection* _tmp7_ = NULL;
+#line 6529 "PhotoPage.c"
+ Page* _tmp5_;
+ ViewCollection* _tmp6_;
+ ViewCollection* _tmp7_;
#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = page;
#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6549,21 +6543,21 @@ static void editing_host_page_real_switching_to_fullscreen (Page* base, Fullscre
g_signal_connect_object (_tmp7_, "items-selected", (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self, 0);
#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_data_collection_unref0 (_tmp7_);
-#line 6549 "PhotoPage.c"
+#line 6543 "PhotoPage.c"
}
#line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (page);
-#line 6553 "PhotoPage.c"
+#line 6547 "PhotoPage.c"
}
static void editing_host_page_real_returning_from_fullscreen (Page* base, FullscreenWindow* fsw) {
EditingHostPage * self;
- FullscreenWindow* _tmp0_ = NULL;
+ FullscreenWindow* _tmp0_;
Page* page = NULL;
- FullscreenWindow* _tmp1_ = NULL;
- Page* _tmp2_ = NULL;
- Page* _tmp3_ = NULL;
+ FullscreenWindow* _tmp1_;
+ Page* _tmp2_;
+ Page* _tmp3_;
#line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6584,11 +6578,11 @@ static void editing_host_page_real_returning_from_fullscreen (Page* base, Fullsc
_tmp3_ = page;
#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp3_ != NULL) {
-#line 6584 "PhotoPage.c"
- Page* _tmp4_ = NULL;
- ViewCollection* _tmp5_ = NULL;
- ViewCollection* _tmp6_ = NULL;
- guint _tmp7_ = 0U;
+#line 6578 "PhotoPage.c"
+ Page* _tmp4_;
+ ViewCollection* _tmp5_;
+ ViewCollection* _tmp6_;
+ guint _tmp7_;
#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = page;
#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6601,11 +6595,11 @@ static void editing_host_page_real_returning_from_fullscreen (Page* base, Fullsc
g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self);
#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_data_collection_unref0 (_tmp6_);
-#line 6601 "PhotoPage.c"
+#line 6595 "PhotoPage.c"
}
#line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (page);
-#line 6605 "PhotoPage.c"
+#line 6599 "PhotoPage.c"
}
@@ -6614,11 +6608,11 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (GEE_IS_ITERABLE (selected));
-#line 6614 "PhotoPage.c"
+#line 6608 "PhotoPage.c"
{
GeeIterator* _view_it = NULL;
- GeeIterable* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeIterable* _tmp0_;
+ GeeIterator* _tmp1_;
#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = selected;
#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6627,20 +6621,20 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
_view_it = _tmp1_;
#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
while (TRUE) {
-#line 6627 "PhotoPage.c"
- gboolean _tmp2_ = FALSE;
+#line 6621 "PhotoPage.c"
+ gboolean _tmp2_;
DataView* view = NULL;
- gpointer _tmp3_ = NULL;
- DataView* _tmp4_ = NULL;
- DataSource* _tmp5_ = NULL;
- Photo* _tmp6_ = NULL;
+ gpointer _tmp3_;
+ DataView* _tmp4_;
+ DataSource* _tmp5_;
+ Photo* _tmp6_;
#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = gee_iterator_next (_view_it);
#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (!_tmp2_) {
#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 6640 "PhotoPage.c"
+#line 6634 "PhotoPage.c"
}
#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = gee_iterator_get (_view_it);
@@ -6660,18 +6654,18 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
_g_object_unref0 (view);
#line 903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 6660 "PhotoPage.c"
+#line 6654 "PhotoPage.c"
}
#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_view_it);
-#line 6664 "PhotoPage.c"
+#line 6658 "PhotoPage.c"
}
}
void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable) {
- GtkToolButton* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ GtkToolButton* _tmp0_;
+ gboolean _tmp1_;
#line 907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6680,14 +6674,14 @@ void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_ena
_tmp1_ = should_enable;
#line 908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 6680 "PhotoPage.c"
+#line 6674 "PhotoPage.c"
}
static void _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched (PixbufCache* _sender, Photo* photo, GdkPixbuf* pixbuf, GError* err, gpointer self) {
#line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_pixbuf_fetched ((EditingHostPage*) self, photo, pixbuf, err);
-#line 6687 "PhotoPage.c"
+#line 6681 "PhotoPage.c"
}
@@ -6696,7 +6690,7 @@ static gboolean _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter
result = editing_host_page_master_cache_filter ((EditingHostPage*) self, photo);
#line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 6696 "PhotoPage.c"
+#line 6690 "PhotoPage.c"
}
@@ -6704,19 +6698,19 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
Scaling scaling = {0};
Scaling _tmp0_ = {0};
gboolean _tmp1_ = FALSE;
- PixbufCache* _tmp2_ = NULL;
- const gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- PixbufCache* _tmp10_ = NULL;
- SourceCollection* _tmp14_ = NULL;
- Scaling _tmp15_ = {0};
- PixbufCache* _tmp16_ = NULL;
- PixbufCache* _tmp17_ = NULL;
- SourceCollection* _tmp18_ = NULL;
- Scaling _tmp19_ = {0};
- PixbufCache* _tmp20_ = NULL;
- const gchar* _tmp21_ = NULL;
+ PixbufCache* _tmp2_;
+ const gchar* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ PixbufCache* _tmp10_;
+ SourceCollection* _tmp14_;
+ Scaling _tmp15_;
+ PixbufCache* _tmp16_;
+ PixbufCache* _tmp17_;
+ SourceCollection* _tmp18_;
+ Scaling _tmp19_;
+ PixbufCache* _tmp20_;
+ const gchar* _tmp21_;
#line 914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6729,11 +6723,11 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
_tmp2_ = self->priv->cache;
#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp2_ != NULL) {
-#line 6729 "PhotoPage.c"
- PixbufCache* _tmp3_ = NULL;
+#line 6723 "PhotoPage.c"
+ PixbufCache* _tmp3_;
Scaling _tmp4_ = {0};
- Scaling _tmp5_ = {0};
- gboolean _tmp6_ = FALSE;
+ Scaling _tmp5_;
+ gboolean _tmp6_;
#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = self->priv->cache;
#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6744,17 +6738,17 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
_tmp6_ = scaling_equals (&_tmp4_, &_tmp5_);
#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = _tmp6_;
-#line 6744 "PhotoPage.c"
+#line 6738 "PhotoPage.c"
} else {
#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = FALSE;
-#line 6748 "PhotoPage.c"
+#line 6742 "PhotoPage.c"
}
#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp1_) {
#line 919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 6754 "PhotoPage.c"
+#line 6748 "PhotoPage.c"
}
#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp7_ = caller;
@@ -6770,10 +6764,10 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
_tmp10_ = self->priv->cache;
#line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp10_ != NULL) {
-#line 6770 "PhotoPage.c"
- PixbufCache* _tmp11_ = NULL;
- guint _tmp12_ = 0U;
- PixbufCache* _tmp13_ = NULL;
+#line 6764 "PhotoPage.c"
+ PixbufCache* _tmp11_;
+ guint _tmp12_;
+ PixbufCache* _tmp13_;
#line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp11_ = self->priv->cache;
#line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6784,7 +6778,7 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
_tmp13_ = self->priv->cache;
#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
pixbuf_cache_cancel_all (_tmp13_);
-#line 6784 "PhotoPage.c"
+#line 6778 "PhotoPage.c"
}
#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp14_ = self->priv->sources;
@@ -6814,12 +6808,12 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
_tmp21_ = caller;
#line 936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_refresh_caches (self, _tmp21_);
-#line 6814 "PhotoPage.c"
+#line 6808 "PhotoPage.c"
}
static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar* caller) {
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6828,16 +6822,16 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar
_tmp0_ = editing_host_page_has_photo (self);
#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
-#line 6828 "PhotoPage.c"
- const gchar* _tmp1_ = NULL;
- Photo* _tmp2_ = NULL;
- Photo* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- ViewCollection* _tmp6_ = NULL;
- ViewCollection* _tmp7_ = NULL;
- Photo* _tmp8_ = NULL;
- Photo* _tmp9_ = NULL;
+#line 6822 "PhotoPage.c"
+ const gchar* _tmp1_;
+ Photo* _tmp2_;
+ Photo* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ ViewCollection* _tmp6_;
+ ViewCollection* _tmp7_;
+ Photo* _tmp8_;
+ Photo* _tmp9_;
#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = caller;
#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6869,14 +6863,14 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar
_g_object_unref0 (_tmp9_);
#line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_data_collection_unref0 (_tmp7_);
-#line 6868 "PhotoPage.c"
+#line 6862 "PhotoPage.c"
} else {
- const gchar* _tmp10_ = NULL;
+ const gchar* _tmp10_;
#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp10_ = caller;
#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_debug ("PhotoPage.vala:946: Refresh pixbuf caches (%s): (no photo)", _tmp10_);
-#line 6875 "PhotoPage.c"
+#line 6869 "PhotoPage.c"
}
}
@@ -6884,8 +6878,8 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar
static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Photo* photo) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
- Photo* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ Photo* _tmp1_;
+ gboolean _tmp2_;
#line 950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
#line 950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6898,33 +6892,33 @@ static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Ph
if (_tmp2_) {
#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = TRUE;
-#line 6897 "PhotoPage.c"
+#line 6891 "PhotoPage.c"
} else {
- Photo* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ Photo* _tmp3_;
+ gboolean _tmp4_;
#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = photo;
#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = photo_has_editable (_tmp3_);
#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = _tmp4_;
-#line 6907 "PhotoPage.c"
+#line 6901 "PhotoPage.c"
}
#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
result = _tmp0_;
#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 6913 "PhotoPage.c"
+#line 6907 "PhotoPage.c"
}
static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* photo, GdkPixbuf* pixbuf, GError* err) {
- Photo* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- Photo* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- gboolean _tmp4_ = FALSE;
- GdkPixbuf* _tmp5_ = NULL;
+ Photo* _tmp0_;
+ Photo* _tmp1_;
+ Photo* _tmp2_;
+ gboolean _tmp3_;
+ gboolean _tmp4_;
+ GdkPixbuf* _tmp5_;
GError * _inner_error_ = NULL;
#line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -6948,31 +6942,31 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
if (_tmp4_) {
#line 957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 6947 "PhotoPage.c"
+#line 6941 "PhotoPage.c"
}
#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = pixbuf;
#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp5_ != NULL) {
-#line 6953 "PhotoPage.c"
+#line 6947 "PhotoPage.c"
gboolean _tmp6_ = FALSE;
- ZoomBuffer* _tmp7_ = NULL;
+ ZoomBuffer* _tmp7_;
Dimensions max_dim = {0};
- Photo* _tmp15_ = NULL;
+ Photo* _tmp15_;
Dimensions _tmp16_ = {0};
- EditingToolsEditingTool* _tmp17_ = NULL;
- GdkPixbuf* _tmp31_ = NULL;
- Dimensions _tmp32_ = {0};
- Photo* _tmp33_ = NULL;
+ EditingToolsEditingTool* _tmp17_;
+ GdkPixbuf* _tmp31_;
+ Dimensions _tmp32_;
+ Photo* _tmp33_;
#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp7_ = self->priv->zoom_buffer;
#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp7_ != NULL) {
-#line 6967 "PhotoPage.c"
- ZoomBuffer* _tmp8_ = NULL;
- Photo* _tmp9_ = NULL;
- Photo* _tmp10_ = NULL;
- Photo* _tmp11_ = NULL;
+#line 6961 "PhotoPage.c"
+ ZoomBuffer* _tmp8_;
+ Photo* _tmp9_;
+ Photo* _tmp10_;
+ Photo* _tmp11_;
#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp8_ = self->priv->zoom_buffer;
#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6985,18 +6979,18 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
_tmp6_ = _tmp10_ == _tmp11_;
#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp10_);
-#line 6984 "PhotoPage.c"
+#line 6978 "PhotoPage.c"
} else {
#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_ = FALSE;
-#line 6988 "PhotoPage.c"
+#line 6982 "PhotoPage.c"
}
#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp6_) {
-#line 6992 "PhotoPage.c"
- Photo* _tmp12_ = NULL;
- GdkPixbuf* _tmp13_ = NULL;
- ZoomBuffer* _tmp14_ = NULL;
+#line 6986 "PhotoPage.c"
+ Photo* _tmp12_;
+ GdkPixbuf* _tmp13_;
+ ZoomBuffer* _tmp14_;
#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp12_ = photo;
#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7007,7 +7001,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
_g_object_unref0 (self->priv->zoom_buffer);
#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self->priv->zoom_buffer = _tmp14_;
-#line 7006 "PhotoPage.c"
+#line 7000 "PhotoPage.c"
}
#line 966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp15_ = photo;
@@ -7019,16 +7013,16 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
_tmp17_ = self->priv->current_tool;
#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp17_ != NULL) {
-#line 7018 "PhotoPage.c"
+#line 7012 "PhotoPage.c"
{
Dimensions tool_pixbuf_dim = {0};
GdkPixbuf* tool_pixbuf = NULL;
- EditingToolsEditingTool* _tmp18_ = NULL;
+ EditingToolsEditingTool* _tmp18_;
Scaling _tmp19_ = {0};
- Photo* _tmp20_ = NULL;
+ Photo* _tmp20_;
Dimensions _tmp21_ = {0};
- GdkPixbuf* _tmp22_ = NULL;
- GdkPixbuf* _tmp23_ = NULL;
+ GdkPixbuf* _tmp22_;
+ GdkPixbuf* _tmp23_;
#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp18_ = self->priv->current_tool;
#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7043,16 +7037,16 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
tool_pixbuf = _tmp22_;
#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7042 "PhotoPage.c"
- goto __catch244_g_error;
+#line 7036 "PhotoPage.c"
+ goto __catch245_g_error;
}
#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp23_ = tool_pixbuf;
#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp23_ != NULL) {
-#line 7049 "PhotoPage.c"
- GdkPixbuf* _tmp24_ = NULL;
- Dimensions _tmp25_ = {0};
+#line 7043 "PhotoPage.c"
+ GdkPixbuf* _tmp24_;
+ Dimensions _tmp25_;
#line 974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp24_ = tool_pixbuf;
#line 974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7061,21 +7055,21 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
_tmp25_ = tool_pixbuf_dim;
#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
max_dim = _tmp25_;
-#line 7060 "PhotoPage.c"
+#line 7054 "PhotoPage.c"
}
#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (tool_pixbuf);
-#line 7064 "PhotoPage.c"
+#line 7058 "PhotoPage.c"
}
- goto __finally244;
- __catch244_g_error:
+ goto __finally245;
+ __catch245_g_error:
{
GError* err = NULL;
- Photo* _tmp26_ = NULL;
- gchar* _tmp27_ = NULL;
- gchar* _tmp28_ = NULL;
- GError* _tmp29_ = NULL;
- const gchar* _tmp30_ = NULL;
+ Photo* _tmp26_;
+ gchar* _tmp27_;
+ gchar* _tmp28_;
+ GError* _tmp29_;
+ const gchar* _tmp30_;
#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
err = _inner_error_;
#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7100,9 +7094,9 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
_g_error_free0 (err);
#line 981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 7099 "PhotoPage.c"
+#line 7093 "PhotoPage.c"
}
- __finally244:
+ __finally245:
#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7111,7 +7105,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
g_clear_error (&_inner_error_);
#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 7110 "PhotoPage.c"
+#line 7104 "PhotoPage.c"
}
}
#line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7126,22 +7120,22 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
_tmp33_ = photo;
#line 988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PHOTO, Photo), FALSE);
-#line 7125 "PhotoPage.c"
+#line 7119 "PhotoPage.c"
} else {
- GError* _tmp34_ = NULL;
+ GError* _tmp34_;
#line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp34_ = err;
#line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp34_ != NULL) {
-#line 7132 "PhotoPage.c"
- Photo* _tmp35_ = NULL;
+#line 7126 "PhotoPage.c"
+ Photo* _tmp35_;
#line 992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_set_photo_missing (self, TRUE);
#line 995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp35_ = photo;
#line 995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo), TRUE);
-#line 7140 "PhotoPage.c"
+#line 7134 "PhotoPage.c"
}
}
}
@@ -7149,30 +7143,30 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCollection* controller, Photo* photo) {
PixbufCachePixbufCacheBatch* normal_batch = NULL;
- PixbufCachePixbufCacheBatch* _tmp0_ = NULL;
+ PixbufCachePixbufCacheBatch* _tmp0_;
PixbufCachePixbufCacheBatch* master_batch = NULL;
- PixbufCachePixbufCacheBatch* _tmp1_ = NULL;
- PixbufCachePixbufCacheBatch* _tmp2_ = NULL;
- Photo* _tmp3_ = NULL;
- PixbufCachePixbufCacheBatch* _tmp4_ = NULL;
- Photo* _tmp5_ = NULL;
+ PixbufCachePixbufCacheBatch* _tmp1_;
+ PixbufCachePixbufCacheBatch* _tmp2_;
+ Photo* _tmp3_;
+ PixbufCachePixbufCacheBatch* _tmp4_;
+ Photo* _tmp5_;
DataSource* next_source = NULL;
DataSource* prev_source = NULL;
- ViewCollection* _tmp6_ = NULL;
- Photo* _tmp7_ = NULL;
+ ViewCollection* _tmp6_;
+ Photo* _tmp7_;
DataSource* _tmp8_ = NULL;
DataSource* _tmp9_ = NULL;
- gboolean _tmp10_ = FALSE;
+ gboolean _tmp10_;
Photo* next = NULL;
- DataSource* _tmp11_ = NULL;
- Photo* _tmp12_ = NULL;
+ DataSource* _tmp11_;
+ Photo* _tmp12_;
Photo* prev = NULL;
- DataSource* _tmp13_ = NULL;
- Photo* _tmp14_ = NULL;
- PixbufCache* _tmp39_ = NULL;
- PixbufCachePixbufCacheBatch* _tmp40_ = NULL;
- PixbufCache* _tmp41_ = NULL;
- PixbufCachePixbufCacheBatch* _tmp42_ = NULL;
+ DataSource* _tmp13_;
+ Photo* _tmp14_;
+ PixbufCache* _tmp39_;
+ PixbufCachePixbufCacheBatch* _tmp40_;
+ PixbufCache* _tmp41_;
+ PixbufCachePixbufCacheBatch* _tmp42_;
#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7225,7 +7219,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
_g_object_unref0 (normal_batch);
#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 7224 "PhotoPage.c"
+#line 7218 "PhotoPage.c"
}
#line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp11_ = next_source;
@@ -7239,15 +7233,15 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO, Photo));
#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
prev = _tmp14_;
-#line 7238 "PhotoPage.c"
+#line 7232 "PhotoPage.c"
{
GeeIterator* _neighbor_source_it = NULL;
- ViewCollection* _tmp15_ = NULL;
- Photo* _tmp16_ = NULL;
- GeeSet* _tmp17_ = NULL;
- GeeSet* _tmp18_ = NULL;
- GeeIterator* _tmp19_ = NULL;
- GeeIterator* _tmp20_ = NULL;
+ ViewCollection* _tmp15_;
+ Photo* _tmp16_;
+ GeeSet* _tmp17_;
+ GeeSet* _tmp18_;
+ GeeIterator* _tmp19_;
+ GeeIterator* _tmp20_;
#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp15_ = controller;
#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7266,25 +7260,25 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
_neighbor_source_it = _tmp20_;
#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
while (TRUE) {
-#line 7265 "PhotoPage.c"
- GeeIterator* _tmp21_ = NULL;
- gboolean _tmp22_ = FALSE;
+#line 7259 "PhotoPage.c"
+ GeeIterator* _tmp21_;
+ gboolean _tmp22_;
DataSource* neighbor_source = NULL;
- GeeIterator* _tmp23_ = NULL;
- gpointer _tmp24_ = NULL;
+ GeeIterator* _tmp23_;
+ gpointer _tmp24_;
Photo* neighbor = NULL;
- DataSource* _tmp25_ = NULL;
- Photo* _tmp26_ = NULL;
+ DataSource* _tmp25_;
+ Photo* _tmp26_;
BackgroundJobJobPriority priority = 0;
gboolean _tmp27_ = FALSE;
- Photo* _tmp28_ = NULL;
- Photo* _tmp29_ = NULL;
- gboolean _tmp30_ = FALSE;
- PixbufCachePixbufCacheBatch* _tmp34_ = NULL;
- BackgroundJobJobPriority _tmp35_ = 0;
- Photo* _tmp36_ = NULL;
- PixbufCachePixbufCacheBatch* _tmp37_ = NULL;
- Photo* _tmp38_ = NULL;
+ Photo* _tmp28_;
+ Photo* _tmp29_;
+ gboolean _tmp30_;
+ PixbufCachePixbufCacheBatch* _tmp34_;
+ BackgroundJobJobPriority _tmp35_;
+ Photo* _tmp36_;
+ PixbufCachePixbufCacheBatch* _tmp37_;
+ Photo* _tmp38_;
#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp21_ = _neighbor_source_it;
#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7293,7 +7287,7 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
if (!_tmp22_) {
#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 7292 "PhotoPage.c"
+#line 7286 "PhotoPage.c"
}
#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp23_ = _neighbor_source_it;
@@ -7319,11 +7313,11 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
if (_tmp30_) {
#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp27_ = TRUE;
-#line 7318 "PhotoPage.c"
+#line 7312 "PhotoPage.c"
} else {
- Photo* _tmp31_ = NULL;
- Photo* _tmp32_ = NULL;
- gboolean _tmp33_ = FALSE;
+ Photo* _tmp31_;
+ Photo* _tmp32_;
+ gboolean _tmp33_;
#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp31_ = neighbor;
#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7332,13 +7326,13 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
_tmp33_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_SOURCE, DataSource));
#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp27_ = _tmp33_;
-#line 7331 "PhotoPage.c"
+#line 7325 "PhotoPage.c"
}
#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp27_) {
#line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
priority = BACKGROUND_JOB_JOB_PRIORITY_HIGH;
-#line 7337 "PhotoPage.c"
+#line 7331 "PhotoPage.c"
}
#line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp34_ = normal_batch;
@@ -7358,11 +7352,11 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
_g_object_unref0 (neighbor);
#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (neighbor_source);
-#line 7357 "PhotoPage.c"
+#line 7351 "PhotoPage.c"
}
#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_neighbor_source_it);
-#line 7361 "PhotoPage.c"
+#line 7355 "PhotoPage.c"
}
#line 1025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp39_ = self->priv->cache;
@@ -7388,23 +7382,23 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
_g_object_unref0 (master_batch);
#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (normal_batch);
-#line 7387 "PhotoPage.c"
+#line 7381 "PhotoPage.c"
}
static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, ViewCollection* old_controller, Photo* old_photo, ViewCollection* new_controller, Photo* new_photo) {
GeeSet* old_neighbors = NULL;
- ViewCollection* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- GeeSet* _tmp2_ = NULL;
+ ViewCollection* _tmp0_;
+ Photo* _tmp1_;
+ GeeSet* _tmp2_;
GeeSet* new_neighbors = NULL;
- ViewCollection* _tmp3_ = NULL;
- Photo* _tmp4_ = NULL;
- GeeSet* _tmp5_ = NULL;
+ ViewCollection* _tmp3_;
+ Photo* _tmp4_;
+ GeeSet* _tmp5_;
gboolean _tmp23_ = FALSE;
- GeeSet* _tmp24_ = NULL;
- Photo* _tmp25_ = NULL;
- gboolean _tmp26_ = FALSE;
+ GeeSet* _tmp24_;
+ Photo* _tmp25_;
+ gboolean _tmp26_;
#line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7431,11 +7425,11 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
_tmp5_ = view_collection_get_extended_neighbors (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
new_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_SET, GeeSet);
-#line 7430 "PhotoPage.c"
+#line 7424 "PhotoPage.c"
{
GeeIterator* _old_neighbor_it = NULL;
- GeeSet* _tmp6_ = NULL;
- GeeIterator* _tmp7_ = NULL;
+ GeeSet* _tmp6_;
+ GeeIterator* _tmp7_;
#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_ = old_neighbors;
#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7444,16 +7438,16 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
_old_neighbor_it = _tmp7_;
#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
while (TRUE) {
-#line 7443 "PhotoPage.c"
- GeeIterator* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+#line 7437 "PhotoPage.c"
+ GeeIterator* _tmp8_;
+ gboolean _tmp9_;
Photo* old_neighbor = NULL;
- GeeIterator* _tmp10_ = NULL;
- gpointer _tmp11_ = NULL;
+ GeeIterator* _tmp10_;
+ gpointer _tmp11_;
gboolean _tmp12_ = FALSE;
- GeeSet* _tmp13_ = NULL;
- Photo* _tmp14_ = NULL;
- gboolean _tmp15_ = FALSE;
+ GeeSet* _tmp13_;
+ Photo* _tmp14_;
+ gboolean _tmp15_;
#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp8_ = _old_neighbor_it;
#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7462,7 +7456,7 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
if (!_tmp9_) {
#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 7461 "PhotoPage.c"
+#line 7455 "PhotoPage.c"
}
#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp10_ = _old_neighbor_it;
@@ -7478,10 +7472,10 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
_tmp15_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_);
#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (!_tmp15_) {
-#line 7477 "PhotoPage.c"
- Photo* _tmp16_ = NULL;
- Photo* _tmp17_ = NULL;
- gboolean _tmp18_ = FALSE;
+#line 7471 "PhotoPage.c"
+ Photo* _tmp16_;
+ Photo* _tmp17_;
+ gboolean _tmp18_;
#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp16_ = new_photo;
#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7490,19 +7484,19 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
_tmp18_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource));
#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp12_ = !_tmp18_;
-#line 7489 "PhotoPage.c"
+#line 7483 "PhotoPage.c"
} else {
#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp12_ = FALSE;
-#line 7493 "PhotoPage.c"
+#line 7487 "PhotoPage.c"
}
#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp12_) {
-#line 7497 "PhotoPage.c"
- PixbufCache* _tmp19_ = NULL;
- Photo* _tmp20_ = NULL;
- PixbufCache* _tmp21_ = NULL;
- Photo* _tmp22_ = NULL;
+#line 7491 "PhotoPage.c"
+ PixbufCache* _tmp19_;
+ Photo* _tmp20_;
+ PixbufCache* _tmp21_;
+ Photo* _tmp22_;
#line 1042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp19_ = self->priv->cache;
#line 1042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7515,15 +7509,15 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
_tmp22_ = old_neighbor;
#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
pixbuf_cache_drop (_tmp21_, _tmp22_);
-#line 7514 "PhotoPage.c"
+#line 7508 "PhotoPage.c"
}
#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (old_neighbor);
-#line 7518 "PhotoPage.c"
+#line 7512 "PhotoPage.c"
}
#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_old_neighbor_it);
-#line 7522 "PhotoPage.c"
+#line 7516 "PhotoPage.c"
}
#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp24_ = new_neighbors;
@@ -7533,10 +7527,10 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
_tmp26_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (!_tmp26_) {
-#line 7532 "PhotoPage.c"
- Photo* _tmp27_ = NULL;
- Photo* _tmp28_ = NULL;
- gboolean _tmp29_ = FALSE;
+#line 7526 "PhotoPage.c"
+ Photo* _tmp27_;
+ Photo* _tmp28_;
+ gboolean _tmp29_;
#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp27_ = new_photo;
#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7545,19 +7539,19 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
_tmp29_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_SOURCE, DataSource));
#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp23_ = !_tmp29_;
-#line 7544 "PhotoPage.c"
+#line 7538 "PhotoPage.c"
} else {
#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp23_ = FALSE;
-#line 7548 "PhotoPage.c"
+#line 7542 "PhotoPage.c"
}
#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp23_) {
-#line 7552 "PhotoPage.c"
- PixbufCache* _tmp30_ = NULL;
- Photo* _tmp31_ = NULL;
- PixbufCache* _tmp32_ = NULL;
- Photo* _tmp33_ = NULL;
+#line 7546 "PhotoPage.c"
+ PixbufCache* _tmp30_;
+ Photo* _tmp31_;
+ PixbufCache* _tmp32_;
+ Photo* _tmp33_;
#line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp30_ = self->priv->cache;
#line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7570,20 +7564,20 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
_tmp33_ = old_photo;
#line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
pixbuf_cache_drop (_tmp32_, _tmp33_);
-#line 7569 "PhotoPage.c"
+#line 7563 "PhotoPage.c"
}
#line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (new_neighbors);
#line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (old_neighbors);
-#line 7575 "PhotoPage.c"
+#line 7569 "PhotoPage.c"
}
static DataView* editing_host_page_real_create_photo_view (EditingHostPage* self, DataSource* source) {
DataView* result = NULL;
- DataSource* _tmp0_ = NULL;
- PhotoView* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ PhotoView* _tmp1_;
#line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7594,7 +7588,7 @@ static DataView* editing_host_page_real_create_photo_view (EditingHostPage* self
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 7593 "PhotoPage.c"
+#line 7587 "PhotoPage.c"
}
@@ -7603,13 +7597,13 @@ DataView* editing_host_page_create_photo_view (EditingHostPage* self, DataSource
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
#line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return EDITING_HOST_PAGE_GET_CLASS (self)->create_photo_view (self, source);
-#line 7602 "PhotoPage.c"
+#line 7596 "PhotoPage.c"
}
static gboolean editing_host_page_is_photo (EditingHostPage* self, DataSource* source) {
gboolean result = FALSE;
- DataSource* _tmp0_ = NULL;
+ DataSource* _tmp0_;
#line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
#line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7620,7 +7614,7 @@ static gboolean editing_host_page_is_photo (EditingHostPage* self, DataSource* s
result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO_SOURCE);
#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 7619 "PhotoPage.c"
+#line 7613 "PhotoPage.c"
}
@@ -7629,7 +7623,7 @@ static DataView* _editing_host_page_create_photo_view_create_view (DataSource* s
result = editing_host_page_create_photo_view ((EditingHostPage*) self, source);
#line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 7628 "PhotoPage.c"
+#line 7622 "PhotoPage.c"
}
@@ -7638,21 +7632,21 @@ static gboolean _editing_host_page_is_photo_create_view_predicate (DataSource* s
result = editing_host_page_is_photo ((EditingHostPage*) self, source);
#line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 7637 "PhotoPage.c"
+#line 7631 "PhotoPage.c"
}
void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* controller, Photo* starting_photo) {
- ViewCollection* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- DataView* _tmp2_ = NULL;
- DataView* _tmp3_ = NULL;
+ ViewCollection* _tmp0_;
+ Photo* _tmp1_;
+ DataView* _tmp2_;
+ DataView* _tmp3_;
gboolean _tmp4_ = FALSE;
- ViewCollection* _tmp5_ = NULL;
- ViewCollection* _tmp6_ = NULL;
- ViewCollection* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
- Photo* _tmp18_ = NULL;
+ ViewCollection* _tmp5_;
+ ViewCollection* _tmp6_;
+ ViewCollection* _tmp7_;
+ gboolean _tmp8_;
+ Photo* _tmp18_;
#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7683,31 +7677,31 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
_data_collection_unref0 (_tmp7_);
#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp8_) {
-#line 7682 "PhotoPage.c"
- ViewCollection* _tmp9_ = NULL;
- ViewCollection* _tmp10_ = NULL;
+#line 7676 "PhotoPage.c"
+ ViewCollection* _tmp9_;
+ ViewCollection* _tmp10_;
#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp9_ = controller;
#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp10_ = self->priv->parent_view;
#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = _tmp9_ != _tmp10_;
-#line 7691 "PhotoPage.c"
+#line 7685 "PhotoPage.c"
} else {
#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = FALSE;
-#line 7695 "PhotoPage.c"
+#line 7689 "PhotoPage.c"
}
#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp4_) {
-#line 7699 "PhotoPage.c"
- ViewCollection* _tmp11_ = NULL;
- ViewCollection* _tmp12_ = NULL;
- ViewCollection* _tmp13_ = NULL;
- ViewCollection* _tmp14_ = NULL;
- ViewCollection* _tmp15_ = NULL;
- ViewCollection* _tmp16_ = NULL;
- ViewCollection* _tmp17_ = NULL;
+#line 7693 "PhotoPage.c"
+ ViewCollection* _tmp11_;
+ ViewCollection* _tmp12_;
+ ViewCollection* _tmp13_;
+ ViewCollection* _tmp14_;
+ ViewCollection* _tmp15_;
+ ViewCollection* _tmp16_;
+ ViewCollection* _tmp17_;
#line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7734,27 +7728,27 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
_data_collection_unref0 (self->priv->parent_view);
#line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self->priv->parent_view = _tmp17_;
-#line 7733 "PhotoPage.c"
+#line 7727 "PhotoPage.c"
}
#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp18_ = starting_photo;
#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_replace_photo (self, _tmp18_);
-#line 7739 "PhotoPage.c"
+#line 7733 "PhotoPage.c"
}
void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection* controller, Photo* starting_photo) {
- ViewCollection* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- DataView* _tmp2_ = NULL;
- DataView* _tmp3_ = NULL;
+ ViewCollection* _tmp0_;
+ Photo* _tmp1_;
+ DataView* _tmp2_;
+ DataView* _tmp3_;
gboolean _tmp4_ = FALSE;
- ViewCollection* _tmp5_ = NULL;
- ViewCollection* _tmp6_ = NULL;
- ViewCollection* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
- Photo* _tmp18_ = NULL;
+ ViewCollection* _tmp5_;
+ ViewCollection* _tmp6_;
+ ViewCollection* _tmp7_;
+ gboolean _tmp8_;
+ Photo* _tmp18_;
#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7785,31 +7779,31 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
_data_collection_unref0 (_tmp7_);
#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp8_) {
-#line 7784 "PhotoPage.c"
- ViewCollection* _tmp9_ = NULL;
- ViewCollection* _tmp10_ = NULL;
+#line 7778 "PhotoPage.c"
+ ViewCollection* _tmp9_;
+ ViewCollection* _tmp10_;
#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp9_ = controller;
#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp10_ = self->priv->parent_view;
#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = _tmp9_ != _tmp10_;
-#line 7793 "PhotoPage.c"
+#line 7787 "PhotoPage.c"
} else {
#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = FALSE;
-#line 7797 "PhotoPage.c"
+#line 7791 "PhotoPage.c"
}
#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp4_) {
-#line 7801 "PhotoPage.c"
- ViewCollection* _tmp11_ = NULL;
- ViewCollection* _tmp12_ = NULL;
- ViewCollection* _tmp13_ = NULL;
- ViewCollection* _tmp14_ = NULL;
- ViewCollection* _tmp15_ = NULL;
- ViewCollection* _tmp16_ = NULL;
- ViewCollection* _tmp17_ = NULL;
+#line 7795 "PhotoPage.c"
+ ViewCollection* _tmp11_;
+ ViewCollection* _tmp12_;
+ ViewCollection* _tmp13_;
+ ViewCollection* _tmp14_;
+ ViewCollection* _tmp15_;
+ ViewCollection* _tmp16_;
+ ViewCollection* _tmp17_;
#line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7836,26 +7830,26 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
_data_collection_unref0 (self->priv->parent_view);
#line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self->priv->parent_view = _tmp17_;
-#line 7835 "PhotoPage.c"
+#line 7829 "PhotoPage.c"
}
#line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp18_ = starting_photo;
#line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_replace_photo (self, _tmp18_);
-#line 7841 "PhotoPage.c"
+#line 7835 "PhotoPage.c"
}
static void editing_host_page_real_update_ui (EditingHostPage* self, gboolean missing) {
gboolean sensitivity = FALSE;
- gboolean _tmp0_ = FALSE;
- GtkToolButton* _tmp1_ = NULL;
- GtkToggleToolButton* _tmp2_ = NULL;
- GtkToggleToolButton* _tmp3_ = NULL;
- GtkToggleToolButton* _tmp4_ = NULL;
- GtkToggleToolButton* _tmp5_ = NULL;
- GtkToolButton* _tmp6_ = NULL;
- GtkScale* _tmp7_ = NULL;
+ gboolean _tmp0_;
+ GtkToolButton* _tmp1_;
+ GtkToggleToolButton* _tmp2_;
+ GtkToggleToolButton* _tmp3_;
+ GtkToggleToolButton* _tmp4_;
+ GtkToggleToolButton* _tmp5_;
+ GtkToolButton* _tmp6_;
+ GtkScale* _tmp7_;
Dimensions _tmp8_ = {0};
#line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = missing;
@@ -7893,7 +7887,7 @@ static void editing_host_page_real_update_ui (EditingHostPage* self, gboolean mi
dimensions_init (&_tmp8_, 0, 0);
#line 1097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp8_, FALSE);
-#line 7892 "PhotoPage.c"
+#line 7886 "PhotoPage.c"
}
@@ -7902,14 +7896,14 @@ void editing_host_page_update_ui (EditingHostPage* self, gboolean missing) {
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
EDITING_HOST_PAGE_GET_CLASS (self)->update_ui (self, missing);
-#line 7901 "PhotoPage.c"
+#line 7895 "PhotoPage.c"
}
static void editing_host_page_real_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing) {
#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_PHOTO (photo));
-#line 7908 "PhotoPage.c"
+#line 7902 "PhotoPage.c"
}
@@ -7918,36 +7912,36 @@ void editing_host_page_notify_photo_backing_missing (EditingHostPage* self, Phot
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
EDITING_HOST_PAGE_GET_CLASS (self)->notify_photo_backing_missing (self, photo, missing);
-#line 7917 "PhotoPage.c"
+#line 7911 "PhotoPage.c"
}
static void editing_host_page_draw_message (EditingHostPage* self, const gchar* message) {
PangoLayout* pango_layout = NULL;
- const gchar* _tmp0_ = NULL;
- PangoLayout* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ PangoLayout* _tmp1_;
gint text_width = 0;
gint text_height = 0;
- PangoLayout* _tmp2_ = NULL;
+ PangoLayout* _tmp2_;
gint _tmp3_ = 0;
gint _tmp4_ = 0;
GtkAllocation allocation = {0};
GtkAllocation _tmp5_ = {0};
gint x = 0;
- GtkAllocation _tmp6_ = {0};
- gint _tmp7_ = 0;
- gint _tmp8_ = 0;
+ GtkAllocation _tmp6_;
+ gint _tmp7_;
+ gint _tmp8_;
gint _tmp9_ = 0;
- gint _tmp10_ = 0;
+ gint _tmp10_;
gint y = 0;
- GtkAllocation _tmp12_ = {0};
- gint _tmp13_ = 0;
- gint _tmp14_ = 0;
+ GtkAllocation _tmp12_;
+ gint _tmp13_;
+ gint _tmp14_;
gint _tmp15_ = 0;
- gint _tmp16_ = 0;
- PangoLayout* _tmp18_ = NULL;
- gint _tmp19_ = 0;
- gint _tmp20_ = 0;
+ gint _tmp16_;
+ PangoLayout* _tmp18_;
+ gint _tmp19_;
+ gint _tmp20_;
#line 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7982,17 +7976,17 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar*
_tmp10_ = x;
#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp10_ > 0) {
-#line 7981 "PhotoPage.c"
- gint _tmp11_ = 0;
+#line 7975 "PhotoPage.c"
+ gint _tmp11_;
#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp11_ = x;
#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp9_ = _tmp11_ / 2;
-#line 7987 "PhotoPage.c"
+#line 7981 "PhotoPage.c"
} else {
#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp9_ = 0;
-#line 7991 "PhotoPage.c"
+#line 7985 "PhotoPage.c"
}
#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
x = _tmp9_;
@@ -8008,17 +8002,17 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar*
_tmp16_ = y;
#line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp16_ > 0) {
-#line 8007 "PhotoPage.c"
- gint _tmp17_ = 0;
+#line 8001 "PhotoPage.c"
+ gint _tmp17_;
#line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp17_ = y;
#line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp15_ = _tmp17_ / 2;
-#line 8013 "PhotoPage.c"
+#line 8007 "PhotoPage.c"
} else {
#line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp15_ = 0;
-#line 8017 "PhotoPage.c"
+#line 8011 "PhotoPage.c"
}
#line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
y = _tmp15_;
@@ -8032,19 +8026,19 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar*
single_photo_page_paint_text (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp18_, _tmp19_, _tmp20_);
#line 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (pango_layout);
-#line 8031 "PhotoPage.c"
+#line 8025 "PhotoPage.c"
}
void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missing) {
- gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
- gboolean _tmp2_ = FALSE;
+ gboolean _tmp0_;
+ gboolean _tmp1_;
+ gboolean _tmp2_;
Photo* photo = NULL;
- Photo* _tmp3_ = NULL;
- Photo* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- gboolean _tmp6_ = FALSE;
+ Photo* _tmp3_;
+ Photo* _tmp4_;
+ gboolean _tmp5_;
+ gboolean _tmp6_;
GError * _inner_error_ = NULL;
#line 1123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -8056,7 +8050,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
if (_tmp0_ == _tmp1_) {
#line 1125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 8055 "PhotoPage.c"
+#line 8049 "PhotoPage.c"
}
#line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = missing;
@@ -8074,7 +8068,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
_g_object_unref0 (photo);
#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 8073 "PhotoPage.c"
+#line 8067 "PhotoPage.c"
}
#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = missing;
@@ -8084,20 +8078,20 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
_tmp6_ = self->priv->photo_missing;
#line 1135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp6_) {
-#line 8083 "PhotoPage.c"
+#line 8077 "PhotoPage.c"
{
GdkPixbuf* pixbuf = NULL;
- Photo* _tmp7_ = NULL;
+ Photo* _tmp7_;
Scaling _tmp8_ = {0};
- GdkPixbuf* _tmp9_ = NULL;
- GdkPixbuf* _tmp10_ = NULL;
- GdkPixbuf* _tmp11_ = NULL;
- gint _tmp12_ = 0;
- GdkPixbuf* _tmp13_ = NULL;
- gint _tmp14_ = 0;
- GdkPixbuf* _tmp15_ = NULL;
- GdkPixbuf* _tmp16_ = NULL;
- Photo* _tmp17_ = NULL;
+ GdkPixbuf* _tmp9_;
+ GdkPixbuf* _tmp10_;
+ GdkPixbuf* _tmp11_;
+ gint _tmp12_;
+ GdkPixbuf* _tmp13_;
+ gint _tmp14_;
+ GdkPixbuf* _tmp15_;
+ GdkPixbuf* _tmp16_;
+ Photo* _tmp17_;
Dimensions _tmp18_ = {0};
#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp7_ = photo;
@@ -8109,8 +8103,8 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
pixbuf = _tmp9_;
#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8108 "PhotoPage.c"
- goto __catch245_g_error;
+#line 8102 "PhotoPage.c"
+ goto __catch246_g_error;
}
#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp10_ = pixbuf;
@@ -8138,18 +8132,18 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp16_, &_tmp18_, NULL);
#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (pixbuf);
-#line 8137 "PhotoPage.c"
+#line 8131 "PhotoPage.c"
}
- goto __finally245;
- __catch245_g_error:
+ goto __finally246;
+ __catch246_g_error:
{
GError* err = NULL;
- GdkPixbuf* _tmp19_ = NULL;
- GdkPixbuf* _tmp20_ = NULL;
- Photo* _tmp21_ = NULL;
+ GdkPixbuf* _tmp19_;
+ GdkPixbuf* _tmp20_;
+ Photo* _tmp21_;
Dimensions _tmp22_ = {0};
- GError* _tmp23_ = NULL;
- const gchar* _tmp24_ = NULL;
+ GError* _tmp23_;
+ const gchar* _tmp24_;
#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
err = _inner_error_;
#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8174,9 +8168,9 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
g_warning ("PhotoPage.vala:1145: %s", _tmp24_);
#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_error_free0 (err);
-#line 8173 "PhotoPage.c"
+#line 8167 "PhotoPage.c"
}
- __finally245:
+ __finally246:
#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8187,18 +8181,18 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
g_clear_error (&_inner_error_);
#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 8186 "PhotoPage.c"
+#line 8180 "PhotoPage.c"
}
}
#line 1123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (photo);
-#line 8191 "PhotoPage.c"
+#line 8185 "PhotoPage.c"
}
gboolean editing_host_page_get_photo_missing (EditingHostPage* self) {
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 1150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8207,7 +8201,7 @@ gboolean editing_host_page_get_photo_missing (EditingHostPage* self) {
result = _tmp0_;
#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 8206 "PhotoPage.c"
+#line 8200 "PhotoPage.c"
}
@@ -8221,7 +8215,7 @@ static gboolean editing_host_page_real_confirm_replace_photo (EditingHostPage* s
result = TRUE;
#line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 8220 "PhotoPage.c"
+#line 8214 "PhotoPage.c"
}
@@ -8230,18 +8224,18 @@ gboolean editing_host_page_confirm_replace_photo (EditingHostPage* self, Photo*
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
#line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return EDITING_HOST_PAGE_GET_CLASS (self)->confirm_replace_photo (self, old_photo, new_photo);
-#line 8229 "PhotoPage.c"
+#line 8223 "PhotoPage.c"
}
static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Photo* new_photo) {
GdkPixbuf* result = NULL;
GdkPixbuf* pixbuf = NULL;
- PixbufCache* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- GdkPixbuf* _tmp2_ = NULL;
- GdkPixbuf* _tmp3_ = NULL;
- GdkPixbuf* _tmp11_ = NULL;
+ PixbufCache* _tmp0_;
+ Photo* _tmp1_;
+ GdkPixbuf* _tmp2_;
+ GdkPixbuf* _tmp3_;
+ GdkPixbuf* _tmp11_;
GError * _inner_error_ = NULL;
#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
@@ -8259,13 +8253,13 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
_tmp3_ = pixbuf;
#line 1160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp3_ == NULL) {
-#line 8258 "PhotoPage.c"
+#line 8252 "PhotoPage.c"
{
GdkPixbuf* _tmp4_ = NULL;
- Photo* _tmp5_ = NULL;
+ Photo* _tmp5_;
Scaling _tmp6_ = {0};
- GdkPixbuf* _tmp7_ = NULL;
- GdkPixbuf* _tmp8_ = NULL;
+ GdkPixbuf* _tmp7_;
+ GdkPixbuf* _tmp8_;
#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = new_photo;
#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8276,8 +8270,8 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
_tmp4_ = _tmp7_;
#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8275 "PhotoPage.c"
- goto __catch246_g_error;
+#line 8269 "PhotoPage.c"
+ goto __catch247_g_error;
}
#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp8_ = _tmp4_;
@@ -8289,14 +8283,14 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
pixbuf = _tmp8_;
#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp4_);
-#line 8288 "PhotoPage.c"
+#line 8282 "PhotoPage.c"
}
- goto __finally246;
- __catch246_g_error:
+ goto __finally247;
+ __catch247_g_error:
{
GError* err = NULL;
- GError* _tmp9_ = NULL;
- const gchar* _tmp10_ = NULL;
+ GError* _tmp9_;
+ const gchar* _tmp10_;
#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
err = _inner_error_;
#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8309,9 +8303,9 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
g_warning ("PhotoPage.vala:1164: %s", _tmp10_);
#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_error_free0 (err);
-#line 8308 "PhotoPage.c"
+#line 8302 "PhotoPage.c"
}
- __finally246:
+ __finally247:
#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8322,19 +8316,19 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
g_clear_error (&_inner_error_);
#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return NULL;
-#line 8321 "PhotoPage.c"
+#line 8315 "PhotoPage.c"
}
}
#line 1167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp11_ = pixbuf;
#line 1167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp11_ == NULL) {
-#line 8328 "PhotoPage.c"
- GdkPixbuf* _tmp12_ = NULL;
+#line 8322 "PhotoPage.c"
+ GdkPixbuf* _tmp12_;
Scaling _tmp13_ = {0};
- GdkPixbuf* _tmp14_ = NULL;
- GdkPixbuf* _tmp15_ = NULL;
- GdkPixbuf* _tmp16_ = NULL;
+ GdkPixbuf* _tmp14_;
+ GdkPixbuf* _tmp15_;
+ GdkPixbuf* _tmp16_;
#line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp12_ = get_placeholder_pixbuf ();
#line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8351,44 +8345,44 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
_tmp16_ = _tmp15_;
#line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp16_);
-#line 8350 "PhotoPage.c"
+#line 8344 "PhotoPage.c"
}
#line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
result = pixbuf;
#line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 8356 "PhotoPage.c"
+#line 8350 "PhotoPage.c"
}
static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_photo) {
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
- Photo* _tmp2_ = NULL;
- Photo* _tmp3_ = NULL;
- Photo* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- gboolean _tmp6_ = FALSE;
+ Photo* _tmp2_;
+ Photo* _tmp3_;
+ Photo* _tmp4_;
+ gboolean _tmp5_;
+ gboolean _tmp6_;
gboolean _tmp14_ = FALSE;
gboolean _tmp15_ = FALSE;
- gboolean _tmp16_ = FALSE;
+ gboolean _tmp16_;
Dimensions _tmp26_ = {0};
Photo* old_photo = NULL;
- Photo* _tmp27_ = NULL;
- Photo* _tmp28_ = NULL;
- Photo* _tmp29_ = NULL;
- gchar* _tmp30_ = NULL;
- gchar* _tmp31_ = NULL;
- Photo* _tmp32_ = NULL;
- GFile* _tmp33_ = NULL;
- GFile* _tmp34_ = NULL;
- gboolean _tmp35_ = FALSE;
- Photo* _tmp36_ = NULL;
- Photo* _tmp43_ = NULL;
- Photo* _tmp44_ = NULL;
- GdkPixbuf* _tmp45_ = NULL;
- GdkPixbuf* _tmp46_ = NULL;
- ZoomBuffer* _tmp47_ = NULL;
+ Photo* _tmp27_;
+ Photo* _tmp28_;
+ Photo* _tmp29_;
+ gchar* _tmp30_;
+ gchar* _tmp31_;
+ Photo* _tmp32_;
+ GFile* _tmp33_;
+ GFile* _tmp34_;
+ gboolean _tmp35_;
+ Photo* _tmp36_;
+ Photo* _tmp43_;
+ Photo* _tmp44_;
+ GdkPixbuf* _tmp45_;
+ GdkPixbuf* _tmp46_;
+ ZoomBuffer* _tmp47_;
#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8407,40 +8401,40 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
_g_object_unref0 (_tmp4_);
#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp6_) {
-#line 8406 "PhotoPage.c"
- gboolean _tmp7_ = FALSE;
+#line 8400 "PhotoPage.c"
+ gboolean _tmp7_;
#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp7_ = self->priv->pixbuf_dirty;
#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = !_tmp7_;
-#line 8412 "PhotoPage.c"
+#line 8406 "PhotoPage.c"
} else {
#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = FALSE;
-#line 8416 "PhotoPage.c"
+#line 8410 "PhotoPage.c"
}
#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp1_) {
-#line 8420 "PhotoPage.c"
- gboolean _tmp8_ = FALSE;
+#line 8414 "PhotoPage.c"
+ gboolean _tmp8_;
#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp8_ = self->priv->photo_missing;
#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = !_tmp8_;
-#line 8426 "PhotoPage.c"
+#line 8420 "PhotoPage.c"
} else {
#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = FALSE;
-#line 8430 "PhotoPage.c"
+#line 8424 "PhotoPage.c"
}
#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
-#line 8434 "PhotoPage.c"
- Photo* _tmp9_ = NULL;
- Photo* _tmp10_ = NULL;
- GdkPixbuf* _tmp11_ = NULL;
- GdkPixbuf* _tmp12_ = NULL;
- ZoomBuffer* _tmp13_ = NULL;
+#line 8428 "PhotoPage.c"
+ Photo* _tmp9_;
+ Photo* _tmp10_;
+ GdkPixbuf* _tmp11_;
+ GdkPixbuf* _tmp12_;
+ ZoomBuffer* _tmp13_;
#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp9_ = new_photo;
#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8459,17 +8453,17 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
_g_object_unref0 (_tmp12_);
#line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 8458 "PhotoPage.c"
+#line 8452 "PhotoPage.c"
}
#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp16_ = editing_host_page_has_photo (self);
#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp16_) {
-#line 8464 "PhotoPage.c"
- Photo* _tmp17_ = NULL;
- Photo* _tmp18_ = NULL;
- Photo* _tmp19_ = NULL;
- gboolean _tmp20_ = FALSE;
+#line 8458 "PhotoPage.c"
+ Photo* _tmp17_;
+ Photo* _tmp18_;
+ Photo* _tmp19_;
+ gboolean _tmp20_;
#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp17_ = new_photo;
#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8482,30 +8476,30 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
_tmp15_ = !_tmp20_;
#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp19_);
-#line 8481 "PhotoPage.c"
+#line 8475 "PhotoPage.c"
} else {
#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp15_ = FALSE;
-#line 8485 "PhotoPage.c"
+#line 8479 "PhotoPage.c"
}
#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp15_) {
#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp14_ = editing_host_page_confirm_replace_photo != NULL;
-#line 8491 "PhotoPage.c"
+#line 8485 "PhotoPage.c"
} else {
#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp14_ = FALSE;
-#line 8495 "PhotoPage.c"
+#line 8489 "PhotoPage.c"
}
#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp14_) {
-#line 8499 "PhotoPage.c"
- Photo* _tmp21_ = NULL;
- Photo* _tmp22_ = NULL;
- Photo* _tmp23_ = NULL;
- gboolean _tmp24_ = FALSE;
- gboolean _tmp25_ = FALSE;
+#line 8493 "PhotoPage.c"
+ Photo* _tmp21_;
+ Photo* _tmp22_;
+ Photo* _tmp23_;
+ gboolean _tmp24_;
+ gboolean _tmp25_;
#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp21_ = editing_host_page_get_photo (self);
#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8522,7 +8516,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
if (_tmp25_) {
#line 1187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 8521 "PhotoPage.c"
+#line 8515 "PhotoPage.c"
}
}
#line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8571,13 +8565,13 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
_tmp36_ = old_photo;
#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp36_ != NULL) {
-#line 8570 "PhotoPage.c"
- ViewCollection* _tmp37_ = NULL;
- ViewCollection* _tmp38_ = NULL;
- Photo* _tmp39_ = NULL;
- ViewCollection* _tmp40_ = NULL;
- ViewCollection* _tmp41_ = NULL;
- Photo* _tmp42_ = NULL;
+#line 8564 "PhotoPage.c"
+ ViewCollection* _tmp37_;
+ ViewCollection* _tmp38_;
+ Photo* _tmp39_;
+ ViewCollection* _tmp40_;
+ ViewCollection* _tmp41_;
+ Photo* _tmp42_;
#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8596,7 +8590,7 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
_data_collection_unref0 (_tmp41_);
#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_data_collection_unref0 (_tmp38_);
-#line 8595 "PhotoPage.c"
+#line 8589 "PhotoPage.c"
}
#line 1211 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
@@ -8622,21 +8616,21 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
editing_host_page_refresh_caches (self, "replace_photo");
#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (old_photo);
-#line 8621 "PhotoPage.c"
+#line 8615 "PhotoPage.c"
}
static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
EditingHostPage * self;
- GtkScale* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- GtkScale* _tmp2_ = NULL;
- GtkScale* _tmp3_ = NULL;
- Photo* _tmp4_ = NULL;
- Photo* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+ GtkScale* _tmp0_;
+ guint _tmp1_;
+ GtkScale* _tmp2_;
+ GtkScale* _tmp3_;
+ Photo* _tmp4_;
+ Photo* _tmp5_;
+ gboolean _tmp6_;
gboolean _tmp12_ = FALSE;
- GtkDrawingArea* _tmp13_ = NULL;
+ GtkDrawingArea* _tmp13_;
#line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 1222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8665,9 +8659,9 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
_g_object_unref0 (_tmp5_);
#line 1228 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp6_) {
-#line 8664 "PhotoPage.c"
- Photo* _tmp7_ = NULL;
- Photo* _tmp8_ = NULL;
+#line 8658 "PhotoPage.c"
+ Photo* _tmp7_;
+ Photo* _tmp8_;
Dimensions _tmp9_ = {0};
Dimensions _tmp10_ = {0};
ZoomState _tmp11_ = {0};
@@ -8685,58 +8679,58 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp11_);
#line 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp8_);
-#line 8684 "PhotoPage.c"
+#line 8678 "PhotoPage.c"
}
#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas;
#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp13_ != NULL) {
-#line 8690 "PhotoPage.c"
- GtkDrawingArea* _tmp14_ = NULL;
- GdkWindow* _tmp15_ = NULL;
+#line 8684 "PhotoPage.c"
+ GtkDrawingArea* _tmp14_;
+ GdkWindow* _tmp15_;
#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas;
#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp15_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp12_ = _tmp15_ != NULL;
-#line 8699 "PhotoPage.c"
+#line 8693 "PhotoPage.c"
} else {
#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp12_ = FALSE;
-#line 8703 "PhotoPage.c"
+#line 8697 "PhotoPage.c"
}
#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp12_) {
#line 1236 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_LEFT_PTR);
-#line 8709 "PhotoPage.c"
+#line 8703 "PhotoPage.c"
}
#line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 8713 "PhotoPage.c"
+#line 8707 "PhotoPage.c"
}
static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
GdkPixbuf* pixbuf = NULL;
- PixbufCache* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- Photo* _tmp2_ = NULL;
- GdkPixbuf* _tmp3_ = NULL;
- GdkPixbuf* _tmp4_ = NULL;
- GdkPixbuf* _tmp5_ = NULL;
+ PixbufCache* _tmp0_;
+ Photo* _tmp1_;
+ Photo* _tmp2_;
+ GdkPixbuf* _tmp3_;
+ GdkPixbuf* _tmp4_;
+ GdkPixbuf* _tmp5_;
Scaling scaling = {0};
Scaling _tmp10_ = {0};
- Photo* _tmp11_ = NULL;
- Photo* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
- gchar* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- PixbufCache* _tmp28_ = NULL;
- Photo* _tmp29_ = NULL;
- Photo* _tmp30_ = NULL;
+ Photo* _tmp11_;
+ Photo* _tmp12_;
+ gchar* _tmp13_;
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
+ PixbufCache* _tmp28_;
+ Photo* _tmp29_;
+ Photo* _tmp30_;
GError * _inner_error_ = NULL;
#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -8758,10 +8752,10 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
_tmp5_ = pixbuf;
#line 1243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp5_ != NULL) {
-#line 8757 "PhotoPage.c"
- GdkPixbuf* _tmp6_ = NULL;
- Photo* _tmp7_ = NULL;
- Photo* _tmp8_ = NULL;
+#line 8751 "PhotoPage.c"
+ GdkPixbuf* _tmp6_;
+ Photo* _tmp7_;
+ Photo* _tmp8_;
Dimensions _tmp9_ = {0};
#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_ = pixbuf;
@@ -8781,7 +8775,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
_g_object_unref0 (pixbuf);
#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 8780 "PhotoPage.c"
+#line 8774 "PhotoPage.c"
}
#line 1250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp10_);
@@ -8807,16 +8801,16 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
_g_free0 (_tmp14_);
#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp12_);
-#line 8806 "PhotoPage.c"
+#line 8800 "PhotoPage.c"
{
GdkPixbuf* _tmp17_ = NULL;
- Photo* _tmp18_ = NULL;
- Photo* _tmp19_ = NULL;
- Scaling _tmp20_ = {0};
- GdkPixbuf* _tmp21_ = NULL;
- GdkPixbuf* _tmp22_ = NULL;
- Photo* _tmp23_ = NULL;
- Photo* _tmp24_ = NULL;
+ Photo* _tmp18_;
+ Photo* _tmp19_;
+ Scaling _tmp20_;
+ GdkPixbuf* _tmp21_;
+ GdkPixbuf* _tmp22_;
+ Photo* _tmp23_;
+ Photo* _tmp24_;
Dimensions _tmp25_ = {0};
#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp18_ = editing_host_page_get_photo (self);
@@ -8834,8 +8828,8 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
_tmp17_ = _tmp22_;
#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8833 "PhotoPage.c"
- goto __catch247_g_error;
+#line 8827 "PhotoPage.c"
+ goto __catch248_g_error;
}
#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp23_ = editing_host_page_get_photo (self);
@@ -8849,14 +8843,14 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
_g_object_unref0 (_tmp24_);
#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp17_);
-#line 8848 "PhotoPage.c"
+#line 8842 "PhotoPage.c"
}
- goto __finally247;
- __catch247_g_error:
+ goto __finally248;
+ __catch248_g_error:
{
GError* err = NULL;
- GError* _tmp26_ = NULL;
- const gchar* _tmp27_ = NULL;
+ GError* _tmp26_;
+ const gchar* _tmp27_;
#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
err = _inner_error_;
#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8869,9 +8863,9 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
g_warning ("PhotoPage.vala:1259: %s", _tmp27_);
#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_error_free0 (err);
-#line 8868 "PhotoPage.c"
+#line 8862 "PhotoPage.c"
}
- __finally247:
+ __finally248:
#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8882,7 +8876,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
g_clear_error (&_inner_error_);
#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 8881 "PhotoPage.c"
+#line 8875 "PhotoPage.c"
}
#line 1262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp28_ = self->priv->cache;
@@ -8898,22 +8892,22 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
self->priv->pixbuf_dirty = FALSE;
#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (pixbuf);
-#line 8897 "PhotoPage.c"
+#line 8891 "PhotoPage.c"
}
static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
gboolean result = FALSE;
Photo* photo = NULL;
- Photo* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
+ Photo* _tmp0_;
+ Photo* _tmp1_;
GdkPixbuf* pixbuf = NULL;
Dimensions max_dim = {0};
- Photo* _tmp2_ = NULL;
+ Photo* _tmp2_;
Dimensions _tmp3_ = {0};
- gboolean _tmp18_ = FALSE;
+ gboolean _tmp18_;
gboolean _tmp26_ = FALSE;
- gboolean _tmp27_ = FALSE;
+ gboolean _tmp27_;
GError * _inner_error_ = NULL;
#line 1269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
@@ -8931,7 +8925,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
_g_object_unref0 (photo);
#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 8930 "PhotoPage.c"
+#line 8924 "PhotoPage.c"
}
#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
pixbuf = NULL;
@@ -8941,12 +8935,12 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_);
#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
max_dim = _tmp3_;
-#line 8940 "PhotoPage.c"
+#line 8934 "PhotoPage.c"
{
Dimensions tool_pixbuf_dim = {0};
Dimensions _tmp4_ = {0};
- EditingToolsEditingTool* _tmp5_ = NULL;
- GdkPixbuf* _tmp13_ = NULL;
+ EditingToolsEditingTool* _tmp5_;
+ GdkPixbuf* _tmp13_;
#line 1282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_.width = 0;
#line 1282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8955,14 +8949,14 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
_tmp5_ = self->priv->current_tool;
#line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp5_ != NULL) {
-#line 8954 "PhotoPage.c"
+#line 8948 "PhotoPage.c"
GdkPixbuf* _tmp6_ = NULL;
- EditingToolsEditingTool* _tmp7_ = NULL;
+ EditingToolsEditingTool* _tmp7_;
Scaling _tmp8_ = {0};
- Photo* _tmp9_ = NULL;
+ Photo* _tmp9_;
Dimensions _tmp10_ = {0};
- GdkPixbuf* _tmp11_ = NULL;
- GdkPixbuf* _tmp12_ = NULL;
+ GdkPixbuf* _tmp11_;
+ GdkPixbuf* _tmp12_;
#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp7_ = self->priv->current_tool;
#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8977,8 +8971,8 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
_tmp6_ = _tmp11_;
#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8976 "PhotoPage.c"
- goto __catch248_g_error;
+#line 8970 "PhotoPage.c"
+ goto __catch249_g_error;
}
#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp12_ = _tmp6_;
@@ -8990,27 +8984,27 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
pixbuf = _tmp12_;
#line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp6_);
-#line 8989 "PhotoPage.c"
+#line 8983 "PhotoPage.c"
}
#line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp13_ = pixbuf;
#line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp13_ != NULL) {
-#line 8995 "PhotoPage.c"
- Dimensions _tmp14_ = {0};
+#line 8989 "PhotoPage.c"
+ Dimensions _tmp14_;
#line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp14_ = tool_pixbuf_dim;
#line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
max_dim = _tmp14_;
-#line 9001 "PhotoPage.c"
+#line 8995 "PhotoPage.c"
}
}
- goto __finally248;
- __catch248_g_error:
+ goto __finally249;
+ __catch249_g_error:
{
GError* err = NULL;
- GError* _tmp15_ = NULL;
- const gchar* _tmp16_ = NULL;
+ GError* _tmp15_;
+ const gchar* _tmp16_;
#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
err = _inner_error_;
#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9025,12 +9019,12 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
editing_host_page_set_photo_missing (self, TRUE);
#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_error_free0 (err);
-#line 9024 "PhotoPage.c"
+#line 9018 "PhotoPage.c"
}
- __finally248:
+ __finally249:
#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9029 "PhotoPage.c"
+#line 9023 "PhotoPage.c"
gboolean _tmp17_ = FALSE;
#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (pixbuf);
@@ -9042,23 +9036,23 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
g_clear_error (&_inner_error_);
#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return _tmp17_;
-#line 9041 "PhotoPage.c"
+#line 9035 "PhotoPage.c"
}
#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp18_ = self->priv->photo_missing;
#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (!_tmp18_) {
-#line 9047 "PhotoPage.c"
- GdkPixbuf* _tmp19_ = NULL;
- GdkPixbuf* _tmp23_ = NULL;
+#line 9041 "PhotoPage.c"
+ GdkPixbuf* _tmp19_;
+ GdkPixbuf* _tmp23_;
#line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp19_ = pixbuf;
#line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp19_ == NULL) {
-#line 9054 "PhotoPage.c"
- PixbufCache* _tmp20_ = NULL;
- Photo* _tmp21_ = NULL;
- GdkPixbuf* _tmp22_ = NULL;
+#line 9048 "PhotoPage.c"
+ PixbufCache* _tmp20_;
+ Photo* _tmp21_;
+ GdkPixbuf* _tmp22_;
#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp20_ = self->priv->cache;
#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9069,45 +9063,45 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
_g_object_unref0 (pixbuf);
#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
pixbuf = _tmp22_;
-#line 9068 "PhotoPage.c"
+#line 9062 "PhotoPage.c"
}
#line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp23_ = pixbuf;
#line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp23_ == NULL) {
-#line 9074 "PhotoPage.c"
- PixbufCache* _tmp24_ = NULL;
- Photo* _tmp25_ = NULL;
+#line 9068 "PhotoPage.c"
+ PixbufCache* _tmp24_;
+ Photo* _tmp25_;
#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp24_ = self->priv->cache;
#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp25_ = photo;
#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
pixbuf_cache_prefetch (_tmp24_, _tmp25_, BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE);
-#line 9083 "PhotoPage.c"
+#line 9077 "PhotoPage.c"
}
}
#line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp27_ = self->priv->photo_missing;
#line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (!_tmp27_) {
-#line 9090 "PhotoPage.c"
- GdkPixbuf* _tmp28_ = NULL;
+#line 9084 "PhotoPage.c"
+ GdkPixbuf* _tmp28_;
#line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp28_ = pixbuf;
#line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp26_ = _tmp28_ != NULL;
-#line 9096 "PhotoPage.c"
+#line 9090 "PhotoPage.c"
} else {
#line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp26_ = FALSE;
-#line 9100 "PhotoPage.c"
+#line 9094 "PhotoPage.c"
}
#line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp26_) {
-#line 9104 "PhotoPage.c"
- GdkPixbuf* _tmp29_ = NULL;
- Dimensions _tmp30_ = {0};
+#line 9098 "PhotoPage.c"
+ GdkPixbuf* _tmp29_;
+ Dimensions _tmp30_;
#line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp29_ = pixbuf;
#line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9116,7 +9110,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp29_, &_tmp30_, NULL);
#line 1305 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self->priv->pixbuf_dirty = FALSE;
-#line 9115 "PhotoPage.c"
+#line 9109 "PhotoPage.c"
}
#line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
result = FALSE;
@@ -9126,13 +9120,13 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
_g_object_unref0 (photo);
#line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 9125 "PhotoPage.c"
+#line 9119 "PhotoPage.c"
}
static void editing_host_page_real_on_resize (Page* base, GdkRectangle* rect) {
EditingHostPage * self;
- GdkRectangle _tmp0_ = {0};
+ GdkRectangle _tmp0_;
#line 1315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 1315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9143,7 +9137,7 @@ static void editing_host_page_real_on_resize (Page* base, GdkRectangle* rect) {
PAGE_CLASS (editing_host_page_parent_class)->on_resize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp0_);
#line 1318 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_track_tool_window (self);
-#line 9142 "PhotoPage.c"
+#line 9136 "PhotoPage.c"
}
@@ -9159,7 +9153,7 @@ static void editing_host_page_real_on_resize_finished (Page* base, GdkRectangle*
self->priv->pixbuf_dirty = TRUE;
#line 1328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_update_pixbuf (self);
-#line 9158 "PhotoPage.c"
+#line 9152 "PhotoPage.c"
}
@@ -9172,52 +9166,52 @@ static void editing_host_page_on_viewport_resized (EditingHostPage* self) {
self->priv->pixbuf_dirty = TRUE;
#line 1337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_update_pixbuf (self);
-#line 9171 "PhotoPage.c"
+#line 9165 "PhotoPage.c"
}
static void editing_host_page_real_update_actions (Page* base, gint selected_count, gint count) {
EditingHostPage * self;
gboolean multiple_photos = FALSE;
- ViewCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gboolean _tmp3_ = FALSE;
- GtkToolButton* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- GtkToolButton* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+ ViewCollection* _tmp0_;
+ ViewCollection* _tmp1_;
+ gint _tmp2_;
+ gboolean _tmp3_;
+ GtkToolButton* _tmp4_;
+ gboolean _tmp5_;
+ GtkToolButton* _tmp6_;
+ gboolean _tmp7_;
Photo* photo = NULL;
- Photo* _tmp8_ = NULL;
+ Photo* _tmp8_;
Scaling scaling = {0};
Scaling _tmp9_ = {0};
gboolean _tmp10_ = FALSE;
gboolean _tmp11_ = FALSE;
gboolean _tmp12_ = FALSE;
- Photo* _tmp13_ = NULL;
- GtkToolButton* _tmp19_ = NULL;
+ Photo* _tmp13_;
+ GtkToolButton* _tmp19_;
gboolean _tmp20_ = FALSE;
gboolean _tmp21_ = FALSE;
- Photo* _tmp22_ = NULL;
- GtkToggleToolButton* _tmp27_ = NULL;
+ Photo* _tmp22_;
+ GtkToggleToolButton* _tmp27_;
gboolean _tmp28_ = FALSE;
gboolean _tmp29_ = FALSE;
- Photo* _tmp30_ = NULL;
- GtkToggleToolButton* _tmp35_ = NULL;
+ Photo* _tmp30_;
+ GtkToggleToolButton* _tmp35_;
gboolean _tmp36_ = FALSE;
gboolean _tmp37_ = FALSE;
- Photo* _tmp38_ = NULL;
- GtkToggleToolButton* _tmp43_ = NULL;
+ Photo* _tmp38_;
+ GtkToggleToolButton* _tmp43_;
gboolean _tmp44_ = FALSE;
gboolean _tmp45_ = FALSE;
- Photo* _tmp46_ = NULL;
- GtkToolButton* _tmp50_ = NULL;
+ Photo* _tmp46_;
+ GtkToolButton* _tmp50_;
gboolean _tmp51_ = FALSE;
gboolean _tmp52_ = FALSE;
- Photo* _tmp53_ = NULL;
- GtkToggleToolButton* _tmp58_ = NULL;
- gint _tmp59_ = 0;
- gint _tmp60_ = 0;
+ Photo* _tmp53_;
+ GtkToggleToolButton* _tmp58_;
+ gint _tmp59_;
+ gint _tmp60_;
#line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9256,51 +9250,51 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
_tmp13_ = photo;
#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp13_ != NULL) {
-#line 9255 "PhotoPage.c"
- gboolean _tmp14_ = FALSE;
+#line 9249 "PhotoPage.c"
+ gboolean _tmp14_;
#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp14_ = self->priv->photo_missing;
#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp12_ = !_tmp14_;
-#line 9261 "PhotoPage.c"
+#line 9255 "PhotoPage.c"
} else {
#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp12_ = FALSE;
-#line 9265 "PhotoPage.c"
+#line 9259 "PhotoPage.c"
}
#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp12_) {
-#line 9269 "PhotoPage.c"
- Photo* _tmp15_ = NULL;
- gboolean _tmp16_ = FALSE;
+#line 9263 "PhotoPage.c"
+ Photo* _tmp15_;
+ gboolean _tmp16_;
#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp15_ = photo;
#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp16_ = photo_check_can_rotate (_tmp15_);
#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp11_ = _tmp16_;
-#line 9278 "PhotoPage.c"
+#line 9272 "PhotoPage.c"
} else {
#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp11_ = FALSE;
-#line 9282 "PhotoPage.c"
+#line 9276 "PhotoPage.c"
}
#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp11_) {
-#line 9286 "PhotoPage.c"
- Photo* _tmp17_ = NULL;
- gboolean _tmp18_ = FALSE;
+#line 9280 "PhotoPage.c"
+ Photo* _tmp17_;
+ gboolean _tmp18_;
#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp17_ = photo;
#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp18_ = editing_host_page_is_rotate_available (self, _tmp17_);
#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp10_ = _tmp18_;
-#line 9295 "PhotoPage.c"
+#line 9289 "PhotoPage.c"
} else {
#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp10_ = FALSE;
-#line 9299 "PhotoPage.c"
+#line 9293 "PhotoPage.c"
}
#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp19_ = self->priv->rotate_button;
@@ -9310,24 +9304,24 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
_tmp22_ = photo;
#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp22_ != NULL) {
-#line 9309 "PhotoPage.c"
- gboolean _tmp23_ = FALSE;
+#line 9303 "PhotoPage.c"
+ gboolean _tmp23_;
#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp23_ = self->priv->photo_missing;
#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp21_ = !_tmp23_;
-#line 9315 "PhotoPage.c"
+#line 9309 "PhotoPage.c"
} else {
#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp21_ = FALSE;
-#line 9319 "PhotoPage.c"
+#line 9313 "PhotoPage.c"
}
#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp21_) {
-#line 9323 "PhotoPage.c"
- Photo* _tmp24_ = NULL;
- Scaling _tmp25_ = {0};
- gboolean _tmp26_ = FALSE;
+#line 9317 "PhotoPage.c"
+ Photo* _tmp24_;
+ Scaling _tmp25_;
+ gboolean _tmp26_;
#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp24_ = photo;
#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9336,11 +9330,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
_tmp26_ = editing_tools_crop_tool_is_available (_tmp24_, &_tmp25_);
#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp20_ = _tmp26_;
-#line 9335 "PhotoPage.c"
+#line 9329 "PhotoPage.c"
} else {
#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp20_ = FALSE;
-#line 9339 "PhotoPage.c"
+#line 9333 "PhotoPage.c"
}
#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp27_ = self->priv->crop_button;
@@ -9350,24 +9344,24 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
_tmp30_ = photo;
#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp30_ != NULL) {
-#line 9349 "PhotoPage.c"
- gboolean _tmp31_ = FALSE;
+#line 9343 "PhotoPage.c"
+ gboolean _tmp31_;
#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp31_ = self->priv->photo_missing;
#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp29_ = !_tmp31_;
-#line 9355 "PhotoPage.c"
+#line 9349 "PhotoPage.c"
} else {
#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp29_ = FALSE;
-#line 9359 "PhotoPage.c"
+#line 9353 "PhotoPage.c"
}
#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp29_) {
-#line 9363 "PhotoPage.c"
- Photo* _tmp32_ = NULL;
- Scaling _tmp33_ = {0};
- gboolean _tmp34_ = FALSE;
+#line 9357 "PhotoPage.c"
+ Photo* _tmp32_;
+ Scaling _tmp33_;
+ gboolean _tmp34_;
#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp32_ = photo;
#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9376,11 +9370,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
_tmp34_ = editing_tools_redeye_tool_is_available (_tmp32_, &_tmp33_);
#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp28_ = _tmp34_;
-#line 9375 "PhotoPage.c"
+#line 9369 "PhotoPage.c"
} else {
#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp28_ = FALSE;
-#line 9379 "PhotoPage.c"
+#line 9373 "PhotoPage.c"
}
#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp35_ = self->priv->redeye_button;
@@ -9390,24 +9384,24 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
_tmp38_ = photo;
#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp38_ != NULL) {
-#line 9389 "PhotoPage.c"
- gboolean _tmp39_ = FALSE;
+#line 9383 "PhotoPage.c"
+ gboolean _tmp39_;
#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp39_ = self->priv->photo_missing;
#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp37_ = !_tmp39_;
-#line 9395 "PhotoPage.c"
+#line 9389 "PhotoPage.c"
} else {
#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp37_ = FALSE;
-#line 9399 "PhotoPage.c"
+#line 9393 "PhotoPage.c"
}
#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp37_) {
-#line 9403 "PhotoPage.c"
- Photo* _tmp40_ = NULL;
- Scaling _tmp41_ = {0};
- gboolean _tmp42_ = FALSE;
+#line 9397 "PhotoPage.c"
+ Photo* _tmp40_;
+ Scaling _tmp41_;
+ gboolean _tmp42_;
#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp40_ = photo;
#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9416,11 +9410,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
_tmp42_ = editing_tools_adjust_tool_is_available (_tmp40_, &_tmp41_);
#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp36_ = _tmp42_;
-#line 9415 "PhotoPage.c"
+#line 9409 "PhotoPage.c"
} else {
#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp36_ = FALSE;
-#line 9419 "PhotoPage.c"
+#line 9413 "PhotoPage.c"
}
#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp43_ = self->priv->adjust_button;
@@ -9430,34 +9424,34 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
_tmp46_ = photo;
#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp46_ != NULL) {
-#line 9429 "PhotoPage.c"
- gboolean _tmp47_ = FALSE;
+#line 9423 "PhotoPage.c"
+ gboolean _tmp47_;
#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp47_ = self->priv->photo_missing;
#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp45_ = !_tmp47_;
-#line 9435 "PhotoPage.c"
+#line 9429 "PhotoPage.c"
} else {
#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp45_ = FALSE;
-#line 9439 "PhotoPage.c"
+#line 9433 "PhotoPage.c"
}
#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp45_) {
-#line 9443 "PhotoPage.c"
- Photo* _tmp48_ = NULL;
- gboolean _tmp49_ = FALSE;
+#line 9437 "PhotoPage.c"
+ Photo* _tmp48_;
+ gboolean _tmp49_;
#line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp48_ = photo;
#line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp49_ = editing_host_page_is_enhance_available (self, _tmp48_);
#line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp44_ = _tmp49_;
-#line 9452 "PhotoPage.c"
+#line 9446 "PhotoPage.c"
} else {
#line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp44_ = FALSE;
-#line 9456 "PhotoPage.c"
+#line 9450 "PhotoPage.c"
}
#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp50_ = self->priv->enhance_button;
@@ -9467,24 +9461,24 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
_tmp53_ = photo;
#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp53_ != NULL) {
-#line 9466 "PhotoPage.c"
- gboolean _tmp54_ = FALSE;
+#line 9460 "PhotoPage.c"
+ gboolean _tmp54_;
#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp54_ = self->priv->photo_missing;
#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp52_ = !_tmp54_;
-#line 9472 "PhotoPage.c"
+#line 9466 "PhotoPage.c"
} else {
#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp52_ = FALSE;
-#line 9476 "PhotoPage.c"
+#line 9470 "PhotoPage.c"
}
#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp52_) {
-#line 9480 "PhotoPage.c"
- Photo* _tmp55_ = NULL;
- Scaling _tmp56_ = {0};
- gboolean _tmp57_ = FALSE;
+#line 9474 "PhotoPage.c"
+ Photo* _tmp55_;
+ Scaling _tmp56_;
+ gboolean _tmp57_;
#line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp55_ = photo;
#line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9493,11 +9487,11 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
_tmp57_ = editing_tools_straighten_tool_is_available (_tmp55_, &_tmp56_);
#line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp51_ = _tmp57_;
-#line 9492 "PhotoPage.c"
+#line 9486 "PhotoPage.c"
} else {
#line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp51_ = FALSE;
-#line 9496 "PhotoPage.c"
+#line 9490 "PhotoPage.c"
}
#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp58_ = self->priv->straighten_button;
@@ -9511,7 +9505,7 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
PAGE_CLASS (editing_host_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp59_, _tmp60_);
#line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (photo);
-#line 9510 "PhotoPage.c"
+#line 9504 "PhotoPage.c"
}
@@ -9521,60 +9515,60 @@ static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
gboolean _tmp2_ = FALSE;
- EditingToolsEditingTool* _tmp3_ = NULL;
- GdkEventKey* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
+ EditingToolsEditingTool* _tmp3_;
+ GdkEventKey* _tmp7_;
+ gboolean _tmp8_;
#line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = self->priv->current_tool;
#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp3_ == NULL) {
-#line 9529 "PhotoPage.c"
- gboolean _tmp4_ = FALSE;
+#line 9523 "PhotoPage.c"
+ gboolean _tmp4_;
#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = !_tmp4_;
-#line 9535 "PhotoPage.c"
+#line 9529 "PhotoPage.c"
} else {
#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = FALSE;
-#line 9539 "PhotoPage.c"
+#line 9533 "PhotoPage.c"
}
#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp2_) {
-#line 9543 "PhotoPage.c"
- gboolean _tmp5_ = FALSE;
+#line 9537 "PhotoPage.c"
+ gboolean _tmp5_;
#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = !_tmp5_;
-#line 9549 "PhotoPage.c"
+#line 9543 "PhotoPage.c"
} else {
#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = FALSE;
-#line 9553 "PhotoPage.c"
+#line 9547 "PhotoPage.c"
}
#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp1_) {
-#line 9557 "PhotoPage.c"
- gboolean _tmp6_ = FALSE;
+#line 9551 "PhotoPage.c"
+ gboolean _tmp6_;
#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_ = editing_host_page_has_photo (self);
#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = _tmp6_;
-#line 9563 "PhotoPage.c"
+#line 9557 "PhotoPage.c"
} else {
#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = FALSE;
-#line 9567 "PhotoPage.c"
+#line 9561 "PhotoPage.c"
}
#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
#line 1368 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_swap_in_original (self);
-#line 9573 "PhotoPage.c"
+#line 9567 "PhotoPage.c"
}
#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp7_ = event;
@@ -9584,16 +9578,16 @@ static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey
result = _tmp8_;
#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 9583 "PhotoPage.c"
+#line 9577 "PhotoPage.c"
}
static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKey* event) {
EditingHostPage * self;
gboolean result = FALSE;
- EditingToolsEditingTool* _tmp0_ = NULL;
- GdkEventKey* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ EditingToolsEditingTool* _tmp0_;
+ GdkEventKey* _tmp1_;
+ gboolean _tmp2_;
#line 1373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9602,7 +9596,7 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe
if (_tmp0_ == NULL) {
#line 1375 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_swap_out_original (self);
-#line 9601 "PhotoPage.c"
+#line 9595 "PhotoPage.c"
}
#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = event;
@@ -9612,16 +9606,16 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe
result = _tmp2_;
#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 9611 "PhotoPage.c"
+#line 9605 "PhotoPage.c"
}
static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey* event) {
EditingHostPage * self;
gboolean result = FALSE;
- EditingToolsEditingTool* _tmp0_ = NULL;
- GdkEventKey* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ EditingToolsEditingTool* _tmp0_;
+ GdkEventKey* _tmp1_;
+ gboolean _tmp2_;
#line 1380 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9630,7 +9624,7 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey*
if (_tmp0_ == NULL) {
#line 1382 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_swap_out_original (self);
-#line 9629 "PhotoPage.c"
+#line 9623 "PhotoPage.c"
}
#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = event;
@@ -9640,7 +9634,7 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey*
result = _tmp2_;
#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 9639 "PhotoPage.c"
+#line 9633 "PhotoPage.c"
}
@@ -9649,46 +9643,46 @@ static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey*
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
- EditingToolsEditingTool* _tmp2_ = NULL;
- GdkEventKey* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+ EditingToolsEditingTool* _tmp2_;
+ GdkEventKey* _tmp5_;
+ gboolean _tmp6_;
#line 1387 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = self->priv->current_tool;
#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp2_ == NULL) {
-#line 9657 "PhotoPage.c"
- gboolean _tmp3_ = FALSE;
+#line 9651 "PhotoPage.c"
+ gboolean _tmp3_;
#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = _tmp3_;
-#line 9663 "PhotoPage.c"
+#line 9657 "PhotoPage.c"
} else {
#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = FALSE;
-#line 9667 "PhotoPage.c"
+#line 9661 "PhotoPage.c"
}
#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp1_) {
-#line 9671 "PhotoPage.c"
- gboolean _tmp4_ = FALSE;
+#line 9665 "PhotoPage.c"
+ gboolean _tmp4_;
#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = !_tmp4_;
-#line 9677 "PhotoPage.c"
+#line 9671 "PhotoPage.c"
} else {
#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = FALSE;
-#line 9681 "PhotoPage.c"
+#line 9675 "PhotoPage.c"
}
#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
#line 1389 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_swap_in_original (self);
-#line 9687 "PhotoPage.c"
+#line 9681 "PhotoPage.c"
}
#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = event;
@@ -9698,33 +9692,33 @@ static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey*
result = _tmp6_;
#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 9697 "PhotoPage.c"
+#line 9691 "PhotoPage.c"
}
static void editing_host_page_swap_in_original (EditingHostPage* self) {
GdkPixbuf* original = NULL;
- GdkPixbuf* _tmp9_ = NULL;
- GtkScale* _tmp10_ = NULL;
- gdouble _tmp11_ = 0.0;
- GdkPixbuf* _tmp12_ = NULL;
- Photo* _tmp13_ = NULL;
- Photo* _tmp14_ = NULL;
+ GdkPixbuf* _tmp9_;
+ GtkScale* _tmp10_;
+ gdouble _tmp11_;
+ GdkPixbuf* _tmp12_;
+ Photo* _tmp13_;
+ Photo* _tmp14_;
Dimensions _tmp15_ = {0};
GError * _inner_error_ = NULL;
#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 9713 "PhotoPage.c"
+#line 9707 "PhotoPage.c"
{
GdkPixbuf* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- Photo* _tmp2_ = NULL;
- GdkPixbuf* _tmp3_ = NULL;
- GdkPixbuf* _tmp4_ = NULL;
- Photo* _tmp5_ = NULL;
- Photo* _tmp6_ = NULL;
- Orientation _tmp7_ = 0;
- GdkPixbuf* _tmp8_ = NULL;
+ Photo* _tmp1_;
+ Photo* _tmp2_;
+ GdkPixbuf* _tmp3_;
+ GdkPixbuf* _tmp4_;
+ Photo* _tmp5_;
+ Photo* _tmp6_;
+ Orientation _tmp7_;
+ GdkPixbuf* _tmp8_;
#line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = editing_host_page_get_photo (self);
#line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9739,8 +9733,8 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
_tmp0_ = _tmp4_;
#line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9738 "PhotoPage.c"
- goto __catch249_g_error;
+#line 9732 "PhotoPage.c"
+ goto __catch250_g_error;
}
#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = editing_host_page_get_photo (self);
@@ -9758,10 +9752,10 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
_g_object_unref0 (_tmp6_);
#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp0_);
-#line 9757 "PhotoPage.c"
+#line 9751 "PhotoPage.c"
}
- goto __finally249;
- __catch249_g_error:
+ goto __finally250;
+ __catch250_g_error:
{
GError* err = NULL;
#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9774,9 +9768,9 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
_g_object_unref0 (original);
#line 1400 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 9773 "PhotoPage.c"
+#line 9767 "PhotoPage.c"
}
- __finally249:
+ __finally250:
#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9787,7 +9781,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
g_clear_error (&_inner_error_);
#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 9786 "PhotoPage.c"
+#line 9780 "PhotoPage.c"
}
#line 1404 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp9_ = single_photo_page_get_unscaled_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
@@ -9805,7 +9799,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
single_photo_page_save_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 9804 "PhotoPage.c"
+#line 9798 "PhotoPage.c"
}
#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp12_ = original;
@@ -9821,22 +9815,22 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
_g_object_unref0 (_tmp14_);
#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (original);
-#line 9820 "PhotoPage.c"
+#line 9814 "PhotoPage.c"
}
static void editing_host_page_swap_out_original (EditingHostPage* self) {
- GdkPixbuf* _tmp0_ = NULL;
+ GdkPixbuf* _tmp0_;
#line 1416 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = self->priv->swapped;
#line 1417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_ != NULL) {
-#line 9832 "PhotoPage.c"
- GdkPixbuf* _tmp1_ = NULL;
- Photo* _tmp2_ = NULL;
- Photo* _tmp3_ = NULL;
+#line 9826 "PhotoPage.c"
+ GdkPixbuf* _tmp1_;
+ Photo* _tmp2_;
+ Photo* _tmp3_;
Dimensions _tmp4_ = {0};
#line 1418 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = self->priv->swapped;
@@ -9858,7 +9852,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) {
_g_object_unref0 (self->priv->swapped);
#line 1424 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self->priv->swapped = NULL;
-#line 9857 "PhotoPage.c"
+#line 9851 "PhotoPage.c"
}
}
@@ -9866,26 +9860,26 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) {
static gpointer _editing_tools_editing_tool_ref0 (gpointer self) {
#line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return self ? editing_tools_editing_tool_ref (self) : NULL;
-#line 9865 "PhotoPage.c"
+#line 9859 "PhotoPage.c"
}
static void editing_host_page_activate_tool (EditingHostPage* self, EditingToolsEditingTool* tool) {
Dimensions _tmp0_ = {0};
- GdkPixbuf* _tmp1_ = NULL;
+ GdkPixbuf* _tmp1_;
GdkPixbuf* unscaled = NULL;
Dimensions max_dim = {0};
- Photo* _tmp2_ = NULL;
- Photo* _tmp3_ = NULL;
+ Photo* _tmp2_;
+ Photo* _tmp3_;
Dimensions _tmp4_ = {0};
- Dimensions _tmp5_ = {0};
- GdkPixbuf* _tmp22_ = NULL;
+ Dimensions _tmp5_;
+ GdkPixbuf* _tmp22_;
EditingToolsPhotoCanvas* photo_canvas = NULL;
- EditingHostPageEditingHostCanvas* _tmp25_ = NULL;
- EditingToolsEditingTool* _tmp26_ = NULL;
- EditingToolsEditingTool* _tmp27_ = NULL;
- EditingToolsEditingTool* _tmp28_ = NULL;
- EditingToolsPhotoCanvas* _tmp29_ = NULL;
+ EditingHostPageEditingHostCanvas* _tmp25_;
+ EditingToolsEditingTool* _tmp26_;
+ EditingToolsEditingTool* _tmp27_;
+ EditingToolsEditingTool* _tmp28_;
+ EditingToolsPhotoCanvas* _tmp29_;
GError * _inner_error_ = NULL;
#line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -9917,20 +9911,20 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
_g_object_unref0 (_tmp3_);
#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
max_dim = _tmp5_;
-#line 9916 "PhotoPage.c"
+#line 9910 "PhotoPage.c"
{
Dimensions tool_pixbuf_dim = {0};
Dimensions _tmp6_ = {0};
GdkPixbuf* _tmp7_ = NULL;
- EditingToolsEditingTool* _tmp8_ = NULL;
+ EditingToolsEditingTool* _tmp8_;
Scaling _tmp9_ = {0};
- Photo* _tmp10_ = NULL;
- Photo* _tmp11_ = NULL;
+ Photo* _tmp10_;
+ Photo* _tmp11_;
Dimensions _tmp12_ = {0};
- GdkPixbuf* _tmp13_ = NULL;
- GdkPixbuf* _tmp14_ = NULL;
- GdkPixbuf* _tmp15_ = NULL;
- GdkPixbuf* _tmp16_ = NULL;
+ GdkPixbuf* _tmp13_;
+ GdkPixbuf* _tmp14_;
+ GdkPixbuf* _tmp15_;
+ GdkPixbuf* _tmp16_;
#line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_.width = 0;
#line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9955,8 +9949,8 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
_tmp7_ = _tmp14_;
#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9954 "PhotoPage.c"
- goto __catch250_g_error;
+#line 9948 "PhotoPage.c"
+ goto __catch251_g_error;
}
#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp15_ = _tmp7_;
@@ -9970,26 +9964,26 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
_tmp16_ = unscaled;
#line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp16_ != NULL) {
-#line 9969 "PhotoPage.c"
- Dimensions _tmp17_ = {0};
+#line 9963 "PhotoPage.c"
+ Dimensions _tmp17_;
#line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp17_ = tool_pixbuf_dim;
#line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
max_dim = _tmp17_;
-#line 9975 "PhotoPage.c"
+#line 9969 "PhotoPage.c"
}
#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp7_);
-#line 9979 "PhotoPage.c"
+#line 9973 "PhotoPage.c"
}
- goto __finally250;
- __catch250_g_error:
+ goto __finally251;
+ __catch251_g_error:
{
GError* err = NULL;
- GError* _tmp18_ = NULL;
- const gchar* _tmp19_ = NULL;
- GtkToggleToolButton* _tmp20_ = NULL;
- GtkToggleToolButton* _tmp21_ = NULL;
+ GError* _tmp18_;
+ const gchar* _tmp19_;
+ GtkToggleToolButton* _tmp20_;
+ GtkToggleToolButton* _tmp21_;
#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
err = _inner_error_;
#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10016,9 +10010,9 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
_g_object_unref0 (unscaled);
#line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 10015 "PhotoPage.c"
+#line 10009 "PhotoPage.c"
}
- __finally250:
+ __finally251:
#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10029,22 +10023,22 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
g_clear_error (&_inner_error_);
#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 10028 "PhotoPage.c"
+#line 10022 "PhotoPage.c"
}
#line 1461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp22_ = unscaled;
#line 1461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp22_ != NULL) {
-#line 10034 "PhotoPage.c"
- GdkPixbuf* _tmp23_ = NULL;
- Dimensions _tmp24_ = {0};
+#line 10028 "PhotoPage.c"
+ GdkPixbuf* _tmp23_;
+ Dimensions _tmp24_;
#line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp23_ = unscaled;
#line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp24_ = max_dim;
#line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp23_, &_tmp24_, NULL);
-#line 10043 "PhotoPage.c"
+#line 10037 "PhotoPage.c"
}
#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp25_ = editing_host_page_editing_host_canvas_new (self);
@@ -10072,42 +10066,42 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
_editing_tools_photo_canvas_unref0 (photo_canvas);
#line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (unscaled);
-#line 10071 "PhotoPage.c"
+#line 10065 "PhotoPage.c"
}
static void _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated (EditingToolsEditingTool* _sender, gpointer self) {
#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_tool_activated ((EditingHostPage*) self);
-#line 10078 "PhotoPage.c"
+#line 10072 "PhotoPage.c"
}
static void _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) {
#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_tool_deactivated ((EditingHostPage*) self);
-#line 10085 "PhotoPage.c"
+#line 10079 "PhotoPage.c"
}
static void _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied (EditingToolsEditingTool* _sender, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement, gpointer self) {
#line 1501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_tool_applied ((EditingHostPage*) self, command, new_pixbuf, new_max_dim, needs_improvement);
-#line 10092 "PhotoPage.c"
+#line 10086 "PhotoPage.c"
}
static void _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled (EditingToolsEditingTool* _sender, gpointer self) {
#line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_tool_cancelled ((EditingHostPage*) self);
-#line 10099 "PhotoPage.c"
+#line 10093 "PhotoPage.c"
}
static void _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted (EditingToolsEditingTool* _sender, gpointer self) {
#line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_tool_aborted ((EditingHostPage*) self);
-#line 10106 "PhotoPage.c"
+#line 10100 "PhotoPage.c"
}
@@ -10116,36 +10110,36 @@ static gboolean _editing_host_page_update_pixbuf_gsource_func (gpointer self) {
result = editing_host_page_update_pixbuf ((EditingHostPage*) self);
#line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 10115 "PhotoPage.c"
+#line 10109 "PhotoPage.c"
}
static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement) {
- EditingToolsEditingTool* _tmp0_ = NULL;
+ EditingToolsEditingTool* _tmp0_;
EditingToolsEditingTool* tool = NULL;
- EditingToolsEditingTool* _tmp1_ = NULL;
- EditingToolsEditingTool* _tmp2_ = NULL;
+ EditingToolsEditingTool* _tmp1_;
+ EditingToolsEditingTool* _tmp2_;
EditingToolsEditingToolWindow* tool_window = NULL;
- EditingToolsEditingTool* _tmp3_ = NULL;
- EditingToolsEditingToolWindow* _tmp4_ = NULL;
+ EditingToolsEditingTool* _tmp3_;
+ EditingToolsEditingToolWindow* _tmp4_;
gboolean _tmp5_ = FALSE;
- EditingToolsEditingToolWindow* _tmp6_ = NULL;
- EditingToolsEditingTool* _tmp24_ = NULL;
- EditingToolsEditingTool* _tmp25_ = NULL;
- guint _tmp26_ = 0U;
- EditingToolsEditingTool* _tmp27_ = NULL;
- guint _tmp28_ = 0U;
- EditingToolsEditingTool* _tmp29_ = NULL;
- guint _tmp30_ = 0U;
- EditingToolsEditingTool* _tmp31_ = NULL;
- guint _tmp32_ = 0U;
- EditingToolsEditingTool* _tmp33_ = NULL;
- guint _tmp34_ = 0U;
+ EditingToolsEditingToolWindow* _tmp6_;
+ EditingToolsEditingTool* _tmp24_;
+ EditingToolsEditingTool* _tmp25_;
+ guint _tmp26_;
+ EditingToolsEditingTool* _tmp27_;
+ guint _tmp28_;
+ EditingToolsEditingTool* _tmp29_;
+ guint _tmp30_;
+ EditingToolsEditingTool* _tmp31_;
+ guint _tmp32_;
+ EditingToolsEditingTool* _tmp33_;
+ guint _tmp34_;
GdkPixbuf* replacement = NULL;
- GdkPixbuf* _tmp35_ = NULL;
- GdkPixbuf* _tmp43_ = NULL;
- gboolean _tmp46_ = FALSE;
- Command* _tmp47_ = NULL;
+ GdkPixbuf* _tmp35_;
+ GdkPixbuf* _tmp43_;
+ gboolean _tmp46_;
+ Command* _tmp47_;
#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10160,7 +10154,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
if (_tmp0_ == NULL) {
#line 1481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 10159 "PhotoPage.c"
+#line 10153 "PhotoPage.c"
}
#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = self->priv->current_tool;
@@ -10182,41 +10176,41 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
_tmp6_ = tool_window;
#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp6_ != NULL) {
-#line 10181 "PhotoPage.c"
- EditingToolsEditingToolWindow* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
+#line 10175 "PhotoPage.c"
+ EditingToolsEditingToolWindow* _tmp7_;
+ gboolean _tmp8_;
#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp7_ = tool_window;
#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp8_ = editing_tools_editing_tool_window_has_user_moved (_tmp7_);
#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = _tmp8_;
-#line 10190 "PhotoPage.c"
+#line 10184 "PhotoPage.c"
} else {
#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = FALSE;
-#line 10194 "PhotoPage.c"
+#line 10188 "PhotoPage.c"
}
#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp5_) {
-#line 10198 "PhotoPage.c"
+#line 10192 "PhotoPage.c"
gint last_location_x = 0;
gint last_location_y = 0;
- EditingToolsEditingToolWindow* _tmp9_ = NULL;
+ EditingToolsEditingToolWindow* _tmp9_;
gint _tmp10_ = 0;
gint _tmp11_ = 0;
- GeeHashMap* _tmp12_ = NULL;
- EditingToolsEditingTool* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- gint _tmp17_ = 0;
- GeeHashMap* _tmp18_ = NULL;
- EditingToolsEditingTool* _tmp19_ = NULL;
- const gchar* _tmp20_ = NULL;
- gchar* _tmp21_ = NULL;
- gchar* _tmp22_ = NULL;
- gint _tmp23_ = 0;
+ GeeHashMap* _tmp12_;
+ EditingToolsEditingTool* _tmp13_;
+ const gchar* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
+ gint _tmp17_;
+ GeeHashMap* _tmp18_;
+ EditingToolsEditingTool* _tmp19_;
+ const gchar* _tmp20_;
+ gchar* _tmp21_;
+ gchar* _tmp22_;
+ gint _tmp23_;
#line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp9_ = tool_window;
#line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10257,7 +10251,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, (gpointer) ((gintptr) _tmp23_));
#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_free0 (_tmp22_);
-#line 10256 "PhotoPage.c"
+#line 10250 "PhotoPage.c"
}
#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp24_ = tool;
@@ -10307,9 +10301,9 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
_tmp35_ = new_pixbuf;
#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp35_ != NULL) {
-#line 10306 "PhotoPage.c"
- GdkPixbuf* _tmp36_ = NULL;
- GdkPixbuf* _tmp37_ = NULL;
+#line 10300 "PhotoPage.c"
+ GdkPixbuf* _tmp36_;
+ GdkPixbuf* _tmp37_;
#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp36_ = new_pixbuf;
#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10318,17 +10312,17 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
_g_object_unref0 (replacement);
#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
replacement = _tmp37_;
-#line 10317 "PhotoPage.c"
+#line 10311 "PhotoPage.c"
} else {
- GdkPixbuf* _tmp38_ = NULL;
+ GdkPixbuf* _tmp38_;
#line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp38_ = self->priv->cancel_editing_pixbuf;
#line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp38_ != NULL) {
-#line 10324 "PhotoPage.c"
- GdkPixbuf* _tmp39_ = NULL;
- GdkPixbuf* _tmp40_ = NULL;
- GdkPixbuf* _tmp41_ = NULL;
+#line 10318 "PhotoPage.c"
+ GdkPixbuf* _tmp39_;
+ GdkPixbuf* _tmp40_;
+ GdkPixbuf* _tmp41_;
Dimensions _tmp42_ = {0};
#line 1516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp39_ = self->priv->cancel_editing_pixbuf;
@@ -10346,27 +10340,27 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
*new_max_dim = _tmp42_;
#line 1518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
needs_improvement = FALSE;
-#line 10345 "PhotoPage.c"
+#line 10339 "PhotoPage.c"
} else {
#line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
needs_improvement = TRUE;
-#line 10349 "PhotoPage.c"
+#line 10343 "PhotoPage.c"
}
}
#line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp43_ = replacement;
#line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp43_ != NULL) {
-#line 10356 "PhotoPage.c"
- GdkPixbuf* _tmp44_ = NULL;
- Dimensions _tmp45_ = {0};
+#line 10350 "PhotoPage.c"
+ GdkPixbuf* _tmp44_;
+ Dimensions _tmp45_;
#line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp44_ = replacement;
#line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp45_ = *new_max_dim;
#line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp44_, &_tmp45_, NULL);
-#line 10365 "PhotoPage.c"
+#line 10359 "PhotoPage.c"
}
#line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (self->priv->cancel_editing_pixbuf);
@@ -10380,16 +10374,16 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
self->priv->pixbuf_dirty = TRUE;
#line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _editing_host_page_update_pixbuf_gsource_func, g_object_ref (self), g_object_unref);
-#line 10379 "PhotoPage.c"
+#line 10373 "PhotoPage.c"
}
#line 1534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp47_ = command;
#line 1534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp47_ != NULL) {
-#line 10385 "PhotoPage.c"
- CommandManager* _tmp48_ = NULL;
- CommandManager* _tmp49_ = NULL;
- Command* _tmp50_ = NULL;
+#line 10379 "PhotoPage.c"
+ CommandManager* _tmp48_;
+ CommandManager* _tmp49_;
+ Command* _tmp50_;
#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp48_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10400,7 +10394,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
command_manager_execute (_tmp49_, _tmp50_);
#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_command_manager_unref0 (_tmp49_);
-#line 10399 "PhotoPage.c"
+#line 10393 "PhotoPage.c"
}
#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (replacement);
@@ -10408,7 +10402,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
_g_object_unref0 (tool_window);
#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_editing_tools_editing_tool_unref0 (tool);
-#line 10407 "PhotoPage.c"
+#line 10401 "PhotoPage.c"
}
@@ -10420,7 +10414,7 @@ static gboolean editing_host_page_real_on_double_click (EditingHostPage* self, G
result = FALSE;
#line 1541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 10419 "PhotoPage.c"
+#line 10413 "PhotoPage.c"
}
@@ -10429,30 +10423,30 @@ gboolean editing_host_page_on_double_click (EditingHostPage* self, GdkEventButto
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
#line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return EDITING_HOST_PAGE_GET_CLASS (self)->on_double_click (self, event);
-#line 10428 "PhotoPage.c"
+#line 10422 "PhotoPage.c"
}
static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton* event) {
EditingHostPage * self;
gboolean result = FALSE;
- GdkEventButton* _tmp0_ = NULL;
- GdkEventType _tmp1_ = 0;
+ GdkEventButton* _tmp0_;
+ GdkEventType _tmp1_;
gint x = 0;
- GdkEventButton* _tmp6_ = NULL;
- gdouble _tmp7_ = 0.0;
+ GdkEventButton* _tmp6_;
+ gdouble _tmp7_;
gint y = 0;
- GdkEventButton* _tmp8_ = NULL;
- gdouble _tmp9_ = 0.0;
+ GdkEventButton* _tmp8_;
+ gdouble _tmp9_;
gboolean _tmp10_ = FALSE;
- EditingToolsEditingTool* _tmp11_ = NULL;
- EditingToolsEditingTool* _tmp18_ = NULL;
- gint _tmp19_ = 0;
- gint _tmp20_ = 0;
- gboolean _tmp21_ = FALSE;
- EditingToolsEditingTool* _tmp22_ = NULL;
- gint _tmp23_ = 0;
- gint _tmp24_ = 0;
+ EditingToolsEditingTool* _tmp11_;
+ EditingToolsEditingTool* _tmp18_;
+ gint _tmp19_;
+ gint _tmp20_;
+ gboolean _tmp21_;
+ EditingToolsEditingTool* _tmp22_;
+ gint _tmp23_;
+ gint _tmp24_;
#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10463,33 +10457,33 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
_tmp1_ = _tmp0_->type;
#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp1_ == GDK_2BUTTON_PRESS) {
-#line 10462 "PhotoPage.c"
+#line 10456 "PhotoPage.c"
gboolean _tmp2_ = FALSE;
- EditingToolsEditingTool* _tmp3_ = NULL;
+ EditingToolsEditingTool* _tmp3_;
#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = self->priv->current_tool;
#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp3_ == NULL) {
-#line 10469 "PhotoPage.c"
- GdkEventButton* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+#line 10463 "PhotoPage.c"
+ GdkEventButton* _tmp4_;
+ gboolean _tmp5_;
#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = event;
#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = editing_host_page_on_double_click (self, _tmp4_);
#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = _tmp5_;
-#line 10478 "PhotoPage.c"
+#line 10472 "PhotoPage.c"
} else {
#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = FALSE;
-#line 10482 "PhotoPage.c"
+#line 10476 "PhotoPage.c"
}
#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
result = _tmp2_;
#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 10488 "PhotoPage.c"
+#line 10482 "PhotoPage.c"
}
#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_ = event;
@@ -10507,28 +10501,28 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
_tmp11_ = self->priv->current_tool;
#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp11_ == NULL) {
-#line 10506 "PhotoPage.c"
- GtkScale* _tmp12_ = NULL;
- gdouble _tmp13_ = 0.0;
+#line 10500 "PhotoPage.c"
+ GtkScale* _tmp12_;
+ gdouble _tmp13_;
#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp12_ = self->priv->zoom_slider;
#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp13_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_range_get_type (), GtkRange));
#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp10_ = _tmp13_ != 0.0;
-#line 10515 "PhotoPage.c"
+#line 10509 "PhotoPage.c"
} else {
#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp10_ = FALSE;
-#line 10519 "PhotoPage.c"
+#line 10513 "PhotoPage.c"
}
#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp10_) {
-#line 10523 "PhotoPage.c"
- GdkEventButton* _tmp14_ = NULL;
- gdouble _tmp15_ = 0.0;
- GdkEventButton* _tmp16_ = NULL;
- gdouble _tmp17_ = 0.0;
+#line 10517 "PhotoPage.c"
+ GdkEventButton* _tmp14_;
+ gdouble _tmp15_;
+ GdkEventButton* _tmp16_;
+ gdouble _tmp17_;
#line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp14_ = event;
#line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10549,7 +10543,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
result = TRUE;
#line 1561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 10548 "PhotoPage.c"
+#line 10542 "PhotoPage.c"
}
#line 1565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp18_ = self->priv->current_tool;
@@ -10559,7 +10553,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
result = FALSE;
#line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 10558 "PhotoPage.c"
+#line 10552 "PhotoPage.c"
}
#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp19_ = x;
@@ -10573,7 +10567,7 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
result = TRUE;
#line 1572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 10572 "PhotoPage.c"
+#line 10566 "PhotoPage.c"
}
#line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp22_ = self->priv->current_tool;
@@ -10587,24 +10581,24 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
result = TRUE;
#line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 10586 "PhotoPage.c"
+#line 10580 "PhotoPage.c"
}
static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventButton* event) {
EditingHostPage * self;
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
- EditingToolsEditingTool* _tmp21_ = NULL;
- EditingToolsEditingTool* _tmp22_ = NULL;
- GdkEventButton* _tmp23_ = NULL;
- gdouble _tmp24_ = 0.0;
- GdkEventButton* _tmp25_ = NULL;
- gdouble _tmp26_ = 0.0;
- EditingToolsEditingTool* _tmp27_ = NULL;
- EditingToolsEditingToolWindow* _tmp28_ = NULL;
- EditingToolsEditingToolWindow* _tmp29_ = NULL;
- gboolean _tmp30_ = FALSE;
+ gboolean _tmp0_;
+ EditingToolsEditingTool* _tmp21_;
+ EditingToolsEditingTool* _tmp22_;
+ GdkEventButton* _tmp23_;
+ gdouble _tmp24_;
+ GdkEventButton* _tmp25_;
+ gdouble _tmp26_;
+ EditingToolsEditingTool* _tmp27_;
+ EditingToolsEditingToolWindow* _tmp28_;
+ EditingToolsEditingToolWindow* _tmp29_;
+ gboolean _tmp30_;
#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10613,31 +10607,31 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
_tmp0_ = self->priv->is_pan_in_progress;
#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
-#line 10612 "PhotoPage.c"
+#line 10606 "PhotoPage.c"
GdkPoint viewport_center = {0};
ZoomState _tmp1_ = {0};
GdkPoint _tmp2_ = {0};
gint delta_x = 0;
- GdkEventButton* _tmp3_ = NULL;
- gdouble _tmp4_ = 0.0;
- GdkPoint _tmp5_ = {0};
- gint _tmp6_ = 0;
+ GdkEventButton* _tmp3_;
+ gdouble _tmp4_;
+ GdkPoint _tmp5_;
+ gint _tmp6_;
gint delta_y = 0;
- GdkEventButton* _tmp7_ = NULL;
- gdouble _tmp8_ = 0.0;
- GdkPoint _tmp9_ = {0};
- gint _tmp10_ = 0;
- gint _tmp11_ = 0;
- gint _tmp12_ = 0;
- gint _tmp13_ = 0;
- gint _tmp14_ = 0;
+ GdkEventButton* _tmp7_;
+ gdouble _tmp8_;
+ GdkPoint _tmp9_;
+ gint _tmp10_;
+ gint _tmp11_;
+ gint _tmp12_;
+ gint _tmp13_;
+ gint _tmp14_;
ZoomState zoom_state = {0};
ZoomState _tmp15_ = {0};
- GdkPoint _tmp16_ = {0};
- ZoomState _tmp17_ = {0};
- ZoomBuffer* _tmp18_ = NULL;
- ZoomBuffer* _tmp19_ = NULL;
- ZoomState _tmp20_ = {0};
+ GdkPoint _tmp16_;
+ ZoomState _tmp17_;
+ ZoomBuffer* _tmp18_;
+ ZoomBuffer* _tmp19_;
+ ZoomState _tmp20_;
#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10700,7 +10694,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
self->priv->is_pan_in_progress = FALSE;
#line 1593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 10699 "PhotoPage.c"
+#line 10693 "PhotoPage.c"
}
#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp21_ = self->priv->current_tool;
@@ -10710,7 +10704,7 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
result = FALSE;
#line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 10709 "PhotoPage.c"
+#line 10703 "PhotoPage.c"
}
#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp22_ = self->priv->current_tool;
@@ -10736,10 +10730,10 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
_g_object_unref0 (_tmp29_);
#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp30_) {
-#line 10735 "PhotoPage.c"
- EditingToolsEditingTool* _tmp31_ = NULL;
- EditingToolsEditingToolWindow* _tmp32_ = NULL;
- EditingToolsEditingToolWindow* _tmp33_ = NULL;
+#line 10729 "PhotoPage.c"
+ EditingToolsEditingTool* _tmp31_;
+ EditingToolsEditingToolWindow* _tmp32_;
+ EditingToolsEditingToolWindow* _tmp33_;
#line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp31_ = self->priv->current_tool;
#line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10750,21 +10744,21 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow));
#line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp33_);
-#line 10749 "PhotoPage.c"
+#line 10743 "PhotoPage.c"
}
#line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
result = FALSE;
#line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 10755 "PhotoPage.c"
+#line 10749 "PhotoPage.c"
}
static gboolean editing_host_page_real_on_right_click (Page* base, GdkEventButton* event) {
EditingHostPage * self;
gboolean result = FALSE;
- GdkEventButton* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ GdkEventButton* _tmp0_;
+ gboolean _tmp1_;
#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10777,7 +10771,7 @@ static gboolean editing_host_page_real_on_right_click (Page* base, GdkEventButto
result = _tmp1_;
#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 10776 "PhotoPage.c"
+#line 10770 "PhotoPage.c"
}
@@ -10786,26 +10780,26 @@ static gboolean _editing_host_page_on_fetch_original_gsource_func (gpointer self
result = editing_host_page_on_fetch_original ((EditingHostPage*) self);
#line 1622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 10785 "PhotoPage.c"
+#line 10779 "PhotoPage.c"
}
static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap* map) {
- GeeMap* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- Photo* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- gboolean _tmp4_ = FALSE;
- Photo* _tmp5_ = NULL;
- Photo* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
- gboolean _tmp8_ = FALSE;
- ViewCollection* _tmp9_ = NULL;
- ViewCollection* _tmp10_ = NULL;
- gint _tmp11_ = 0;
- ViewCollection* _tmp12_ = NULL;
- ViewCollection* _tmp13_ = NULL;
- gint _tmp14_ = 0;
+ GeeMap* _tmp0_;
+ Photo* _tmp1_;
+ Photo* _tmp2_;
+ gboolean _tmp3_;
+ gboolean _tmp4_;
+ Photo* _tmp5_;
+ Photo* _tmp6_;
+ gboolean _tmp7_;
+ gboolean _tmp8_;
+ ViewCollection* _tmp9_;
+ ViewCollection* _tmp10_;
+ gint _tmp11_;
+ ViewCollection* _tmp12_;
+ ViewCollection* _tmp13_;
+ gint _tmp14_;
#line 1613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10826,7 +10820,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap*
if (_tmp4_) {
#line 1615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 10825 "PhotoPage.c"
+#line 10819 "PhotoPage.c"
}
#line 1617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self->priv->pixbuf_dirty = TRUE;
@@ -10844,7 +10838,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap*
if (_tmp8_) {
#line 1622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _editing_host_page_on_fetch_original_gsource_func, g_object_ref (self), g_object_unref);
-#line 10843 "PhotoPage.c"
+#line 10837 "PhotoPage.c"
}
#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -10864,7 +10858,7 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap*
_data_collection_unref0 (_tmp13_);
#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_data_collection_unref0 (_tmp10_);
-#line 10863 "PhotoPage.c"
+#line 10857 "PhotoPage.c"
}
@@ -10873,23 +10867,23 @@ static void editing_host_page_on_view_contents_ordering_altered (EditingHostPage
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_refresh_caches (self, "on_view_contents_ordering_altered");
-#line 10872 "PhotoPage.c"
+#line 10866 "PhotoPage.c"
}
static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) {
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 1631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
#line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = editing_host_page_has_photo (self);
#line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
-#line 10885 "PhotoPage.c"
- PixbufCache* _tmp1_ = NULL;
- Photo* _tmp2_ = NULL;
- Photo* _tmp3_ = NULL;
+#line 10879 "PhotoPage.c"
+ PixbufCache* _tmp1_;
+ Photo* _tmp2_;
+ Photo* _tmp3_;
#line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = self->priv->master_cache;
#line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10900,13 +10894,13 @@ static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) {
pixbuf_cache_prefetch (_tmp1_, _tmp3_, BACKGROUND_JOB_JOB_PRIORITY_LOW, FALSE);
#line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp3_);
-#line 10899 "PhotoPage.c"
+#line 10893 "PhotoPage.c"
}
#line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
result = FALSE;
#line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 10905 "PhotoPage.c"
+#line 10899 "PhotoPage.c"
}
@@ -10915,16 +10909,16 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) {
Dimensions content_dim = {0};
Dimensions _tmp0_ = {0};
ZoomState _tmp1_ = {0};
- gint _tmp2_ = 0;
+ gint _tmp2_;
ZoomState _tmp3_ = {0};
- gint _tmp4_ = 0;
+ gint _tmp4_;
Dimensions canvas_dim = {0};
Dimensions _tmp5_ = {0};
gboolean _tmp6_ = FALSE;
- Dimensions _tmp7_ = {0};
- gint _tmp8_ = 0;
- Dimensions _tmp9_ = {0};
- gint _tmp10_ = 0;
+ Dimensions _tmp7_;
+ gint _tmp8_;
+ Dimensions _tmp9_;
+ gint _tmp10_;
#line 1638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10957,11 +10951,11 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) {
_tmp10_ = _tmp9_.width;
#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp8_ >= _tmp10_) {
-#line 10956 "PhotoPage.c"
- Dimensions _tmp11_ = {0};
- gint _tmp12_ = 0;
- Dimensions _tmp13_ = {0};
- gint _tmp14_ = 0;
+#line 10950 "PhotoPage.c"
+ Dimensions _tmp11_;
+ gint _tmp12_;
+ Dimensions _tmp13_;
+ gint _tmp14_;
#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp11_ = canvas_dim;
#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10972,22 +10966,22 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) {
_tmp14_ = _tmp13_.height;
#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_ = _tmp12_ >= _tmp14_;
-#line 10971 "PhotoPage.c"
+#line 10965 "PhotoPage.c"
} else {
#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_ = FALSE;
-#line 10975 "PhotoPage.c"
+#line 10969 "PhotoPage.c"
}
#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
result = !_tmp6_;
#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 10981 "PhotoPage.c"
+#line 10975 "PhotoPage.c"
}
static void editing_host_page_update_cursor_for_zoom_context (EditingHostPage* self) {
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 1649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10996,11 +10990,11 @@ static void editing_host_page_update_cursor_for_zoom_context (EditingHostPage* s
if (_tmp0_) {
#line 1651 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_FLEUR);
-#line 10995 "PhotoPage.c"
+#line 10989 "PhotoPage.c"
} else {
#line 1653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_LEFT_PTR);
-#line 10999 "PhotoPage.c"
+#line 10993 "PhotoPage.c"
}
}
@@ -11008,13 +11002,13 @@ static void editing_host_page_update_cursor_for_zoom_context (EditingHostPage* s
static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) {
EditingHostPage * self;
gboolean result = FALSE;
- EditingToolsEditingTool* _tmp0_ = NULL;
- gboolean _tmp6_ = FALSE;
- GdkEventMotion* _tmp24_ = NULL;
- gint _tmp25_ = 0;
- gint _tmp26_ = 0;
- GdkModifierType _tmp27_ = 0;
- gboolean _tmp28_ = FALSE;
+ EditingToolsEditingTool* _tmp0_;
+ gboolean _tmp6_;
+ GdkEventMotion* _tmp24_;
+ gint _tmp25_;
+ gint _tmp26_;
+ GdkModifierType _tmp27_;
+ gboolean _tmp28_;
#line 1657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 1657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11023,12 +11017,12 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
_tmp0_ = self->priv->current_tool;
#line 1658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_ != NULL) {
-#line 11022 "PhotoPage.c"
- EditingToolsEditingTool* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
- GdkModifierType _tmp4_ = 0;
- GdkEventMotion* _tmp5_ = NULL;
+#line 11016 "PhotoPage.c"
+ EditingToolsEditingTool* _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
+ GdkModifierType _tmp4_;
+ GdkEventMotion* _tmp5_;
#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = self->priv->current_tool;
#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11047,7 +11041,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
result = TRUE;
#line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 11046 "PhotoPage.c"
+#line 11040 "PhotoPage.c"
}
#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_update_cursor_for_zoom_context (self);
@@ -11055,28 +11049,28 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
_tmp6_ = self->priv->is_pan_in_progress;
#line 1669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp6_) {
-#line 11054 "PhotoPage.c"
+#line 11048 "PhotoPage.c"
gint delta_x = 0;
- GdkEventMotion* _tmp7_ = NULL;
- gdouble _tmp8_ = 0.0;
- GdkPoint _tmp9_ = {0};
- gint _tmp10_ = 0;
+ GdkEventMotion* _tmp7_;
+ gdouble _tmp8_;
+ GdkPoint _tmp9_;
+ gint _tmp10_;
gint delta_y = 0;
- GdkEventMotion* _tmp11_ = NULL;
- gdouble _tmp12_ = 0.0;
- GdkPoint _tmp13_ = {0};
- gint _tmp14_ = 0;
+ GdkEventMotion* _tmp11_;
+ gdouble _tmp12_;
+ GdkPoint _tmp13_;
+ gint _tmp14_;
GdkPoint viewport_center = {0};
ZoomState _tmp15_ = {0};
GdkPoint _tmp16_ = {0};
- gint _tmp17_ = 0;
- gint _tmp18_ = 0;
- gint _tmp19_ = 0;
- gint _tmp20_ = 0;
+ gint _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
+ gint _tmp20_;
ZoomState zoom_state = {0};
ZoomState _tmp21_ = {0};
- GdkPoint _tmp22_ = {0};
- ZoomState _tmp23_ = {0};
+ GdkPoint _tmp22_;
+ ZoomState _tmp23_;
#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp7_ = event;
#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11129,7 +11123,7 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
result = TRUE;
#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 11128 "PhotoPage.c"
+#line 11122 "PhotoPage.c"
}
#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp24_ = event;
@@ -11145,24 +11139,24 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
result = _tmp28_;
#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 11144 "PhotoPage.c"
+#line 11138 "PhotoPage.c"
}
static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
EditingHostPage * self;
gboolean result = FALSE;
- EditingToolsEditingTool* _tmp0_ = NULL;
- gboolean _tmp3_ = FALSE;
+ EditingToolsEditingTool* _tmp0_;
+ gboolean _tmp3_;
#line 1686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = self->priv->current_tool;
#line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_ != NULL) {
-#line 11159 "PhotoPage.c"
- EditingToolsEditingTool* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+#line 11153 "PhotoPage.c"
+ EditingToolsEditingTool* _tmp1_;
+ gboolean _tmp2_;
#line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = self->priv->current_tool;
#line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11171,7 +11165,7 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
result = _tmp2_;
#line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 11170 "PhotoPage.c"
+#line 11164 "PhotoPage.c"
}
#line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = PAGE_CLASS (editing_host_page_parent_class)->on_leave_notify_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page));
@@ -11179,24 +11173,24 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
result = _tmp3_;
#line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 11178 "PhotoPage.c"
+#line 11172 "PhotoPage.c"
}
static void editing_host_page_track_tool_window (EditingHostPage* self) {
- EditingToolsEditingTool* _tmp0_ = NULL;
+ EditingToolsEditingTool* _tmp0_;
#line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = self->priv->current_tool;
#line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_ != NULL) {
-#line 11190 "PhotoPage.c"
+#line 11184 "PhotoPage.c"
EditingToolsEditingToolWindow* tool_window = NULL;
- EditingToolsEditingTool* _tmp1_ = NULL;
- EditingToolsEditingToolWindow* _tmp2_ = NULL;
+ EditingToolsEditingTool* _tmp1_;
+ EditingToolsEditingToolWindow* _tmp2_;
gboolean _tmp3_ = FALSE;
- EditingToolsEditingToolWindow* _tmp4_ = NULL;
+ EditingToolsEditingToolWindow* _tmp4_;
#line 1696 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = self->priv->current_tool;
#line 1696 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11207,37 +11201,37 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) {
_tmp4_ = tool_window;
#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp4_ != NULL) {
-#line 11206 "PhotoPage.c"
- EditingToolsEditingToolWindow* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+#line 11200 "PhotoPage.c"
+ EditingToolsEditingToolWindow* _tmp5_;
+ gboolean _tmp6_;
#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = tool_window;
#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_ = editing_tools_editing_tool_window_has_user_moved (_tmp5_);
#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = !_tmp6_;
-#line 11215 "PhotoPage.c"
+#line 11209 "PhotoPage.c"
} else {
#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = FALSE;
-#line 11219 "PhotoPage.c"
+#line 11213 "PhotoPage.c"
}
#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp3_) {
#line 1698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_place_tool_window (self);
-#line 11225 "PhotoPage.c"
+#line 11219 "PhotoPage.c"
}
#line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (tool_window);
-#line 11229 "PhotoPage.c"
+#line 11223 "PhotoPage.c"
}
}
static void editing_host_page_real_on_move (Page* base, GdkRectangle* rect) {
EditingHostPage * self;
- GdkRectangle _tmp0_ = {0};
+ GdkRectangle _tmp0_;
#line 1702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 1702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11248,14 +11242,14 @@ static void editing_host_page_real_on_move (Page* base, GdkRectangle* rect) {
_tmp0_ = *rect;
#line 1705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
PAGE_CLASS (editing_host_page_parent_class)->on_move (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp0_);
-#line 11247 "PhotoPage.c"
+#line 11241 "PhotoPage.c"
}
static void editing_host_page_real_on_move_finished (Page* base, GdkRectangle* rect) {
EditingHostPage * self;
- GeeHashMap* _tmp0_ = NULL;
- GdkRectangle _tmp1_ = {0};
+ GeeHashMap* _tmp0_;
+ GdkRectangle _tmp1_;
#line 1708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 1708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11268,7 +11262,7 @@ static void editing_host_page_real_on_move_finished (Page* base, GdkRectangle* r
_tmp1_ = *rect;
#line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
PAGE_CLASS (editing_host_page_parent_class)->on_move_finished (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp1_);
-#line 11267 "PhotoPage.c"
+#line 11261 "PhotoPage.c"
}
@@ -11278,10 +11272,10 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
ZoomState _tmp0_ = {0};
GdkPoint viewport_center = {0};
GdkPoint _tmp1_ = {0};
- GdkEventKey* _tmp2_ = NULL;
- guint _tmp3_ = 0U;
- const gchar* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
+ GdkEventKey* _tmp2_;
+ guint _tmp3_;
+ const gchar* _tmp4_;
+ const gchar* _tmp5_;
GQuark _tmp7_ = 0U;
#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
static GQuark _tmp6_label0 = 0;
@@ -11307,11 +11301,11 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
static GQuark _tmp6_label10 = 0;
#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
static GQuark _tmp6_label11 = 0;
-#line 11306 "PhotoPage.c"
+#line 11300 "PhotoPage.c"
ZoomState new_zoom_state = {0};
- ZoomState _tmp12_ = {0};
- GdkPoint _tmp13_ = {0};
- ZoomState _tmp14_ = {0};
+ ZoomState _tmp12_;
+ GdkPoint _tmp13_;
+ ZoomState _tmp14_;
#line 1714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
#line 1714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11338,78 +11332,78 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
if (((_tmp7_ == ((0 != _tmp6_label0) ? _tmp6_label0 : (_tmp6_label0 = g_quark_from_static_string ("Left")))) || (_tmp7_ == ((0 != _tmp6_label1) ? _tmp6_label1 : (_tmp6_label1 = g_quark_from_static_string ("KP_Left"))))) || (_tmp7_ == ((0 != _tmp6_label2) ? _tmp6_label2 : (_tmp6_label2 = g_quark_from_static_string ("KP_4"))))) {
#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 11337 "PhotoPage.c"
+#line 11331 "PhotoPage.c"
default:
{
- gint _tmp8_ = 0;
+ gint _tmp8_;
#line 1722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp8_ = viewport_center.x;
#line 1722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
viewport_center.x = _tmp8_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
#line 1723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 11347 "PhotoPage.c"
+#line 11341 "PhotoPage.c"
}
}
} else if (((_tmp7_ == ((0 != _tmp6_label3) ? _tmp6_label3 : (_tmp6_label3 = g_quark_from_static_string ("Right")))) || (_tmp7_ == ((0 != _tmp6_label4) ? _tmp6_label4 : (_tmp6_label4 = g_quark_from_static_string ("KP_Right"))))) || (_tmp7_ == ((0 != _tmp6_label5) ? _tmp6_label5 : (_tmp6_label5 = g_quark_from_static_string ("KP_6"))))) {
#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 11353 "PhotoPage.c"
+#line 11347 "PhotoPage.c"
default:
{
- gint _tmp9_ = 0;
+ gint _tmp9_;
#line 1728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp9_ = viewport_center.x;
#line 1728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
viewport_center.x = _tmp9_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
#line 1729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 11363 "PhotoPage.c"
+#line 11357 "PhotoPage.c"
}
}
} else if (((_tmp7_ == ((0 != _tmp6_label6) ? _tmp6_label6 : (_tmp6_label6 = g_quark_from_static_string ("Down")))) || (_tmp7_ == ((0 != _tmp6_label7) ? _tmp6_label7 : (_tmp6_label7 = g_quark_from_static_string ("KP_Down"))))) || (_tmp7_ == ((0 != _tmp6_label8) ? _tmp6_label8 : (_tmp6_label8 = g_quark_from_static_string ("KP_2"))))) {
#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 11369 "PhotoPage.c"
+#line 11363 "PhotoPage.c"
default:
{
- gint _tmp10_ = 0;
+ gint _tmp10_;
#line 1734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp10_ = viewport_center.y;
#line 1734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
viewport_center.y = _tmp10_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
#line 1735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 11379 "PhotoPage.c"
+#line 11373 "PhotoPage.c"
}
}
} else if (((_tmp7_ == ((0 != _tmp6_label9) ? _tmp6_label9 : (_tmp6_label9 = g_quark_from_static_string ("Up")))) || (_tmp7_ == ((0 != _tmp6_label10) ? _tmp6_label10 : (_tmp6_label10 = g_quark_from_static_string ("KP_Up"))))) || (_tmp7_ == ((0 != _tmp6_label11) ? _tmp6_label11 : (_tmp6_label11 = g_quark_from_static_string ("KP_8"))))) {
#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 11385 "PhotoPage.c"
+#line 11379 "PhotoPage.c"
default:
{
- gint _tmp11_ = 0;
+ gint _tmp11_;
#line 1740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp11_ = viewport_center.y;
#line 1740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
viewport_center.y = _tmp11_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
#line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 11395 "PhotoPage.c"
+#line 11389 "PhotoPage.c"
}
}
} else {
#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 11401 "PhotoPage.c"
+#line 11395 "PhotoPage.c"
default:
{
#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
result = FALSE;
#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 11408 "PhotoPage.c"
+#line 11402 "PhotoPage.c"
}
}
}
@@ -11429,22 +11423,22 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
result = TRUE;
#line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 11428 "PhotoPage.c"
+#line 11422 "PhotoPage.c"
}
static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
EditingHostPage * self;
gboolean result = FALSE;
- EditingToolsEditingTool* _tmp0_ = NULL;
- gboolean _tmp4_ = FALSE;
- GdkEventKey* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
+ EditingToolsEditingTool* _tmp0_;
+ gboolean _tmp4_;
+ GdkEventKey* _tmp7_;
+ gboolean _tmp8_;
gboolean handled = FALSE;
- GdkEventKey* _tmp9_ = NULL;
- guint _tmp10_ = 0U;
- const gchar* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
+ GdkEventKey* _tmp9_;
+ guint _tmp10_;
+ const gchar* _tmp11_;
+ const gchar* _tmp12_;
GQuark _tmp14_ = 0U;
#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
static GQuark _tmp13_label0 = 0;
@@ -11462,8 +11456,8 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
static GQuark _tmp13_label6 = 0;
#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
static GQuark _tmp13_label7 = 0;
-#line 11461 "PhotoPage.c"
- gboolean _tmp15_ = FALSE;
+#line 11455 "PhotoPage.c"
+ gboolean _tmp15_;
gboolean _tmp16_ = FALSE;
#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
@@ -11473,10 +11467,10 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
_tmp0_ = self->priv->current_tool;
#line 1756 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_ != NULL) {
-#line 11472 "PhotoPage.c"
- EditingToolsEditingTool* _tmp1_ = NULL;
- GdkEventKey* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 11466 "PhotoPage.c"
+ EditingToolsEditingTool* _tmp1_;
+ GdkEventKey* _tmp2_;
+ gboolean _tmp3_;
#line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = self->priv->current_tool;
#line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11489,16 +11483,16 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
result = TRUE;
#line 1758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 11488 "PhotoPage.c"
+#line 11482 "PhotoPage.c"
}
}
#line 1762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = editing_host_page_is_panning_possible (self);
#line 1762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp4_) {
-#line 11495 "PhotoPage.c"
- GdkEventKey* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+#line 11489 "PhotoPage.c"
+ GdkEventKey* _tmp5_;
+ gboolean _tmp6_;
#line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = event;
#line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11509,7 +11503,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
result = TRUE;
#line 1764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 11508 "PhotoPage.c"
+#line 11502 "PhotoPage.c"
}
}
#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11522,7 +11516,7 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
result = TRUE;
#line 1771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 11521 "PhotoPage.c"
+#line 11515 "PhotoPage.c"
}
#line 1773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
handled = TRUE;
@@ -11540,51 +11534,51 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
if ((_tmp14_ == ((0 != _tmp13_label0) ? _tmp13_label0 : (_tmp13_label0 = g_quark_from_static_string ("Down")))) || (_tmp14_ == ((0 != _tmp13_label1) ? _tmp13_label1 : (_tmp13_label1 = g_quark_from_static_string ("KP_Down"))))) {
#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 11539 "PhotoPage.c"
+#line 11533 "PhotoPage.c"
default:
{
#line 1780 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 11544 "PhotoPage.c"
+#line 11538 "PhotoPage.c"
}
}
} else if (((_tmp14_ == ((0 != _tmp13_label2) ? _tmp13_label2 : (_tmp13_label2 = g_quark_from_static_string ("equal")))) || (_tmp14_ == ((0 != _tmp13_label3) ? _tmp13_label3 : (_tmp13_label3 = g_quark_from_static_string ("plus"))))) || (_tmp14_ == ((0 != _tmp13_label4) ? _tmp13_label4 : (_tmp13_label4 = g_quark_from_static_string ("KP_Add"))))) {
#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 11550 "PhotoPage.c"
+#line 11544 "PhotoPage.c"
default:
{
#line 1785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize");
#line 1786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 11557 "PhotoPage.c"
+#line 11551 "PhotoPage.c"
}
}
} else if (((_tmp14_ == ((0 != _tmp13_label5) ? _tmp13_label5 : (_tmp13_label5 = g_quark_from_static_string ("minus")))) || (_tmp14_ == ((0 != _tmp13_label6) ? _tmp13_label6 : (_tmp13_label6 = g_quark_from_static_string ("underscore"))))) || (_tmp14_ == ((0 != _tmp13_label7) ? _tmp13_label7 : (_tmp13_label7 = g_quark_from_static_string ("KP_Subtract"))))) {
#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 11563 "PhotoPage.c"
+#line 11557 "PhotoPage.c"
default:
{
#line 1792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize");
#line 1793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 11570 "PhotoPage.c"
+#line 11564 "PhotoPage.c"
}
}
} else {
#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 11576 "PhotoPage.c"
+#line 11570 "PhotoPage.c"
default:
{
#line 1796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
handled = FALSE;
#line 1797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 11583 "PhotoPage.c"
+#line 11577 "PhotoPage.c"
}
}
}
@@ -11596,36 +11590,36 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
result = TRUE;
#line 1801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 11595 "PhotoPage.c"
+#line 11589 "PhotoPage.c"
}
#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event != NULL) {
-#line 11599 "PhotoPage.c"
- GdkEventKey* _tmp17_ = NULL;
- gboolean _tmp18_ = FALSE;
+#line 11593 "PhotoPage.c"
+ GdkEventKey* _tmp17_;
+ gboolean _tmp18_;
#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp17_ = event;
#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp18_ = GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget), _tmp17_);
#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp16_ = _tmp18_;
-#line 11608 "PhotoPage.c"
+#line 11602 "PhotoPage.c"
} else {
#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp16_ = TRUE;
-#line 11612 "PhotoPage.c"
+#line 11606 "PhotoPage.c"
}
#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
result = _tmp16_;
#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 11618 "PhotoPage.c"
+#line 11612 "PhotoPage.c"
}
static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t* default_ctx, Dimensions* dim) {
EditingHostPage * self;
- EditingToolsEditingTool* _tmp0_ = NULL;
+ EditingToolsEditingTool* _tmp0_;
#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11636,11 +11630,11 @@ static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t*
_tmp0_ = self->priv->current_tool;
#line 1808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_ != NULL) {
-#line 11635 "PhotoPage.c"
- EditingToolsEditingTool* _tmp1_ = NULL;
- EditingToolsPhotoCanvas* _tmp2_ = NULL;
- cairo_t* _tmp3_ = NULL;
- Dimensions _tmp4_ = {0};
+#line 11629 "PhotoPage.c"
+ EditingToolsEditingTool* _tmp1_;
+ EditingToolsPhotoCanvas* _tmp2_;
+ cairo_t* _tmp3_;
+ Dimensions _tmp4_;
#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = self->priv->current_tool;
#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11651,7 +11645,7 @@ static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t*
_tmp4_ = *dim;
#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_tools_photo_canvas_set_surface (_tmp2_, _tmp3_, &_tmp4_);
-#line 11650 "PhotoPage.c"
+#line 11644 "PhotoPage.c"
}
}
@@ -11659,7 +11653,7 @@ static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t*
static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) {
EditingHostPage * self;
gboolean _tmp0_ = FALSE;
- EditingToolsEditingTool* _tmp1_ = NULL;
+ EditingToolsEditingTool* _tmp1_;
#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11670,25 +11664,25 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix
_tmp1_ = self->priv->current_tool;
#line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp1_ != NULL) {
-#line 11669 "PhotoPage.c"
- SinglePhotoPageUpdateReason _tmp2_ = 0;
+#line 11663 "PhotoPage.c"
+ SinglePhotoPageUpdateReason _tmp2_;
#line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = reason;
#line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = _tmp2_ != SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT;
-#line 11675 "PhotoPage.c"
+#line 11669 "PhotoPage.c"
} else {
#line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = FALSE;
-#line 11679 "PhotoPage.c"
+#line 11673 "PhotoPage.c"
}
#line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
-#line 11683 "PhotoPage.c"
- EditingToolsEditingTool* _tmp3_ = NULL;
- EditingToolsPhotoCanvas* _tmp4_ = NULL;
- Dimensions _tmp5_ = {0};
- GdkPixbuf* _tmp6_ = NULL;
+#line 11677 "PhotoPage.c"
+ EditingToolsEditingTool* _tmp3_;
+ EditingToolsPhotoCanvas* _tmp4_;
+ Dimensions _tmp5_;
+ GdkPixbuf* _tmp6_;
GdkRectangle _tmp7_ = {0};
#line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = self->priv->current_tool;
@@ -11706,7 +11700,7 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix
_g_object_unref0 (self->priv->cancel_editing_pixbuf);
#line 1818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self->priv->cancel_editing_pixbuf = NULL;
-#line 11705 "PhotoPage.c"
+#line 11699 "PhotoPage.c"
}
}
@@ -11717,7 +11711,7 @@ static GdkPixbuf* editing_host_page_real_get_bottom_left_trinket (EditingHostPag
result = NULL;
#line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 11716 "PhotoPage.c"
+#line 11710 "PhotoPage.c"
}
@@ -11726,7 +11720,7 @@ GdkPixbuf* editing_host_page_get_bottom_left_trinket (EditingHostPage* self, gin
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
#line 1822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_left_trinket (self, scale);
-#line 11725 "PhotoPage.c"
+#line 11719 "PhotoPage.c"
}
@@ -11736,7 +11730,7 @@ static GdkPixbuf* editing_host_page_real_get_top_left_trinket (EditingHostPage*
result = NULL;
#line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 11735 "PhotoPage.c"
+#line 11729 "PhotoPage.c"
}
@@ -11745,7 +11739,7 @@ GdkPixbuf* editing_host_page_get_top_left_trinket (EditingHostPage* self, gint s
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
#line 1826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_left_trinket (self, scale);
-#line 11744 "PhotoPage.c"
+#line 11738 "PhotoPage.c"
}
@@ -11755,7 +11749,7 @@ static GdkPixbuf* editing_host_page_real_get_top_right_trinket (EditingHostPage*
result = NULL;
#line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 11754 "PhotoPage.c"
+#line 11748 "PhotoPage.c"
}
@@ -11764,7 +11758,7 @@ GdkPixbuf* editing_host_page_get_top_right_trinket (EditingHostPage* self, gint
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
#line 1830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_right_trinket (self, scale);
-#line 11763 "PhotoPage.c"
+#line 11757 "PhotoPage.c"
}
@@ -11774,7 +11768,7 @@ static GdkPixbuf* editing_host_page_real_get_bottom_right_trinket (EditingHostPa
result = NULL;
#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 11773 "PhotoPage.c"
+#line 11767 "PhotoPage.c"
}
@@ -11783,30 +11777,30 @@ GdkPixbuf* editing_host_page_get_bottom_right_trinket (EditingHostPage* self, gi
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
#line 1834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_right_trinket (self, scale);
-#line 11782 "PhotoPage.c"
+#line 11776 "PhotoPage.c"
}
static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dimensions* ctx_dim) {
EditingHostPage * self;
- EditingToolsEditingTool* _tmp0_ = NULL;
+ EditingToolsEditingTool* _tmp0_;
gboolean _tmp3_ = FALSE;
- gboolean _tmp4_ = FALSE;
- cairo_t* _tmp23_ = NULL;
- Dimensions _tmp24_ = {0};
- ZoomState _tmp25_ = {0};
- gboolean _tmp26_ = FALSE;
+ gboolean _tmp4_;
+ cairo_t* _tmp22_;
+ Dimensions _tmp23_;
+ ZoomState _tmp24_ = {0};
+ gboolean _tmp25_;
GdkRectangle scaled_rect = {0};
- GdkRectangle _tmp27_ = {0};
+ GdkRectangle _tmp26_ = {0};
GdkPixbuf* trinket = NULL;
- GdkPixbuf* _tmp28_ = NULL;
- GdkPixbuf* _tmp29_ = NULL;
- GdkPixbuf* _tmp53_ = NULL;
- GdkPixbuf* _tmp54_ = NULL;
- GdkPixbuf* _tmp73_ = NULL;
- GdkPixbuf* _tmp74_ = NULL;
- GdkPixbuf* _tmp98_ = NULL;
- GdkPixbuf* _tmp99_ = NULL;
+ GdkPixbuf* _tmp27_;
+ GdkPixbuf* _tmp28_;
+ GdkPixbuf* _tmp52_;
+ GdkPixbuf* _tmp53_;
+ GdkPixbuf* _tmp72_;
+ GdkPixbuf* _tmp73_;
+ GdkPixbuf* _tmp97_;
+ GdkPixbuf* _tmp98_;
#line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11817,9 +11811,9 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
_tmp0_ = self->priv->current_tool;
#line 1839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_ != NULL) {
-#line 11816 "PhotoPage.c"
- EditingToolsEditingTool* _tmp1_ = NULL;
- cairo_t* _tmp2_ = NULL;
+#line 11810 "PhotoPage.c"
+ EditingToolsEditingTool* _tmp1_;
+ cairo_t* _tmp2_;
#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = self->priv->current_tool;
#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11828,44 +11822,43 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
editing_tools_editing_tool_paint (_tmp1_, _tmp2_);
#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 11827 "PhotoPage.c"
+#line 11821 "PhotoPage.c"
}
#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = self->priv->photo_missing;
#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp4_) {
-#line 11833 "PhotoPage.c"
- gboolean _tmp5_ = FALSE;
+#line 11827 "PhotoPage.c"
+ gboolean _tmp5_;
#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = editing_host_page_has_photo (self);
#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = _tmp5_;
-#line 11839 "PhotoPage.c"
+#line 11833 "PhotoPage.c"
} else {
#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = FALSE;
-#line 11843 "PhotoPage.c"
+#line 11837 "PhotoPage.c"
}
#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp3_) {
-#line 11847 "PhotoPage.c"
- cairo_t* _tmp6_ = NULL;
- cairo_t* _tmp7_ = NULL;
+#line 11841 "PhotoPage.c"
+ cairo_t* _tmp6_;
+ cairo_t* _tmp7_;
Dimensions _tmp8_ = {0};
- gint _tmp9_ = 0;
+ gint _tmp9_;
Dimensions _tmp10_ = {0};
- gint _tmp11_ = 0;
- cairo_t* _tmp12_ = NULL;
- cairo_t* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
- Photo* _tmp15_ = NULL;
- Photo* _tmp16_ = NULL;
- GFile* _tmp17_ = NULL;
- GFile* _tmp18_ = NULL;
- gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
- gchar* _tmp21_ = NULL;
- gchar* _tmp22_ = NULL;
+ gint _tmp11_;
+ cairo_t* _tmp12_;
+ cairo_t* _tmp13_;
+ Photo* _tmp14_;
+ Photo* _tmp15_;
+ GFile* _tmp16_;
+ GFile* _tmp17_;
+ gchar* _tmp18_;
+ gchar* _tmp19_;
+ gchar* _tmp20_;
+ gchar* _tmp21_;
#line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_ = ctx;
#line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11891,440 +11884,438 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
#line 1849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
cairo_paint (_tmp13_);
#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp14_ = _ ("Photo source file missing: %s");
-#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp15_ = editing_host_page_get_photo (self);
+ _tmp14_ = editing_host_page_get_photo (self);
#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp16_ = _tmp15_;
+ _tmp15_ = _tmp14_;
#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp17_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
+ _tmp16_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_SOURCE, MediaSource));
#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp18_ = _tmp17_;
+ _tmp17_ = _tmp16_;
#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp19_ = g_file_get_path (_tmp18_);
+ _tmp18_ = g_file_get_path (_tmp17_);
#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp20_ = _tmp19_;
+ _tmp19_ = _tmp18_;
#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp21_ = g_strdup_printf (_tmp14_, _tmp20_);
+ _tmp20_ = g_strdup_printf (_ ("Photo source file missing: %s"), _tmp19_);
#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp22_ = _tmp21_;
+ _tmp21_ = _tmp20_;
#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- editing_host_page_draw_message (self, _tmp22_);
+ editing_host_page_draw_message (self, _tmp21_);
#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _g_free0 (_tmp22_);
+ _g_free0 (_tmp21_);
#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _g_free0 (_tmp20_);
+ _g_free0 (_tmp19_);
#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _g_object_unref0 (_tmp18_);
+ _g_object_unref0 (_tmp17_);
#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _g_object_unref0 (_tmp16_);
+ _g_object_unref0 (_tmp15_);
#line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 11919 "PhotoPage.c"
+#line 11910 "PhotoPage.c"
}
#line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp23_ = ctx;
+ _tmp22_ = ctx;
#line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp24_ = *ctx_dim;
+ _tmp23_ = *ctx_dim;
#line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->paint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp23_, &_tmp24_);
+ SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->paint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp22_, &_tmp23_);
#line 1856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp25_);
+ single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp24_);
#line 1856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp26_ = zoom_state_is_default (&_tmp25_);
+ _tmp25_ = zoom_state_is_default (&_tmp24_);
#line 1856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- if (!_tmp26_) {
+ if (!_tmp25_) {
#line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 11935 "PhotoPage.c"
+#line 11926 "PhotoPage.c"
}
#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp27_);
+ single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp26_);
#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- scaled_rect = _tmp27_;
+ scaled_rect = _tmp26_;
#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp28_ = editing_host_page_get_bottom_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
+ _tmp27_ = editing_host_page_get_bottom_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- trinket = _tmp28_;
+ trinket = _tmp27_;
#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp29_ = trinket;
+ _tmp28_ = trinket;
#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- if (_tmp29_ != NULL) {
-#line 11949 "PhotoPage.c"
+ if (_tmp28_ != NULL) {
+#line 11940 "PhotoPage.c"
gint x = 0;
- GdkRectangle _tmp30_ = {0};
- gint _tmp31_ = 0;
+ GdkRectangle _tmp29_;
+ gint _tmp30_;
gint y = 0;
- GdkRectangle _tmp32_ = {0};
- gint _tmp33_ = 0;
- GdkRectangle _tmp34_ = {0};
- gint _tmp35_ = 0;
- GdkPixbuf* _tmp36_ = NULL;
- gint _tmp37_ = 0;
- gint _tmp38_ = 0;
- cairo_t* _tmp39_ = NULL;
- GdkPixbuf* _tmp40_ = NULL;
- gint _tmp41_ = 0;
- gint _tmp42_ = 0;
- cairo_t* _tmp43_ = NULL;
- gint _tmp44_ = 0;
- gint _tmp45_ = 0;
- GdkPixbuf* _tmp46_ = NULL;
- gint _tmp47_ = 0;
- gint _tmp48_ = 0;
- GdkPixbuf* _tmp49_ = NULL;
- gint _tmp50_ = 0;
- gint _tmp51_ = 0;
- cairo_t* _tmp52_ = NULL;
+ GdkRectangle _tmp31_;
+ gint _tmp32_;
+ GdkRectangle _tmp33_;
+ gint _tmp34_;
+ GdkPixbuf* _tmp35_;
+ gint _tmp36_;
+ gint _tmp37_;
+ cairo_t* _tmp38_;
+ GdkPixbuf* _tmp39_;
+ gint _tmp40_;
+ gint _tmp41_;
+ cairo_t* _tmp42_;
+ gint _tmp43_;
+ gint _tmp44_;
+ GdkPixbuf* _tmp45_;
+ gint _tmp46_;
+ gint _tmp47_;
+ GdkPixbuf* _tmp48_;
+ gint _tmp49_;
+ gint _tmp50_;
+ cairo_t* _tmp51_;
#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp30_ = scaled_rect;
+ _tmp29_ = scaled_rect;
#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp31_ = _tmp30_.x;
+ _tmp30_ = _tmp29_.x;
#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- x = _tmp31_ + EDITING_HOST_PAGE_TRINKET_PADDING;
+ x = _tmp30_ + EDITING_HOST_PAGE_TRINKET_PADDING;
#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp32_ = scaled_rect;
+ _tmp31_ = scaled_rect;
#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp33_ = _tmp32_.y;
+ _tmp32_ = _tmp31_.y;
#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp34_ = scaled_rect;
+ _tmp33_ = scaled_rect;
#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp35_ = _tmp34_.height;
+ _tmp34_ = _tmp33_.height;
#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp36_ = trinket;
+ _tmp35_ = trinket;
#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp37_ = gdk_pixbuf_get_height (_tmp36_);
+ _tmp36_ = gdk_pixbuf_get_height (_tmp35_);
#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp38_ = _tmp37_;
+ _tmp37_ = _tmp36_;
#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- y = ((_tmp33_ + _tmp35_) - _tmp38_) - EDITING_HOST_PAGE_TRINKET_PADDING;
+ y = ((_tmp32_ + _tmp34_) - _tmp37_) - EDITING_HOST_PAGE_TRINKET_PADDING;
#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp39_ = ctx;
+ _tmp38_ = ctx;
#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp40_ = trinket;
+ _tmp39_ = trinket;
#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp41_ = x;
+ _tmp40_ = x;
#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp42_ = y;
+ _tmp41_ = y;
#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- gdk_cairo_set_source_pixbuf (_tmp39_, _tmp40_, (gdouble) _tmp41_, (gdouble) _tmp42_);
+ gdk_cairo_set_source_pixbuf (_tmp38_, _tmp39_, (gdouble) _tmp40_, (gdouble) _tmp41_);
#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp43_ = ctx;
+ _tmp42_ = ctx;
#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp44_ = x;
+ _tmp43_ = x;
#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp45_ = y;
+ _tmp44_ = y;
#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp46_ = trinket;
+ _tmp45_ = trinket;
#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp47_ = gdk_pixbuf_get_width (_tmp46_);
+ _tmp46_ = gdk_pixbuf_get_width (_tmp45_);
#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp48_ = _tmp47_;
+ _tmp47_ = _tmp46_;
#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp49_ = trinket;
+ _tmp48_ = trinket;
#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp50_ = gdk_pixbuf_get_height (_tmp49_);
+ _tmp49_ = gdk_pixbuf_get_height (_tmp48_);
#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp51_ = _tmp50_;
+ _tmp50_ = _tmp49_;
#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- cairo_rectangle (_tmp43_, (gdouble) _tmp44_, (gdouble) _tmp45_, (gdouble) _tmp48_, (gdouble) _tmp51_);
+ cairo_rectangle (_tmp42_, (gdouble) _tmp43_, (gdouble) _tmp44_, (gdouble) _tmp47_, (gdouble) _tmp50_);
#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp52_ = ctx;
+ _tmp51_ = ctx;
#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- cairo_fill (_tmp52_);
-#line 12031 "PhotoPage.c"
+ cairo_fill (_tmp51_);
+#line 12022 "PhotoPage.c"
}
#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp53_ = editing_host_page_get_top_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
+ _tmp52_ = editing_host_page_get_top_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (trinket);
#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- trinket = _tmp53_;
+ trinket = _tmp52_;
#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp54_ = trinket;
+ _tmp53_ = trinket;
#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- if (_tmp54_ != NULL) {
-#line 12043 "PhotoPage.c"
+ if (_tmp53_ != NULL) {
+#line 12034 "PhotoPage.c"
gint x = 0;
- GdkRectangle _tmp55_ = {0};
- gint _tmp56_ = 0;
+ GdkRectangle _tmp54_;
+ gint _tmp55_;
gint y = 0;
- GdkRectangle _tmp57_ = {0};
- gint _tmp58_ = 0;
- cairo_t* _tmp59_ = NULL;
- GdkPixbuf* _tmp60_ = NULL;
- gint _tmp61_ = 0;
- gint _tmp62_ = 0;
- cairo_t* _tmp63_ = NULL;
- gint _tmp64_ = 0;
- gint _tmp65_ = 0;
- GdkPixbuf* _tmp66_ = NULL;
- gint _tmp67_ = 0;
- gint _tmp68_ = 0;
- GdkPixbuf* _tmp69_ = NULL;
- gint _tmp70_ = 0;
- gint _tmp71_ = 0;
- cairo_t* _tmp72_ = NULL;
+ GdkRectangle _tmp56_;
+ gint _tmp57_;
+ cairo_t* _tmp58_;
+ GdkPixbuf* _tmp59_;
+ gint _tmp60_;
+ gint _tmp61_;
+ cairo_t* _tmp62_;
+ gint _tmp63_;
+ gint _tmp64_;
+ GdkPixbuf* _tmp65_;
+ gint _tmp66_;
+ gint _tmp67_;
+ GdkPixbuf* _tmp68_;
+ gint _tmp69_;
+ gint _tmp70_;
+ cairo_t* _tmp71_;
#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp55_ = scaled_rect;
+ _tmp54_ = scaled_rect;
#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp56_ = _tmp55_.x;
+ _tmp55_ = _tmp54_.x;
#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- x = _tmp56_ + EDITING_HOST_PAGE_TRINKET_PADDING;
+ x = _tmp55_ + EDITING_HOST_PAGE_TRINKET_PADDING;
#line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp57_ = scaled_rect;
+ _tmp56_ = scaled_rect;
#line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp58_ = _tmp57_.y;
+ _tmp57_ = _tmp56_.y;
#line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- y = _tmp58_ + EDITING_HOST_PAGE_TRINKET_PADDING;
+ y = _tmp57_ + EDITING_HOST_PAGE_TRINKET_PADDING;
#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp59_ = ctx;
+ _tmp58_ = ctx;
#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp60_ = trinket;
+ _tmp59_ = trinket;
#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp61_ = x;
+ _tmp60_ = x;
#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp62_ = y;
+ _tmp61_ = y;
#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- gdk_cairo_set_source_pixbuf (_tmp59_, _tmp60_, (gdouble) _tmp61_, (gdouble) _tmp62_);
+ gdk_cairo_set_source_pixbuf (_tmp58_, _tmp59_, (gdouble) _tmp60_, (gdouble) _tmp61_);
#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp63_ = ctx;
+ _tmp62_ = ctx;
#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp64_ = x;
+ _tmp63_ = x;
#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp65_ = y;
+ _tmp64_ = y;
#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp66_ = trinket;
+ _tmp65_ = trinket;
#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp67_ = gdk_pixbuf_get_width (_tmp66_);
+ _tmp66_ = gdk_pixbuf_get_width (_tmp65_);
#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp68_ = _tmp67_;
+ _tmp67_ = _tmp66_;
#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp69_ = trinket;
+ _tmp68_ = trinket;
#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp70_ = gdk_pixbuf_get_height (_tmp69_);
+ _tmp69_ = gdk_pixbuf_get_height (_tmp68_);
#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp71_ = _tmp70_;
+ _tmp70_ = _tmp69_;
#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- cairo_rectangle (_tmp63_, (gdouble) _tmp64_, (gdouble) _tmp65_, (gdouble) _tmp68_, (gdouble) _tmp71_);
+ cairo_rectangle (_tmp62_, (gdouble) _tmp63_, (gdouble) _tmp64_, (gdouble) _tmp67_, (gdouble) _tmp70_);
#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp72_ = ctx;
+ _tmp71_ = ctx;
#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- cairo_fill (_tmp72_);
-#line 12110 "PhotoPage.c"
+ cairo_fill (_tmp71_);
+#line 12101 "PhotoPage.c"
}
#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp73_ = editing_host_page_get_top_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
+ _tmp72_ = editing_host_page_get_top_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (trinket);
#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- trinket = _tmp73_;
+ trinket = _tmp72_;
#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp74_ = trinket;
+ _tmp73_ = trinket;
#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- if (_tmp74_ != NULL) {
-#line 12122 "PhotoPage.c"
+ if (_tmp73_ != NULL) {
+#line 12113 "PhotoPage.c"
gint x = 0;
- GdkRectangle _tmp75_ = {0};
- gint _tmp76_ = 0;
- GdkRectangle _tmp77_ = {0};
- gint _tmp78_ = 0;
- GdkPixbuf* _tmp79_ = NULL;
- gint _tmp80_ = 0;
- gint _tmp81_ = 0;
+ GdkRectangle _tmp74_;
+ gint _tmp75_;
+ GdkRectangle _tmp76_;
+ gint _tmp77_;
+ GdkPixbuf* _tmp78_;
+ gint _tmp79_;
+ gint _tmp80_;
gint y = 0;
- GdkRectangle _tmp82_ = {0};
- gint _tmp83_ = 0;
- cairo_t* _tmp84_ = NULL;
- GdkPixbuf* _tmp85_ = NULL;
- gint _tmp86_ = 0;
- gint _tmp87_ = 0;
- cairo_t* _tmp88_ = NULL;
- gint _tmp89_ = 0;
- gint _tmp90_ = 0;
- GdkPixbuf* _tmp91_ = NULL;
- gint _tmp92_ = 0;
- gint _tmp93_ = 0;
- GdkPixbuf* _tmp94_ = NULL;
- gint _tmp95_ = 0;
- gint _tmp96_ = 0;
- cairo_t* _tmp97_ = NULL;
+ GdkRectangle _tmp81_;
+ gint _tmp82_;
+ cairo_t* _tmp83_;
+ GdkPixbuf* _tmp84_;
+ gint _tmp85_;
+ gint _tmp86_;
+ cairo_t* _tmp87_;
+ gint _tmp88_;
+ gint _tmp89_;
+ GdkPixbuf* _tmp90_;
+ gint _tmp91_;
+ gint _tmp92_;
+ GdkPixbuf* _tmp93_;
+ gint _tmp94_;
+ gint _tmp95_;
+ cairo_t* _tmp96_;
#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp75_ = scaled_rect;
+ _tmp74_ = scaled_rect;
#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp76_ = _tmp75_.x;
+ _tmp75_ = _tmp74_.x;
#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp77_ = scaled_rect;
+ _tmp76_ = scaled_rect;
#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp78_ = _tmp77_.width;
+ _tmp77_ = _tmp76_.width;
#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp79_ = trinket;
+ _tmp78_ = trinket;
#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp80_ = gdk_pixbuf_get_width (_tmp79_);
+ _tmp79_ = gdk_pixbuf_get_width (_tmp78_);
#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp81_ = _tmp80_;
+ _tmp80_ = _tmp79_;
#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- x = ((_tmp76_ + _tmp78_) - _tmp81_) - EDITING_HOST_PAGE_TRINKET_PADDING;
+ x = ((_tmp75_ + _tmp77_) - _tmp80_) - EDITING_HOST_PAGE_TRINKET_PADDING;
#line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp82_ = scaled_rect;
+ _tmp81_ = scaled_rect;
#line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp83_ = _tmp82_.y;
+ _tmp82_ = _tmp81_.y;
#line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- y = _tmp83_ + EDITING_HOST_PAGE_TRINKET_PADDING;
+ y = _tmp82_ + EDITING_HOST_PAGE_TRINKET_PADDING;
#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp84_ = ctx;
+ _tmp83_ = ctx;
#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp85_ = trinket;
+ _tmp84_ = trinket;
#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp86_ = x;
+ _tmp85_ = x;
#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp87_ = y;
+ _tmp86_ = y;
#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- gdk_cairo_set_source_pixbuf (_tmp84_, _tmp85_, (gdouble) _tmp86_, (gdouble) _tmp87_);
+ gdk_cairo_set_source_pixbuf (_tmp83_, _tmp84_, (gdouble) _tmp85_, (gdouble) _tmp86_);
#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp88_ = ctx;
+ _tmp87_ = ctx;
#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp89_ = x;
+ _tmp88_ = x;
#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp90_ = y;
+ _tmp89_ = y;
#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp91_ = trinket;
+ _tmp90_ = trinket;
#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp92_ = gdk_pixbuf_get_width (_tmp91_);
+ _tmp91_ = gdk_pixbuf_get_width (_tmp90_);
#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp93_ = _tmp92_;
+ _tmp92_ = _tmp91_;
#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp94_ = trinket;
+ _tmp93_ = trinket;
#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp95_ = gdk_pixbuf_get_height (_tmp94_);
+ _tmp94_ = gdk_pixbuf_get_height (_tmp93_);
#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp96_ = _tmp95_;
+ _tmp95_ = _tmp94_;
#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- cairo_rectangle (_tmp88_, (gdouble) _tmp89_, (gdouble) _tmp90_, (gdouble) _tmp93_, (gdouble) _tmp96_);
+ cairo_rectangle (_tmp87_, (gdouble) _tmp88_, (gdouble) _tmp89_, (gdouble) _tmp92_, (gdouble) _tmp95_);
#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp97_ = ctx;
+ _tmp96_ = ctx;
#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- cairo_fill (_tmp97_);
-#line 12204 "PhotoPage.c"
+ cairo_fill (_tmp96_);
+#line 12195 "PhotoPage.c"
}
#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp98_ = editing_host_page_get_bottom_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
+ _tmp97_ = editing_host_page_get_bottom_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (trinket);
#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- trinket = _tmp98_;
+ trinket = _tmp97_;
#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp99_ = trinket;
+ _tmp98_ = trinket;
#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- if (_tmp99_ != NULL) {
-#line 12216 "PhotoPage.c"
+ if (_tmp98_ != NULL) {
+#line 12207 "PhotoPage.c"
gint x = 0;
- GdkRectangle _tmp100_ = {0};
- gint _tmp101_ = 0;
- GdkRectangle _tmp102_ = {0};
- gint _tmp103_ = 0;
- GdkPixbuf* _tmp104_ = NULL;
- gint _tmp105_ = 0;
- gint _tmp106_ = 0;
+ GdkRectangle _tmp99_;
+ gint _tmp100_;
+ GdkRectangle _tmp101_;
+ gint _tmp102_;
+ GdkPixbuf* _tmp103_;
+ gint _tmp104_;
+ gint _tmp105_;
gint y = 0;
- GdkRectangle _tmp107_ = {0};
- gint _tmp108_ = 0;
- GdkRectangle _tmp109_ = {0};
- gint _tmp110_ = 0;
- GdkPixbuf* _tmp111_ = NULL;
- gint _tmp112_ = 0;
- gint _tmp113_ = 0;
- cairo_t* _tmp114_ = NULL;
- GdkPixbuf* _tmp115_ = NULL;
- gint _tmp116_ = 0;
- gint _tmp117_ = 0;
- cairo_t* _tmp118_ = NULL;
- gint _tmp119_ = 0;
- gint _tmp120_ = 0;
- GdkPixbuf* _tmp121_ = NULL;
- gint _tmp122_ = 0;
- gint _tmp123_ = 0;
- GdkPixbuf* _tmp124_ = NULL;
- gint _tmp125_ = 0;
- gint _tmp126_ = 0;
- cairo_t* _tmp127_ = NULL;
+ GdkRectangle _tmp106_;
+ gint _tmp107_;
+ GdkRectangle _tmp108_;
+ gint _tmp109_;
+ GdkPixbuf* _tmp110_;
+ gint _tmp111_;
+ gint _tmp112_;
+ cairo_t* _tmp113_;
+ GdkPixbuf* _tmp114_;
+ gint _tmp115_;
+ gint _tmp116_;
+ cairo_t* _tmp117_;
+ gint _tmp118_;
+ gint _tmp119_;
+ GdkPixbuf* _tmp120_;
+ gint _tmp121_;
+ gint _tmp122_;
+ GdkPixbuf* _tmp123_;
+ gint _tmp124_;
+ gint _tmp125_;
+ cairo_t* _tmp126_;
#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp100_ = scaled_rect;
+ _tmp99_ = scaled_rect;
#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp101_ = _tmp100_.x;
+ _tmp100_ = _tmp99_.x;
#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp102_ = scaled_rect;
+ _tmp101_ = scaled_rect;
#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp103_ = _tmp102_.width;
+ _tmp102_ = _tmp101_.width;
#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp104_ = trinket;
+ _tmp103_ = trinket;
#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp105_ = gdk_pixbuf_get_width (_tmp104_);
+ _tmp104_ = gdk_pixbuf_get_width (_tmp103_);
#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp106_ = _tmp105_;
+ _tmp105_ = _tmp104_;
#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- x = ((_tmp101_ + _tmp103_) - _tmp106_) - EDITING_HOST_PAGE_TRINKET_PADDING;
+ x = ((_tmp100_ + _tmp102_) - _tmp105_) - EDITING_HOST_PAGE_TRINKET_PADDING;
#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp107_ = scaled_rect;
+ _tmp106_ = scaled_rect;
#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp108_ = _tmp107_.y;
+ _tmp107_ = _tmp106_.y;
#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp109_ = scaled_rect;
+ _tmp108_ = scaled_rect;
#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp110_ = _tmp109_.height;
+ _tmp109_ = _tmp108_.height;
#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp111_ = trinket;
+ _tmp110_ = trinket;
#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp112_ = gdk_pixbuf_get_height (_tmp111_);
+ _tmp111_ = gdk_pixbuf_get_height (_tmp110_);
#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp113_ = _tmp112_;
+ _tmp112_ = _tmp111_;
#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- y = ((_tmp108_ + _tmp110_) - _tmp113_) - EDITING_HOST_PAGE_TRINKET_PADDING;
+ y = ((_tmp107_ + _tmp109_) - _tmp112_) - EDITING_HOST_PAGE_TRINKET_PADDING;
#line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp114_ = ctx;
+ _tmp113_ = ctx;
#line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp115_ = trinket;
+ _tmp114_ = trinket;
#line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp116_ = x;
+ _tmp115_ = x;
#line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp117_ = y;
+ _tmp116_ = y;
#line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- gdk_cairo_set_source_pixbuf (_tmp114_, _tmp115_, (gdouble) _tmp116_, (gdouble) _tmp117_);
+ gdk_cairo_set_source_pixbuf (_tmp113_, _tmp114_, (gdouble) _tmp115_, (gdouble) _tmp116_);
#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp118_ = ctx;
+ _tmp117_ = ctx;
#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp119_ = x;
+ _tmp118_ = x;
#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp120_ = y;
+ _tmp119_ = y;
#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp121_ = trinket;
+ _tmp120_ = trinket;
#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp122_ = gdk_pixbuf_get_width (_tmp121_);
+ _tmp121_ = gdk_pixbuf_get_width (_tmp120_);
#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp123_ = _tmp122_;
+ _tmp122_ = _tmp121_;
#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp124_ = trinket;
+ _tmp123_ = trinket;
#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp125_ = gdk_pixbuf_get_height (_tmp124_);
+ _tmp124_ = gdk_pixbuf_get_height (_tmp123_);
#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp126_ = _tmp125_;
+ _tmp125_ = _tmp124_;
#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- cairo_rectangle (_tmp118_, (gdouble) _tmp119_, (gdouble) _tmp120_, (gdouble) _tmp123_, (gdouble) _tmp126_);
+ cairo_rectangle (_tmp117_, (gdouble) _tmp118_, (gdouble) _tmp119_, (gdouble) _tmp122_, (gdouble) _tmp125_);
#line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp127_ = ctx;
+ _tmp126_ = ctx;
#line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- cairo_fill (_tmp127_);
-#line 12313 "PhotoPage.c"
+ cairo_fill (_tmp126_);
+#line 12304 "PhotoPage.c"
}
#line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (trinket);
-#line 12317 "PhotoPage.c"
+#line 12308 "PhotoPage.c"
}
gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* photo) {
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 1899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
#line 1899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12335,24 +12326,24 @@ gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* ph
result = !_tmp0_;
#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 12334 "PhotoPage.c"
+#line 12325 "PhotoPage.c"
}
static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation, const gchar* name, const gchar* description) {
Dimensions _tmp0_ = {0};
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
RotateSingleCommand* command = NULL;
- Photo* _tmp2_ = NULL;
- Photo* _tmp3_ = NULL;
- Rotation _tmp4_ = 0;
- const gchar* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- RotateSingleCommand* _tmp7_ = NULL;
- RotateSingleCommand* _tmp8_ = NULL;
- CommandManager* _tmp9_ = NULL;
- CommandManager* _tmp10_ = NULL;
- RotateSingleCommand* _tmp11_ = NULL;
+ Photo* _tmp2_;
+ Photo* _tmp3_;
+ Rotation _tmp4_;
+ const gchar* _tmp5_;
+ const gchar* _tmp6_;
+ RotateSingleCommand* _tmp7_;
+ RotateSingleCommand* _tmp8_;
+ CommandManager* _tmp9_;
+ CommandManager* _tmp10_;
+ RotateSingleCommand* _tmp11_;
#line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12371,7 +12362,7 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation,
if (!_tmp1_) {
#line 1909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 12370 "PhotoPage.c"
+#line 12361 "PhotoPage.c"
}
#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = editing_host_page_get_photo (self);
@@ -12403,7 +12394,7 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation,
_command_manager_unref0 (_tmp10_);
#line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (command);
-#line 12402 "PhotoPage.c"
+#line 12393 "PhotoPage.c"
}
@@ -12412,7 +12403,7 @@ void editing_host_page_on_rotate_clockwise (EditingHostPage* self) {
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_rotate (self, ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP);
-#line 12411 "PhotoPage.c"
+#line 12402 "PhotoPage.c"
}
@@ -12421,7 +12412,7 @@ void editing_host_page_on_rotate_counterclockwise (EditingHostPage* self) {
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_rotate (self, ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP);
-#line 12420 "PhotoPage.c"
+#line 12411 "PhotoPage.c"
}
@@ -12430,7 +12421,7 @@ void editing_host_page_on_flip_horizontally (EditingHostPage* self) {
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_rotate (self, ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "");
-#line 12429 "PhotoPage.c"
+#line 12420 "PhotoPage.c"
}
@@ -12439,26 +12430,26 @@ void editing_host_page_on_flip_vertically (EditingHostPage* self) {
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_rotate (self, ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "");
-#line 12438 "PhotoPage.c"
+#line 12429 "PhotoPage.c"
}
void editing_host_page_on_revert (EditingHostPage* self) {
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
Dimensions _tmp1_ = {0};
- gboolean _tmp2_ = FALSE;
- Photo* _tmp3_ = NULL;
- Photo* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- gboolean _tmp6_ = FALSE;
+ gboolean _tmp2_;
+ Photo* _tmp3_;
+ Photo* _tmp4_;
+ gboolean _tmp5_;
+ gboolean _tmp6_;
RevertSingleCommand* command = NULL;
- Photo* _tmp17_ = NULL;
- Photo* _tmp18_ = NULL;
- RevertSingleCommand* _tmp19_ = NULL;
- RevertSingleCommand* _tmp20_ = NULL;
- CommandManager* _tmp21_ = NULL;
- CommandManager* _tmp22_ = NULL;
- RevertSingleCommand* _tmp23_ = NULL;
+ Photo* _tmp17_;
+ Photo* _tmp18_;
+ RevertSingleCommand* _tmp19_;
+ RevertSingleCommand* _tmp20_;
+ CommandManager* _tmp21_;
+ CommandManager* _tmp22_;
+ RevertSingleCommand* _tmp23_;
#line 1932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12467,7 +12458,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
if (_tmp0_) {
#line 1934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 12466 "PhotoPage.c"
+#line 12457 "PhotoPage.c"
}
#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
dimensions_init (&_tmp1_, 0, 0);
@@ -12479,7 +12470,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
if (!_tmp2_) {
#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 12478 "PhotoPage.c"
+#line 12469 "PhotoPage.c"
}
#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = editing_host_page_get_photo (self);
@@ -12493,17 +12484,17 @@ void editing_host_page_on_revert (EditingHostPage* self) {
_g_object_unref0 (_tmp4_);
#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp6_) {
-#line 12492 "PhotoPage.c"
- AppWindow* _tmp7_ = NULL;
- AppWindow* _tmp8_ = NULL;
- ViewCollection* _tmp9_ = NULL;
- ViewCollection* _tmp10_ = NULL;
- GeeCollection* _tmp11_ = NULL;
- GeeCollection* _tmp12_ = NULL;
- gboolean _tmp13_ = FALSE;
- gboolean _tmp14_ = FALSE;
- Photo* _tmp15_ = NULL;
- Photo* _tmp16_ = NULL;
+#line 12483 "PhotoPage.c"
+ AppWindow* _tmp7_;
+ AppWindow* _tmp8_;
+ ViewCollection* _tmp9_;
+ ViewCollection* _tmp10_;
+ GeeCollection* _tmp11_;
+ GeeCollection* _tmp12_;
+ gboolean _tmp13_;
+ gboolean _tmp14_;
+ Photo* _tmp15_;
+ Photo* _tmp16_;
#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp7_ = app_window_get_instance ();
#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12530,7 +12521,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
if (_tmp14_) {
#line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 12529 "PhotoPage.c"
+#line 12520 "PhotoPage.c"
}
#line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp15_ = editing_host_page_get_photo (self);
@@ -12540,7 +12531,7 @@ void editing_host_page_on_revert (EditingHostPage* self) {
photo_revert_to_master (_tmp16_, TRUE);
#line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp16_);
-#line 12539 "PhotoPage.c"
+#line 12530 "PhotoPage.c"
}
#line 1950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
@@ -12570,32 +12561,32 @@ void editing_host_page_on_revert (EditingHostPage* self) {
_command_manager_unref0 (_tmp22_);
#line 1932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (command);
-#line 12569 "PhotoPage.c"
+#line 12560 "PhotoPage.c"
}
void editing_host_page_on_edit_title (EditingHostPage* self) {
LibraryPhoto* item = NULL;
- Photo* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ Photo* _tmp0_;
+ Photo* _tmp1_;
+ gboolean _tmp2_;
EditTitleDialog* edit_title_dialog = NULL;
- LibraryPhoto* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- EditTitleDialog* _tmp8_ = NULL;
- EditTitleDialog* _tmp9_ = NULL;
+ LibraryPhoto* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ EditTitleDialog* _tmp8_;
+ EditTitleDialog* _tmp9_;
gchar* new_title = NULL;
- EditTitleDialog* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
+ EditTitleDialog* _tmp10_;
+ gchar* _tmp11_;
+ const gchar* _tmp12_;
EditTitleCommand* command = NULL;
- LibraryPhoto* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
- EditTitleCommand* _tmp15_ = NULL;
- CommandManager* _tmp16_ = NULL;
- CommandManager* _tmp17_ = NULL;
- EditTitleCommand* _tmp18_ = NULL;
+ LibraryPhoto* _tmp13_;
+ const gchar* _tmp14_;
+ EditTitleCommand* _tmp15_;
+ CommandManager* _tmp16_;
+ CommandManager* _tmp17_;
+ EditTitleCommand* _tmp18_;
#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12608,9 +12599,9 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
_g_object_unref0 (_tmp1_);
#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp2_) {
-#line 12607 "PhotoPage.c"
- Photo* _tmp3_ = NULL;
- LibraryPhoto* _tmp4_ = NULL;
+#line 12598 "PhotoPage.c"
+ Photo* _tmp3_;
+ LibraryPhoto* _tmp4_;
#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = editing_host_page_get_photo (self);
#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12619,19 +12610,19 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
if (_tmp4_ == NULL) {
#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp3_);
-#line 12618 "PhotoPage.c"
+#line 12609 "PhotoPage.c"
}
#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (item);
#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
item = _tmp4_;
-#line 12624 "PhotoPage.c"
+#line 12615 "PhotoPage.c"
} else {
#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (item);
#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 12630 "PhotoPage.c"
+#line 12621 "PhotoPage.c"
}
#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = item;
@@ -12665,7 +12656,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
_g_object_unref0 (item);
#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 12664 "PhotoPage.c"
+#line 12655 "PhotoPage.c"
}
#line 1970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp13_ = item;
@@ -12693,32 +12684,32 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
_text_entry_dialog_mediator_unref0 (edit_title_dialog);
#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (item);
-#line 12692 "PhotoPage.c"
+#line 12683 "PhotoPage.c"
}
void editing_host_page_on_edit_comment (EditingHostPage* self) {
LibraryPhoto* item = NULL;
- Photo* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ Photo* _tmp0_;
+ Photo* _tmp1_;
+ gboolean _tmp2_;
EditCommentDialog* edit_comment_dialog = NULL;
- LibraryPhoto* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- EditCommentDialog* _tmp8_ = NULL;
- EditCommentDialog* _tmp9_ = NULL;
+ LibraryPhoto* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ EditCommentDialog* _tmp8_;
+ EditCommentDialog* _tmp9_;
gchar* new_comment = NULL;
- EditCommentDialog* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
+ EditCommentDialog* _tmp10_;
+ gchar* _tmp11_;
+ const gchar* _tmp12_;
EditCommentCommand* command = NULL;
- LibraryPhoto* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
- EditCommentCommand* _tmp15_ = NULL;
- CommandManager* _tmp16_ = NULL;
- CommandManager* _tmp17_ = NULL;
- EditCommentCommand* _tmp18_ = NULL;
+ LibraryPhoto* _tmp13_;
+ const gchar* _tmp14_;
+ EditCommentCommand* _tmp15_;
+ CommandManager* _tmp16_;
+ CommandManager* _tmp17_;
+ EditCommentCommand* _tmp18_;
#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12731,9 +12722,9 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
_g_object_unref0 (_tmp1_);
#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp2_) {
-#line 12730 "PhotoPage.c"
- Photo* _tmp3_ = NULL;
- LibraryPhoto* _tmp4_ = NULL;
+#line 12721 "PhotoPage.c"
+ Photo* _tmp3_;
+ LibraryPhoto* _tmp4_;
#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = editing_host_page_get_photo (self);
#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12742,19 +12733,19 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
if (_tmp4_ == NULL) {
#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp3_);
-#line 12741 "PhotoPage.c"
+#line 12732 "PhotoPage.c"
}
#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (item);
#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
item = _tmp4_;
-#line 12747 "PhotoPage.c"
+#line 12738 "PhotoPage.c"
} else {
#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (item);
#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 12753 "PhotoPage.c"
+#line 12744 "PhotoPage.c"
}
#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = item;
@@ -12788,7 +12779,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
_g_object_unref0 (item);
#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 12787 "PhotoPage.c"
+#line 12778 "PhotoPage.c"
}
#line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp13_ = item;
@@ -12816,25 +12807,25 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (item);
-#line 12815 "PhotoPage.c"
+#line 12806 "PhotoPage.c"
}
void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
AdjustDateTimeDialog* dialog = NULL;
- Photo* _tmp1_ = NULL;
- Photo* _tmp2_ = NULL;
- AdjustDateTimeDialog* _tmp3_ = NULL;
- AdjustDateTimeDialog* _tmp4_ = NULL;
+ Photo* _tmp1_;
+ Photo* _tmp2_;
+ AdjustDateTimeDialog* _tmp3_;
+ AdjustDateTimeDialog* _tmp4_;
gint64 time_shift = 0LL;
gboolean keep_relativity = FALSE;
gboolean modify_originals = FALSE;
- AdjustDateTimeDialog* _tmp5_ = NULL;
+ AdjustDateTimeDialog* _tmp5_;
gint64 _tmp6_ = 0LL;
gboolean _tmp7_ = FALSE;
gboolean _tmp8_ = FALSE;
- gboolean _tmp9_ = FALSE;
+ gboolean _tmp9_;
#line 1990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12843,7 +12834,7 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
if (!_tmp0_) {
#line 1992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 12842 "PhotoPage.c"
+#line 12833 "PhotoPage.c"
}
#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = editing_host_page_get_photo (self);
@@ -12871,21 +12862,21 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
modify_originals = _tmp8_;
#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp9_) {
-#line 12870 "PhotoPage.c"
- ViewCollection* _tmp10_ = NULL;
- ViewCollection* _tmp11_ = NULL;
- GeeList* _tmp12_ = NULL;
- GeeList* _tmp13_ = NULL;
+#line 12861 "PhotoPage.c"
+ ViewCollection* _tmp10_;
+ ViewCollection* _tmp11_;
+ GeeList* _tmp12_;
+ GeeList* _tmp13_;
AdjustDateTimePhotoCommand* command = NULL;
- Photo* _tmp14_ = NULL;
- Photo* _tmp15_ = NULL;
- gint64 _tmp16_ = 0LL;
- gboolean _tmp17_ = FALSE;
- AdjustDateTimePhotoCommand* _tmp18_ = NULL;
- AdjustDateTimePhotoCommand* _tmp19_ = NULL;
- CommandManager* _tmp20_ = NULL;
- CommandManager* _tmp21_ = NULL;
- AdjustDateTimePhotoCommand* _tmp22_ = NULL;
+ Photo* _tmp14_;
+ Photo* _tmp15_;
+ gint64 _tmp16_;
+ gboolean _tmp17_;
+ AdjustDateTimePhotoCommand* _tmp18_;
+ AdjustDateTimePhotoCommand* _tmp19_;
+ CommandManager* _tmp20_;
+ CommandManager* _tmp21_;
+ AdjustDateTimePhotoCommand* _tmp22_;
#line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12926,31 +12917,31 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
_command_manager_unref0 (_tmp21_);
#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (command);
-#line 12925 "PhotoPage.c"
+#line 12916 "PhotoPage.c"
}
#line 1990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (dialog);
-#line 12929 "PhotoPage.c"
+#line 12920 "PhotoPage.c"
}
void editing_host_page_on_set_background (EditingHostPage* self) {
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 2007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = editing_host_page_has_photo (self);
#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
-#line 12941 "PhotoPage.c"
+#line 12932 "PhotoPage.c"
SetBackgroundPhotoDialog* dialog = NULL;
- SetBackgroundPhotoDialog* _tmp1_ = NULL;
+ SetBackgroundPhotoDialog* _tmp1_;
gboolean desktop = FALSE;
gboolean screensaver = FALSE;
- SetBackgroundPhotoDialog* _tmp2_ = NULL;
+ SetBackgroundPhotoDialog* _tmp2_;
gboolean _tmp3_ = FALSE;
gboolean _tmp4_ = FALSE;
- gboolean _tmp5_ = FALSE;
+ gboolean _tmp5_;
#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = set_background_photo_dialog_new ();
#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12967,15 +12958,15 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
screensaver = _tmp4_;
#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp5_) {
-#line 12966 "PhotoPage.c"
- AppWindow* _tmp6_ = NULL;
- AppWindow* _tmp7_ = NULL;
- Photo* _tmp8_ = NULL;
- Photo* _tmp9_ = NULL;
- gboolean _tmp10_ = FALSE;
- gboolean _tmp11_ = FALSE;
- AppWindow* _tmp12_ = NULL;
- AppWindow* _tmp13_ = NULL;
+#line 12957 "PhotoPage.c"
+ AppWindow* _tmp6_;
+ AppWindow* _tmp7_;
+ Photo* _tmp8_;
+ Photo* _tmp9_;
+ gboolean _tmp10_;
+ gboolean _tmp11_;
+ AppWindow* _tmp12_;
+ AppWindow* _tmp13_;
#line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_ = app_window_get_instance ();
#line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13004,11 +12995,11 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow));
#line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp13_);
-#line 13003 "PhotoPage.c"
+#line 12994 "PhotoPage.c"
}
#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (dialog);
-#line 13007 "PhotoPage.c"
+#line 12998 "PhotoPage.c"
}
}
@@ -13016,22 +13007,22 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
static void _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
#line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 13015 "PhotoPage.c"
+#line 13006 "PhotoPage.c"
}
static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey* event) {
EditingHostPage * self;
gboolean result = FALSE;
- GtkToolButton* _tmp0_ = NULL;
- GtkToolButton* _tmp1_ = NULL;
- GtkToolButton* _tmp2_ = NULL;
- GtkToolButton* _tmp3_ = NULL;
- guint _tmp4_ = 0U;
- GtkToolButton* _tmp5_ = NULL;
- EditingToolsEditingTool* _tmp6_ = NULL;
- GdkEventKey* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
+ GtkToolButton* _tmp0_;
+ GtkToolButton* _tmp1_;
+ GtkToolButton* _tmp2_;
+ GtkToolButton* _tmp3_;
+ guint _tmp4_;
+ GtkToolButton* _tmp5_;
+ EditingToolsEditingTool* _tmp6_;
+ GdkEventKey* _tmp7_;
+ gboolean _tmp8_;
#line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13062,7 +13053,7 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey*
if (_tmp6_ == NULL) {
#line 2027 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_swap_out_original (self);
-#line 13061 "PhotoPage.c"
+#line 13052 "PhotoPage.c"
}
#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp7_ = event;
@@ -13072,24 +13063,24 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey*
result = _tmp8_;
#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 13071 "PhotoPage.c"
+#line 13062 "PhotoPage.c"
}
static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey* event) {
EditingHostPage * self;
gboolean result = FALSE;
- GtkToolButton* _tmp0_ = NULL;
- GtkToolButton* _tmp1_ = NULL;
- GtkToolButton* _tmp2_ = NULL;
- GtkToolButton* _tmp3_ = NULL;
- guint _tmp4_ = 0U;
- GtkToolButton* _tmp5_ = NULL;
+ GtkToolButton* _tmp0_;
+ GtkToolButton* _tmp1_;
+ GtkToolButton* _tmp2_;
+ GtkToolButton* _tmp3_;
+ guint _tmp4_;
+ GtkToolButton* _tmp5_;
gboolean _tmp6_ = FALSE;
gboolean _tmp7_ = FALSE;
- EditingToolsEditingTool* _tmp8_ = NULL;
- GdkEventKey* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
+ EditingToolsEditingTool* _tmp8_;
+ GdkEventKey* _tmp11_;
+ gboolean _tmp12_;
#line 2032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13118,37 +13109,37 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey
_tmp8_ = self->priv->current_tool;
#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp8_ == NULL) {
-#line 13117 "PhotoPage.c"
- gboolean _tmp9_ = FALSE;
+#line 13108 "PhotoPage.c"
+ gboolean _tmp9_;
#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp9_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp7_ = _tmp9_;
-#line 13123 "PhotoPage.c"
+#line 13114 "PhotoPage.c"
} else {
#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp7_ = FALSE;
-#line 13127 "PhotoPage.c"
+#line 13118 "PhotoPage.c"
}
#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp7_) {
-#line 13131 "PhotoPage.c"
- gboolean _tmp10_ = FALSE;
+#line 13122 "PhotoPage.c"
+ gboolean _tmp10_;
#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp10_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_ = !_tmp10_;
-#line 13137 "PhotoPage.c"
+#line 13128 "PhotoPage.c"
} else {
#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_ = FALSE;
-#line 13141 "PhotoPage.c"
+#line 13132 "PhotoPage.c"
}
#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp6_) {
#line 2040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_swap_in_original (self);
-#line 13147 "PhotoPage.c"
+#line 13138 "PhotoPage.c"
}
#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp11_ = event;
@@ -13158,29 +13149,29 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey
result = _tmp12_;
#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 13157 "PhotoPage.c"
+#line 13148 "PhotoPage.c"
}
void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleToolButton* toggle, EditingToolsEditingToolFactory factory) {
gboolean _tmp0_ = FALSE;
- GtkToggleToolButton* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- gboolean _tmp3_ = FALSE;
+ GtkToggleToolButton* _tmp1_;
+ gboolean _tmp2_;
+ gboolean _tmp3_;
gboolean deactivating_only = FALSE;
Dimensions _tmp6_ = {0};
- gboolean _tmp7_ = FALSE;
- GtkToggleToolButton* _tmp8_ = NULL;
- GtkToggleToolButton* _tmp9_ = NULL;
+ gboolean _tmp7_;
+ GtkToggleToolButton* _tmp8_;
+ GtkToggleToolButton* _tmp9_;
EditingToolsEditingTool* tool = NULL;
- EditingToolsEditingToolFactory _tmp10_ = NULL;
- EditingToolsEditingTool* _tmp11_ = NULL;
- EditingToolsEditingTool* _tmp12_ = NULL;
- EditingToolsEditingTool* _tmp13_ = NULL;
- EditingToolsEditingTool* _tmp14_ = NULL;
- EditingToolsEditingTool* _tmp15_ = NULL;
- EditingToolsEditingTool* _tmp16_ = NULL;
- EditingToolsEditingTool* _tmp17_ = NULL;
+ EditingToolsEditingToolFactory _tmp10_;
+ EditingToolsEditingTool* _tmp11_;
+ EditingToolsEditingTool* _tmp12_;
+ EditingToolsEditingTool* _tmp13_;
+ EditingToolsEditingTool* _tmp14_;
+ EditingToolsEditingTool* _tmp15_;
+ EditingToolsEditingTool* _tmp16_;
+ EditingToolsEditingTool* _tmp17_;
#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13193,20 +13184,20 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
_tmp3_ = _tmp2_;
#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (!_tmp3_) {
-#line 13192 "PhotoPage.c"
- GtkToggleToolButton* _tmp4_ = NULL;
- GtkToggleToolButton* _tmp5_ = NULL;
+#line 13183 "PhotoPage.c"
+ GtkToggleToolButton* _tmp4_;
+ GtkToggleToolButton* _tmp5_;
#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = self->priv->current_editing_toggle;
#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = toggle;
#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = _tmp4_ == _tmp5_;
-#line 13201 "PhotoPage.c"
+#line 13192 "PhotoPage.c"
} else {
#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = FALSE;
-#line 13205 "PhotoPage.c"
+#line 13196 "PhotoPage.c"
}
#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
deactivating_only = _tmp0_;
@@ -13222,7 +13213,7 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 13221 "PhotoPage.c"
+#line 13212 "PhotoPage.c"
}
#line 2056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -13266,14 +13257,14 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
editing_host_page_activate_tool (self, _tmp17_);
#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_editing_tools_editing_tool_unref0 (tool);
-#line 13265 "PhotoPage.c"
+#line 13256 "PhotoPage.c"
}
static void editing_host_page_on_tool_activated (EditingHostPage* self) {
- GtkToggleToolButton* _tmp0_ = NULL;
- GtkScale* _tmp1_ = NULL;
- GtkToggleToolButton* _tmp2_ = NULL;
+ GtkToggleToolButton* _tmp0_;
+ GtkScale* _tmp1_;
+ GtkToggleToolButton* _tmp2_;
#line 2071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 2072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13288,14 +13279,14 @@ static void editing_host_page_on_tool_activated (EditingHostPage* self) {
_tmp2_ = self->priv->current_editing_toggle;
#line 2074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
gtk_toggle_tool_button_set_active (_tmp2_, TRUE);
-#line 13287 "PhotoPage.c"
+#line 13278 "PhotoPage.c"
}
static void editing_host_page_on_tool_deactivated (EditingHostPage* self) {
- GtkToggleToolButton* _tmp0_ = NULL;
- GtkScale* _tmp1_ = NULL;
- GtkToggleToolButton* _tmp2_ = NULL;
+ GtkToggleToolButton* _tmp0_;
+ GtkScale* _tmp1_;
+ GtkToggleToolButton* _tmp2_;
#line 2077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 2078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13310,15 +13301,15 @@ static void editing_host_page_on_tool_deactivated (EditingHostPage* self) {
_tmp2_ = self->priv->current_editing_toggle;
#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
gtk_toggle_tool_button_set_active (_tmp2_, FALSE);
-#line 13309 "PhotoPage.c"
+#line 13300 "PhotoPage.c"
}
static void editing_host_page_on_tool_applied (EditingHostPage* self, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement) {
- Command* _tmp0_ = NULL;
- GdkPixbuf* _tmp1_ = NULL;
- Dimensions _tmp2_ = {0};
- gboolean _tmp3_ = FALSE;
+ Command* _tmp0_;
+ GdkPixbuf* _tmp1_;
+ Dimensions _tmp2_;
+ gboolean _tmp3_;
#line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13337,7 +13328,7 @@ static void editing_host_page_on_tool_applied (EditingHostPage* self, Command* c
_tmp3_ = needs_improvement;
#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_deactivate_tool (self, _tmp0_, _tmp1_, &_tmp2_, _tmp3_);
-#line 13336 "PhotoPage.c"
+#line 13327 "PhotoPage.c"
}
@@ -13353,7 +13344,7 @@ static void editing_host_page_on_tool_cancelled (EditingHostPage* self) {
single_photo_page_restore_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
#line 2092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 13352 "PhotoPage.c"
+#line 13343 "PhotoPage.c"
}
@@ -13367,14 +13358,14 @@ static void editing_host_page_on_tool_aborted (EditingHostPage* self) {
editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
#line 2097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_set_photo_missing (self, TRUE);
-#line 13366 "PhotoPage.c"
+#line 13357 "PhotoPage.c"
}
void editing_host_page_toggle_crop (EditingHostPage* self) {
- GtkToggleToolButton* _tmp0_ = NULL;
- GtkToggleToolButton* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ GtkToggleToolButton* _tmp0_;
+ GtkToggleToolButton* _tmp1_;
+ gboolean _tmp2_;
#line 2100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13385,14 +13376,14 @@ void editing_host_page_toggle_crop (EditingHostPage* self) {
_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
#line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13384 "PhotoPage.c"
+#line 13375 "PhotoPage.c"
}
void editing_host_page_toggle_straighten (EditingHostPage* self) {
- GtkToggleToolButton* _tmp0_ = NULL;
- GtkToggleToolButton* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ GtkToggleToolButton* _tmp0_;
+ GtkToggleToolButton* _tmp1_;
+ gboolean _tmp2_;
#line 2104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13403,14 +13394,14 @@ void editing_host_page_toggle_straighten (EditingHostPage* self) {
_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
#line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13402 "PhotoPage.c"
+#line 13393 "PhotoPage.c"
}
void editing_host_page_toggle_redeye (EditingHostPage* self) {
- GtkToggleToolButton* _tmp0_ = NULL;
- GtkToggleToolButton* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ GtkToggleToolButton* _tmp0_;
+ GtkToggleToolButton* _tmp1_;
+ gboolean _tmp2_;
#line 2108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13421,14 +13412,14 @@ void editing_host_page_toggle_redeye (EditingHostPage* self) {
_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
#line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13420 "PhotoPage.c"
+#line 13411 "PhotoPage.c"
}
void editing_host_page_toggle_adjust (EditingHostPage* self) {
- GtkToggleToolButton* _tmp0_ = NULL;
- GtkToggleToolButton* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ GtkToggleToolButton* _tmp0_;
+ GtkToggleToolButton* _tmp1_;
+ gboolean _tmp2_;
#line 2112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13439,7 +13430,7 @@ void editing_host_page_toggle_adjust (EditingHostPage* self) {
_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
#line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13438 "PhotoPage.c"
+#line 13429 "PhotoPage.c"
}
@@ -13448,19 +13439,19 @@ static EditingToolsEditingTool* _editing_tools_straighten_tool_factory_editing_t
result = editing_tools_straighten_tool_factory ();
#line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 13447 "PhotoPage.c"
+#line 13438 "PhotoPage.c"
}
static void editing_host_page_on_straighten_toggled (EditingHostPage* self) {
- GtkToggleToolButton* _tmp0_ = NULL;
+ GtkToggleToolButton* _tmp0_;
#line 2116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = self->priv->straighten_button;
#line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_straighten_tool_factory_editing_tools_editing_tool_factory);
-#line 13459 "PhotoPage.c"
+#line 13450 "PhotoPage.c"
}
@@ -13469,19 +13460,19 @@ static EditingToolsEditingTool* _editing_tools_crop_tool_factory_editing_tools_e
result = editing_tools_crop_tool_factory ();
#line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 13468 "PhotoPage.c"
+#line 13459 "PhotoPage.c"
}
static void editing_host_page_on_crop_toggled (EditingHostPage* self) {
- GtkToggleToolButton* _tmp0_ = NULL;
+ GtkToggleToolButton* _tmp0_;
#line 2120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = self->priv->crop_button;
#line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_crop_tool_factory_editing_tools_editing_tool_factory);
-#line 13480 "PhotoPage.c"
+#line 13471 "PhotoPage.c"
}
@@ -13490,19 +13481,19 @@ static EditingToolsEditingTool* _editing_tools_redeye_tool_factory_editing_tools
result = editing_tools_redeye_tool_factory ();
#line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 13489 "PhotoPage.c"
+#line 13480 "PhotoPage.c"
}
static void editing_host_page_on_redeye_toggled (EditingHostPage* self) {
- GtkToggleToolButton* _tmp0_ = NULL;
+ GtkToggleToolButton* _tmp0_;
#line 2124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = self->priv->redeye_button;
#line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_redeye_tool_factory_editing_tools_editing_tool_factory);
-#line 13501 "PhotoPage.c"
+#line 13492 "PhotoPage.c"
}
@@ -13511,25 +13502,25 @@ static EditingToolsEditingTool* _editing_tools_adjust_tool_factory_editing_tools
result = editing_tools_adjust_tool_factory ();
#line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 13510 "PhotoPage.c"
+#line 13501 "PhotoPage.c"
}
static void editing_host_page_on_adjust_toggled (EditingHostPage* self) {
- GtkToggleToolButton* _tmp0_ = NULL;
+ GtkToggleToolButton* _tmp0_;
#line 2128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = self->priv->adjust_button;
#line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_adjust_tool_factory_editing_tools_editing_tool_factory);
-#line 13522 "PhotoPage.c"
+#line 13513 "PhotoPage.c"
}
gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* photo) {
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 2132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
#line 2132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13540,32 +13531,32 @@ gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* p
result = !_tmp0_;
#line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 13539 "PhotoPage.c"
+#line 13530 "PhotoPage.c"
}
void editing_host_page_on_enhance (EditingHostPage* self) {
- EditingToolsEditingTool* _tmp0_ = NULL;
- gboolean _tmp2_ = FALSE;
+ EditingToolsEditingTool* _tmp0_;
+ gboolean _tmp2_;
EditingToolsAdjustTool* adjust_tool = NULL;
- EditingToolsEditingTool* _tmp3_ = NULL;
- EditingToolsAdjustTool* _tmp4_ = NULL;
- EditingToolsAdjustTool* _tmp5_ = NULL;
+ EditingToolsEditingTool* _tmp3_;
+ EditingToolsAdjustTool* _tmp4_;
+ EditingToolsAdjustTool* _tmp5_;
EnhanceSingleCommand* command = NULL;
- Photo* _tmp7_ = NULL;
- Photo* _tmp8_ = NULL;
- EnhanceSingleCommand* _tmp9_ = NULL;
- EnhanceSingleCommand* _tmp10_ = NULL;
- CommandManager* _tmp11_ = NULL;
- CommandManager* _tmp12_ = NULL;
- EnhanceSingleCommand* _tmp13_ = NULL;
+ Photo* _tmp7_;
+ Photo* _tmp8_;
+ EnhanceSingleCommand* _tmp9_;
+ EnhanceSingleCommand* _tmp10_;
+ CommandManager* _tmp11_;
+ CommandManager* _tmp12_;
+ EnhanceSingleCommand* _tmp13_;
#line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 2140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = self->priv->current_tool;
#line 2140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
-#line 13564 "PhotoPage.c"
+#line 13555 "PhotoPage.c"
Dimensions _tmp1_ = {0};
#line 2141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
dimensions_init (&_tmp1_, 0, 0);
@@ -13573,7 +13564,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE);
#line 2143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 13572 "PhotoPage.c"
+#line 13563 "PhotoPage.c"
}
#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = editing_host_page_has_photo (self);
@@ -13581,7 +13572,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
if (!_tmp2_) {
#line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 13580 "PhotoPage.c"
+#line 13571 "PhotoPage.c"
}
#line 2149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = self->priv->current_tool;
@@ -13593,8 +13584,8 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
_tmp5_ = adjust_tool;
#line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp5_ != NULL) {
-#line 13592 "PhotoPage.c"
- EditingToolsAdjustTool* _tmp6_ = NULL;
+#line 13583 "PhotoPage.c"
+ EditingToolsAdjustTool* _tmp6_;
#line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_ = adjust_tool;
#line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13603,7 +13594,7 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
_editing_tools_editing_tool_unref0 (adjust_tool);
#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 13602 "PhotoPage.c"
+#line 13593 "PhotoPage.c"
}
#line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp7_ = editing_host_page_get_photo (self);
@@ -13631,16 +13622,16 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
_g_object_unref0 (command);
#line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_editing_tools_editing_tool_unref0 (adjust_tool);
-#line 13630 "PhotoPage.c"
+#line 13621 "PhotoPage.c"
}
void editing_host_page_on_copy_adjustments (EditingHostPage* self) {
- gboolean _tmp0_ = FALSE;
- Photo* _tmp1_ = NULL;
- Photo* _tmp2_ = NULL;
- PixelTransformationBundle* _tmp3_ = NULL;
- PixelTransformationBundle* _tmp4_ = NULL;
+ gboolean _tmp0_;
+ Photo* _tmp1_;
+ Photo* _tmp2_;
+ PixelTransformationBundle* _tmp3_;
+ PixelTransformationBundle* _tmp4_;
#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 2161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13649,7 +13640,7 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) {
if (!_tmp0_) {
#line 2162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 13648 "PhotoPage.c"
+#line 13639 "PhotoPage.c"
}
#line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = editing_host_page_get_photo (self);
@@ -13667,24 +13658,24 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) {
_g_object_unref0 (_tmp2_);
#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE);
-#line 13666 "PhotoPage.c"
+#line 13657 "PhotoPage.c"
}
void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
PixelTransformationBundle* copied_adjustments = NULL;
- PixelTransformationBundle* _tmp0_ = NULL;
+ PixelTransformationBundle* _tmp0_;
gboolean _tmp1_ = FALSE;
- gboolean _tmp2_ = FALSE;
+ gboolean _tmp2_;
AdjustColorsSingleCommand* command = NULL;
- Photo* _tmp4_ = NULL;
- Photo* _tmp5_ = NULL;
- PixelTransformationBundle* _tmp6_ = NULL;
- AdjustColorsSingleCommand* _tmp7_ = NULL;
- AdjustColorsSingleCommand* _tmp8_ = NULL;
- CommandManager* _tmp9_ = NULL;
- CommandManager* _tmp10_ = NULL;
- AdjustColorsSingleCommand* _tmp11_ = NULL;
+ Photo* _tmp4_;
+ Photo* _tmp5_;
+ PixelTransformationBundle* _tmp6_;
+ AdjustColorsSingleCommand* _tmp7_;
+ AdjustColorsSingleCommand* _tmp8_;
+ CommandManager* _tmp9_;
+ CommandManager* _tmp10_;
+ AdjustColorsSingleCommand* _tmp11_;
#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 2168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13697,14 +13688,14 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
if (!_tmp2_) {
#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = TRUE;
-#line 13696 "PhotoPage.c"
+#line 13687 "PhotoPage.c"
} else {
- PixelTransformationBundle* _tmp3_ = NULL;
+ PixelTransformationBundle* _tmp3_;
#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = copied_adjustments;
#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = _tmp3_ == NULL;
-#line 13703 "PhotoPage.c"
+#line 13694 "PhotoPage.c"
}
#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp1_) {
@@ -13712,7 +13703,7 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
_pixel_transformation_bundle_unref0 (copied_adjustments);
#line 2170 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 13711 "PhotoPage.c"
+#line 13702 "PhotoPage.c"
}
#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = editing_host_page_get_photo (self);
@@ -13742,56 +13733,56 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
_g_object_unref0 (command);
#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 13741 "PhotoPage.c"
+#line 13732 "PhotoPage.c"
}
static void editing_host_page_place_tool_window (EditingHostPage* self) {
- EditingToolsEditingTool* _tmp0_ = NULL;
+ EditingToolsEditingTool* _tmp0_;
EditingToolsEditingToolWindow* tool_window = NULL;
- EditingToolsEditingTool* _tmp1_ = NULL;
- EditingToolsEditingToolWindow* _tmp2_ = NULL;
- EditingToolsEditingToolWindow* _tmp3_ = NULL;
- EditingToolsEditingToolWindow* _tmp4_ = NULL;
- AppWindow* _tmp5_ = NULL;
- AppWindow* _tmp6_ = NULL;
- EditingToolsEditingToolWindow* _tmp7_ = NULL;
- EditingToolsEditingToolWindow* _tmp8_ = NULL;
+ EditingToolsEditingTool* _tmp1_;
+ EditingToolsEditingToolWindow* _tmp2_;
+ EditingToolsEditingToolWindow* _tmp3_;
+ EditingToolsEditingToolWindow* _tmp4_;
+ AppWindow* _tmp5_;
+ AppWindow* _tmp6_;
+ EditingToolsEditingToolWindow* _tmp7_;
+ EditingToolsEditingToolWindow* _tmp8_;
GtkAllocation tool_alloc = {0};
- EditingToolsEditingToolWindow* _tmp9_ = NULL;
+ EditingToolsEditingToolWindow* _tmp9_;
GtkAllocation _tmp10_ = {0};
gint x = 0;
gint y = 0;
- GeeHashMap* _tmp11_ = NULL;
- EditingToolsEditingTool* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
- gchar* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- gboolean _tmp16_ = FALSE;
- gboolean _tmp17_ = FALSE;
+ GeeHashMap* _tmp11_;
+ EditingToolsEditingTool* _tmp12_;
+ const gchar* _tmp13_;
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+ gboolean _tmp16_;
+ gboolean _tmp17_;
GdkScreen* screen = NULL;
- GtkWindow* _tmp87_ = NULL;
- GtkWindow* _tmp88_ = NULL;
- GdkScreen* _tmp89_ = NULL;
- GdkScreen* _tmp90_ = NULL;
- GdkScreen* _tmp91_ = NULL;
- gint _tmp92_ = 0;
- GdkScreen* _tmp93_ = NULL;
- gint _tmp94_ = 0;
- GtkAllocation _tmp95_ = {0};
- gint _tmp96_ = 0;
- gint _tmp97_ = 0;
- gint _tmp98_ = 0;
- GdkScreen* _tmp99_ = NULL;
- gint _tmp100_ = 0;
- GtkAllocation _tmp101_ = {0};
- gint _tmp102_ = 0;
- gint _tmp103_ = 0;
- EditingToolsEditingToolWindow* _tmp104_ = NULL;
- gint _tmp105_ = 0;
- gint _tmp106_ = 0;
- EditingToolsEditingToolWindow* _tmp107_ = NULL;
- EditingToolsEditingToolWindow* _tmp108_ = NULL;
+ GtkWindow* _tmp87_;
+ GtkWindow* _tmp88_;
+ GdkScreen* _tmp89_;
+ GdkScreen* _tmp90_;
+ GdkScreen* _tmp91_;
+ gint _tmp92_;
+ GdkScreen* _tmp93_;
+ gint _tmp94_;
+ GtkAllocation _tmp95_;
+ gint _tmp96_;
+ gint _tmp97_;
+ gint _tmp98_;
+ GdkScreen* _tmp99_;
+ gint _tmp100_;
+ GtkAllocation _tmp101_;
+ gint _tmp102_;
+ gint _tmp103_;
+ EditingToolsEditingToolWindow* _tmp104_;
+ gint _tmp105_;
+ gint _tmp106_;
+ EditingToolsEditingToolWindow* _tmp107_;
+ EditingToolsEditingToolWindow* _tmp108_;
#line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_EDITING_HOST_PAGE (self));
#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13800,7 +13791,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
if (_tmp0_ == NULL) {
#line 2179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 13799 "PhotoPage.c"
+#line 13790 "PhotoPage.c"
}
#line 2181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = self->priv->current_tool;
@@ -13816,7 +13807,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
_g_object_unref0 (tool_window);
#line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 13815 "PhotoPage.c"
+#line 13806 "PhotoPage.c"
}
#line 2186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = tool_window;
@@ -13860,19 +13851,19 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
_g_free0 (_tmp15_);
#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp17_) {
-#line 13859 "PhotoPage.c"
- GeeHashMap* _tmp18_ = NULL;
- EditingToolsEditingTool* _tmp19_ = NULL;
- const gchar* _tmp20_ = NULL;
- gchar* _tmp21_ = NULL;
- gchar* _tmp22_ = NULL;
- gpointer _tmp23_ = NULL;
- GeeHashMap* _tmp24_ = NULL;
- EditingToolsEditingTool* _tmp25_ = NULL;
- const gchar* _tmp26_ = NULL;
- gchar* _tmp27_ = NULL;
- gchar* _tmp28_ = NULL;
- gpointer _tmp29_ = NULL;
+#line 13850 "PhotoPage.c"
+ GeeHashMap* _tmp18_;
+ EditingToolsEditingTool* _tmp19_;
+ const gchar* _tmp20_;
+ gchar* _tmp21_;
+ gchar* _tmp22_;
+ gpointer _tmp23_;
+ GeeHashMap* _tmp24_;
+ EditingToolsEditingTool* _tmp25_;
+ const gchar* _tmp26_;
+ gchar* _tmp27_;
+ gchar* _tmp28_;
+ gpointer _tmp29_;
#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp18_ = self->priv->last_locations;
#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13905,13 +13896,13 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
y = (gint) ((gintptr) _tmp29_);
#line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_free0 (_tmp28_);
-#line 13904 "PhotoPage.c"
+#line 13895 "PhotoPage.c"
} else {
- GtkWindow* _tmp30_ = NULL;
- GtkWindow* _tmp31_ = NULL;
- AppWindow* _tmp32_ = NULL;
- AppWindow* _tmp33_ = NULL;
- gboolean _tmp34_ = FALSE;
+ GtkWindow* _tmp30_;
+ GtkWindow* _tmp31_;
+ AppWindow* _tmp32_;
+ AppWindow* _tmp33_;
+ gboolean _tmp34_;
#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp30_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13928,35 +13919,35 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
_g_object_unref0 (_tmp31_);
#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp34_) {
-#line 13927 "PhotoPage.c"
+#line 13918 "PhotoPage.c"
gint rx = 0;
gint ry = 0;
- GtkWindow* _tmp35_ = NULL;
- GtkWindow* _tmp36_ = NULL;
- GdkWindow* _tmp37_ = NULL;
+ GtkWindow* _tmp35_;
+ GtkWindow* _tmp36_;
+ GdkWindow* _tmp37_;
gint _tmp38_ = 0;
gint _tmp39_ = 0;
GtkAllocation viewport_allocation = {0};
- GtkViewport* _tmp40_ = NULL;
+ GtkViewport* _tmp40_;
GtkAllocation _tmp41_ = {0};
gint cx = 0;
gint cy = 0;
gint cwidth = 0;
gint cheight = 0;
- GtkAllocation _tmp42_ = {0};
- gint _tmp43_ = 0;
- GtkAllocation _tmp44_ = {0};
- gint _tmp45_ = 0;
- GtkAllocation _tmp46_ = {0};
- gint _tmp47_ = 0;
- GtkAllocation _tmp48_ = {0};
- gint _tmp49_ = 0;
+ GtkAllocation _tmp42_;
+ gint _tmp43_;
+ GtkAllocation _tmp44_;
+ gint _tmp45_;
+ GtkAllocation _tmp46_;
+ gint _tmp47_;
+ GtkAllocation _tmp48_;
+ gint _tmp49_;
gint _tmp50_ = 0;
- gint _tmp59_ = 0;
- gint _tmp60_ = 0;
- gint _tmp61_ = 0;
- GtkAllocation _tmp62_ = {0};
- gint _tmp63_ = 0;
+ gint _tmp59_;
+ gint _tmp60_;
+ gint _tmp61_;
+ GtkAllocation _tmp62_;
+ gint _tmp63_;
#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp35_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14003,12 +13994,12 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
cheight = _tmp49_;
#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE)) {
-#line 14002 "PhotoPage.c"
- gint _tmp51_ = 0;
- gint _tmp52_ = 0;
- gint _tmp53_ = 0;
- GtkAllocation _tmp54_ = {0};
- gint _tmp55_ = 0;
+#line 13993 "PhotoPage.c"
+ gint _tmp51_;
+ gint _tmp52_;
+ gint _tmp53_;
+ GtkAllocation _tmp54_;
+ gint _tmp55_;
#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp51_ = rx;
#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14021,11 +14012,11 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
_tmp55_ = _tmp54_.width;
#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp50_ = ((_tmp51_ + _tmp52_) + (_tmp53_ / 2)) - (_tmp55_ / 2);
-#line 14020 "PhotoPage.c"
+#line 14011 "PhotoPage.c"
} else {
- gint _tmp56_ = 0;
- gint _tmp57_ = 0;
- gint _tmp58_ = 0;
+ gint _tmp56_;
+ gint _tmp57_;
+ gint _tmp58_;
#line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp56_ = rx;
#line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14034,7 +14025,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
_tmp58_ = cwidth;
#line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp50_ = (_tmp56_ + _tmp57_) + (_tmp58_ / 2);
-#line 14033 "PhotoPage.c"
+#line 14024 "PhotoPage.c"
}
#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
x = _tmp50_;
@@ -14050,29 +14041,29 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
_tmp63_ = _tmp62_.height;
#line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
y = ((_tmp59_ + _tmp60_) + _tmp61_) - ((_tmp63_ / 4) * 3);
-#line 14049 "PhotoPage.c"
+#line 14040 "PhotoPage.c"
} else {
- GtkWindow* _tmp64_ = NULL;
- GtkWindow* _tmp65_ = NULL;
+ GtkWindow* _tmp64_;
+ GtkWindow* _tmp65_;
GtkAllocation toolbar_alloc = {0};
- GtkToolbar* _tmp66_ = NULL;
- GtkToolbar* _tmp67_ = NULL;
+ GtkToolbar* _tmp66_;
+ GtkToolbar* _tmp67_;
GtkAllocation _tmp68_ = {0};
GdkScreen* screen = NULL;
- GtkWindow* _tmp69_ = NULL;
- GtkWindow* _tmp70_ = NULL;
- GdkScreen* _tmp71_ = NULL;
- GdkScreen* _tmp72_ = NULL;
- GdkScreen* _tmp73_ = NULL;
- GdkScreen* _tmp74_ = NULL;
- gint _tmp75_ = 0;
- GdkScreen* _tmp76_ = NULL;
- gint _tmp77_ = 0;
- GtkAllocation _tmp78_ = {0};
- gint _tmp79_ = 0;
- GtkAllocation _tmp80_ = {0};
- gint _tmp81_ = 0;
- EditingToolsEditingTool* _tmp82_ = NULL;
+ GtkWindow* _tmp69_;
+ GtkWindow* _tmp70_;
+ GdkScreen* _tmp71_;
+ GdkScreen* _tmp72_;
+ GdkScreen* _tmp73_;
+ GdkScreen* _tmp74_;
+ gint _tmp75_;
+ GdkScreen* _tmp76_;
+ gint _tmp77_;
+ GtkAllocation _tmp78_;
+ gint _tmp79_;
+ GtkAllocation _tmp80_;
+ gint _tmp81_;
+ EditingToolsEditingTool* _tmp82_;
#line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp64_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14129,17 +14120,17 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
_tmp82_ = self->priv->current_tool;
#line 2235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp82_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
-#line 14128 "PhotoPage.c"
- gint _tmp83_ = 0;
+#line 14119 "PhotoPage.c"
+ gint _tmp83_;
#line 2236 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp83_ = x;
#line 2236 "/home/jens/Source/shotwell/src/PhotoPage.vala"
x = (_tmp83_ * 3) / 4;
-#line 14134 "PhotoPage.c"
+#line 14125 "PhotoPage.c"
} else {
- gint _tmp84_ = 0;
- GtkAllocation _tmp85_ = {0};
- gint _tmp86_ = 0;
+ gint _tmp84_;
+ GtkAllocation _tmp85_;
+ gint _tmp86_;
#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp84_ = x;
#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14148,11 +14139,11 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
_tmp86_ = _tmp85_.width;
#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
x = (_tmp84_ - _tmp86_) / 2;
-#line 14147 "PhotoPage.c"
+#line 14138 "PhotoPage.c"
}
#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (screen);
-#line 14151 "PhotoPage.c"
+#line 14142 "PhotoPage.c"
}
}
#line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14217,28 +14208,28 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
_g_object_unref0 (screen);
#line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (tool_window);
-#line 14216 "PhotoPage.c"
+#line 14207 "PhotoPage.c"
}
static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
EditingHostPage * self;
Dimensions _tmp0_ = {0};
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
Photo* current_photo = NULL;
- Photo* _tmp2_ = NULL;
- Photo* _tmp3_ = NULL;
+ Photo* _tmp2_;
+ Photo* _tmp3_;
DataView* current = NULL;
- ViewCollection* _tmp4_ = NULL;
- ViewCollection* _tmp5_ = NULL;
- Photo* _tmp6_ = NULL;
- Photo* _tmp7_ = NULL;
- DataView* _tmp8_ = NULL;
- DataView* _tmp9_ = NULL;
- DataView* _tmp10_ = NULL;
+ ViewCollection* _tmp4_;
+ ViewCollection* _tmp5_;
+ Photo* _tmp6_;
+ Photo* _tmp7_;
+ DataView* _tmp8_;
+ DataView* _tmp9_;
+ DataView* _tmp10_;
DataView* next = NULL;
- DataView* _tmp11_ = NULL;
- DataView* _tmp12_ = NULL;
+ DataView* _tmp11_;
+ DataView* _tmp12_;
#line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 2254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14251,7 +14242,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
if (!_tmp1_) {
#line 2257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 14250 "PhotoPage.c"
+#line 14241 "PhotoPage.c"
}
#line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = editing_host_page_get_photo (self);
@@ -14289,7 +14280,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
_g_object_unref0 (current_photo);
#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 14288 "PhotoPage.c"
+#line 14279 "PhotoPage.c"
}
#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp11_ = current;
@@ -14297,30 +14288,30 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
_tmp12_ = _g_object_ref0 (_tmp11_);
#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
next = _tmp12_;
-#line 14296 "PhotoPage.c"
+#line 14287 "PhotoPage.c"
{
gboolean _tmp13_ = FALSE;
#line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp13_ = TRUE;
#line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
while (TRUE) {
-#line 14303 "PhotoPage.c"
- ViewCollection* _tmp14_ = NULL;
- ViewCollection* _tmp15_ = NULL;
- DataView* _tmp16_ = NULL;
- DataView* _tmp17_ = NULL;
- DataView* _tmp18_ = NULL;
+#line 14294 "PhotoPage.c"
+ ViewCollection* _tmp14_;
+ ViewCollection* _tmp15_;
+ DataView* _tmp16_;
+ DataView* _tmp17_;
+ DataView* _tmp18_;
Photo* next_photo = NULL;
- DataView* _tmp19_ = NULL;
- DataSource* _tmp20_ = NULL;
- Photo* _tmp21_ = NULL;
- Photo* _tmp22_ = NULL;
- Photo* _tmp23_ = NULL;
- Photo* _tmp24_ = NULL;
- Photo* _tmp25_ = NULL;
+ DataView* _tmp19_;
+ DataSource* _tmp20_;
+ Photo* _tmp21_;
+ Photo* _tmp22_;
+ Photo* _tmp23_;
+ Photo* _tmp24_;
+ Photo* _tmp25_;
#line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (!_tmp13_) {
-#line 14319 "PhotoPage.c"
+#line 14310 "PhotoPage.c"
}
#line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp13_ = FALSE;
@@ -14344,7 +14335,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
if (_tmp18_ == NULL) {
#line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 14343 "PhotoPage.c"
+#line 14334 "PhotoPage.c"
}
#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp19_ = next;
@@ -14356,7 +14347,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
if (_tmp21_ == NULL) {
#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp20_);
-#line 14355 "PhotoPage.c"
+#line 14346 "PhotoPage.c"
}
#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
next_photo = _tmp21_;
@@ -14368,7 +14359,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
_g_object_unref0 (next_photo);
#line 2275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
continue;
-#line 14367 "PhotoPage.c"
+#line 14358 "PhotoPage.c"
}
#line 2277 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp23_ = next_photo;
@@ -14380,7 +14371,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
_g_object_unref0 (next_photo);
#line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 14379 "PhotoPage.c"
+#line 14370 "PhotoPage.c"
}
#line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp25_ = next_photo;
@@ -14390,7 +14381,7 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
_g_object_unref0 (next_photo);
#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 14389 "PhotoPage.c"
+#line 14380 "PhotoPage.c"
}
}
#line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14399,28 +14390,28 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
_g_object_unref0 (current);
#line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (current_photo);
-#line 14398 "PhotoPage.c"
+#line 14389 "PhotoPage.c"
}
static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
EditingHostPage * self;
Dimensions _tmp0_ = {0};
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
Photo* current_photo = NULL;
- Photo* _tmp2_ = NULL;
- Photo* _tmp3_ = NULL;
+ Photo* _tmp2_;
+ Photo* _tmp3_;
DataView* current = NULL;
- ViewCollection* _tmp4_ = NULL;
- ViewCollection* _tmp5_ = NULL;
- Photo* _tmp6_ = NULL;
- Photo* _tmp7_ = NULL;
- DataView* _tmp8_ = NULL;
- DataView* _tmp9_ = NULL;
- DataView* _tmp10_ = NULL;
+ ViewCollection* _tmp4_;
+ ViewCollection* _tmp5_;
+ Photo* _tmp6_;
+ Photo* _tmp7_;
+ DataView* _tmp8_;
+ DataView* _tmp9_;
+ DataView* _tmp10_;
DataView* previous = NULL;
- DataView* _tmp11_ = NULL;
- DataView* _tmp12_ = NULL;
+ DataView* _tmp11_;
+ DataView* _tmp12_;
#line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 2287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14433,7 +14424,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
if (!_tmp1_) {
#line 2290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 14432 "PhotoPage.c"
+#line 14423 "PhotoPage.c"
}
#line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = editing_host_page_get_photo (self);
@@ -14471,7 +14462,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
_g_object_unref0 (current_photo);
#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 14470 "PhotoPage.c"
+#line 14461 "PhotoPage.c"
}
#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp11_ = current;
@@ -14479,30 +14470,30 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
_tmp12_ = _g_object_ref0 (_tmp11_);
#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
previous = _tmp12_;
-#line 14478 "PhotoPage.c"
+#line 14469 "PhotoPage.c"
{
gboolean _tmp13_ = FALSE;
#line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp13_ = TRUE;
#line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
while (TRUE) {
-#line 14485 "PhotoPage.c"
- ViewCollection* _tmp14_ = NULL;
- ViewCollection* _tmp15_ = NULL;
- DataView* _tmp16_ = NULL;
- DataView* _tmp17_ = NULL;
- DataView* _tmp18_ = NULL;
+#line 14476 "PhotoPage.c"
+ ViewCollection* _tmp14_;
+ ViewCollection* _tmp15_;
+ DataView* _tmp16_;
+ DataView* _tmp17_;
+ DataView* _tmp18_;
Photo* previous_photo = NULL;
- DataView* _tmp19_ = NULL;
- DataSource* _tmp20_ = NULL;
- Photo* _tmp21_ = NULL;
- Photo* _tmp22_ = NULL;
- Photo* _tmp23_ = NULL;
- Photo* _tmp24_ = NULL;
- Photo* _tmp25_ = NULL;
+ DataView* _tmp19_;
+ DataSource* _tmp20_;
+ Photo* _tmp21_;
+ Photo* _tmp22_;
+ Photo* _tmp23_;
+ Photo* _tmp24_;
+ Photo* _tmp25_;
#line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (!_tmp13_) {
-#line 14501 "PhotoPage.c"
+#line 14492 "PhotoPage.c"
}
#line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp13_ = FALSE;
@@ -14526,7 +14517,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
if (_tmp18_ == NULL) {
#line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 14525 "PhotoPage.c"
+#line 14516 "PhotoPage.c"
}
#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp19_ = previous;
@@ -14538,7 +14529,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
if (_tmp21_ == NULL) {
#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp20_);
-#line 14537 "PhotoPage.c"
+#line 14528 "PhotoPage.c"
}
#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
previous_photo = _tmp21_;
@@ -14550,7 +14541,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
_g_object_unref0 (previous_photo);
#line 2308 "/home/jens/Source/shotwell/src/PhotoPage.vala"
continue;
-#line 14549 "PhotoPage.c"
+#line 14540 "PhotoPage.c"
}
#line 2310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp23_ = previous_photo;
@@ -14562,7 +14553,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
_g_object_unref0 (previous_photo);
#line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 14561 "PhotoPage.c"
+#line 14552 "PhotoPage.c"
}
#line 2313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp25_ = previous_photo;
@@ -14572,7 +14563,7 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
_g_object_unref0 (previous_photo);
#line 2315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 14571 "PhotoPage.c"
+#line 14562 "PhotoPage.c"
}
}
#line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14581,13 +14572,13 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
_g_object_unref0 (current);
#line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (current_photo);
-#line 14580 "PhotoPage.c"
+#line 14571 "PhotoPage.c"
}
gboolean editing_host_page_has_current_tool (EditingHostPage* self) {
gboolean result = FALSE;
- EditingToolsEditingTool* _tmp0_ = NULL;
+ EditingToolsEditingTool* _tmp0_;
#line 2319 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
#line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14596,7 +14587,7 @@ gboolean editing_host_page_has_current_tool (EditingHostPage* self) {
result = _tmp0_ != NULL;
#line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 14595 "PhotoPage.c"
+#line 14586 "PhotoPage.c"
}
@@ -14607,33 +14598,33 @@ void editing_host_page_unset_view_collection (EditingHostPage* self) {
_data_collection_unref0 (self->priv->parent_view);
#line 2324 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self->priv->parent_view = NULL;
-#line 14606 "PhotoPage.c"
+#line 14597 "PhotoPage.c"
}
static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_construct (GType object_type, EditingHostPage* host_page) {
EditingHostPageEditingHostCanvas* self = NULL;
- EditingHostPage* _tmp0_ = NULL;
- GtkWindow* _tmp1_ = NULL;
- GtkWindow* _tmp2_ = NULL;
- EditingHostPage* _tmp3_ = NULL;
- GtkDrawingArea* _tmp4_ = NULL;
- GdkWindow* _tmp5_ = NULL;
- EditingHostPage* _tmp6_ = NULL;
- Photo* _tmp7_ = NULL;
- Photo* _tmp8_ = NULL;
- EditingHostPage* _tmp9_ = NULL;
- cairo_t* _tmp10_ = NULL;
- cairo_t* _tmp11_ = NULL;
- EditingHostPage* _tmp12_ = NULL;
+ EditingHostPage* _tmp0_;
+ GtkWindow* _tmp1_;
+ GtkWindow* _tmp2_;
+ EditingHostPage* _tmp3_;
+ GtkDrawingArea* _tmp4_;
+ GdkWindow* _tmp5_;
+ EditingHostPage* _tmp6_;
+ Photo* _tmp7_;
+ Photo* _tmp8_;
+ EditingHostPage* _tmp9_;
+ cairo_t* _tmp10_;
+ cairo_t* _tmp11_;
+ EditingHostPage* _tmp12_;
Dimensions _tmp13_ = {0};
- EditingHostPage* _tmp14_ = NULL;
- GdkPixbuf* _tmp15_ = NULL;
- GdkPixbuf* _tmp16_ = NULL;
- EditingHostPage* _tmp17_ = NULL;
+ EditingHostPage* _tmp14_;
+ GdkPixbuf* _tmp15_;
+ GdkPixbuf* _tmp16_;
+ EditingHostPage* _tmp17_;
GdkRectangle _tmp18_ = {0};
- EditingHostPage* _tmp19_ = NULL;
- EditingHostPage* _tmp20_ = NULL;
+ EditingHostPage* _tmp19_;
+ EditingHostPage* _tmp20_;
#line 377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_EDITING_HOST_PAGE (host_page), NULL);
#line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14694,27 +14685,27 @@ static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_c
self->priv->host_page = _tmp20_;
#line 377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return self;
-#line 14693 "PhotoPage.c"
+#line 14684 "PhotoPage.c"
}
static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_new (EditingHostPage* host_page) {
#line 377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return editing_host_page_editing_host_canvas_construct (EDITING_HOST_PAGE_TYPE_EDITING_HOST_CANVAS, host_page);
-#line 14700 "PhotoPage.c"
+#line 14691 "PhotoPage.c"
}
static void editing_host_page_editing_host_canvas_real_repaint (EditingToolsPhotoCanvas* base) {
EditingHostPageEditingHostCanvas * self;
- EditingHostPage* _tmp0_ = NULL;
+ EditingHostPage* _tmp0_;
#line 385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_HOST_PAGE_TYPE_EDITING_HOST_CANVAS, EditingHostPageEditingHostCanvas);
#line 386 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = self->priv->host_page;
#line 386 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 14713 "PhotoPage.c"
+#line 14704 "PhotoPage.c"
}
@@ -14726,19 +14717,19 @@ static void editing_host_page_editing_host_canvas_class_init (EditingHostPageEdi
#line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_type_class_add_private (klass, sizeof (EditingHostPageEditingHostCanvasPrivate));
#line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingToolsPhotoCanvasClass *) klass)->repaint = (void (*)(EditingToolsPhotoCanvas*)) editing_host_page_editing_host_canvas_real_repaint;
-#line 14726 "PhotoPage.c"
+ ((EditingToolsPhotoCanvasClass *) klass)->repaint = (void (*) (EditingToolsPhotoCanvas *)) editing_host_page_editing_host_canvas_real_repaint;
+#line 14717 "PhotoPage.c"
}
static void editing_host_page_editing_host_canvas_instance_init (EditingHostPageEditingHostCanvas * self) {
#line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self->priv = EDITING_HOST_PAGE_EDITING_HOST_CANVAS_GET_PRIVATE (self);
-#line 14733 "PhotoPage.c"
+#line 14724 "PhotoPage.c"
}
-static void editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCanvas* obj) {
+static void editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCanvas * obj) {
EditingHostPageEditingHostCanvas * self;
#line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_HOST_PAGE_TYPE_EDITING_HOST_CANVAS, EditingHostPageEditingHostCanvas);
@@ -14746,7 +14737,7 @@ static void editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCan
_g_object_unref0 (self->priv->host_page);
#line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
EDITING_TOOLS_PHOTO_CANVAS_CLASS (editing_host_page_editing_host_canvas_parent_class)->finalize (obj);
-#line 14745 "PhotoPage.c"
+#line 14736 "PhotoPage.c"
}
@@ -14768,111 +14759,111 @@ static void editing_host_page_class_init (EditingHostPageClass * klass) {
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_type_class_add_private (klass, sizeof (EditingHostPagePrivate));
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->on_zoom_slider_key_press = (gboolean (*)(EditingHostPage*, GdkEventKey*)) editing_host_page_real_on_zoom_slider_key_press;
+ ((EditingHostPageClass *) klass)->on_zoom_slider_key_press = (gboolean (*) (EditingHostPage *, GdkEventKey*)) editing_host_page_real_on_zoom_slider_key_press;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->on_increase_size = (void (*)(EditingHostPage*)) editing_host_page_real_on_increase_size;
+ ((EditingHostPageClass *) klass)->on_increase_size = (void (*) (EditingHostPage *)) editing_host_page_real_on_increase_size;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->on_decrease_size = (void (*)(EditingHostPage*)) editing_host_page_real_on_decrease_size;
+ ((EditingHostPageClass *) klass)->on_decrease_size = (void (*) (EditingHostPage *)) editing_host_page_real_on_decrease_size;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((SinglePhotoPageClass *) klass)->save_zoom_state = (void (*)(SinglePhotoPage*)) editing_host_page_real_save_zoom_state;
+ ((SinglePhotoPageClass *) klass)->save_zoom_state = (void (*) (SinglePhotoPage *)) editing_host_page_real_save_zoom_state;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((SinglePhotoPageClass *) klass)->get_zoom_buffer = (ZoomBuffer* (*)(SinglePhotoPage*)) editing_host_page_real_get_zoom_buffer;
+ ((SinglePhotoPageClass *) klass)->get_zoom_buffer = (ZoomBuffer* (*) (SinglePhotoPage *)) editing_host_page_real_get_zoom_buffer;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_mousewheel_up = (gboolean (*)(Page*, GdkEventScroll*)) editing_host_page_real_on_mousewheel_up;
+ ((PageClass *) klass)->on_mousewheel_up = (gboolean (*) (Page *, GdkEventScroll*)) editing_host_page_real_on_mousewheel_up;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_mousewheel_down = (gboolean (*)(Page*, GdkEventScroll*)) editing_host_page_real_on_mousewheel_down;
+ ((PageClass *) klass)->on_mousewheel_down = (gboolean (*) (Page *, GdkEventScroll*)) editing_host_page_real_on_mousewheel_down;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((SinglePhotoPageClass *) klass)->restore_zoom_state = (void (*)(SinglePhotoPage*)) editing_host_page_real_restore_zoom_state;
+ ((SinglePhotoPageClass *) klass)->restore_zoom_state = (void (*) (SinglePhotoPage *)) editing_host_page_real_restore_zoom_state;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((SinglePhotoPageClass *) klass)->is_zoom_supported = (gboolean (*)(SinglePhotoPage*)) editing_host_page_real_is_zoom_supported;
+ ((SinglePhotoPageClass *) klass)->is_zoom_supported = (gboolean (*) (SinglePhotoPage *)) editing_host_page_real_is_zoom_supported;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->set_container = (void (*)(Page*, GtkWindow*)) editing_host_page_real_set_container;
+ ((PageClass *) klass)->set_container = (void (*) (Page *, GtkWindow*)) editing_host_page_real_set_container;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->photo_changing = (void (*)(EditingHostPage*, Photo*)) editing_host_page_real_photo_changing;
+ ((EditingHostPageClass *) klass)->photo_changing = (void (*) (EditingHostPage *, Photo*)) editing_host_page_real_photo_changing;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((GtkWidgetClass *) klass)->realize = (void (*)(GtkWidget*)) editing_host_page_real_realize;
+ ((GtkWidgetClass *) klass)->realize = (void (*) (GtkWidget *)) editing_host_page_real_realize;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->switched_to = (void (*)(Page*)) editing_host_page_real_switched_to;
+ ((PageClass *) klass)->switched_to = (void (*) (Page *)) editing_host_page_real_switched_to;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->switching_from = (void (*)(Page*)) editing_host_page_real_switching_from;
+ ((PageClass *) klass)->switching_from = (void (*) (Page *)) editing_host_page_real_switching_from;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->switching_to_fullscreen = (void (*)(Page*, FullscreenWindow*)) editing_host_page_real_switching_to_fullscreen;
+ ((PageClass *) klass)->switching_to_fullscreen = (void (*) (Page *, FullscreenWindow*)) editing_host_page_real_switching_to_fullscreen;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->returning_from_fullscreen = (void (*)(Page*, FullscreenWindow*)) editing_host_page_real_returning_from_fullscreen;
+ ((PageClass *) klass)->returning_from_fullscreen = (void (*) (Page *, FullscreenWindow*)) editing_host_page_real_returning_from_fullscreen;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->create_photo_view = (DataView* (*)(EditingHostPage*, DataSource*)) editing_host_page_real_create_photo_view;
+ ((EditingHostPageClass *) klass)->create_photo_view = (DataView* (*) (EditingHostPage *, DataSource*)) editing_host_page_real_create_photo_view;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->update_ui = (void (*)(EditingHostPage*, gboolean)) editing_host_page_real_update_ui;
+ ((EditingHostPageClass *) klass)->update_ui = (void (*) (EditingHostPage *, gboolean)) editing_host_page_real_update_ui;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->notify_photo_backing_missing = (void (*)(EditingHostPage*, Photo*, gboolean)) editing_host_page_real_notify_photo_backing_missing;
+ ((EditingHostPageClass *) klass)->notify_photo_backing_missing = (void (*) (EditingHostPage *, Photo*, gboolean)) editing_host_page_real_notify_photo_backing_missing;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->confirm_replace_photo = (gboolean (*)(EditingHostPage*, Photo*, Photo*)) editing_host_page_real_confirm_replace_photo;
+ ((EditingHostPageClass *) klass)->confirm_replace_photo = (gboolean (*) (EditingHostPage *, Photo*, Photo*)) editing_host_page_real_confirm_replace_photo;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((SinglePhotoPageClass *) klass)->cancel_zoom = (void (*)(SinglePhotoPage*)) editing_host_page_real_cancel_zoom;
+ ((SinglePhotoPageClass *) klass)->cancel_zoom = (void (*) (SinglePhotoPage *)) editing_host_page_real_cancel_zoom;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_resize = (void (*)(Page*, GdkRectangle*)) editing_host_page_real_on_resize;
+ ((PageClass *) klass)->on_resize = (void (*) (Page *, GdkRectangle*)) editing_host_page_real_on_resize;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_resize_finished = (void (*)(Page*, GdkRectangle*)) editing_host_page_real_on_resize_finished;
+ ((PageClass *) klass)->on_resize_finished = (void (*) (Page *, GdkRectangle*)) editing_host_page_real_on_resize_finished;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) editing_host_page_real_update_actions;
+ ((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) editing_host_page_real_update_actions;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_shift_pressed = (gboolean (*)(Page*, GdkEventKey*)) editing_host_page_real_on_shift_pressed;
+ ((PageClass *) klass)->on_shift_pressed = (gboolean (*) (Page *, GdkEventKey*)) editing_host_page_real_on_shift_pressed;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_shift_released = (gboolean (*)(Page*, GdkEventKey*)) editing_host_page_real_on_shift_released;
+ ((PageClass *) klass)->on_shift_released = (gboolean (*) (Page *, GdkEventKey*)) editing_host_page_real_on_shift_released;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_alt_pressed = (gboolean (*)(Page*, GdkEventKey*)) editing_host_page_real_on_alt_pressed;
+ ((PageClass *) klass)->on_alt_pressed = (gboolean (*) (Page *, GdkEventKey*)) editing_host_page_real_on_alt_pressed;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_alt_released = (gboolean (*)(Page*, GdkEventKey*)) editing_host_page_real_on_alt_released;
+ ((PageClass *) klass)->on_alt_released = (gboolean (*) (Page *, GdkEventKey*)) editing_host_page_real_on_alt_released;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->on_double_click = (gboolean (*)(EditingHostPage*, GdkEventButton*)) editing_host_page_real_on_double_click;
+ ((EditingHostPageClass *) klass)->on_double_click = (gboolean (*) (EditingHostPage *, GdkEventButton*)) editing_host_page_real_on_double_click;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_left_click = (gboolean (*)(Page*, GdkEventButton*)) editing_host_page_real_on_left_click;
+ ((PageClass *) klass)->on_left_click = (gboolean (*) (Page *, GdkEventButton*)) editing_host_page_real_on_left_click;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_left_released = (gboolean (*)(Page*, GdkEventButton*)) editing_host_page_real_on_left_released;
+ ((PageClass *) klass)->on_left_released = (gboolean (*) (Page *, GdkEventButton*)) editing_host_page_real_on_left_released;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_right_click = (gboolean (*)(Page*, GdkEventButton*)) editing_host_page_real_on_right_click;
+ ((PageClass *) klass)->on_right_click = (gboolean (*) (Page *, GdkEventButton*)) editing_host_page_real_on_right_click;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_motion = (gboolean (*)(Page*, GdkEventMotion*, gint, gint, GdkModifierType)) editing_host_page_real_on_motion;
+ ((PageClass *) klass)->on_motion = (gboolean (*) (Page *, GdkEventMotion*, gint, gint, GdkModifierType)) editing_host_page_real_on_motion;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_leave_notify_event = (gboolean (*)(Page*)) editing_host_page_real_on_leave_notify_event;
+ ((PageClass *) klass)->on_leave_notify_event = (gboolean (*) (Page *)) editing_host_page_real_on_leave_notify_event;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_move = (void (*)(Page*, GdkRectangle*)) editing_host_page_real_on_move;
+ ((PageClass *) klass)->on_move = (void (*) (Page *, GdkRectangle*)) editing_host_page_real_on_move;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_move_finished = (void (*)(Page*, GdkRectangle*)) editing_host_page_real_on_move_finished;
+ ((PageClass *) klass)->on_move_finished = (void (*) (Page *, GdkRectangle*)) editing_host_page_real_on_move_finished;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) editing_host_page_real_key_press_event;
+ ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) editing_host_page_real_key_press_event;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((SinglePhotoPageClass *) klass)->new_surface = (void (*)(SinglePhotoPage*, cairo_t*, Dimensions*)) editing_host_page_real_new_surface;
+ ((SinglePhotoPageClass *) klass)->new_surface = (void (*) (SinglePhotoPage *, cairo_t*, Dimensions*)) editing_host_page_real_new_surface;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((SinglePhotoPageClass *) klass)->updated_pixbuf = (void (*)(SinglePhotoPage*, GdkPixbuf*, SinglePhotoPageUpdateReason, Dimensions*)) editing_host_page_real_updated_pixbuf;
+ ((SinglePhotoPageClass *) klass)->updated_pixbuf = (void (*) (SinglePhotoPage *, GdkPixbuf*, SinglePhotoPageUpdateReason, Dimensions*)) editing_host_page_real_updated_pixbuf;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->get_bottom_left_trinket = (GdkPixbuf* (*)(EditingHostPage*, gint)) editing_host_page_real_get_bottom_left_trinket;
+ ((EditingHostPageClass *) klass)->get_bottom_left_trinket = (GdkPixbuf* (*) (EditingHostPage *, gint)) editing_host_page_real_get_bottom_left_trinket;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->get_top_left_trinket = (GdkPixbuf* (*)(EditingHostPage*, gint)) editing_host_page_real_get_top_left_trinket;
+ ((EditingHostPageClass *) klass)->get_top_left_trinket = (GdkPixbuf* (*) (EditingHostPage *, gint)) editing_host_page_real_get_top_left_trinket;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->get_top_right_trinket = (GdkPixbuf* (*)(EditingHostPage*, gint)) editing_host_page_real_get_top_right_trinket;
+ ((EditingHostPageClass *) klass)->get_top_right_trinket = (GdkPixbuf* (*) (EditingHostPage *, gint)) editing_host_page_real_get_top_right_trinket;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->get_bottom_right_trinket = (GdkPixbuf* (*)(EditingHostPage*, gint)) editing_host_page_real_get_bottom_right_trinket;
+ ((EditingHostPageClass *) klass)->get_bottom_right_trinket = (GdkPixbuf* (*) (EditingHostPage *, gint)) editing_host_page_real_get_bottom_right_trinket;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((SinglePhotoPageClass *) klass)->paint = (void (*)(SinglePhotoPage*, cairo_t*, Dimensions*)) editing_host_page_real_paint;
+ ((SinglePhotoPageClass *) klass)->paint = (void (*) (SinglePhotoPage *, cairo_t*, Dimensions*)) editing_host_page_real_paint;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_ctrl_pressed = (gboolean (*)(Page*, GdkEventKey*)) editing_host_page_real_on_ctrl_pressed;
+ ((PageClass *) klass)->on_ctrl_pressed = (gboolean (*) (Page *, GdkEventKey*)) editing_host_page_real_on_ctrl_pressed;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_ctrl_released = (gboolean (*)(Page*, GdkEventKey*)) editing_host_page_real_on_ctrl_released;
+ ((PageClass *) klass)->on_ctrl_released = (gboolean (*) (Page *, GdkEventKey*)) editing_host_page_real_on_ctrl_released;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((SinglePhotoPageClass *) klass)->on_next_photo = (void (*)(SinglePhotoPage*)) editing_host_page_real_on_next_photo;
+ ((SinglePhotoPageClass *) klass)->on_next_photo = (void (*) (SinglePhotoPage *)) editing_host_page_real_on_next_photo;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((SinglePhotoPageClass *) klass)->on_previous_photo = (void (*)(SinglePhotoPage*)) editing_host_page_real_on_previous_photo;
+ ((SinglePhotoPageClass *) klass)->on_previous_photo = (void (*) (SinglePhotoPage *)) editing_host_page_real_on_previous_photo;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
G_OBJECT_CLASS (klass)->finalize = editing_host_page_finalize;
-#line 14864 "PhotoPage.c"
+#line 14855 "PhotoPage.c"
}
static void editing_host_page_instance_init (EditingHostPage * self) {
- GtkToolButton* _tmp0_ = NULL;
- GtkToolButton* _tmp1_ = NULL;
- GeeHashMap* _tmp2_ = NULL;
+ GtkToolButton* _tmp0_;
+ GtkToolButton* _tmp1_;
+ GeeHashMap* _tmp2_;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self->priv = EDITING_HOST_PAGE_GET_PRIVATE (self);
#line 391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14933,20 +14924,20 @@ static void editing_host_page_instance_init (EditingHostPage * self) {
_tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_INT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self->priv->last_locations = _tmp2_;
-#line 14932 "PhotoPage.c"
+#line 14923 "PhotoPage.c"
}
-static void editing_host_page_finalize (GObject* obj) {
+static void editing_host_page_finalize (GObject * obj) {
EditingHostPage * self;
- SourceCollection* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- ViewCollection* _tmp2_ = NULL;
- ViewCollection* _tmp3_ = NULL;
- guint _tmp4_ = 0U;
- ViewCollection* _tmp5_ = NULL;
- ViewCollection* _tmp6_ = NULL;
- guint _tmp7_ = 0U;
+ SourceCollection* _tmp0_;
+ guint _tmp1_;
+ ViewCollection* _tmp2_;
+ ViewCollection* _tmp3_;
+ guint _tmp4_;
+ ViewCollection* _tmp5_;
+ ViewCollection* _tmp6_;
+ guint _tmp7_;
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDITING_HOST_PAGE, EditingHostPage);
#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15017,7 +15008,7 @@ static void editing_host_page_finalize (GObject* obj) {
_g_object_unref0 (self->priv->last_locations);
#line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
G_OBJECT_CLASS (editing_host_page_parent_class)->finalize (obj);
-#line 15016 "PhotoPage.c"
+#line 15007 "PhotoPage.c"
}
@@ -15036,381 +15027,381 @@ GType editing_host_page_get_type (void) {
static void _library_photo_page_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_photo_destroyed ((LibraryPhotoPage*) self, source);
-#line 15035 "PhotoPage.c"
+#line 15026 "PhotoPage.c"
}
static void _library_photo_page_on_metadata_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
#line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_metadata_altered ((LibraryPhotoPage*) self, items);
-#line 15042 "PhotoPage.c"
+#line 15033 "PhotoPage.c"
}
static void _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self) {
#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_external_app_changed ((LibraryPhotoPage*) self);
-#line 15049 "PhotoPage.c"
+#line 15040 "PhotoPage.c"
}
static void _library_photo_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_export ((LibraryPhotoPage*) self);
-#line 15056 "PhotoPage.c"
+#line 15047 "PhotoPage.c"
}
static void _library_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_print ((LibraryPhotoPage*) self);
-#line 15063 "PhotoPage.c"
+#line 15054 "PhotoPage.c"
}
static void _library_photo_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_publish ((LibraryPhotoPage*) self);
-#line 15070 "PhotoPage.c"
+#line 15061 "PhotoPage.c"
}
static void _library_photo_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_remove_from_library ((LibraryPhotoPage*) self);
-#line 15077 "PhotoPage.c"
+#line 15068 "PhotoPage.c"
}
static void _library_photo_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_move_to_trash ((LibraryPhotoPage*) self);
-#line 15084 "PhotoPage.c"
+#line 15075 "PhotoPage.c"
}
static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 15091 "PhotoPage.c"
+#line 15082 "PhotoPage.c"
}
static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 15098 "PhotoPage.c"
+#line 15089 "PhotoPage.c"
}
static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_rotate_clockwise ((EditingHostPage*) self);
-#line 15105 "PhotoPage.c"
+#line 15096 "PhotoPage.c"
}
static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 15112 "PhotoPage.c"
+#line 15103 "PhotoPage.c"
}
static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_flip_horizontally ((EditingHostPage*) self);
-#line 15119 "PhotoPage.c"
+#line 15110 "PhotoPage.c"
}
static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_flip_vertically ((EditingHostPage*) self);
-#line 15126 "PhotoPage.c"
+#line 15117 "PhotoPage.c"
}
static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_enhance ((EditingHostPage*) self);
-#line 15133 "PhotoPage.c"
+#line 15124 "PhotoPage.c"
}
static void _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_copy_adjustments ((EditingHostPage*) self);
-#line 15140 "PhotoPage.c"
+#line 15131 "PhotoPage.c"
}
static void _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_paste_adjustments ((EditingHostPage*) self);
-#line 15147 "PhotoPage.c"
+#line 15138 "PhotoPage.c"
}
static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_toggle_crop ((EditingHostPage*) self);
-#line 15154 "PhotoPage.c"
+#line 15145 "PhotoPage.c"
}
static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_toggle_straighten ((EditingHostPage*) self);
-#line 15161 "PhotoPage.c"
+#line 15152 "PhotoPage.c"
}
static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_toggle_redeye ((EditingHostPage*) self);
-#line 15168 "PhotoPage.c"
+#line 15159 "PhotoPage.c"
}
static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_toggle_adjust ((EditingHostPage*) self);
-#line 15175 "PhotoPage.c"
+#line 15166 "PhotoPage.c"
}
static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_revert ((EditingHostPage*) self);
-#line 15182 "PhotoPage.c"
+#line 15173 "PhotoPage.c"
}
static void _editing_host_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_edit_title ((EditingHostPage*) self);
-#line 15189 "PhotoPage.c"
+#line 15180 "PhotoPage.c"
}
static void _editing_host_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_edit_comment ((EditingHostPage*) self);
-#line 15196 "PhotoPage.c"
+#line 15187 "PhotoPage.c"
}
static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_adjust_date_time ((EditingHostPage*) self);
-#line 15203 "PhotoPage.c"
+#line 15194 "PhotoPage.c"
}
static void _library_photo_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_external_edit ((LibraryPhotoPage*) self);
-#line 15210 "PhotoPage.c"
+#line 15201 "PhotoPage.c"
}
static void _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_external_edit_raw ((LibraryPhotoPage*) self);
-#line 15217 "PhotoPage.c"
+#line 15208 "PhotoPage.c"
}
static void _library_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_send_to ((LibraryPhotoPage*) self);
-#line 15224 "PhotoPage.c"
+#line 15215 "PhotoPage.c"
}
static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_set_background ((EditingHostPage*) self);
-#line 15231 "PhotoPage.c"
+#line 15222 "PhotoPage.c"
}
static void _library_photo_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_flag_unflag ((LibraryPhotoPage*) self);
-#line 15238 "PhotoPage.c"
+#line 15229 "PhotoPage.c"
}
static void _library_photo_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_increase_rating ((LibraryPhotoPage*) self);
-#line 15245 "PhotoPage.c"
+#line 15236 "PhotoPage.c"
}
static void _library_photo_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_decrease_rating ((LibraryPhotoPage*) self);
-#line 15252 "PhotoPage.c"
+#line 15243 "PhotoPage.c"
}
static void _library_photo_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_rate_rejected ((LibraryPhotoPage*) self);
-#line 15259 "PhotoPage.c"
+#line 15250 "PhotoPage.c"
}
static void _library_photo_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_rate_unrated ((LibraryPhotoPage*) self);
-#line 15266 "PhotoPage.c"
+#line 15257 "PhotoPage.c"
}
static void _library_photo_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_rate_one ((LibraryPhotoPage*) self);
-#line 15273 "PhotoPage.c"
+#line 15264 "PhotoPage.c"
}
static void _library_photo_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_rate_two ((LibraryPhotoPage*) self);
-#line 15280 "PhotoPage.c"
+#line 15271 "PhotoPage.c"
}
static void _library_photo_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_rate_three ((LibraryPhotoPage*) self);
-#line 15287 "PhotoPage.c"
+#line 15278 "PhotoPage.c"
}
static void _library_photo_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_rate_four ((LibraryPhotoPage*) self);
-#line 15294 "PhotoPage.c"
+#line 15285 "PhotoPage.c"
}
static void _library_photo_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_rate_five ((LibraryPhotoPage*) self);
-#line 15301 "PhotoPage.c"
+#line 15292 "PhotoPage.c"
}
static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_increase_size ((EditingHostPage*) self);
-#line 15308 "PhotoPage.c"
+#line 15299 "PhotoPage.c"
}
static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_on_decrease_size ((EditingHostPage*) self);
-#line 15315 "PhotoPage.c"
+#line 15306 "PhotoPage.c"
}
static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_snap_zoom_to_min ((EditingHostPage*) self);
-#line 15322 "PhotoPage.c"
+#line 15313 "PhotoPage.c"
}
static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_snap_zoom_to_isomorphic ((EditingHostPage*) self);
-#line 15329 "PhotoPage.c"
+#line 15320 "PhotoPage.c"
}
static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_snap_zoom_to_max ((EditingHostPage*) self);
-#line 15336 "PhotoPage.c"
+#line 15327 "PhotoPage.c"
}
static void _library_photo_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_add_tags ((LibraryPhotoPage*) self);
-#line 15343 "PhotoPage.c"
+#line 15334 "PhotoPage.c"
}
static void _library_photo_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_modify_tags ((LibraryPhotoPage*) self);
-#line 15350 "PhotoPage.c"
+#line 15341 "PhotoPage.c"
}
static void _library_photo_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_slideshow ((LibraryPhotoPage*) self);
-#line 15357 "PhotoPage.c"
+#line 15348 "PhotoPage.c"
}
static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_on_action_toggle ((Page*) self, action, parameter);
-#line 15364 "PhotoPage.c"
+#line 15355 "PhotoPage.c"
}
static void _library_photo_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_display_ratings ((LibraryPhotoPage*) self, action, value);
-#line 15371 "PhotoPage.c"
+#line 15362 "PhotoPage.c"
}
static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
#line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_photos_altered ((LibraryPhotoPage*) self);
-#line 15378 "PhotoPage.c"
+#line 15369 "PhotoPage.c"
}
static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self) {
#line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_photo_unlinking ((LibraryPhotoPage*) self, unlinking);
-#line 15385 "PhotoPage.c"
+#line 15376 "PhotoPage.c"
}
static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self) {
#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_photo_relinked ((LibraryPhotoPage*) self, relinked);
-#line 15392 "PhotoPage.c"
+#line 15383 "PhotoPage.c"
}
LibraryPhotoPage* library_photo_page_construct (GType object_type) {
LibraryPhotoPage * self = NULL;
- LibraryPhotoSourceCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- ViewCollection* _tmp2_ = NULL;
- LibraryPhotoSourceCollection* _tmp3_ = NULL;
- LibraryPhotoSourceCollection* _tmp4_ = NULL;
- ConfigFacade* _tmp5_ = NULL;
- ConfigFacade* _tmp6_ = NULL;
- ViewCollection* _tmp7_ = NULL;
- ViewCollection* _tmp8_ = NULL;
- LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp9_ = NULL;
- LibraryPhotoSourceCollection* _tmp10_ = NULL;
- LibraryPhotoSourceCollection* _tmp11_ = NULL;
+ LibraryPhotoSourceCollection* _tmp0_;
+ ViewCollection* _tmp1_;
+ ViewCollection* _tmp2_;
+ LibraryPhotoSourceCollection* _tmp3_;
+ LibraryPhotoSourceCollection* _tmp4_;
+ ConfigFacade* _tmp5_;
+ ConfigFacade* _tmp6_;
+ ViewCollection* _tmp7_;
+ ViewCollection* _tmp8_;
+ LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp9_;
+ LibraryPhotoSourceCollection* _tmp10_;
+ LibraryPhotoSourceCollection* _tmp11_;
#line 2345 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = library_photo_global;
#line 2345 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15459,24 +15450,24 @@ LibraryPhotoPage* library_photo_page_construct (GType object_type) {
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-relinked", (GCallback) _library_photo_page_on_photo_relinked_source_collection_items_relinked, self, 0);
#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return self;
-#line 15458 "PhotoPage.c"
+#line 15449 "PhotoPage.c"
}
LibraryPhotoPage* library_photo_page_new (void) {
#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return library_photo_page_construct (TYPE_LIBRARY_PHOTO_PAGE);
-#line 15465 "PhotoPage.c"
+#line 15456 "PhotoPage.c"
}
gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, DataView* view) {
gboolean result = FALSE;
- DataView* _tmp0_ = NULL;
- DataSource* _tmp1_ = NULL;
- MediaSource* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- gboolean _tmp4_ = FALSE;
+ DataView* _tmp0_;
+ DataSource* _tmp1_;
+ MediaSource* _tmp2_;
+ gboolean _tmp3_;
+ gboolean _tmp4_;
#line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), FALSE);
#line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15497,12 +15488,12 @@ gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, Dat
result = _tmp4_;
#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 15496 "PhotoPage.c"
+#line 15487 "PhotoPage.c"
}
static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCollection* unlinking) {
- LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL;
+ LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_;
#line 2373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15511,12 +15502,12 @@ static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCo
_tmp0_ = self->priv->filter;
#line 2374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 15510 "PhotoPage.c"
+#line 15501 "PhotoPage.c"
}
static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCollection* relinked) {
- LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL;
+ LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_;
#line 2377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15525,15 +15516,15 @@ static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCol
_tmp0_ = self->priv->filter;
#line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 15524 "PhotoPage.c"
+#line 15515 "PhotoPage.c"
}
static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
LibraryPhotoPage * self;
- GeeList* _tmp0_ = NULL;
- GeeList* _tmp1_ = NULL;
- GeeList* _tmp2_ = NULL;
+ GeeList* _tmp0_;
+ GeeList* _tmp1_;
+ GeeList* _tmp2_;
#line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
#line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15550,55 +15541,55 @@ static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeLi
_tmp2_ = ui_filenames;
#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), "photo.ui");
-#line 15549 "PhotoPage.c"
+#line 15540 "PhotoPage.c"
}
static GVariant* _variant_new16 (gboolean value) {
#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 15556 "PhotoPage.c"
+#line 15547 "PhotoPage.c"
}
static GVariant* _variant_new17 (const gchar* value) {
#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return g_variant_ref_sink (g_variant_new_string (value));
-#line 15563 "PhotoPage.c"
+#line 15554 "PhotoPage.c"
}
static void _library_photo_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self) {
#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_raw_developer_changed ((LibraryPhotoPage*) self, _sender, value);
-#line 15570 "PhotoPage.c"
+#line 15561 "PhotoPage.c"
}
static void library_photo_page_real_add_actions (Page* base, GActionMap* map) {
LibraryPhotoPage * self;
- GActionMap* _tmp0_ = NULL;
- GActionMap* _tmp1_ = NULL;
- GAction* _tmp2_ = NULL;
- GSimpleAction* _tmp3_ = NULL;
- GSimpleAction* _tmp4_ = NULL;
- ConfigFacade* _tmp5_ = NULL;
- ConfigFacade* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
- GVariant* _tmp8_ = NULL;
+ GActionMap* _tmp0_;
+ GActionMap* _tmp1_;
+ GAction* _tmp2_;
+ GSimpleAction* _tmp3_;
+ GSimpleAction* _tmp4_;
+ ConfigFacade* _tmp5_;
+ ConfigFacade* _tmp6_;
+ gboolean _tmp7_;
+ GVariant* _tmp8_;
RawDeveloper d = 0;
- ConfigFacade* _tmp9_ = NULL;
- ConfigFacade* _tmp10_ = NULL;
- RawDeveloper _tmp11_ = 0;
- RawDeveloper _tmp12_ = 0;
+ ConfigFacade* _tmp9_;
+ ConfigFacade* _tmp10_;
+ RawDeveloper _tmp11_;
+ RawDeveloper _tmp12_;
const gchar* _tmp13_ = NULL;
- RawDeveloper _tmp14_ = 0;
+ RawDeveloper _tmp14_;
GSimpleAction* action = NULL;
- const GVariantType* _tmp15_ = NULL;
- GVariant* _tmp16_ = NULL;
- GSimpleAction* _tmp17_ = NULL;
- GSimpleAction* _tmp18_ = NULL;
- GActionMap* _tmp19_ = NULL;
+ const GVariantType* _tmp15_;
+ GVariant* _tmp16_;
+ GSimpleAction* _tmp17_;
+ GSimpleAction* _tmp18_;
+ GActionMap* _tmp19_;
#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15619,7 +15610,7 @@ static void library_photo_page_real_add_actions (Page* base, GActionMap* map) {
if (_tmp3_ == NULL) {
#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp2_);
-#line 15618 "PhotoPage.c"
+#line 15609 "PhotoPage.c"
}
#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = _tmp3_;
@@ -15657,11 +15648,11 @@ static void library_photo_page_real_add_actions (Page* base, GActionMap* map) {
if (_tmp14_ == RAW_DEVELOPER_SHOTWELL) {
#line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp13_ = "Shotwell";
-#line 15656 "PhotoPage.c"
+#line 15647 "PhotoPage.c"
} else {
#line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp13_ = "Camera";
-#line 15660 "PhotoPage.c"
+#line 15651 "PhotoPage.c"
}
#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp15_ = G_VARIANT_TYPE_STRING;
@@ -15685,13 +15676,13 @@ static void library_photo_page_real_add_actions (Page* base, GActionMap* map) {
g_action_map_add_action (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (action, g_action_get_type (), GAction));
#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (action);
-#line 15684 "PhotoPage.c"
+#line 15675 "PhotoPage.c"
}
static void library_photo_page_real_remove_actions (Page* base, GActionMap* map) {
LibraryPhotoPage * self;
- GActionMap* _tmp0_ = NULL;
+ GActionMap* _tmp0_;
#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15700,7 +15691,7 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map)
_tmp0_ = map;
#line 2454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
PAGE_CLASS (library_photo_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_);
-#line 15699 "PhotoPage.c"
+#line 15690 "PhotoPage.c"
{
GActionEntry* entry_collection = NULL;
gint entry_collection_length1 = 0;
@@ -15712,15 +15703,15 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map)
entry_collection_length1 = G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries);
#line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
for (entry_it = 0; entry_it < G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries); entry_it = entry_it + 1) {
-#line 15711 "PhotoPage.c"
+#line 15702 "PhotoPage.c"
GActionEntry entry = {0};
#line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
entry = entry_collection[entry_it];
-#line 15715 "PhotoPage.c"
+#line 15706 "PhotoPage.c"
{
- GActionMap* _tmp1_ = NULL;
- GActionEntry _tmp2_ = {0};
- const gchar* _tmp3_ = NULL;
+ GActionMap* _tmp1_;
+ GActionEntry _tmp2_;
+ const gchar* _tmp3_;
#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = map;
#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15729,7 +15720,7 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map)
_tmp3_ = _tmp2_.name;
#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 15728 "PhotoPage.c"
+#line 15719 "PhotoPage.c"
}
}
}
@@ -15739,58 +15730,58 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map)
static gpointer _injection_group_ref0 (gpointer self) {
#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return self ? injection_group_ref (self) : NULL;
-#line 15738 "PhotoPage.c"
+#line 15729 "PhotoPage.c"
}
-static void _vala_array_add82 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add82 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if ((*length) == (*size)) {
#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15749 "PhotoPage.c"
+#line 15740 "PhotoPage.c"
}
#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
(*array)[(*length)++] = value;
#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
(*array)[*length] = NULL;
-#line 15755 "PhotoPage.c"
+#line 15746 "PhotoPage.c"
}
-static void _vala_array_add83 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add83 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if ((*length) == (*size)) {
#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15766 "PhotoPage.c"
+#line 15757 "PhotoPage.c"
}
#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
(*array)[(*length)++] = value;
#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
(*array)[*length] = NULL;
-#line 15772 "PhotoPage.c"
+#line 15763 "PhotoPage.c"
}
-static void _vala_array_add84 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+static void _vala_array_add84 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if ((*length) == (*size)) {
#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15783 "PhotoPage.c"
+#line 15774 "PhotoPage.c"
}
#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
(*array)[(*length)++] = value;
#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
(*array)[*length] = NULL;
-#line 15789 "PhotoPage.c"
+#line 15780 "PhotoPage.c"
}
@@ -15798,30 +15789,27 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
LibraryPhotoPage * self;
InjectionGroup** result = NULL;
InjectionGroup** groups = NULL;
- gint _tmp0_ = 0;
- InjectionGroup** _tmp1_ = NULL;
- gint groups_length1 = 0;
- gint _groups_size_ = 0;
+ gint _tmp0_;
+ InjectionGroup** _tmp1_;
+ gint groups_length1;
+ gint _groups_size_;
InjectionGroup* print_group = NULL;
- InjectionGroup* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- InjectionGroup** _tmp4_ = NULL;
- gint _tmp4__length1 = 0;
- InjectionGroup* _tmp5_ = NULL;
+ InjectionGroup* _tmp2_;
+ InjectionGroup** _tmp3_;
+ gint _tmp3__length1;
+ InjectionGroup* _tmp4_;
InjectionGroup* publish_group = NULL;
- InjectionGroup* _tmp6_ = NULL;
- const gchar* _tmp7_ = NULL;
- InjectionGroup** _tmp8_ = NULL;
- gint _tmp8__length1 = 0;
- InjectionGroup* _tmp9_ = NULL;
+ InjectionGroup* _tmp5_;
+ InjectionGroup** _tmp6_;
+ gint _tmp6__length1;
+ InjectionGroup* _tmp7_;
InjectionGroup* bg_group = NULL;
- InjectionGroup* _tmp10_ = NULL;
- const gchar* _tmp11_ = NULL;
- InjectionGroup** _tmp12_ = NULL;
- gint _tmp12__length1 = 0;
- InjectionGroup* _tmp13_ = NULL;
- InjectionGroup** _tmp14_ = NULL;
- gint _tmp14__length1 = 0;
+ InjectionGroup* _tmp8_;
+ InjectionGroup** _tmp9_;
+ gint _tmp9__length1;
+ InjectionGroup* _tmp10_;
+ InjectionGroup** _tmp11_;
+ gint _tmp11__length1;
#line 2460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
#line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15837,61 +15825,55 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
print_group = _tmp2_;
#line 2464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp3_ = _ ("_Print");
-#line 2464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- injection_group_add_menu_item (print_group, _tmp3_, "Print", "<Primary>p");
+ injection_group_add_menu_item (print_group, _ ("_Print"), "Print", "<Primary>p");
#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp4_ = groups;
+ _tmp3_ = groups;
#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp4__length1 = groups_length1;
+ _tmp3__length1 = groups_length1;
#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp5_ = _injection_group_ref0 (print_group);
+ _tmp4_ = _injection_group_ref0 (print_group);
#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _vala_array_add82 (&groups, &groups_length1, &_groups_size_, _tmp5_);
+ _vala_array_add82 (&groups, &groups_length1, &_groups_size_, _tmp4_);
#line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp6_ = injection_group_new ("PublishPlaceholder");
+ _tmp5_ = injection_group_new ("PublishPlaceholder");
#line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- publish_group = _tmp6_;
-#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp7_ = _ ("_Publish");
+ publish_group = _tmp5_;
#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- injection_group_add_menu_item (publish_group, _tmp7_, "Publish", "<Primary><Shift>p");
+ injection_group_add_menu_item (publish_group, _ ("_Publish"), "Publish", "<Primary><Shift>p");
#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp8_ = groups;
+ _tmp6_ = groups;
#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp8__length1 = groups_length1;
+ _tmp6__length1 = groups_length1;
#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp9_ = _injection_group_ref0 (publish_group);
+ _tmp7_ = _injection_group_ref0 (publish_group);
#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _vala_array_add83 (&groups, &groups_length1, &_groups_size_, _tmp9_);
+ _vala_array_add83 (&groups, &groups_length1, &_groups_size_, _tmp7_);
#line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp10_ = injection_group_new ("SetBackgroundPlaceholder");
+ _tmp8_ = injection_group_new ("SetBackgroundPlaceholder");
#line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- bg_group = _tmp10_;
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp11_ = _ ("Set as _Desktop Background");
+ bg_group = _tmp8_;
#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- injection_group_add_menu_item (bg_group, _tmp11_, "SetBackground", "<Primary>b");
+ injection_group_add_menu_item (bg_group, _ ("Set as _Desktop Background"), "SetBackground", "<Primary>b");
#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp12_ = groups;
+ _tmp9_ = groups;
#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp12__length1 = groups_length1;
+ _tmp9__length1 = groups_length1;
#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp13_ = _injection_group_ref0 (bg_group);
+ _tmp10_ = _injection_group_ref0 (bg_group);
#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _vala_array_add84 (&groups, &groups_length1, &_groups_size_, _tmp13_);
+ _vala_array_add84 (&groups, &groups_length1, &_groups_size_, _tmp10_);
#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp14_ = groups;
+ _tmp11_ = groups;
#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp14__length1 = groups_length1;
+ _tmp11__length1 = groups_length1;
#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (result_length1) {
#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- *result_length1 = _tmp14__length1;
-#line 15887 "PhotoPage.c"
+ *result_length1 = _tmp11__length1;
+#line 15869 "PhotoPage.c"
}
#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- result = _tmp14_;
+ result = _tmp11_;
#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_injection_group_unref0 (bg_group);
#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15900,18 +15882,18 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
_injection_group_unref0 (print_group);
#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 15899 "PhotoPage.c"
+#line 15881 "PhotoPage.c"
}
static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value) {
gboolean display = FALSE;
- GVariant* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- ConfigFacade* _tmp2_ = NULL;
- ConfigFacade* _tmp3_ = NULL;
- GSimpleAction* _tmp4_ = NULL;
- GVariant* _tmp5_ = NULL;
+ GVariant* _tmp0_;
+ gboolean _tmp1_;
+ ConfigFacade* _tmp2_;
+ ConfigFacade* _tmp3_;
+ GSimpleAction* _tmp4_;
+ GVariant* _tmp5_;
#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15938,15 +15920,15 @@ static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GSimp
_tmp5_ = value;
#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 15937 "PhotoPage.c"
+#line 15919 "PhotoPage.c"
}
static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboolean display) {
GSimpleAction* action = NULL;
- GAction* _tmp0_ = NULL;
- GSimpleAction* _tmp1_ = NULL;
- GSimpleAction* _tmp2_ = NULL;
+ GAction* _tmp0_;
+ GSimpleAction* _tmp1_;
+ GSimpleAction* _tmp2_;
#line 2491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15957,7 +15939,7 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo
if (_tmp1_ == NULL) {
#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp0_);
-#line 15956 "PhotoPage.c"
+#line 15938 "PhotoPage.c"
}
#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
action = _tmp1_;
@@ -15965,57 +15947,57 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo
_tmp2_ = action;
#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp2_ != NULL) {
-#line 15964 "PhotoPage.c"
- GSimpleAction* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+#line 15946 "PhotoPage.c"
+ GSimpleAction* _tmp3_;
+ gboolean _tmp4_;
#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = action;
#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = display;
#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_simple_action_set_enabled (_tmp3_, _tmp4_);
-#line 15973 "PhotoPage.c"
+#line 15955 "PhotoPage.c"
}
#line 2491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (action);
-#line 15977 "PhotoPage.c"
+#line 15959 "PhotoPage.c"
}
static void library_photo_page_real_update_actions (Page* base, gint selected_count, gint count) {
LibraryPhotoPage * self;
gboolean multiple = FALSE;
- ViewCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gboolean _tmp3_ = FALSE;
+ ViewCollection* _tmp0_;
+ ViewCollection* _tmp1_;
+ gint _tmp2_;
+ gboolean _tmp3_;
gboolean _tmp4_ = FALSE;
- gboolean _tmp5_ = FALSE;
+ gboolean _tmp5_;
gboolean rotate_possible = FALSE;
gboolean _tmp9_ = FALSE;
- gboolean _tmp10_ = FALSE;
+ gboolean _tmp10_;
gboolean is_raw = FALSE;
gboolean _tmp14_ = FALSE;
- gboolean _tmp15_ = FALSE;
+ gboolean _tmp15_;
gboolean _tmp20_ = FALSE;
- gboolean _tmp21_ = FALSE;
+ gboolean _tmp21_;
gboolean _tmp30_ = FALSE;
- gboolean _tmp31_ = FALSE;
- gboolean _tmp33_ = FALSE;
+ gboolean _tmp31_;
+ gboolean _tmp33_;
gboolean _tmp34_ = FALSE;
- gboolean _tmp35_ = FALSE;
- gboolean _tmp39_ = FALSE;
- gboolean _tmp40_ = FALSE;
- gboolean _tmp41_ = FALSE;
- gboolean _tmp42_ = FALSE;
- gboolean _tmp43_ = FALSE;
- gboolean _tmp44_ = FALSE;
- gboolean _tmp45_ = FALSE;
- gboolean _tmp46_ = FALSE;
+ gboolean _tmp35_;
+ gboolean _tmp39_;
+ gboolean _tmp40_;
+ gboolean _tmp41_;
+ gboolean _tmp42_;
+ gboolean _tmp43_;
+ gboolean _tmp44_;
+ gboolean _tmp45_;
+ gboolean _tmp46_;
gboolean _tmp55_ = FALSE;
- gboolean _tmp56_ = FALSE;
- gint _tmp61_ = 0;
- gint _tmp62_ = 0;
+ gboolean _tmp56_;
+ gint _tmp61_;
+ gint _tmp62_;
#line 2497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16034,10 +16016,10 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
_tmp5_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp5_) {
-#line 16033 "PhotoPage.c"
- Photo* _tmp6_ = NULL;
- Photo* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
+#line 16015 "PhotoPage.c"
+ Photo* _tmp6_;
+ Photo* _tmp7_;
+ gboolean _tmp8_;
#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16048,11 +16030,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
_tmp4_ = _tmp8_;
#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp7_);
-#line 16047 "PhotoPage.c"
+#line 16029 "PhotoPage.c"
} else {
#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = FALSE;
-#line 16051 "PhotoPage.c"
+#line 16033 "PhotoPage.c"
}
#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
rotate_possible = _tmp4_;
@@ -16060,10 +16042,10 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
_tmp10_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp10_) {
-#line 16059 "PhotoPage.c"
- Photo* _tmp11_ = NULL;
- Photo* _tmp12_ = NULL;
- PhotoFileFormat _tmp13_ = 0;
+#line 16041 "PhotoPage.c"
+ Photo* _tmp11_;
+ Photo* _tmp12_;
+ PhotoFileFormat _tmp13_;
#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16074,11 +16056,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
_tmp9_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW;
#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp12_);
-#line 16073 "PhotoPage.c"
+#line 16055 "PhotoPage.c"
} else {
#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp9_ = FALSE;
-#line 16077 "PhotoPage.c"
+#line 16059 "PhotoPage.c"
}
#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
is_raw = _tmp9_;
@@ -16086,11 +16068,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
_tmp15_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp15_) {
-#line 16085 "PhotoPage.c"
- ConfigFacade* _tmp16_ = NULL;
- ConfigFacade* _tmp17_ = NULL;
- gchar* _tmp18_ = NULL;
- gchar* _tmp19_ = NULL;
+#line 16067 "PhotoPage.c"
+ ConfigFacade* _tmp16_;
+ ConfigFacade* _tmp17_;
+ gchar* _tmp18_;
+ gchar* _tmp19_;
#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp16_ = config_facade_get_instance ();
#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16105,11 +16087,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
_g_free0 (_tmp19_);
#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp17_);
-#line 16104 "PhotoPage.c"
+#line 16086 "PhotoPage.c"
} else {
#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp14_ = FALSE;
-#line 16108 "PhotoPage.c"
+#line 16090 "PhotoPage.c"
}
#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp14_);
@@ -16117,12 +16099,12 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
_tmp21_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp21_) {
-#line 16116 "PhotoPage.c"
+#line 16098 "PhotoPage.c"
gboolean _tmp22_ = FALSE;
- Photo* _tmp23_ = NULL;
- Photo* _tmp24_ = NULL;
- gboolean _tmp25_ = FALSE;
- gboolean _tmp26_ = FALSE;
+ Photo* _tmp23_;
+ Photo* _tmp24_;
+ gboolean _tmp25_;
+ gboolean _tmp26_;
#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp23_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16137,11 +16119,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
if (_tmp26_) {
#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp22_ = TRUE;
-#line 16136 "PhotoPage.c"
+#line 16118 "PhotoPage.c"
} else {
- Photo* _tmp27_ = NULL;
- Photo* _tmp28_ = NULL;
- gboolean _tmp29_ = FALSE;
+ Photo* _tmp27_;
+ Photo* _tmp28_;
+ gboolean _tmp29_;
#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp27_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16152,15 +16134,15 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
_tmp22_ = _tmp29_;
#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp28_);
-#line 16151 "PhotoPage.c"
+#line 16133 "PhotoPage.c"
}
#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp20_ = _tmp22_;
-#line 16155 "PhotoPage.c"
+#line 16137 "PhotoPage.c"
} else {
#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp20_ = FALSE;
-#line 16159 "PhotoPage.c"
+#line 16141 "PhotoPage.c"
}
#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp20_);
@@ -16168,17 +16150,17 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
_tmp31_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp31_) {
-#line 16167 "PhotoPage.c"
- gboolean _tmp32_ = FALSE;
+#line 16149 "PhotoPage.c"
+ gboolean _tmp32_;
#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp32_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp30_ = !_tmp32_;
-#line 16173 "PhotoPage.c"
+#line 16155 "PhotoPage.c"
} else {
#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp30_ = FALSE;
-#line 16177 "PhotoPage.c"
+#line 16159 "PhotoPage.c"
}
#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp30_) {
@@ -16186,7 +16168,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
library_photo_page_update_rating_menu_item_sensitivity (self);
#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_update_development_menu_item_sensitivity (self);
-#line 16185 "PhotoPage.c"
+#line 16167 "PhotoPage.c"
}
#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp33_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -16196,10 +16178,10 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
_tmp35_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp35_) {
-#line 16195 "PhotoPage.c"
- Photo* _tmp36_ = NULL;
- Photo* _tmp37_ = NULL;
- gboolean _tmp38_ = FALSE;
+#line 16177 "PhotoPage.c"
+ Photo* _tmp36_;
+ Photo* _tmp37_;
+ gboolean _tmp38_;
#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp36_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16210,11 +16192,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
_tmp34_ = _tmp38_;
#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp37_);
-#line 16209 "PhotoPage.c"
+#line 16191 "PhotoPage.c"
} else {
#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp34_ = FALSE;
-#line 16213 "PhotoPage.c"
+#line 16195 "PhotoPage.c"
}
#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp34_);
@@ -16250,15 +16232,15 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
_tmp46_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp46_) {
-#line 16249 "PhotoPage.c"
- Photo* _tmp47_ = NULL;
- Photo* _tmp48_ = NULL;
+#line 16231 "PhotoPage.c"
+ Photo* _tmp47_;
+ Photo* _tmp48_;
Scaling _tmp49_ = {0};
- gboolean _tmp50_ = FALSE;
- Photo* _tmp51_ = NULL;
- Photo* _tmp52_ = NULL;
+ gboolean _tmp50_;
+ Photo* _tmp51_;
+ Photo* _tmp52_;
Scaling _tmp53_ = {0};
- gboolean _tmp54_ = FALSE;
+ gboolean _tmp54_;
#line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp47_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16283,7 +16265,7 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp54_);
#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp52_);
-#line 16282 "PhotoPage.c"
+#line 16264 "PhotoPage.c"
}
#line 2531 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_update_flag_action (self);
@@ -16291,11 +16273,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
_tmp56_ = is_raw;
#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp56_) {
-#line 16290 "PhotoPage.c"
- ConfigFacade* _tmp57_ = NULL;
- ConfigFacade* _tmp58_ = NULL;
- gchar* _tmp59_ = NULL;
- gchar* _tmp60_ = NULL;
+#line 16272 "PhotoPage.c"
+ ConfigFacade* _tmp57_;
+ ConfigFacade* _tmp58_;
+ gchar* _tmp59_;
+ gchar* _tmp60_;
#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp57_ = config_facade_get_instance ();
#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16310,11 +16292,11 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
_g_free0 (_tmp60_);
#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp58_);
-#line 16309 "PhotoPage.c"
+#line 16291 "PhotoPage.c"
} else {
#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp55_ = FALSE;
-#line 16313 "PhotoPage.c"
+#line 16295 "PhotoPage.c"
}
#line 2533 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp55_);
@@ -16324,25 +16306,25 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
_tmp62_ = count;
#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
PAGE_CLASS (library_photo_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp61_, _tmp62_);
-#line 16323 "PhotoPage.c"
+#line 16305 "PhotoPage.c"
}
static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) {
gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
#line 2539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp1_) {
-#line 16336 "PhotoPage.c"
+#line 16318 "PhotoPage.c"
gboolean _tmp2_ = FALSE;
- Photo* _tmp3_ = NULL;
- Photo* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- gboolean _tmp6_ = FALSE;
+ Photo* _tmp3_;
+ Photo* _tmp4_;
+ gboolean _tmp5_;
+ gboolean _tmp6_;
#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16357,11 +16339,11 @@ static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) {
if (_tmp6_) {
#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = TRUE;
-#line 16356 "PhotoPage.c"
+#line 16338 "PhotoPage.c"
} else {
- Photo* _tmp7_ = NULL;
- Photo* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+ Photo* _tmp7_;
+ Photo* _tmp8_;
+ gboolean _tmp9_;
#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16372,38 +16354,38 @@ static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) {
_tmp2_ = _tmp9_;
#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp8_);
-#line 16371 "PhotoPage.c"
+#line 16353 "PhotoPage.c"
}
#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = _tmp2_;
-#line 16375 "PhotoPage.c"
+#line 16357 "PhotoPage.c"
} else {
#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = FALSE;
-#line 16379 "PhotoPage.c"
+#line 16361 "PhotoPage.c"
}
#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp0_);
#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_update_flag_action (self);
-#line 16385 "PhotoPage.c"
+#line 16367 "PhotoPage.c"
}
static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value) {
RawDeveloper developer = 0;
- GVariant* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
+ GVariant* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
GQuark _tmp4_ = 0U;
#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
static GQuark _tmp3_label0 = 0;
#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
static GQuark _tmp3_label1 = 0;
-#line 16399 "PhotoPage.c"
- RawDeveloper _tmp5_ = 0;
- GSimpleAction* _tmp6_ = NULL;
- GVariant* _tmp7_ = NULL;
+#line 16381 "PhotoPage.c"
+ RawDeveloper _tmp5_;
+ GSimpleAction* _tmp6_;
+ GVariant* _tmp7_;
#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16422,38 +16404,38 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self,
if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Shotwell")))) {
#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 16421 "PhotoPage.c"
+#line 16403 "PhotoPage.c"
default:
{
#line 2551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
developer = RAW_DEVELOPER_SHOTWELL;
#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 16428 "PhotoPage.c"
+#line 16410 "PhotoPage.c"
}
}
} else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Camera")))) {
#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 16434 "PhotoPage.c"
+#line 16416 "PhotoPage.c"
default:
{
#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
developer = RAW_DEVELOPER_CAMERA;
#line 2555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 16441 "PhotoPage.c"
+#line 16423 "PhotoPage.c"
}
}
} else {
#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 16447 "PhotoPage.c"
+#line 16429 "PhotoPage.c"
default:
{
#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 16452 "PhotoPage.c"
+#line 16434 "PhotoPage.c"
}
}
}
@@ -16467,30 +16449,30 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self,
_tmp7_ = value;
#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_simple_action_set_state (_tmp6_, _tmp7_);
-#line 16466 "PhotoPage.c"
+#line 16448 "PhotoPage.c"
}
static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, RawDeveloper rd) {
- ViewCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gboolean _tmp3_ = FALSE;
+ ViewCollection* _tmp0_;
+ ViewCollection* _tmp1_;
+ gint _tmp2_;
+ gboolean _tmp3_;
Photo* photo = NULL;
- ViewCollection* _tmp4_ = NULL;
- ViewCollection* _tmp5_ = NULL;
- GeeList* _tmp6_ = NULL;
- GeeList* _tmp7_ = NULL;
- gpointer _tmp8_ = NULL;
- DataView* _tmp9_ = NULL;
- DataSource* _tmp10_ = NULL;
- Photo* _tmp11_ = NULL;
- Photo* _tmp12_ = NULL;
+ ViewCollection* _tmp4_;
+ ViewCollection* _tmp5_;
+ GeeList* _tmp6_;
+ GeeList* _tmp7_;
+ gpointer _tmp8_;
+ DataView* _tmp9_;
+ DataSource* _tmp10_;
+ Photo* _tmp11_;
+ Photo* _tmp12_;
gboolean _tmp13_ = FALSE;
- Photo* _tmp14_ = NULL;
+ Photo* _tmp14_;
gboolean _tmp19_ = FALSE;
- Photo* _tmp20_ = NULL;
- gboolean _tmp21_ = FALSE;
+ Photo* _tmp20_;
+ gboolean _tmp21_;
#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16505,7 +16487,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
if (_tmp3_) {
#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 16504 "PhotoPage.c"
+#line 16486 "PhotoPage.c"
}
#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -16527,7 +16509,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
if (_tmp11_ == NULL) {
#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp10_);
-#line 16526 "PhotoPage.c"
+#line 16508 "PhotoPage.c"
}
#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp12_ = _tmp11_;
@@ -16545,12 +16527,12 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
if (_tmp14_ == NULL) {
#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp13_ = TRUE;
-#line 16544 "PhotoPage.c"
+#line 16526 "PhotoPage.c"
} else {
- RawDeveloper _tmp15_ = 0;
- Photo* _tmp16_ = NULL;
- RawDeveloper _tmp17_ = 0;
- gboolean _tmp18_ = FALSE;
+ RawDeveloper _tmp15_;
+ Photo* _tmp16_;
+ RawDeveloper _tmp17_;
+ gboolean _tmp18_;
#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp15_ = rd;
#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16561,7 +16543,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
_tmp18_ = raw_developer_is_equivalent (_tmp15_, _tmp17_);
#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp13_ = _tmp18_;
-#line 16560 "PhotoPage.c"
+#line 16542 "PhotoPage.c"
}
#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp13_) {
@@ -16569,7 +16551,7 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
_g_object_unref0 (photo);
#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 16568 "PhotoPage.c"
+#line 16550 "PhotoPage.c"
}
#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp20_ = photo;
@@ -16579,29 +16561,29 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
if (!_tmp21_) {
#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp19_ = TRUE;
-#line 16578 "PhotoPage.c"
+#line 16560 "PhotoPage.c"
} else {
- gboolean _tmp22_ = FALSE;
+ gboolean _tmp22_;
#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp22_ = dialogs_confirm_warn_developer_changed (1);
#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp19_ = _tmp22_;
-#line 16585 "PhotoPage.c"
+#line 16567 "PhotoPage.c"
}
#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp19_) {
-#line 16589 "PhotoPage.c"
+#line 16571 "PhotoPage.c"
SetRawDeveloperCommand* command = NULL;
- ViewCollection* _tmp23_ = NULL;
- ViewCollection* _tmp24_ = NULL;
- GeeList* _tmp25_ = NULL;
- GeeList* _tmp26_ = NULL;
- RawDeveloper _tmp27_ = 0;
- SetRawDeveloperCommand* _tmp28_ = NULL;
- SetRawDeveloperCommand* _tmp29_ = NULL;
- CommandManager* _tmp30_ = NULL;
- CommandManager* _tmp31_ = NULL;
- SetRawDeveloperCommand* _tmp32_ = NULL;
+ ViewCollection* _tmp23_;
+ ViewCollection* _tmp24_;
+ GeeList* _tmp25_;
+ GeeList* _tmp26_;
+ RawDeveloper _tmp27_;
+ SetRawDeveloperCommand* _tmp28_;
+ SetRawDeveloperCommand* _tmp29_;
+ CommandManager* _tmp30_;
+ CommandManager* _tmp31_;
+ SetRawDeveloperCommand* _tmp32_;
#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16636,11 +16618,11 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
library_photo_page_update_development_menu_item_sensitivity (self);
#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (command);
-#line 16635 "PhotoPage.c"
+#line 16617 "PhotoPage.c"
}
#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (photo);
-#line 16639 "PhotoPage.c"
+#line 16621 "PhotoPage.c"
}
@@ -16649,36 +16631,36 @@ void library_photo_page_developer_changed (LibraryPhotoPage* self, RawDeveloper
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
LIBRARY_PHOTO_PAGE_GET_CLASS (self)->developer_changed (self, rd);
-#line 16648 "PhotoPage.c"
+#line 16630 "PhotoPage.c"
}
static void library_photo_page_update_flag_action (LibraryPhotoPage* self) {
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", _tmp0_);
-#line 16660 "PhotoPage.c"
+#line 16642 "PhotoPage.c"
}
static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) {
#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_page_destroyed ((LibraryPhotoPage*) self);
-#line 16667 "PhotoPage.c"
+#line 16649 "PhotoPage.c"
}
void library_photo_page_display_for_collection (LibraryPhotoPage* self, CollectionPage* return_page, Photo* photo, ViewCollection* view) {
- CollectionPage* _tmp0_ = NULL;
- CollectionPage* _tmp1_ = NULL;
- CollectionPage* _tmp2_ = NULL;
+ CollectionPage* _tmp0_;
+ CollectionPage* _tmp1_;
+ CollectionPage* _tmp2_;
ViewCollection* _tmp3_ = NULL;
- ViewCollection* _tmp4_ = NULL;
- Photo* _tmp9_ = NULL;
+ ViewCollection* _tmp4_;
+ Photo* _tmp9_;
#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16703,9 +16685,9 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti
_tmp4_ = view;
#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp4_ != NULL) {
-#line 16702 "PhotoPage.c"
- ViewCollection* _tmp5_ = NULL;
- ViewCollection* _tmp6_ = NULL;
+#line 16684 "PhotoPage.c"
+ ViewCollection* _tmp5_;
+ ViewCollection* _tmp6_;
#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = view;
#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16714,10 +16696,10 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti
_data_collection_unref0 (_tmp3_);
#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = _tmp6_;
-#line 16713 "PhotoPage.c"
+#line 16695 "PhotoPage.c"
} else {
- CollectionPage* _tmp7_ = NULL;
- ViewCollection* _tmp8_ = NULL;
+ CollectionPage* _tmp7_;
+ ViewCollection* _tmp8_;
#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp7_ = return_page;
#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16726,7 +16708,7 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti
_data_collection_unref0 (_tmp3_);
#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = _tmp8_;
-#line 16725 "PhotoPage.c"
+#line 16707 "PhotoPage.c"
}
#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp9_ = photo;
@@ -16734,7 +16716,7 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti
editing_host_page_display_copy_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp3_, _tmp9_);
#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_data_collection_unref0 (_tmp3_);
-#line 16733 "PhotoPage.c"
+#line 16715 "PhotoPage.c"
}
@@ -16747,14 +16729,14 @@ void library_photo_page_on_page_destroyed (LibraryPhotoPage* self) {
self->priv->return_page = NULL;
#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
editing_host_page_unset_view_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 16746 "PhotoPage.c"
+#line 16728 "PhotoPage.c"
}
CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self) {
CollectionPage* result = NULL;
- CollectionPage* _tmp0_ = NULL;
- CollectionPage* _tmp1_ = NULL;
+ CollectionPage* _tmp0_;
+ CollectionPage* _tmp1_;
#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), NULL);
#line 2608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16765,17 +16747,17 @@ CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self)
result = _tmp1_;
#line 2608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 16764 "PhotoPage.c"
+#line 16746 "PhotoPage.c"
}
static void library_photo_page_real_switched_to (Page* base) {
LibraryPhotoPage * self;
- Photo* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- ConfigFacade* _tmp2_ = NULL;
- ConfigFacade* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ Photo* _tmp0_;
+ Photo* _tmp1_;
+ ConfigFacade* _tmp2_;
+ ConfigFacade* _tmp3_;
+ gboolean _tmp4_;
#line 2611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16802,7 +16784,7 @@ static void library_photo_page_real_switched_to (Page* base) {
library_photo_page_set_display_ratings (self, _tmp4_);
#line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp3_);
-#line 16801 "PhotoPage.c"
+#line 16783 "PhotoPage.c"
}
@@ -16812,7 +16794,7 @@ static void library_photo_page_real_switching_from (Page* base) {
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
PAGE_CLASS (library_photo_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page));
-#line 16811 "PhotoPage.c"
+#line 16793 "PhotoPage.c"
{
GActionEntry* entry_collection = NULL;
gint entry_collection_length1 = 0;
@@ -16824,16 +16806,16 @@ static void library_photo_page_real_switching_from (Page* base) {
entry_collection_length1 = G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries);
#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
for (entry_it = 0; entry_it < G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries); entry_it = entry_it + 1) {
-#line 16823 "PhotoPage.c"
+#line 16805 "PhotoPage.c"
GActionEntry entry = {0};
#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
entry = entry_collection[entry_it];
-#line 16827 "PhotoPage.c"
+#line 16809 "PhotoPage.c"
{
- AppWindow* _tmp0_ = NULL;
- AppWindow* _tmp1_ = NULL;
- GActionEntry _tmp2_ = {0};
- const gchar* _tmp3_ = NULL;
+ AppWindow* _tmp0_;
+ AppWindow* _tmp1_;
+ GActionEntry _tmp2_;
+ const gchar* _tmp3_;
#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = app_window_get_instance ();
#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16846,7 +16828,7 @@ static void library_photo_page_real_switching_from (Page* base) {
g_action_map_remove_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), _tmp3_);
#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp1_);
-#line 16845 "PhotoPage.c"
+#line 16827 "PhotoPage.c"
}
}
}
@@ -16857,13 +16839,13 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
LibraryPhotoPage * self;
GdkPixbuf* result = NULL;
gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
- Photo* _tmp5_ = NULL;
- LibraryPhoto* _tmp6_ = NULL;
- Rating _tmp7_ = 0;
- gint _tmp8_ = 0;
- GdkPixbuf* _tmp9_ = NULL;
- GdkPixbuf* _tmp10_ = NULL;
+ gboolean _tmp1_;
+ Photo* _tmp5_;
+ LibraryPhoto* _tmp6_;
+ Rating _tmp7_;
+ gint _tmp8_;
+ GdkPixbuf* _tmp9_;
+ GdkPixbuf* _tmp10_;
#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16872,11 +16854,11 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
if (!_tmp1_) {
#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = TRUE;
-#line 16871 "PhotoPage.c"
+#line 16853 "PhotoPage.c"
} else {
- ConfigFacade* _tmp2_ = NULL;
- ConfigFacade* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ ConfigFacade* _tmp2_;
+ ConfigFacade* _tmp3_;
+ gboolean _tmp4_;
#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = config_facade_get_instance ();
#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16887,7 +16869,7 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
_tmp0_ = !_tmp4_;
#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp3_);
-#line 16886 "PhotoPage.c"
+#line 16868 "PhotoPage.c"
}
#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
@@ -16895,7 +16877,7 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
result = NULL;
#line 2635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 16894 "PhotoPage.c"
+#line 16876 "PhotoPage.c"
}
#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -16915,7 +16897,7 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
result = _tmp10_;
#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 16914 "PhotoPage.c"
+#line 16896 "PhotoPage.c"
}
@@ -16923,8 +16905,8 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
LibraryPhotoPage * self;
GdkPixbuf* result = NULL;
gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
- GdkPixbuf* _tmp5_ = NULL;
+ gboolean _tmp1_;
+ GdkPixbuf* _tmp5_;
#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16933,11 +16915,11 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
if (!_tmp1_) {
#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = TRUE;
-#line 16932 "PhotoPage.c"
+#line 16914 "PhotoPage.c"
} else {
- Photo* _tmp2_ = NULL;
- LibraryPhoto* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ Photo* _tmp2_;
+ LibraryPhoto* _tmp3_;
+ gboolean _tmp4_;
#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16948,7 +16930,7 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
_tmp0_ = !_tmp4_;
#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp3_);
-#line 16947 "PhotoPage.c"
+#line 16929 "PhotoPage.c"
}
#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
@@ -16956,7 +16938,7 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
result = NULL;
#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 16955 "PhotoPage.c"
+#line 16937 "PhotoPage.c"
}
#line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE);
@@ -16964,22 +16946,22 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
result = _tmp5_;
#line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 16963 "PhotoPage.c"
+#line 16945 "PhotoPage.c"
}
static void library_photo_page_on_slideshow (LibraryPhotoPage* self) {
LibraryPhoto* photo = NULL;
- Photo* _tmp0_ = NULL;
- LibraryPhoto* _tmp1_ = NULL;
- AppWindow* _tmp2_ = NULL;
- AppWindow* _tmp3_ = NULL;
- LibraryPhotoSourceCollection* _tmp4_ = NULL;
- ViewCollection* _tmp5_ = NULL;
- ViewCollection* _tmp6_ = NULL;
- LibraryPhoto* _tmp7_ = NULL;
- SlideshowPage* _tmp8_ = NULL;
- SlideshowPage* _tmp9_ = NULL;
+ Photo* _tmp0_;
+ LibraryPhoto* _tmp1_;
+ AppWindow* _tmp2_;
+ AppWindow* _tmp3_;
+ LibraryPhotoSourceCollection* _tmp4_;
+ ViewCollection* _tmp5_;
+ ViewCollection* _tmp6_;
+ LibraryPhoto* _tmp7_;
+ SlideshowPage* _tmp8_;
+ SlideshowPage* _tmp9_;
#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16994,7 +16976,7 @@ static void library_photo_page_on_slideshow (LibraryPhotoPage* self) {
_g_object_unref0 (photo);
#line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 16993 "PhotoPage.c"
+#line 16975 "PhotoPage.c"
}
#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = app_window_get_instance ();
@@ -17024,17 +17006,17 @@ static void library_photo_page_on_slideshow (LibraryPhotoPage* self) {
_g_object_unref0 (_tmp3_);
#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (photo);
-#line 17023 "PhotoPage.c"
+#line 17005 "PhotoPage.c"
}
static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPage* self) {
gboolean _tmp0_ = FALSE;
ZoomState _tmp1_ = {0};
- gboolean _tmp2_ = FALSE;
+ gboolean _tmp2_;
gboolean _tmp4_ = FALSE;
ZoomState _tmp5_ = {0};
- gboolean _tmp6_ = FALSE;
+ gboolean _tmp6_;
#line 2656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17043,17 +17025,17 @@ static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPa
_tmp2_ = zoom_state_is_max (&_tmp1_);
#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (!_tmp2_) {
-#line 17042 "PhotoPage.c"
- gboolean _tmp3_ = FALSE;
+#line 17024 "PhotoPage.c"
+ gboolean _tmp3_;
#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = !_tmp3_;
-#line 17048 "PhotoPage.c"
+#line 17030 "PhotoPage.c"
} else {
#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = FALSE;
-#line 17052 "PhotoPage.c"
+#line 17034 "PhotoPage.c"
}
#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_);
@@ -17063,21 +17045,21 @@ static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPa
_tmp6_ = zoom_state_is_default (&_tmp5_);
#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (!_tmp6_) {
-#line 17062 "PhotoPage.c"
- gboolean _tmp7_ = FALSE;
+#line 17044 "PhotoPage.c"
+ gboolean _tmp7_;
#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp7_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = !_tmp7_;
-#line 17068 "PhotoPage.c"
+#line 17050 "PhotoPage.c"
} else {
#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = FALSE;
-#line 17072 "PhotoPage.c"
+#line 17054 "PhotoPage.c"
}
#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_);
-#line 17076 "PhotoPage.c"
+#line 17058 "PhotoPage.c"
}
@@ -17089,7 +17071,7 @@ static void library_photo_page_real_on_increase_size (EditingHostPage* base) {
EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_increase_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 17088 "PhotoPage.c"
+#line 17070 "PhotoPage.c"
}
@@ -17101,18 +17083,18 @@ static void library_photo_page_real_on_decrease_size (EditingHostPage* base) {
EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_decrease_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 17100 "PhotoPage.c"
+#line 17082 "PhotoPage.c"
}
static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPage* base, GdkEventKey* event) {
LibraryPhotoPage * self;
gboolean result = FALSE;
- GdkEventKey* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- GdkEventKey* _tmp2_ = NULL;
- guint _tmp3_ = 0U;
- const gchar* _tmp4_ = NULL;
+ GdkEventKey* _tmp0_;
+ gboolean _tmp1_;
+ GdkEventKey* _tmp2_;
+ guint _tmp3_;
+ const gchar* _tmp4_;
#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17127,7 +17109,7 @@ static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPag
result = TRUE;
#line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 17126 "PhotoPage.c"
+#line 17108 "PhotoPage.c"
}
#line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = event;
@@ -17143,13 +17125,13 @@ static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPag
result = TRUE;
#line 2679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 17142 "PhotoPage.c"
+#line 17124 "PhotoPage.c"
} else {
#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
result = FALSE;
#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 17148 "PhotoPage.c"
+#line 17130 "PhotoPage.c"
}
}
@@ -17157,8 +17139,8 @@ static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPag
static void library_photo_page_real_update_ui (EditingHostPage* base, gboolean missing) {
LibraryPhotoPage * self;
gboolean sensitivity = FALSE;
- gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp0_;
+ gboolean _tmp1_;
#line 2685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17229,15 +17211,15 @@ static void library_photo_page_real_update_ui (EditingHostPage* base, gboolean m
_tmp1_ = missing;
#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->update_ui (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp1_);
-#line 17228 "PhotoPage.c"
+#line 17210 "PhotoPage.c"
}
static void library_photo_page_real_notify_photo_backing_missing (EditingHostPage* base, Photo* photo, gboolean missing) {
LibraryPhotoPage * self;
- gboolean _tmp0_ = FALSE;
- Photo* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ gboolean _tmp0_;
+ Photo* _tmp3_;
+ gboolean _tmp4_;
#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17246,20 +17228,20 @@ static void library_photo_page_real_notify_photo_backing_missing (EditingHostPag
_tmp0_ = missing;
#line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
-#line 17245 "PhotoPage.c"
- Photo* _tmp1_ = NULL;
+#line 17227 "PhotoPage.c"
+ Photo* _tmp1_;
#line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = photo;
#line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
media_source_mark_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource));
-#line 17251 "PhotoPage.c"
+#line 17233 "PhotoPage.c"
} else {
- Photo* _tmp2_ = NULL;
+ Photo* _tmp2_;
#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = photo;
#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource));
-#line 17258 "PhotoPage.c"
+#line 17240 "PhotoPage.c"
}
#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = photo;
@@ -17267,7 +17249,7 @@ static void library_photo_page_real_notify_photo_backing_missing (EditingHostPag
_tmp4_ = missing;
#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->notify_photo_backing_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp3_, _tmp4_);
-#line 17266 "PhotoPage.c"
+#line 17248 "PhotoPage.c"
}
@@ -17276,10 +17258,10 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
gboolean handled = FALSE;
- GdkEventKey* _tmp3_ = NULL;
- guint _tmp4_ = 0U;
- const gchar* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
+ GdkEventKey* _tmp3_;
+ guint _tmp4_;
+ const gchar* _tmp5_;
+ const gchar* _tmp6_;
GQuark _tmp8_ = 0U;
#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
static GQuark _tmp7_label0 = 0;
@@ -17323,20 +17305,20 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
g_return_val_if_fail (event != NULL, FALSE);
#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event != NULL) {
-#line 17322 "PhotoPage.c"
- GdkEventKey* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+#line 17304 "PhotoPage.c"
+ GdkEventKey* _tmp1_;
+ gboolean _tmp2_;
#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = event;
#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), gtk_widget_get_type (), GtkWidget), _tmp1_);
#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = _tmp2_ == TRUE;
-#line 17331 "PhotoPage.c"
+#line 17313 "PhotoPage.c"
} else {
#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = FALSE;
-#line 17335 "PhotoPage.c"
+#line 17317 "PhotoPage.c"
}
#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
@@ -17344,7 +17326,7 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
result = TRUE;
#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 17343 "PhotoPage.c"
+#line 17325 "PhotoPage.c"
}
#line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
handled = TRUE;
@@ -17362,12 +17344,12 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
if (((_tmp8_ == ((0 != _tmp7_label0) ? _tmp7_label0 : (_tmp7_label0 = g_quark_from_static_string ("Escape")))) || (_tmp8_ == ((0 != _tmp7_label1) ? _tmp7_label1 : (_tmp7_label1 = g_quark_from_static_string ("Return"))))) || (_tmp8_ == ((0 != _tmp7_label2) ? _tmp7_label2 : (_tmp7_label2 = g_quark_from_static_string ("KP_Enter"))))) {
#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 17361 "PhotoPage.c"
+#line 17343 "PhotoPage.c"
default:
{
- GtkWindow* _tmp9_ = NULL;
- GtkWindow* _tmp10_ = NULL;
- gboolean _tmp11_ = FALSE;
+ GtkWindow* _tmp9_;
+ GtkWindow* _tmp10_;
+ gboolean _tmp11_;
#line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp9_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17380,193 +17362,193 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
if (_tmp11_) {
#line 2746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_return_to_collection (self);
-#line 17379 "PhotoPage.c"
+#line 17361 "PhotoPage.c"
}
#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 17383 "PhotoPage.c"
+#line 17365 "PhotoPage.c"
}
}
} else if (_tmp8_ == ((0 != _tmp7_label3) ? _tmp7_label3 : (_tmp7_label3 = g_quark_from_static_string ("Delete")))) {
#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 17389 "PhotoPage.c"
+#line 17371 "PhotoPage.c"
default:
{
#line 2753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MoveToTrash");
#line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 17396 "PhotoPage.c"
+#line 17378 "PhotoPage.c"
}
}
} else if ((_tmp8_ == ((0 != _tmp7_label4) ? _tmp7_label4 : (_tmp7_label4 = g_quark_from_static_string ("period")))) || (_tmp8_ == ((0 != _tmp7_label5) ? _tmp7_label5 : (_tmp7_label5 = g_quark_from_static_string ("greater"))))) {
#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 17402 "PhotoPage.c"
+#line 17384 "PhotoPage.c"
default:
{
#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating");
#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 17409 "PhotoPage.c"
+#line 17391 "PhotoPage.c"
}
}
} else if ((_tmp8_ == ((0 != _tmp7_label6) ? _tmp7_label6 : (_tmp7_label6 = g_quark_from_static_string ("comma")))) || (_tmp8_ == ((0 != _tmp7_label7) ? _tmp7_label7 : (_tmp7_label7 = g_quark_from_static_string ("less"))))) {
#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 17415 "PhotoPage.c"
+#line 17397 "PhotoPage.c"
default:
{
#line 2763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating");
#line 2764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 17422 "PhotoPage.c"
+#line 17404 "PhotoPage.c"
}
}
} else if (_tmp8_ == ((0 != _tmp7_label8) ? _tmp7_label8 : (_tmp7_label8 = g_quark_from_static_string ("KP_1")))) {
#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 17428 "PhotoPage.c"
+#line 17410 "PhotoPage.c"
default:
{
#line 2767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne");
#line 2768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 17435 "PhotoPage.c"
+#line 17417 "PhotoPage.c"
}
}
} else if (_tmp8_ == ((0 != _tmp7_label9) ? _tmp7_label9 : (_tmp7_label9 = g_quark_from_static_string ("KP_2")))) {
#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 17441 "PhotoPage.c"
+#line 17423 "PhotoPage.c"
default:
{
#line 2771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo");
#line 2772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 17448 "PhotoPage.c"
+#line 17430 "PhotoPage.c"
}
}
} else if (_tmp8_ == ((0 != _tmp7_label10) ? _tmp7_label10 : (_tmp7_label10 = g_quark_from_static_string ("KP_3")))) {
#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 17454 "PhotoPage.c"
+#line 17436 "PhotoPage.c"
default:
{
#line 2775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree");
#line 2776 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 17461 "PhotoPage.c"
+#line 17443 "PhotoPage.c"
}
}
} else if (_tmp8_ == ((0 != _tmp7_label11) ? _tmp7_label11 : (_tmp7_label11 = g_quark_from_static_string ("KP_4")))) {
#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 17467 "PhotoPage.c"
+#line 17449 "PhotoPage.c"
default:
{
#line 2779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour");
#line 2780 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 17474 "PhotoPage.c"
+#line 17456 "PhotoPage.c"
}
}
} else if (_tmp8_ == ((0 != _tmp7_label12) ? _tmp7_label12 : (_tmp7_label12 = g_quark_from_static_string ("KP_5")))) {
#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 17480 "PhotoPage.c"
+#line 17462 "PhotoPage.c"
default:
{
#line 2783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive");
#line 2784 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 17487 "PhotoPage.c"
+#line 17469 "PhotoPage.c"
}
}
} else if (_tmp8_ == ((0 != _tmp7_label13) ? _tmp7_label13 : (_tmp7_label13 = g_quark_from_static_string ("KP_0")))) {
#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 17493 "PhotoPage.c"
+#line 17475 "PhotoPage.c"
default:
{
#line 2787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated");
#line 2788 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 17500 "PhotoPage.c"
+#line 17482 "PhotoPage.c"
}
}
} else if (_tmp8_ == ((0 != _tmp7_label14) ? _tmp7_label14 : (_tmp7_label14 = g_quark_from_static_string ("KP_9")))) {
#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 17506 "PhotoPage.c"
+#line 17488 "PhotoPage.c"
default:
{
#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected");
#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 17513 "PhotoPage.c"
+#line 17495 "PhotoPage.c"
}
}
} else if (_tmp8_ == ((0 != _tmp7_label15) ? _tmp7_label15 : (_tmp7_label15 = g_quark_from_static_string ("bracketright")))) {
#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 17519 "PhotoPage.c"
+#line 17501 "PhotoPage.c"
default:
{
#line 2795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
#line 2796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 17526 "PhotoPage.c"
+#line 17508 "PhotoPage.c"
}
}
} else if (_tmp8_ == ((0 != _tmp7_label16) ? _tmp7_label16 : (_tmp7_label16 = g_quark_from_static_string ("bracketleft")))) {
#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 17532 "PhotoPage.c"
+#line 17514 "PhotoPage.c"
default:
{
#line 2799 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise");
#line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 17539 "PhotoPage.c"
+#line 17521 "PhotoPage.c"
}
}
} else if (_tmp8_ == ((0 != _tmp7_label17) ? _tmp7_label17 : (_tmp7_label17 = g_quark_from_static_string ("slash")))) {
#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 17545 "PhotoPage.c"
+#line 17527 "PhotoPage.c"
default:
{
#line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag");
#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 17552 "PhotoPage.c"
+#line 17534 "PhotoPage.c"
}
}
} else {
#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
switch (0) {
-#line 17558 "PhotoPage.c"
+#line 17540 "PhotoPage.c"
default:
{
#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
handled = FALSE;
#line 2808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 17565 "PhotoPage.c"
+#line 17547 "PhotoPage.c"
}
}
}
@@ -17574,7 +17556,7 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
result = handled;
#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 17573 "PhotoPage.c"
+#line 17555 "PhotoPage.c"
}
@@ -17582,9 +17564,9 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
LibraryPhotoPage * self;
gboolean result = FALSE;
FullscreenWindow* fs = NULL;
- GtkWindow* _tmp0_ = NULL;
- FullscreenWindow* _tmp1_ = NULL;
- FullscreenWindow* _tmp2_ = NULL;
+ GtkWindow* _tmp0_;
+ FullscreenWindow* _tmp1_;
+ FullscreenWindow* _tmp2_;
#line 2814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
#line 2814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17597,7 +17579,7 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
if (_tmp1_ == NULL) {
#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp0_);
-#line 17596 "PhotoPage.c"
+#line 17578 "PhotoPage.c"
}
#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
fs = _tmp1_;
@@ -17607,14 +17589,14 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
if (_tmp2_ == NULL) {
#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self->priv->return_to_collection_on_release = TRUE;
-#line 17606 "PhotoPage.c"
+#line 17588 "PhotoPage.c"
} else {
- FullscreenWindow* _tmp3_ = NULL;
+ FullscreenWindow* _tmp3_;
#line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = fs;
#line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
fullscreen_window_close (_tmp3_);
-#line 17613 "PhotoPage.c"
+#line 17595 "PhotoPage.c"
}
#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
result = TRUE;
@@ -17622,16 +17604,16 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
_g_object_unref0 (fs);
#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 17621 "PhotoPage.c"
+#line 17603 "PhotoPage.c"
}
static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventButton* event) {
LibraryPhotoPage * self;
gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
- GdkEventButton* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ gboolean _tmp0_;
+ GdkEventButton* _tmp1_;
+ gboolean _tmp2_;
#line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
#line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17648,7 +17630,7 @@ static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventBu
result = TRUE;
#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 17647 "PhotoPage.c"
+#line 17629 "PhotoPage.c"
}
#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = event;
@@ -17658,29 +17640,29 @@ static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventBu
result = _tmp2_;
#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 17657 "PhotoPage.c"
+#line 17639 "PhotoPage.c"
}
static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
GtkMenu* result = NULL;
- GtkMenu* _tmp0_ = NULL;
- GtkMenu* _tmp7_ = NULL;
- GtkMenu* _tmp8_ = NULL;
+ GtkMenu* _tmp0_;
+ GtkMenu* _tmp7_;
+ GtkMenu* _tmp8_;
#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), NULL);
#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = self->priv->context_menu;
#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_ == NULL) {
-#line 17672 "PhotoPage.c"
+#line 17654 "PhotoPage.c"
GMenuModel* model = NULL;
- GtkBuilder* _tmp1_ = NULL;
- GObject* _tmp2_ = NULL;
- GMenuModel* _tmp3_ = NULL;
- GMenuModel* _tmp4_ = NULL;
- GtkMenu* _tmp5_ = NULL;
- GtkMenu* _tmp6_ = NULL;
+ GtkBuilder* _tmp1_;
+ GObject* _tmp2_;
+ GMenuModel* _tmp3_;
+ GMenuModel* _tmp4_;
+ GtkMenu* _tmp5_;
+ GtkMenu* _tmp6_;
#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17705,7 +17687,7 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
gtk_menu_attach_to_widget (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (model);
-#line 17704 "PhotoPage.c"
+#line 17686 "PhotoPage.c"
}
#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp7_ = self->priv->context_menu;
@@ -17715,16 +17697,16 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
result = _tmp8_;
#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 17714 "PhotoPage.c"
+#line 17696 "PhotoPage.c"
}
static gboolean library_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event) {
LibraryPhotoPage * self;
gboolean result = FALSE;
- GtkMenu* _tmp0_ = NULL;
- GtkMenu* _tmp1_ = NULL;
- GdkEventButton* _tmp2_ = NULL;
+ GtkMenu* _tmp0_;
+ GtkMenu* _tmp1_;
+ GdkEventButton* _tmp2_;
#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17743,15 +17725,15 @@ static gboolean library_photo_page_real_on_context_buttonpress (Page* base, GdkE
result = TRUE;
#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 17742 "PhotoPage.c"
+#line 17724 "PhotoPage.c"
}
static gboolean library_photo_page_real_on_context_keypress (Page* base) {
LibraryPhotoPage * self;
gboolean result = FALSE;
- GtkMenu* _tmp0_ = NULL;
- GtkMenu* _tmp1_ = NULL;
+ GtkMenu* _tmp0_;
+ GtkMenu* _tmp1_;
#line 2854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17766,22 +17748,22 @@ static gboolean library_photo_page_real_on_context_keypress (Page* base) {
result = TRUE;
#line 2857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 17765 "PhotoPage.c"
+#line 17747 "PhotoPage.c"
}
static void library_photo_page_return_to_collection (LibraryPhotoPage* self) {
- CollectionPage* _tmp0_ = NULL;
+ CollectionPage* _tmp0_;
#line 2860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = self->priv->return_page;
#line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (NULL != _tmp0_) {
-#line 17777 "PhotoPage.c"
- LibraryWindow* _tmp1_ = NULL;
- LibraryWindow* _tmp2_ = NULL;
- CollectionPage* _tmp3_ = NULL;
+#line 17759 "PhotoPage.c"
+ LibraryWindow* _tmp1_;
+ LibraryWindow* _tmp2_;
+ CollectionPage* _tmp3_;
#line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = library_window_get_app ();
#line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17792,10 +17774,10 @@ static void library_photo_page_return_to_collection (LibraryPhotoPage* self) {
library_window_switch_to_page (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PAGE, Page));
#line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp2_);
-#line 17791 "PhotoPage.c"
+#line 17773 "PhotoPage.c"
} else {
- LibraryWindow* _tmp4_ = NULL;
- LibraryWindow* _tmp5_ = NULL;
+ LibraryWindow* _tmp4_;
+ LibraryWindow* _tmp5_;
#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = library_window_get_app ();
#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17804,18 +17786,16 @@ static void library_photo_page_return_to_collection (LibraryPhotoPage* self) {
library_window_switch_to_library_page (_tmp5_);
#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp5_);
-#line 17803 "PhotoPage.c"
+#line 17785 "PhotoPage.c"
}
}
static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) {
LibraryPhoto* photo = NULL;
- Photo* _tmp0_ = NULL;
+ Photo* _tmp0_;
GeeCollection* photos = NULL;
- GeeArrayList* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
+ GeeArrayList* _tmp1_;
#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17829,40 +17809,36 @@ static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) {
#line 2872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
gee_collection_add (photos, photo);
#line 2874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp2_ = _ ("Remove From Library");
-#line 2874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp3_ = _ ("Removing Photo From Library");
-#line 2874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- remove_from_app (photos, _tmp2_, _tmp3_);
+ remove_from_app (photos, _ ("Remove From Library"), _ ("Removing Photo From Library"));
#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (photos);
#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (photo);
-#line 17837 "PhotoPage.c"
+#line 17813 "PhotoPage.c"
}
static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
- gboolean _tmp0_ = FALSE;
- CollectionPage* _tmp1_ = NULL;
+ gboolean _tmp0_;
+ CollectionPage* _tmp1_;
LibraryPhoto* photo = NULL;
- Photo* _tmp4_ = NULL;
+ Photo* _tmp4_;
GeeCollection* photos = NULL;
- GeeArrayList* _tmp5_ = NULL;
- GeeCollection* _tmp6_ = NULL;
- LibraryPhoto* _tmp7_ = NULL;
- LibraryPhoto* _tmp8_ = NULL;
- Photo* _tmp9_ = NULL;
- Photo* _tmp10_ = NULL;
- gboolean _tmp11_ = FALSE;
- gboolean _tmp12_ = FALSE;
- CommandManager* _tmp22_ = NULL;
- CommandManager* _tmp23_ = NULL;
- GeeCollection* _tmp24_ = NULL;
- TrashUntrashPhotosCommand* _tmp25_ = NULL;
- TrashUntrashPhotosCommand* _tmp26_ = NULL;
- LibraryWindow* _tmp27_ = NULL;
- LibraryWindow* _tmp28_ = NULL;
+ GeeArrayList* _tmp5_;
+ GeeCollection* _tmp6_;
+ LibraryPhoto* _tmp7_;
+ LibraryPhoto* _tmp8_;
+ Photo* _tmp9_;
+ Photo* _tmp10_;
+ gboolean _tmp11_;
+ gboolean _tmp12_;
+ CommandManager* _tmp22_;
+ CommandManager* _tmp23_;
+ GeeCollection* _tmp24_;
+ TrashUntrashPhotosCommand* _tmp25_;
+ TrashUntrashPhotosCommand* _tmp26_;
+ LibraryWindow* _tmp27_;
+ LibraryWindow* _tmp28_;
#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17871,15 +17847,15 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
if (!_tmp0_) {
#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 17870 "PhotoPage.c"
+#line 17846 "PhotoPage.c"
}
#line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = self->priv->return_page;
#line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENT_PAGE)) {
-#line 17876 "PhotoPage.c"
- LibraryWindow* _tmp2_ = NULL;
- LibraryWindow* _tmp3_ = NULL;
+#line 17852 "PhotoPage.c"
+ LibraryWindow* _tmp2_;
+ LibraryWindow* _tmp3_;
#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = library_window_get_app ();
#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17888,7 +17864,7 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
library_window_set_page_switching_enabled (_tmp3_, FALSE);
#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp3_);
-#line 17887 "PhotoPage.c"
+#line 17863 "PhotoPage.c"
}
#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -17920,14 +17896,14 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
_g_object_unref0 (_tmp10_);
#line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp12_) {
-#line 17919 "PhotoPage.c"
- LibraryWindow* _tmp13_ = NULL;
- LibraryWindow* _tmp14_ = NULL;
- GtkWindow* _tmp15_ = NULL;
- GtkWindow* _tmp16_ = NULL;
- gboolean _tmp17_ = FALSE;
- LibraryWindow* _tmp20_ = NULL;
- LibraryWindow* _tmp21_ = NULL;
+#line 17895 "PhotoPage.c"
+ LibraryWindow* _tmp13_;
+ LibraryWindow* _tmp14_;
+ GtkWindow* _tmp15_;
+ GtkWindow* _tmp16_;
+ gboolean _tmp17_;
+ LibraryWindow* _tmp20_;
+ LibraryWindow* _tmp21_;
#line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp13_ = library_window_get_app ();
#line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17946,9 +17922,9 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
_g_object_unref0 (_tmp16_);
#line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp17_) {
-#line 17945 "PhotoPage.c"
- GtkWindow* _tmp18_ = NULL;
- FullscreenWindow* _tmp19_ = NULL;
+#line 17921 "PhotoPage.c"
+ GtkWindow* _tmp18_;
+ FullscreenWindow* _tmp19_;
#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp18_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17957,7 +17933,7 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
fullscreen_window_close (_tmp19_);
#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp19_);
-#line 17956 "PhotoPage.c"
+#line 17932 "PhotoPage.c"
}
#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp20_ = library_window_get_app ();
@@ -17967,7 +17943,7 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
library_window_switch_to_library_page (_tmp21_);
#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp21_);
-#line 17966 "PhotoPage.c"
+#line 17942 "PhotoPage.c"
}
#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp22_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -17997,32 +17973,32 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
_g_object_unref0 (photos);
#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (photo);
-#line 17996 "PhotoPage.c"
+#line 17972 "PhotoPage.c"
}
static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
-#line 18008 "PhotoPage.c"
+#line 17984 "PhotoPage.c"
GeeArrayList* photo_list = NULL;
- GeeArrayList* _tmp1_ = NULL;
- GeeArrayList* _tmp2_ = NULL;
- Photo* _tmp3_ = NULL;
- Photo* _tmp4_ = NULL;
- CommandManager* _tmp5_ = NULL;
- CommandManager* _tmp6_ = NULL;
- GeeArrayList* _tmp7_ = NULL;
- Photo* _tmp8_ = NULL;
- LibraryPhoto* _tmp9_ = NULL;
- gboolean _tmp10_ = FALSE;
- FlagUnflagCommand* _tmp11_ = NULL;
- FlagUnflagCommand* _tmp12_ = NULL;
+ GeeArrayList* _tmp1_;
+ GeeArrayList* _tmp2_;
+ Photo* _tmp3_;
+ Photo* _tmp4_;
+ CommandManager* _tmp5_;
+ CommandManager* _tmp6_;
+ GeeArrayList* _tmp7_;
+ Photo* _tmp8_;
+ LibraryPhoto* _tmp9_;
+ gboolean _tmp10_;
+ FlagUnflagCommand* _tmp11_;
+ FlagUnflagCommand* _tmp12_;
#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18063,13 +18039,13 @@ static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
_command_manager_unref0 (_tmp6_);
#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (photo_list);
-#line 18062 "PhotoPage.c"
+#line 18038 "PhotoPage.c"
}
}
static void library_photo_page_on_photo_destroyed (LibraryPhotoPage* self, DataSource* source) {
- DataSource* _tmp0_ = NULL;
+ DataSource* _tmp0_;
#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18078,28 +18054,28 @@ static void library_photo_page_on_photo_destroyed (LibraryPhotoPage* self, DataS
_tmp0_ = source;
#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_photo_removed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 18077 "PhotoPage.c"
+#line 18053 "PhotoPage.c"
}
static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, LibraryPhoto* photo) {
gboolean _tmp0_ = FALSE;
- LibraryPhoto* _tmp1_ = NULL;
+ LibraryPhoto* _tmp1_;
ViewCollection* view = NULL;
- ViewCollection* _tmp6_ = NULL;
- ViewCollection* _tmp7_ = NULL;
- ViewCollection* _tmp8_ = NULL;
- ViewCollection* _tmp9_ = NULL;
- LibraryPhoto* _tmp10_ = NULL;
- DataView* _tmp11_ = NULL;
- DataView* _tmp12_ = NULL;
- Marker* _tmp13_ = NULL;
- Marker* _tmp14_ = NULL;
- LibraryPhoto* _tmp15_ = NULL;
- Photo* _tmp16_ = NULL;
- Photo* _tmp17_ = NULL;
- gboolean _tmp18_ = FALSE;
- gboolean _tmp19_ = FALSE;
+ ViewCollection* _tmp6_;
+ ViewCollection* _tmp7_;
+ ViewCollection* _tmp8_;
+ ViewCollection* _tmp9_;
+ LibraryPhoto* _tmp10_;
+ DataView* _tmp11_;
+ DataView* _tmp12_;
+ Marker* _tmp13_;
+ Marker* _tmp14_;
+ LibraryPhoto* _tmp15_;
+ Photo* _tmp16_;
+ Photo* _tmp17_;
+ gboolean _tmp18_;
+ gboolean _tmp19_;
#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18110,12 +18086,12 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library
if (_tmp1_ == NULL) {
#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = TRUE;
-#line 18109 "PhotoPage.c"
+#line 18085 "PhotoPage.c"
} else {
- LibraryPhoto* _tmp2_ = NULL;
- Photo* _tmp3_ = NULL;
- Photo* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+ LibraryPhoto* _tmp2_;
+ Photo* _tmp3_;
+ Photo* _tmp4_;
+ gboolean _tmp5_;
#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = photo;
#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18128,13 +18104,13 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library
_tmp0_ = !_tmp5_;
#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp4_);
-#line 18127 "PhotoPage.c"
+#line 18103 "PhotoPage.c"
}
#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 18133 "PhotoPage.c"
+#line 18109 "PhotoPage.c"
}
#line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
@@ -18178,9 +18154,9 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library
_g_object_unref0 (_tmp17_);
#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp19_) {
-#line 18177 "PhotoPage.c"
- LibraryWindow* _tmp20_ = NULL;
- LibraryWindow* _tmp21_ = NULL;
+#line 18153 "PhotoPage.c"
+ LibraryWindow* _tmp20_;
+ LibraryWindow* _tmp21_;
#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp20_ = library_window_get_app ();
#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18189,19 +18165,19 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library
library_window_switch_to_library_page (_tmp21_);
#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp21_);
-#line 18188 "PhotoPage.c"
+#line 18164 "PhotoPage.c"
}
#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_data_collection_unref0 (view);
-#line 18192 "PhotoPage.c"
+#line 18168 "PhotoPage.c"
}
static void library_photo_page_on_print (LibraryPhotoPage* self) {
- ViewCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gboolean _tmp3_ = FALSE;
+ ViewCollection* _tmp0_;
+ ViewCollection* _tmp1_;
+ gint _tmp2_;
+ gboolean _tmp3_;
#line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18216,13 +18192,13 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) {
_data_collection_unref0 (_tmp1_);
#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp3_) {
-#line 18215 "PhotoPage.c"
- PrintManager* _tmp4_ = NULL;
- PrintManager* _tmp5_ = NULL;
- ViewCollection* _tmp6_ = NULL;
- ViewCollection* _tmp7_ = NULL;
- GeeList* _tmp8_ = NULL;
- GeeCollection* _tmp9_ = NULL;
+#line 18191 "PhotoPage.c"
+ PrintManager* _tmp4_;
+ PrintManager* _tmp5_;
+ ViewCollection* _tmp6_;
+ ViewCollection* _tmp7_;
+ GeeList* _tmp8_;
+ GeeCollection* _tmp9_;
#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = print_manager_get_instance ();
#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18243,25 +18219,25 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) {
_data_collection_unref0 (_tmp7_);
#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_print_manager_unref0 (_tmp5_);
-#line 18242 "PhotoPage.c"
+#line 18218 "PhotoPage.c"
}
}
static void library_photo_page_on_external_app_changed (LibraryPhotoPage* self) {
gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp1_) {
-#line 18256 "PhotoPage.c"
- ConfigFacade* _tmp2_ = NULL;
- ConfigFacade* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+#line 18232 "PhotoPage.c"
+ ConfigFacade* _tmp2_;
+ ConfigFacade* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = config_facade_get_instance ();
#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18276,20 +18252,20 @@ static void library_photo_page_on_external_app_changed (LibraryPhotoPage* self)
_g_free0 (_tmp5_);
#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp3_);
-#line 18275 "PhotoPage.c"
+#line 18251 "PhotoPage.c"
} else {
#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = FALSE;
-#line 18279 "PhotoPage.c"
+#line 18255 "PhotoPage.c"
}
#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp0_);
-#line 18283 "PhotoPage.c"
+#line 18259 "PhotoPage.c"
}
static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
GError * _inner_error_ = NULL;
#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
@@ -18299,15 +18275,15 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
if (!_tmp0_) {
#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 18298 "PhotoPage.c"
+#line 18274 "PhotoPage.c"
}
{
- AppWindow* _tmp1_ = NULL;
- AppWindow* _tmp2_ = NULL;
- Photo* _tmp3_ = NULL;
- Photo* _tmp4_ = NULL;
- AppWindow* _tmp5_ = NULL;
- AppWindow* _tmp6_ = NULL;
+ AppWindow* _tmp1_;
+ AppWindow* _tmp2_;
+ Photo* _tmp3_;
+ Photo* _tmp4_;
+ AppWindow* _tmp5_;
+ AppWindow* _tmp6_;
#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = app_window_get_instance ();
#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18326,8 +18302,8 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
_g_object_unref0 (_tmp4_);
#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18325 "PhotoPage.c"
- goto __catch251_g_error;
+#line 18301 "PhotoPage.c"
+ goto __catch252_g_error;
}
#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = app_window_get_instance ();
@@ -18337,17 +18313,17 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow));
#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp6_);
-#line 18336 "PhotoPage.c"
+#line 18312 "PhotoPage.c"
}
- goto __finally251;
- __catch251_g_error:
+ goto __finally252;
+ __catch252_g_error:
{
GError* err = NULL;
- AppWindow* _tmp7_ = NULL;
- AppWindow* _tmp8_ = NULL;
- GError* _tmp9_ = NULL;
- Photo* _tmp10_ = NULL;
- Photo* _tmp11_ = NULL;
+ AppWindow* _tmp7_;
+ AppWindow* _tmp8_;
+ GError* _tmp9_;
+ Photo* _tmp10_;
+ Photo* _tmp11_;
#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
err = _inner_error_;
#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18372,9 +18348,9 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
_g_object_unref0 (_tmp11_);
#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_error_free0 (err);
-#line 18371 "PhotoPage.c"
+#line 18347 "PhotoPage.c"
}
- __finally251:
+ __finally252:
#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18383,17 +18359,17 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
g_clear_error (&_inner_error_);
#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 18382 "PhotoPage.c"
+#line 18358 "PhotoPage.c"
}
}
static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
- gboolean _tmp0_ = FALSE;
- Photo* _tmp1_ = NULL;
- Photo* _tmp2_ = NULL;
- PhotoFileFormat _tmp3_ = 0;
- gboolean _tmp4_ = FALSE;
+ gboolean _tmp0_;
+ Photo* _tmp1_;
+ Photo* _tmp2_;
+ PhotoFileFormat _tmp3_;
+ gboolean _tmp4_;
GError * _inner_error_ = NULL;
#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
@@ -18403,7 +18379,7 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
if (!_tmp0_) {
#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 18402 "PhotoPage.c"
+#line 18378 "PhotoPage.c"
}
#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -18419,15 +18395,15 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
if (_tmp4_) {
#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 18418 "PhotoPage.c"
+#line 18394 "PhotoPage.c"
}
{
- AppWindow* _tmp5_ = NULL;
- AppWindow* _tmp6_ = NULL;
- Photo* _tmp7_ = NULL;
- Photo* _tmp8_ = NULL;
- AppWindow* _tmp9_ = NULL;
- AppWindow* _tmp10_ = NULL;
+ AppWindow* _tmp5_;
+ AppWindow* _tmp6_;
+ Photo* _tmp7_;
+ Photo* _tmp8_;
+ AppWindow* _tmp9_;
+ AppWindow* _tmp10_;
#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = app_window_get_instance ();
#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18446,8 +18422,8 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
_g_object_unref0 (_tmp8_);
#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18445 "PhotoPage.c"
- goto __catch252_g_error;
+#line 18421 "PhotoPage.c"
+ goto __catch253_g_error;
}
#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp9_ = app_window_get_instance ();
@@ -18457,17 +18433,17 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE_WINDOW, PageWindow));
#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp10_);
-#line 18456 "PhotoPage.c"
+#line 18432 "PhotoPage.c"
}
- goto __finally252;
- __catch252_g_error:
+ goto __finally253;
+ __catch253_g_error:
{
GError* err = NULL;
- AppWindow* _tmp11_ = NULL;
- AppWindow* _tmp12_ = NULL;
- GError* _tmp13_ = NULL;
- gchar* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
+ AppWindow* _tmp11_;
+ AppWindow* _tmp12_;
+ GError* _tmp13_;
+ gchar* _tmp14_;
+ gchar* _tmp15_;
#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
err = _inner_error_;
#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18492,9 +18468,9 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
_g_free0 (_tmp15_);
#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_error_free0 (err);
-#line 18491 "PhotoPage.c"
+#line 18467 "PhotoPage.c"
}
- __finally252:
+ __finally253:
#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18503,24 +18479,24 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
g_clear_error (&_inner_error_);
#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 18502 "PhotoPage.c"
+#line 18478 "PhotoPage.c"
}
}
static void library_photo_page_on_send_to (LibraryPhotoPage* self) {
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 2989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
-#line 18515 "PhotoPage.c"
- ViewCollection* _tmp1_ = NULL;
- ViewCollection* _tmp2_ = NULL;
- GeeList* _tmp3_ = NULL;
- GeeCollection* _tmp4_ = NULL;
+#line 18491 "PhotoPage.c"
+ ViewCollection* _tmp1_;
+ ViewCollection* _tmp2_;
+ GeeList* _tmp3_;
+ GeeCollection* _tmp4_;
#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18535,37 +18511,36 @@ static void library_photo_page_on_send_to (LibraryPhotoPage* self) {
_g_object_unref0 (_tmp4_);
#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_data_collection_unref0 (_tmp2_);
-#line 18534 "PhotoPage.c"
+#line 18510 "PhotoPage.c"
}
}
static void library_photo_page_on_export (LibraryPhotoPage* self) {
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
ExportDialog* export_dialog = NULL;
- const gchar* _tmp1_ = NULL;
- ExportDialog* _tmp2_ = NULL;
+ ExportDialog* _tmp1_;
gint scale = 0;
ScaleConstraint constraint = 0;
ExportFormatParameters export_params = {0};
- ExportFormatParameters _tmp3_ = {0};
- ExportDialog* _tmp4_ = NULL;
- gint _tmp5_ = 0;
- ScaleConstraint _tmp6_ = 0;
- gboolean _tmp7_ = FALSE;
+ ExportFormatParameters _tmp2_ = {0};
+ ExportDialog* _tmp3_;
+ gint _tmp4_ = 0;
+ ScaleConstraint _tmp5_ = 0;
+ gboolean _tmp6_;
GFile* save_as = NULL;
- Photo* _tmp8_ = NULL;
- Photo* _tmp9_ = NULL;
- ExportFormatParameters _tmp10_ = {0};
- gchar* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
- GFile* _tmp13_ = NULL;
- GFile* _tmp14_ = NULL;
- GFile* _tmp15_ = NULL;
+ Photo* _tmp7_;
+ Photo* _tmp8_;
+ ExportFormatParameters _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ GFile* _tmp12_;
+ GFile* _tmp13_;
+ GFile* _tmp14_;
Scaling scaling = {0};
- ScaleConstraint _tmp16_ = 0;
- gint _tmp17_ = 0;
- Scaling _tmp18_ = {0};
+ ScaleConstraint _tmp15_;
+ gint _tmp16_;
+ Scaling _tmp17_ = {0};
GError * _inner_error_ = NULL;
#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
@@ -18575,175 +18550,170 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
if (!_tmp0_) {
#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 18574 "PhotoPage.c"
+#line 18549 "PhotoPage.c"
}
#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp1_ = _ ("Export Photo");
-#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp2_ = export_dialog_new (_tmp1_);
+ _tmp1_ = export_dialog_new (_ ("Export Photo"));
#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- g_object_ref_sink (_tmp2_);
+ g_object_ref_sink (_tmp1_);
#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- export_dialog = _tmp2_;
+ export_dialog = _tmp1_;
#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- export_format_parameters_last (&_tmp3_);
+ export_format_parameters_last (&_tmp2_);
#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- export_params = _tmp3_;
+ export_params = _tmp2_;
#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp4_ = export_dialog;
+ _tmp3_ = export_dialog;
#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp7_ = export_dialog_execute (_tmp4_, &_tmp5_, &_tmp6_, &export_params);
+ _tmp6_ = export_dialog_execute (_tmp3_, &_tmp4_, &_tmp5_, &export_params);
#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- scale = _tmp5_;
+ scale = _tmp4_;
#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- constraint = _tmp6_;
+ constraint = _tmp5_;
#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- if (!_tmp7_) {
+ if (!_tmp6_) {
#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (export_dialog);
#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 18602 "PhotoPage.c"
+#line 18575 "PhotoPage.c"
}
#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp8_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ _tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp10_ = export_params;
+ _tmp9_ = export_params;
#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp11_ = photo_get_export_basename_for_parameters (_tmp9_, &_tmp10_);
+ _tmp10_ = photo_get_export_basename_for_parameters (_tmp8_, &_tmp9_);
#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp12_ = _tmp11_;
+ _tmp11_ = _tmp10_;
#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp13_ = export_ui_choose_file (_tmp12_);
+ _tmp12_ = export_ui_choose_file (_tmp11_);
#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp14_ = _tmp13_;
+ _tmp13_ = _tmp12_;
#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _g_free0 (_tmp12_);
+ _g_free0 (_tmp11_);
#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _g_object_unref0 (_tmp9_);
+ _g_object_unref0 (_tmp8_);
#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- save_as = _tmp14_;
+ save_as = _tmp13_;
#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp15_ = save_as;
+ _tmp14_ = save_as;
#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- if (_tmp15_ == NULL) {
+ if (_tmp14_ == NULL) {
#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (save_as);
#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (export_dialog);
#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 18634 "PhotoPage.c"
+#line 18607 "PhotoPage.c"
}
#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp16_ = constraint;
+ _tmp15_ = constraint;
#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp17_ = scale;
+ _tmp16_ = scale;
#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- scaling_for_constraint (_tmp16_, _tmp17_, FALSE, &_tmp18_);
+ scaling_for_constraint (_tmp15_, _tmp16_, FALSE, &_tmp17_);
#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- scaling = _tmp18_;
-#line 18644 "PhotoPage.c"
+ scaling = _tmp17_;
+#line 18617 "PhotoPage.c"
{
- Photo* _tmp19_ = NULL;
- Photo* _tmp20_ = NULL;
- GFile* _tmp21_ = NULL;
- Scaling _tmp22_ = {0};
- ExportFormatParameters _tmp23_ = {0};
- JpegQuality _tmp24_ = 0;
- Photo* _tmp25_ = NULL;
- Photo* _tmp26_ = NULL;
- ExportFormatParameters _tmp27_ = {0};
- PhotoFileFormat _tmp28_ = 0;
- ExportFormatParameters _tmp29_ = {0};
- ExportFormatMode _tmp30_ = 0;
- ExportFormatParameters _tmp31_ = {0};
- gboolean _tmp32_ = FALSE;
+ Photo* _tmp18_;
+ Photo* _tmp19_;
+ GFile* _tmp20_;
+ Scaling _tmp21_;
+ ExportFormatParameters _tmp22_;
+ JpegQuality _tmp23_;
+ Photo* _tmp24_;
+ Photo* _tmp25_;
+ ExportFormatParameters _tmp26_;
+ PhotoFileFormat _tmp27_;
+ ExportFormatParameters _tmp28_;
+ ExportFormatMode _tmp29_;
+ ExportFormatParameters _tmp30_;
+ gboolean _tmp31_;
#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp19_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ _tmp18_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp20_ = _tmp19_;
+ _tmp19_ = _tmp18_;
#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp21_ = save_as;
+ _tmp20_ = save_as;
#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp22_ = scaling;
+ _tmp21_ = scaling;
#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp23_ = export_params;
+ _tmp22_ = export_params;
#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp24_ = _tmp23_.quality;
+ _tmp23_ = _tmp22_.quality;
#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp25_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ _tmp24_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp26_ = _tmp25_;
+ _tmp25_ = _tmp24_;
#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp27_ = export_params;
+ _tmp26_ = export_params;
#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp28_ = photo_get_export_format_for_parameters (_tmp26_, &_tmp27_);
+ _tmp27_ = photo_get_export_format_for_parameters (_tmp25_, &_tmp26_);
#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp29_ = export_params;
+ _tmp28_ = export_params;
#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp30_ = _tmp29_.mode;
+ _tmp29_ = _tmp28_.mode;
#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp31_ = export_params;
+ _tmp30_ = export_params;
#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp32_ = _tmp31_.export_metadata;
+ _tmp31_ = _tmp30_.export_metadata;
#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- photo_export (_tmp20_, _tmp21_, &_tmp22_, _tmp24_, _tmp28_, _tmp30_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp32_, &_inner_error_);
+ photo_export (_tmp19_, _tmp20_, &_tmp21_, _tmp23_, _tmp27_, _tmp29_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp31_, &_inner_error_);
#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _g_object_unref0 (_tmp26_);
+ _g_object_unref0 (_tmp25_);
#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _g_object_unref0 (_tmp20_);
+ _g_object_unref0 (_tmp19_);
#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18696 "PhotoPage.c"
- goto __catch253_g_error;
+#line 18669 "PhotoPage.c"
+ goto __catch254_g_error;
}
}
- goto __finally253;
- __catch253_g_error:
+ goto __finally254;
+ __catch254_g_error:
{
GError* err = NULL;
- const gchar* _tmp33_ = NULL;
- GFile* _tmp34_ = NULL;
- gchar* _tmp35_ = NULL;
- gchar* _tmp36_ = NULL;
- GError* _tmp37_ = NULL;
- const gchar* _tmp38_ = NULL;
- gchar* _tmp39_ = NULL;
- gchar* _tmp40_ = NULL;
+ GFile* _tmp32_;
+ gchar* _tmp33_;
+ gchar* _tmp34_;
+ GError* _tmp35_;
+ const gchar* _tmp36_;
+ gchar* _tmp37_;
+ gchar* _tmp38_;
#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
err = _inner_error_;
#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_inner_error_ = NULL;
#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp33_ = _ ("Unable to export %s: %s");
+ _tmp32_ = save_as;
#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp34_ = save_as;
+ _tmp33_ = g_file_get_path (_tmp32_);
#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp35_ = g_file_get_path (_tmp34_);
+ _tmp34_ = _tmp33_;
#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp36_ = _tmp35_;
+ _tmp35_ = err;
#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp37_ = err;
+ _tmp36_ = _tmp35_->message;
#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp38_ = _tmp37_->message;
+ _tmp37_ = g_strdup_printf (_ ("Unable to export %s: %s"), _tmp34_, _tmp36_);
#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp39_ = g_strdup_printf (_tmp33_, _tmp36_, _tmp38_);
-#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp40_ = _tmp39_;
+ _tmp38_ = _tmp37_;
#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- app_window_error_message (_tmp40_, NULL);
+ app_window_error_message (_tmp38_, NULL);
#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _g_free0 (_tmp40_);
+ _g_free0 (_tmp38_);
#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _g_free0 (_tmp36_);
+ _g_free0 (_tmp34_);
#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_error_free0 (err);
-#line 18740 "PhotoPage.c"
+#line 18710 "PhotoPage.c"
}
- __finally253:
+ __finally254:
#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18756,21 +18726,21 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
g_clear_error (&_inner_error_);
#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 18755 "PhotoPage.c"
+#line 18725 "PhotoPage.c"
}
#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (save_as);
#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (export_dialog);
-#line 18761 "PhotoPage.c"
+#line 18731 "PhotoPage.c"
}
static void library_photo_page_on_publish (LibraryPhotoPage* self) {
- ViewCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gboolean _tmp3_ = FALSE;
+ ViewCollection* _tmp0_;
+ ViewCollection* _tmp1_;
+ gint _tmp2_;
+ gboolean _tmp3_;
#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18785,11 +18755,11 @@ static void library_photo_page_on_publish (LibraryPhotoPage* self) {
_data_collection_unref0 (_tmp1_);
#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp3_) {
-#line 18784 "PhotoPage.c"
- ViewCollection* _tmp4_ = NULL;
- ViewCollection* _tmp5_ = NULL;
- GeeList* _tmp6_ = NULL;
- GeeCollection* _tmp7_ = NULL;
+#line 18754 "PhotoPage.c"
+ ViewCollection* _tmp4_;
+ ViewCollection* _tmp5_;
+ GeeList* _tmp6_;
+ GeeCollection* _tmp7_;
#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18804,22 +18774,22 @@ static void library_photo_page_on_publish (LibraryPhotoPage* self) {
_g_object_unref0 (_tmp7_);
#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_data_collection_unref0 (_tmp5_);
-#line 18803 "PhotoPage.c"
+#line 18773 "PhotoPage.c"
}
}
static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) {
gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
SetRatingSingleCommand* command = NULL;
- Photo* _tmp3_ = NULL;
- Photo* _tmp4_ = NULL;
- SetRatingSingleCommand* _tmp5_ = NULL;
- SetRatingSingleCommand* _tmp6_ = NULL;
- CommandManager* _tmp7_ = NULL;
- CommandManager* _tmp8_ = NULL;
- SetRatingSingleCommand* _tmp9_ = NULL;
+ Photo* _tmp3_;
+ Photo* _tmp4_;
+ SetRatingSingleCommand* _tmp5_;
+ SetRatingSingleCommand* _tmp6_;
+ CommandManager* _tmp7_;
+ CommandManager* _tmp8_;
+ SetRatingSingleCommand* _tmp9_;
#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18828,20 +18798,20 @@ static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) {
if (!_tmp1_) {
#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = TRUE;
-#line 18827 "PhotoPage.c"
+#line 18797 "PhotoPage.c"
} else {
- gboolean _tmp2_ = FALSE;
+ gboolean _tmp2_;
#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = _tmp2_;
-#line 18834 "PhotoPage.c"
+#line 18804 "PhotoPage.c"
}
#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
#line 3030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 18840 "PhotoPage.c"
+#line 18810 "PhotoPage.c"
}
#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -18869,21 +18839,21 @@ static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) {
library_photo_page_update_rating_menu_item_sensitivity (self);
#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (command);
-#line 18868 "PhotoPage.c"
+#line 18838 "PhotoPage.c"
}
static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self) {
gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
SetRatingSingleCommand* command = NULL;
- Photo* _tmp3_ = NULL;
- Photo* _tmp4_ = NULL;
- SetRatingSingleCommand* _tmp5_ = NULL;
- SetRatingSingleCommand* _tmp6_ = NULL;
- CommandManager* _tmp7_ = NULL;
- CommandManager* _tmp8_ = NULL;
- SetRatingSingleCommand* _tmp9_ = NULL;
+ Photo* _tmp3_;
+ Photo* _tmp4_;
+ SetRatingSingleCommand* _tmp5_;
+ SetRatingSingleCommand* _tmp6_;
+ CommandManager* _tmp7_;
+ CommandManager* _tmp8_;
+ SetRatingSingleCommand* _tmp9_;
#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18892,20 +18862,20 @@ static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self) {
if (!_tmp1_) {
#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = TRUE;
-#line 18891 "PhotoPage.c"
+#line 18861 "PhotoPage.c"
} else {
- gboolean _tmp2_ = FALSE;
+ gboolean _tmp2_;
#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = _tmp2_;
-#line 18898 "PhotoPage.c"
+#line 18868 "PhotoPage.c"
}
#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
#line 3040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 18904 "PhotoPage.c"
+#line 18874 "PhotoPage.c"
}
#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -18933,22 +18903,22 @@ static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self) {
library_photo_page_update_rating_menu_item_sensitivity (self);
#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (command);
-#line 18932 "PhotoPage.c"
+#line 18902 "PhotoPage.c"
}
static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rating) {
gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
SetRatingSingleCommand* command = NULL;
- Photo* _tmp3_ = NULL;
- Photo* _tmp4_ = NULL;
- Rating _tmp5_ = 0;
- SetRatingSingleCommand* _tmp6_ = NULL;
- SetRatingSingleCommand* _tmp7_ = NULL;
- CommandManager* _tmp8_ = NULL;
- CommandManager* _tmp9_ = NULL;
- SetRatingSingleCommand* _tmp10_ = NULL;
+ Photo* _tmp3_;
+ Photo* _tmp4_;
+ Rating _tmp5_;
+ SetRatingSingleCommand* _tmp6_;
+ SetRatingSingleCommand* _tmp7_;
+ CommandManager* _tmp8_;
+ CommandManager* _tmp9_;
+ SetRatingSingleCommand* _tmp10_;
#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18957,20 +18927,20 @@ static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rat
if (!_tmp1_) {
#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = TRUE;
-#line 18956 "PhotoPage.c"
+#line 18926 "PhotoPage.c"
} else {
- gboolean _tmp2_ = FALSE;
+ gboolean _tmp2_;
#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = _tmp2_;
-#line 18963 "PhotoPage.c"
+#line 18933 "PhotoPage.c"
}
#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
#line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 18969 "PhotoPage.c"
+#line 18939 "PhotoPage.c"
}
#line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
@@ -19000,7 +18970,7 @@ static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rat
library_photo_page_update_rating_menu_item_sensitivity (self);
#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (command);
-#line 18999 "PhotoPage.c"
+#line 18969 "PhotoPage.c"
}
@@ -19009,7 +18979,7 @@ static void library_photo_page_on_rate_rejected (LibraryPhotoPage* self) {
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 3059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_set_rating (self, RATING_REJECTED);
-#line 19008 "PhotoPage.c"
+#line 18978 "PhotoPage.c"
}
@@ -19018,7 +18988,7 @@ static void library_photo_page_on_rate_unrated (LibraryPhotoPage* self) {
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 3063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_set_rating (self, RATING_UNRATED);
-#line 19017 "PhotoPage.c"
+#line 18987 "PhotoPage.c"
}
@@ -19027,7 +18997,7 @@ static void library_photo_page_on_rate_one (LibraryPhotoPage* self) {
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_set_rating (self, RATING_ONE);
-#line 19026 "PhotoPage.c"
+#line 18996 "PhotoPage.c"
}
@@ -19036,7 +19006,7 @@ static void library_photo_page_on_rate_two (LibraryPhotoPage* self) {
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_set_rating (self, RATING_TWO);
-#line 19035 "PhotoPage.c"
+#line 19005 "PhotoPage.c"
}
@@ -19045,7 +19015,7 @@ static void library_photo_page_on_rate_three (LibraryPhotoPage* self) {
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 3075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_set_rating (self, RATING_THREE);
-#line 19044 "PhotoPage.c"
+#line 19014 "PhotoPage.c"
}
@@ -19054,7 +19024,7 @@ static void library_photo_page_on_rate_four (LibraryPhotoPage* self) {
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_set_rating (self, RATING_FOUR);
-#line 19053 "PhotoPage.c"
+#line 19023 "PhotoPage.c"
}
@@ -19063,40 +19033,40 @@ static void library_photo_page_on_rate_five (LibraryPhotoPage* self) {
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_on_set_rating (self, RATING_FIVE);
-#line 19062 "PhotoPage.c"
+#line 19032 "PhotoPage.c"
}
static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhotoPage* self) {
- Photo* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- Rating _tmp2_ = 0;
- Photo* _tmp3_ = NULL;
- Photo* _tmp4_ = NULL;
- Rating _tmp5_ = 0;
- Photo* _tmp6_ = NULL;
- Photo* _tmp7_ = NULL;
- Rating _tmp8_ = 0;
- Photo* _tmp9_ = NULL;
- Photo* _tmp10_ = NULL;
- Rating _tmp11_ = 0;
- Photo* _tmp12_ = NULL;
- Photo* _tmp13_ = NULL;
- Rating _tmp14_ = 0;
- Photo* _tmp15_ = NULL;
- Photo* _tmp16_ = NULL;
- Rating _tmp17_ = 0;
- Photo* _tmp18_ = NULL;
- Photo* _tmp19_ = NULL;
- Rating _tmp20_ = 0;
- Photo* _tmp21_ = NULL;
- Photo* _tmp22_ = NULL;
- Rating _tmp23_ = 0;
- gboolean _tmp24_ = FALSE;
- Photo* _tmp25_ = NULL;
- Photo* _tmp26_ = NULL;
- Rating _tmp27_ = 0;
- gboolean _tmp28_ = FALSE;
+ Photo* _tmp0_;
+ Photo* _tmp1_;
+ Rating _tmp2_;
+ Photo* _tmp3_;
+ Photo* _tmp4_;
+ Rating _tmp5_;
+ Photo* _tmp6_;
+ Photo* _tmp7_;
+ Rating _tmp8_;
+ Photo* _tmp9_;
+ Photo* _tmp10_;
+ Rating _tmp11_;
+ Photo* _tmp12_;
+ Photo* _tmp13_;
+ Rating _tmp14_;
+ Photo* _tmp15_;
+ Photo* _tmp16_;
+ Rating _tmp17_;
+ Photo* _tmp18_;
+ Photo* _tmp19_;
+ Rating _tmp20_;
+ Photo* _tmp21_;
+ Photo* _tmp22_;
+ Rating _tmp23_;
+ gboolean _tmp24_;
+ Photo* _tmp25_;
+ Photo* _tmp26_;
+ Rating _tmp27_;
+ gboolean _tmp28_;
#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19193,32 +19163,32 @@ static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhoto
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp28_);
#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp26_);
-#line 19192 "PhotoPage.c"
+#line 19162 "PhotoPage.c"
}
static GVariant* _variant_new18 (const gchar* value) {
#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return g_variant_ref_sink (g_variant_new_string (value));
-#line 19199 "PhotoPage.c"
+#line 19169 "PhotoPage.c"
}
static GVariant* _variant_new19 (const gchar* value) {
#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return g_variant_ref_sink (g_variant_new_string (value));
-#line 19206 "PhotoPage.c"
+#line 19176 "PhotoPage.c"
}
static void library_photo_page_update_development_menu_item_sensitivity (LibraryPhotoPage* self) {
PhotoFileFormat format = 0;
- Photo* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- PhotoFileFormat _tmp2_ = 0;
- PhotoFileFormat _tmp3_ = 0;
- PhotoFileFormat _tmp4_ = 0;
- PhotoFileFormat _tmp5_ = 0;
+ Photo* _tmp0_;
+ Photo* _tmp1_;
+ PhotoFileFormat _tmp2_;
+ PhotoFileFormat _tmp3_;
+ PhotoFileFormat _tmp4_;
+ PhotoFileFormat _tmp5_;
#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19241,11 +19211,11 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
_tmp5_ = format;
#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp5_ == PHOTO_FILE_FORMAT_RAW) {
-#line 19240 "PhotoPage.c"
- Photo* _tmp6_ = NULL;
- Photo* _tmp7_ = NULL;
- RawDeveloper _tmp8_ = 0;
- RawDeveloper _tmp9_ = 0;
+#line 19210 "PhotoPage.c"
+ Photo* _tmp6_;
+ Photo* _tmp7_;
+ RawDeveloper _tmp8_;
+ RawDeveloper _tmp9_;
#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19260,11 +19230,11 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
switch (_tmp9_) {
#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
case RAW_DEVELOPER_SHOTWELL:
-#line 19259 "PhotoPage.c"
+#line 19229 "PhotoPage.c"
{
- GAction* _tmp10_ = NULL;
- GAction* _tmp11_ = NULL;
- GVariant* _tmp12_ = NULL;
+ GAction* _tmp10_;
+ GAction* _tmp11_;
+ GVariant* _tmp12_;
#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp10_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19279,17 +19249,17 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
_g_object_unref0 (_tmp11_);
#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 19278 "PhotoPage.c"
+#line 19248 "PhotoPage.c"
}
#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
case RAW_DEVELOPER_CAMERA:
#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
case RAW_DEVELOPER_EMBEDDED:
-#line 19284 "PhotoPage.c"
+#line 19254 "PhotoPage.c"
{
- GAction* _tmp13_ = NULL;
- GAction* _tmp14_ = NULL;
- GVariant* _tmp15_ = NULL;
+ GAction* _tmp13_;
+ GAction* _tmp14_;
+ GVariant* _tmp15_;
#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp13_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19304,13 +19274,13 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
_g_object_unref0 (_tmp14_);
#line 3113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
break;
-#line 19303 "PhotoPage.c"
+#line 19273 "PhotoPage.c"
}
default:
{
#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_assert_not_reached ();
-#line 19309 "PhotoPage.c"
+#line 19279 "PhotoPage.c"
}
}
}
@@ -19319,11 +19289,11 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeMap* map) {
gboolean _tmp0_ = FALSE;
- GeeMap* _tmp1_ = NULL;
- Photo* _tmp2_ = NULL;
- Photo* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
- gboolean _tmp5_ = FALSE;
+ GeeMap* _tmp1_;
+ Photo* _tmp2_;
+ Photo* _tmp3_;
+ gboolean _tmp4_;
+ gboolean _tmp5_;
#line 3121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 3121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19342,13 +19312,13 @@ static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeM
_g_object_unref0 (_tmp3_);
#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp5_) {
-#line 19341 "PhotoPage.c"
- GeeMap* _tmp6_ = NULL;
- Photo* _tmp7_ = NULL;
- Photo* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
- Alteration* _tmp10_ = NULL;
- gboolean _tmp11_ = FALSE;
+#line 19311 "PhotoPage.c"
+ GeeMap* _tmp6_;
+ Photo* _tmp7_;
+ Photo* _tmp8_;
+ gpointer _tmp9_;
+ Alteration* _tmp10_;
+ gboolean _tmp11_;
#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp6_ = map;
#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19367,32 +19337,32 @@ static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeM
_alteration_unref0 (_tmp10_);
#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp8_);
-#line 19366 "PhotoPage.c"
+#line 19336 "PhotoPage.c"
} else {
#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp0_ = FALSE;
-#line 19370 "PhotoPage.c"
+#line 19340 "PhotoPage.c"
}
#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp0_) {
#line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 19376 "PhotoPage.c"
+#line 19346 "PhotoPage.c"
}
}
static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
AddTagsDialog* dialog = NULL;
- AddTagsDialog* _tmp0_ = NULL;
+ AddTagsDialog* _tmp0_;
gchar** names = NULL;
- AddTagsDialog* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gchar** _tmp3_ = NULL;
- gint names_length1 = 0;
- gint _names_size_ = 0;
- gchar** _tmp4_ = NULL;
- gint _tmp4__length1 = 0;
+ AddTagsDialog* _tmp1_;
+ gint _tmp2_;
+ gchar** _tmp3_;
+ gint names_length1;
+ gint _names_size_;
+ gchar** _tmp4_;
+ gint _tmp4__length1;
#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19415,23 +19385,23 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
_tmp4__length1 = names_length1;
#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
if (_tmp4_ != NULL) {
-#line 19414 "PhotoPage.c"
- CommandManager* _tmp5_ = NULL;
- CommandManager* _tmp6_ = NULL;
- HierarchicalTagIndex* _tmp7_ = NULL;
- HierarchicalTagIndex* _tmp8_ = NULL;
- gchar** _tmp9_ = NULL;
- gint _tmp9__length1 = 0;
- gint _tmp10_ = 0;
- gchar** _tmp11_ = NULL;
- gchar** _tmp12_ = NULL;
- gint _tmp12__length1 = 0;
- ViewCollection* _tmp13_ = NULL;
- ViewCollection* _tmp14_ = NULL;
- GeeList* _tmp15_ = NULL;
- GeeCollection* _tmp16_ = NULL;
- AddTagsCommand* _tmp17_ = NULL;
- AddTagsCommand* _tmp18_ = NULL;
+#line 19384 "PhotoPage.c"
+ CommandManager* _tmp5_;
+ CommandManager* _tmp6_;
+ HierarchicalTagIndex* _tmp7_;
+ HierarchicalTagIndex* _tmp8_;
+ gchar** _tmp9_;
+ gint _tmp9__length1;
+ gint _tmp10_;
+ gchar** _tmp11_;
+ gchar** _tmp12_;
+ gint _tmp12__length1;
+ ViewCollection* _tmp13_;
+ ViewCollection* _tmp14_;
+ GeeList* _tmp15_;
+ GeeCollection* _tmp16_;
+ AddTagsCommand* _tmp17_;
+ AddTagsCommand* _tmp18_;
#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19476,37 +19446,37 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
_hierarchical_tag_index_unref0 (_tmp8_);
#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_command_manager_unref0 (_tmp6_);
-#line 19475 "PhotoPage.c"
+#line 19445 "PhotoPage.c"
}
#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_text_entry_dialog_mediator_unref0 (dialog);
-#line 19481 "PhotoPage.c"
+#line 19451 "PhotoPage.c"
}
static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) {
LibraryPhoto* photo = NULL;
- ViewCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- DataView* _tmp2_ = NULL;
- DataView* _tmp3_ = NULL;
- DataSource* _tmp4_ = NULL;
- LibraryPhoto* _tmp5_ = NULL;
+ ViewCollection* _tmp0_;
+ ViewCollection* _tmp1_;
+ DataView* _tmp2_;
+ DataView* _tmp3_;
+ DataSource* _tmp4_;
+ LibraryPhoto* _tmp5_;
ModifyTagsDialog* dialog = NULL;
- LibraryPhoto* _tmp6_ = NULL;
- ModifyTagsDialog* _tmp7_ = NULL;
+ LibraryPhoto* _tmp6_;
+ ModifyTagsDialog* _tmp7_;
GeeArrayList* new_tags = NULL;
- ModifyTagsDialog* _tmp8_ = NULL;
- GeeArrayList* _tmp9_ = NULL;
- GeeArrayList* _tmp10_ = NULL;
- CommandManager* _tmp11_ = NULL;
- CommandManager* _tmp12_ = NULL;
- LibraryPhoto* _tmp13_ = NULL;
- GeeArrayList* _tmp14_ = NULL;
- ModifyTagsCommand* _tmp15_ = NULL;
- ModifyTagsCommand* _tmp16_ = NULL;
+ ModifyTagsDialog* _tmp8_;
+ GeeArrayList* _tmp9_;
+ GeeArrayList* _tmp10_;
+ CommandManager* _tmp11_;
+ CommandManager* _tmp12_;
+ LibraryPhoto* _tmp13_;
+ GeeArrayList* _tmp14_;
+ ModifyTagsCommand* _tmp15_;
+ ModifyTagsCommand* _tmp16_;
#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
#line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19551,7 +19521,7 @@ static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) {
_g_object_unref0 (photo);
#line 3143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return;
-#line 19550 "PhotoPage.c"
+#line 19520 "PhotoPage.c"
}
#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -19577,18 +19547,18 @@ static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) {
_text_entry_dialog_mediator_unref0 (dialog);
#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (photo);
-#line 19576 "PhotoPage.c"
+#line 19546 "PhotoPage.c"
}
static gboolean library_photo_page_library_photo_page_view_filter_real_predicate (ViewFilter* base, DataView* view) {
LibraryPhotoPageLibraryPhotoPageViewFilter * self;
gboolean result = FALSE;
- DataView* _tmp0_ = NULL;
- DataSource* _tmp1_ = NULL;
- MediaSource* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- gboolean _tmp4_ = FALSE;
+ DataView* _tmp0_;
+ DataSource* _tmp1_;
+ MediaSource* _tmp2_;
+ gboolean _tmp3_;
+ gboolean _tmp4_;
#line 2335 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_PHOTO_PAGE_TYPE_LIBRARY_PHOTO_PAGE_VIEW_FILTER, LibraryPhotoPageLibraryPhotoPageViewFilter);
#line 2335 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19609,7 +19579,7 @@ static gboolean library_photo_page_library_photo_page_view_filter_real_predicate
result = _tmp4_;
#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return result;
-#line 19608 "PhotoPage.c"
+#line 19578 "PhotoPage.c"
}
@@ -19619,14 +19589,14 @@ static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_ph
self = (LibraryPhotoPageLibraryPhotoPageViewFilter*) view_filter_construct (object_type);
#line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return self;
-#line 19618 "PhotoPage.c"
+#line 19588 "PhotoPage.c"
}
static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_new (void) {
#line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
return library_photo_page_library_photo_page_view_filter_construct (LIBRARY_PHOTO_PAGE_TYPE_LIBRARY_PHOTO_PAGE_VIEW_FILTER);
-#line 19625 "PhotoPage.c"
+#line 19595 "PhotoPage.c"
}
@@ -19634,8 +19604,8 @@ static void library_photo_page_library_photo_page_view_filter_class_init (Librar
#line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
library_photo_page_library_photo_page_view_filter_parent_class = g_type_class_peek_parent (klass);
#line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) library_photo_page_library_photo_page_view_filter_real_predicate;
-#line 19634 "PhotoPage.c"
+ ((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) library_photo_page_library_photo_page_view_filter_real_predicate;
+#line 19604 "PhotoPage.c"
}
@@ -19661,53 +19631,53 @@ static void library_photo_page_class_init (LibraryPhotoPageClass * klass) {
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
g_type_class_add_private (klass, sizeof (LibraryPhotoPagePrivate));
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) library_photo_page_real_init_collect_ui_filenames;
+ ((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) library_photo_page_real_init_collect_ui_filenames;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) library_photo_page_real_add_actions;
+ ((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) library_photo_page_real_add_actions;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) library_photo_page_real_remove_actions;
+ ((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) library_photo_page_real_remove_actions;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->init_collect_injection_groups = (InjectionGroup** (*)(Page*, int*)) library_photo_page_real_init_collect_injection_groups;
+ ((PageClass *) klass)->init_collect_injection_groups = (InjectionGroup** (*) (Page *, int*)) library_photo_page_real_init_collect_injection_groups;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) library_photo_page_real_update_actions;
+ ((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) library_photo_page_real_update_actions;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((LibraryPhotoPageClass *) klass)->developer_changed = (void (*)(LibraryPhotoPage*, RawDeveloper)) library_photo_page_real_developer_changed;
+ ((LibraryPhotoPageClass *) klass)->developer_changed = (void (*) (LibraryPhotoPage *, RawDeveloper)) library_photo_page_real_developer_changed;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->switched_to = (void (*)(Page*)) library_photo_page_real_switched_to;
+ ((PageClass *) klass)->switched_to = (void (*) (Page *)) library_photo_page_real_switched_to;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->switching_from = (void (*)(Page*)) library_photo_page_real_switching_from;
+ ((PageClass *) klass)->switching_from = (void (*) (Page *)) library_photo_page_real_switching_from;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->get_bottom_left_trinket = (GdkPixbuf* (*)(EditingHostPage*, gint)) library_photo_page_real_get_bottom_left_trinket;
+ ((EditingHostPageClass *) klass)->get_bottom_left_trinket = (GdkPixbuf* (*) (EditingHostPage *, gint)) library_photo_page_real_get_bottom_left_trinket;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->get_top_right_trinket = (GdkPixbuf* (*)(EditingHostPage*, gint)) library_photo_page_real_get_top_right_trinket;
+ ((EditingHostPageClass *) klass)->get_top_right_trinket = (GdkPixbuf* (*) (EditingHostPage *, gint)) library_photo_page_real_get_top_right_trinket;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->on_increase_size = (void (*)(EditingHostPage*)) library_photo_page_real_on_increase_size;
+ ((EditingHostPageClass *) klass)->on_increase_size = (void (*) (EditingHostPage *)) library_photo_page_real_on_increase_size;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->on_decrease_size = (void (*)(EditingHostPage*)) library_photo_page_real_on_decrease_size;
+ ((EditingHostPageClass *) klass)->on_decrease_size = (void (*) (EditingHostPage *)) library_photo_page_real_on_decrease_size;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->on_zoom_slider_key_press = (gboolean (*)(EditingHostPage*, GdkEventKey*)) library_photo_page_real_on_zoom_slider_key_press;
+ ((EditingHostPageClass *) klass)->on_zoom_slider_key_press = (gboolean (*) (EditingHostPage *, GdkEventKey*)) library_photo_page_real_on_zoom_slider_key_press;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->update_ui = (void (*)(EditingHostPage*, gboolean)) library_photo_page_real_update_ui;
+ ((EditingHostPageClass *) klass)->update_ui = (void (*) (EditingHostPage *, gboolean)) library_photo_page_real_update_ui;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->notify_photo_backing_missing = (void (*)(EditingHostPage*, Photo*, gboolean)) library_photo_page_real_notify_photo_backing_missing;
+ ((EditingHostPageClass *) klass)->notify_photo_backing_missing = (void (*) (EditingHostPage *, Photo*, gboolean)) library_photo_page_real_notify_photo_backing_missing;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) library_photo_page_real_key_press_event;
+ ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) library_photo_page_real_key_press_event;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((EditingHostPageClass *) klass)->on_double_click = (gboolean (*)(EditingHostPage*, GdkEventButton*)) library_photo_page_real_on_double_click;
+ ((EditingHostPageClass *) klass)->on_double_click = (gboolean (*) (EditingHostPage *, GdkEventButton*)) library_photo_page_real_on_double_click;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_left_released = (gboolean (*)(Page*, GdkEventButton*)) library_photo_page_real_on_left_released;
+ ((PageClass *) klass)->on_left_released = (gboolean (*) (Page *, GdkEventButton*)) library_photo_page_real_on_left_released;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_context_buttonpress = (gboolean (*)(Page*, GdkEventButton*)) library_photo_page_real_on_context_buttonpress;
+ ((PageClass *) klass)->on_context_buttonpress = (gboolean (*) (Page *, GdkEventButton*)) library_photo_page_real_on_context_buttonpress;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- ((PageClass *) klass)->on_context_keypress = (gboolean (*)(Page*)) library_photo_page_real_on_context_keypress;
+ ((PageClass *) klass)->on_context_keypress = (gboolean (*) (Page *)) library_photo_page_real_on_context_keypress;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
G_OBJECT_CLASS (klass)->finalize = library_photo_page_finalize;
-#line 19701 "PhotoPage.c"
+#line 19671 "PhotoPage.c"
}
static void library_photo_page_instance_init (LibraryPhotoPage * self) {
- LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL;
+ LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self->priv = LIBRARY_PHOTO_PAGE_GET_PRIVATE (self);
#line 2340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19718,19 +19688,19 @@ static void library_photo_page_instance_init (LibraryPhotoPage * self) {
_tmp0_ = library_photo_page_library_photo_page_view_filter_new ();
#line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self->priv->filter = _tmp0_;
-#line 19717 "PhotoPage.c"
+#line 19687 "PhotoPage.c"
}
-static void library_photo_page_finalize (GObject* obj) {
+static void library_photo_page_finalize (GObject * obj) {
LibraryPhotoPage * self;
- LibraryPhotoSourceCollection* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- LibraryPhotoSourceCollection* _tmp2_ = NULL;
- guint _tmp3_ = 0U;
- ConfigFacade* _tmp4_ = NULL;
- ConfigFacade* _tmp5_ = NULL;
- guint _tmp6_ = 0U;
+ LibraryPhotoSourceCollection* _tmp0_;
+ guint _tmp1_;
+ LibraryPhotoSourceCollection* _tmp2_;
+ guint _tmp3_;
+ ConfigFacade* _tmp4_;
+ ConfigFacade* _tmp5_;
+ guint _tmp6_;
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19763,7 +19733,7 @@ static void library_photo_page_finalize (GObject* obj) {
_g_object_unref0 (self->priv->context_menu);
#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
G_OBJECT_CLASS (library_photo_page_parent_class)->finalize (obj);
-#line 19762 "PhotoPage.c"
+#line 19732 "PhotoPage.c"
}