diff options
Diffstat (limited to 'src/direct')
| -rw-r--r-- | src/direct/Direct.c | 10 | ||||
| -rw-r--r-- | src/direct/DirectPhoto.c | 609 | ||||
| -rw-r--r-- | src/direct/DirectPhotoPage.c | 1720 | ||||
| -rw-r--r-- | src/direct/DirectView.c | 64 | ||||
| -rw-r--r-- | src/direct/DirectWindow.c | 156 |
5 files changed, 1262 insertions, 1297 deletions
diff --git a/src/direct/Direct.c b/src/direct/Direct.c index 1d5987d..36ab376 100644 --- a/src/direct/Direct.c +++ b/src/direct/Direct.c @@ -1,4 +1,4 @@ -/* Direct.c generated by valac 0.34.7, the Vala compiler +/* Direct.c generated by valac 0.36.6, the Vala compiler * generated from Direct.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -44,8 +44,8 @@ static gpointer _g_object_ref0 (gpointer self) { void direct_preconfigure (GFile* initial_file) { - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; #line 20 "/home/jens/Source/shotwell/src/direct/Direct.vala" g_return_if_fail (G_IS_FILE (initial_file)); #line 21 "/home/jens/Source/shotwell/src/direct/Direct.vala" @@ -61,8 +61,8 @@ void direct_preconfigure (GFile* initial_file) { void direct_init (GError** error) { - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; #line 25 "/home/jens/Source/shotwell/src/direct/Direct.vala" _tmp0_ = direct_initial_file; #line 25 "/home/jens/Source/shotwell/src/direct/Direct.vala" diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c index 5347674..013bb80 100644 --- a/src/direct/DirectPhoto.c +++ b/src/direct/DirectPhoto.c @@ -1,4 +1,4 @@ -/* DirectPhoto.c generated by valac 0.34.7, the Vala compiler +/* DirectPhoto.c generated by valac 0.36.6, the Vala compiler * generated from DirectPhoto.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -349,6 +349,11 @@ typedef struct _PhotoPreview PhotoPreview; typedef struct _PhotoPreviewClass PhotoPreviewClass; #define _photo_preview_unref0(var) ((var == NULL) ? NULL : (var = (photo_preview_unref (var), NULL))) #define _media_metadata_unref0(var) ((var == NULL) ? NULL : (var = (media_metadata_unref (var), NULL))) +enum { + DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL, + DIRECT_PHOTO_LAST_SIGNAL +}; +static guint direct_photo_signals[DIRECT_PHOTO_LAST_SIGNAL] = {0}; typedef struct _DataCollectionPrivate DataCollectionPrivate; #define TYPE_MARKER (marker_get_type ()) @@ -975,7 +980,7 @@ void direct_photo_init (GFile* initial_file); void photo_init_photo (void); DirectPhotoSourceCollection* direct_photo_source_collection_new (GFile* initial_file); DirectPhotoSourceCollection* direct_photo_source_collection_construct (GType object_type, GFile* initial_file); -gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto** photo, gboolean reimport); +gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto* * photo, gboolean reimport); gboolean data_collection_add (DataCollection* self, DataObject* object); void direct_photo_terminate (void); void photo_terminate_photo (void); @@ -994,10 +999,10 @@ void photo_value_set_reimport_master_state (GValue* value, gpointer v_object); void photo_value_take_reimport_master_state (GValue* value, gpointer v_object); gpointer photo_value_get_reimport_master_state (const GValue* value); GType photo_reimport_master_state_get_type (void) G_GNUC_CONST; -gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState** reimport_state, GError** error); +gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState* * reimport_state, GError** error); GQuark database_error_quark (void); void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, GError** error); -ImportResult direct_photo_internal_import (GFile* file, DirectPhoto** photo); +ImportResult direct_photo_internal_import (GFile* file, DirectPhoto* * photo); gpointer photo_import_params_ref (gpointer instance); void photo_import_params_unref (gpointer instance); GParamSpec* param_spec_photo_import_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -1059,7 +1064,7 @@ static void direct_photo_real_trash (MediaSource* base); static void direct_photo_real_untrash (MediaSource* base); static void direct_photo_real_mark_offline (MediaSource* base); static void direct_photo_real_mark_online (MediaSource* base); -static void direct_photo_finalize (GObject* obj); +static void direct_photo_finalize (GObject * obj); GType marker_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); @@ -1107,12 +1112,12 @@ PhotoFileFormat photo_get_file_format (Photo* self); gchar* import_result_to_string (ImportResult self); gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollection* self, GFile* file); DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self, GFile* file); -static void direct_photo_source_collection_finalize (DataCollection* obj); +static void direct_photo_source_collection_finalize (DataCollection * obj); static DirectPhoto* direct_photo_construct (GType object_type, PhotoRow* row) { DirectPhoto * self = NULL; - PhotoRow* _tmp0_ = NULL; + PhotoRow* _tmp0_; #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_PHOTO_ROW (row), NULL); #line 18 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1121,14 +1126,14 @@ static DirectPhoto* direct_photo_construct (GType object_type, PhotoRow* row) { self = (DirectPhoto*) photo_construct (object_type, _tmp0_); #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return self; -#line 1125 "DirectPhoto.c" +#line 1130 "DirectPhoto.c" } static DirectPhoto* direct_photo_new (PhotoRow* row) { #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return direct_photo_construct (TYPE_DIRECT_PHOTO, row); -#line 1132 "DirectPhoto.c" +#line 1137 "DirectPhoto.c" } @@ -1147,10 +1152,10 @@ static DirectPhoto* direct_photo_new (PhotoRow* row) { * obtained by calling get_orientation() prior to export()ing a DirectPhoto. */ void direct_photo_fixup_orientation_after_reimport (DirectPhoto* self, Orientation dest) { - PhotoRow* _tmp0_ = NULL; - Orientation _tmp1_ = 0; - BackingPhotoRow* _tmp2_ = NULL; - Orientation _tmp3_ = 0; + PhotoRow* _tmp0_; + Orientation _tmp1_; + BackingPhotoRow* _tmp2_; + Orientation _tmp3_; #line 35 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_DIRECT_PHOTO (self)); #line 36 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1165,22 +1170,22 @@ void direct_photo_fixup_orientation_after_reimport (DirectPhoto* self, Orientati _tmp3_ = dest; #line 37 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp2_->original_orientation = _tmp3_; -#line 1169 "DirectPhoto.c" +#line 1174 "DirectPhoto.c" } void direct_photo_init (GFile* initial_file) { - GFile* _tmp0_ = NULL; - DirectPhotoSourceCollection* _tmp1_ = NULL; + GFile* _tmp0_; + DirectPhotoSourceCollection* _tmp1_; DirectPhoto* photo = NULL; gchar* reason = NULL; - DirectPhotoSourceCollection* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; + DirectPhotoSourceCollection* _tmp2_; + GFile* _tmp3_; DirectPhoto* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - DirectPhotoSourceCollection* _tmp8_ = NULL; - DirectPhoto* _tmp9_ = NULL; + gchar* _tmp5_; + const gchar* _tmp6_; + DirectPhotoSourceCollection* _tmp8_; + DirectPhoto* _tmp9_; #line 40 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (G_IS_FILE (initial_file)); #line 41 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1209,13 +1214,13 @@ void direct_photo_init (GFile* initial_file) { _tmp6_ = reason; #line 46 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (_tmp6_ != NULL) { -#line 1213 "DirectPhoto.c" - const gchar* _tmp7_ = NULL; +#line 1218 "DirectPhoto.c" + const gchar* _tmp7_; #line 47 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp7_ = reason; #line 47 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_warning ("DirectPhoto.vala:47: fetch error: %s", _tmp7_); -#line 1219 "DirectPhoto.c" +#line 1224 "DirectPhoto.c" } #line 48 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp8_ = direct_photo_global; @@ -1227,14 +1232,14 @@ void direct_photo_init (GFile* initial_file) { _g_free0 (reason); #line 40 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (photo); -#line 1231 "DirectPhoto.c" +#line 1236 "DirectPhoto.c" } void direct_photo_terminate (void) { #line 52 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" photo_terminate_photo (); -#line 1238 "DirectPhoto.c" +#line 1243 "DirectPhoto.c" } @@ -1242,12 +1247,12 @@ static void direct_photo_save_dims (DirectPhoto* self) { GError * _inner_error_ = NULL; #line 57 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_DIRECT_PHOTO (self)); -#line 1246 "DirectPhoto.c" +#line 1251 "DirectPhoto.c" { GdkPixbuf* _tmp0_ = NULL; Scaling _tmp1_ = {0}; - GdkPixbuf* _tmp2_ = NULL; - BackingPhotoRow* _tmp3_ = NULL; + GdkPixbuf* _tmp2_; + BackingPhotoRow* _tmp3_; Dimensions _tmp4_ = {0}; #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" scaling_for_original (&_tmp1_); @@ -1257,7 +1262,7 @@ static void direct_photo_save_dims (DirectPhoto* self) { _tmp0_ = _tmp2_; #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1261 "DirectPhoto.c" +#line 1266 "DirectPhoto.c" goto __catch45_g_error; } #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1268,14 +1273,14 @@ static void direct_photo_save_dims (DirectPhoto* self) { _tmp3_->dim = _tmp4_; #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_tmp0_); -#line 1272 "DirectPhoto.c" +#line 1277 "DirectPhoto.c" } goto __finally45; __catch45_g_error: { GError* e = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + gchar* _tmp5_; + gchar* _tmp6_; #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" e = _inner_error_; #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1290,7 +1295,7 @@ static void direct_photo_save_dims (DirectPhoto* self) { _g_free0 (_tmp6_); #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_error_free0 (e); -#line 1294 "DirectPhoto.c" +#line 1299 "DirectPhoto.c" } __finally45: #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1301,14 +1306,14 @@ static void direct_photo_save_dims (DirectPhoto* self) { g_clear_error (&_inner_error_); #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return; -#line 1305 "DirectPhoto.c" +#line 1310 "DirectPhoto.c" } } ImportResult direct_photo_demand_load (DirectPhoto* self) { ImportResult result = 0; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; PhotoReimportMasterState* reimport_state = NULL; GError * _inner_error_ = NULL; #line 67 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1323,11 +1328,11 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { result = IMPORT_RESULT_SUCCESS; #line 70 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1327 "DirectPhoto.c" +#line 1332 "DirectPhoto.c" } { PhotoReimportMasterState* _tmp1_ = NULL; - PhotoReimportMasterState* _tmp2_ = NULL; + PhotoReimportMasterState* _tmp2_; #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" photo_prepare_for_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), &_tmp1_, &_inner_error_); #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1336,7 +1341,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { reimport_state = _tmp1_; #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1340 "DirectPhoto.c" +#line 1345 "DirectPhoto.c" goto __catch46_g_error; } #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1345,7 +1350,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { photo_finish_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp2_, &_inner_error_); #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1349 "DirectPhoto.c" +#line 1354 "DirectPhoto.c" goto __catch46_g_error; } } @@ -1353,8 +1358,8 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { __catch46_g_error: { GError* err = NULL; - GError* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; + GError* _tmp3_; + const gchar* _tmp4_; #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" err = _inner_error_; #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1373,7 +1378,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { _photo_reimport_master_state_unref0 (reimport_state); #line 79 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1377 "DirectPhoto.c" +#line 1382 "DirectPhoto.c" } __finally46: #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1386,7 +1391,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { g_clear_error (&_inner_error_); #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return 0; -#line 1390 "DirectPhoto.c" +#line 1395 "DirectPhoto.c" } #line 82 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->loaded = TRUE; @@ -1398,23 +1403,23 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { _photo_reimport_master_state_unref0 (reimport_state); #line 84 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1402 "DirectPhoto.c" +#line 1407 "DirectPhoto.c" } -ImportResult direct_photo_internal_import (GFile* file, DirectPhoto** photo) { +ImportResult direct_photo_internal_import (GFile* file, DirectPhoto* * photo) { DirectPhoto* _vala_photo = NULL; ImportResult result = 0; PhotoImportParams* params = NULL; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; ImportID _tmp1_ = {0}; - PhotoImportParams* _tmp2_ = NULL; - PhotoTable* _tmp3_ = NULL; - PhotoTable* _tmp4_ = NULL; - PhotoRow* _tmp5_ = NULL; + PhotoImportParams* _tmp2_; + PhotoTable* _tmp3_; + PhotoTable* _tmp4_; + PhotoRow* _tmp5_; PhotoID _tmp6_ = {0}; - PhotoRow* _tmp7_ = NULL; - DirectPhoto* _tmp8_ = NULL; + PhotoRow* _tmp7_; + DirectPhoto* _tmp8_; #line 89 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (G_IS_FILE (file), 0); #line 90 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1453,24 +1458,24 @@ ImportResult direct_photo_internal_import (GFile* file, DirectPhoto** photo) { if (photo) { #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" *photo = _vala_photo; -#line 1457 "DirectPhoto.c" +#line 1462 "DirectPhoto.c" } else { #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_vala_photo); -#line 1461 "DirectPhoto.c" +#line 1466 "DirectPhoto.c" } #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1465 "DirectPhoto.c" +#line 1470 "DirectPhoto.c" } static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scaling* scaling, GError** error) { DirectPhoto * self; GdkPixbuf* result = NULL; - GdkPixbuf* _tmp0_ = NULL; - GdkPixbuf* _tmp9_ = NULL; - GdkPixbuf* _tmp10_ = NULL; + GdkPixbuf* _tmp0_; + GdkPixbuf* _tmp9_; + GdkPixbuf* _tmp10_; GError * _inner_error_ = NULL; #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); @@ -1480,11 +1485,11 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali _tmp0_ = self->priv->preview; #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (_tmp0_ == NULL) { -#line 1484 "DirectPhoto.c" +#line 1489 "DirectPhoto.c" GdkPixbuf* _tmp1_ = NULL; - GdkPixbuf* _tmp2_ = NULL; - GdkPixbuf* _tmp3_ = NULL; - GdkPixbuf* _tmp4_ = NULL; + GdkPixbuf* _tmp2_; + GdkPixbuf* _tmp3_; + GdkPixbuf* _tmp4_; #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp2_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), DIRECT_PHOTO_PREVIEW_BEST_FIT, &_inner_error_); #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1495,7 +1500,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali g_propagate_error (error, _inner_error_); #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return NULL; -#line 1499 "DirectPhoto.c" +#line 1504 "DirectPhoto.c" } #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp3_ = _tmp1_; @@ -1509,11 +1514,11 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali _tmp4_ = self->priv->preview; #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (_tmp4_ == NULL) { -#line 1513 "DirectPhoto.c" +#line 1518 "DirectPhoto.c" GdkPixbuf* _tmp5_ = NULL; - Scaling _tmp6_ = {0}; - GdkPixbuf* _tmp7_ = NULL; - GdkPixbuf* _tmp8_ = NULL; + Scaling _tmp6_; + GdkPixbuf* _tmp7_; + GdkPixbuf* _tmp8_; #line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp6_ = *scaling; #line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1528,7 +1533,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali _g_object_unref0 (_tmp1_); #line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return NULL; -#line 1532 "DirectPhoto.c" +#line 1537 "DirectPhoto.c" } #line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp8_ = _tmp5_; @@ -1540,11 +1545,11 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali self->priv->preview = _tmp8_; #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_tmp5_); -#line 1544 "DirectPhoto.c" +#line 1549 "DirectPhoto.c" } #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_tmp1_); -#line 1548 "DirectPhoto.c" +#line 1553 "DirectPhoto.c" } #line 107 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp9_ = self->priv->preview; @@ -1554,24 +1559,24 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali result = _tmp10_; #line 107 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1558 "DirectPhoto.c" +#line 1563 "DirectPhoto.c" } static void direct_photo_real_rotate (Photo* base, Rotation rotation) { DirectPhoto * self; - Rotation _tmp0_ = 0; + Rotation _tmp0_; #line 110 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); #line 111 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->can_rotate_now = FALSE; #line 112 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - g_signal_emit_by_name (self, "can-rotate-changed", FALSE); + g_signal_emit (self, direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL], 0, FALSE); #line 113 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp0_ = rotation; #line 113 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" PHOTO_CLASS (direct_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_); -#line 1575 "DirectPhoto.c" +#line 1580 "DirectPhoto.c" } @@ -1579,8 +1584,8 @@ static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scal DirectPhoto * self; GdkPixbuf* result = NULL; GdkPixbuf* ret = NULL; - Scaling _tmp0_ = {0}; - GdkPixbuf* _tmp1_ = NULL; + Scaling _tmp0_; + GdkPixbuf* _tmp1_; GError * _inner_error_ = NULL; #line 116 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); @@ -1598,17 +1603,17 @@ static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scal g_propagate_error (error, _inner_error_); #line 117 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return NULL; -#line 1602 "DirectPhoto.c" +#line 1607 "DirectPhoto.c" } #line 118 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - g_signal_emit_by_name (self, "can-rotate-changed", TRUE); + g_signal_emit (self, direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL], 0, TRUE); #line 119 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->can_rotate_now = TRUE; #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" result = ret; #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1612 "DirectPhoto.c" +#line 1617 "DirectPhoto.c" } @@ -1616,10 +1621,10 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s DirectPhoto * self; GdkPixbuf* result = NULL; PhotoMetadata* metadata = NULL; - PhotoMetadata* _tmp0_ = NULL; + PhotoMetadata* _tmp0_; GdkPixbuf* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; - PhotoMetadata* _tmp3_ = NULL; + PhotoMetadata* _tmp3_; GError * _inner_error_ = NULL; #line 123 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); @@ -1633,17 +1638,17 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s if (_tmp3_ == NULL) { #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp2_ = TRUE; -#line 1637 "DirectPhoto.c" +#line 1642 "DirectPhoto.c" } else { - PhotoMetadata* _tmp4_ = NULL; - guint _tmp5_ = 0U; + PhotoMetadata* _tmp4_; + guint _tmp5_; #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp4_ = metadata; #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp5_ = photo_metadata_get_preview_count (_tmp4_); #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp2_ = _tmp5_ == ((guint) 0); -#line 1647 "DirectPhoto.c" +#line 1652 "DirectPhoto.c" } #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (_tmp2_) { @@ -1651,16 +1656,16 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s _g_object_unref0 (_tmp1_); #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp1_ = NULL; -#line 1655 "DirectPhoto.c" +#line 1660 "DirectPhoto.c" } else { GdkPixbuf* _tmp6_ = NULL; - PhotoMetadata* _tmp7_ = NULL; - PhotoPreview* _tmp8_ = NULL; - PhotoPreview* _tmp9_ = NULL; - GdkPixbuf* _tmp10_ = NULL; - GdkPixbuf* _tmp11_ = NULL; - Orientation _tmp12_ = 0; - GdkPixbuf* _tmp13_ = NULL; + PhotoMetadata* _tmp7_; + PhotoPreview* _tmp8_; + PhotoPreview* _tmp9_; + GdkPixbuf* _tmp10_; + GdkPixbuf* _tmp11_; + Orientation _tmp12_; + GdkPixbuf* _tmp13_; #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp7_ = metadata; #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1685,7 +1690,7 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s _media_metadata_unref0 (metadata); #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return NULL; -#line 1689 "DirectPhoto.c" +#line 1694 "DirectPhoto.c" } #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp12_ = photo_get_orientation (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)); @@ -1697,7 +1702,7 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s _tmp1_ = _tmp13_; #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_tmp6_); -#line 1701 "DirectPhoto.c" +#line 1706 "DirectPhoto.c" } #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" result = _tmp1_; @@ -1705,13 +1710,13 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s _media_metadata_unref0 (metadata); #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1709 "DirectPhoto.c" +#line 1714 "DirectPhoto.c" } static void direct_photo_real_notify_altered (DataObject* base, Alteration* alteration) { DirectPhoto * self; - Alteration* _tmp0_ = NULL; + Alteration* _tmp0_; #line 130 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); #line 130 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1724,7 +1729,7 @@ static void direct_photo_real_notify_altered (DataObject* base, Alteration* alte _tmp0_ = alteration; #line 133 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" DATA_OBJECT_CLASS (direct_photo_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_OBJECT, DataObject), _tmp0_); -#line 1728 "DirectPhoto.c" +#line 1733 "DirectPhoto.c" } @@ -1737,7 +1742,7 @@ static gboolean direct_photo_real_has_user_generated_metadata (Photo* base) { result = FALSE; #line 138 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1741 "DirectPhoto.c" +#line 1746 "DirectPhoto.c" } @@ -1747,7 +1752,7 @@ static void direct_photo_real_set_user_metadata_for_export (Photo* base, PhotoMe self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); #line 141 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_PHOTO_METADATA (metadata)); -#line 1751 "DirectPhoto.c" +#line 1756 "DirectPhoto.c" } @@ -1757,7 +1762,7 @@ static void direct_photo_real_apply_user_metadata_for_reimport (Photo* base, Pho self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); #line 145 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_PHOTO_METADATA (metadata)); -#line 1761 "DirectPhoto.c" +#line 1766 "DirectPhoto.c" } @@ -1770,7 +1775,7 @@ static gboolean direct_photo_real_is_trashed (MediaSource* base) { result = FALSE; #line 150 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1774 "DirectPhoto.c" +#line 1779 "DirectPhoto.c" } @@ -1783,7 +1788,7 @@ static gboolean direct_photo_real_is_offline (MediaSource* base) { result = FALSE; #line 155 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1787 "DirectPhoto.c" +#line 1792 "DirectPhoto.c" } @@ -1791,7 +1796,7 @@ static void direct_photo_real_trash (MediaSource* base) { DirectPhoto * self; #line 158 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); -#line 1795 "DirectPhoto.c" +#line 1800 "DirectPhoto.c" } @@ -1799,7 +1804,7 @@ static void direct_photo_real_untrash (MediaSource* base) { DirectPhoto * self; #line 162 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); -#line 1803 "DirectPhoto.c" +#line 1808 "DirectPhoto.c" } @@ -1807,7 +1812,7 @@ static void direct_photo_real_mark_offline (MediaSource* base) { DirectPhoto * self; #line 166 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); -#line 1811 "DirectPhoto.c" +#line 1816 "DirectPhoto.c" } @@ -1815,7 +1820,7 @@ static void direct_photo_real_mark_online (MediaSource* base) { DirectPhoto * self; #line 170 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); -#line 1819 "DirectPhoto.c" +#line 1824 "DirectPhoto.c" } @@ -1825,38 +1830,38 @@ static void direct_photo_class_init (DirectPhotoClass * klass) { #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_type_class_add_private (klass, sizeof (DirectPhotoPrivate)); #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*)(MediaSource*, Scaling*, GError**)) direct_photo_real_get_preview_pixbuf; + ((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*) (MediaSource *, Scaling*, GError**)) direct_photo_real_get_preview_pixbuf; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((PhotoClass *) klass)->rotate = (void (*)(Photo*, Rotation)) direct_photo_real_rotate; + ((PhotoClass *) klass)->rotate = (void (*) (Photo *, Rotation)) direct_photo_real_rotate; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*)(PhotoSource*, Scaling*, GError**)) direct_photo_real_get_pixbuf; + ((PhotoSourceClass *) klass)->get_pixbuf = (GdkPixbuf* (*) (PhotoSource *, Scaling*, GError**)) direct_photo_real_get_pixbuf; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*)(ThumbnailSource*, gint, GError**)) direct_photo_real_get_thumbnail; + ((ThumbnailSourceClass *) klass)->get_thumbnail = (GdkPixbuf* (*) (ThumbnailSource *, gint, GError**)) direct_photo_real_get_thumbnail; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) direct_photo_real_notify_altered; + ((DataObjectClass *) klass)->notify_altered = (void (*) (DataObject *, Alteration*)) direct_photo_real_notify_altered; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*)(Photo*)) direct_photo_real_has_user_generated_metadata; + ((PhotoClass *) klass)->has_user_generated_metadata = (gboolean (*) (Photo *)) direct_photo_real_has_user_generated_metadata; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((PhotoClass *) klass)->set_user_metadata_for_export = (void (*)(Photo*, PhotoMetadata*)) direct_photo_real_set_user_metadata_for_export; + ((PhotoClass *) klass)->set_user_metadata_for_export = (void (*) (Photo *, PhotoMetadata*)) direct_photo_real_set_user_metadata_for_export; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*)(Photo*, PhotoMetadata*)) direct_photo_real_apply_user_metadata_for_reimport; + ((PhotoClass *) klass)->apply_user_metadata_for_reimport = (void (*) (Photo *, PhotoMetadata*)) direct_photo_real_apply_user_metadata_for_reimport; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((MediaSourceClass *) klass)->is_trashed = (gboolean (*)(MediaSource*)) direct_photo_real_is_trashed; + ((MediaSourceClass *) klass)->is_trashed = (gboolean (*) (MediaSource *)) direct_photo_real_is_trashed; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((MediaSourceClass *) klass)->is_offline = (gboolean (*)(MediaSource*)) direct_photo_real_is_offline; + ((MediaSourceClass *) klass)->is_offline = (gboolean (*) (MediaSource *)) direct_photo_real_is_offline; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((MediaSourceClass *) klass)->trash = (void (*)(MediaSource*)) direct_photo_real_trash; + ((MediaSourceClass *) klass)->trash = (void (*) (MediaSource *)) direct_photo_real_trash; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((MediaSourceClass *) klass)->untrash = (void (*)(MediaSource*)) direct_photo_real_untrash; + ((MediaSourceClass *) klass)->untrash = (void (*) (MediaSource *)) direct_photo_real_untrash; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((MediaSourceClass *) klass)->mark_offline = (void (*)(MediaSource*)) direct_photo_real_mark_offline; + ((MediaSourceClass *) klass)->mark_offline = (void (*) (MediaSource *)) direct_photo_real_mark_offline; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((MediaSourceClass *) klass)->mark_online = (void (*)(MediaSource*)) direct_photo_real_mark_online; + ((MediaSourceClass *) klass)->mark_online = (void (*) (MediaSource *)) direct_photo_real_mark_online; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" G_OBJECT_CLASS (klass)->finalize = direct_photo_finalize; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - g_signal_new ("can_rotate_changed", TYPE_DIRECT_PHOTO, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); -#line 1860 "DirectPhoto.c" + direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL] = g_signal_new ("can-rotate-changed", TYPE_DIRECT_PHOTO, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); +#line 1865 "DirectPhoto.c" } @@ -1867,11 +1872,11 @@ static void direct_photo_instance_init (DirectPhoto * self) { self->priv->preview = NULL; #line 15 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->loaded = FALSE; -#line 1871 "DirectPhoto.c" +#line 1876 "DirectPhoto.c" } -static void direct_photo_finalize (GObject* obj) { +static void direct_photo_finalize (GObject * obj) { DirectPhoto * self; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_PHOTO, DirectPhoto); @@ -1879,7 +1884,7 @@ static void direct_photo_finalize (GObject* obj) { _g_object_unref0 (self->priv->preview); #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" G_OBJECT_CLASS (direct_photo_parent_class)->finalize (obj); -#line 1883 "DirectPhoto.c" +#line 1888 "DirectPhoto.c" } @@ -1900,7 +1905,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { result = file_hash ((GFile*) v); #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1904 "DirectPhoto.c" +#line 1909 "DirectPhoto.c" } @@ -1909,7 +1914,7 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer result = file_equal ((GFile*) a, (GFile*) b); #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1913 "DirectPhoto.c" +#line 1918 "DirectPhoto.c" } @@ -1918,33 +1923,33 @@ static gint64 _direct_photo_source_collection_get_direct_key_get_source_database result = direct_photo_source_collection_get_direct_key (source); #line 183 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1922 "DirectPhoto.c" +#line 1927 "DirectPhoto.c" } static void _direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered (DirectoryMonitor* _sender, GFile* file, GFileInfo* info, gpointer self) { #line 187 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" direct_photo_source_collection_on_file_discovered ((DirectPhotoSourceCollection*) self, file, info); -#line 1929 "DirectPhoto.c" +#line 1934 "DirectPhoto.c" } static void _direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) { #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" direct_photo_source_collection_on_discovery_completed ((DirectPhotoSourceCollection*) self); -#line 1936 "DirectPhoto.c" +#line 1941 "DirectPhoto.c" } DirectPhotoSourceCollection* direct_photo_source_collection_construct (GType object_type, GFile* initial_file) { DirectPhotoSourceCollection* self = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - DirectoryMonitor* _tmp3_ = NULL; - DirectoryMonitor* _tmp4_ = NULL; - DirectoryMonitor* _tmp5_ = NULL; - DirectoryMonitor* _tmp6_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; + DirectoryMonitor* _tmp3_; + DirectoryMonitor* _tmp4_; + DirectoryMonitor* _tmp5_; + DirectoryMonitor* _tmp6_; #line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (G_IS_FILE (initial_file), NULL); #line 183 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1977,21 +1982,21 @@ DirectPhotoSourceCollection* direct_photo_source_collection_construct (GType obj directory_monitor_start_discovery (_tmp6_); #line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return self; -#line 1981 "DirectPhoto.c" +#line 1986 "DirectPhoto.c" } DirectPhotoSourceCollection* direct_photo_source_collection_new (GFile* initial_file) { #line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return direct_photo_source_collection_construct (TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, initial_file); -#line 1988 "DirectPhoto.c" +#line 1993 "DirectPhoto.c" } static gboolean direct_photo_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) { DirectPhotoSourceCollection * self; gboolean result = FALSE; - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; #line 193 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection); #line 193 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2002,26 +2007,26 @@ static gboolean direct_photo_source_collection_real_holds_type_of_source (Source result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DIRECT_PHOTO); #line 194 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2006 "DirectPhoto.c" +#line 2011 "DirectPhoto.c" } static gpointer _g_object_ref0 (gpointer self) { #line 198 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return self ? g_object_ref (self) : NULL; -#line 2013 "DirectPhoto.c" +#line 2018 "DirectPhoto.c" } static gint64 direct_photo_source_collection_get_direct_key (DataSource* source) { gint64 result = 0LL; DirectPhoto* photo = NULL; - DataSource* _tmp0_ = NULL; - DirectPhoto* _tmp1_ = NULL; + DataSource* _tmp0_; + DirectPhoto* _tmp1_; PhotoID photo_id = {0}; PhotoID _tmp2_ = {0}; - PhotoID _tmp3_ = {0}; - gint64 _tmp4_ = 0LL; + PhotoID _tmp3_; + gint64 _tmp4_; #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL); #line 198 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2044,22 +2049,22 @@ static gint64 direct_photo_source_collection_get_direct_key (DataSource* source) _g_object_unref0 (photo); #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2048 "DirectPhoto.c" +#line 2053 "DirectPhoto.c" } static void direct_photo_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added) { DirectPhotoSourceCollection * self; - GeeIterable* _tmp16_ = NULL; + GeeIterable* _tmp16_; #line 204 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection); #line 204 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (GEE_IS_ITERABLE (added)); -#line 2059 "DirectPhoto.c" +#line 2064 "DirectPhoto.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeIterable* _tmp0_; + GeeIterator* _tmp1_; #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp0_ = added; #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2068,24 +2073,24 @@ static void direct_photo_source_collection_real_notify_items_added (DataCollecti _object_it = _tmp1_; #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" while (TRUE) { -#line 2072 "DirectPhoto.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 2077 "DirectPhoto.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; DataObject* object = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; DirectPhoto* photo = NULL; - DataObject* _tmp6_ = NULL; - DirectPhoto* _tmp7_ = NULL; + DataObject* _tmp6_; + DirectPhoto* _tmp7_; GFile* file = NULL; - DirectPhoto* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - GeeHashMap* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - GeeHashMap* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; - DirectPhoto* _tmp15_ = NULL; + DirectPhoto* _tmp8_; + GFile* _tmp9_; + GeeHashMap* _tmp10_; + GFile* _tmp11_; + gboolean _tmp12_; + GeeHashMap* _tmp13_; + GFile* _tmp14_; + DirectPhoto* _tmp15_; #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp2_ = _object_it; #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2094,7 +2099,7 @@ static void direct_photo_source_collection_real_notify_items_added (DataCollecti if (!_tmp3_) { #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" break; -#line 2098 "DirectPhoto.c" +#line 2103 "DirectPhoto.c" } #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp4_ = _object_it; @@ -2136,32 +2141,32 @@ static void direct_photo_source_collection_real_notify_items_added (DataCollecti _g_object_unref0 (photo); #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (object); -#line 2140 "DirectPhoto.c" +#line 2145 "DirectPhoto.c" } #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_object_it); -#line 2144 "DirectPhoto.c" +#line 2149 "DirectPhoto.c" } #line 214 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp16_ = added; #line 214 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp16_); -#line 2150 "DirectPhoto.c" +#line 2155 "DirectPhoto.c" } static void direct_photo_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) { DirectPhotoSourceCollection * self; - GeeIterable* _tmp14_ = NULL; + GeeIterable* _tmp14_; #line 217 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection); #line 217 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); -#line 2161 "DirectPhoto.c" +#line 2166 "DirectPhoto.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeIterable* _tmp0_; + GeeIterator* _tmp1_; #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp0_ = removed; #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2170,23 +2175,23 @@ static void direct_photo_source_collection_real_notify_items_removed (DataCollec _object_it = _tmp1_; #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" while (TRUE) { -#line 2174 "DirectPhoto.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 2179 "DirectPhoto.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; DataObject* object = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; DirectPhoto* photo = NULL; - DataObject* _tmp6_ = NULL; - DirectPhoto* _tmp7_ = NULL; + DataObject* _tmp6_; + DirectPhoto* _tmp7_; GFile* file = NULL; - DirectPhoto* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; + DirectPhoto* _tmp8_; + GFile* _tmp9_; gboolean is_removed = FALSE; - GeeHashMap* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; - gboolean _tmp13_ = FALSE; + GeeHashMap* _tmp10_; + GFile* _tmp11_; + gboolean _tmp12_; + gboolean _tmp13_; #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp2_ = _object_it; #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2195,7 +2200,7 @@ static void direct_photo_source_collection_real_notify_items_removed (DataCollec if (!_tmp3_) { #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" break; -#line 2199 "DirectPhoto.c" +#line 2204 "DirectPhoto.c" } #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp4_ = _object_it; @@ -2233,25 +2238,25 @@ static void direct_photo_source_collection_real_notify_items_removed (DataCollec _g_object_unref0 (photo); #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (object); -#line 2237 "DirectPhoto.c" +#line 2242 "DirectPhoto.c" } #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_object_it); -#line 2241 "DirectPhoto.c" +#line 2246 "DirectPhoto.c" } #line 226 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp14_ = removed; #line 226 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp14_); -#line 2247 "DirectPhoto.c" +#line 2252 "DirectPhoto.c" } gboolean direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCollection* self, GFile* file) { gboolean result = FALSE; - GeeHashMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GeeHashMap* _tmp0_; + GFile* _tmp1_; + gboolean _tmp2_; #line 229 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), FALSE); #line 229 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2266,26 +2271,26 @@ gboolean direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCo result = _tmp2_; #line 230 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2270 "DirectPhoto.c" +#line 2275 "DirectPhoto.c" } static void direct_photo_source_collection_on_file_discovered (DirectPhotoSourceCollection* self, GFile* file, GFileInfo* info) { - GFile* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - GFile* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + GFile* _tmp0_; + gboolean _tmp1_; + GFile* _tmp2_; + gboolean _tmp3_; DirectPhoto* photo = NULL; gchar* reason = NULL; - GFile* _tmp4_ = NULL; + GFile* _tmp4_; DirectPhoto* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - GeeCollection* _tmp9_ = NULL; - DirectPhoto* _tmp10_ = NULL; - GeeCollection* _tmp11_ = NULL; - gint _tmp12_ = 0; - gint _tmp13_ = 0; + gchar* _tmp6_; + const gchar* _tmp7_; + GeeCollection* _tmp9_; + DirectPhoto* _tmp10_; + GeeCollection* _tmp11_; + gint _tmp12_; + gint _tmp13_; #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self)); #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2300,7 +2305,7 @@ static void direct_photo_source_collection_on_file_discovered (DirectPhotoSource if (_tmp1_) { #line 236 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return; -#line 2304 "DirectPhoto.c" +#line 2309 "DirectPhoto.c" } #line 239 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp2_ = file; @@ -2310,7 +2315,7 @@ static void direct_photo_source_collection_on_file_discovered (DirectPhotoSource if (!_tmp3_) { #line 240 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return; -#line 2314 "DirectPhoto.c" +#line 2319 "DirectPhoto.c" } #line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp4_ = file; @@ -2326,13 +2331,13 @@ static void direct_photo_source_collection_on_file_discovered (DirectPhotoSource _tmp7_ = reason; #line 244 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (_tmp7_ != NULL) { -#line 2330 "DirectPhoto.c" - const gchar* _tmp8_ = NULL; +#line 2335 "DirectPhoto.c" + const gchar* _tmp8_; #line 245 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp8_ = reason; #line 245 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_warning ("DirectPhoto.vala:245: Error fetching file: %s", _tmp8_); -#line 2336 "DirectPhoto.c" +#line 2341 "DirectPhoto.c" } #line 246 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp9_ = self->priv->prepared_photos; @@ -2350,13 +2355,13 @@ static void direct_photo_source_collection_on_file_discovered (DirectPhotoSource if (_tmp13_ >= DIRECT_PHOTO_SOURCE_COLLECTION_DISCOVERED_FILES_BATCH_ADD) { #line 248 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" direct_photo_source_collection_flush_prepared_photos (self); -#line 2354 "DirectPhoto.c" +#line 2359 "DirectPhoto.c" } #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_free0 (reason); #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (photo); -#line 2360 "DirectPhoto.c" +#line 2365 "DirectPhoto.c" } @@ -2365,15 +2370,15 @@ static void direct_photo_source_collection_on_discovery_completed (DirectPhotoSo g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self)); #line 252 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" direct_photo_source_collection_flush_prepared_photos (self); -#line 2369 "DirectPhoto.c" +#line 2374 "DirectPhoto.c" } static void direct_photo_source_collection_flush_prepared_photos (DirectPhotoSourceCollection* self) { - GeeCollection* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; #line 255 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self)); #line 256 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2388,15 +2393,15 @@ static void direct_photo_source_collection_flush_prepared_photos (DirectPhotoSou _tmp3_ = self->priv->prepared_photos; #line 257 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" gee_collection_clear (_tmp3_); -#line 2392 "DirectPhoto.c" +#line 2397 "DirectPhoto.c" } gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* self, GFile* file) { gboolean result = FALSE; - GeeHashMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GeeHashMap* _tmp0_; + GFile* _tmp1_; + gboolean _tmp2_; #line 260 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), FALSE); #line 260 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2411,19 +2416,19 @@ gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* s result = _tmp2_; #line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2415 "DirectPhoto.c" +#line 2420 "DirectPhoto.c" } void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* self, DirectPhoto* photo) { - DirectPhoto* _tmp0_ = NULL; + DirectPhoto* _tmp0_; DirectPhoto* reimported_photo = NULL; - DirectPhoto* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; + DirectPhoto* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; DirectPhoto* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + gchar* _tmp5_; + gchar* _tmp6_; #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self)); #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2452,23 +2457,23 @@ void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* _g_object_unref0 (_tmp3_); #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (reimported_photo); -#line 2456 "DirectPhoto.c" +#line 2461 "DirectPhoto.c" } -gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto** photo, gboolean reimport) { +gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto* * photo, gboolean reimport) { DirectPhoto* _vala_photo = NULL; gchar* result = NULL; - GeeHashMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; - DirectPhoto* _tmp3_ = NULL; + GeeHashMap* _tmp0_; + GFile* _tmp1_; + gpointer _tmp2_; + DirectPhoto* _tmp3_; ImportResult _result_ = 0; - GFile* _tmp25_ = NULL; + GFile* _tmp25_; DirectPhoto* _tmp26_ = NULL; - ImportResult _tmp27_ = 0; + ImportResult _tmp27_; gchar* _tmp28_ = NULL; - ImportResult _tmp29_ = 0; + ImportResult _tmp29_; GError * _inner_error_ = NULL; #line 271 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), NULL); @@ -2488,27 +2493,27 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, _tmp3_ = _vala_photo; #line 274 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (_tmp3_ != NULL) { -#line 2492 "DirectPhoto.c" +#line 2497 "DirectPhoto.c" gchar* reason = NULL; - gboolean _tmp4_ = FALSE; + gboolean _tmp4_; #line 275 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" reason = NULL; #line 277 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp4_ = reimport; #line 277 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (_tmp4_) { -#line 2501 "DirectPhoto.c" +#line 2506 "DirectPhoto.c" { Orientation ori_tmp = 0; gboolean should_restore_ori = FALSE; gboolean _tmp5_ = FALSE; - DirectPhoto* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + DirectPhoto* _tmp6_; + gboolean _tmp7_; PhotoReimportMasterState* reimport_state = NULL; gboolean _tmp12_ = FALSE; - DirectPhoto* _tmp13_ = NULL; + DirectPhoto* _tmp13_; PhotoReimportMasterState* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + gboolean _tmp15_; #line 279 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" ori_tmp = ORIENTATION_TOP_LEFT; #line 280 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2521,23 +2526,23 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, if (_tmp7_) { #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp5_ = TRUE; -#line 2525 "DirectPhoto.c" +#line 2530 "DirectPhoto.c" } else { - DirectPhoto* _tmp8_ = NULL; - PhotoFileFormat _tmp9_ = 0; + DirectPhoto* _tmp8_; + PhotoFileFormat _tmp9_; #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp8_ = _vala_photo; #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp9_ = photo_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo)); #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp5_ = _tmp9_ == PHOTO_FILE_FORMAT_JFIF; -#line 2535 "DirectPhoto.c" +#line 2540 "DirectPhoto.c" } #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (_tmp5_) { -#line 2539 "DirectPhoto.c" - DirectPhoto* _tmp10_ = NULL; - Orientation _tmp11_ = 0; +#line 2544 "DirectPhoto.c" + DirectPhoto* _tmp10_; + Orientation _tmp11_; #line 284 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp10_ = _vala_photo; #line 284 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2546,7 +2551,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, ori_tmp = _tmp11_; #line 285 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" should_restore_ori = TRUE; -#line 2550 "DirectPhoto.c" +#line 2555 "DirectPhoto.c" } #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp13_ = _vala_photo; @@ -2562,15 +2567,15 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 2566 "DirectPhoto.c" +#line 2571 "DirectPhoto.c" goto __catch47_g_error; } #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (_tmp12_) { -#line 2571 "DirectPhoto.c" - DirectPhoto* _tmp16_ = NULL; - PhotoReimportMasterState* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; +#line 2576 "DirectPhoto.c" + DirectPhoto* _tmp16_; + PhotoReimportMasterState* _tmp17_; + gboolean _tmp18_; #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp16_ = _vala_photo; #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2581,45 +2586,45 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 2585 "DirectPhoto.c" +#line 2590 "DirectPhoto.c" goto __catch47_g_error; } #line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp18_ = should_restore_ori; #line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (_tmp18_) { -#line 2592 "DirectPhoto.c" - DirectPhoto* _tmp19_ = NULL; - Orientation _tmp20_ = 0; +#line 2597 "DirectPhoto.c" + DirectPhoto* _tmp19_; + Orientation _tmp20_; #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp19_ = _vala_photo; #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp20_ = ori_tmp; #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" direct_photo_fixup_orientation_after_reimport (_tmp19_, _tmp20_); -#line 2601 "DirectPhoto.c" +#line 2606 "DirectPhoto.c" } } else { - gchar* _tmp21_ = NULL; + gchar* _tmp21_; #line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp21_ = import_result_to_string (IMPORT_RESULT_FILE_ERROR); #line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_free0 (reason); #line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" reason = _tmp21_; -#line 2611 "DirectPhoto.c" +#line 2616 "DirectPhoto.c" } #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 2615 "DirectPhoto.c" +#line 2620 "DirectPhoto.c" } goto __finally47; __catch47_g_error: { GError* err = NULL; - GError* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; + GError* _tmp22_; + const gchar* _tmp23_; + gchar* _tmp24_; #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" err = _inner_error_; #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2636,7 +2641,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, reason = _tmp24_; #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_error_free0 (err); -#line 2640 "DirectPhoto.c" +#line 2645 "DirectPhoto.c" } __finally47: #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2649,7 +2654,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, g_clear_error (&_inner_error_); #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return NULL; -#line 2653 "DirectPhoto.c" +#line 2658 "DirectPhoto.c" } } #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2658,15 +2663,15 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, if (photo) { #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" *photo = _vala_photo; -#line 2662 "DirectPhoto.c" +#line 2667 "DirectPhoto.c" } else { #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_vala_photo); -#line 2666 "DirectPhoto.c" +#line 2671 "DirectPhoto.c" } #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2670 "DirectPhoto.c" +#line 2675 "DirectPhoto.c" } #line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp25_ = file; @@ -2686,10 +2691,10 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, _g_free0 (_tmp28_); #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp28_ = NULL; -#line 2690 "DirectPhoto.c" +#line 2695 "DirectPhoto.c" } else { - ImportResult _tmp30_ = 0; - gchar* _tmp31_ = NULL; + ImportResult _tmp30_; + gchar* _tmp31_; #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp30_ = _result_; #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2698,7 +2703,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, _g_free0 (_tmp28_); #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp28_ = _tmp31_; -#line 2702 "DirectPhoto.c" +#line 2707 "DirectPhoto.c" } #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" result = _tmp28_; @@ -2706,23 +2711,23 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, if (photo) { #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" *photo = _vala_photo; -#line 2710 "DirectPhoto.c" +#line 2715 "DirectPhoto.c" } else { #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_vala_photo); -#line 2714 "DirectPhoto.c" +#line 2719 "DirectPhoto.c" } #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2718 "DirectPhoto.c" +#line 2723 "DirectPhoto.c" } gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollection* self, GFile* file) { gboolean result = FALSE; - GeeHashMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GeeHashMap* _tmp0_; + GFile* _tmp1_; + gboolean _tmp2_; #line 313 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), FALSE); #line 313 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2737,15 +2742,15 @@ gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollec result = _tmp2_; #line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2741 "DirectPhoto.c" +#line 2746 "DirectPhoto.c" } DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self, GFile* file) { DirectPhoto* result = NULL; - GeeHashMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + GFile* _tmp1_; + gpointer _tmp2_; #line 317 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), NULL); #line 317 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2760,7 +2765,7 @@ DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCo result = (DirectPhoto*) _tmp2_; #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2764 "DirectPhoto.c" +#line 2769 "DirectPhoto.c" } @@ -2772,18 +2777,18 @@ static void direct_photo_source_collection_class_init (DirectPhotoSourceCollecti #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_type_class_add_private (klass, sizeof (DirectPhotoSourceCollectionPrivate)); #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*)(SourceCollection*, DataSource*)) direct_photo_source_collection_real_holds_type_of_source; + ((SourceCollectionClass *) klass)->holds_type_of_source = (gboolean (*) (SourceCollection *, DataSource*)) direct_photo_source_collection_real_holds_type_of_source; #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((DataCollectionClass *) klass)->notify_items_added = (void (*)(DataCollection*, GeeIterable*)) direct_photo_source_collection_real_notify_items_added; + ((DataCollectionClass *) klass)->notify_items_added = (void (*) (DataCollection *, GeeIterable*)) direct_photo_source_collection_real_notify_items_added; #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ((DataCollectionClass *) klass)->notify_items_removed = (void (*)(DataCollection*, GeeIterable*)) direct_photo_source_collection_real_notify_items_removed; -#line 2781 "DirectPhoto.c" + ((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) direct_photo_source_collection_real_notify_items_removed; +#line 2786 "DirectPhoto.c" } static void direct_photo_source_collection_instance_init (DirectPhotoSourceCollection * self) { - GeeArrayList* _tmp0_ = NULL; - GeeHashMap* _tmp1_ = NULL; + GeeArrayList* _tmp0_; + GeeHashMap* _tmp1_; #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv = DIRECT_PHOTO_SOURCE_COLLECTION_GET_PRIVATE (self); #line 177 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2794,11 +2799,11 @@ static void direct_photo_source_collection_instance_init (DirectPhotoSourceColle _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->file_map = _tmp1_; -#line 2798 "DirectPhoto.c" +#line 2803 "DirectPhoto.c" } -static void direct_photo_source_collection_finalize (DataCollection* obj) { +static void direct_photo_source_collection_finalize (DataCollection * obj) { DirectPhotoSourceCollection * self; #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection); @@ -2810,7 +2815,7 @@ static void direct_photo_source_collection_finalize (DataCollection* obj) { _g_object_unref0 (self->priv->monitor); #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->finalize (obj); -#line 2814 "DirectPhoto.c" +#line 2819 "DirectPhoto.c" } diff --git a/src/direct/DirectPhotoPage.c b/src/direct/DirectPhotoPage.c index 08a3c07..07f26d9 100644 --- a/src/direct/DirectPhotoPage.c +++ b/src/direct/DirectPhotoPage.c @@ -1,4 +1,4 @@ -/* DirectPhotoPage.c generated by valac 0.34.7, the Vala compiler +/* DirectPhotoPage.c generated by valac 0.36.6, the Vala compiler * generated from DirectPhotoPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -722,8 +722,8 @@ 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_add61 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value); -static void _vala_array_add62 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value); +static void _vala_array_add61 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); +static void _vala_array_add62 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value); void app_window_error_message (const gchar* message, GtkWindow* parent); gboolean photo_file_format_is_file_supported (GFile* file); #define RESOURCES_APP_TITLE "Shotwell" @@ -797,7 +797,7 @@ gboolean direct_photo_page_check_quit (DirectPhotoPage* self); static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* base, Photo* old_photo, Photo* new_photo); void scaling_for_constraint (ScaleConstraint constraint, gint scale, gboolean scale_up, Scaling* result); void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error); -gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto** photo, gboolean reimport); +gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto* * photo, gboolean reimport); gboolean data_source_equals (DataSource* self, DataSource* source); GType direct_view_get_type (void) G_GNUC_CONST; DirectView* direct_view_new (DirectPhoto* source); @@ -850,7 +850,7 @@ static gboolean __lambda16_ (Block7Data* _data7_); void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable); static gboolean ___lambda16__gsource_func (gpointer self); static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base, DataSource* source); -static void direct_photo_page_finalize (GObject* obj); +static void direct_photo_page_finalize (GObject * obj); GType direct_fullscreen_photo_page_get_type (void) G_GNUC_CONST; enum { DIRECT_FULLSCREEN_PHOTO_PAGE_DUMMY_PROPERTY @@ -1047,20 +1047,20 @@ static void _direct_photo_page_on_selection_group_altered_view_collection_select DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file) { DirectPhotoPage * self = NULL; - DirectPhotoSourceCollection* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - GFile* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - DirectViewCollection* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; - DirectPhotoSourceCollection* _tmp13_ = NULL; - ViewCollection* _tmp14_ = NULL; - ViewCollection* _tmp15_ = NULL; + DirectPhotoSourceCollection* _tmp0_; + GFile* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + GFile* _tmp4_; + gboolean _tmp5_; + GFile* _tmp8_; + GFile* _tmp9_; + DirectViewCollection* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; + DirectPhotoSourceCollection* _tmp13_; + ViewCollection* _tmp14_; + ViewCollection* _tmp15_; #line 13 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 14 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1082,8 +1082,8 @@ DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file) { #line 16 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (!_tmp5_) { #line 1085 "DirectPhotoPage.c" - Application* _tmp6_ = NULL; - Application* _tmp7_ = NULL; + Application* _tmp6_; + Application* _tmp7_; #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = application_get_instance (); #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1145,9 +1145,9 @@ DirectPhotoPage* direct_photo_page_new (GFile* file) { static void direct_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { DirectPhotoPage * self; - GeeList* _tmp0_ = NULL; - GeeList* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; + GeeList* _tmp0_; + GeeList* _tmp1_; + GeeList* _tmp2_; #line 35 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 35 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1170,8 +1170,8 @@ static void direct_photo_page_real_init_collect_ui_filenames (Page* base, GeeLis static void direct_photo_page_real_add_actions (Page* base, GActionMap* map) { DirectPhotoPage * self; - GActionMap* _tmp0_ = NULL; - GActionMap* _tmp1_ = NULL; + GActionMap* _tmp0_; + GActionMap* _tmp1_; #line 68 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 68 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1190,7 +1190,7 @@ static void direct_photo_page_real_add_actions (Page* base, GActionMap* map) { static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map) { DirectPhotoPage * self; - GActionMap* _tmp0_ = NULL; + GActionMap* _tmp0_; #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1217,9 +1217,9 @@ static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map) entry = entry_collection[entry_it]; #line 1219 "DirectPhotoPage.c" { - GActionMap* _tmp1_ = NULL; - GActionEntry _tmp2_ = {0}; - const gchar* _tmp3_ = NULL; + GActionMap* _tmp1_; + GActionEntry _tmp2_; + const gchar* _tmp3_; #line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = map; #line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1242,7 +1242,7 @@ static gpointer _injection_group_ref0 (gpointer self) { } -static void _vala_array_add61 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) { +static void _vala_array_add61 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if ((*length) == (*size)) { #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1259,7 +1259,7 @@ static void _vala_array_add61 (InjectionGroup*** array, int* length, int* size, } -static void _vala_array_add62 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) { +static void _vala_array_add62 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) { #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if ((*length) == (*size)) { #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1280,24 +1280,22 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa DirectPhotoPage * 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* bg_group = NULL; - InjectionGroup* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - InjectionGroup** _tmp8_ = NULL; - gint _tmp8__length1 = 0; - InjectionGroup* _tmp9_ = NULL; - InjectionGroup** _tmp10_ = NULL; - gint _tmp10__length1 = 0; + InjectionGroup* _tmp5_; + InjectionGroup** _tmp6_; + gint _tmp6__length1; + InjectionGroup* _tmp7_; + InjectionGroup** _tmp8_; + gint _tmp8__length1; #line 81 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1313,62 +1311,58 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa #line 84 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" print_group = _tmp2_; #line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp3_ = _ ("_Print"); -#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - injection_group_add_menu_item (print_group, _tmp3_, "Print", "<Primary>p"); + injection_group_add_menu_item (print_group, _ ("_Print"), "Print", "<Primary>p"); #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp4_ = groups; + _tmp3_ = groups; #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp4__length1 = groups_length1; + _tmp3__length1 = groups_length1; #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp5_ = _injection_group_ref0 (print_group); + _tmp4_ = _injection_group_ref0 (print_group); #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _vala_array_add61 (&groups, &groups_length1, &_groups_size_, _tmp5_); + _vala_array_add61 (&groups, &groups_length1, &_groups_size_, _tmp4_); #line 89 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp6_ = injection_group_new ("SetBackgroundPlaceholder"); + _tmp5_ = injection_group_new ("SetBackgroundPlaceholder"); #line 89 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - bg_group = _tmp6_; -#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp7_ = _ ("Set as _Desktop Background"); + bg_group = _tmp5_; #line 90 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - injection_group_add_menu_item (bg_group, _tmp7_, "SetBackground", "<Primary>b"); + injection_group_add_menu_item (bg_group, _ ("Set as _Desktop Background"), "SetBackground", "<Primary>b"); #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp8_ = groups; + _tmp6_ = groups; #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp8__length1 = groups_length1; + _tmp6__length1 = groups_length1; #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp9_ = _injection_group_ref0 (bg_group); + _tmp7_ = _injection_group_ref0 (bg_group); #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _vala_array_add62 (&groups, &groups_length1, &_groups_size_, _tmp9_); + _vala_array_add62 (&groups, &groups_length1, &_groups_size_, _tmp7_); #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp10_ = groups; + _tmp8_ = groups; #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp10__length1 = groups_length1; + _tmp8__length1 = groups_length1; #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (result_length1) { #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - *result_length1 = _tmp10__length1; -#line 1352 "DirectPhotoPage.c" + *result_length1 = _tmp8__length1; +#line 1346 "DirectPhotoPage.c" } #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - result = _tmp10_; + result = _tmp8_; #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _injection_group_unref0 (bg_group); #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _injection_group_unref0 (print_group); #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 1362 "DirectPhotoPage.c" +#line 1356 "DirectPhotoPage.c" } static gboolean direct_photo_page_check_editable_file (GFile* file) { gboolean result = FALSE; - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gboolean _tmp3_; + gboolean _tmp4_; #line 97 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1385,119 +1379,110 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) { _g_free0 (_tmp2_); #line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp4_) { -#line 1389 "DirectPhotoPage.c" - const gchar* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; +#line 1383 "DirectPhotoPage.c" + GFile* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp5_ = _ ("%s does not exist."); + _tmp5_ = file; #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp6_ = file; + _tmp6_ = g_file_get_path (_tmp5_); #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp7_ = g_file_get_path (_tmp6_); -#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp9_ = g_strdup_printf (_tmp5_, _tmp8_); + _tmp8_ = g_strdup_printf (_ ("%s does not exist."), _tmp7_); #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - app_window_error_message (_tmp10_, NULL); + app_window_error_message (_tmp9_, NULL); #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp8_); -#line 1414 "DirectPhotoPage.c" + _g_free0 (_tmp7_); +#line 1405 "DirectPhotoPage.c" } else { - GFile* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; - gboolean _tmp15_ = FALSE; + GFile* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gboolean _tmp13_; + gboolean _tmp14_; #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp11_ = file; + _tmp10_ = file; #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp12_ = g_file_get_path (_tmp11_); + _tmp11_ = g_file_get_path (_tmp10_); #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp14_ = g_file_test (_tmp13_, G_FILE_TEST_IS_REGULAR); + _tmp13_ = g_file_test (_tmp12_, G_FILE_TEST_IS_REGULAR); #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp15_ = !_tmp14_; + _tmp14_ = !_tmp13_; #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp12_); #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp15_) { -#line 1435 "DirectPhotoPage.c" - const gchar* _tmp16_ = NULL; - GFile* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; -#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp16_ = _ ("%s is not a file."); -#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp17_ = file; + if (_tmp14_) { +#line 1426 "DirectPhotoPage.c" + GFile* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp18_ = g_file_get_path (_tmp17_); + _tmp15_ = file; #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp19_ = _tmp18_; + _tmp16_ = g_file_get_path (_tmp15_); #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp20_ = g_strdup_printf (_tmp16_, _tmp19_); + _tmp17_ = _tmp16_; #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp21_ = _tmp20_; + _tmp18_ = g_strdup_printf (_ ("%s is not a file."), _tmp17_); #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - app_window_error_message (_tmp21_, NULL); + _tmp19_ = _tmp18_; #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp21_); + app_window_error_message (_tmp19_, NULL); #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (_tmp19_); -#line 1460 "DirectPhotoPage.c" +#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" + _g_free0 (_tmp17_); +#line 1448 "DirectPhotoPage.c" } else { - GFile* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; + GFile* _tmp20_; + gboolean _tmp21_; #line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp22_ = file; + _tmp20_ = file; #line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp23_ = photo_file_format_is_file_supported (_tmp22_); + _tmp21_ = photo_file_format_is_file_supported (_tmp20_); #line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (!_tmp23_) { -#line 1470 "DirectPhotoPage.c" - const gchar* _tmp24_ = NULL; - GFile* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; + if (!_tmp21_) { +#line 1458 "DirectPhotoPage.c" + GFile* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp24_ = _ ("%s does not support the file format of\n%s."); + _tmp22_ = file; #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp25_ = file; + _tmp23_ = g_file_get_path (_tmp22_); #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp26_ = g_file_get_path (_tmp25_); + _tmp24_ = _tmp23_; #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp27_ = _tmp26_; + _tmp25_ = g_strdup_printf (_ ("%s does not support the file format of\n%s."), RESOURCES_APP_TITLE, _tmp24_); #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp28_ = g_strdup_printf (_tmp24_, RESOURCES_APP_TITLE, _tmp27_); + _tmp26_ = _tmp25_; #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp29_ = _tmp28_; -#line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - app_window_error_message (_tmp29_, NULL); + app_window_error_message (_tmp26_, NULL); #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp29_); + _g_free0 (_tmp26_); #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp27_); -#line 1495 "DirectPhotoPage.c" + _g_free0 (_tmp24_); +#line 1480 "DirectPhotoPage.c" } else { #line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = TRUE; #line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 1501 "DirectPhotoPage.c" +#line 1486 "DirectPhotoPage.c" } } } @@ -1505,24 +1490,24 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) { result = FALSE; #line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 1509 "DirectPhotoPage.c" +#line 1494 "DirectPhotoPage.c" } static void direct_photo_page_real_realize (GtkWidget* base) { DirectPhotoPage * self; DirectPhoto* photo = NULL; - DirectPhotoSourceCollection* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - DirectPhoto* _tmp2_ = NULL; - DirectPhoto* _tmp3_ = NULL; + DirectPhotoSourceCollection* _tmp0_; + GFile* _tmp1_; + DirectPhoto* _tmp2_; + DirectPhoto* _tmp3_; #line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 112 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (GTK_WIDGET_CLASS (direct_photo_page_parent_class)->realize != NULL) { #line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" GTK_WIDGET_CLASS (direct_photo_page_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), gtk_widget_get_type (), GtkWidget)); -#line 1526 "DirectPhotoPage.c" +#line 1511 "DirectPhotoPage.c" } #line 115 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = direct_photo_global; @@ -1536,42 +1521,39 @@ static void direct_photo_page_real_realize (GtkWidget* base) { _tmp3_ = photo; #line 117 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp3_ != NULL) { -#line 1540 "DirectPhotoPage.c" - DirectViewCollection* _tmp4_ = NULL; - DirectPhoto* _tmp5_ = NULL; +#line 1525 "DirectPhotoPage.c" + DirectViewCollection* _tmp4_; + DirectPhoto* _tmp5_; #line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = self->priv->view_controller; #line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp5_ = photo; #line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO, Photo)); -#line 1549 "DirectPhotoPage.c" +#line 1534 "DirectPhotoPage.c" } else { - const gchar* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; -#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp6_ = _ ("Unable open photo %s. Sorry."); + GFile* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp7_ = self->priv->initial_file; + _tmp6_ = self->priv->initial_file; #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp8_ = g_file_get_path (_tmp7_); + _tmp7_ = g_file_get_path (_tmp6_); #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp10_ = g_strdup_printf (_tmp6_, _tmp9_); + _tmp9_ = g_strdup_printf (_ ("Unable open photo %s. Sorry."), _tmp8_); #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - app_window_panic (_tmp11_); + app_window_panic (_tmp10_); #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp10_); #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp9_); -#line 1575 "DirectPhotoPage.c" + _g_free0 (_tmp8_); +#line 1557 "DirectPhotoPage.c" } #line 123 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (self->priv->initial_file); @@ -1579,27 +1561,27 @@ static void direct_photo_page_real_realize (GtkWidget* base) { self->priv->initial_file = NULL; #line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (photo); -#line 1583 "DirectPhotoPage.c" +#line 1565 "DirectPhotoPage.c" } static void _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed (DirectPhoto* _sender, gboolean b, gpointer self) { #line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_on_dphoto_can_rotate_changed ((DirectPhotoPage*) self, b); -#line 1590 "DirectPhotoPage.c" +#line 1572 "DirectPhotoPage.c" } static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo* new_photo) { DirectPhotoPage * self; - Photo* _tmp0_ = NULL; - Photo* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - Photo* _tmp8_ = NULL; + Photo* _tmp0_; + Photo* _tmp1_; + gboolean _tmp2_; + Photo* _tmp8_; DirectPhoto* tmp = NULL; - Photo* _tmp9_ = NULL; - DirectPhoto* _tmp10_ = NULL; - DirectPhoto* _tmp11_ = NULL; + Photo* _tmp9_; + DirectPhoto* _tmp10_; + DirectPhoto* _tmp11_; #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1614,11 +1596,11 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo* _g_object_unref0 (_tmp1_); #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp2_) { -#line 1618 "DirectPhotoPage.c" +#line 1600 "DirectPhotoPage.c" DirectPhoto* tmp = NULL; - Photo* _tmp3_ = NULL; - DirectPhoto* _tmp4_ = NULL; - DirectPhoto* _tmp5_ = NULL; + Photo* _tmp3_; + DirectPhoto* _tmp4_; + DirectPhoto* _tmp5_; #line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1627,7 +1609,7 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo* if (_tmp4_ == NULL) { #line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp3_); -#line 1631 "DirectPhotoPage.c" +#line 1613 "DirectPhotoPage.c" } #line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" tmp = _tmp4_; @@ -1635,20 +1617,20 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo* _tmp5_ = tmp; #line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp5_ != NULL) { -#line 1639 "DirectPhotoPage.c" - DirectPhoto* _tmp6_ = NULL; - guint _tmp7_ = 0U; +#line 1621 "DirectPhotoPage.c" + DirectPhoto* _tmp6_; + guint _tmp7_; #line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = tmp; #line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_signal_parse_name ("can-rotate-changed", TYPE_DIRECT_PHOTO, &_tmp7_, NULL, FALSE); #line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed, self); -#line 1648 "DirectPhotoPage.c" +#line 1630 "DirectPhotoPage.c" } #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (tmp); -#line 1652 "DirectPhotoPage.c" +#line 1634 "DirectPhotoPage.c" } #line 135 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp8_ = new_photo; @@ -1664,26 +1646,26 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo* _tmp11_ = tmp; #line 139 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp11_ != NULL) { -#line 1668 "DirectPhotoPage.c" - DirectPhoto* _tmp12_ = NULL; +#line 1650 "DirectPhotoPage.c" + DirectPhoto* _tmp12_; #line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp12_ = tmp; #line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_signal_connect_object (_tmp12_, "can-rotate-changed", (GCallback) _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed, self, 0); -#line 1674 "DirectPhotoPage.c" +#line 1656 "DirectPhotoPage.c" } #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (tmp); -#line 1678 "DirectPhotoPage.c" +#line 1660 "DirectPhotoPage.c" } GFile* direct_photo_page_get_current_file (DirectPhotoPage* self) { GFile* result = NULL; - Photo* _tmp0_ = NULL; - Photo* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; + Photo* _tmp0_; + Photo* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; #line 144 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), NULL); #line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1700,16 +1682,16 @@ GFile* direct_photo_page_get_current_file (DirectPhotoPage* self) { result = _tmp3_; #line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 1704 "DirectPhotoPage.c" +#line 1686 "DirectPhotoPage.c" } static gboolean direct_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event) { DirectPhotoPage * self; gboolean result = FALSE; - GtkMenu* _tmp0_ = NULL; - GtkMenu* _tmp1_ = NULL; - GdkEventButton* _tmp2_ = NULL; + GtkMenu* _tmp0_; + GtkMenu* _tmp1_; + GdkEventButton* _tmp2_; #line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1728,29 +1710,29 @@ static gboolean direct_photo_page_real_on_context_buttonpress (Page* base, GdkEv result = TRUE; #line 151 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 1732 "DirectPhotoPage.c" +#line 1714 "DirectPhotoPage.c" } static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self) { GtkMenu* result = NULL; - GtkMenu* _tmp0_ = NULL; - GtkMenu* _tmp7_ = NULL; - GtkMenu* _tmp8_ = NULL; + GtkMenu* _tmp0_; + GtkMenu* _tmp7_; + GtkMenu* _tmp8_; #line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), NULL); #line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = self->priv->context_menu; #line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp0_ == NULL) { -#line 1747 "DirectPhotoPage.c" +#line 1729 "DirectPhotoPage.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 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder; #line 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1775,7 +1757,7 @@ static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self) { gtk_menu_attach_to_widget (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL); #line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (model); -#line 1779 "DirectPhotoPage.c" +#line 1761 "DirectPhotoPage.c" } #line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp7_ = self->priv->context_menu; @@ -1785,17 +1767,17 @@ static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self) { result = _tmp8_; #line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 1789 "DirectPhotoPage.c" +#line 1771 "DirectPhotoPage.c" } static void direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage* self) { gboolean _tmp0_ = FALSE; ZoomState _tmp1_ = {0}; - gboolean _tmp2_ = FALSE; + gboolean _tmp2_; gboolean _tmp4_ = FALSE; ZoomState _tmp5_ = {0}; - gboolean _tmp6_ = FALSE; + gboolean _tmp6_; #line 167 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); #line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1804,17 +1786,17 @@ static void direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage _tmp2_ = zoom_state_is_max (&_tmp1_); #line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (!_tmp2_) { -#line 1808 "DirectPhotoPage.c" - gboolean _tmp3_ = FALSE; +#line 1790 "DirectPhotoPage.c" + gboolean _tmp3_; #line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = !_tmp3_; -#line 1814 "DirectPhotoPage.c" +#line 1796 "DirectPhotoPage.c" } else { #line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = FALSE; -#line 1818 "DirectPhotoPage.c" +#line 1800 "DirectPhotoPage.c" } #line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_); @@ -1824,21 +1806,21 @@ static void direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage _tmp6_ = zoom_state_is_default (&_tmp5_); #line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (!_tmp6_) { -#line 1828 "DirectPhotoPage.c" - gboolean _tmp7_ = FALSE; +#line 1810 "DirectPhotoPage.c" + gboolean _tmp7_; #line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp7_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = !_tmp7_; -#line 1834 "DirectPhotoPage.c" +#line 1816 "DirectPhotoPage.c" } else { #line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = FALSE; -#line 1838 "DirectPhotoPage.c" +#line 1820 "DirectPhotoPage.c" } #line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_); -#line 1842 "DirectPhotoPage.c" +#line 1824 "DirectPhotoPage.c" } @@ -1850,7 +1832,7 @@ static void direct_photo_page_real_on_increase_size (EditingHostPage* base) { EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_increase_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_update_zoom_menu_item_sensitivity (self); -#line 1854 "DirectPhotoPage.c" +#line 1836 "DirectPhotoPage.c" } @@ -1862,20 +1844,20 @@ static void direct_photo_page_real_on_decrease_size (EditingHostPage* base) { EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_decrease_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 181 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_update_zoom_menu_item_sensitivity (self); -#line 1866 "DirectPhotoPage.c" +#line 1848 "DirectPhotoPage.c" } static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap* map) { gboolean contains = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; gboolean _tmp14_ = FALSE; - gboolean _tmp15_ = FALSE; + gboolean _tmp15_; gboolean sensitive = FALSE; - gboolean _tmp17_ = FALSE; + gboolean _tmp17_; gboolean _tmp19_ = FALSE; - gboolean _tmp20_ = FALSE; - gboolean _tmp25_ = FALSE; + gboolean _tmp20_; + gboolean _tmp25_; #line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); #line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1886,22 +1868,22 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap* _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp0_) { -#line 1890 "DirectPhotoPage.c" +#line 1872 "DirectPhotoPage.c" Photo* photo = NULL; - Photo* _tmp1_ = NULL; + Photo* _tmp1_; #line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" photo = _tmp1_; -#line 1897 "DirectPhotoPage.c" +#line 1879 "DirectPhotoPage.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp2_ = NULL; - GeeSet* _tmp3_ = NULL; - GeeSet* _tmp4_ = NULL; - GeeSet* _tmp5_ = NULL; - GeeIterator* _tmp6_ = NULL; - GeeIterator* _tmp7_ = NULL; + GeeMap* _tmp2_; + GeeSet* _tmp3_; + GeeSet* _tmp4_; + GeeSet* _tmp5_; + GeeIterator* _tmp6_; + GeeIterator* _tmp7_; #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = map; #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1920,14 +1902,14 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap* _object_it = _tmp7_; #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" while (TRUE) { -#line 1924 "DirectPhotoPage.c" - GeeIterator* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; +#line 1906 "DirectPhotoPage.c" + GeeIterator* _tmp8_; + gboolean _tmp9_; DataObject* object = NULL; - GeeIterator* _tmp10_ = NULL; - gpointer _tmp11_ = NULL; - DataObject* _tmp12_ = NULL; - Photo* _tmp13_ = NULL; + GeeIterator* _tmp10_; + gpointer _tmp11_; + DataObject* _tmp12_; + Photo* _tmp13_; #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp8_ = _object_it; #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -1936,7 +1918,7 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap* if (!_tmp9_) { #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" break; -#line 1940 "DirectPhotoPage.c" +#line 1922 "DirectPhotoPage.c" } #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp10_ = _object_it; @@ -1956,35 +1938,35 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap* _g_object_unref0 (object); #line 192 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" break; -#line 1960 "DirectPhotoPage.c" +#line 1942 "DirectPhotoPage.c" } #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (object); -#line 1964 "DirectPhotoPage.c" +#line 1946 "DirectPhotoPage.c" } #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_object_it); -#line 1968 "DirectPhotoPage.c" +#line 1950 "DirectPhotoPage.c" } #line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (photo); -#line 1972 "DirectPhotoPage.c" +#line 1954 "DirectPhotoPage.c" } #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp15_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp15_) { -#line 1978 "DirectPhotoPage.c" - gboolean _tmp16_ = FALSE; +#line 1960 "DirectPhotoPage.c" + gboolean _tmp16_; #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp16_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp14_ = !_tmp16_; -#line 1984 "DirectPhotoPage.c" +#line 1966 "DirectPhotoPage.c" } else { #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp14_ = FALSE; -#line 1988 "DirectPhotoPage.c" +#line 1970 "DirectPhotoPage.c" } #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" sensitive = _tmp14_; @@ -1992,23 +1974,23 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap* _tmp17_ = sensitive; #line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp17_) { -#line 1996 "DirectPhotoPage.c" - gboolean _tmp18_ = FALSE; +#line 1978 "DirectPhotoPage.c" + gboolean _tmp18_; #line 199 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp18_ = contains; #line 199 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" sensitive = _tmp18_; -#line 2002 "DirectPhotoPage.c" +#line 1984 "DirectPhotoPage.c" } #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp20_ = sensitive; #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp20_) { -#line 2008 "DirectPhotoPage.c" - Photo* _tmp21_ = NULL; - Photo* _tmp22_ = NULL; - PhotoFileFormat _tmp23_ = 0; - gboolean _tmp24_ = FALSE; +#line 1990 "DirectPhotoPage.c" + Photo* _tmp21_; + Photo* _tmp22_; + PhotoFileFormat _tmp23_; + gboolean _tmp24_; #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp21_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2021,11 +2003,11 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap* _tmp19_ = _tmp24_; #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp22_); -#line 2025 "DirectPhotoPage.c" +#line 2007 "DirectPhotoPage.c" } else { #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp19_ = FALSE; -#line 2029 "DirectPhotoPage.c" +#line 2011 "DirectPhotoPage.c" } #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Save", _tmp19_); @@ -2033,13 +2015,13 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap* _tmp25_ = sensitive; #line 202 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp25_); -#line 2037 "DirectPhotoPage.c" +#line 2019 "DirectPhotoPage.c" } static void direct_photo_page_on_selection_group_altered (DirectPhotoPage* self) { - CommandManager* _tmp0_ = NULL; - CommandManager* _tmp1_ = NULL; + CommandManager* _tmp0_; + CommandManager* _tmp1_; #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); #line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2050,7 +2032,7 @@ static void direct_photo_page_on_selection_group_altered (DirectPhotoPage* self) command_manager_reset (_tmp1_); #line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _command_manager_unref0 (_tmp1_); -#line 2054 "DirectPhotoPage.c" +#line 2036 "DirectPhotoPage.c" } @@ -2058,11 +2040,11 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G DirectPhotoPage * self; gboolean result = FALSE; FullscreenWindow* fs = NULL; - GtkWindow* _tmp0_ = NULL; - FullscreenWindow* _tmp1_ = NULL; - FullscreenWindow* _tmp2_ = NULL; - GdkEventButton* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + GtkWindow* _tmp0_; + FullscreenWindow* _tmp1_; + FullscreenWindow* _tmp2_; + GdkEventButton* _tmp4_; + gboolean _tmp5_; #line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2075,7 +2057,7 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G if (_tmp1_ == NULL) { #line 216 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp0_); -#line 2079 "DirectPhotoPage.c" +#line 2061 "DirectPhotoPage.c" } #line 216 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" fs = _tmp1_; @@ -2083,8 +2065,8 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G _tmp2_ = fs; #line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp2_ != NULL) { -#line 2087 "DirectPhotoPage.c" - FullscreenWindow* _tmp3_ = NULL; +#line 2069 "DirectPhotoPage.c" + FullscreenWindow* _tmp3_; #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = fs; #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2095,7 +2077,7 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G _g_object_unref0 (fs); #line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2099 "DirectPhotoPage.c" +#line 2081 "DirectPhotoPage.c" } #line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = event; @@ -2107,42 +2089,42 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G _g_object_unref0 (fs); #line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2111 "DirectPhotoPage.c" +#line 2093 "DirectPhotoPage.c" } static void direct_photo_page_real_update_ui (EditingHostPage* base, gboolean missing) { DirectPhotoPage * self; gboolean sensitivity = FALSE; - gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; - gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; - gboolean _tmp8_ = FALSE; - gboolean _tmp9_ = FALSE; - gboolean _tmp10_ = FALSE; - gboolean _tmp11_ = FALSE; - gboolean _tmp12_ = FALSE; - gboolean _tmp13_ = FALSE; - gboolean _tmp14_ = FALSE; - gboolean _tmp15_ = FALSE; - gboolean _tmp16_ = FALSE; - gboolean _tmp17_ = FALSE; - gboolean _tmp18_ = FALSE; - gboolean _tmp19_ = FALSE; - gboolean _tmp20_ = FALSE; - gboolean _tmp21_ = FALSE; - gboolean _tmp22_ = FALSE; - gboolean _tmp23_ = FALSE; - gboolean _tmp24_ = FALSE; - gboolean _tmp25_ = FALSE; + gboolean _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; + gboolean _tmp6_; + gboolean _tmp7_; + gboolean _tmp8_; + gboolean _tmp9_; + gboolean _tmp10_; + gboolean _tmp11_; + gboolean _tmp12_; + gboolean _tmp13_; + gboolean _tmp14_; + gboolean _tmp15_; + gboolean _tmp16_; + gboolean _tmp17_; + gboolean _tmp18_; + gboolean _tmp19_; + gboolean _tmp20_; + gboolean _tmp21_; + gboolean _tmp22_; + gboolean _tmp23_; + gboolean _tmp24_; + gboolean _tmp25_; gboolean _tmp26_ = FALSE; - gboolean _tmp27_ = FALSE; - gboolean _tmp29_ = FALSE; + gboolean _tmp27_; + gboolean _tmp29_; #line 226 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2253,17 +2235,17 @@ static void direct_photo_page_real_update_ui (EditingHostPage* base, gboolean mi _tmp27_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp27_) { -#line 2257 "DirectPhotoPage.c" - gboolean _tmp28_ = FALSE; +#line 2239 "DirectPhotoPage.c" + gboolean _tmp28_; #line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp28_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp26_ = !_tmp28_; -#line 2263 "DirectPhotoPage.c" +#line 2245 "DirectPhotoPage.c" } else { #line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp26_ = FALSE; -#line 2267 "DirectPhotoPage.c" +#line 2249 "DirectPhotoPage.c" } #line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp26_); @@ -2271,41 +2253,41 @@ static void direct_photo_page_real_update_ui (EditingHostPage* base, gboolean mi _tmp29_ = missing; #line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->update_ui (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp29_); -#line 2275 "DirectPhotoPage.c" +#line 2257 "DirectPhotoPage.c" } static void direct_photo_page_real_update_actions (Page* base, gint selected_count, gint count) { DirectPhotoPage * 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 revert_possible = FALSE; gboolean _tmp12_ = FALSE; - gboolean _tmp13_ = FALSE; + gboolean _tmp13_; gboolean rotate_possible = FALSE; gboolean _tmp17_ = FALSE; - gboolean _tmp18_ = FALSE; + gboolean _tmp18_; gboolean enhance_possible = FALSE; - gboolean _tmp22_ = FALSE; - gboolean _tmp23_ = FALSE; - gboolean _tmp24_ = FALSE; - gboolean _tmp25_ = FALSE; - gboolean _tmp26_ = FALSE; - gboolean _tmp27_ = FALSE; - gboolean _tmp28_ = FALSE; - gboolean _tmp29_ = FALSE; - gboolean _tmp30_ = FALSE; - gboolean _tmp31_ = FALSE; - Photo* _tmp40_ = NULL; - Photo* _tmp41_ = NULL; - gboolean _tmp42_ = FALSE; - gint _tmp46_ = 0; - gint _tmp47_ = 0; + gboolean _tmp22_; + gboolean _tmp23_; + gboolean _tmp24_; + gboolean _tmp25_; + gboolean _tmp26_; + gboolean _tmp27_; + gboolean _tmp28_; + gboolean _tmp29_; + gboolean _tmp30_; + gboolean _tmp31_; + Photo* _tmp40_; + Photo* _tmp41_; + gboolean _tmp42_; + gint _tmp46_; + gint _tmp47_; #line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2324,12 +2306,12 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou _tmp5_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp5_) { -#line 2328 "DirectPhotoPage.c" +#line 2310 "DirectPhotoPage.c" gboolean _tmp6_ = FALSE; - Photo* _tmp7_ = NULL; - Photo* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; - gboolean _tmp10_ = FALSE; + Photo* _tmp7_; + Photo* _tmp8_; + gboolean _tmp9_; + gboolean _tmp10_; #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2342,25 +2324,25 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou _g_object_unref0 (_tmp8_); #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp10_) { -#line 2346 "DirectPhotoPage.c" - gboolean _tmp11_ = FALSE; +#line 2328 "DirectPhotoPage.c" + gboolean _tmp11_; #line 266 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp11_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 266 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = !_tmp11_; -#line 2352 "DirectPhotoPage.c" +#line 2334 "DirectPhotoPage.c" } else { #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = FALSE; -#line 2356 "DirectPhotoPage.c" +#line 2338 "DirectPhotoPage.c" } #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = _tmp6_; -#line 2360 "DirectPhotoPage.c" +#line 2342 "DirectPhotoPage.c" } else { #line 266 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = FALSE; -#line 2364 "DirectPhotoPage.c" +#line 2346 "DirectPhotoPage.c" } #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" revert_possible = _tmp4_; @@ -2368,10 +2350,10 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou _tmp13_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp13_) { -#line 2372 "DirectPhotoPage.c" - Photo* _tmp14_ = NULL; - Photo* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; +#line 2354 "DirectPhotoPage.c" + Photo* _tmp14_; + Photo* _tmp15_; + gboolean _tmp16_; #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp14_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2382,11 +2364,11 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou _tmp12_ = _tmp16_; #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp15_); -#line 2386 "DirectPhotoPage.c" +#line 2368 "DirectPhotoPage.c" } else { #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp12_ = FALSE; -#line 2390 "DirectPhotoPage.c" +#line 2372 "DirectPhotoPage.c" } #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" rotate_possible = _tmp12_; @@ -2394,10 +2376,10 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou _tmp18_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp18_) { -#line 2398 "DirectPhotoPage.c" - Photo* _tmp19_ = NULL; - Photo* _tmp20_ = NULL; - gboolean _tmp21_ = FALSE; +#line 2380 "DirectPhotoPage.c" + Photo* _tmp19_; + Photo* _tmp20_; + gboolean _tmp21_; #line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp19_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2408,11 +2390,11 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou _tmp17_ = _tmp21_; #line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp20_); -#line 2412 "DirectPhotoPage.c" +#line 2394 "DirectPhotoPage.c" } else { #line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp17_ = FALSE; -#line 2416 "DirectPhotoPage.c" +#line 2398 "DirectPhotoPage.c" } #line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" enhance_possible = _tmp17_; @@ -2456,15 +2438,15 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou _tmp31_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 281 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp31_) { -#line 2460 "DirectPhotoPage.c" - Photo* _tmp32_ = NULL; - Photo* _tmp33_ = NULL; +#line 2442 "DirectPhotoPage.c" + Photo* _tmp32_; + Photo* _tmp33_; Scaling _tmp34_ = {0}; - gboolean _tmp35_ = FALSE; - Photo* _tmp36_ = NULL; - Photo* _tmp37_ = NULL; + gboolean _tmp35_; + Photo* _tmp36_; + Photo* _tmp37_; Scaling _tmp38_ = {0}; - gboolean _tmp39_ = FALSE; + gboolean _tmp39_; #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp32_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2489,7 +2471,7 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp39_); #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp37_); -#line 2493 "DirectPhotoPage.c" +#line 2475 "DirectPhotoPage.c" } #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp40_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); @@ -2501,10 +2483,10 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou _g_object_unref0 (_tmp41_); #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp42_) { -#line 2505 "DirectPhotoPage.c" - Photo* _tmp43_ = NULL; - Photo* _tmp44_ = NULL; - PhotoFileFormat _tmp45_ = 0; +#line 2487 "DirectPhotoPage.c" + Photo* _tmp43_; + Photo* _tmp44_; + PhotoFileFormat _tmp45_; #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp43_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2515,11 +2497,11 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp45_ != PHOTO_FILE_FORMAT_RAW); #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp44_); -#line 2519 "DirectPhotoPage.c" +#line 2501 "DirectPhotoPage.c" } else { #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", FALSE); -#line 2523 "DirectPhotoPage.c" +#line 2505 "DirectPhotoPage.c" } #line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp46_ = selected_count; @@ -2527,38 +2509,36 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou _tmp47_ = count; #line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" PAGE_CLASS (direct_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), _tmp46_, _tmp47_); -#line 2531 "DirectPhotoPage.c" +#line 2513 "DirectPhotoPage.c" } static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self, Photo* photo) { gboolean result = FALSE; - Photo* _tmp0_ = NULL; - Photo* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + Photo* _tmp0_; + Photo* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; gboolean is_writeable = FALSE; - Photo* _tmp5_ = NULL; - Photo* _tmp6_ = NULL; - PhotoFileFormat _tmp7_ = 0; - gboolean _tmp8_ = FALSE; - gboolean _tmp9_ = FALSE; + Photo* _tmp5_; + Photo* _tmp6_; + PhotoFileFormat _tmp7_; + gboolean _tmp8_; + gboolean _tmp9_; const gchar* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; + gboolean _tmp11_; gchar* save_option = NULL; - gchar* _tmp14_ = NULL; + gchar* _tmp12_; GtkResponseType response = 0; - const gchar* _tmp15_ = NULL; - Photo* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - GtkResponseType _tmp23_ = 0; - GtkResponseType _tmp24_ = 0; - GtkResponseType _tmp25_ = 0; + Photo* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + const gchar* _tmp18_; + GtkResponseType _tmp19_; + GtkResponseType _tmp20_; + GtkResponseType _tmp21_; #line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), FALSE); #line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2571,7 +2551,7 @@ static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self result = TRUE; #line 302 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2575 "DirectPhotoPage.c" +#line 2555 "DirectPhotoPage.c" } #line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = photo; @@ -2583,14 +2563,14 @@ static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self result = TRUE; #line 305 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2587 "DirectPhotoPage.c" +#line 2567 "DirectPhotoPage.c" } #line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = self->priv->drop_if_dirty; #line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp3_) { -#line 2593 "DirectPhotoPage.c" - Photo* _tmp4_ = NULL; +#line 2573 "DirectPhotoPage.c" + Photo* _tmp4_; #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = photo; #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2599,7 +2579,7 @@ static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self result = TRUE; #line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2603 "DirectPhotoPage.c" +#line 2583 "DirectPhotoPage.c" } #line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); @@ -2619,146 +2599,135 @@ static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self _tmp11_ = is_writeable; #line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp11_) { -#line 2623 "DirectPhotoPage.c" - const gchar* _tmp12_ = NULL; #line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp12_ = _ ("_Save"); -#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp10_ = _tmp12_; -#line 2629 "DirectPhotoPage.c" + _tmp10_ = _ ("_Save"); +#line 2605 "DirectPhotoPage.c" } else { - const gchar* _tmp13_ = NULL; -#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp13_ = _ ("_Save a Copy"); #line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp10_ = _tmp13_; -#line 2636 "DirectPhotoPage.c" + _tmp10_ = _ ("_Save a Copy"); +#line 2609 "DirectPhotoPage.c" } #line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp14_ = g_strdup (_tmp10_); + _tmp12_ = g_strdup (_tmp10_); #line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - save_option = _tmp14_; + save_option = _tmp12_; #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp15_ = _ ("Lose changes to %s?"); + _tmp13_ = photo; #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp16_ = photo; + _tmp14_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource)); #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp17_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp18_ = _tmp17_; -#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp19_ = g_strdup_printf (_tmp15_, _tmp18_); + _tmp15_ = _tmp14_; #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp20_ = _tmp19_; + _tmp16_ = g_strdup_printf (_ ("Lose changes to %s?"), _tmp15_); #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp21_ = save_option; + _tmp17_ = _tmp16_; #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp22_ = _ ("Close _without Saving"); + _tmp18_ = save_option; #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp23_ = app_window_negate_affirm_cancel_question (_tmp20_, _tmp21_, _tmp22_, NULL, NULL); + _tmp19_ = app_window_negate_affirm_cancel_question (_tmp17_, _tmp18_, _ ("Close _without Saving"), NULL, NULL); #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp24_ = _tmp23_; + _tmp20_ = _tmp19_; #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp17_); #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp15_); #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - response = _tmp24_; + response = _tmp20_; #line 322 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp25_ = response; + _tmp21_ = response; #line 322 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp25_ == GTK_RESPONSE_YES) { -#line 2672 "DirectPhotoPage.c" - Photo* _tmp26_ = NULL; + if (_tmp21_ == GTK_RESPONSE_YES) { +#line 2641 "DirectPhotoPage.c" + Photo* _tmp22_; #line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp26_ = photo; + _tmp22_ = photo; #line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - photo_remove_all_transformations (_tmp26_); -#line 2678 "DirectPhotoPage.c" + photo_remove_all_transformations (_tmp22_); +#line 2647 "DirectPhotoPage.c" } else { - GtkResponseType _tmp27_ = 0; + GtkResponseType _tmp23_; #line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp27_ = response; + _tmp23_ = response; #line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp27_ == GTK_RESPONSE_NO) { -#line 2685 "DirectPhotoPage.c" - gboolean _tmp28_ = FALSE; + if (_tmp23_ == GTK_RESPONSE_NO) { +#line 2654 "DirectPhotoPage.c" + gboolean _tmp24_; #line 325 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp28_ = is_writeable; + _tmp24_ = is_writeable; #line 325 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp28_) { -#line 2691 "DirectPhotoPage.c" - Photo* _tmp29_ = NULL; - GFile* _tmp30_ = NULL; - GFile* _tmp31_ = NULL; - Photo* _tmp32_ = NULL; - Photo* _tmp33_ = NULL; - PhotoFileFormat _tmp34_ = 0; + if (_tmp24_) { +#line 2660 "DirectPhotoPage.c" + Photo* _tmp25_; + GFile* _tmp26_; + GFile* _tmp27_; + Photo* _tmp28_; + Photo* _tmp29_; + PhotoFileFormat _tmp30_; #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp29_ = photo; + _tmp25_ = photo; #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp30_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp26_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_MEDIA_SOURCE, MediaSource)); #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp31_ = _tmp30_; + _tmp27_ = _tmp26_; #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp32_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp28_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp33_ = _tmp32_; + _tmp29_ = _tmp28_; #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp34_ = photo_get_file_format (_tmp33_); + _tmp30_ = photo_get_file_format (_tmp29_); #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - direct_photo_page_save (self, _tmp31_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, _tmp34_, FALSE, TRUE); + direct_photo_page_save (self, _tmp27_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, _tmp30_, FALSE, TRUE); #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp33_); + _g_object_unref0 (_tmp29_); #line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp31_); -#line 2716 "DirectPhotoPage.c" + _g_object_unref0 (_tmp27_); +#line 2685 "DirectPhotoPage.c" } else { #line 329 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_photo_page_on_save_as (self); -#line 2720 "DirectPhotoPage.c" +#line 2689 "DirectPhotoPage.c" } } else { - gboolean _tmp35_ = FALSE; - gboolean _tmp36_ = FALSE; - GtkResponseType _tmp37_ = 0; + gboolean _tmp31_ = FALSE; + gboolean _tmp32_ = FALSE; + GtkResponseType _tmp33_; #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp37_ = response; + _tmp33_ = response; #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp37_ == GTK_RESPONSE_CANCEL) { + if (_tmp33_ == GTK_RESPONSE_CANCEL) { #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp36_ = TRUE; -#line 2732 "DirectPhotoPage.c" + _tmp32_ = TRUE; +#line 2701 "DirectPhotoPage.c" } else { - GtkResponseType _tmp38_ = 0; + GtkResponseType _tmp34_; #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp38_ = response; + _tmp34_ = response; #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp36_ = _tmp38_ == GTK_RESPONSE_DELETE_EVENT; -#line 2739 "DirectPhotoPage.c" + _tmp32_ = _tmp34_ == GTK_RESPONSE_DELETE_EVENT; +#line 2708 "DirectPhotoPage.c" } #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp36_) { + if (_tmp32_) { #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp35_ = TRUE; -#line 2745 "DirectPhotoPage.c" + _tmp31_ = TRUE; +#line 2714 "DirectPhotoPage.c" } else { - GtkResponseType _tmp39_ = 0; + GtkResponseType _tmp35_; #line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp39_ = response; + _tmp35_ = response; #line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp35_ = _tmp39_ == GTK_RESPONSE_CLOSE; -#line 2752 "DirectPhotoPage.c" + _tmp31_ = _tmp35_ == GTK_RESPONSE_CLOSE; +#line 2721 "DirectPhotoPage.c" } #line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp35_) { + if (_tmp31_) { #line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = FALSE; #line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (save_option); #line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2762 "DirectPhotoPage.c" +#line 2731 "DirectPhotoPage.c" } } } @@ -2768,16 +2737,16 @@ static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self _g_free0 (save_option); #line 335 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2772 "DirectPhotoPage.c" +#line 2741 "DirectPhotoPage.c" } gboolean direct_photo_page_check_quit (DirectPhotoPage* self) { gboolean result = FALSE; - Photo* _tmp0_ = NULL; - Photo* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + Photo* _tmp0_; + Photo* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; #line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), FALSE); #line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2794,7 +2763,7 @@ gboolean direct_photo_page_check_quit (DirectPhotoPage* self) { result = _tmp3_; #line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2798 "DirectPhotoPage.c" +#line 2767 "DirectPhotoPage.c" } @@ -2802,7 +2771,7 @@ static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* b DirectPhotoPage * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; - Photo* _tmp1_ = NULL; + Photo* _tmp1_; #line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2813,49 +2782,49 @@ static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* b _tmp1_ = old_photo; #line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp1_ != NULL) { -#line 2817 "DirectPhotoPage.c" - Photo* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 2786 "DirectPhotoPage.c" + Photo* _tmp2_; + gboolean _tmp3_; #line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp2_ = old_photo; #line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = direct_photo_page_check_ok_to_close_photo (self, _tmp2_); #line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = _tmp3_; -#line 2826 "DirectPhotoPage.c" +#line 2795 "DirectPhotoPage.c" } else { #line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = TRUE; -#line 2830 "DirectPhotoPage.c" +#line 2799 "DirectPhotoPage.c" } #line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = _tmp0_; #line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 2836 "DirectPhotoPage.c" +#line 2805 "DirectPhotoPage.c" } static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint scale, ScaleConstraint constraint, JpegQuality quality, PhotoFileFormat format, gboolean copy_unmodified, gboolean save_metadata) { Scaling scaling = {0}; - ScaleConstraint _tmp0_ = 0; - gint _tmp1_ = 0; + ScaleConstraint _tmp0_; + gint _tmp1_; Scaling _tmp2_ = {0}; DirectPhoto* photo = NULL; - DirectPhotoSourceCollection* _tmp19_ = NULL; - GFile* _tmp20_ = NULL; - DirectPhoto* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - Photo* _tmp24_ = NULL; - Photo* _tmp25_ = NULL; - DirectPhoto* _tmp26_ = NULL; - gboolean _tmp27_ = FALSE; - gboolean _tmp28_ = FALSE; - DirectPhotoSourceCollection* _tmp33_ = NULL; - DirectPhoto* _tmp34_ = NULL; - DirectViewCollection* _tmp35_ = NULL; - DirectPhoto* _tmp36_ = NULL; + DirectPhotoSourceCollection* _tmp18_; + GFile* _tmp19_; + DirectPhoto* _tmp20_ = NULL; + gchar* _tmp21_; + gchar* _tmp22_; + Photo* _tmp23_; + Photo* _tmp24_; + DirectPhoto* _tmp25_; + gboolean _tmp26_; + gboolean _tmp27_; + DirectPhotoSourceCollection* _tmp32_; + DirectPhoto* _tmp33_; + DirectViewCollection* _tmp34_; + DirectPhoto* _tmp35_; GError * _inner_error_ = NULL; #line 346 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); @@ -2869,16 +2838,16 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca scaling_for_constraint (_tmp0_, _tmp1_, FALSE, &_tmp2_); #line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" scaling = _tmp2_; -#line 2873 "DirectPhotoPage.c" +#line 2842 "DirectPhotoPage.c" { - Photo* _tmp3_ = NULL; - Photo* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - Scaling _tmp6_ = {0}; - JpegQuality _tmp7_ = 0; - PhotoFileFormat _tmp8_ = 0; - gboolean _tmp9_ = FALSE; - gboolean _tmp10_ = FALSE; + Photo* _tmp3_; + Photo* _tmp4_; + GFile* _tmp5_; + Scaling _tmp6_; + JpegQuality _tmp7_; + PhotoFileFormat _tmp8_; + gboolean _tmp9_; + gboolean _tmp10_; #line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2901,7 +2870,7 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca _g_object_unref0 (_tmp4_); #line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2905 "DirectPhotoPage.c" +#line 2874 "DirectPhotoPage.c" goto __catch48_g_error; } } @@ -2909,45 +2878,42 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca __catch48_g_error: { GError* err = NULL; - const gchar* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - GError* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; + GFile* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + GError* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; #line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" err = _inner_error_; #line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _inner_error_ = NULL; #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp11_ = _ ("Error while saving to %s: %s"); -#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp12_ = dest; + _tmp11_ = dest; #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp13_ = g_file_get_path (_tmp12_); + _tmp12_ = g_file_get_path (_tmp11_); #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp15_ = err; + _tmp14_ = err; #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp16_ = _tmp15_->message; + _tmp15_ = _tmp14_->message; #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp17_ = g_strdup_printf (_tmp11_, _tmp14_, _tmp16_); + _tmp16_ = g_strdup_printf (_ ("Error while saving to %s: %s"), _tmp13_, _tmp15_); #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - app_window_error_message (_tmp18_, NULL); + app_window_error_message (_tmp17_, NULL); #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp17_); #line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp13_); #line 356 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_error_free0 (err); #line 356 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return; -#line 2951 "DirectPhotoPage.c" +#line 2917 "DirectPhotoPage.c" } __finally48: #line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -2958,90 +2924,90 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca g_clear_error (&_inner_error_); #line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return; -#line 2962 "DirectPhotoPage.c" +#line 2928 "DirectPhotoPage.c" } #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp19_ = direct_photo_global; + _tmp18_ = direct_photo_global; #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp20_ = dest; + _tmp19_ = dest; #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp22_ = direct_photo_source_collection_fetch (_tmp19_, _tmp20_, &_tmp21_, TRUE); + _tmp21_ = direct_photo_source_collection_fetch (_tmp18_, _tmp19_, &_tmp20_, TRUE); #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (photo); #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - photo = _tmp21_; + photo = _tmp20_; #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp23_ = _tmp22_; + _tmp22_ = _tmp21_; #line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp23_); + _g_free0 (_tmp22_); #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp24_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp23_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp25_ = _tmp24_; + _tmp24_ = _tmp23_; #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp26_ = photo; + _tmp25_ = photo; #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp27_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource)); + _tmp26_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_SOURCE, DataSource)); #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp28_ = !_tmp27_; + _tmp27_ = !_tmp26_; #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp25_); + _g_object_unref0 (_tmp24_); #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp28_) { -#line 2992 "DirectPhotoPage.c" + if (_tmp27_) { +#line 2958 "DirectPhotoPage.c" DirectView* tmp_view = NULL; - DirectPhoto* _tmp29_ = NULL; - DirectView* _tmp30_ = NULL; - DirectViewCollection* _tmp31_ = NULL; - DirectView* _tmp32_ = NULL; + DirectPhoto* _tmp28_; + DirectView* _tmp29_; + DirectViewCollection* _tmp30_; + DirectView* _tmp31_; #line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp29_ = photo; + _tmp28_ = photo; #line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp30_ = direct_view_new (_tmp29_); + _tmp29_ = direct_view_new (_tmp28_); #line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - tmp_view = _tmp30_; + tmp_view = _tmp29_; #line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp31_ = self->priv->view_controller; + _tmp30_ = self->priv->view_controller; #line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp32_ = tmp_view; + _tmp31_ = tmp_view; #line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_OBJECT, DataObject)); #line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (tmp_view); -#line 3012 "DirectPhotoPage.c" +#line 2978 "DirectPhotoPage.c" } #line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp33_ = direct_photo_global; + _tmp32_ = direct_photo_global; #line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp34_ = photo; + _tmp33_ = photo; #line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - direct_photo_source_collection_reimport_photo (_tmp33_, _tmp34_); + direct_photo_source_collection_reimport_photo (_tmp32_, _tmp33_); #line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp35_ = self->priv->view_controller; + _tmp34_ = self->priv->view_controller; #line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp36_ = photo; + _tmp35_ = photo; #line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_PHOTO, Photo)); + editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo)); #line 346 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (photo); -#line 3028 "DirectPhotoPage.c" +#line 2994 "DirectPhotoPage.c" } static void direct_photo_page_on_save (DirectPhotoPage* self) { gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - Photo* _tmp2_ = NULL; - Photo* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; - Photo* _tmp11_ = NULL; - Photo* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; - Photo* _tmp15_ = NULL; - Photo* _tmp16_ = NULL; - PhotoFileFormat _tmp17_ = 0; + Photo* _tmp2_; + Photo* _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; + Photo* _tmp11_; + Photo* _tmp12_; + GFile* _tmp13_; + GFile* _tmp14_; + Photo* _tmp15_; + Photo* _tmp16_; + PhotoFileFormat _tmp17_; #line 372 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3058,12 +3024,12 @@ static void direct_photo_page_on_save (DirectPhotoPage* self) { if (_tmp5_) { #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = TRUE; -#line 3062 "DirectPhotoPage.c" +#line 3028 "DirectPhotoPage.c" } else { - Photo* _tmp6_ = NULL; - Photo* _tmp7_ = NULL; - PhotoFileFormat _tmp8_ = 0; - gboolean _tmp9_ = FALSE; + Photo* _tmp6_; + Photo* _tmp7_; + PhotoFileFormat _tmp8_; + gboolean _tmp9_; #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3076,26 +3042,26 @@ static void direct_photo_page_on_save (DirectPhotoPage* self) { _tmp1_ = !_tmp9_; #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp7_); -#line 3080 "DirectPhotoPage.c" +#line 3046 "DirectPhotoPage.c" } #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp1_) { #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = TRUE; -#line 3086 "DirectPhotoPage.c" +#line 3052 "DirectPhotoPage.c" } else { - gboolean _tmp10_ = FALSE; + gboolean _tmp10_; #line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp10_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = _tmp10_; -#line 3093 "DirectPhotoPage.c" +#line 3059 "DirectPhotoPage.c" } #line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp0_) { #line 375 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return; -#line 3099 "DirectPhotoPage.c" +#line 3065 "DirectPhotoPage.c" } #line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); @@ -3119,370 +3085,364 @@ static void direct_photo_page_on_save (DirectPhotoPage* self) { _g_object_unref0 (_tmp14_); #line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (_tmp12_); -#line 3123 "DirectPhotoPage.c" +#line 3089 "DirectPhotoPage.c" } static void direct_photo_page_on_save_as (DirectPhotoPage* self) { ExportDialog* export_dialog = NULL; - const gchar* _tmp0_ = NULL; - ExportDialog* _tmp1_ = NULL; + ExportDialog* _tmp0_; gint scale = 0; ScaleConstraint constraint = 0; ExportFormatParameters export_params = {0}; - ExportFormatParameters _tmp2_ = {0}; - ExportDialog* _tmp3_ = NULL; - gint _tmp4_ = 0; - ScaleConstraint _tmp5_ = 0; - gboolean _tmp6_ = FALSE; + ExportFormatParameters _tmp1_ = {0}; + ExportDialog* _tmp2_; + gint _tmp3_ = 0; + ScaleConstraint _tmp4_ = 0; + gboolean _tmp5_; gchar* filename = NULL; - Photo* _tmp7_ = NULL; - Photo* _tmp8_ = NULL; - ExportFormatParameters _tmp9_ = {0}; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; + Photo* _tmp6_; + Photo* _tmp7_; + ExportFormatParameters _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; PhotoFileFormat effective_export_format = 0; - Photo* _tmp12_ = NULL; - Photo* _tmp13_ = NULL; - ExportFormatParameters _tmp14_ = {0}; - PhotoFileFormat _tmp15_ = 0; - PhotoFileFormat _tmp16_ = 0; + Photo* _tmp11_; + Photo* _tmp12_; + ExportFormatParameters _tmp13_; + PhotoFileFormat _tmp14_; + PhotoFileFormat _tmp15_; gchar** output_format_extensions = NULL; - PhotoFileFormat _tmp17_ = 0; - PhotoFileFormatProperties* _tmp18_ = NULL; - PhotoFileFormatProperties* _tmp19_ = NULL; - gint _tmp20_ = 0; - gchar** _tmp21_ = NULL; - gchar** _tmp22_ = NULL; - gint _tmp22__length1 = 0; - gint output_format_extensions_length1 = 0; - gint _output_format_extensions_size_ = 0; + PhotoFileFormat _tmp16_; + PhotoFileFormatProperties* _tmp17_; + PhotoFileFormatProperties* _tmp18_; + gint _tmp19_; + gchar** _tmp20_; + gchar** _tmp21_; + gint _tmp21__length1; + gint output_format_extensions_length1; + gint _output_format_extensions_size_; GtkFileFilter* output_format_filter = NULL; - GtkFileFilter* _tmp23_ = NULL; - gchar** _tmp24_ = NULL; - gint _tmp24__length1 = 0; + GtkFileFilter* _tmp22_; + gchar** _tmp23_; + gint _tmp23__length1; GtkFileChooserDialog* save_as_dialog = NULL; - const gchar* _tmp36_ = NULL; - AppWindow* _tmp37_ = NULL; - AppWindow* _tmp38_ = NULL; - GtkFileChooserDialog* _tmp39_ = NULL; - GtkFileChooserDialog* _tmp40_ = NULL; - GtkFileChooserDialog* _tmp41_ = NULL; - GtkFileChooserDialog* _tmp42_ = NULL; - const gchar* _tmp43_ = NULL; - GtkFileChooserDialog* _tmp44_ = NULL; - GFile* _tmp45_ = NULL; - gchar* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; - GtkFileChooserDialog* _tmp48_ = NULL; - GtkFileFilter* _tmp49_ = NULL; - GtkFileFilter* _tmp50_ = NULL; - GtkFileChooserDialog* _tmp51_ = NULL; - GtkFileChooserDialog* _tmp52_ = NULL; + AppWindow* _tmp35_; + AppWindow* _tmp36_; + GtkFileChooserDialog* _tmp37_; + GtkFileChooserDialog* _tmp38_; + GtkFileChooserDialog* _tmp39_; + GtkFileChooserDialog* _tmp40_; + const gchar* _tmp41_; + GtkFileChooserDialog* _tmp42_; + GFile* _tmp43_; + gchar* _tmp44_; + gchar* _tmp45_; + GtkFileChooserDialog* _tmp46_; + GtkFileFilter* _tmp47_; + GtkFileFilter* _tmp48_; + GtkFileChooserDialog* _tmp49_; + GtkFileChooserDialog* _tmp50_; gint response = 0; - GtkFileChooserDialog* _tmp53_ = NULL; - gint _tmp54_ = 0; - gint _tmp55_ = 0; - GtkFileChooserDialog* _tmp74_ = NULL; + GtkFileChooserDialog* _tmp51_; + gint _tmp52_; + gint _tmp53_; + GtkFileChooserDialog* _tmp72_; #line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); #line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp0_ = _ ("Save As"); -#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp1_ = export_dialog_new (_tmp0_); + _tmp0_ = export_dialog_new (_ ("Save As")); #line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - g_object_ref_sink (_tmp1_); + g_object_ref_sink (_tmp0_); #line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - export_dialog = _tmp1_; + export_dialog = _tmp0_; #line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - export_format_parameters_last (&_tmp2_); + export_format_parameters_last (&_tmp1_); #line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - export_params = _tmp2_; + export_params = _tmp1_; #line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp3_ = export_dialog; + _tmp2_ = export_dialog; #line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp6_ = export_dialog_execute (_tmp3_, &_tmp4_, &_tmp5_, &export_params); + _tmp5_ = export_dialog_execute (_tmp2_, &_tmp3_, &_tmp4_, &export_params); #line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - scale = _tmp4_; + scale = _tmp3_; #line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - constraint = _tmp5_; + constraint = _tmp4_; #line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (!_tmp6_) { + if (!_tmp5_) { #line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (export_dialog); #line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return; -#line 3216 "DirectPhotoPage.c" +#line 3178 "DirectPhotoPage.c" } #line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp9_ = export_params; + _tmp8_ = export_params; #line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp10_ = photo_get_export_basename_for_parameters (_tmp8_, &_tmp9_); + _tmp9_ = photo_get_export_basename_for_parameters (_tmp7_, &_tmp8_); #line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - filename = _tmp11_; + filename = _tmp10_; #line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp12_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); + _tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp14_ = export_params; + _tmp13_ = export_params; #line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp15_ = photo_get_export_format_for_parameters (_tmp13_, &_tmp14_); + _tmp14_ = photo_get_export_format_for_parameters (_tmp12_, &_tmp13_); #line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp12_); #line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - effective_export_format = _tmp16_; + effective_export_format = _tmp15_; #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp17_ = effective_export_format; + _tmp16_ = effective_export_format; #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp18_ = photo_file_format_get_properties (_tmp17_); + _tmp17_ = photo_file_format_get_properties (_tmp16_); #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp21_ = photo_file_format_properties_get_known_extensions (_tmp19_, &_tmp20_); + _tmp20_ = photo_file_format_properties_get_known_extensions (_tmp18_, &_tmp19_); #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp22__length1 = _tmp20_; + _tmp21__length1 = _tmp19_; #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _photo_file_format_properties_unref0 (_tmp19_); + _photo_file_format_properties_unref0 (_tmp18_); #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - output_format_extensions = _tmp22_; + output_format_extensions = _tmp21_; #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - output_format_extensions_length1 = _tmp22__length1; + output_format_extensions_length1 = _tmp21__length1; #line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _output_format_extensions_size_ = output_format_extensions_length1; #line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp23_ = gtk_file_filter_new (); + _tmp22_ = gtk_file_filter_new (); #line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - g_object_ref_sink (_tmp23_); + g_object_ref_sink (_tmp22_); #line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - output_format_filter = _tmp23_; + output_format_filter = _tmp22_; #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp24_ = output_format_extensions; + _tmp23_ = output_format_extensions; #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp24__length1 = output_format_extensions_length1; -#line 3276 "DirectPhotoPage.c" + _tmp23__length1 = output_format_extensions_length1; +#line 3238 "DirectPhotoPage.c" { gchar** extension_collection = NULL; gint extension_collection_length1 = 0; gint _extension_collection_size_ = 0; gint extension_it = 0; #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - extension_collection = _tmp24_; + extension_collection = _tmp23_; #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - extension_collection_length1 = _tmp24__length1; + extension_collection_length1 = _tmp23__length1; #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - for (extension_it = 0; extension_it < _tmp24__length1; extension_it = extension_it + 1) { -#line 3288 "DirectPhotoPage.c" - gchar* _tmp25_ = NULL; + for (extension_it = 0; extension_it < _tmp23__length1; extension_it = extension_it + 1) { +#line 3250 "DirectPhotoPage.c" + gchar* _tmp24_; gchar* extension = NULL; #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp25_ = g_strdup (extension_collection[extension_it]); + _tmp24_ = g_strdup (extension_collection[extension_it]); #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - extension = _tmp25_; -#line 3295 "DirectPhotoPage.c" + extension = _tmp24_; +#line 3257 "DirectPhotoPage.c" { gchar* uppercase_extension = NULL; - const gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - GtkFileFilter* _tmp28_ = NULL; - const gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - GtkFileFilter* _tmp32_ = NULL; - const gchar* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; + const gchar* _tmp25_; + gchar* _tmp26_; + GtkFileFilter* _tmp27_; + const gchar* _tmp28_; + gchar* _tmp29_; + gchar* _tmp30_; + GtkFileFilter* _tmp31_; + const gchar* _tmp32_; + gchar* _tmp33_; + gchar* _tmp34_; #line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp26_ = extension; + _tmp25_ = extension; #line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp27_ = g_utf8_strup (_tmp26_, (gssize) -1); + _tmp26_ = g_utf8_strup (_tmp25_, (gssize) -1); #line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - uppercase_extension = _tmp27_; + uppercase_extension = _tmp26_; #line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp28_ = output_format_filter; + _tmp27_ = output_format_filter; #line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp29_ = extension; + _tmp28_ = extension; #line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp30_ = g_strconcat ("*.", _tmp29_, NULL); + _tmp29_ = g_strconcat ("*.", _tmp28_, NULL); #line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp31_ = _tmp30_; + _tmp30_ = _tmp29_; #line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gtk_file_filter_add_pattern (_tmp28_, _tmp31_); + gtk_file_filter_add_pattern (_tmp27_, _tmp30_); #line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp31_); + _g_free0 (_tmp30_); #line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp32_ = output_format_filter; + _tmp31_ = output_format_filter; #line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp33_ = uppercase_extension; + _tmp32_ = uppercase_extension; #line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp34_ = g_strconcat ("*.", _tmp33_, NULL); + _tmp33_ = g_strconcat ("*.", _tmp32_, NULL); #line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp35_ = _tmp34_; + _tmp34_ = _tmp33_; #line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gtk_file_filter_add_pattern (_tmp32_, _tmp35_); + gtk_file_filter_add_pattern (_tmp31_, _tmp34_); #line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp35_); + _g_free0 (_tmp34_); #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (uppercase_extension); #line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_free0 (extension); -#line 3342 "DirectPhotoPage.c" +#line 3304 "DirectPhotoPage.c" } } } #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp36_ = _ ("Save As"); -#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp37_ = app_window_get_instance (); + _tmp35_ = app_window_get_instance (); #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp38_ = _tmp37_; + _tmp36_ = _tmp35_; #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp39_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL); + _tmp37_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_ ("Save As"), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL); #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - g_object_ref_sink (_tmp39_); + g_object_ref_sink (_tmp37_); #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp40_ = _tmp39_; + _tmp38_ = _tmp37_; #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp38_); + _g_object_unref0 (_tmp36_); #line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - save_as_dialog = _tmp40_; + save_as_dialog = _tmp38_; #line 407 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp41_ = save_as_dialog; + _tmp39_ = save_as_dialog; #line 407 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE); + gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE); #line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp42_ = save_as_dialog; + _tmp40_ = save_as_dialog; #line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp43_ = filename; + _tmp41_ = filename; #line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp43_); + gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp41_); #line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp44_ = save_as_dialog; + _tmp42_ = save_as_dialog; #line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp45_ = self->priv->current_save_dir; + _tmp43_ = self->priv->current_save_dir; #line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp46_ = g_file_get_path (_tmp45_); + _tmp44_ = g_file_get_path (_tmp43_); #line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp47_ = _tmp46_; + _tmp45_ = _tmp44_; #line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp47_); + gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp45_); #line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp47_); + _g_free0 (_tmp45_); #line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp48_ = save_as_dialog; + _tmp46_ = save_as_dialog; #line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp49_ = output_format_filter; + _tmp47_ = output_format_filter; #line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp50_ = _g_object_ref0 (_tmp49_); + _tmp48_ = _g_object_ref0 (_tmp47_); #line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gtk_file_chooser_add_filter (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp50_); + gtk_file_chooser_add_filter (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp48_); #line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp51_ = save_as_dialog; + _tmp49_ = save_as_dialog; #line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE); + gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE); #line 412 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp52_ = save_as_dialog; + _tmp50_ = save_as_dialog; #line 412 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE); + gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE); #line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp53_ = save_as_dialog; + _tmp51_ = save_as_dialog; #line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp54_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_dialog_get_type (), GtkDialog)); + _tmp52_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_dialog_get_type (), GtkDialog)); #line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - response = _tmp54_; + response = _tmp52_; #line 415 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp55_ = response; + _tmp53_ = response; #line 415 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - if (_tmp55_ == ((gint) GTK_RESPONSE_OK)) { -#line 3410 "DirectPhotoPage.c" - GtkFileChooserDialog* _tmp56_ = NULL; - gchar* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - GFile* _tmp59_ = NULL; - GFile* _tmp60_ = NULL; - gint _tmp61_ = 0; - ScaleConstraint _tmp62_ = 0; - ExportFormatParameters _tmp63_ = {0}; - JpegQuality _tmp64_ = 0; - PhotoFileFormat _tmp65_ = 0; - ExportFormatParameters _tmp66_ = {0}; - ExportFormatMode _tmp67_ = 0; - ExportFormatParameters _tmp68_ = {0}; - gboolean _tmp69_ = FALSE; - GtkFileChooserDialog* _tmp70_ = NULL; - gchar* _tmp71_ = NULL; - gchar* _tmp72_ = NULL; - GFile* _tmp73_ = NULL; + if (_tmp53_ == ((gint) GTK_RESPONSE_OK)) { +#line 3370 "DirectPhotoPage.c" + GtkFileChooserDialog* _tmp54_; + gchar* _tmp55_; + gchar* _tmp56_; + GFile* _tmp57_; + GFile* _tmp58_; + gint _tmp59_; + ScaleConstraint _tmp60_; + ExportFormatParameters _tmp61_; + JpegQuality _tmp62_; + PhotoFileFormat _tmp63_; + ExportFormatParameters _tmp64_; + ExportFormatMode _tmp65_; + ExportFormatParameters _tmp66_; + gboolean _tmp67_; + GtkFileChooserDialog* _tmp68_; + gchar* _tmp69_; + gchar* _tmp70_; + GFile* _tmp71_; #line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self->priv->drop_if_dirty = TRUE; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp56_ = save_as_dialog; + _tmp54_ = save_as_dialog; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp57_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); + _tmp55_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp58_ = _tmp57_; + _tmp56_ = _tmp55_; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp59_ = g_file_new_for_uri (_tmp58_); + _tmp57_ = g_file_new_for_uri (_tmp56_); #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp60_ = _tmp59_; + _tmp58_ = _tmp57_; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp61_ = scale; + _tmp59_ = scale; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp62_ = constraint; + _tmp60_ = constraint; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp63_ = export_params; + _tmp61_ = export_params; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp64_ = _tmp63_.quality; + _tmp62_ = _tmp61_.quality; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp65_ = effective_export_format; + _tmp63_ = effective_export_format; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp66_ = export_params; + _tmp64_ = export_params; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp67_ = _tmp66_.mode; + _tmp65_ = _tmp64_.mode; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp68_ = export_params; + _tmp66_ = export_params; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp69_ = _tmp68_.export_metadata; + _tmp67_ = _tmp66_.export_metadata; #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - direct_photo_page_save (self, _tmp60_, _tmp61_, _tmp62_, _tmp64_, _tmp65_, _tmp67_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp69_); + direct_photo_page_save (self, _tmp58_, _tmp59_, _tmp60_, _tmp62_, _tmp63_, _tmp65_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp67_); #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_object_unref0 (_tmp60_); + _g_object_unref0 (_tmp58_); #line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp58_); + _g_free0 (_tmp56_); #line 422 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self->priv->drop_if_dirty = FALSE; #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp70_ = save_as_dialog; + _tmp68_ = save_as_dialog; #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp71_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); + _tmp69_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser)); #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp72_ = _tmp71_; + _tmp70_ = _tmp69_; #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp73_ = g_file_new_for_path (_tmp72_); + _tmp71_ = g_file_new_for_path (_tmp70_); #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (self->priv->current_save_dir); #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - self->priv->current_save_dir = _tmp73_; + self->priv->current_save_dir = _tmp71_; #line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _g_free0 (_tmp72_); -#line 3481 "DirectPhotoPage.c" + _g_free0 (_tmp70_); +#line 3441 "DirectPhotoPage.c" } #line 427 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - _tmp74_ = save_as_dialog; + _tmp72_ = save_as_dialog; #line 427 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget)); + gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget)); #line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (save_as_dialog); #line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3493,23 +3453,23 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) { _g_free0 (filename); #line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _g_object_unref0 (export_dialog); -#line 3497 "DirectPhotoPage.c" +#line 3457 "DirectPhotoPage.c" } static void direct_photo_page_on_send_to (DirectPhotoPage* self) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 430 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); #line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)); #line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp0_) { -#line 3509 "DirectPhotoPage.c" - ViewCollection* _tmp1_ = NULL; - ViewCollection* _tmp2_ = NULL; - GeeList* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; +#line 3469 "DirectPhotoPage.c" + ViewCollection* _tmp1_; + ViewCollection* _tmp2_; + GeeList* _tmp3_; + GeeCollection* _tmp4_; #line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3524,7 +3484,7 @@ static void direct_photo_page_on_send_to (DirectPhotoPage* self) { _g_object_unref0 (_tmp4_); #line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _data_collection_unref0 (_tmp2_); -#line 3528 "DirectPhotoPage.c" +#line 3488 "DirectPhotoPage.c" } } @@ -3533,18 +3493,18 @@ static gboolean direct_photo_page_real_on_app_key_pressed (Page* base, GdkEventK DirectPhotoPage * self; gboolean result = FALSE; gboolean handled = 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 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" static GQuark _tmp4_label0 = 0; #line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" static GQuark _tmp4_label1 = 0; -#line 3546 "DirectPhotoPage.c" +#line 3506 "DirectPhotoPage.c" gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; + gboolean _tmp7_; #line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3565,40 +3525,40 @@ static gboolean direct_photo_page_real_on_app_key_pressed (Page* base, GdkEventK if (_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("bracketright")))) { #line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" switch (0) { -#line 3569 "DirectPhotoPage.c" +#line 3529 "DirectPhotoPage.c" default: { #line 440 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise"); #line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" break; -#line 3576 "DirectPhotoPage.c" +#line 3536 "DirectPhotoPage.c" } } } else if (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("bracketleft")))) { #line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" switch (0) { -#line 3582 "DirectPhotoPage.c" +#line 3542 "DirectPhotoPage.c" default: { #line 444 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise"); #line 445 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" break; -#line 3589 "DirectPhotoPage.c" +#line 3549 "DirectPhotoPage.c" } } } else { #line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" switch (0) { -#line 3595 "DirectPhotoPage.c" +#line 3555 "DirectPhotoPage.c" default: { #line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" handled = FALSE; #line 449 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" break; -#line 3602 "DirectPhotoPage.c" +#line 3562 "DirectPhotoPage.c" } } } @@ -3608,31 +3568,31 @@ static gboolean direct_photo_page_real_on_app_key_pressed (Page* base, GdkEventK if (_tmp7_) { #line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = TRUE; -#line 3612 "DirectPhotoPage.c" +#line 3572 "DirectPhotoPage.c" } else { - GdkEventKey* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; + GdkEventKey* _tmp8_; + gboolean _tmp9_; #line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp8_ = event; #line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp9_ = PAGE_CLASS (direct_photo_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp8_); #line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp6_ = _tmp9_; -#line 3622 "DirectPhotoPage.c" +#line 3582 "DirectPhotoPage.c" } #line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" result = _tmp6_; #line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 3628 "DirectPhotoPage.c" +#line 3588 "DirectPhotoPage.c" } static void direct_photo_page_on_print (DirectPhotoPage* self) { - ViewCollection* _tmp0_ = NULL; - ViewCollection* _tmp1_ = NULL; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; + ViewCollection* _tmp0_; + ViewCollection* _tmp1_; + gint _tmp2_; + gboolean _tmp3_; #line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); #line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3647,13 +3607,13 @@ static void direct_photo_page_on_print (DirectPhotoPage* self) { _data_collection_unref0 (_tmp1_); #line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (_tmp3_) { -#line 3651 "DirectPhotoPage.c" - PrintManager* _tmp4_ = NULL; - PrintManager* _tmp5_ = NULL; - ViewCollection* _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; - GeeList* _tmp8_ = NULL; - GeeCollection* _tmp9_ = NULL; +#line 3611 "DirectPhotoPage.c" + PrintManager* _tmp4_; + PrintManager* _tmp5_; + ViewCollection* _tmp6_; + ViewCollection* _tmp7_; + GeeList* _tmp8_; + GeeCollection* _tmp9_; #line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _tmp4_ = print_manager_get_instance (); #line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3674,7 +3634,7 @@ static void direct_photo_page_on_print (DirectPhotoPage* self) { _data_collection_unref0 (_tmp7_); #line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _print_manager_unref0 (_tmp5_); -#line 3678 "DirectPhotoPage.c" +#line 3638 "DirectPhotoPage.c" } } @@ -3684,7 +3644,7 @@ static Block7Data* block7_data_ref (Block7Data* _data7_) { g_atomic_int_inc (&_data7_->_ref_count_); #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return _data7_; -#line 3688 "DirectPhotoPage.c" +#line 3648 "DirectPhotoPage.c" } @@ -3693,7 +3653,7 @@ static void block7_data_unref (void * _userdata_) { _data7_ = (Block7Data*) _userdata_; #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" if (g_atomic_int_dec_and_test (&_data7_->_ref_count_)) { -#line 3697 "DirectPhotoPage.c" +#line 3657 "DirectPhotoPage.c" DirectPhotoPage* self; #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = _data7_->self; @@ -3701,7 +3661,7 @@ static void block7_data_unref (void * _userdata_) { _g_object_unref0 (self); #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_slice_free (Block7Data, _data7_); -#line 3705 "DirectPhotoPage.c" +#line 3665 "DirectPhotoPage.c" } } @@ -3709,7 +3669,7 @@ static void block7_data_unref (void * _userdata_) { static gboolean __lambda16_ (Block7Data* _data7_) { DirectPhotoPage* self; gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = _data7_->self; #line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3720,7 +3680,7 @@ static gboolean __lambda16_ (Block7Data* _data7_) { result = FALSE; #line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 3724 "DirectPhotoPage.c" +#line 3684 "DirectPhotoPage.c" } @@ -3729,13 +3689,13 @@ static gboolean ___lambda16__gsource_func (gpointer self) { result = __lambda16_ (self); #line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 3733 "DirectPhotoPage.c" +#line 3693 "DirectPhotoPage.c" } static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* self, gboolean should_allow_rotation) { Block7Data* _data7_; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self)); #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3754,15 +3714,15 @@ static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* sel block7_data_unref (_data7_); #line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" _data7_ = NULL; -#line 3758 "DirectPhotoPage.c" +#line 3718 "DirectPhotoPage.c" } static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base, DataSource* source) { DirectPhotoPage * self; DataView* result = NULL; - DataSource* _tmp0_ = NULL; - DirectView* _tmp1_ = NULL; + DataSource* _tmp0_; + DirectView* _tmp1_; #line 473 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 473 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3775,7 +3735,7 @@ static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); #line 474 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return result; -#line 3779 "DirectPhotoPage.c" +#line 3739 "DirectPhotoPage.c" } @@ -3785,38 +3745,38 @@ static void direct_photo_page_class_init (DirectPhotoPageClass * klass) { #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_type_class_add_private (klass, sizeof (DirectPhotoPagePrivate)); #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - ((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) direct_photo_page_real_init_collect_ui_filenames; + ((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) direct_photo_page_real_init_collect_ui_filenames; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - ((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) direct_photo_page_real_add_actions; + ((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) direct_photo_page_real_add_actions; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - ((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) direct_photo_page_real_remove_actions; + ((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) direct_photo_page_real_remove_actions; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - ((PageClass *) klass)->init_collect_injection_groups = (InjectionGroup** (*)(Page*, int*)) direct_photo_page_real_init_collect_injection_groups; + ((PageClass *) klass)->init_collect_injection_groups = (InjectionGroup** (*) (Page *, int*)) direct_photo_page_real_init_collect_injection_groups; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - ((GtkWidgetClass *) klass)->realize = (void (*)(GtkWidget*)) direct_photo_page_real_realize; + ((GtkWidgetClass *) klass)->realize = (void (*) (GtkWidget *)) direct_photo_page_real_realize; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - ((EditingHostPageClass *) klass)->photo_changing = (void (*)(EditingHostPage*, Photo*)) direct_photo_page_real_photo_changing; + ((EditingHostPageClass *) klass)->photo_changing = (void (*) (EditingHostPage *, Photo*)) direct_photo_page_real_photo_changing; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - ((PageClass *) klass)->on_context_buttonpress = (gboolean (*)(Page*, GdkEventButton*)) direct_photo_page_real_on_context_buttonpress; + ((PageClass *) klass)->on_context_buttonpress = (gboolean (*) (Page *, GdkEventButton*)) direct_photo_page_real_on_context_buttonpress; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - ((EditingHostPageClass *) klass)->on_increase_size = (void (*)(EditingHostPage*)) direct_photo_page_real_on_increase_size; + ((EditingHostPageClass *) klass)->on_increase_size = (void (*) (EditingHostPage *)) direct_photo_page_real_on_increase_size; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - ((EditingHostPageClass *) klass)->on_decrease_size = (void (*)(EditingHostPage*)) direct_photo_page_real_on_decrease_size; + ((EditingHostPageClass *) klass)->on_decrease_size = (void (*) (EditingHostPage *)) direct_photo_page_real_on_decrease_size; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - ((EditingHostPageClass *) klass)->on_double_click = (gboolean (*)(EditingHostPage*, GdkEventButton*)) direct_photo_page_real_on_double_click; + ((EditingHostPageClass *) klass)->on_double_click = (gboolean (*) (EditingHostPage *, GdkEventButton*)) direct_photo_page_real_on_double_click; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - ((EditingHostPageClass *) klass)->update_ui = (void (*)(EditingHostPage*, gboolean)) direct_photo_page_real_update_ui; + ((EditingHostPageClass *) klass)->update_ui = (void (*) (EditingHostPage *, gboolean)) direct_photo_page_real_update_ui; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - ((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) direct_photo_page_real_update_actions; + ((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) direct_photo_page_real_update_actions; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - ((EditingHostPageClass *) klass)->confirm_replace_photo = (gboolean (*)(EditingHostPage*, Photo*, Photo*)) direct_photo_page_real_confirm_replace_photo; + ((EditingHostPageClass *) klass)->confirm_replace_photo = (gboolean (*) (EditingHostPage *, Photo*, Photo*)) direct_photo_page_real_confirm_replace_photo; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - ((PageClass *) klass)->on_app_key_pressed = (gboolean (*)(Page*, GdkEventKey*)) direct_photo_page_real_on_app_key_pressed; + ((PageClass *) klass)->on_app_key_pressed = (gboolean (*) (Page *, GdkEventKey*)) direct_photo_page_real_on_app_key_pressed; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - ((EditingHostPageClass *) klass)->create_photo_view = (DataView* (*)(EditingHostPage*, DataSource*)) direct_photo_page_real_create_photo_view; + ((EditingHostPageClass *) klass)->create_photo_view = (DataView* (*) (EditingHostPage *, DataSource*)) direct_photo_page_real_create_photo_view; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" G_OBJECT_CLASS (klass)->finalize = direct_photo_page_finalize; -#line 3820 "DirectPhotoPage.c" +#line 3780 "DirectPhotoPage.c" } @@ -3827,14 +3787,14 @@ static void direct_photo_page_instance_init (DirectPhotoPage * self) { self->priv->view_controller = NULL; #line 11 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self->priv->drop_if_dirty = FALSE; -#line 3831 "DirectPhotoPage.c" +#line 3791 "DirectPhotoPage.c" } -static void direct_photo_page_finalize (GObject* obj) { +static void direct_photo_page_finalize (GObject * obj) { DirectPhotoPage * self; - DirectPhotoSourceCollection* _tmp0_ = NULL; - guint _tmp1_ = 0U; + DirectPhotoSourceCollection* _tmp0_; + guint _tmp1_; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); #line 32 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3853,7 +3813,7 @@ static void direct_photo_page_finalize (GObject* obj) { _g_object_unref0 (self->priv->context_menu); #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" G_OBJECT_CLASS (direct_photo_page_parent_class)->finalize (obj); -#line 3857 "DirectPhotoPage.c" +#line 3817 "DirectPhotoPage.c" } @@ -3871,7 +3831,7 @@ GType direct_photo_page_get_type (void) { DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_type, GFile* file) { DirectFullscreenPhotoPage * self = NULL; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; #line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 480 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3880,20 +3840,20 @@ DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_ self = (DirectFullscreenPhotoPage*) direct_photo_page_construct (object_type, _tmp0_); #line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return self; -#line 3884 "DirectPhotoPage.c" +#line 3844 "DirectPhotoPage.c" } DirectFullscreenPhotoPage* direct_fullscreen_photo_page_new (GFile* file) { #line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" return direct_fullscreen_photo_page_construct (TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, file); -#line 3891 "DirectPhotoPage.c" +#line 3851 "DirectPhotoPage.c" } static void direct_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { DirectFullscreenPhotoPage * self; - GeeList* _tmp0_ = NULL; + GeeList* _tmp0_; #line 483 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, DirectFullscreenPhotoPage); #line 483 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" @@ -3902,7 +3862,7 @@ static void direct_fullscreen_photo_page_real_init_collect_ui_filenames (Page* b _tmp0_ = ui_filenames; #line 486 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "direct_context.ui"); -#line 3906 "DirectPhotoPage.c" +#line 3866 "DirectPhotoPage.c" } @@ -3910,8 +3870,8 @@ static void direct_fullscreen_photo_page_class_init (DirectFullscreenPhotoPageCl #line 478 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" direct_fullscreen_photo_page_parent_class = g_type_class_peek_parent (klass); #line 478 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala" - ((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) direct_fullscreen_photo_page_real_init_collect_ui_filenames; -#line 3915 "DirectPhotoPage.c" + ((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) direct_fullscreen_photo_page_real_init_collect_ui_filenames; +#line 3875 "DirectPhotoPage.c" } diff --git a/src/direct/DirectView.c b/src/direct/DirectView.c index da18fc5..7ad6acd 100644 --- a/src/direct/DirectView.c +++ b/src/direct/DirectView.c @@ -1,4 +1,4 @@ -/* DirectView.c generated by valac 0.34.7, the Vala compiler +/* DirectView.c generated by valac 0.36.6, the Vala compiler * generated from DirectView.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -448,7 +448,7 @@ DataView* data_view_construct (GType object_type, DataSource* source); GFile* media_source_get_file (MediaSource* self); GFile* direct_view_get_file (DirectView* self); gchar* direct_view_get_collate_key (DirectView* self); -static void direct_view_finalize (GObject* obj); +static void direct_view_finalize (GObject * obj); GType marker_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; gpointer view_filter_ref (gpointer instance); @@ -499,9 +499,9 @@ ViewManager* view_manager_construct (GType object_type); DirectView* direct_view_construct (GType object_type, DirectPhoto* source) { DirectView * self = NULL; - DirectPhoto* _tmp0_ = NULL; - DirectPhoto* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; + DirectPhoto* _tmp0_; + DirectPhoto* _tmp1_; + GFile* _tmp2_; #line 11 "/home/jens/Source/shotwell/src/direct/DirectView.vala" g_return_val_if_fail (IS_DIRECT_PHOTO (source), NULL); #line 12 "/home/jens/Source/shotwell/src/direct/DirectView.vala" @@ -538,8 +538,8 @@ static gpointer _g_object_ref0 (gpointer self) { GFile* direct_view_get_file (DirectView* self) { GFile* result = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; #line 17 "/home/jens/Source/shotwell/src/direct/DirectView.vala" g_return_val_if_fail (IS_DIRECT_VIEW (self), NULL); #line 18 "/home/jens/Source/shotwell/src/direct/DirectView.vala" @@ -556,9 +556,9 @@ GFile* direct_view_get_file (DirectView* self) { gchar* direct_view_get_collate_key (DirectView* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp5_; + gchar* _tmp6_; #line 21 "/home/jens/Source/shotwell/src/direct/DirectView.vala" g_return_val_if_fail (IS_DIRECT_VIEW (self), NULL); #line 22 "/home/jens/Source/shotwell/src/direct/DirectView.vala" @@ -566,10 +566,10 @@ gchar* direct_view_get_collate_key (DirectView* self) { #line 22 "/home/jens/Source/shotwell/src/direct/DirectView.vala" if (_tmp0_ == NULL) { #line 569 "DirectView.c" - GFile* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; + GFile* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; #line 23 "/home/jens/Source/shotwell/src/direct/DirectView.vala" _tmp1_ = self->priv->file; #line 23 "/home/jens/Source/shotwell/src/direct/DirectView.vala" @@ -618,7 +618,7 @@ static void direct_view_instance_init (DirectView * self) { } -static void direct_view_finalize (GObject* obj) { +static void direct_view_finalize (GObject * obj) { DirectView * self; #line 7 "/home/jens/Source/shotwell/src/direct/DirectView.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_VIEW, DirectView); @@ -655,11 +655,11 @@ static gint64 _direct_view_collection_filename_comparator_comparator (void* a, v DirectViewCollection* direct_view_collection_construct (GType object_type) { DirectViewCollection* self = NULL; - DirectPhotoSourceCollection* _tmp0_ = NULL; - DirectViewCollectionDirectViewManager* _tmp1_ = NULL; - DirectViewCollectionDirectViewManager* _tmp2_ = NULL; - ViewCollectionMonitor* _tmp3_ = NULL; - ViewCollectionMonitor* _tmp4_ = NULL; + DirectPhotoSourceCollection* _tmp0_; + DirectViewCollectionDirectViewManager* _tmp1_; + DirectViewCollectionDirectViewManager* _tmp2_; + ViewCollectionMonitor* _tmp3_; + ViewCollectionMonitor* _tmp4_; #line 37 "/home/jens/Source/shotwell/src/direct/DirectView.vala" self = (DirectViewCollection*) view_collection_construct (object_type, "DirectViewCollection"); #line 39 "/home/jens/Source/shotwell/src/direct/DirectView.vala" @@ -694,16 +694,16 @@ DirectViewCollection* direct_view_collection_new (void) { static gint64 direct_view_collection_filename_comparator (void* a, void* b) { gint64 result = 0LL; DirectView* aview = NULL; - void* _tmp0_ = NULL; + void* _tmp0_; DirectView* bview = NULL; - void* _tmp1_ = NULL; - GCompareFunc _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint64 _tmp8_ = 0LL; + void* _tmp1_; + GCompareFunc _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gint _tmp7_; + gint64 _tmp8_; #line 44 "/home/jens/Source/shotwell/src/direct/DirectView.vala" _tmp0_ = a; #line 44 "/home/jens/Source/shotwell/src/direct/DirectView.vala" @@ -741,8 +741,8 @@ static gint64 direct_view_collection_filename_comparator (void* a, void* b) { static DataView* direct_view_collection_direct_view_manager_real_create_view (ViewManager* base, DataSource* source) { DirectViewCollectionDirectViewManager * self; DataView* result = NULL; - DataSource* _tmp0_ = NULL; - DirectView* _tmp1_ = NULL; + DataSource* _tmp0_; + DirectView* _tmp1_; #line 31 "/home/jens/Source/shotwell/src/direct/DirectView.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, DIRECT_VIEW_COLLECTION_TYPE_DIRECT_VIEW_MANAGER, DirectViewCollectionDirectViewManager); #line 31 "/home/jens/Source/shotwell/src/direct/DirectView.vala" @@ -780,7 +780,7 @@ static void direct_view_collection_direct_view_manager_class_init (DirectViewCol #line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala" direct_view_collection_direct_view_manager_parent_class = g_type_class_peek_parent (klass); #line 30 "/home/jens/Source/shotwell/src/direct/DirectView.vala" - ((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) direct_view_collection_direct_view_manager_real_create_view; + ((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) direct_view_collection_direct_view_manager_real_create_view; #line 785 "DirectView.c" } diff --git a/src/direct/DirectWindow.c b/src/direct/DirectWindow.c index 265200a..16c0212 100644 --- a/src/direct/DirectWindow.c +++ b/src/direct/DirectWindow.c @@ -1,4 +1,4 @@ -/* DirectWindow.c generated by valac 0.34.7, the Vala compiler +/* DirectWindow.c generated by valac 0.36.6, the Vala compiler * generated from DirectWindow.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -358,7 +358,7 @@ static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* e static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEventButton* event); void app_window_on_fullscreen (AppWindow* self); static gboolean direct_window_real_key_press_event (GtkWidget* base, GdkEventKey* event); -static void direct_window_finalize (GObject* obj); +static void direct_window_finalize (GObject * obj); static void _direct_window_on_photo_changed_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { @@ -377,26 +377,26 @@ static void _direct_window_on_photo_changed_view_collection_items_state_changed DirectWindow* direct_window_construct (GType object_type, GFile* file) { DirectWindow * self = NULL; - GFile* _tmp0_ = NULL; - DirectPhotoPage* _tmp1_ = NULL; - DirectPhotoPage* _tmp2_ = NULL; - ViewCollection* _tmp3_ = NULL; - ViewCollection* _tmp4_ = NULL; - DirectPhotoPage* _tmp5_ = NULL; - ViewCollection* _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; - DirectPhotoPage* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - DirectPhotoPage* _tmp10_ = NULL; + GFile* _tmp0_; + DirectPhotoPage* _tmp1_; + DirectPhotoPage* _tmp2_; + ViewCollection* _tmp3_; + ViewCollection* _tmp4_; + DirectPhotoPage* _tmp5_; + ViewCollection* _tmp6_; + ViewCollection* _tmp7_; + DirectPhotoPage* _tmp8_; + GFile* _tmp9_; + DirectPhotoPage* _tmp10_; GtkBox* layout = NULL; - GtkBox* _tmp11_ = NULL; - DirectPhotoPage* _tmp12_ = NULL; - DirectPhotoPage* _tmp13_ = NULL; - GtkToolbar* _tmp14_ = NULL; - GtkToolbar* _tmp15_ = NULL; - DirectPhotoPage* _tmp16_ = NULL; - GMenuModel* _tmp17_ = NULL; - GMenuModel* _tmp18_ = NULL; + GtkBox* _tmp11_; + DirectPhotoPage* _tmp12_; + DirectPhotoPage* _tmp13_; + GtkToolbar* _tmp14_; + GtkToolbar* _tmp15_; + DirectPhotoPage* _tmp16_; + GMenuModel* _tmp17_; + GMenuModel* _tmp18_; #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" @@ -499,8 +499,8 @@ static gpointer _g_object_ref0 (gpointer self) { DirectWindow* direct_window_get_app (void) { DirectWindow* result = NULL; - AppWindow* _tmp0_ = NULL; - DirectWindow* _tmp1_ = NULL; + AppWindow* _tmp0_; + DirectWindow* _tmp1_; #line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = app_window_instance; #line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" @@ -515,7 +515,7 @@ DirectWindow* direct_window_get_app (void) { DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self) { DirectPhotoPage* result = NULL; - Page* _tmp0_ = NULL; + Page* _tmp0_; #line 36 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_val_if_fail (IS_DIRECT_WINDOW (self), NULL); #line 37 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" @@ -530,17 +530,17 @@ DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self) { void direct_window_update_title (DirectWindow* self, GFile* file, gboolean modified) { const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - GFile* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; + gboolean _tmp1_; + GFile* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GFile* _tmp5_; + GFile* _tmp6_; + GFile* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; #line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_if_fail (IS_DIRECT_WINDOW (self)); #line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" @@ -594,12 +594,12 @@ void direct_window_update_title (DirectWindow* self, GFile* file, gboolean modif static void direct_window_real_on_fullscreen (AppWindow* base) { DirectWindow * self; GFile* file = NULL; - DirectPhotoPage* _tmp0_ = NULL; - DirectPhotoPage* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - DirectFullscreenPhotoPage* _tmp4_ = NULL; - DirectFullscreenPhotoPage* _tmp5_ = NULL; + DirectPhotoPage* _tmp0_; + DirectPhotoPage* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; + DirectFullscreenPhotoPage* _tmp4_; + DirectFullscreenPhotoPage* _tmp5_; #line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); #line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" @@ -633,7 +633,7 @@ static void direct_window_real_on_fullscreen (AppWindow* base) { static gchar* direct_window_real_get_app_role (AppWindow* base) { DirectWindow * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 51 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); #line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" @@ -648,9 +648,9 @@ static gchar* direct_window_real_get_app_role (AppWindow* base) { static void direct_window_on_photo_changed (DirectWindow* self) { Photo* photo = NULL; - DirectPhotoPage* _tmp0_ = NULL; - Photo* _tmp1_ = NULL; - Photo* _tmp2_ = NULL; + DirectPhotoPage* _tmp0_; + Photo* _tmp1_; + Photo* _tmp2_; #line 55 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_if_fail (IS_DIRECT_WINDOW (self)); #line 56 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" @@ -664,11 +664,11 @@ static void direct_window_on_photo_changed (DirectWindow* self) { #line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (_tmp2_ != NULL) { #line 667 "DirectWindow.c" - Photo* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - Photo* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + Photo* _tmp3_; + GFile* _tmp4_; + GFile* _tmp5_; + Photo* _tmp6_; + gboolean _tmp7_; #line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp3_ = photo; #line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" @@ -693,14 +693,14 @@ static void direct_window_on_photo_changed (DirectWindow* self) { static void direct_window_real_on_quit (AppWindow* base) { DirectWindow * self; - DirectPhotoPage* _tmp0_ = NULL; - DirectPhotoPage* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; - ConfigFacade* _tmp4_ = NULL; - ConfigFacade* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; - Dimensions _tmp7_ = {0}; + DirectPhotoPage* _tmp0_; + DirectPhotoPage* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; + ConfigFacade* _tmp4_; + ConfigFacade* _tmp5_; + gboolean _tmp6_; + Dimensions _tmp7_; #line 61 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); #line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" @@ -740,10 +740,10 @@ static void direct_window_real_on_quit (AppWindow* base) { static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* event) { DirectWindow * self; gboolean result = FALSE; - DirectPhotoPage* _tmp0_ = NULL; - DirectPhotoPage* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + DirectPhotoPage* _tmp0_; + DirectPhotoPage* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; gboolean _tmp4_ = FALSE; #line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); @@ -770,8 +770,8 @@ static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* e #line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (GTK_WIDGET_CLASS (direct_window_parent_class)->delete_event != NULL) { #line 773 "DirectWindow.c" - GdkEventAny* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + GdkEventAny* _tmp5_; + gboolean _tmp6_; #line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp5_ = event; #line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" @@ -795,8 +795,8 @@ static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* e static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEventButton* event) { DirectWindow * self; gboolean result = FALSE; - GdkEventButton* _tmp0_ = NULL; - GdkEventType _tmp1_ = 0; + GdkEventButton* _tmp0_; + GdkEventType _tmp1_; #line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); #line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" @@ -826,9 +826,9 @@ static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEvent static gboolean direct_window_real_key_press_event (GtkWidget* base, GdkEventKey* event) { DirectWindow * self; gboolean result = FALSE; - GdkEventKey* _tmp0_ = NULL; - guint _tmp1_ = 0U; - const gchar* _tmp2_ = NULL; + GdkEventKey* _tmp0_; + guint _tmp1_; + const gchar* _tmp2_; gboolean _tmp3_ = FALSE; #line 87 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); @@ -853,8 +853,8 @@ static gboolean direct_window_real_key_press_event (GtkWidget* base, GdkEventKey #line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (GTK_WIDGET_CLASS (direct_window_parent_class)->key_press_event != NULL) { #line 856 "DirectWindow.c" - GdkEventKey* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + GdkEventKey* _tmp4_; + gboolean _tmp5_; #line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp4_ = event; #line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" @@ -881,17 +881,17 @@ static void direct_window_class_init (DirectWindowClass * klass) { #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_type_class_add_private (klass, sizeof (DirectWindowPrivate)); #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - ((AppWindowClass *) klass)->on_fullscreen = (void (*)(AppWindow*)) direct_window_real_on_fullscreen; + ((AppWindowClass *) klass)->on_fullscreen = (void (*) (AppWindow *)) direct_window_real_on_fullscreen; #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - ((AppWindowClass *) klass)->get_app_role = (gchar* (*)(AppWindow*)) direct_window_real_get_app_role; + ((AppWindowClass *) klass)->get_app_role = (gchar* (*) (AppWindow *)) direct_window_real_get_app_role; #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - ((AppWindowClass *) klass)->on_quit = (void (*)(AppWindow*)) direct_window_real_on_quit; + ((AppWindowClass *) klass)->on_quit = (void (*) (AppWindow *)) direct_window_real_on_quit; #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - ((GtkWidgetClass *) klass)->delete_event = (gboolean (*)(GtkWidget*, GdkEventAny*)) direct_window_real_delete_event; + ((GtkWidgetClass *) klass)->delete_event = (gboolean (*) (GtkWidget *, GdkEventAny*)) direct_window_real_delete_event; #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - ((GtkWidgetClass *) klass)->button_press_event = (gboolean (*)(GtkWidget*, GdkEventButton*)) direct_window_real_button_press_event; + ((GtkWidgetClass *) klass)->button_press_event = (gboolean (*) (GtkWidget *, GdkEventButton*)) direct_window_real_button_press_event; #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*)(GtkWidget*, GdkEventKey*)) direct_window_real_key_press_event; + ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) direct_window_real_key_press_event; #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" G_OBJECT_CLASS (klass)->finalize = direct_window_finalize; #line 898 "DirectWindow.c" @@ -905,7 +905,7 @@ static void direct_window_instance_init (DirectWindow * self) { } -static void direct_window_finalize (GObject* obj) { +static void direct_window_finalize (GObject * obj) { DirectWindow * self; #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_WINDOW, DirectWindow); |