diff options
Diffstat (limited to 'src/MediaDataRepresentation.c')
| -rw-r--r-- | src/MediaDataRepresentation.c | 3775 |
1 files changed, 1940 insertions, 1835 deletions
diff --git a/src/MediaDataRepresentation.c b/src/MediaDataRepresentation.c index e0df289..9a6edc0 100644 --- a/src/MediaDataRepresentation.c +++ b/src/MediaDataRepresentation.c @@ -1,4 +1,4 @@ -/* MediaDataRepresentation.c generated by valac 0.34.7, the Vala compiler +/* MediaDataRepresentation.c generated by valac 0.36.6, the Vala compiler * generated from MediaDataRepresentation.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -233,6 +233,11 @@ typedef struct _EventSourceCollectionClass EventSourceCollectionClass; typedef struct _TransactionController TransactionController; typedef struct _TransactionControllerClass TransactionControllerClass; +enum { + MEDIA_SOURCE_MASTER_REPLACED_SIGNAL, + MEDIA_SOURCE_LAST_SIGNAL +}; +static guint media_source_signals[MEDIA_SOURCE_LAST_SIGNAL] = {0}; typedef struct _SourceHoldingTankPrivate SourceHoldingTankPrivate; #define TYPE_DATABASE_SOURCE_HOLDING_TANK (database_source_holding_tank_get_type ()) @@ -394,6 +399,17 @@ typedef struct _AggregateProgressMonitorClass AggregateProgressMonitorClass; #define _aggregate_progress_monitor_unref0(var) ((var == NULL) ? NULL : (var = (aggregate_progress_monitor_unref (var), NULL))) #define TOMBSTONE_TYPE_REASON (tombstone_reason_get_type ()) +enum { + MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_STARTING_SIGNAL, + MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_COMPLETED_SIGNAL, + MEDIA_SOURCE_COLLECTION_MASTER_FILE_REPLACED_SIGNAL, + MEDIA_SOURCE_COLLECTION_TRASHCAN_CONTENTS_ALTERED_SIGNAL, + MEDIA_SOURCE_COLLECTION_IMPORT_ROLL_ALTERED_SIGNAL, + MEDIA_SOURCE_COLLECTION_OFFLINE_CONTENTS_ALTERED_SIGNAL, + MEDIA_SOURCE_COLLECTION_FLAGGED_CONTENTS_ALTERED_SIGNAL, + MEDIA_SOURCE_COLLECTION_LAST_SIGNAL +}; +static guint media_source_collection_signals[MEDIA_SOURCE_COLLECTION_LAST_SIGNAL] = {0}; #define TYPE_MEDIA_COLLECTION_REGISTRY (media_collection_registry_get_type ()) #define MEDIA_COLLECTION_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_COLLECTION_REGISTRY, MediaCollectionRegistry)) @@ -939,7 +955,7 @@ struct _ParamSpecMediaCollectionRegistry { static gpointer backing_file_state_parent_class = NULL; static gpointer media_source_parent_class = NULL; extern EventSourceCollection* event_global; -static IndexableIface* media_source_indexable_parent_iface = NULL; +static IndexableIface * media_source_indexable_parent_iface = NULL; static gpointer media_source_holding_tank_parent_class = NULL; static gpointer media_source_transaction_controller_parent_class = NULL; static gpointer media_source_collection_parent_class = NULL; @@ -978,7 +994,7 @@ Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); GType orientation_get_type (void) G_GNUC_CONST; GFile* backing_file_state_get_file (BackingFileState* self); -static void backing_file_state_finalize (BackingFileState* obj); +static void backing_file_state_finalize (BackingFileState * obj); GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); @@ -1140,7 +1156,7 @@ void media_source_get_import_id (MediaSource* self, ImportID* result); static void media_source_real_get_import_id (MediaSource* self, ImportID* result); static void media_source_real_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file); static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void media_source_finalize (GObject* obj); +static void media_source_finalize (GObject * obj); GType database_source_holding_tank_get_type (void) G_GNUC_CONST; GType media_source_holding_tank_get_type (void) G_GNUC_CONST; #define MEDIA_SOURCE_HOLDING_TANK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTankPrivate)) @@ -1162,7 +1178,7 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin static void media_source_holding_tank_on_master_source_replaced (MediaSourceHoldingTank* self, MediaSource* media_source, GFile* old_file, GFile* new_file); static void _media_source_holding_tank_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self); void source_holding_tank_notify_contents_altered (SourceHoldingTank* self, GeeCollection* added, GeeCollection* removed); -static void media_source_holding_tank_finalize (SourceHoldingTank* obj); +static void media_source_holding_tank_finalize (SourceHoldingTank * obj); GType media_source_transaction_controller_get_type (void) G_GNUC_CONST; #define MEDIA_SOURCE_TRANSACTION_CONTROLLER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, MediaSourceTransactionControllerPrivate)) enum { @@ -1178,7 +1194,7 @@ static void media_source_transaction_controller_real_commit_impl (TransactionCon void data_collection_thaw_notifications (DataCollection* self); GQuark database_error_quark (void); void database_table_commit_transaction (GError** error); -static void media_source_transaction_controller_finalize (TransactionController* obj); +static void media_source_transaction_controller_finalize (TransactionController * obj); GType marker_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); @@ -1297,7 +1313,7 @@ static void media_source_collection_real_trashcan_contents_altered (MediaSourceC static void media_source_collection_real_import_roll_altered (MediaSourceCollection* self); static void media_source_collection_real_offline_contents_altered (MediaSourceCollection* self, GeeCollection* added, GeeCollection* removed); static void media_source_collection_real_flagged_contents_altered (MediaSourceCollection* self); -static void media_source_collection_finalize (DataCollection* obj); +static void media_source_collection_finalize (DataCollection * obj); gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -1362,7 +1378,7 @@ GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaColle MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaCollectionRegistry* self, GFile* file); gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry* self, const gchar* source_id); #define VIDEO_TYPENAME "video" -static void media_collection_registry_finalize (MediaCollectionRegistry* obj); +static void media_collection_registry_finalize (MediaCollectionRegistry * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); @@ -1370,12 +1386,12 @@ static gint _vala_array_length (gpointer array); BackingFileState* backing_file_state_construct (GType object_type, const gchar* filepath, gint64 filesize, time_t modification_time, const gchar* md5) { BackingFileState* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gint64 _tmp2_ = 0LL; - time_t _tmp3_ = 0; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + gint64 _tmp2_; + time_t _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; #line 13 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 13 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -1406,28 +1422,28 @@ BackingFileState* backing_file_state_construct (GType object_type, const gchar* self->md5 = _tmp5_; #line 13 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 1410 "MediaDataRepresentation.c" +#line 1426 "MediaDataRepresentation.c" } BackingFileState* backing_file_state_new (const gchar* filepath, gint64 filesize, time_t modification_time, const gchar* md5) { #line 13 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return backing_file_state_construct (TYPE_BACKING_FILE_STATE, filepath, filesize, modification_time, md5); -#line 1417 "MediaDataRepresentation.c" +#line 1433 "MediaDataRepresentation.c" } BackingFileState* backing_file_state_construct_from_photo_row (GType object_type, BackingPhotoRow* photo_row, const gchar* md5) { BackingFileState* self = NULL; - BackingPhotoRow* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - BackingPhotoRow* _tmp3_ = NULL; - gint64 _tmp4_ = 0LL; - BackingPhotoRow* _tmp5_ = NULL; - time_t _tmp6_ = 0; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; + BackingPhotoRow* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + BackingPhotoRow* _tmp3_; + gint64 _tmp4_; + BackingPhotoRow* _tmp5_; + time_t _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; #line 20 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_BACKING_PHOTO_ROW (photo_row), NULL); #line 20 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -1464,21 +1480,21 @@ BackingFileState* backing_file_state_construct_from_photo_row (GType object_type self->md5 = _tmp8_; #line 20 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 1468 "MediaDataRepresentation.c" +#line 1484 "MediaDataRepresentation.c" } BackingFileState* backing_file_state_new_from_photo_row (BackingPhotoRow* photo_row, const gchar* md5) { #line 20 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return backing_file_state_construct_from_photo_row (TYPE_BACKING_FILE_STATE, photo_row, md5); -#line 1475 "MediaDataRepresentation.c" +#line 1491 "MediaDataRepresentation.c" } GFile* backing_file_state_get_file (BackingFileState* self) { GFile* result = NULL; - const gchar* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + const gchar* _tmp0_; + GFile* _tmp1_; #line 27 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_BACKING_FILE_STATE (self), NULL); #line 28 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -1489,14 +1505,14 @@ GFile* backing_file_state_get_file (BackingFileState* self) { result = _tmp1_; #line 28 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 1493 "MediaDataRepresentation.c" +#line 1509 "MediaDataRepresentation.c" } static void value_backing_file_state_init (GValue* value) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 1500 "MediaDataRepresentation.c" +#line 1516 "MediaDataRepresentation.c" } @@ -1505,7 +1521,7 @@ static void value_backing_file_state_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" backing_file_state_unref (value->data[0].v_pointer); -#line 1509 "MediaDataRepresentation.c" +#line 1525 "MediaDataRepresentation.c" } } @@ -1515,11 +1531,11 @@ static void value_backing_file_state_copy_value (const GValue* src_value, GValue if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" dest_value->data[0].v_pointer = backing_file_state_ref (src_value->data[0].v_pointer); -#line 1519 "MediaDataRepresentation.c" +#line 1535 "MediaDataRepresentation.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" dest_value->data[0].v_pointer = NULL; -#line 1523 "MediaDataRepresentation.c" +#line 1539 "MediaDataRepresentation.c" } } @@ -1527,66 +1543,66 @@ static void value_backing_file_state_copy_value (const GValue* src_value, GValue static gpointer value_backing_file_state_peek_pointer (const GValue* value) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return value->data[0].v_pointer; -#line 1531 "MediaDataRepresentation.c" +#line 1547 "MediaDataRepresentation.c" } static gchar* value_backing_file_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (collect_values[0].v_pointer) { -#line 1538 "MediaDataRepresentation.c" - BackingFileState* object; +#line 1554 "MediaDataRepresentation.c" + BackingFileState * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1545 "MediaDataRepresentation.c" +#line 1561 "MediaDataRepresentation.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1549 "MediaDataRepresentation.c" +#line 1565 "MediaDataRepresentation.c" } #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = backing_file_state_ref (object); -#line 1553 "MediaDataRepresentation.c" +#line 1569 "MediaDataRepresentation.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 1557 "MediaDataRepresentation.c" +#line 1573 "MediaDataRepresentation.c" } #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 1561 "MediaDataRepresentation.c" +#line 1577 "MediaDataRepresentation.c" } static gchar* value_backing_file_state_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - BackingFileState** object_p; + BackingFileState ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1572 "MediaDataRepresentation.c" +#line 1588 "MediaDataRepresentation.c" } #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = NULL; -#line 1578 "MediaDataRepresentation.c" +#line 1594 "MediaDataRepresentation.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = value->data[0].v_pointer; -#line 1582 "MediaDataRepresentation.c" +#line 1598 "MediaDataRepresentation.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = backing_file_state_ref (value->data[0].v_pointer); -#line 1586 "MediaDataRepresentation.c" +#line 1602 "MediaDataRepresentation.c" } #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 1590 "MediaDataRepresentation.c" +#line 1606 "MediaDataRepresentation.c" } @@ -1600,7 +1616,7 @@ GParamSpec* param_spec_backing_file_state (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return G_PARAM_SPEC (spec); -#line 1604 "MediaDataRepresentation.c" +#line 1620 "MediaDataRepresentation.c" } @@ -1609,12 +1625,12 @@ gpointer value_get_backing_file_state (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_FILE_STATE), NULL); #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return value->data[0].v_pointer; -#line 1613 "MediaDataRepresentation.c" +#line 1629 "MediaDataRepresentation.c" } void value_set_backing_file_state (GValue* value, gpointer v_object) { - BackingFileState* old; + BackingFileState * old; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_FILE_STATE)); #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -1629,23 +1645,23 @@ void value_set_backing_file_state (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" backing_file_state_ref (value->data[0].v_pointer); -#line 1633 "MediaDataRepresentation.c" +#line 1649 "MediaDataRepresentation.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 1637 "MediaDataRepresentation.c" +#line 1653 "MediaDataRepresentation.c" } #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" backing_file_state_unref (old); -#line 1643 "MediaDataRepresentation.c" +#line 1659 "MediaDataRepresentation.c" } } void value_take_backing_file_state (GValue* value, gpointer v_object) { - BackingFileState* old; + BackingFileState * old; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_FILE_STATE)); #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -1658,17 +1674,17 @@ void value_take_backing_file_state (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = v_object; -#line 1662 "MediaDataRepresentation.c" +#line 1678 "MediaDataRepresentation.c" } else { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 1666 "MediaDataRepresentation.c" +#line 1682 "MediaDataRepresentation.c" } #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" backing_file_state_unref (old); -#line 1672 "MediaDataRepresentation.c" +#line 1688 "MediaDataRepresentation.c" } } @@ -1678,18 +1694,18 @@ static void backing_file_state_class_init (BackingFileStateClass * klass) { backing_file_state_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((BackingFileStateClass *) klass)->finalize = backing_file_state_finalize; -#line 1682 "MediaDataRepresentation.c" +#line 1698 "MediaDataRepresentation.c" } static void backing_file_state_instance_init (BackingFileState * self) { #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->ref_count = 1; -#line 1689 "MediaDataRepresentation.c" +#line 1705 "MediaDataRepresentation.c" } -static void backing_file_state_finalize (BackingFileState* obj) { +static void backing_file_state_finalize (BackingFileState * obj) { BackingFileState * self; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_FILE_STATE, BackingFileState); @@ -1699,7 +1715,7 @@ static void backing_file_state_finalize (BackingFileState* obj) { _g_free0 (self->filepath); #line 11 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (self->md5); -#line 1703 "MediaDataRepresentation.c" +#line 1719 "MediaDataRepresentation.c" } @@ -1718,18 +1734,18 @@ GType backing_file_state_get_type (void) { gpointer backing_file_state_ref (gpointer instance) { - BackingFileState* self; + BackingFileState * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return instance; -#line 1728 "MediaDataRepresentation.c" +#line 1744 "MediaDataRepresentation.c" } void backing_file_state_unref (gpointer instance) { - BackingFileState* self; + BackingFileState * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1737,28 +1753,28 @@ void backing_file_state_unref (gpointer instance) { BACKING_FILE_STATE_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1741 "MediaDataRepresentation.c" +#line 1757 "MediaDataRepresentation.c" } } MediaSource* media_source_construct (GType object_type, gint64 object_id) { MediaSource * self = NULL; - gint64 _tmp0_ = 0LL; + gint64 _tmp0_; #line 40 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = object_id; #line 40 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = (MediaSource*) thumbnail_source_construct (object_type, _tmp0_); #line 39 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 1755 "MediaDataRepresentation.c" +#line 1771 "MediaDataRepresentation.c" } inline guint64 media_source_internal_add_flags (guint64 flags, guint64 selector) { guint64 result = 0ULL; - guint64 _tmp0_ = 0ULL; - guint64 _tmp1_ = 0ULL; + guint64 _tmp0_; + guint64 _tmp1_; #line 44 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = flags; #line 44 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -1767,14 +1783,14 @@ inline guint64 media_source_internal_add_flags (guint64 flags, guint64 selector) result = _tmp0_ | _tmp1_; #line 44 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 1771 "MediaDataRepresentation.c" +#line 1787 "MediaDataRepresentation.c" } inline guint64 media_source_internal_remove_flags (guint64 flags, guint64 selector) { guint64 result = 0ULL; - guint64 _tmp0_ = 0ULL; - guint64 _tmp1_ = 0ULL; + guint64 _tmp0_; + guint64 _tmp1_; #line 48 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = flags; #line 48 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -1783,14 +1799,14 @@ inline guint64 media_source_internal_remove_flags (guint64 flags, guint64 select result = _tmp0_ & (~_tmp1_); #line 48 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 1787 "MediaDataRepresentation.c" +#line 1803 "MediaDataRepresentation.c" } inline gboolean media_source_internal_is_flag_set (guint64 flags, guint64 selector) { gboolean result = FALSE; - guint64 _tmp0_ = 0ULL; - guint64 _tmp1_ = 0ULL; + guint64 _tmp0_; + guint64 _tmp1_; #line 52 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = flags; #line 52 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -1799,13 +1815,13 @@ inline gboolean media_source_internal_is_flag_set (guint64 flags, guint64 select result = (_tmp0_ & _tmp1_) != ((guint64) 0); #line 52 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 1803 "MediaDataRepresentation.c" +#line 1819 "MediaDataRepresentation.c" } static void media_source_real_notify_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file) { - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; #line 55 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_IS_FILE (old_file)); #line 55 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -1815,8 +1831,8 @@ static void media_source_real_notify_master_replaced (MediaSource* self, GFile* #line 56 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = new_file; #line 56 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_emit_by_name (self, "master-replaced", _tmp0_, _tmp1_); -#line 1820 "MediaDataRepresentation.c" + g_signal_emit (self, media_source_signals[MEDIA_SOURCE_MASTER_REPLACED_SIGNAL], 0, _tmp0_, _tmp1_); +#line 1836 "MediaDataRepresentation.c" } @@ -1825,26 +1841,26 @@ void media_source_notify_master_replaced (MediaSource* self, GFile* old_file, GF g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 55 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->notify_master_replaced (self, old_file, new_file); -#line 1829 "MediaDataRepresentation.c" +#line 1845 "MediaDataRepresentation.c" } static gpointer _alteration_ref0 (gpointer self) { #line 60 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? alteration_ref (self) : NULL; -#line 1836 "MediaDataRepresentation.c" +#line 1852 "MediaDataRepresentation.c" } static void media_source_real_notify_altered (DataObject* base, Alteration* alteration) { MediaSource * self; Alteration* local = NULL; - Alteration* _tmp0_ = NULL; - Alteration* _tmp1_ = NULL; + Alteration* _tmp0_; + Alteration* _tmp1_; gboolean _tmp2_ = FALSE; - Alteration* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - Alteration* _tmp11_ = NULL; + Alteration* _tmp3_; + gboolean _tmp4_; + Alteration* _tmp11_; #line 59 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE, MediaSource); #line 59 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -1863,25 +1879,25 @@ static void media_source_real_notify_altered (DataObject* base, Alteration* alte if (_tmp4_) { #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = TRUE; -#line 1867 "MediaDataRepresentation.c" +#line 1883 "MediaDataRepresentation.c" } else { - Alteration* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + Alteration* _tmp5_; + gboolean _tmp6_; #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = local; #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = alteration_has_detail (_tmp5_, "backing", "master"); #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _tmp6_; -#line 1877 "MediaDataRepresentation.c" +#line 1893 "MediaDataRepresentation.c" } #line 62 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp2_) { -#line 1881 "MediaDataRepresentation.c" - Alteration* _tmp7_ = NULL; - Alteration* _tmp8_ = NULL; - Alteration* _tmp9_ = NULL; - Alteration* _tmp10_ = NULL; +#line 1897 "MediaDataRepresentation.c" + Alteration* _tmp7_; + Alteration* _tmp8_; + Alteration* _tmp9_; + Alteration* _tmp10_; #line 63 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_update_indexable_keywords (self); #line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -1898,7 +1914,7 @@ static void media_source_real_notify_altered (DataObject* base, Alteration* alte local = _tmp10_; #line 64 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _alteration_unref0 (_tmp9_); -#line 1902 "MediaDataRepresentation.c" +#line 1918 "MediaDataRepresentation.c" } #line 67 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = local; @@ -1906,15 +1922,15 @@ static void media_source_real_notify_altered (DataObject* base, Alteration* alte DATA_OBJECT_CLASS (media_source_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_OBJECT, DataObject), _tmp11_); #line 59 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _alteration_unref0 (local); -#line 1910 "MediaDataRepresentation.c" +#line 1926 "MediaDataRepresentation.c" } static void media_source_real_notify_membership_changed (DataObject* base, DataCollection* collection) { MediaSource * self; gboolean _tmp0_ = FALSE; - DataCollection* _tmp1_ = NULL; - DataCollection* _tmp3_ = NULL; + DataCollection* _tmp1_; + DataCollection* _tmp3_; #line 72 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE, MediaSource); #line 72 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -1923,44 +1939,44 @@ static void media_source_real_notify_membership_changed (DataObject* base, DataC _tmp1_ = collection; #line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp1_ != NULL) { -#line 1927 "MediaDataRepresentation.c" - const gchar* _tmp2_ = NULL; +#line 1943 "MediaDataRepresentation.c" + const gchar* _tmp2_; #line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = self->priv->indexable_keywords; #line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = _tmp2_ == NULL; -#line 1933 "MediaDataRepresentation.c" +#line 1949 "MediaDataRepresentation.c" } else { #line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = FALSE; -#line 1937 "MediaDataRepresentation.c" +#line 1953 "MediaDataRepresentation.c" } #line 73 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp0_) { #line 76 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_update_indexable_keywords (self); -#line 1943 "MediaDataRepresentation.c" +#line 1959 "MediaDataRepresentation.c" } #line 79 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = collection; #line 79 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" DATA_OBJECT_CLASS (media_source_parent_class)->notify_membership_changed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_OBJECT, DataObject), _tmp3_); -#line 1949 "MediaDataRepresentation.c" +#line 1965 "MediaDataRepresentation.c" } static void media_source_update_indexable_keywords (MediaSource* self) { gchar** indexables = NULL; - gchar** _tmp0_ = NULL; - gint indexables_length1 = 0; - gint _indexables_size_ = 0; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; + gchar** _tmp0_; + gint indexables_length1; + gint _indexables_size_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; #line 82 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 83 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2003,14 +2019,14 @@ static void media_source_update_indexable_keywords (MediaSource* self) { self->priv->indexable_keywords = _tmp7_; #line 82 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" indexables = (_vala_array_free (indexables, indexables_length1, (GDestroyNotify) g_free), NULL); -#line 2007 "MediaDataRepresentation.c" +#line 2023 "MediaDataRepresentation.c" } static const gchar* media_source_real_get_indexable_keywords (Indexable* base) { MediaSource * self; const gchar* result = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 91 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE, MediaSource); #line 92 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2019,7 +2035,7 @@ static const gchar* media_source_real_get_indexable_keywords (Indexable* base) { result = _tmp0_; #line 92 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2023 "MediaDataRepresentation.c" +#line 2039 "MediaDataRepresentation.c" } @@ -2029,7 +2045,7 @@ static gboolean media_source_real_set_event_id (MediaSource* self, EventID* id) g_critical ("Type `%s' does not implement abstract method `media_source_set_event_id'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 95 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2033 "MediaDataRepresentation.c" +#line 2049 "MediaDataRepresentation.c" } @@ -2038,14 +2054,14 @@ gboolean media_source_set_event_id (MediaSource* self, EventID* id) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); #line 95 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->set_event_id (self, id); -#line 2042 "MediaDataRepresentation.c" +#line 2058 "MediaDataRepresentation.c" } static gpointer _g_object_ref0 (gpointer self) { #line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? g_object_ref (self) : NULL; -#line 2049 "MediaDataRepresentation.c" +#line 2065 "MediaDataRepresentation.c" } @@ -2053,12 +2069,12 @@ gboolean media_source_delete_original_file (MediaSource* self) { gboolean result = FALSE; gboolean ret = FALSE; GFile* file = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - gboolean _tmp14_ = FALSE; + GFile* _tmp0_; + GFile* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; + gboolean _tmp13_; + gboolean _tmp14_; GError * _inner_error_ = NULL; #line 97 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); @@ -2068,11 +2084,11 @@ gboolean media_source_delete_original_file (MediaSource* self) { _tmp0_ = media_source_get_master_file (self); #line 99 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" file = _tmp0_; -#line 2072 "MediaDataRepresentation.c" +#line 2088 "MediaDataRepresentation.c" { gboolean _tmp1_ = FALSE; - GFile* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + GFile* _tmp2_; + gboolean _tmp3_; #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = file; #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2081,22 +2097,22 @@ gboolean media_source_delete_original_file (MediaSource* self) { _tmp1_ = _tmp3_; #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2085 "MediaDataRepresentation.c" - goto __catch561_g_error; +#line 2101 "MediaDataRepresentation.c" + goto __catch562_g_error; } #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ret = _tmp1_; -#line 2090 "MediaDataRepresentation.c" +#line 2106 "MediaDataRepresentation.c" } - goto __finally561; - __catch561_g_error: + goto __finally562; + __catch562_g_error: { GError* err = NULL; - GFile* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - GError* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; + GFile* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + GError* _tmp7_; + const gchar* _tmp8_; #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" err = _inner_error_; #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2118,12 +2134,12 @@ gboolean media_source_delete_original_file (MediaSource* self) { _g_free0 (_tmp6_); #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); -#line 2121 "MediaDataRepresentation.c" +#line 2137 "MediaDataRepresentation.c" } - __finally561: + __finally562: #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2126 "MediaDataRepresentation.c" +#line 2142 "MediaDataRepresentation.c" gboolean _tmp9_ = FALSE; #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (file); @@ -2133,7 +2149,7 @@ gboolean media_source_delete_original_file (MediaSource* self) { g_clear_error (&_inner_error_); #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp9_; -#line 2136 "MediaDataRepresentation.c" +#line 2152 "MediaDataRepresentation.c" } #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = file; @@ -2149,10 +2165,10 @@ gboolean media_source_delete_original_file (MediaSource* self) { _g_object_unref0 (_tmp12_); #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp14_) { -#line 2152 "MediaDataRepresentation.c" +#line 2168 "MediaDataRepresentation.c" GFile* parent = NULL; - GFile* _tmp15_ = NULL; - GFile* _tmp16_ = NULL; + GFile* _tmp15_; + GFile* _tmp16_; #line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = file; #line 112 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2161,16 +2177,16 @@ gboolean media_source_delete_original_file (MediaSource* self) { parent = _tmp16_; #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 2164 "MediaDataRepresentation.c" - GFile* _tmp17_ = NULL; - GFile* _tmp18_ = NULL; - GFile* _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; - gboolean _tmp21_ = FALSE; - GFile* _tmp22_ = NULL; - GFile* _tmp23_ = NULL; +#line 2180 "MediaDataRepresentation.c" + GFile* _tmp17_; + GFile* _tmp18_; + GFile* _tmp19_; + gboolean _tmp20_; + gboolean _tmp21_; + GFile* _tmp22_; + GFile* _tmp23_; gboolean _tmp24_ = FALSE; - GFile* _tmp25_ = NULL; + GFile* _tmp25_; #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = parent; #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2187,7 +2203,7 @@ gboolean media_source_delete_original_file (MediaSource* self) { if (_tmp21_) { #line 113 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 2190 "MediaDataRepresentation.c" +#line 2206 "MediaDataRepresentation.c" } #line 114 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp22_ = parent; @@ -2203,12 +2219,12 @@ gboolean media_source_delete_original_file (MediaSource* self) { if (_tmp25_ == NULL) { #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp24_ = TRUE; -#line 2206 "MediaDataRepresentation.c" +#line 2222 "MediaDataRepresentation.c" } else { - GFile* _tmp26_ = NULL; - GFile* _tmp27_ = NULL; - GFile* _tmp28_ = NULL; - gboolean _tmp29_ = FALSE; + GFile* _tmp26_; + GFile* _tmp27_; + GFile* _tmp28_; + gboolean _tmp29_; #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp26_ = parent; #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2221,18 +2237,18 @@ gboolean media_source_delete_original_file (MediaSource* self) { _tmp24_ = _tmp29_; #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp28_); -#line 2224 "MediaDataRepresentation.c" +#line 2240 "MediaDataRepresentation.c" } #line 115 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp24_) { #line 116 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 2230 "MediaDataRepresentation.c" +#line 2246 "MediaDataRepresentation.c" } { gboolean _tmp30_ = FALSE; - GFile* _tmp31_ = NULL; - gboolean _tmp32_ = FALSE; + GFile* _tmp31_; + gboolean _tmp32_; #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp31_ = parent; #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2241,25 +2257,25 @@ gboolean media_source_delete_original_file (MediaSource* self) { _tmp30_ = _tmp32_; #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2244 "MediaDataRepresentation.c" - goto __catch562_g_error; +#line 2260 "MediaDataRepresentation.c" + goto __catch563_g_error; } #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp30_) { #line 120 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 2251 "MediaDataRepresentation.c" +#line 2267 "MediaDataRepresentation.c" } } - goto __finally562; - __catch562_g_error: + goto __finally563; + __catch563_g_error: { GError* err = NULL; - GFile* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; - GError* _tmp36_ = NULL; - const gchar* _tmp37_ = NULL; + GFile* _tmp33_; + gchar* _tmp34_; + gchar* _tmp35_; + GError* _tmp36_; + const gchar* _tmp37_; #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" err = _inner_error_; #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2282,12 +2298,12 @@ gboolean media_source_delete_original_file (MediaSource* self) { _g_error_free0 (err); #line 124 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 2285 "MediaDataRepresentation.c" +#line 2301 "MediaDataRepresentation.c" } - __finally562: + __finally563: #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2290 "MediaDataRepresentation.c" +#line 2306 "MediaDataRepresentation.c" gboolean _tmp38_ = FALSE; #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (parent); @@ -2299,21 +2315,21 @@ gboolean media_source_delete_original_file (MediaSource* self) { g_clear_error (&_inner_error_); #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp38_; -#line 2302 "MediaDataRepresentation.c" +#line 2318 "MediaDataRepresentation.c" } { - GFile* _tmp39_ = NULL; - GFile* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; + GFile* _tmp39_; + GFile* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; #line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp39_ = parent; #line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_file_delete (_tmp39_, NULL, &_inner_error_); #line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2315 "MediaDataRepresentation.c" - goto __catch563_g_error; +#line 2331 "MediaDataRepresentation.c" + goto __catch564_g_error; } #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp40_ = parent; @@ -2325,17 +2341,17 @@ gboolean media_source_delete_original_file (MediaSource* self) { g_debug ("MediaDataRepresentation.vala:129: Deleted empty directory %s", _tmp42_); #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (_tmp42_); -#line 2328 "MediaDataRepresentation.c" +#line 2344 "MediaDataRepresentation.c" } - goto __finally563; - __catch563_g_error: + goto __finally564; + __catch564_g_error: { GError* err = NULL; - GFile* _tmp43_ = NULL; - gchar* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - GError* _tmp46_ = NULL; - const gchar* _tmp47_ = NULL; + GFile* _tmp43_; + gchar* _tmp44_; + gchar* _tmp45_; + GError* _tmp46_; + const gchar* _tmp47_; #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" err = _inner_error_; #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2357,12 +2373,12 @@ gboolean media_source_delete_original_file (MediaSource* self) { _g_free0 (_tmp45_); #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); -#line 2359 "MediaDataRepresentation.c" +#line 2375 "MediaDataRepresentation.c" } - __finally563: + __finally564: #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2364 "MediaDataRepresentation.c" +#line 2380 "MediaDataRepresentation.c" gboolean _tmp48_ = FALSE; #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (parent); @@ -2374,12 +2390,12 @@ gboolean media_source_delete_original_file (MediaSource* self) { g_clear_error (&_inner_error_); #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp48_; -#line 2376 "MediaDataRepresentation.c" +#line 2392 "MediaDataRepresentation.c" } } #line 111 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (parent); -#line 2381 "MediaDataRepresentation.c" +#line 2397 "MediaDataRepresentation.c" } #line 138 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = ret; @@ -2387,7 +2403,7 @@ gboolean media_source_delete_original_file (MediaSource* self) { _g_object_unref0 (file); #line 138 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2389 "MediaDataRepresentation.c" +#line 2405 "MediaDataRepresentation.c" } @@ -2395,10 +2411,10 @@ static gchar* media_source_real_get_name (DataObject* base) { MediaSource * self; gchar* result = NULL; gchar* title = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + const gchar* _tmp2_; + gboolean _tmp3_; #line 141 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE, MediaSource); #line 142 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2411,18 +2427,18 @@ static gchar* media_source_real_get_name (DataObject* base) { _tmp3_ = is_string_empty (_tmp2_); #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp3_) { -#line 2413 "MediaDataRepresentation.c" - gchar* _tmp4_ = NULL; +#line 2429 "MediaDataRepresentation.c" + gchar* _tmp4_; #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = media_source_get_basename (self); #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (_tmp1_); #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp4_; -#line 2421 "MediaDataRepresentation.c" +#line 2437 "MediaDataRepresentation.c" } else { - const gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + const gchar* _tmp5_; + gchar* _tmp6_; #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = title; #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2431,7 +2447,7 @@ static gchar* media_source_real_get_name (DataObject* base) { _g_free0 (_tmp1_); #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp6_; -#line 2433 "MediaDataRepresentation.c" +#line 2449 "MediaDataRepresentation.c" } #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp1_; @@ -2439,16 +2455,16 @@ static gchar* media_source_real_get_name (DataObject* base) { _g_free0 (title); #line 144 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2441 "MediaDataRepresentation.c" +#line 2457 "MediaDataRepresentation.c" } static gchar* media_source_real_get_basename (MediaSource* self) { gchar* result = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_source_get_file (self); #line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2463,7 +2479,7 @@ static gchar* media_source_real_get_basename (MediaSource* self) { result = _tmp3_; #line 148 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2465 "MediaDataRepresentation.c" +#line 2481 "MediaDataRepresentation.c" } @@ -2472,7 +2488,7 @@ gchar* media_source_get_basename (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 147 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_basename (self); -#line 2474 "MediaDataRepresentation.c" +#line 2490 "MediaDataRepresentation.c" } @@ -2481,7 +2497,7 @@ static GFile* media_source_real_get_file (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_get_file'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 151 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2483 "MediaDataRepresentation.c" +#line 2499 "MediaDataRepresentation.c" } @@ -2490,7 +2506,7 @@ GFile* media_source_get_file (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 151 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_file (self); -#line 2492 "MediaDataRepresentation.c" +#line 2508 "MediaDataRepresentation.c" } @@ -2499,7 +2515,7 @@ static GFile* media_source_real_get_master_file (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_get_master_file'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 152 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2501 "MediaDataRepresentation.c" +#line 2517 "MediaDataRepresentation.c" } @@ -2508,7 +2524,7 @@ GFile* media_source_get_master_file (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 152 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_master_file (self); -#line 2510 "MediaDataRepresentation.c" +#line 2526 "MediaDataRepresentation.c" } @@ -2518,7 +2534,7 @@ static guint64 media_source_real_get_master_filesize (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_get_master_filesize'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2520 "MediaDataRepresentation.c" +#line 2536 "MediaDataRepresentation.c" } @@ -2527,7 +2543,7 @@ guint64 media_source_get_master_filesize (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0ULL); #line 153 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_master_filesize (self); -#line 2529 "MediaDataRepresentation.c" +#line 2545 "MediaDataRepresentation.c" } @@ -2537,7 +2553,7 @@ static guint64 media_source_real_get_filesize (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_get_filesize'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2539 "MediaDataRepresentation.c" +#line 2555 "MediaDataRepresentation.c" } @@ -2546,7 +2562,7 @@ guint64 media_source_get_filesize (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0ULL); #line 154 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_filesize (self); -#line 2548 "MediaDataRepresentation.c" +#line 2564 "MediaDataRepresentation.c" } @@ -2556,7 +2572,7 @@ static time_t media_source_real_get_timestamp (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_get_timestamp'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2558 "MediaDataRepresentation.c" +#line 2574 "MediaDataRepresentation.c" } @@ -2565,7 +2581,7 @@ time_t media_source_get_timestamp (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0); #line 155 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_timestamp (self); -#line 2567 "MediaDataRepresentation.c" +#line 2583 "MediaDataRepresentation.c" } @@ -2574,7 +2590,7 @@ static BackingFileState** media_source_real_get_backing_files_state (MediaSource g_critical ("Type `%s' does not implement abstract method `media_source_get_backing_files_state'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 158 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2576 "MediaDataRepresentation.c" +#line 2592 "MediaDataRepresentation.c" } @@ -2583,7 +2599,7 @@ BackingFileState** media_source_get_backing_files_state (MediaSource* self, int* g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 158 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_backing_files_state (self, result_length1); -#line 2585 "MediaDataRepresentation.c" +#line 2601 "MediaDataRepresentation.c" } @@ -2592,7 +2608,7 @@ static gchar* media_source_real_get_title (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_get_title'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2594 "MediaDataRepresentation.c" +#line 2610 "MediaDataRepresentation.c" } @@ -2601,7 +2617,7 @@ gchar* media_source_get_title (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 160 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_title (self); -#line 2603 "MediaDataRepresentation.c" +#line 2619 "MediaDataRepresentation.c" } @@ -2610,7 +2626,7 @@ static gchar* media_source_real_get_comment (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_get_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 161 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2612 "MediaDataRepresentation.c" +#line 2628 "MediaDataRepresentation.c" } @@ -2619,7 +2635,7 @@ gchar* media_source_get_comment (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 161 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_comment (self); -#line 2621 "MediaDataRepresentation.c" +#line 2637 "MediaDataRepresentation.c" } @@ -2628,7 +2644,7 @@ static void media_source_real_set_title (MediaSource* self, const gchar* title) g_critical ("Type `%s' does not implement abstract method `media_source_set_title'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2630 "MediaDataRepresentation.c" +#line 2646 "MediaDataRepresentation.c" } @@ -2637,7 +2653,7 @@ void media_source_set_title (MediaSource* self, const gchar* title) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 162 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->set_title (self, title); -#line 2639 "MediaDataRepresentation.c" +#line 2655 "MediaDataRepresentation.c" } @@ -2647,7 +2663,7 @@ static gboolean media_source_real_set_comment (MediaSource* self, const gchar* c g_critical ("Type `%s' does not implement abstract method `media_source_set_comment'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2649 "MediaDataRepresentation.c" +#line 2665 "MediaDataRepresentation.c" } @@ -2656,14 +2672,14 @@ gboolean media_source_set_comment (MediaSource* self, const gchar* comment) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); #line 163 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->set_comment (self, comment); -#line 2658 "MediaDataRepresentation.c" +#line 2674 "MediaDataRepresentation.c" } gchar* media_source_prep_title (const gchar* title) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 166 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = title; #line 166 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2672,14 +2688,14 @@ gchar* media_source_prep_title (const gchar* title) { result = _tmp1_; #line 166 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2674 "MediaDataRepresentation.c" +#line 2690 "MediaDataRepresentation.c" } gchar* media_source_prep_comment (const gchar* comment) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 171 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = comment; #line 171 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2688,7 +2704,7 @@ gchar* media_source_prep_comment (const gchar* comment) { result = _tmp1_; #line 171 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2690 "MediaDataRepresentation.c" +#line 2706 "MediaDataRepresentation.c" } @@ -2697,7 +2713,7 @@ static Rating media_source_real_get_rating (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_get_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 175 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return 0; -#line 2699 "MediaDataRepresentation.c" +#line 2715 "MediaDataRepresentation.c" } @@ -2706,7 +2722,7 @@ Rating media_source_get_rating (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0); #line 175 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_rating (self); -#line 2708 "MediaDataRepresentation.c" +#line 2724 "MediaDataRepresentation.c" } @@ -2715,7 +2731,7 @@ static void media_source_real_set_rating (MediaSource* self, Rating rating) { g_critical ("Type `%s' does not implement abstract method `media_source_set_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 176 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2717 "MediaDataRepresentation.c" +#line 2733 "MediaDataRepresentation.c" } @@ -2724,7 +2740,7 @@ void media_source_set_rating (MediaSource* self, Rating rating) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 176 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->set_rating (self, rating); -#line 2726 "MediaDataRepresentation.c" +#line 2742 "MediaDataRepresentation.c" } @@ -2733,7 +2749,7 @@ static void media_source_real_increase_rating (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_increase_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2735 "MediaDataRepresentation.c" +#line 2751 "MediaDataRepresentation.c" } @@ -2742,7 +2758,7 @@ void media_source_increase_rating (MediaSource* self) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 177 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->increase_rating (self); -#line 2744 "MediaDataRepresentation.c" +#line 2760 "MediaDataRepresentation.c" } @@ -2751,7 +2767,7 @@ static void media_source_real_decrease_rating (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_decrease_rating'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2753 "MediaDataRepresentation.c" +#line 2769 "MediaDataRepresentation.c" } @@ -2760,7 +2776,7 @@ void media_source_decrease_rating (MediaSource* self) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 178 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->decrease_rating (self); -#line 2762 "MediaDataRepresentation.c" +#line 2778 "MediaDataRepresentation.c" } @@ -2769,7 +2785,7 @@ static void media_source_real_get_dimensions (MediaSource* self, PhotoException g_critical ("Type `%s' does not implement abstract method `media_source_get_dimensions'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2771 "MediaDataRepresentation.c" +#line 2787 "MediaDataRepresentation.c" } @@ -2778,7 +2794,7 @@ void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_s g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 180 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->get_dimensions (self, disallowed_steps, result); -#line 2780 "MediaDataRepresentation.c" +#line 2796 "MediaDataRepresentation.c" } @@ -2787,7 +2803,7 @@ static GdkPixbuf* media_source_real_get_preview_pixbuf (MediaSource* self, Scali g_critical ("Type `%s' does not implement abstract method `media_source_get_preview_pixbuf'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 188 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2789 "MediaDataRepresentation.c" +#line 2805 "MediaDataRepresentation.c" } @@ -2796,7 +2812,7 @@ GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, Scaling* scaling, g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 188 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_preview_pixbuf (self, scaling, error); -#line 2798 "MediaDataRepresentation.c" +#line 2814 "MediaDataRepresentation.c" } @@ -2806,7 +2822,7 @@ static gboolean media_source_real_is_trashed (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_is_trashed'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2808 "MediaDataRepresentation.c" +#line 2824 "MediaDataRepresentation.c" } @@ -2815,7 +2831,7 @@ gboolean media_source_is_trashed (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); #line 190 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->is_trashed (self); -#line 2817 "MediaDataRepresentation.c" +#line 2833 "MediaDataRepresentation.c" } @@ -2824,7 +2840,7 @@ static void media_source_real_trash (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_trash'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 191 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2826 "MediaDataRepresentation.c" +#line 2842 "MediaDataRepresentation.c" } @@ -2833,7 +2849,7 @@ void media_source_trash (MediaSource* self) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 191 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->trash (self); -#line 2835 "MediaDataRepresentation.c" +#line 2851 "MediaDataRepresentation.c" } @@ -2842,7 +2858,7 @@ static void media_source_real_untrash (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_untrash'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2844 "MediaDataRepresentation.c" +#line 2860 "MediaDataRepresentation.c" } @@ -2851,7 +2867,7 @@ void media_source_untrash (MediaSource* self) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 192 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->untrash (self); -#line 2853 "MediaDataRepresentation.c" +#line 2869 "MediaDataRepresentation.c" } @@ -2861,7 +2877,7 @@ static gboolean media_source_real_is_offline (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_is_offline'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 2863 "MediaDataRepresentation.c" +#line 2879 "MediaDataRepresentation.c" } @@ -2870,7 +2886,7 @@ gboolean media_source_is_offline (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); #line 194 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->is_offline (self); -#line 2872 "MediaDataRepresentation.c" +#line 2888 "MediaDataRepresentation.c" } @@ -2879,7 +2895,7 @@ static void media_source_real_mark_offline (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_mark_offline'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 195 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2881 "MediaDataRepresentation.c" +#line 2897 "MediaDataRepresentation.c" } @@ -2888,7 +2904,7 @@ void media_source_mark_offline (MediaSource* self) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 195 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->mark_offline (self); -#line 2890 "MediaDataRepresentation.c" +#line 2906 "MediaDataRepresentation.c" } @@ -2897,7 +2913,7 @@ static void media_source_real_mark_online (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_mark_online'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2899 "MediaDataRepresentation.c" +#line 2915 "MediaDataRepresentation.c" } @@ -2906,7 +2922,7 @@ void media_source_mark_online (MediaSource* self) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 196 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->mark_online (self); -#line 2908 "MediaDataRepresentation.c" +#line 2924 "MediaDataRepresentation.c" } @@ -2915,7 +2931,7 @@ static gchar* media_source_real_get_master_md5 (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_get_master_md5'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 2917 "MediaDataRepresentation.c" +#line 2933 "MediaDataRepresentation.c" } @@ -2924,7 +2940,7 @@ gchar* media_source_get_master_md5 (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 198 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_master_md5 (self); -#line 2926 "MediaDataRepresentation.c" +#line 2942 "MediaDataRepresentation.c" } @@ -2933,7 +2949,7 @@ static void media_source_real_get_event_id (MediaSource* self, EventID* result) g_critical ("Type `%s' does not implement abstract method `media_source_get_event_id'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 202 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 2935 "MediaDataRepresentation.c" +#line 2951 "MediaDataRepresentation.c" } @@ -2942,30 +2958,30 @@ void media_source_get_event_id (MediaSource* self, EventID* result) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 202 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->get_event_id (self, result); -#line 2944 "MediaDataRepresentation.c" +#line 2960 "MediaDataRepresentation.c" } Event* media_source_get_event (MediaSource* self) { Event* result = NULL; - Event* _tmp0_ = NULL; + Event* _tmp0_; EventID event_id = {0}; EventID _tmp3_ = {0}; - gboolean _tmp4_ = FALSE; - EventSourceCollection* _tmp5_ = NULL; - EventID _tmp6_ = {0}; - Event* _tmp7_ = NULL; - Event* _tmp8_ = NULL; - Event* _tmp9_ = NULL; + gboolean _tmp4_; + EventSourceCollection* _tmp5_; + EventID _tmp6_; + Event* _tmp7_; + Event* _tmp8_; + Event* _tmp9_; #line 204 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), NULL); #line 205 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->event; #line 205 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp0_ != NULL) { -#line 2965 "MediaDataRepresentation.c" - Event* _tmp1_ = NULL; - Event* _tmp2_ = NULL; +#line 2981 "MediaDataRepresentation.c" + Event* _tmp1_; + Event* _tmp2_; #line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = self->priv->event; #line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -2974,7 +2990,7 @@ Event* media_source_get_event (MediaSource* self) { result = _tmp2_; #line 206 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2976 "MediaDataRepresentation.c" +#line 2992 "MediaDataRepresentation.c" } #line 208 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_get_event_id (self, &_tmp3_); @@ -2988,7 +3004,7 @@ Event* media_source_get_event (MediaSource* self) { result = NULL; #line 210 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 2990 "MediaDataRepresentation.c" +#line 3006 "MediaDataRepresentation.c" } #line 212 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = event_global; @@ -3008,23 +3024,23 @@ Event* media_source_get_event (MediaSource* self) { result = _tmp9_; #line 214 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3010 "MediaDataRepresentation.c" +#line 3026 "MediaDataRepresentation.c" } gboolean media_source_set_event (MediaSource* self, Event* new_event) { gboolean result = FALSE; EventID _tmp0_ = {0}; - Event* _tmp1_ = NULL; + Event* _tmp1_; EventID event_id = {0}; EventID _tmp4_ = {0}; - gint64 _tmp5_ = 0LL; - EventID _tmp6_ = {0}; - gint64 _tmp7_ = 0LL; + gint64 _tmp5_; + EventID _tmp6_; + gint64 _tmp7_; gboolean committed = FALSE; - EventID _tmp8_ = {0}; - gboolean _tmp9_ = FALSE; - gboolean _tmp10_ = FALSE; + EventID _tmp8_; + gboolean _tmp9_; + gboolean _tmp10_; #line 217 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (self), FALSE); #line 217 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3033,8 +3049,8 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) { _tmp1_ = new_event; #line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp1_ != NULL) { -#line 3035 "MediaDataRepresentation.c" - Event* _tmp2_ = NULL; +#line 3051 "MediaDataRepresentation.c" + Event* _tmp2_; EventID _tmp3_ = {0}; #line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = new_event; @@ -3042,11 +3058,11 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) { event_get_event_id (_tmp2_, &_tmp3_); #line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = _tmp3_; -#line 3044 "MediaDataRepresentation.c" +#line 3060 "MediaDataRepresentation.c" } else { #line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_id_init (&_tmp0_, EVENT_ID_INVALID); -#line 3048 "MediaDataRepresentation.c" +#line 3064 "MediaDataRepresentation.c" } #line 218 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_id = _tmp0_; @@ -3064,7 +3080,7 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) { result = TRUE; #line 220 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3066 "MediaDataRepresentation.c" +#line 3082 "MediaDataRepresentation.c" } #line 222 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = event_id; @@ -3076,36 +3092,36 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) { _tmp10_ = committed; #line 223 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp10_) { -#line 3078 "MediaDataRepresentation.c" - Event* _tmp11_ = NULL; - Event* _tmp13_ = NULL; - Event* _tmp15_ = NULL; - Event* _tmp16_ = NULL; - Alteration* _tmp17_ = NULL; - Alteration* _tmp18_ = NULL; +#line 3094 "MediaDataRepresentation.c" + Event* _tmp11_; + Event* _tmp13_; + Event* _tmp15_; + Event* _tmp16_; + Alteration* _tmp17_; + Alteration* _tmp18_; #line 224 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = self->priv->event; #line 224 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp11_ != NULL) { -#line 3089 "MediaDataRepresentation.c" - Event* _tmp12_ = NULL; +#line 3105 "MediaDataRepresentation.c" + Event* _tmp12_; #line 225 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = self->priv->event; #line 225 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_detach (_tmp12_, self); -#line 3095 "MediaDataRepresentation.c" +#line 3111 "MediaDataRepresentation.c" } #line 227 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = new_event; #line 227 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp13_ != NULL) { -#line 3101 "MediaDataRepresentation.c" - Event* _tmp14_ = NULL; +#line 3117 "MediaDataRepresentation.c" + Event* _tmp14_; #line 228 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp14_ = new_event; #line 228 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_attach (_tmp14_, self); -#line 3107 "MediaDataRepresentation.c" +#line 3123 "MediaDataRepresentation.c" } #line 230 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = new_event; @@ -3123,25 +3139,25 @@ gboolean media_source_set_event (MediaSource* self, Event* new_event) { data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_); #line 232 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _alteration_unref0 (_tmp18_); -#line 3125 "MediaDataRepresentation.c" +#line 3141 "MediaDataRepresentation.c" } #line 235 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = committed; #line 235 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3131 "MediaDataRepresentation.c" +#line 3147 "MediaDataRepresentation.c" } void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, TransactionController* controller, GError** error) { EventID _tmp0_ = {0}; - Event* _tmp1_ = NULL; + Event* _tmp1_; EventID event_id = {0}; - TransactionController* _tmp4_ = NULL; - Event* _tmp21_ = NULL; + TransactionController* _tmp4_; + Event* _tmp21_; Alteration* alteration = NULL; - Alteration* _tmp24_ = NULL; - TransactionController* _tmp33_ = NULL; + Alteration* _tmp24_; + TransactionController* _tmp33_; #line 238 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media_sources)); #line 238 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3152,8 +3168,8 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, _tmp1_ = event; #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp1_ != NULL) { -#line 3154 "MediaDataRepresentation.c" - Event* _tmp2_ = NULL; +#line 3170 "MediaDataRepresentation.c" + Event* _tmp2_; EventID _tmp3_ = {0}; #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = event; @@ -3161,11 +3177,11 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, event_get_event_id (_tmp2_, &_tmp3_); #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = _tmp3_; -#line 3163 "MediaDataRepresentation.c" +#line 3179 "MediaDataRepresentation.c" } else { #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_id_init (&_tmp0_, EVENT_ID_INVALID); -#line 3167 "MediaDataRepresentation.c" +#line 3183 "MediaDataRepresentation.c" } #line 240 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_id = _tmp0_; @@ -3173,11 +3189,11 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, _tmp4_ = controller; #line 242 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" transaction_controller_begin (_tmp4_); -#line 3175 "MediaDataRepresentation.c" +#line 3191 "MediaDataRepresentation.c" { GeeIterator* _media_it = NULL; - GeeCollection* _tmp5_ = NULL; - GeeIterator* _tmp6_ = NULL; + GeeCollection* _tmp5_; + GeeIterator* _tmp6_; #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = media_sources; #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3186,21 +3202,21 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, _media_it = _tmp6_; #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3188 "MediaDataRepresentation.c" - GeeIterator* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; +#line 3204 "MediaDataRepresentation.c" + GeeIterator* _tmp7_; + gboolean _tmp8_; MediaSource* media = NULL; - GeeIterator* _tmp9_ = NULL; - gpointer _tmp10_ = NULL; + GeeIterator* _tmp9_; + gpointer _tmp10_; Event* old_event = NULL; - MediaSource* _tmp11_ = NULL; - Event* _tmp12_ = NULL; - Event* _tmp13_ = NULL; - MediaSource* _tmp16_ = NULL; - EventID _tmp17_ = {0}; - MediaSource* _tmp18_ = NULL; - Event* _tmp19_ = NULL; - Event* _tmp20_ = NULL; + MediaSource* _tmp11_; + Event* _tmp12_; + Event* _tmp13_; + MediaSource* _tmp16_; + EventID _tmp17_; + MediaSource* _tmp18_; + Event* _tmp19_; + Event* _tmp20_; #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = _media_it; #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3209,7 +3225,7 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, if (!_tmp8_) { #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3211 "MediaDataRepresentation.c" +#line 3227 "MediaDataRepresentation.c" } #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = _media_it; @@ -3227,16 +3243,16 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, _tmp13_ = old_event; #line 246 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp13_ != NULL) { -#line 3229 "MediaDataRepresentation.c" - Event* _tmp14_ = NULL; - MediaSource* _tmp15_ = NULL; +#line 3245 "MediaDataRepresentation.c" + Event* _tmp14_; + MediaSource* _tmp15_; #line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp14_ = old_event; #line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = media; #line 247 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_detach (_tmp14_, _tmp15_); -#line 3238 "MediaDataRepresentation.c" +#line 3254 "MediaDataRepresentation.c" } #line 249 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = media; @@ -3258,36 +3274,36 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, _g_object_unref0 (old_event); #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (media); -#line 3260 "MediaDataRepresentation.c" +#line 3276 "MediaDataRepresentation.c" } #line 244 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_media_it); -#line 3264 "MediaDataRepresentation.c" +#line 3280 "MediaDataRepresentation.c" } #line 253 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp21_ = event; #line 253 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp21_ != NULL) { -#line 3270 "MediaDataRepresentation.c" - Event* _tmp22_ = NULL; - GeeCollection* _tmp23_ = NULL; +#line 3286 "MediaDataRepresentation.c" + Event* _tmp22_; + GeeCollection* _tmp23_; #line 254 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp22_ = event; #line 254 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp23_ = media_sources; #line 254 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" event_attach_many (_tmp22_, _tmp23_); -#line 3279 "MediaDataRepresentation.c" +#line 3295 "MediaDataRepresentation.c" } #line 256 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp24_ = alteration_new ("metadata", "event"); #line 256 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" alteration = _tmp24_; -#line 3285 "MediaDataRepresentation.c" +#line 3301 "MediaDataRepresentation.c" { GeeIterator* _media_it = NULL; - GeeCollection* _tmp25_ = NULL; - GeeIterator* _tmp26_ = NULL; + GeeCollection* _tmp25_; + GeeIterator* _tmp26_; #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp25_ = media_sources; #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3296,14 +3312,14 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, _media_it = _tmp26_; #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3298 "MediaDataRepresentation.c" - GeeIterator* _tmp27_ = NULL; - gboolean _tmp28_ = FALSE; +#line 3314 "MediaDataRepresentation.c" + GeeIterator* _tmp27_; + gboolean _tmp28_; MediaSource* media = NULL; - GeeIterator* _tmp29_ = NULL; - gpointer _tmp30_ = NULL; - MediaSource* _tmp31_ = NULL; - Alteration* _tmp32_ = NULL; + GeeIterator* _tmp29_; + gpointer _tmp30_; + MediaSource* _tmp31_; + Alteration* _tmp32_; #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp27_ = _media_it; #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3312,7 +3328,7 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, if (!_tmp28_) { #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3314 "MediaDataRepresentation.c" +#line 3330 "MediaDataRepresentation.c" } #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp29_ = _media_it; @@ -3328,11 +3344,11 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_OBJECT, DataObject), _tmp32_); #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (media); -#line 3330 "MediaDataRepresentation.c" +#line 3346 "MediaDataRepresentation.c" } #line 257 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_media_it); -#line 3334 "MediaDataRepresentation.c" +#line 3350 "MediaDataRepresentation.c" } #line 260 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp33_ = controller; @@ -3340,7 +3356,7 @@ void media_source_set_many_to_event (GeeCollection* media_sources, Event* event, transaction_controller_commit (_tmp33_); #line 238 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _alteration_unref0 (alteration); -#line 3342 "MediaDataRepresentation.c" +#line 3358 "MediaDataRepresentation.c" } @@ -3350,7 +3366,7 @@ static time_t media_source_real_get_exposure_time (MediaSource* self) { g_critical ("Type `%s' does not implement abstract method `media_source_get_exposure_time'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 263 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 3352 "MediaDataRepresentation.c" +#line 3368 "MediaDataRepresentation.c" } @@ -3359,7 +3375,7 @@ time_t media_source_get_exposure_time (MediaSource* self) { g_return_val_if_fail (IS_MEDIA_SOURCE (self), 0); #line 263 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_GET_CLASS (self)->get_exposure_time (self); -#line 3361 "MediaDataRepresentation.c" +#line 3377 "MediaDataRepresentation.c" } @@ -3368,7 +3384,7 @@ static void media_source_real_get_import_id (MediaSource* self, ImportID* result g_critical ("Type `%s' does not implement abstract method `media_source_get_import_id'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 3370 "MediaDataRepresentation.c" +#line 3386 "MediaDataRepresentation.c" } @@ -3377,7 +3393,7 @@ void media_source_get_import_id (MediaSource* self, ImportID* result) { g_return_if_fail (IS_MEDIA_SOURCE (self)); #line 265 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_GET_CLASS (self)->get_import_id (self, result); -#line 3379 "MediaDataRepresentation.c" +#line 3395 "MediaDataRepresentation.c" } @@ -3386,7 +3402,7 @@ static void media_source_real_master_replaced (MediaSource* self, GFile* old_fil g_return_if_fail (G_IS_FILE (old_file)); #line 33 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_IS_FILE (new_file)); -#line 3388 "MediaDataRepresentation.c" +#line 3404 "MediaDataRepresentation.c" } @@ -3405,19 +3421,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa data1 = closure->data; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data2 = param_values->data[0].v_pointer; -#line 3407 "MediaDataRepresentation.c" +#line 3423 "MediaDataRepresentation.c" } else { #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data1 = param_values->data[0].v_pointer; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data2 = closure->data; -#line 3413 "MediaDataRepresentation.c" +#line 3429 "MediaDataRepresentation.c" } #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2); -#line 3419 "MediaDataRepresentation.c" +#line 3435 "MediaDataRepresentation.c" } @@ -3427,76 +3443,76 @@ static void media_source_class_init (MediaSourceClass * klass) { #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_class_add_private (klass, sizeof (MediaSourcePrivate)); #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->notify_master_replaced = (void (*)(MediaSource*, GFile*, GFile*)) media_source_real_notify_master_replaced; + ((MediaSourceClass *) klass)->notify_master_replaced = (void (*) (MediaSource *, GFile*, GFile*)) media_source_real_notify_master_replaced; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) media_source_real_notify_altered; + ((DataObjectClass *) klass)->notify_altered = (void (*) (DataObject *, Alteration*)) media_source_real_notify_altered; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((DataObjectClass *) klass)->notify_membership_changed = (void (*)(DataObject*, DataCollection*)) media_source_real_notify_membership_changed; + ((DataObjectClass *) klass)->notify_membership_changed = (void (*) (DataObject *, DataCollection*)) media_source_real_notify_membership_changed; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->set_event_id = (gboolean (*)(MediaSource*, EventID*)) media_source_real_set_event_id; + ((MediaSourceClass *) klass)->set_event_id = (gboolean (*) (MediaSource *, EventID*)) media_source_real_set_event_id; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((DataObjectClass *) klass)->get_name = (gchar* (*)(DataObject*)) media_source_real_get_name; + ((DataObjectClass *) klass)->get_name = (gchar* (*) (DataObject *)) media_source_real_get_name; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_basename = (gchar* (*)(MediaSource*)) media_source_real_get_basename; + ((MediaSourceClass *) klass)->get_basename = (gchar* (*) (MediaSource *)) media_source_real_get_basename; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_file = (GFile* (*)(MediaSource*)) media_source_real_get_file; + ((MediaSourceClass *) klass)->get_file = (GFile* (*) (MediaSource *)) media_source_real_get_file; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_master_file = (GFile* (*)(MediaSource*)) media_source_real_get_master_file; + ((MediaSourceClass *) klass)->get_master_file = (GFile* (*) (MediaSource *)) media_source_real_get_master_file; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_master_filesize = (guint64 (*)(MediaSource*)) media_source_real_get_master_filesize; + ((MediaSourceClass *) klass)->get_master_filesize = (guint64 (*) (MediaSource *)) media_source_real_get_master_filesize; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_filesize = (guint64 (*)(MediaSource*)) media_source_real_get_filesize; + ((MediaSourceClass *) klass)->get_filesize = (guint64 (*) (MediaSource *)) media_source_real_get_filesize; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_timestamp = (time_t (*)(MediaSource*)) media_source_real_get_timestamp; + ((MediaSourceClass *) klass)->get_timestamp = (time_t (*) (MediaSource *)) media_source_real_get_timestamp; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_backing_files_state = (BackingFileState** (*)(MediaSource*, int*)) media_source_real_get_backing_files_state; + ((MediaSourceClass *) klass)->get_backing_files_state = (BackingFileState** (*) (MediaSource *, int*)) media_source_real_get_backing_files_state; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_title = (gchar* (*)(MediaSource*)) media_source_real_get_title; + ((MediaSourceClass *) klass)->get_title = (gchar* (*) (MediaSource *)) media_source_real_get_title; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_comment = (gchar* (*)(MediaSource*)) media_source_real_get_comment; + ((MediaSourceClass *) klass)->get_comment = (gchar* (*) (MediaSource *)) media_source_real_get_comment; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->set_title = (void (*)(MediaSource*, const gchar*)) media_source_real_set_title; + ((MediaSourceClass *) klass)->set_title = (void (*) (MediaSource *, const gchar*)) media_source_real_set_title; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->set_comment = (gboolean (*)(MediaSource*, const gchar*)) media_source_real_set_comment; + ((MediaSourceClass *) klass)->set_comment = (gboolean (*) (MediaSource *, const gchar*)) media_source_real_set_comment; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_rating = (Rating (*)(MediaSource*)) media_source_real_get_rating; + ((MediaSourceClass *) klass)->get_rating = (Rating (*) (MediaSource *)) media_source_real_get_rating; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->set_rating = (void (*)(MediaSource*, Rating)) media_source_real_set_rating; + ((MediaSourceClass *) klass)->set_rating = (void (*) (MediaSource *, Rating)) media_source_real_set_rating; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->increase_rating = (void (*)(MediaSource*)) media_source_real_increase_rating; + ((MediaSourceClass *) klass)->increase_rating = (void (*) (MediaSource *)) media_source_real_increase_rating; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->decrease_rating = (void (*)(MediaSource*)) media_source_real_decrease_rating; + ((MediaSourceClass *) klass)->decrease_rating = (void (*) (MediaSource *)) media_source_real_decrease_rating; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_dimensions = (void (*)(MediaSource*, PhotoException, Dimensions*)) media_source_real_get_dimensions; + ((MediaSourceClass *) klass)->get_dimensions = (void (*) (MediaSource *, PhotoException, Dimensions*)) media_source_real_get_dimensions; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*)(MediaSource*, Scaling*, GError**)) media_source_real_get_preview_pixbuf; + ((MediaSourceClass *) klass)->get_preview_pixbuf = (GdkPixbuf* (*) (MediaSource *, Scaling*, GError**)) media_source_real_get_preview_pixbuf; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->is_trashed = (gboolean (*)(MediaSource*)) media_source_real_is_trashed; + ((MediaSourceClass *) klass)->is_trashed = (gboolean (*) (MediaSource *)) media_source_real_is_trashed; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->trash = (void (*)(MediaSource*)) media_source_real_trash; + ((MediaSourceClass *) klass)->trash = (void (*) (MediaSource *)) media_source_real_trash; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->untrash = (void (*)(MediaSource*)) media_source_real_untrash; + ((MediaSourceClass *) klass)->untrash = (void (*) (MediaSource *)) media_source_real_untrash; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->is_offline = (gboolean (*)(MediaSource*)) media_source_real_is_offline; + ((MediaSourceClass *) klass)->is_offline = (gboolean (*) (MediaSource *)) media_source_real_is_offline; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->mark_offline = (void (*)(MediaSource*)) media_source_real_mark_offline; + ((MediaSourceClass *) klass)->mark_offline = (void (*) (MediaSource *)) media_source_real_mark_offline; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->mark_online = (void (*)(MediaSource*)) media_source_real_mark_online; + ((MediaSourceClass *) klass)->mark_online = (void (*) (MediaSource *)) media_source_real_mark_online; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_master_md5 = (gchar* (*)(MediaSource*)) media_source_real_get_master_md5; + ((MediaSourceClass *) klass)->get_master_md5 = (gchar* (*) (MediaSource *)) media_source_real_get_master_md5; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_event_id = (void (*)(MediaSource*, EventID*)) media_source_real_get_event_id; + ((MediaSourceClass *) klass)->get_event_id = (void (*) (MediaSource *, EventID*)) media_source_real_get_event_id; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_exposure_time = (time_t (*)(MediaSource*)) media_source_real_get_exposure_time; + ((MediaSourceClass *) klass)->get_exposure_time = (time_t (*) (MediaSource *)) media_source_real_get_exposure_time; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceClass *) klass)->get_import_id = (void (*)(MediaSource*, ImportID*)) media_source_real_get_import_id; + ((MediaSourceClass *) klass)->get_import_id = (void (*) (MediaSource *, ImportID*)) media_source_real_get_import_id; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaSourceClass *) klass)->master_replaced = media_source_real_master_replaced; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" G_OBJECT_CLASS (klass)->finalize = media_source_finalize; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_new ("master_replaced", TYPE_MEDIA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceClass, master_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_get_type ()); -#line 3498 "MediaDataRepresentation.c" + media_source_signals[MEDIA_SOURCE_MASTER_REPLACED_SIGNAL] = g_signal_new ("master-replaced", TYPE_MEDIA_SOURCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceClass, master_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, g_file_get_type (), g_file_get_type ()); +#line 3514 "MediaDataRepresentation.c" } @@ -3504,8 +3520,8 @@ static void media_source_indexable_interface_init (IndexableIface * iface) { #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_indexable_parent_iface = g_type_interface_peek_parent (iface); #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - iface->get_indexable_keywords = (const gchar* (*)(Indexable*)) media_source_real_get_indexable_keywords; -#line 3507 "MediaDataRepresentation.c" + iface->get_indexable_keywords = (const gchar* (*) (Indexable *)) media_source_real_get_indexable_keywords; +#line 3523 "MediaDataRepresentation.c" } @@ -3516,11 +3532,11 @@ static void media_source_instance_init (MediaSource * self) { self->priv->event = NULL; #line 37 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->indexable_keywords = NULL; -#line 3518 "MediaDataRepresentation.c" +#line 3534 "MediaDataRepresentation.c" } -static void media_source_finalize (GObject* obj) { +static void media_source_finalize (GObject * obj) { MediaSource * self; #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE, MediaSource); @@ -3530,7 +3546,7 @@ static void media_source_finalize (GObject* obj) { _g_free0 (self->priv->indexable_keywords); #line 32 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" G_OBJECT_CLASS (media_source_parent_class)->finalize (obj); -#line 3532 "MediaDataRepresentation.c" +#line 3548 "MediaDataRepresentation.c" } @@ -3553,7 +3569,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { result = file_hash ((GFile*) v); #line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3555 "MediaDataRepresentation.c" +#line 3571 "MediaDataRepresentation.c" } @@ -3562,17 +3578,17 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer result = file_equal ((GFile*) a, (GFile*) b); #line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3564 "MediaDataRepresentation.c" +#line 3580 "MediaDataRepresentation.c" } MediaSourceHoldingTank* media_source_holding_tank_construct (GType object_type, MediaSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) { MediaSourceHoldingTank* self = NULL; - MediaSourceCollection* _tmp0_ = NULL; - SourceHoldingTankCheckToKeep _tmp1_ = NULL; - void* _tmp1__target = NULL; - GetSourceDatabaseKey _tmp2_ = NULL; - void* _tmp2__target = NULL; + MediaSourceCollection* _tmp0_; + SourceHoldingTankCheckToKeep _tmp1_; + void* _tmp1__target; + GetSourceDatabaseKey _tmp2_; + void* _tmp2__target; #line 272 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (sources), NULL); #line 274 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3589,22 +3605,22 @@ MediaSourceHoldingTank* media_source_holding_tank_construct (GType object_type, self = (MediaSourceHoldingTank*) database_source_holding_tank_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp1_, _tmp1__target, _tmp2_, _tmp2__target); #line 272 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 3591 "MediaDataRepresentation.c" +#line 3607 "MediaDataRepresentation.c" } MediaSourceHoldingTank* media_source_holding_tank_new (MediaSourceCollection* sources, SourceHoldingTankCheckToKeep check_to_keep, void* check_to_keep_target, GetSourceDatabaseKey get_key, void* get_key_target) { #line 272 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return media_source_holding_tank_construct (TYPE_MEDIA_SOURCE_HOLDING_TANK, sources, check_to_keep, check_to_keep_target, get_key, get_key_target); -#line 3598 "MediaDataRepresentation.c" +#line 3614 "MediaDataRepresentation.c" } MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingTank* self, GFile* file) { MediaSource* result = NULL; - GeeHashMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + GFile* _tmp1_; + gpointer _tmp2_; #line 277 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_HOLDING_TANK (self), NULL); #line 277 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3619,7 +3635,7 @@ MediaSource* media_source_holding_tank_fetch_by_master_file (MediaSourceHoldingT result = (MediaSource*) _tmp2_; #line 278 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3621 "MediaDataRepresentation.c" +#line 3637 "MediaDataRepresentation.c" } @@ -3629,15 +3645,15 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel g_return_val_if_fail (IS_MEDIA_SOURCE_HOLDING_TANK (self), NULL); #line 281 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (md5 != NULL, NULL); -#line 3631 "MediaDataRepresentation.c" +#line 3647 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; - GeeHashMap* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + GeeHashMap* _tmp0_; + GeeCollection* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->master_file_map; #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3656,17 +3672,17 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel _source_it = _tmp5_; #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3658 "MediaDataRepresentation.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 3674 "MediaDataRepresentation.c" + GeeIterator* _tmp6_; + gboolean _tmp7_; MediaSource* source = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - MediaSource* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - gboolean _tmp14_ = FALSE; + GeeIterator* _tmp8_; + gpointer _tmp9_; + MediaSource* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + const gchar* _tmp13_; + gboolean _tmp14_; #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _source_it; #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3675,7 +3691,7 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel if (!_tmp7_) { #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3677 "MediaDataRepresentation.c" +#line 3693 "MediaDataRepresentation.c" } #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = _source_it; @@ -3703,37 +3719,37 @@ MediaSource* media_source_holding_tank_fetch_by_md5 (MediaSourceHoldingTank* sel _g_object_unref0 (_source_it); #line 284 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3705 "MediaDataRepresentation.c" +#line 3721 "MediaDataRepresentation.c" } #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 3709 "MediaDataRepresentation.c" +#line 3725 "MediaDataRepresentation.c" } #line 282 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 3713 "MediaDataRepresentation.c" +#line 3729 "MediaDataRepresentation.c" } #line 288 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = NULL; #line 288 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 3719 "MediaDataRepresentation.c" +#line 3735 "MediaDataRepresentation.c" } static void _media_source_holding_tank_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self) { #line 297 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_holding_tank_on_master_source_replaced ((MediaSourceHoldingTank*) self, _sender, old_file, new_file); -#line 3726 "MediaDataRepresentation.c" +#line 3742 "MediaDataRepresentation.c" } static void media_source_holding_tank_real_notify_contents_altered (SourceHoldingTank* base, GeeCollection* added, GeeCollection* removed) { MediaSourceHoldingTank * self; - GeeCollection* _tmp0_ = NULL; - GeeCollection* _tmp15_ = NULL; - GeeCollection* _tmp33_ = NULL; - GeeCollection* _tmp34_ = NULL; + GeeCollection* _tmp0_; + GeeCollection* _tmp15_; + GeeCollection* _tmp33_; + GeeCollection* _tmp34_; #line 291 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank); #line 291 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3744,11 +3760,11 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin _tmp0_ = added; #line 293 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp0_ != NULL) { -#line 3746 "MediaDataRepresentation.c" +#line 3762 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = added; #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3757,21 +3773,21 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin _source_it = _tmp2_; #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3759 "MediaDataRepresentation.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 3775 "MediaDataRepresentation.c" + GeeIterator* _tmp3_; + gboolean _tmp4_; DataSource* source = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; MediaSource* media_source = NULL; - DataSource* _tmp7_ = NULL; - MediaSource* _tmp8_ = NULL; - GeeHashMap* _tmp9_ = NULL; - MediaSource* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; - MediaSource* _tmp13_ = NULL; - MediaSource* _tmp14_ = NULL; + DataSource* _tmp7_; + MediaSource* _tmp8_; + GeeHashMap* _tmp9_; + MediaSource* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; + MediaSource* _tmp13_; + MediaSource* _tmp14_; #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _source_it; #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3780,7 +3796,7 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin if (!_tmp4_) { #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3782 "MediaDataRepresentation.c" +#line 3798 "MediaDataRepresentation.c" } #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _source_it; @@ -3816,22 +3832,22 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin _g_object_unref0 (media_source); #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 3818 "MediaDataRepresentation.c" +#line 3834 "MediaDataRepresentation.c" } #line 294 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 3822 "MediaDataRepresentation.c" +#line 3838 "MediaDataRepresentation.c" } } #line 301 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = removed; #line 301 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp15_ != NULL) { -#line 3829 "MediaDataRepresentation.c" +#line 3845 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp16_ = NULL; - GeeIterator* _tmp17_ = NULL; + GeeCollection* _tmp16_; + GeeIterator* _tmp17_; #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = removed; #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3840,25 +3856,25 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin _source_it = _tmp17_; #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 3842 "MediaDataRepresentation.c" - GeeIterator* _tmp18_ = NULL; - gboolean _tmp19_ = FALSE; +#line 3858 "MediaDataRepresentation.c" + GeeIterator* _tmp18_; + gboolean _tmp19_; DataSource* source = NULL; - GeeIterator* _tmp20_ = NULL; - gpointer _tmp21_ = NULL; + GeeIterator* _tmp20_; + gpointer _tmp21_; MediaSource* media_source = NULL; - DataSource* _tmp22_ = NULL; - MediaSource* _tmp23_ = NULL; + DataSource* _tmp22_; + MediaSource* _tmp23_; gboolean is_removed = FALSE; - GeeHashMap* _tmp24_ = NULL; - MediaSource* _tmp25_ = NULL; - GFile* _tmp26_ = NULL; - GFile* _tmp27_ = NULL; - gboolean _tmp28_ = FALSE; - gboolean _tmp29_ = FALSE; - gboolean _tmp30_ = FALSE; - MediaSource* _tmp31_ = NULL; - guint _tmp32_ = 0U; + GeeHashMap* _tmp24_; + MediaSource* _tmp25_; + GFile* _tmp26_; + GFile* _tmp27_; + gboolean _tmp28_; + gboolean _tmp29_; + gboolean _tmp30_; + MediaSource* _tmp31_; + guint _tmp32_; #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp18_ = _source_it; #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3867,7 +3883,7 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin if (!_tmp19_) { #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 3869 "MediaDataRepresentation.c" +#line 3885 "MediaDataRepresentation.c" } #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp20_ = _source_it; @@ -3911,11 +3927,11 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin _g_object_unref0 (media_source); #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 3913 "MediaDataRepresentation.c" +#line 3929 "MediaDataRepresentation.c" } #line 302 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 3917 "MediaDataRepresentation.c" +#line 3933 "MediaDataRepresentation.c" } } #line 310 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3924,18 +3940,18 @@ static void media_source_holding_tank_real_notify_contents_altered (SourceHoldin _tmp34_ = removed; #line 310 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" SOURCE_HOLDING_TANK_CLASS (media_source_holding_tank_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_HOLDING_TANK, DatabaseSourceHoldingTank), TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp33_, _tmp34_); -#line 3926 "MediaDataRepresentation.c" +#line 3942 "MediaDataRepresentation.c" } static void media_source_holding_tank_on_master_source_replaced (MediaSourceHoldingTank* self, MediaSource* media_source, GFile* old_file, GFile* new_file) { gboolean removed = FALSE; - GeeHashMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GeeHashMap* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - MediaSource* _tmp5_ = NULL; + GeeHashMap* _tmp0_; + GFile* _tmp1_; + gboolean _tmp2_; + GeeHashMap* _tmp3_; + GFile* _tmp4_; + MediaSource* _tmp5_; #line 313 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_HOLDING_TANK (self)); #line 313 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -3962,7 +3978,7 @@ static void media_source_holding_tank_on_master_source_replaced (MediaSourceHold _tmp5_ = media_source; #line 317 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, _tmp5_); -#line 3964 "MediaDataRepresentation.c" +#line 3980 "MediaDataRepresentation.c" } @@ -3974,24 +3990,24 @@ static void media_source_holding_tank_class_init (MediaSourceHoldingTankClass * #line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_class_add_private (klass, sizeof (MediaSourceHoldingTankPrivate)); #line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*)(SourceHoldingTank*, GeeCollection*, GeeCollection*)) media_source_holding_tank_real_notify_contents_altered; -#line 3977 "MediaDataRepresentation.c" + ((SourceHoldingTankClass *) klass)->notify_contents_altered = (void (*) (SourceHoldingTank *, GeeCollection*, GeeCollection*)) media_source_holding_tank_real_notify_contents_altered; +#line 3993 "MediaDataRepresentation.c" } static void media_source_holding_tank_instance_init (MediaSourceHoldingTank * self) { - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; #line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv = MEDIA_SOURCE_HOLDING_TANK_GET_PRIVATE (self); #line 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_MEDIA_SOURCE, (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 269 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->master_file_map = _tmp0_; -#line 3989 "MediaDataRepresentation.c" +#line 4005 "MediaDataRepresentation.c" } -static void media_source_holding_tank_finalize (SourceHoldingTank* obj) { +static void media_source_holding_tank_finalize (SourceHoldingTank * obj) { MediaSourceHoldingTank * self; #line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank); @@ -3999,7 +4015,7 @@ static void media_source_holding_tank_finalize (SourceHoldingTank* obj) { _g_object_unref0 (self->priv->master_file_map); #line 268 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" SOURCE_HOLDING_TANK_CLASS (media_source_holding_tank_parent_class)->finalize (obj); -#line 4001 "MediaDataRepresentation.c" +#line 4017 "MediaDataRepresentation.c" } @@ -4018,14 +4034,14 @@ GType media_source_holding_tank_get_type (void) { static gpointer _data_collection_ref0 (gpointer self) { #line 327 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? data_collection_ref (self) : NULL; -#line 4020 "MediaDataRepresentation.c" +#line 4036 "MediaDataRepresentation.c" } MediaSourceTransactionController* media_source_transaction_controller_construct (GType object_type, MediaSourceCollection* sources) { MediaSourceTransactionController* self = NULL; - MediaSourceCollection* _tmp0_ = NULL; - MediaSourceCollection* _tmp1_ = NULL; + MediaSourceCollection* _tmp0_; + MediaSourceCollection* _tmp1_; #line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (sources), NULL); #line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4040,20 +4056,20 @@ MediaSourceTransactionController* media_source_transaction_controller_construct self->priv->sources = _tmp1_; #line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 4042 "MediaDataRepresentation.c" +#line 4058 "MediaDataRepresentation.c" } MediaSourceTransactionController* media_source_transaction_controller_new (MediaSourceCollection* sources) { #line 326 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return media_source_transaction_controller_construct (TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, sources); -#line 4049 "MediaDataRepresentation.c" +#line 4065 "MediaDataRepresentation.c" } static void media_source_transaction_controller_real_begin_impl (TransactionController* base, GError** error) { MediaSourceTransactionController * self; - MediaSourceCollection* _tmp0_ = NULL; + MediaSourceCollection* _tmp0_; #line 330 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, MediaSourceTransactionController); #line 331 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4062,13 +4078,13 @@ static void media_source_transaction_controller_real_begin_impl (TransactionCont _tmp0_ = self->priv->sources; #line 332 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection)); -#line 4064 "MediaDataRepresentation.c" +#line 4080 "MediaDataRepresentation.c" } static void media_source_transaction_controller_real_commit_impl (TransactionController* base, GError** error) { MediaSourceTransactionController * self; - MediaSourceCollection* _tmp0_ = NULL; + MediaSourceCollection* _tmp0_; GError * _inner_error_ = NULL; #line 335 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, MediaSourceTransactionController); @@ -4084,7 +4100,7 @@ static void media_source_transaction_controller_real_commit_impl (TransactionCon g_propagate_error (error, _inner_error_); #line 337 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 4086 "MediaDataRepresentation.c" +#line 4102 "MediaDataRepresentation.c" } } @@ -4097,21 +4113,21 @@ static void media_source_transaction_controller_class_init (MediaSourceTransacti #line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_class_add_private (klass, sizeof (MediaSourceTransactionControllerPrivate)); #line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((TransactionControllerClass *) klass)->begin_impl = (void (*)(TransactionController*, GError**)) media_source_transaction_controller_real_begin_impl; + ((TransactionControllerClass *) klass)->begin_impl = (void (*) (TransactionController *, GError**)) media_source_transaction_controller_real_begin_impl; #line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((TransactionControllerClass *) klass)->commit_impl = (void (*)(TransactionController*, GError**)) media_source_transaction_controller_real_commit_impl; -#line 4102 "MediaDataRepresentation.c" + ((TransactionControllerClass *) klass)->commit_impl = (void (*) (TransactionController *, GError**)) media_source_transaction_controller_real_commit_impl; +#line 4118 "MediaDataRepresentation.c" } static void media_source_transaction_controller_instance_init (MediaSourceTransactionController * self) { #line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv = MEDIA_SOURCE_TRANSACTION_CONTROLLER_GET_PRIVATE (self); -#line 4109 "MediaDataRepresentation.c" +#line 4125 "MediaDataRepresentation.c" } -static void media_source_transaction_controller_finalize (TransactionController* obj) { +static void media_source_transaction_controller_finalize (TransactionController * obj) { MediaSourceTransactionController * self; #line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE_TRANSACTION_CONTROLLER, MediaSourceTransactionController); @@ -4119,7 +4135,7 @@ static void media_source_transaction_controller_finalize (TransactionController* _data_collection_unref0 (self->priv->sources); #line 323 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" TRANSACTION_CONTROLLER_CLASS (media_source_transaction_controller_parent_class)->finalize (obj); -#line 4121 "MediaDataRepresentation.c" +#line 4137 "MediaDataRepresentation.c" } @@ -4140,17 +4156,17 @@ static gint _import_id_compare_func_gcompare_data_func (gconstpointer a, gconstp result = import_id_compare_func ((ImportID*) a, (ImportID*) b); #line 348 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4142 "MediaDataRepresentation.c" +#line 4158 "MediaDataRepresentation.c" } MediaSourceCollection* media_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target) { MediaSourceCollection* self = NULL; - const gchar* _tmp0_ = NULL; - GetSourceDatabaseKey _tmp1_ = NULL; - void* _tmp1__target = NULL; - MediaSourceHoldingTank* _tmp2_ = NULL; - MediaSourceHoldingTank* _tmp3_ = NULL; + const gchar* _tmp0_; + GetSourceDatabaseKey _tmp1_; + void* _tmp1__target; + MediaSourceHoldingTank* _tmp2_; + MediaSourceHoldingTank* _tmp3_; #line 382 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (name != NULL, NULL); #line 383 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4175,7 +4191,7 @@ MediaSourceCollection* media_source_collection_construct (GType object_type, con self->priv->offline_bin = _tmp3_; #line 382 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 4177 "MediaDataRepresentation.c" +#line 4193 "MediaDataRepresentation.c" } @@ -4186,11 +4202,11 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection* g_return_if_fail ((photos == NULL) || GEE_IS_COLLECTION (photos)); #line 389 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((videos == NULL) || GEE_IS_COLLECTION (videos)); -#line 4188 "MediaDataRepresentation.c" +#line 4204 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeCollection* _tmp0_; + GeeIterator* _tmp1_; #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media; #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4199,14 +4215,14 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection* _source_it = _tmp1_; #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 4201 "MediaDataRepresentation.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 4217 "MediaDataRepresentation.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; MediaSource* source = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; gboolean _tmp6_ = FALSE; - GeeCollection* _tmp7_ = NULL; + GeeCollection* _tmp7_; #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _source_it; #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4215,7 +4231,7 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection* if (!_tmp3_) { #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 4217 "MediaDataRepresentation.c" +#line 4233 "MediaDataRepresentation.c" } #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _source_it; @@ -4227,85 +4243,85 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection* _tmp7_ = photos; #line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp7_ != NULL) { -#line 4229 "MediaDataRepresentation.c" - MediaSource* _tmp8_ = NULL; +#line 4245 "MediaDataRepresentation.c" + MediaSource* _tmp8_; #line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = source; #line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_LIBRARY_PHOTO); -#line 4235 "MediaDataRepresentation.c" +#line 4251 "MediaDataRepresentation.c" } else { #line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = FALSE; -#line 4239 "MediaDataRepresentation.c" +#line 4255 "MediaDataRepresentation.c" } #line 392 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp6_) { -#line 4243 "MediaDataRepresentation.c" - GeeCollection* _tmp9_ = NULL; - MediaSource* _tmp10_ = NULL; +#line 4259 "MediaDataRepresentation.c" + GeeCollection* _tmp9_; + MediaSource* _tmp10_; #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = photos; #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = source; #line 393 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_collection_add (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); -#line 4252 "MediaDataRepresentation.c" +#line 4268 "MediaDataRepresentation.c" } else { gboolean _tmp11_ = FALSE; - GeeCollection* _tmp12_ = NULL; + GeeCollection* _tmp12_; #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = videos; #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp12_ != NULL) { -#line 4260 "MediaDataRepresentation.c" - MediaSource* _tmp13_ = NULL; +#line 4276 "MediaDataRepresentation.c" + MediaSource* _tmp13_; #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = source; #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_VIDEO); -#line 4266 "MediaDataRepresentation.c" +#line 4282 "MediaDataRepresentation.c" } else { #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = FALSE; -#line 4270 "MediaDataRepresentation.c" +#line 4286 "MediaDataRepresentation.c" } #line 394 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp11_) { -#line 4274 "MediaDataRepresentation.c" - GeeCollection* _tmp14_ = NULL; - MediaSource* _tmp15_ = NULL; +#line 4290 "MediaDataRepresentation.c" + GeeCollection* _tmp14_; + MediaSource* _tmp15_; #line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp14_ = videos; #line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = source; #line 395 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_collection_add (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_VIDEO, Video)); -#line 4283 "MediaDataRepresentation.c" +#line 4299 "MediaDataRepresentation.c" } else { gboolean _tmp16_ = FALSE; - GeeCollection* _tmp17_ = NULL; + GeeCollection* _tmp17_; #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = photos; #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp17_ != NULL) { #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = TRUE; -#line 4293 "MediaDataRepresentation.c" +#line 4309 "MediaDataRepresentation.c" } else { - GeeCollection* _tmp18_ = NULL; + GeeCollection* _tmp18_; #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp18_ = videos; #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = _tmp18_ != NULL; -#line 4300 "MediaDataRepresentation.c" +#line 4316 "MediaDataRepresentation.c" } #line 396 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp16_) { -#line 4304 "MediaDataRepresentation.c" - MediaSource* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; +#line 4320 "MediaDataRepresentation.c" + MediaSource* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; #line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp19_ = source; #line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4316,17 +4332,17 @@ void media_source_collection_filter_media (GeeCollection* media, GeeCollection* g_warning ("MediaDataRepresentation.vala:397: Unrecognized media: %s", _tmp21_); #line 397 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (_tmp21_); -#line 4318 "MediaDataRepresentation.c" +#line 4334 "MediaDataRepresentation.c" } } } #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 4324 "MediaDataRepresentation.c" +#line 4340 "MediaDataRepresentation.c" } #line 391 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 4328 "MediaDataRepresentation.c" +#line 4344 "MediaDataRepresentation.c" } } @@ -4335,14 +4351,14 @@ void media_source_collection_count_media (GeeCollection* media, gint* photo_coun gint _vala_photo_count = 0; gint _vala_video_count = 0; GeeArrayList* photos = NULL; - GeeArrayList* _tmp0_ = NULL; + GeeArrayList* _tmp0_; GeeArrayList* videos = NULL; - GeeArrayList* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - gint _tmp6_ = 0; + GeeArrayList* _tmp1_; + GeeCollection* _tmp2_; + gint _tmp3_; + gint _tmp4_; + gint _tmp5_; + gint _tmp6_; #line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); #line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4377,13 +4393,13 @@ void media_source_collection_count_media (GeeCollection* media, gint* photo_coun if (photo_count) { #line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *photo_count = _vala_photo_count; -#line 4379 "MediaDataRepresentation.c" +#line 4395 "MediaDataRepresentation.c" } #line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (video_count) { #line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *video_count = _vala_video_count; -#line 4385 "MediaDataRepresentation.c" +#line 4401 "MediaDataRepresentation.c" } } @@ -4392,11 +4408,11 @@ gboolean media_source_collection_has_photo (GeeCollection* media) { gboolean result = FALSE; #line 412 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (GEE_IS_COLLECTION (media), FALSE); -#line 4394 "MediaDataRepresentation.c" +#line 4410 "MediaDataRepresentation.c" { GeeIterator* _current_media_it = NULL; - GeeCollection* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeCollection* _tmp0_; + GeeIterator* _tmp1_; #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media; #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4405,13 +4421,13 @@ gboolean media_source_collection_has_photo (GeeCollection* media) { _current_media_it = _tmp1_; #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 4407 "MediaDataRepresentation.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 4423 "MediaDataRepresentation.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; MediaSource* current_media = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - MediaSource* _tmp6_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; + MediaSource* _tmp6_; #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _current_media_it; #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4420,7 +4436,7 @@ gboolean media_source_collection_has_photo (GeeCollection* media) { if (!_tmp3_) { #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 4422 "MediaDataRepresentation.c" +#line 4438 "MediaDataRepresentation.c" } #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _current_media_it; @@ -4440,21 +4456,21 @@ gboolean media_source_collection_has_photo (GeeCollection* media) { _g_object_unref0 (_current_media_it); #line 415 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4442 "MediaDataRepresentation.c" +#line 4458 "MediaDataRepresentation.c" } #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (current_media); -#line 4446 "MediaDataRepresentation.c" +#line 4462 "MediaDataRepresentation.c" } #line 413 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_current_media_it); -#line 4450 "MediaDataRepresentation.c" +#line 4466 "MediaDataRepresentation.c" } #line 419 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = FALSE; #line 419 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4456 "MediaDataRepresentation.c" +#line 4472 "MediaDataRepresentation.c" } @@ -4462,11 +4478,11 @@ gboolean media_source_collection_has_video (GeeCollection* media) { gboolean result = FALSE; #line 422 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (GEE_IS_COLLECTION (media), FALSE); -#line 4464 "MediaDataRepresentation.c" +#line 4480 "MediaDataRepresentation.c" { GeeIterator* _current_media_it = NULL; - GeeCollection* _tmp0_ = NULL; - GeeIterator* _tmp1_ = NULL; + GeeCollection* _tmp0_; + GeeIterator* _tmp1_; #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media; #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4475,13 +4491,13 @@ gboolean media_source_collection_has_video (GeeCollection* media) { _current_media_it = _tmp1_; #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 4477 "MediaDataRepresentation.c" - GeeIterator* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 4493 "MediaDataRepresentation.c" + GeeIterator* _tmp2_; + gboolean _tmp3_; MediaSource* current_media = NULL; - GeeIterator* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; - MediaSource* _tmp6_ = NULL; + GeeIterator* _tmp4_; + gpointer _tmp5_; + MediaSource* _tmp6_; #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _current_media_it; #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4490,7 +4506,7 @@ gboolean media_source_collection_has_video (GeeCollection* media) { if (!_tmp3_) { #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 4492 "MediaDataRepresentation.c" +#line 4508 "MediaDataRepresentation.c" } #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _current_media_it; @@ -4510,21 +4526,21 @@ gboolean media_source_collection_has_video (GeeCollection* media) { _g_object_unref0 (_current_media_it); #line 425 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4512 "MediaDataRepresentation.c" +#line 4528 "MediaDataRepresentation.c" } #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (current_media); -#line 4516 "MediaDataRepresentation.c" +#line 4532 "MediaDataRepresentation.c" } #line 423 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_current_media_it); -#line 4520 "MediaDataRepresentation.c" +#line 4536 "MediaDataRepresentation.c" } #line 429 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = FALSE; #line 429 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4526 "MediaDataRepresentation.c" +#line 4542 "MediaDataRepresentation.c" } @@ -4533,7 +4549,7 @@ static MediaSourceHoldingTank* media_source_collection_real_create_trashcan (Med g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_trashcan'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 432 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 4535 "MediaDataRepresentation.c" +#line 4551 "MediaDataRepresentation.c" } @@ -4542,7 +4558,7 @@ MediaSourceHoldingTank* media_source_collection_create_trashcan (MediaSourceColl g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 432 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->create_trashcan (self); -#line 4544 "MediaDataRepresentation.c" +#line 4560 "MediaDataRepresentation.c" } @@ -4551,7 +4567,7 @@ static MediaSourceHoldingTank* media_source_collection_real_create_offline_bin ( g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_offline_bin'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 4553 "MediaDataRepresentation.c" +#line 4569 "MediaDataRepresentation.c" } @@ -4560,7 +4576,7 @@ MediaSourceHoldingTank* media_source_collection_create_offline_bin (MediaSourceC g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 434 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->create_offline_bin (self); -#line 4562 "MediaDataRepresentation.c" +#line 4578 "MediaDataRepresentation.c" } @@ -4569,7 +4585,7 @@ static MediaMonitor* media_source_collection_real_create_media_monitor (MediaSou g_critical ("Type `%s' does not implement abstract method `media_source_collection_create_media_monitor'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 4571 "MediaDataRepresentation.c" +#line 4587 "MediaDataRepresentation.c" } @@ -4578,7 +4594,7 @@ MediaMonitor* media_source_collection_create_media_monitor (MediaSourceCollectio g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 436 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->create_media_monitor (self, workers, cancellable); -#line 4580 "MediaDataRepresentation.c" +#line 4596 "MediaDataRepresentation.c" } @@ -4587,7 +4603,7 @@ static gchar* media_source_collection_real_get_typename (MediaSourceCollection* g_critical ("Type `%s' does not implement abstract method `media_source_collection_get_typename'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 4589 "MediaDataRepresentation.c" +#line 4605 "MediaDataRepresentation.c" } @@ -4596,7 +4612,7 @@ gchar* media_source_collection_get_typename (MediaSourceCollection* self) { g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 438 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->get_typename (self); -#line 4598 "MediaDataRepresentation.c" +#line 4614 "MediaDataRepresentation.c" } @@ -4606,7 +4622,7 @@ static gboolean media_source_collection_real_is_file_recognized (MediaSourceColl g_critical ("Type `%s' does not implement abstract method `media_source_collection_is_file_recognized'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return _tmp0_; -#line 4608 "MediaDataRepresentation.c" +#line 4624 "MediaDataRepresentation.c" } @@ -4615,21 +4631,21 @@ gboolean media_source_collection_is_file_recognized (MediaSourceCollection* self g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), FALSE); #line 440 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->is_file_recognized (self, file); -#line 4617 "MediaDataRepresentation.c" +#line 4633 "MediaDataRepresentation.c" } static gpointer _source_holding_tank_ref0 (gpointer self) { #line 443 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? source_holding_tank_ref (self) : NULL; -#line 4624 "MediaDataRepresentation.c" +#line 4640 "MediaDataRepresentation.c" } MediaSourceHoldingTank* media_source_collection_get_trashcan (MediaSourceCollection* self) { MediaSourceHoldingTank* result = NULL; - MediaSourceHoldingTank* _tmp0_ = NULL; - MediaSourceHoldingTank* _tmp1_ = NULL; + MediaSourceHoldingTank* _tmp0_; + MediaSourceHoldingTank* _tmp1_; #line 442 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 443 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4640,14 +4656,14 @@ MediaSourceHoldingTank* media_source_collection_get_trashcan (MediaSourceCollect result = _tmp1_; #line 443 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4642 "MediaDataRepresentation.c" +#line 4658 "MediaDataRepresentation.c" } MediaSourceHoldingTank* media_source_collection_get_offline_bin (MediaSourceCollection* self) { MediaSourceHoldingTank* result = NULL; - MediaSourceHoldingTank* _tmp0_ = NULL; - MediaSourceHoldingTank* _tmp1_ = NULL; + MediaSourceHoldingTank* _tmp0_; + MediaSourceHoldingTank* _tmp1_; #line 446 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 447 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4658,7 +4674,7 @@ MediaSourceHoldingTank* media_source_collection_get_offline_bin (MediaSourceColl result = _tmp1_; #line 447 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 4660 "MediaDataRepresentation.c" +#line 4676 "MediaDataRepresentation.c" } @@ -4667,7 +4683,7 @@ static MediaSource* media_source_collection_real_fetch_by_numeric_id (MediaSourc g_critical ("Type `%s' does not implement abstract method `media_source_collection_fetch_by_numeric_id'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 453 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 4669 "MediaDataRepresentation.c" +#line 4685 "MediaDataRepresentation.c" } @@ -4676,14 +4692,14 @@ MediaSource* media_source_collection_fetch_by_numeric_id (MediaSourceCollection* g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 453 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->fetch_by_numeric_id (self, numeric_id); -#line 4678 "MediaDataRepresentation.c" +#line 4694 "MediaDataRepresentation.c" } static void media_source_collection_real_notify_import_roll_altered (MediaSourceCollection* self) { #line 456 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_emit_by_name (self, "import-roll-altered"); -#line 4685 "MediaDataRepresentation.c" + g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_IMPORT_ROLL_ALTERED_SIGNAL], 0); +#line 4701 "MediaDataRepresentation.c" } @@ -4692,14 +4708,14 @@ void media_source_collection_notify_import_roll_altered (MediaSourceCollection* g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 455 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_import_roll_altered (self); -#line 4694 "MediaDataRepresentation.c" +#line 4710 "MediaDataRepresentation.c" } static void media_source_collection_real_notify_flagged_contents_altered (MediaSourceCollection* self) { #line 460 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_emit_by_name (self, "flagged-contents-altered"); -#line 4701 "MediaDataRepresentation.c" + g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_FLAGGED_CONTENTS_ALTERED_SIGNAL], 0); +#line 4717 "MediaDataRepresentation.c" } @@ -4708,19 +4724,19 @@ void media_source_collection_notify_flagged_contents_altered (MediaSourceCollect g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 459 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_flagged_contents_altered (self); -#line 4710 "MediaDataRepresentation.c" +#line 4726 "MediaDataRepresentation.c" } static void media_source_collection_real_notify_media_import_starting (MediaSourceCollection* self, GeeCollection* media) { - GeeCollection* _tmp0_ = NULL; + GeeCollection* _tmp0_; #line 463 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); #line 464 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media; #line 464 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_emit_by_name (self, "media-import-starting", _tmp0_); -#line 4722 "MediaDataRepresentation.c" + g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_STARTING_SIGNAL], 0, _tmp0_); +#line 4738 "MediaDataRepresentation.c" } @@ -4729,19 +4745,19 @@ void media_source_collection_notify_media_import_starting (MediaSourceCollection g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 463 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_media_import_starting (self, media); -#line 4731 "MediaDataRepresentation.c" +#line 4747 "MediaDataRepresentation.c" } static void media_source_collection_real_notify_media_import_completed (MediaSourceCollection* self, GeeCollection* media) { - GeeCollection* _tmp0_ = NULL; + GeeCollection* _tmp0_; #line 467 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); #line 468 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media; #line 468 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_emit_by_name (self, "media-import-completed", _tmp0_); -#line 4743 "MediaDataRepresentation.c" + g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_COMPLETED_SIGNAL], 0, _tmp0_); +#line 4759 "MediaDataRepresentation.c" } @@ -4750,7 +4766,7 @@ void media_source_collection_notify_media_import_completed (MediaSourceCollectio g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 467 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->notify_media_import_completed (self, media); -#line 4752 "MediaDataRepresentation.c" +#line 4768 "MediaDataRepresentation.c" } @@ -4759,10 +4775,10 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge GeeArrayList* to_trashcan = NULL; GeeArrayList* to_offline = NULL; gboolean flagged_altered = FALSE; - GeeArrayList* _tmp54_ = NULL; - GeeArrayList* _tmp58_ = NULL; - gboolean _tmp62_ = FALSE; - GeeMap* _tmp63_ = NULL; + GeeArrayList* _tmp54_; + GeeArrayList* _tmp58_; + gboolean _tmp62_; + GeeMap* _tmp63_; #line 471 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection); #line 471 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4773,15 +4789,15 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge to_offline = NULL; #line 474 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = FALSE; -#line 4775 "MediaDataRepresentation.c" +#line 4791 "MediaDataRepresentation.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; - GeeSet* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + GeeMap* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; + GeeSet* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = items; #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4800,31 +4816,31 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _object_it = _tmp5_; #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 4802 "MediaDataRepresentation.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 4818 "MediaDataRepresentation.c" + GeeIterator* _tmp6_; + gboolean _tmp7_; DataObject* object = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; Alteration* alteration = NULL; - GeeMap* _tmp10_ = NULL; - DataObject* _tmp11_ = NULL; - gpointer _tmp12_ = NULL; + GeeMap* _tmp10_; + DataObject* _tmp11_; + gpointer _tmp12_; MediaSource* source = NULL; - DataObject* _tmp13_ = NULL; - MediaSource* _tmp14_ = NULL; - Alteration* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; + DataObject* _tmp13_; + MediaSource* _tmp14_; + Alteration* _tmp15_; + gboolean _tmp16_; gboolean _tmp17_ = FALSE; - MediaSource* _tmp18_ = NULL; - gboolean _tmp19_ = FALSE; + MediaSource* _tmp18_; + gboolean _tmp19_; gboolean _tmp28_ = FALSE; - MediaSource* _tmp29_ = NULL; - gboolean _tmp30_ = FALSE; + MediaSource* _tmp29_; + gboolean _tmp30_; Flaggable* flaggable = NULL; - MediaSource* _tmp39_ = NULL; - Flaggable* _tmp40_ = NULL; - Flaggable* _tmp41_ = NULL; + MediaSource* _tmp39_; + Flaggable* _tmp40_; + Flaggable* _tmp41_; #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _object_it; #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4833,7 +4849,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge if (!_tmp7_) { #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 4835 "MediaDataRepresentation.c" +#line 4851 "MediaDataRepresentation.c" } #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = _object_it; @@ -4869,7 +4885,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _g_object_unref0 (object); #line 480 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" continue; -#line 4871 "MediaDataRepresentation.c" +#line 4887 "MediaDataRepresentation.c" } #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp18_ = source; @@ -4877,11 +4893,11 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _tmp19_ = media_source_is_trashed (_tmp18_); #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp19_) { -#line 4879 "MediaDataRepresentation.c" - MediaSourceHoldingTank* _tmp20_ = NULL; - MediaSourceHoldingTank* _tmp21_ = NULL; - MediaSource* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; +#line 4895 "MediaDataRepresentation.c" + MediaSourceHoldingTank* _tmp20_; + MediaSourceHoldingTank* _tmp21_; + MediaSource* _tmp22_; + gboolean _tmp23_; #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp20_ = media_source_collection_get_trashcan (self); #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4894,31 +4910,31 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _tmp17_ = !_tmp23_; #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp21_); -#line 4896 "MediaDataRepresentation.c" +#line 4912 "MediaDataRepresentation.c" } else { #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = FALSE; -#line 4900 "MediaDataRepresentation.c" +#line 4916 "MediaDataRepresentation.c" } #line 482 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp17_) { -#line 4904 "MediaDataRepresentation.c" - GeeArrayList* _tmp24_ = NULL; - GeeArrayList* _tmp26_ = NULL; - MediaSource* _tmp27_ = NULL; +#line 4920 "MediaDataRepresentation.c" + GeeArrayList* _tmp24_; + GeeArrayList* _tmp26_; + MediaSource* _tmp27_; #line 483 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp24_ = to_trashcan; #line 483 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp24_ == NULL) { -#line 4912 "MediaDataRepresentation.c" - GeeArrayList* _tmp25_ = NULL; +#line 4928 "MediaDataRepresentation.c" + GeeArrayList* _tmp25_; #line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp25_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_trashcan); #line 484 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" to_trashcan = _tmp25_; -#line 4920 "MediaDataRepresentation.c" +#line 4936 "MediaDataRepresentation.c" } #line 486 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp26_ = to_trashcan; @@ -4934,7 +4950,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _g_object_unref0 (object); #line 489 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" continue; -#line 4936 "MediaDataRepresentation.c" +#line 4952 "MediaDataRepresentation.c" } #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp29_ = source; @@ -4942,11 +4958,11 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _tmp30_ = media_source_is_offline (_tmp29_); #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp30_) { -#line 4944 "MediaDataRepresentation.c" - MediaSourceHoldingTank* _tmp31_ = NULL; - MediaSourceHoldingTank* _tmp32_ = NULL; - MediaSource* _tmp33_ = NULL; - gboolean _tmp34_ = FALSE; +#line 4960 "MediaDataRepresentation.c" + MediaSourceHoldingTank* _tmp31_; + MediaSourceHoldingTank* _tmp32_; + MediaSource* _tmp33_; + gboolean _tmp34_; #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp31_ = media_source_collection_get_offline_bin (self); #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -4959,31 +4975,31 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _tmp28_ = !_tmp34_; #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp32_); -#line 4961 "MediaDataRepresentation.c" +#line 4977 "MediaDataRepresentation.c" } else { #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp28_ = FALSE; -#line 4965 "MediaDataRepresentation.c" +#line 4981 "MediaDataRepresentation.c" } #line 492 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp28_) { -#line 4969 "MediaDataRepresentation.c" - GeeArrayList* _tmp35_ = NULL; - GeeArrayList* _tmp37_ = NULL; - MediaSource* _tmp38_ = NULL; +#line 4985 "MediaDataRepresentation.c" + GeeArrayList* _tmp35_; + GeeArrayList* _tmp37_; + MediaSource* _tmp38_; #line 493 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp35_ = to_offline; #line 493 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp35_ == NULL) { -#line 4977 "MediaDataRepresentation.c" - GeeArrayList* _tmp36_ = NULL; +#line 4993 "MediaDataRepresentation.c" + GeeArrayList* _tmp36_; #line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp36_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_offline); #line 494 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" to_offline = _tmp36_; -#line 4985 "MediaDataRepresentation.c" +#line 5001 "MediaDataRepresentation.c" } #line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp37_ = to_offline; @@ -4991,7 +5007,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _tmp38_ = source; #line 496 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp38_); -#line 4993 "MediaDataRepresentation.c" +#line 5009 "MediaDataRepresentation.c" } #line 499 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp39_ = source; @@ -5003,20 +5019,20 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _tmp41_ = flaggable; #line 500 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp41_ != NULL) { -#line 5005 "MediaDataRepresentation.c" - Flaggable* _tmp42_ = NULL; - gboolean _tmp43_ = FALSE; +#line 5021 "MediaDataRepresentation.c" + Flaggable* _tmp42_; + gboolean _tmp43_; #line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp42_ = flaggable; #line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp43_ = flaggable_is_flagged (_tmp42_); #line 501 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp43_) { -#line 5014 "MediaDataRepresentation.c" +#line 5030 "MediaDataRepresentation.c" gboolean _tmp44_ = FALSE; - GeeSet* _tmp45_ = NULL; - MediaSource* _tmp46_ = NULL; - gboolean _tmp47_ = FALSE; + GeeSet* _tmp45_; + MediaSource* _tmp46_; + gboolean _tmp47_; #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp45_ = self->priv->flagged; #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5027,23 +5043,23 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge if (_tmp47_) { #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp44_ = TRUE; -#line 5029 "MediaDataRepresentation.c" +#line 5045 "MediaDataRepresentation.c" } else { - gboolean _tmp48_ = FALSE; + gboolean _tmp48_; #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp48_ = flagged_altered; #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp44_ = _tmp48_; -#line 5036 "MediaDataRepresentation.c" +#line 5052 "MediaDataRepresentation.c" } #line 502 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = _tmp44_; -#line 5040 "MediaDataRepresentation.c" +#line 5056 "MediaDataRepresentation.c" } else { gboolean _tmp49_ = FALSE; - GeeSet* _tmp50_ = NULL; - MediaSource* _tmp51_ = NULL; - gboolean _tmp52_ = FALSE; + GeeSet* _tmp50_; + MediaSource* _tmp51_; + gboolean _tmp52_; #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp50_ = self->priv->flagged; #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5054,18 +5070,18 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge if (_tmp52_) { #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp49_ = TRUE; -#line 5056 "MediaDataRepresentation.c" +#line 5072 "MediaDataRepresentation.c" } else { - gboolean _tmp53_ = FALSE; + gboolean _tmp53_; #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp53_ = flagged_altered; #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp49_ = _tmp53_; -#line 5063 "MediaDataRepresentation.c" +#line 5079 "MediaDataRepresentation.c" } #line 504 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = _tmp49_; -#line 5067 "MediaDataRepresentation.c" +#line 5083 "MediaDataRepresentation.c" } } #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5076,20 +5092,20 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _alteration_unref0 (alteration); #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (object); -#line 5078 "MediaDataRepresentation.c" +#line 5094 "MediaDataRepresentation.c" } #line 475 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_object_it); -#line 5082 "MediaDataRepresentation.c" +#line 5098 "MediaDataRepresentation.c" } #line 508 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp54_ = to_trashcan; #line 508 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp54_ != NULL) { -#line 5088 "MediaDataRepresentation.c" - MediaSourceHoldingTank* _tmp55_ = NULL; - MediaSourceHoldingTank* _tmp56_ = NULL; - GeeArrayList* _tmp57_ = NULL; +#line 5104 "MediaDataRepresentation.c" + MediaSourceHoldingTank* _tmp55_; + MediaSourceHoldingTank* _tmp56_; + GeeArrayList* _tmp57_; #line 509 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp55_ = media_source_collection_get_trashcan (self); #line 509 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5100,16 +5116,16 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge source_holding_tank_unlink_and_hold (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_COLLECTION, GeeCollection)); #line 509 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp56_); -#line 5102 "MediaDataRepresentation.c" +#line 5118 "MediaDataRepresentation.c" } #line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp58_ = to_offline; #line 511 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp58_ != NULL) { -#line 5108 "MediaDataRepresentation.c" - MediaSourceHoldingTank* _tmp59_ = NULL; - MediaSourceHoldingTank* _tmp60_ = NULL; - GeeArrayList* _tmp61_ = NULL; +#line 5124 "MediaDataRepresentation.c" + MediaSourceHoldingTank* _tmp59_; + MediaSourceHoldingTank* _tmp60_; + GeeArrayList* _tmp61_; #line 512 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp59_ = media_source_collection_get_offline_bin (self); #line 512 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5120,7 +5136,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge source_holding_tank_unlink_and_hold (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection)); #line 512 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp60_); -#line 5122 "MediaDataRepresentation.c" +#line 5138 "MediaDataRepresentation.c" } #line 514 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp62_ = flagged_altered; @@ -5128,7 +5144,7 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge if (_tmp62_) { #line 515 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_notify_flagged_contents_altered (self); -#line 5130 "MediaDataRepresentation.c" +#line 5146 "MediaDataRepresentation.c" } #line 517 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp63_ = items; @@ -5138,14 +5154,14 @@ static void media_source_collection_real_items_altered (DataCollection* base, Ge _g_object_unref0 (to_offline); #line 471 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (to_trashcan); -#line 5140 "MediaDataRepresentation.c" +#line 5156 "MediaDataRepresentation.c" } static void _media_source_collection_on_master_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self) { #line 529 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_on_master_replaced ((MediaSourceCollection*) self, _sender, old_file, new_file); -#line 5147 "MediaDataRepresentation.c" +#line 5163 "MediaDataRepresentation.c" } @@ -5153,12 +5169,12 @@ static void media_source_collection_real_notify_contents_altered (DataCollection MediaSourceCollection * self; gboolean import_roll_changed = FALSE; gboolean flagged_altered = FALSE; - GeeIterable* _tmp0_ = NULL; - GeeIterable* _tmp38_ = NULL; - gboolean _tmp74_ = FALSE; - gboolean _tmp75_ = FALSE; - GeeIterable* _tmp76_ = NULL; - GeeIterable* _tmp77_ = NULL; + GeeIterable* _tmp0_; + GeeIterable* _tmp38_; + gboolean _tmp74_; + gboolean _tmp75_; + GeeIterable* _tmp76_; + GeeIterable* _tmp77_; #line 520 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection); #line 520 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5173,11 +5189,11 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _tmp0_ = added; #line 524 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp0_ != NULL) { -#line 5175 "MediaDataRepresentation.c" +#line 5191 "MediaDataRepresentation.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeIterable* _tmp1_; + GeeIterator* _tmp2_; #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = added; #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5186,29 +5202,29 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _object_it = _tmp2_; #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 5188 "MediaDataRepresentation.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 5204 "MediaDataRepresentation.c" + GeeIterator* _tmp3_; + gboolean _tmp4_; DataObject* object = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; MediaSource* media = NULL; - DataObject* _tmp7_ = NULL; - MediaSource* _tmp8_ = NULL; - GeeHashMap* _tmp9_ = NULL; - MediaSource* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; - MediaSource* _tmp13_ = NULL; - MediaSource* _tmp14_ = NULL; + DataObject* _tmp7_; + MediaSource* _tmp8_; + GeeHashMap* _tmp9_; + MediaSource* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; + MediaSource* _tmp13_; + MediaSource* _tmp14_; ImportID import_id = {0}; - MediaSource* _tmp15_ = NULL; + MediaSource* _tmp15_; ImportID _tmp16_ = {0}; - gboolean _tmp17_ = FALSE; + gboolean _tmp17_; Flaggable* flaggable = NULL; - MediaSource* _tmp23_ = NULL; - Flaggable* _tmp24_ = NULL; - Flaggable* _tmp25_ = NULL; + MediaSource* _tmp23_; + Flaggable* _tmp24_; + Flaggable* _tmp25_; #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _object_it; #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5217,7 +5233,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection if (!_tmp4_) { #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 5219 "MediaDataRepresentation.c" +#line 5235 "MediaDataRepresentation.c" } #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _object_it; @@ -5259,12 +5275,12 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _tmp17_ = import_id_is_valid (&import_id); #line 532 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp17_) { -#line 5261 "MediaDataRepresentation.c" - GeeTreeSet* _tmp18_ = NULL; - ImportID _tmp19_ = {0}; - GeeMultiMap* _tmp20_ = NULL; - ImportID _tmp21_ = {0}; - MediaSource* _tmp22_ = NULL; +#line 5277 "MediaDataRepresentation.c" + GeeTreeSet* _tmp18_; + ImportID _tmp19_; + GeeMultiMap* _tmp20_; + ImportID _tmp21_; + MediaSource* _tmp22_; #line 533 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp18_ = self->priv->sorted_import_ids; #line 533 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5281,7 +5297,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection gee_multi_map_set (_tmp20_, &_tmp21_, _tmp22_); #line 536 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" import_roll_changed = TRUE; -#line 5283 "MediaDataRepresentation.c" +#line 5299 "MediaDataRepresentation.c" } #line 539 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp23_ = media; @@ -5293,20 +5309,20 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _tmp25_ = flaggable; #line 540 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp25_ != NULL) { -#line 5295 "MediaDataRepresentation.c" - Flaggable* _tmp26_ = NULL; - gboolean _tmp27_ = FALSE; +#line 5311 "MediaDataRepresentation.c" + Flaggable* _tmp26_; + gboolean _tmp27_; #line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp26_ = flaggable; #line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp27_ = flaggable_is_flagged (_tmp26_); #line 541 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp27_) { -#line 5304 "MediaDataRepresentation.c" +#line 5320 "MediaDataRepresentation.c" gboolean _tmp28_ = FALSE; - GeeSet* _tmp29_ = NULL; - MediaSource* _tmp30_ = NULL; - gboolean _tmp31_ = FALSE; + GeeSet* _tmp29_; + MediaSource* _tmp30_; + gboolean _tmp31_; #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp29_ = self->priv->flagged; #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5317,23 +5333,23 @@ static void media_source_collection_real_notify_contents_altered (DataCollection if (_tmp31_) { #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp28_ = TRUE; -#line 5319 "MediaDataRepresentation.c" +#line 5335 "MediaDataRepresentation.c" } else { - gboolean _tmp32_ = FALSE; + gboolean _tmp32_; #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp32_ = flagged_altered; #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp28_ = _tmp32_; -#line 5326 "MediaDataRepresentation.c" +#line 5342 "MediaDataRepresentation.c" } #line 542 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = _tmp28_; -#line 5330 "MediaDataRepresentation.c" +#line 5346 "MediaDataRepresentation.c" } else { gboolean _tmp33_ = FALSE; - GeeSet* _tmp34_ = NULL; - MediaSource* _tmp35_ = NULL; - gboolean _tmp36_ = FALSE; + GeeSet* _tmp34_; + MediaSource* _tmp35_; + gboolean _tmp36_; #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp34_ = self->priv->flagged; #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5344,18 +5360,18 @@ static void media_source_collection_real_notify_contents_altered (DataCollection if (_tmp36_) { #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp33_ = TRUE; -#line 5346 "MediaDataRepresentation.c" +#line 5362 "MediaDataRepresentation.c" } else { - gboolean _tmp37_ = FALSE; + gboolean _tmp37_; #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp37_ = flagged_altered; #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp33_ = _tmp37_; -#line 5353 "MediaDataRepresentation.c" +#line 5369 "MediaDataRepresentation.c" } #line 544 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = _tmp33_; -#line 5357 "MediaDataRepresentation.c" +#line 5373 "MediaDataRepresentation.c" } } #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5364,22 +5380,22 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _g_object_unref0 (media); #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (object); -#line 5366 "MediaDataRepresentation.c" +#line 5382 "MediaDataRepresentation.c" } #line 525 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_object_it); -#line 5370 "MediaDataRepresentation.c" +#line 5386 "MediaDataRepresentation.c" } } #line 549 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp38_ = removed; #line 549 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp38_ != NULL) { -#line 5377 "MediaDataRepresentation.c" +#line 5393 "MediaDataRepresentation.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp39_ = NULL; - GeeIterator* _tmp40_ = NULL; + GeeIterable* _tmp39_; + GeeIterator* _tmp40_; #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp39_ = removed; #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5388,33 +5404,33 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _object_it = _tmp40_; #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 5390 "MediaDataRepresentation.c" - GeeIterator* _tmp41_ = NULL; - gboolean _tmp42_ = FALSE; +#line 5406 "MediaDataRepresentation.c" + GeeIterator* _tmp41_; + gboolean _tmp42_; DataObject* object = NULL; - GeeIterator* _tmp43_ = NULL; - gpointer _tmp44_ = NULL; + GeeIterator* _tmp43_; + gpointer _tmp44_; MediaSource* media = NULL; - DataObject* _tmp45_ = NULL; - MediaSource* _tmp46_ = NULL; + DataObject* _tmp45_; + MediaSource* _tmp46_; gboolean is_removed = FALSE; - GeeHashMap* _tmp47_ = NULL; - MediaSource* _tmp48_ = NULL; - GFile* _tmp49_ = NULL; - GFile* _tmp50_ = NULL; - gboolean _tmp51_ = FALSE; - gboolean _tmp52_ = FALSE; - gboolean _tmp53_ = FALSE; - MediaSource* _tmp54_ = NULL; - guint _tmp55_ = 0U; + GeeHashMap* _tmp47_; + MediaSource* _tmp48_; + GFile* _tmp49_; + GFile* _tmp50_; + gboolean _tmp51_; + gboolean _tmp52_; + gboolean _tmp53_; + MediaSource* _tmp54_; + guint _tmp55_; ImportID import_id = {0}; - MediaSource* _tmp56_ = NULL; + MediaSource* _tmp56_; ImportID _tmp57_ = {0}; - gboolean _tmp58_ = FALSE; + gboolean _tmp58_; gboolean _tmp69_ = FALSE; - GeeSet* _tmp70_ = NULL; - MediaSource* _tmp71_ = NULL; - gboolean _tmp72_ = FALSE; + GeeSet* _tmp70_; + MediaSource* _tmp71_; + gboolean _tmp72_; #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp41_ = _object_it; #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5423,7 +5439,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection if (!_tmp42_) { #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 5425 "MediaDataRepresentation.c" +#line 5441 "MediaDataRepresentation.c" } #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp43_ = _object_it; @@ -5473,15 +5489,15 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _tmp58_ = import_id_is_valid (&import_id); #line 558 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp58_) { -#line 5475 "MediaDataRepresentation.c" - GeeMultiMap* _tmp59_ = NULL; - ImportID _tmp60_ = {0}; - MediaSource* _tmp61_ = NULL; - gboolean _tmp62_ = FALSE; - gboolean _tmp63_ = FALSE; - GeeMultiMap* _tmp64_ = NULL; - ImportID _tmp65_ = {0}; - gboolean _tmp66_ = FALSE; +#line 5491 "MediaDataRepresentation.c" + GeeMultiMap* _tmp59_; + ImportID _tmp60_; + MediaSource* _tmp61_; + gboolean _tmp62_; + gboolean _tmp63_; + GeeMultiMap* _tmp64_; + ImportID _tmp65_; + gboolean _tmp66_; #line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp59_ = self->priv->import_rolls; #line 559 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5504,20 +5520,20 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _tmp66_ = gee_multi_map_contains (_tmp64_, &_tmp65_); #line 561 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp66_) { -#line 5506 "MediaDataRepresentation.c" - GeeTreeSet* _tmp67_ = NULL; - ImportID _tmp68_ = {0}; +#line 5522 "MediaDataRepresentation.c" + GeeTreeSet* _tmp67_; + ImportID _tmp68_; #line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp67_ = self->priv->sorted_import_ids; #line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp68_ = import_id; #line 562 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp68_); -#line 5515 "MediaDataRepresentation.c" +#line 5531 "MediaDataRepresentation.c" } #line 564 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" import_roll_changed = TRUE; -#line 5519 "MediaDataRepresentation.c" +#line 5535 "MediaDataRepresentation.c" } #line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp70_ = self->priv->flagged; @@ -5529,14 +5545,14 @@ static void media_source_collection_real_notify_contents_altered (DataCollection if (_tmp72_) { #line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp69_ = TRUE; -#line 5531 "MediaDataRepresentation.c" +#line 5547 "MediaDataRepresentation.c" } else { - gboolean _tmp73_ = FALSE; + gboolean _tmp73_; #line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp73_ = flagged_altered; #line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp69_ = _tmp73_; -#line 5538 "MediaDataRepresentation.c" +#line 5554 "MediaDataRepresentation.c" } #line 567 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" flagged_altered = _tmp69_; @@ -5544,11 +5560,11 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _g_object_unref0 (media); #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (object); -#line 5546 "MediaDataRepresentation.c" +#line 5562 "MediaDataRepresentation.c" } #line 550 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_object_it); -#line 5550 "MediaDataRepresentation.c" +#line 5566 "MediaDataRepresentation.c" } } #line 571 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5557,7 +5573,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection if (_tmp74_) { #line 572 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_notify_import_roll_altered (self); -#line 5559 "MediaDataRepresentation.c" +#line 5575 "MediaDataRepresentation.c" } #line 574 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp75_ = flagged_altered; @@ -5565,7 +5581,7 @@ static void media_source_collection_real_notify_contents_altered (DataCollection if (_tmp75_) { #line 575 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_notify_flagged_contents_altered (self); -#line 5567 "MediaDataRepresentation.c" +#line 5583 "MediaDataRepresentation.c" } #line 577 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp76_ = added; @@ -5573,21 +5589,21 @@ static void media_source_collection_real_notify_contents_altered (DataCollection _tmp77_ = removed; #line 577 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" DATA_COLLECTION_CLASS (media_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp76_, _tmp77_); -#line 5575 "MediaDataRepresentation.c" +#line 5591 "MediaDataRepresentation.c" } static void media_source_collection_on_master_replaced (MediaSourceCollection* self, MediaSource* media, GFile* old_file, GFile* new_file) { gboolean is_removed = FALSE; - GeeHashMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - GeeHashMap* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - MediaSource* _tmp5_ = NULL; - MediaSource* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; + GeeHashMap* _tmp0_; + GFile* _tmp1_; + gboolean _tmp2_; + GeeHashMap* _tmp3_; + GFile* _tmp4_; + MediaSource* _tmp5_; + MediaSource* _tmp6_; + GFile* _tmp7_; + GFile* _tmp8_; #line 580 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 580 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5621,16 +5637,16 @@ static void media_source_collection_on_master_replaced (MediaSourceCollection* s #line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = new_file; #line 586 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_emit_by_name (self, "master-file-replaced", _tmp6_, _tmp7_, _tmp8_); -#line 5624 "MediaDataRepresentation.c" + g_signal_emit (self, media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MASTER_FILE_REPLACED_SIGNAL], 0, _tmp6_, _tmp7_, _tmp8_); +#line 5640 "MediaDataRepresentation.c" } MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection* self, GFile* file) { MediaSource* result = NULL; - GeeHashMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + GFile* _tmp1_; + gpointer _tmp2_; #line 589 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 589 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5645,21 +5661,21 @@ MediaSource* media_source_collection_fetch_by_master_file (MediaSourceCollection result = (MediaSource*) _tmp2_; #line 590 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5647 "MediaDataRepresentation.c" +#line 5663 "MediaDataRepresentation.c" } static MediaSource* media_source_collection_real_fetch_by_source_id (MediaSourceCollection* self, const gchar* source_id) { MediaSource* result = NULL; gchar** components = NULL; - const gchar* _tmp0_ = NULL; - gchar** _tmp1_ = NULL; - gchar** _tmp2_ = NULL; - gint components_length1 = 0; - gint _components_size_ = 0; - const gchar* _tmp3_ = NULL; - gint64 _tmp4_ = 0LL; - MediaSource* _tmp5_ = NULL; + const gchar* _tmp0_; + gchar** _tmp1_; + gchar** _tmp2_; + gint components_length1; + gint _components_size_; + const gchar* _tmp3_; + gint64 _tmp4_; + MediaSource* _tmp5_; #line 593 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (source_id != NULL, NULL); #line 594 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5686,7 +5702,7 @@ static MediaSource* media_source_collection_real_fetch_by_source_id (MediaSource components = (_vala_array_free (components, components_length1, (GDestroyNotify) g_free), NULL); #line 597 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5688 "MediaDataRepresentation.c" +#line 5704 "MediaDataRepresentation.c" } @@ -5695,7 +5711,7 @@ MediaSource* media_source_collection_fetch_by_source_id (MediaSourceCollection* g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 593 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->fetch_by_source_id (self, source_id); -#line 5697 "MediaDataRepresentation.c" +#line 5713 "MediaDataRepresentation.c" } @@ -5704,7 +5720,7 @@ static GeeCollection* media_source_collection_real_get_event_source_ids (MediaSo g_critical ("Type `%s' does not implement abstract method `media_source_collection_get_event_source_ids'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 600 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 5706 "MediaDataRepresentation.c" +#line 5722 "MediaDataRepresentation.c" } @@ -5713,16 +5729,16 @@ GeeCollection* media_source_collection_get_event_source_ids (MediaSourceCollecti g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 600 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->get_event_source_ids (self, event_id); -#line 5715 "MediaDataRepresentation.c" +#line 5731 "MediaDataRepresentation.c" } GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollection* self) { GeeCollection* result = NULL; - MediaSourceHoldingTank* _tmp0_ = NULL; - MediaSourceHoldingTank* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; + MediaSourceHoldingTank* _tmp0_; + MediaSourceHoldingTank* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; #line 602 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5739,16 +5755,16 @@ GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollect result = _tmp3_; #line 603 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5741 "MediaDataRepresentation.c" +#line 5757 "MediaDataRepresentation.c" } GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceCollection* self) { GeeCollection* result = NULL; - MediaSourceHoldingTank* _tmp0_ = NULL; - MediaSourceHoldingTank* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; + MediaSourceHoldingTank* _tmp0_; + MediaSourceHoldingTank* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; #line 606 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5765,15 +5781,15 @@ GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceColl result = _tmp3_; #line 607 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5767 "MediaDataRepresentation.c" +#line 5783 "MediaDataRepresentation.c" } GeeCollection* media_source_collection_get_flagged (MediaSourceCollection* self) { GeeCollection* result = NULL; - GeeSet* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; + GeeSet* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; #line 610 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 611 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5786,14 +5802,14 @@ GeeCollection* media_source_collection_get_flagged (MediaSourceCollection* self) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); #line 611 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5788 "MediaDataRepresentation.c" +#line 5804 "MediaDataRepresentation.c" } GeeSortedSet* media_source_collection_get_import_roll_ids (MediaSourceCollection* self) { GeeSortedSet* result = NULL; - GeeTreeSet* _tmp0_ = NULL; - GeeSortedSet* _tmp1_ = NULL; + GeeTreeSet* _tmp0_; + GeeSortedSet* _tmp1_; #line 615 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 616 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5804,16 +5820,16 @@ GeeSortedSet* media_source_collection_get_import_roll_ids (MediaSourceCollection result = _tmp1_; #line 616 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5806 "MediaDataRepresentation.c" +#line 5822 "MediaDataRepresentation.c" } ImportID* media_source_collection_get_last_import_id (MediaSourceCollection* self) { ImportID* result = NULL; ImportID* _tmp0_ = NULL; - GeeTreeSet* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; + GeeTreeSet* _tmp1_; + gint _tmp2_; + gint _tmp3_; #line 619 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5824,9 +5840,9 @@ ImportID* media_source_collection_get_last_import_id (MediaSourceCollection* sel _tmp3_ = _tmp2_; #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp3_ != 0) { -#line 5826 "MediaDataRepresentation.c" - GeeTreeSet* _tmp4_ = NULL; - gpointer _tmp5_ = NULL; +#line 5842 "MediaDataRepresentation.c" + GeeTreeSet* _tmp4_; + gpointer _tmp5_; #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = self->priv->sorted_import_ids; #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5835,27 +5851,27 @@ ImportID* media_source_collection_get_last_import_id (MediaSourceCollection* sel _import_id_free0 (_tmp0_); #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = (ImportID*) _tmp5_; -#line 5837 "MediaDataRepresentation.c" +#line 5853 "MediaDataRepresentation.c" } else { #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _import_id_free0 (_tmp0_); #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = NULL; -#line 5843 "MediaDataRepresentation.c" +#line 5859 "MediaDataRepresentation.c" } #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp0_; #line 620 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5849 "MediaDataRepresentation.c" +#line 5865 "MediaDataRepresentation.c" } GeeCollection* media_source_collection_get_import_roll (MediaSourceCollection* self, ImportID* import_id) { GeeCollection* result = NULL; - GeeMultiMap* _tmp0_ = NULL; - ImportID _tmp1_ = {0}; - GeeCollection* _tmp2_ = NULL; + GeeMultiMap* _tmp0_; + ImportID _tmp1_; + GeeCollection* _tmp2_; #line 623 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 623 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5870,14 +5886,14 @@ GeeCollection* media_source_collection_get_import_roll (MediaSourceCollection* s result = _tmp2_; #line 624 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5872 "MediaDataRepresentation.c" +#line 5888 "MediaDataRepresentation.c" } void media_source_collection_add_many_to_trash (MediaSourceCollection* self, GeeCollection* sources) { - MediaSourceHoldingTank* _tmp0_ = NULL; - MediaSourceHoldingTank* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; + MediaSourceHoldingTank* _tmp0_; + MediaSourceHoldingTank* _tmp1_; + GeeCollection* _tmp2_; #line 627 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 627 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5892,14 +5908,14 @@ void media_source_collection_add_many_to_trash (MediaSourceCollection* self, Gee source_holding_tank_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp2_); #line 628 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp1_); -#line 5894 "MediaDataRepresentation.c" +#line 5910 "MediaDataRepresentation.c" } void media_source_collection_add_many_to_offline (MediaSourceCollection* self, GeeCollection* sources) { - MediaSourceHoldingTank* _tmp0_ = NULL; - MediaSourceHoldingTank* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; + MediaSourceHoldingTank* _tmp0_; + MediaSourceHoldingTank* _tmp1_; + GeeCollection* _tmp2_; #line 631 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 631 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5914,16 +5930,16 @@ void media_source_collection_add_many_to_offline (MediaSourceCollection* self, G source_holding_tank_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), _tmp2_); #line 632 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp1_); -#line 5916 "MediaDataRepresentation.c" +#line 5932 "MediaDataRepresentation.c" } gint media_source_collection_get_trashcan_count (MediaSourceCollection* self) { gint result = 0; - MediaSourceHoldingTank* _tmp0_ = NULL; - MediaSourceHoldingTank* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; + MediaSourceHoldingTank* _tmp0_; + MediaSourceHoldingTank* _tmp1_; + gint _tmp2_; + gint _tmp3_; #line 635 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), 0); #line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5940,17 +5956,17 @@ gint media_source_collection_get_trashcan_count (MediaSourceCollection* self) { result = _tmp3_; #line 636 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 5942 "MediaDataRepresentation.c" +#line 5958 "MediaDataRepresentation.c" } static void media_source_collection_real_import_many (MediaSourceCollection* self, GeeCollection* media) { - GeeCollection* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - GeeCollection* _tmp5_ = NULL; + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeCollection* _tmp4_; + GeeCollection* _tmp5_; #line 642 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); #line 643 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -5973,7 +5989,7 @@ static void media_source_collection_real_import_many (MediaSourceCollection* sel _tmp5_ = media; #line 649 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_source_collection_notify_media_import_completed (self, _tmp5_); -#line 5975 "MediaDataRepresentation.c" +#line 5991 "MediaDataRepresentation.c" } @@ -5982,14 +5998,14 @@ void media_source_collection_import_many (MediaSourceCollection* self, GeeCollec g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 642 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->import_many (self, media); -#line 5984 "MediaDataRepresentation.c" +#line 6000 "MediaDataRepresentation.c" } static void media_source_collection_real_postprocess_imported_media (MediaSourceCollection* self, GeeCollection* media) { #line 654 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); -#line 5991 "MediaDataRepresentation.c" +#line 6007 "MediaDataRepresentation.c" } @@ -5998,7 +6014,7 @@ void media_source_collection_postprocess_imported_media (MediaSourceCollection* g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); #line 654 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->postprocess_imported_media (self, media); -#line 6000 "MediaDataRepresentation.c" +#line 6016 "MediaDataRepresentation.c" } @@ -6007,50 +6023,50 @@ static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 cu result = aggregate_progress_monitor_monitor ((AggregateProgressMonitor*) self, current, total); #line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 6009 "MediaDataRepresentation.c" +#line 6025 "MediaDataRepresentation.c" } void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCollection* sources, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed) { - GeeCollection* _tmp0_ = NULL; + GeeCollection* _tmp0_; GeeHashSet* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + gboolean _tmp2_; GeeHashSet* to_tombstone = NULL; - GeeHashSet* _tmp4_ = NULL; + GeeHashSet* _tmp4_; GeeArrayList* trashed = NULL; - GeeArrayList* _tmp5_ = NULL; + GeeArrayList* _tmp5_; GeeArrayList* offlined = NULL; - GeeArrayList* _tmp6_ = NULL; + GeeArrayList* _tmp6_; GeeArrayList* not_trashed = NULL; - GeeArrayList* _tmp7_ = NULL; + GeeArrayList* _tmp7_; gint total_count = 0; - GeeCollection* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; - gint _tmp30_ = 0; - GeeArrayList* _tmp31_ = NULL; - gint _tmp32_ = 0; - gint _tmp33_ = 0; - GeeArrayList* _tmp34_ = NULL; - gint _tmp35_ = 0; - gint _tmp36_ = 0; - GeeArrayList* _tmp37_ = NULL; - gint _tmp38_ = 0; - gint _tmp39_ = 0; + GeeCollection* _tmp27_; + gint _tmp28_; + gint _tmp29_; + gint _tmp30_; + GeeArrayList* _tmp31_; + gint _tmp32_; + gint _tmp33_; + GeeArrayList* _tmp34_; + gint _tmp35_; + gint _tmp36_; + GeeArrayList* _tmp37_; + gint _tmp38_; + gint _tmp39_; AggregateProgressMonitor* agg_monitor = NULL; - ProgressMonitor _tmp40_ = NULL; - void* _tmp40__target = NULL; - GeeArrayList* _tmp45_ = NULL; - gint _tmp46_ = 0; - gint _tmp47_ = 0; - GeeArrayList* _tmp54_ = NULL; - gint _tmp55_ = 0; - gint _tmp56_ = 0; - GeeArrayList* _tmp63_ = NULL; - gint _tmp64_ = 0; - gint _tmp65_ = 0; + ProgressMonitor _tmp40_; + void* _tmp40__target; + GeeArrayList* _tmp45_; + gint _tmp46_; + gint _tmp47_; + GeeArrayList* _tmp54_; + gint _tmp55_; + gint _tmp56_; + GeeArrayList* _tmp63_; + gint _tmp64_; + gint _tmp65_; gboolean _tmp72_ = FALSE; - GeeHashSet* _tmp73_ = NULL; + GeeHashSet* _tmp73_; GError * _inner_error_ = NULL; #line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (self)); @@ -6066,21 +6082,21 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _tmp2_ = delete_backing; #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp2_) { -#line 6068 "MediaDataRepresentation.c" - GeeHashSet* _tmp3_ = NULL; +#line 6084 "MediaDataRepresentation.c" + GeeHashSet* _tmp3_; #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp3_; -#line 6076 "MediaDataRepresentation.c" +#line 6092 "MediaDataRepresentation.c" } else { #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = NULL; -#line 6082 "MediaDataRepresentation.c" +#line 6098 "MediaDataRepresentation.c" } #line 664 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _g_object_ref0 (_tmp1_); @@ -6098,11 +6114,11 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _tmp7_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 669 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" not_trashed = _tmp7_; -#line 6100 "MediaDataRepresentation.c" +#line 6116 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp8_ = NULL; - GeeIterator* _tmp9_ = NULL; + GeeCollection* _tmp8_; + GeeIterator* _tmp9_; #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = sources; #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6111,15 +6127,15 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _source_it = _tmp9_; #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 6113 "MediaDataRepresentation.c" - GeeIterator* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; +#line 6129 "MediaDataRepresentation.c" + GeeIterator* _tmp10_; + gboolean _tmp11_; MediaSource* source = NULL; - GeeIterator* _tmp12_ = NULL; - gpointer _tmp13_ = NULL; - MediaSource* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; - GeeHashSet* _tmp24_ = NULL; + GeeIterator* _tmp12_; + gpointer _tmp13_; + MediaSource* _tmp14_; + gboolean _tmp15_; + GeeHashSet* _tmp24_; #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = _source_it; #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6128,7 +6144,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo if (!_tmp11_) { #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 6130 "MediaDataRepresentation.c" +#line 6146 "MediaDataRepresentation.c" } #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = _source_it; @@ -6142,69 +6158,69 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _tmp15_ = media_source_is_trashed (_tmp14_); #line 671 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp15_) { -#line 6144 "MediaDataRepresentation.c" - GeeArrayList* _tmp16_ = NULL; - MediaSource* _tmp17_ = NULL; +#line 6160 "MediaDataRepresentation.c" + GeeArrayList* _tmp16_; + MediaSource* _tmp17_; #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = trashed; #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = source; #line 672 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); -#line 6153 "MediaDataRepresentation.c" +#line 6169 "MediaDataRepresentation.c" } else { - MediaSource* _tmp18_ = NULL; - gboolean _tmp19_ = FALSE; + MediaSource* _tmp18_; + gboolean _tmp19_; #line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp18_ = source; #line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp19_ = media_source_is_offline (_tmp18_); #line 673 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp19_) { -#line 6163 "MediaDataRepresentation.c" - GeeArrayList* _tmp20_ = NULL; - MediaSource* _tmp21_ = NULL; +#line 6179 "MediaDataRepresentation.c" + GeeArrayList* _tmp20_; + MediaSource* _tmp21_; #line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp20_ = offlined; #line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp21_ = source; #line 674 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); -#line 6172 "MediaDataRepresentation.c" +#line 6188 "MediaDataRepresentation.c" } else { - GeeArrayList* _tmp22_ = NULL; - MediaSource* _tmp23_ = NULL; + GeeArrayList* _tmp22_; + MediaSource* _tmp23_; #line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp22_ = not_trashed; #line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp23_ = source; #line 676 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp23_); -#line 6182 "MediaDataRepresentation.c" +#line 6198 "MediaDataRepresentation.c" } } #line 678 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp24_ = to_tombstone; #line 678 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp24_ != NULL) { -#line 6189 "MediaDataRepresentation.c" - GeeHashSet* _tmp25_ = NULL; - MediaSource* _tmp26_ = NULL; +#line 6205 "MediaDataRepresentation.c" + GeeHashSet* _tmp25_; + MediaSource* _tmp26_; #line 679 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp25_ = to_tombstone; #line 679 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp26_ = source; #line 679 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_); -#line 6198 "MediaDataRepresentation.c" +#line 6214 "MediaDataRepresentation.c" } #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 6202 "MediaDataRepresentation.c" +#line 6218 "MediaDataRepresentation.c" } #line 670 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 6206 "MediaDataRepresentation.c" +#line 6222 "MediaDataRepresentation.c" } #line 682 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp27_ = sources; @@ -6244,12 +6260,12 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _tmp40__target = monitor_target; #line 687 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp40_ != NULL) { -#line 6246 "MediaDataRepresentation.c" - gint _tmp41_ = 0; - ProgressMonitor _tmp42_ = NULL; - void* _tmp42__target = NULL; - AggregateProgressMonitor* _tmp43_ = NULL; - AggregateProgressMonitor* _tmp44_ = NULL; +#line 6262 "MediaDataRepresentation.c" + gint _tmp41_; + ProgressMonitor _tmp42_; + void* _tmp42__target; + AggregateProgressMonitor* _tmp43_; + AggregateProgressMonitor* _tmp44_; #line 688 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp41_ = total_count; #line 688 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6268,7 +6284,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo monitor = _aggregate_progress_monitor_monitor_progress_monitor; #line 689 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" monitor_target = _tmp44_; -#line 6270 "MediaDataRepresentation.c" +#line 6286 "MediaDataRepresentation.c" } #line 692 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp45_ = trashed; @@ -6278,14 +6294,14 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _tmp47_ = _tmp46_; #line 692 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp47_ > 0) { -#line 6280 "MediaDataRepresentation.c" - MediaSourceHoldingTank* _tmp48_ = NULL; - MediaSourceHoldingTank* _tmp49_ = NULL; - GeeArrayList* _tmp50_ = NULL; - gboolean _tmp51_ = FALSE; - ProgressMonitor _tmp52_ = NULL; - void* _tmp52__target = NULL; - GeeList* _tmp53_ = NULL; +#line 6296 "MediaDataRepresentation.c" + MediaSourceHoldingTank* _tmp48_; + MediaSourceHoldingTank* _tmp49_; + GeeArrayList* _tmp50_; + gboolean _tmp51_; + ProgressMonitor _tmp52_; + void* _tmp52__target; + GeeList* _tmp53_; #line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp48_ = media_source_collection_get_trashcan (self); #line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6304,7 +6320,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo source_holding_tank_destroy_orphans (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_LIST, GeeList), _tmp51_, _tmp52_, _tmp52__target, _tmp53_); #line 693 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp49_); -#line 6306 "MediaDataRepresentation.c" +#line 6322 "MediaDataRepresentation.c" } #line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp54_ = offlined; @@ -6314,14 +6330,14 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _tmp56_ = _tmp55_; #line 695 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp56_ > 0) { -#line 6316 "MediaDataRepresentation.c" - MediaSourceHoldingTank* _tmp57_ = NULL; - MediaSourceHoldingTank* _tmp58_ = NULL; - GeeArrayList* _tmp59_ = NULL; - gboolean _tmp60_ = FALSE; - ProgressMonitor _tmp61_ = NULL; - void* _tmp61__target = NULL; - GeeList* _tmp62_ = NULL; +#line 6332 "MediaDataRepresentation.c" + MediaSourceHoldingTank* _tmp57_; + MediaSourceHoldingTank* _tmp58_; + GeeArrayList* _tmp59_; + gboolean _tmp60_; + ProgressMonitor _tmp61_; + void* _tmp61__target; + GeeList* _tmp62_; #line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp57_ = media_source_collection_get_offline_bin (self); #line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6340,7 +6356,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo source_holding_tank_destroy_orphans (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_LIST, GeeList), _tmp60_, _tmp61_, _tmp61__target, _tmp62_); #line 696 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _source_holding_tank_unref0 (_tmp58_); -#line 6342 "MediaDataRepresentation.c" +#line 6358 "MediaDataRepresentation.c" } #line 699 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp63_ = not_trashed; @@ -6350,14 +6366,14 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _tmp65_ = _tmp64_; #line 699 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp65_ > 0) { -#line 6352 "MediaDataRepresentation.c" - GeeArrayList* _tmp66_ = NULL; - Marker* _tmp67_ = NULL; - Marker* _tmp68_ = NULL; - gboolean _tmp69_ = FALSE; - ProgressMonitor _tmp70_ = NULL; - void* _tmp70__target = NULL; - GeeList* _tmp71_ = NULL; +#line 6368 "MediaDataRepresentation.c" + GeeArrayList* _tmp66_; + Marker* _tmp67_; + Marker* _tmp68_; + gboolean _tmp69_; + ProgressMonitor _tmp70_; + void* _tmp70__target; + GeeList* _tmp71_; #line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp66_ = not_trashed; #line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6376,16 +6392,16 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp68_, _tmp69_, _tmp70_, _tmp70__target, _tmp71_); #line 700 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp68_); -#line 6378 "MediaDataRepresentation.c" +#line 6394 "MediaDataRepresentation.c" } #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp73_ = to_tombstone; #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp73_ != NULL) { -#line 6384 "MediaDataRepresentation.c" - GeeHashSet* _tmp74_ = NULL; - gint _tmp75_ = 0; - gint _tmp76_ = 0; +#line 6400 "MediaDataRepresentation.c" + GeeHashSet* _tmp74_; + gint _tmp75_; + gint _tmp76_; #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp74_ = to_tombstone; #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6394,17 +6410,17 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _tmp76_ = _tmp75_; #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp72_ = _tmp76_ > 0; -#line 6396 "MediaDataRepresentation.c" +#line 6412 "MediaDataRepresentation.c" } else { #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp72_ = FALSE; -#line 6400 "MediaDataRepresentation.c" +#line 6416 "MediaDataRepresentation.c" } #line 702 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp72_) { -#line 6404 "MediaDataRepresentation.c" +#line 6420 "MediaDataRepresentation.c" { - GeeHashSet* _tmp77_ = NULL; + GeeHashSet* _tmp77_; #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp77_ = to_tombstone; #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6413,8 +6429,8 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo if (G_UNLIKELY (_inner_error_ != NULL)) { #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_inner_error_->domain == DATABASE_ERROR) { -#line 6415 "MediaDataRepresentation.c" - goto __catch564_database_error; +#line 6431 "MediaDataRepresentation.c" + goto __catch565_database_error; } #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _aggregate_progress_monitor_unref0 (agg_monitor); @@ -6434,14 +6450,14 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo g_clear_error (&_inner_error_); #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 6436 "MediaDataRepresentation.c" +#line 6452 "MediaDataRepresentation.c" } } - goto __finally564; - __catch564_database_error: + goto __finally565; + __catch565_database_error: { GError* err = NULL; - GError* _tmp78_ = NULL; + GError* _tmp78_; #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" err = _inner_error_; #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6452,9 +6468,9 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo app_window_database_error (_tmp78_); #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); -#line 6454 "MediaDataRepresentation.c" +#line 6470 "MediaDataRepresentation.c" } - __finally564: + __finally565: #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6475,7 +6491,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo g_clear_error (&_inner_error_); #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 6477 "MediaDataRepresentation.c" +#line 6493 "MediaDataRepresentation.c" } } #line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6490,15 +6506,15 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo _g_object_unref0 (to_tombstone); #line 660 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 6492 "MediaDataRepresentation.c" +#line 6508 "MediaDataRepresentation.c" } void media_source_collection_delete_backing_files (MediaSourceCollection* self, GeeCollection* sources, ProgressMonitor monitor, void* monitor_target, GeeList* not_deleted) { gint total_count = 0; - GeeCollection* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + GeeCollection* _tmp0_; + gint _tmp1_; + gint _tmp2_; gint i = 0; GError * _inner_error_ = NULL; #line 713 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6517,11 +6533,11 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, total_count = _tmp2_; #line 716 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" i = 1; -#line 6519 "MediaDataRepresentation.c" +#line 6535 "MediaDataRepresentation.c" { GeeIterator* _source_it = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = sources; #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6530,23 +6546,27 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, _source_it = _tmp4_; #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 6532 "MediaDataRepresentation.c" - GeeIterator* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; +#line 6548 "MediaDataRepresentation.c" + GeeIterator* _tmp5_; + gboolean _tmp6_; MediaSource* source = NULL; - GeeIterator* _tmp7_ = NULL; - gpointer _tmp8_ = NULL; + GeeIterator* _tmp7_; + gpointer _tmp8_; GFile* file = NULL; - MediaSource* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; + MediaSource* _tmp9_; + GFile* _tmp10_; + GFile* masterfile = NULL; + MediaSource* _tmp17_; + GFile* _tmp18_; + GFile* _tmp19_; gboolean deleted = FALSE; - GFile* _tmp17_ = NULL; - gboolean _tmp18_ = FALSE; - gboolean _tmp19_ = FALSE; - gboolean _tmp20_ = FALSE; - ProgressMonitor _tmp24_ = NULL; - void* _tmp24__target = NULL; - gint _tmp28_ = 0; + GFile* _tmp27_; + gboolean _tmp28_; + gboolean _tmp29_ = FALSE; + gboolean _tmp30_; + ProgressMonitor _tmp34_; + void* _tmp34__target; + gint _tmp38_; #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _source_it; #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6555,7 +6575,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, if (!_tmp6_) { #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 6557 "MediaDataRepresentation.c" +#line 6577 "MediaDataRepresentation.c" } #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = _source_it; @@ -6569,28 +6589,28 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, _tmp10_ = media_source_get_file (_tmp9_); #line 719 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" file = _tmp10_; -#line 6571 "MediaDataRepresentation.c" +#line 6591 "MediaDataRepresentation.c" { - GFile* _tmp11_ = NULL; + GFile* _tmp11_; #line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = file; #line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_file_delete (_tmp11_, NULL, &_inner_error_); #line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6580 "MediaDataRepresentation.c" - goto __catch565_g_error; +#line 6600 "MediaDataRepresentation.c" + goto __catch566_g_error; } } - goto __finally565; - __catch565_g_error: + goto __finally566; + __catch566_g_error: { GError* err = NULL; - GFile* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - GError* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; + GFile* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + GError* _tmp15_; + const gchar* _tmp16_; #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" err = _inner_error_; #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6611,9 +6631,9 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, _g_free0 (_tmp14_); #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_error_free0 (err); -#line 6613 "MediaDataRepresentation.c" +#line 6633 "MediaDataRepresentation.c" } - __finally565: + __finally566: #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6628,79 +6648,164 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self, g_clear_error (&_inner_error_); #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 6630 "MediaDataRepresentation.c" +#line 6650 "MediaDataRepresentation.c" } #line 727 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp17_ = file; + _tmp17_ = source; #line 727 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp18_ = g_file_query_exists (_tmp17_, NULL); + _tmp18_ = media_source_get_master_file (_tmp17_); #line 727 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - deleted = !_tmp18_; -#line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp20_ = deleted; + masterfile = _tmp18_; #line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (!_tmp20_) { -#line 6642 "MediaDataRepresentation.c" - GeeList* _tmp21_ = NULL; + _tmp19_ = masterfile; #line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp21_ = not_deleted; -#line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp19_ = NULL != _tmp21_; -#line 6648 "MediaDataRepresentation.c" - } else { -#line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp19_ = FALSE; -#line 6652 "MediaDataRepresentation.c" - } -#line 728 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp19_) { -#line 6656 "MediaDataRepresentation.c" - GeeList* _tmp22_ = NULL; - MediaSource* _tmp23_ = NULL; -#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp22_ = not_deleted; + if (_tmp19_ != NULL) { +#line 6662 "MediaDataRepresentation.c" + { + GFile* _tmp20_; +#line 730 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp20_ = masterfile; +#line 730 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_file_delete (_tmp20_, NULL, &_inner_error_); +#line 730 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 6671 "MediaDataRepresentation.c" + goto __catch567_g_error; + } + } + goto __finally567; + __catch567_g_error: + { + GError* err = NULL; + GError* _tmp21_; #line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp23_ = source; + err = _inner_error_; #line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_); -#line 6665 "MediaDataRepresentation.c" - } -#line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp24_ = monitor; + _inner_error_ = NULL; #line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp24__target = monitor_target; + _tmp21_ = err; #line 732 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - if (_tmp24_ != NULL) { -#line 6673 "MediaDataRepresentation.c" - ProgressMonitor _tmp25_ = NULL; - void* _tmp25__target = NULL; - gint _tmp26_ = 0; - gint _tmp27_ = 0; + if (!g_error_matches (_tmp21_, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) { +#line 6688 "MediaDataRepresentation.c" + GFile* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + GError* _tmp25_; + const gchar* _tmp26_; #line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp25_ = monitor; + _tmp22_ = masterfile; #line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp25__target = monitor_target; + _tmp23_ = g_file_get_path (_tmp22_); #line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp26_ = i; + _tmp24_ = _tmp23_; #line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp27_ = total_count; + _tmp25_ = err; #line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp25_ ((guint64) _tmp26_, (guint64) _tmp27_, TRUE, _tmp25__target); -#line 6688 "MediaDataRepresentation.c" + _tmp26_ = _tmp25_->message; +#line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_debug ("MediaDataRepresentation.vala:733: Exception deleting master file %s: %" \ +"s", _tmp24_, _tmp26_); +#line 733 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _g_free0 (_tmp24_); +#line 6708 "MediaDataRepresentation.c" + } +#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _g_error_free0 (err); +#line 6712 "MediaDataRepresentation.c" + } + __finally567: +#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _g_object_unref0 (masterfile); +#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _g_object_unref0 (file); +#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _g_object_unref0 (source); +#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _g_object_unref0 (_source_it); +#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); +#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_clear_error (&_inner_error_); +#line 729 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + return; +#line 6731 "MediaDataRepresentation.c" + } + } +#line 738 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp27_ = file; +#line 738 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp28_ = g_file_query_exists (_tmp27_, NULL); +#line 738 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + deleted = !_tmp28_; +#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp30_ = deleted; +#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + if (!_tmp30_) { +#line 6744 "MediaDataRepresentation.c" + GeeList* _tmp31_; +#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp31_ = not_deleted; +#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp29_ = NULL != _tmp31_; +#line 6750 "MediaDataRepresentation.c" + } else { +#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp29_ = FALSE; +#line 6754 "MediaDataRepresentation.c" + } +#line 739 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + if (_tmp29_) { +#line 6758 "MediaDataRepresentation.c" + GeeList* _tmp32_; + MediaSource* _tmp33_; +#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp32_ = not_deleted; +#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp33_ = source; +#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection), _tmp33_); +#line 6767 "MediaDataRepresentation.c" } -#line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - _tmp28_ = i; -#line 735 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - i = _tmp28_ + 1; +#line 743 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp34_ = monitor; +#line 743 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp34__target = monitor_target; +#line 743 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + if (_tmp34_ != NULL) { +#line 6775 "MediaDataRepresentation.c" + ProgressMonitor _tmp35_; + void* _tmp35__target; + gint _tmp36_; + gint _tmp37_; +#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp35_ = monitor; +#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp35__target = monitor_target; +#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp36_ = i; +#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp37_ = total_count; +#line 744 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp35_ ((guint64) _tmp36_, (guint64) _tmp37_, TRUE, _tmp35__target); +#line 6790 "MediaDataRepresentation.c" + } +#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _tmp38_ = i; +#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + i = _tmp38_ + 1; +#line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + _g_object_unref0 (masterfile); #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (file); #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (source); -#line 6698 "MediaDataRepresentation.c" +#line 6802 "MediaDataRepresentation.c" } #line 718 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_source_it); -#line 6702 "MediaDataRepresentation.c" +#line 6806 "MediaDataRepresentation.c" } } @@ -6710,21 +6815,21 @@ TransactionController* media_source_collection_get_transaction_controller (Media g_return_val_if_fail (IS_MEDIA_SOURCE_COLLECTION (self), NULL); #line 342 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return MEDIA_SOURCE_COLLECTION_GET_CLASS (self)->get_transaction_controller (self); -#line 6712 "MediaDataRepresentation.c" +#line 6816 "MediaDataRepresentation.c" } static void media_source_collection_real_media_import_starting (MediaSourceCollection* self, GeeCollection* media) { #line 355 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); -#line 6719 "MediaDataRepresentation.c" +#line 6823 "MediaDataRepresentation.c" } static void media_source_collection_real_media_import_completed (MediaSourceCollection* self, GeeCollection* media) { #line 362 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (GEE_IS_COLLECTION (media)); -#line 6726 "MediaDataRepresentation.c" +#line 6830 "MediaDataRepresentation.c" } @@ -6735,7 +6840,7 @@ static void media_source_collection_real_master_file_replaced (MediaSourceCollec g_return_if_fail (G_IS_FILE (old_file)); #line 365 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_IS_FILE (new_file)); -#line 6737 "MediaDataRepresentation.c" +#line 6841 "MediaDataRepresentation.c" } @@ -6754,19 +6859,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closu data1 = closure->data; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data2 = param_values->data[0].v_pointer; -#line 6756 "MediaDataRepresentation.c" +#line 6860 "MediaDataRepresentation.c" } else { #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data1 = param_values->data[0].v_pointer; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data2 = closure->data; -#line 6762 "MediaDataRepresentation.c" +#line 6866 "MediaDataRepresentation.c" } #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_object (param_values + 3), data2); -#line 6768 "MediaDataRepresentation.c" +#line 6872 "MediaDataRepresentation.c" } @@ -6775,7 +6880,7 @@ static void media_source_collection_real_trashcan_contents_altered (MediaSourceC g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); #line 368 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 6777 "MediaDataRepresentation.c" +#line 6881 "MediaDataRepresentation.c" } @@ -6788,7 +6893,7 @@ static void media_source_collection_real_offline_contents_altered (MediaSourceCo g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added)); #line 375 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed)); -#line 6790 "MediaDataRepresentation.c" +#line 6894 "MediaDataRepresentation.c" } @@ -6804,37 +6909,37 @@ static void media_source_collection_class_init (MediaSourceCollectionClass * kla #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_class_add_private (klass, sizeof (MediaSourceCollectionPrivate)); #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->create_trashcan = (MediaSourceHoldingTank* (*)(MediaSourceCollection*)) media_source_collection_real_create_trashcan; + ((MediaSourceCollectionClass *) klass)->create_trashcan = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) media_source_collection_real_create_trashcan; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->create_offline_bin = (MediaSourceHoldingTank* (*)(MediaSourceCollection*)) media_source_collection_real_create_offline_bin; + ((MediaSourceCollectionClass *) klass)->create_offline_bin = (MediaSourceHoldingTank* (*) (MediaSourceCollection *)) media_source_collection_real_create_offline_bin; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->create_media_monitor = (MediaMonitor* (*)(MediaSourceCollection*, Workers*, GCancellable*)) media_source_collection_real_create_media_monitor; + ((MediaSourceCollectionClass *) klass)->create_media_monitor = (MediaMonitor* (*) (MediaSourceCollection *, Workers*, GCancellable*)) media_source_collection_real_create_media_monitor; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->get_typename = (gchar* (*)(MediaSourceCollection*)) media_source_collection_real_get_typename; + ((MediaSourceCollectionClass *) klass)->get_typename = (gchar* (*) (MediaSourceCollection *)) media_source_collection_real_get_typename; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->is_file_recognized = (gboolean (*)(MediaSourceCollection*, GFile*)) media_source_collection_real_is_file_recognized; + ((MediaSourceCollectionClass *) klass)->is_file_recognized = (gboolean (*) (MediaSourceCollection *, GFile*)) media_source_collection_real_is_file_recognized; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = (MediaSource* (*)(MediaSourceCollection*, gint64)) media_source_collection_real_fetch_by_numeric_id; + ((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = (MediaSource* (*) (MediaSourceCollection *, gint64)) media_source_collection_real_fetch_by_numeric_id; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->notify_import_roll_altered = (void (*)(MediaSourceCollection*)) media_source_collection_real_notify_import_roll_altered; + ((MediaSourceCollectionClass *) klass)->notify_import_roll_altered = (void (*) (MediaSourceCollection *)) media_source_collection_real_notify_import_roll_altered; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->notify_flagged_contents_altered = (void (*)(MediaSourceCollection*)) media_source_collection_real_notify_flagged_contents_altered; + ((MediaSourceCollectionClass *) klass)->notify_flagged_contents_altered = (void (*) (MediaSourceCollection *)) media_source_collection_real_notify_flagged_contents_altered; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->notify_media_import_starting = (void (*)(MediaSourceCollection*, GeeCollection*)) media_source_collection_real_notify_media_import_starting; + ((MediaSourceCollectionClass *) klass)->notify_media_import_starting = (void (*) (MediaSourceCollection *, GeeCollection*)) media_source_collection_real_notify_media_import_starting; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->notify_media_import_completed = (void (*)(MediaSourceCollection*, GeeCollection*)) media_source_collection_real_notify_media_import_completed; + ((MediaSourceCollectionClass *) klass)->notify_media_import_completed = (void (*) (MediaSourceCollection *, GeeCollection*)) media_source_collection_real_notify_media_import_completed; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((DataCollectionClass *) klass)->items_altered = (void (*)(DataCollection*, GeeMap*)) media_source_collection_real_items_altered; + ((DataCollectionClass *) klass)->items_altered = (void (*) (DataCollection *, GeeMap*)) media_source_collection_real_items_altered; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((DataCollectionClass *) klass)->notify_contents_altered = (void (*)(DataCollection*, GeeIterable*, GeeIterable*)) media_source_collection_real_notify_contents_altered; + ((DataCollectionClass *) klass)->notify_contents_altered = (void (*) (DataCollection *, GeeIterable*, GeeIterable*)) media_source_collection_real_notify_contents_altered; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->fetch_by_source_id = (MediaSource* (*)(MediaSourceCollection*, const gchar*)) media_source_collection_real_fetch_by_source_id; + ((MediaSourceCollectionClass *) klass)->fetch_by_source_id = (MediaSource* (*) (MediaSourceCollection *, const gchar*)) media_source_collection_real_fetch_by_source_id; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->get_event_source_ids = (GeeCollection* (*)(MediaSourceCollection*, EventID*)) media_source_collection_real_get_event_source_ids; + ((MediaSourceCollectionClass *) klass)->get_event_source_ids = (GeeCollection* (*) (MediaSourceCollection *, EventID*)) media_source_collection_real_get_event_source_ids; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->import_many = (void (*)(MediaSourceCollection*, GeeCollection*)) media_source_collection_real_import_many; + ((MediaSourceCollectionClass *) klass)->import_many = (void (*) (MediaSourceCollection *, GeeCollection*)) media_source_collection_real_import_many; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - ((MediaSourceCollectionClass *) klass)->postprocess_imported_media = (void (*)(MediaSourceCollection*, GeeCollection*)) media_source_collection_real_postprocess_imported_media; + ((MediaSourceCollectionClass *) klass)->postprocess_imported_media = (void (*) (MediaSourceCollection *, GeeCollection*)) media_source_collection_real_postprocess_imported_media; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaSourceCollectionClass *) klass)->media_import_starting = media_source_collection_real_media_import_starting; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6850,28 +6955,28 @@ static void media_source_collection_class_init (MediaSourceCollectionClass * kla #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaSourceCollectionClass *) klass)->flagged_contents_altered = media_source_collection_real_flagged_contents_altered; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_new ("media_import_starting", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, media_import_starting), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); + media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_STARTING_SIGNAL] = g_signal_new ("media-import-starting", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, media_import_starting), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_new ("media_import_completed", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, media_import_completed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); + media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MEDIA_IMPORT_COMPLETED_SIGNAL] = g_signal_new ("media-import-completed", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, media_import_completed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GEE_TYPE_COLLECTION); #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_new ("master_file_replaced", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, master_file_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, g_file_get_type (), g_file_get_type ()); + media_source_collection_signals[MEDIA_SOURCE_COLLECTION_MASTER_FILE_REPLACED_SIGNAL] = g_signal_new ("master-file-replaced", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, master_file_replaced), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, g_file_get_type (), g_file_get_type ()); #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_new ("trashcan_contents_altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, trashcan_contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION); + media_source_collection_signals[MEDIA_SOURCE_COLLECTION_TRASHCAN_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, trashcan_contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION); #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_new ("import_roll_altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, import_roll_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + media_source_collection_signals[MEDIA_SOURCE_COLLECTION_IMPORT_ROLL_ALTERED_SIGNAL] = g_signal_new ("import-roll-altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, import_roll_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_new ("offline_contents_altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, offline_contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION); + media_source_collection_signals[MEDIA_SOURCE_COLLECTION_OFFLINE_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("offline-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, offline_contents_altered), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GEE_TYPE_COLLECTION, GEE_TYPE_COLLECTION); #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_signal_new ("flagged_contents_altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, flagged_contents_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 6865 "MediaDataRepresentation.c" + media_source_collection_signals[MEDIA_SOURCE_COLLECTION_FLAGGED_CONTENTS_ALTERED_SIGNAL] = g_signal_new ("flagged-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (MediaSourceCollectionClass, flagged_contents_altered), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); +#line 6969 "MediaDataRepresentation.c" } static void media_source_collection_instance_init (MediaSourceCollection * self) { - GeeHashMap* _tmp0_ = NULL; - GeeTreeMultiMap* _tmp1_ = NULL; - GeeTreeSet* _tmp2_ = NULL; - GeeHashSet* _tmp3_ = NULL; + GeeHashMap* _tmp0_; + GeeTreeMultiMap* _tmp1_; + GeeTreeSet* _tmp2_; + GeeHashSet* _tmp3_; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv = MEDIA_SOURCE_COLLECTION_GET_PRIVATE (self); #line 344 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" @@ -6894,11 +6999,11 @@ static void media_source_collection_instance_init (MediaSourceCollection * self) _tmp3_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL); #line 351 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->flagged = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SET, GeeSet); -#line 6896 "MediaDataRepresentation.c" +#line 7000 "MediaDataRepresentation.c" } -static void media_source_collection_finalize (DataCollection* obj) { +static void media_source_collection_finalize (DataCollection * obj) { MediaSourceCollection * self; #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection); @@ -6916,7 +7021,7 @@ static void media_source_collection_finalize (DataCollection* obj) { _g_object_unref0 (self->priv->flagged); #line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" DATA_COLLECTION_CLASS (media_source_collection_parent_class)->finalize (obj); -#line 6918 "MediaDataRepresentation.c" +#line 7022 "MediaDataRepresentation.c" } @@ -6933,654 +7038,654 @@ GType media_source_collection_get_type (void) { static void _media_collection_registry_on_init_done_application_init_done (Application* _sender, gpointer self) { -#line 754 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_on_init_done ((MediaCollectionRegistry*) self); -#line 6937 "MediaDataRepresentation.c" +#line 7041 "MediaDataRepresentation.c" } static MediaCollectionRegistry* media_collection_registry_construct (GType object_type) { MediaCollectionRegistry* self = NULL; - Application* _tmp0_ = NULL; - Application* _tmp1_ = NULL; -#line 749 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + Application* _tmp0_; + Application* _tmp1_; +#line 760 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = (MediaCollectionRegistry*) g_type_create_instance (object_type); -#line 750 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 761 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = application_get_instance (); -#line 750 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 761 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 750 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 761 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_connect (_tmp1_, "init-done", (GCallback) _media_collection_registry_on_init_done_application_init_done, self); -#line 750 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 761 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _application_unref0 (_tmp1_); -#line 749 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 760 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self; -#line 6957 "MediaDataRepresentation.c" +#line 7061 "MediaDataRepresentation.c" } static MediaCollectionRegistry* media_collection_registry_new (void) { -#line 749 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 760 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return media_collection_registry_construct (TYPE_MEDIA_COLLECTION_REGISTRY); -#line 6964 "MediaDataRepresentation.c" +#line 7068 "MediaDataRepresentation.c" } static void media_collection_registry_on_init_done (MediaCollectionRegistry* self) { LibraryMonitor* library_monitor = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - LibraryMonitor* _tmp3_ = NULL; - LibraryMonitor* _tmp4_ = NULL; - LibraryMonitorPool* _tmp5_ = NULL; - LibraryMonitorPool* _tmp6_ = NULL; -#line 757 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GFile* _tmp0_; + GFile* _tmp1_; + gboolean _tmp2_; + LibraryMonitor* _tmp3_; + LibraryMonitor* _tmp4_; + LibraryMonitorPool* _tmp5_; + LibraryMonitorPool* _tmp6_; +#line 768 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); -#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = app_dirs_get_import_dir (); -#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = commandline_options_no_runtime_monitoring; -#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = library_monitor_new (_tmp1_, TRUE, !_tmp2_); -#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _tmp3_; -#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 759 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 770 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" library_monitor = _tmp4_; -#line 762 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 773 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = library_monitor_pool_get_instance (); -#line 762 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 773 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _tmp5_; -#line 762 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 773 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" library_monitor_pool_replace (_tmp6_, library_monitor, MEDIA_COLLECTION_REGISTRY_LIBRARY_MONITOR_START_DELAY_MSEC); -#line 762 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 773 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _library_monitor_pool_unref0 (_tmp6_); -#line 757 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 768 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (library_monitor); -#line 7003 "MediaDataRepresentation.c" +#line 7107 "MediaDataRepresentation.c" } static void _media_collection_registry_on_import_directory_changed_configuration_facade_import_directory_changed (ConfigurationFacade* _sender, gpointer self) { -#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_on_import_directory_changed (); -#line 7010 "MediaDataRepresentation.c" +#line 7114 "MediaDataRepresentation.c" } void media_collection_registry_init (void) { - MediaCollectionRegistry* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - ConfigFacade* _tmp2_ = NULL; -#line 766 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + MediaCollectionRegistry* _tmp0_; + ConfigFacade* _tmp1_; + ConfigFacade* _tmp2_; +#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_collection_registry_new (); -#line 766 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _media_collection_registry_unref0 (media_collection_registry_instance); -#line 766 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_instance = _tmp0_; -#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = config_facade_get_instance (); -#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _tmp1_; -#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "import-directory-changed", (GCallback) _media_collection_registry_on_import_directory_changed_configuration_facade_import_directory_changed, NULL); -#line 767 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp2_); -#line 7032 "MediaDataRepresentation.c" +#line 7136 "MediaDataRepresentation.c" } void media_collection_registry_terminate (void) { - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - guint _tmp2_ = 0U; -#line 771 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + guint _tmp2_; +#line 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = config_facade_get_instance (); -#line 771 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 771 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_parse_name ("import-directory-changed", TYPE_CONFIGURATION_FACADE, &_tmp2_, NULL, FALSE); -#line 771 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _media_collection_registry_on_import_directory_changed_configuration_facade_import_directory_changed, NULL); -#line 771 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 782 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 7050 "MediaDataRepresentation.c" +#line 7154 "MediaDataRepresentation.c" } static void media_collection_registry_on_import_directory_changed (void) { GFile* import_dir = NULL; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; LibraryMonitor* current = NULL; - LibraryMonitorPool* _tmp1_ = NULL; - LibraryMonitorPool* _tmp2_ = NULL; - LibraryMonitor* _tmp3_ = NULL; - LibraryMonitor* _tmp4_ = NULL; + LibraryMonitorPool* _tmp1_; + LibraryMonitorPool* _tmp2_; + LibraryMonitor* _tmp3_; + LibraryMonitor* _tmp4_; gboolean _tmp5_ = FALSE; - LibraryMonitor* _tmp6_ = NULL; + LibraryMonitor* _tmp6_; LibraryMonitor* replacement = NULL; - GFile* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - LibraryMonitor* _tmp14_ = NULL; - LibraryMonitorPool* _tmp15_ = NULL; - LibraryMonitorPool* _tmp16_ = NULL; - LibraryMonitor* _tmp17_ = NULL; -#line 775 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GFile* _tmp12_; + gboolean _tmp13_; + LibraryMonitor* _tmp14_; + LibraryMonitorPool* _tmp15_; + LibraryMonitorPool* _tmp16_; + LibraryMonitor* _tmp17_; +#line 786 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = app_dirs_get_import_dir (); -#line 775 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 786 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" import_dir = _tmp0_; -#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = library_monitor_pool_get_instance (); -#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _tmp1_; -#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = library_monitor_pool_get_monitor (_tmp2_); -#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _tmp3_; -#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _library_monitor_pool_unref0 (_tmp2_); -#line 777 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 788 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" current = _tmp4_; -#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = current; -#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp6_ != NULL) { -#line 7091 "MediaDataRepresentation.c" - LibraryMonitor* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; -#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 7195 "MediaDataRepresentation.c" + LibraryMonitor* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; + GFile* _tmp10_; + gboolean _tmp11_; +#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = current; -#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor)); -#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = _tmp8_; -#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = import_dir; -#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = g_file_equal (_tmp9_, _tmp10_); -#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _tmp11_; -#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp9_); -#line 7111 "MediaDataRepresentation.c" +#line 7215 "MediaDataRepresentation.c" } else { -#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = FALSE; -#line 7115 "MediaDataRepresentation.c" +#line 7219 "MediaDataRepresentation.c" } -#line 778 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 789 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp5_) { -#line 779 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (current); -#line 779 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (import_dir); -#line 779 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return; -#line 7125 "MediaDataRepresentation.c" +#line 7229 "MediaDataRepresentation.c" } -#line 781 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = import_dir; -#line 781 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = commandline_options_no_runtime_monitoring; -#line 781 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp14_ = library_monitor_new (_tmp12_, TRUE, !_tmp13_); -#line 781 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 792 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" replacement = _tmp14_; -#line 783 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = library_monitor_pool_get_instance (); -#line 783 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = _tmp15_; -#line 783 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = replacement; -#line 783 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" library_monitor_pool_replace (_tmp16_, _tmp17_, MEDIA_COLLECTION_REGISTRY_LIBRARY_MONITOR_START_DELAY_MSEC); -#line 783 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _library_monitor_pool_unref0 (_tmp16_); -#line 774 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 785 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (replacement); -#line 774 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 785 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (current); -#line 774 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 785 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (import_dir); -#line 7151 "MediaDataRepresentation.c" +#line 7255 "MediaDataRepresentation.c" } static gpointer _media_collection_registry_ref0 (gpointer self) { -#line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? media_collection_registry_ref (self) : NULL; -#line 7158 "MediaDataRepresentation.c" +#line 7262 "MediaDataRepresentation.c" } MediaCollectionRegistry* media_collection_registry_get_instance (void) { MediaCollectionRegistry* result = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; -#line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; +#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_collection_registry_instance; -#line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _media_collection_registry_ref0 (_tmp0_); -#line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp1_; -#line 787 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 798 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7174 "MediaDataRepresentation.c" +#line 7278 "MediaDataRepresentation.c" } gchar* media_collection_registry_get_typename_from_source_id (const gchar* source_id) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; -#line 790 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + const gchar* _tmp0_; + gboolean _tmp1_; +#line 801 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (source_id != NULL, NULL); -#line 793 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 804 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = source_id; -#line 793 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 804 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = g_str_has_prefix (_tmp0_, PHOTO_TYPENAME); -#line 793 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 804 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp1_) { -#line 7190 "MediaDataRepresentation.c" - gchar* _tmp2_ = NULL; -#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 7294 "MediaDataRepresentation.c" + gchar* _tmp2_; +#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = g_strdup (PHOTO_TYPENAME); -#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp2_; -#line 794 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7198 "MediaDataRepresentation.c" +#line 7302 "MediaDataRepresentation.c" } else { gchar** components = NULL; - const gchar* _tmp3_ = NULL; - gchar** _tmp4_ = NULL; - gchar** _tmp5_ = NULL; - gint components_length1 = 0; - gint _components_size_ = 0; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; -#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + const gchar* _tmp3_; + gchar** _tmp4_; + gchar** _tmp5_; + gint components_length1; + gint _components_size_; + gchar** _tmp6_; + gint _tmp6__length1; + gchar** _tmp7_; + gint _tmp7__length1; + const gchar* _tmp8_; + gchar* _tmp9_; +#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = source_id; -#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _tmp4_ = g_strsplit (_tmp3_, "-", 0); -#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" components = _tmp5_; -#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" components_length1 = _vala_array_length (_tmp4_); -#line 796 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 807 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _components_size_ = components_length1; -#line 797 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = components; -#line 797 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6__length1 = components_length1; -#line 797 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 808 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _vala_assert (_tmp6__length1 == 2, "components.length == 2"); -#line 799 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = components; -#line 799 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7__length1 = components_length1; -#line 799 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = _tmp7_[0]; -#line 799 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = g_strdup (_tmp8_); -#line 799 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp9_; -#line 799 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" components = (_vala_array_free (components, components_length1, (GDestroyNotify) g_free), NULL); -#line 799 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 810 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7242 "MediaDataRepresentation.c" +#line 7346 "MediaDataRepresentation.c" } } void media_collection_registry_register_collection (MediaCollectionRegistry* self, MediaSourceCollection* collection) { - GeeArrayList* _tmp0_ = NULL; - MediaSourceCollection* _tmp1_ = NULL; - GeeHashMap* _tmp2_ = NULL; - MediaSourceCollection* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - MediaSourceCollection* _tmp6_ = NULL; -#line 803 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GeeArrayList* _tmp0_; + MediaSourceCollection* _tmp1_; + GeeHashMap* _tmp2_; + MediaSourceCollection* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + MediaSourceCollection* _tmp6_; +#line 814 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); -#line 803 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 814 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_SOURCE_COLLECTION (collection)); -#line 804 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 815 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->all; -#line 804 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 815 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = collection; -#line 804 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 815 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = self->priv->by_typename; -#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = collection; -#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = media_source_collection_get_typename (_tmp3_); -#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _tmp4_; -#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = collection; -#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, _tmp6_); -#line 805 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (_tmp5_); -#line 7279 "MediaDataRepresentation.c" +#line 7383 "MediaDataRepresentation.c" } MediaSourceCollection* media_collection_registry_get_collection (MediaCollectionRegistry* self, const gchar* typename) { MediaSourceCollection* result = NULL; - GeeHashMap* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; -#line 812 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GeeHashMap* _tmp0_; + const gchar* _tmp1_; + gpointer _tmp2_; +#line 823 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL); -#line 812 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 823 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (typename != NULL, NULL); -#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->by_typename; -#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = typename; -#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = (MediaSourceCollection*) _tmp2_; -#line 813 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 824 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7302 "MediaDataRepresentation.c" +#line 7406 "MediaDataRepresentation.c" } GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self) { GeeCollection* result = NULL; - GeeArrayList* _tmp0_ = NULL; - GeeBidirList* _tmp1_ = NULL; - GeeBidirList* _tmp2_ = NULL; -#line 816 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GeeArrayList* _tmp0_; + GeeBidirList* _tmp1_; + GeeBidirList* _tmp2_; +#line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL); -#line 817 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = self->priv->all; -#line 817 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = gee_abstract_bidir_list_get_read_only_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_BIDIR_LIST, GeeAbstractBidirList)); -#line 817 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _tmp1_; -#line 817 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection); -#line 817 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 828 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7323 "MediaDataRepresentation.c" +#line 7427 "MediaDataRepresentation.c" } void media_collection_registry_freeze_all (MediaCollectionRegistry* self) { -#line 820 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); -#line 7330 "MediaDataRepresentation.c" +#line 7434 "MediaDataRepresentation.c" { GeeIterator* _sources_it = NULL; - GeeCollection* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; - GeeIterator* _tmp3_ = NULL; -#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; + GeeIterator* _tmp3_; +#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_collection_registry_get_all (self); -#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _tmp2_; -#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _sources_it = _tmp3_; -#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7351 "MediaDataRepresentation.c" - GeeIterator* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; +#line 7455 "MediaDataRepresentation.c" + GeeIterator* _tmp4_; + gboolean _tmp5_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp6_ = NULL; - gpointer _tmp7_ = NULL; - MediaSourceCollection* _tmp8_ = NULL; -#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GeeIterator* _tmp6_; + gpointer _tmp7_; + MediaSourceCollection* _tmp8_; +#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _sources_it; -#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = gee_iterator_next (_tmp4_); -#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp5_) { -#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7366 "MediaDataRepresentation.c" +#line 7470 "MediaDataRepresentation.c" } -#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _sources_it; -#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = gee_iterator_get (_tmp6_); -#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" sources = (MediaSourceCollection*) _tmp7_; -#line 822 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 833 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = sources; -#line 822 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 833 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection)); -#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (sources); -#line 7380 "MediaDataRepresentation.c" +#line 7484 "MediaDataRepresentation.c" } -#line 821 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_sources_it); -#line 7384 "MediaDataRepresentation.c" +#line 7488 "MediaDataRepresentation.c" } } void media_collection_registry_thaw_all (MediaCollectionRegistry* self) { -#line 825 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); -#line 7392 "MediaDataRepresentation.c" +#line 7496 "MediaDataRepresentation.c" { GeeIterator* _sources_it = NULL; - GeeCollection* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; - GeeIterator* _tmp3_ = NULL; -#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; + GeeIterator* _tmp3_; +#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_collection_registry_get_all (self); -#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _tmp2_; -#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _sources_it = _tmp3_; -#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7413 "MediaDataRepresentation.c" - GeeIterator* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; +#line 7517 "MediaDataRepresentation.c" + GeeIterator* _tmp4_; + gboolean _tmp5_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp6_ = NULL; - gpointer _tmp7_ = NULL; - MediaSourceCollection* _tmp8_ = NULL; -#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GeeIterator* _tmp6_; + gpointer _tmp7_; + MediaSourceCollection* _tmp8_; +#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _sources_it; -#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = gee_iterator_next (_tmp4_); -#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp5_) { -#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7428 "MediaDataRepresentation.c" +#line 7532 "MediaDataRepresentation.c" } -#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _sources_it; -#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = gee_iterator_get (_tmp6_); -#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" sources = (MediaSourceCollection*) _tmp7_; -#line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 838 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = sources; -#line 827 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 838 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection)); -#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (sources); -#line 7442 "MediaDataRepresentation.c" +#line 7546 "MediaDataRepresentation.c" } -#line 826 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_sources_it); -#line 7446 "MediaDataRepresentation.c" +#line 7550 "MediaDataRepresentation.c" } } void media_collection_registry_begin_transaction_on_all (MediaCollectionRegistry* self) { -#line 830 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 841 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); -#line 7454 "MediaDataRepresentation.c" +#line 7558 "MediaDataRepresentation.c" { GeeIterator* _sources_it = NULL; - GeeCollection* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; - GeeIterator* _tmp3_ = NULL; -#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; + GeeIterator* _tmp3_; +#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_collection_registry_get_all (self); -#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _tmp2_; -#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _sources_it = _tmp3_; -#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7475 "MediaDataRepresentation.c" - GeeIterator* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; +#line 7579 "MediaDataRepresentation.c" + GeeIterator* _tmp4_; + gboolean _tmp5_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp6_ = NULL; - gpointer _tmp7_ = NULL; - MediaSourceCollection* _tmp8_ = NULL; - TransactionController* _tmp9_ = NULL; - TransactionController* _tmp10_ = NULL; -#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GeeIterator* _tmp6_; + gpointer _tmp7_; + MediaSourceCollection* _tmp8_; + TransactionController* _tmp9_; + TransactionController* _tmp10_; +#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _sources_it; -#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = gee_iterator_next (_tmp4_); -#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp5_) { -#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7492 "MediaDataRepresentation.c" +#line 7596 "MediaDataRepresentation.c" } -#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _sources_it; -#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = gee_iterator_get (_tmp6_); -#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" sources = (MediaSourceCollection*) _tmp7_; -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = sources; -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = media_source_collection_get_transaction_controller (_tmp8_); -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = _tmp9_; -#line 832 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" transaction_controller_begin (_tmp10_); -#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (sources); -#line 7510 "MediaDataRepresentation.c" +#line 7614 "MediaDataRepresentation.c" } -#line 831 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 842 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_sources_it); -#line 7514 "MediaDataRepresentation.c" +#line 7618 "MediaDataRepresentation.c" } } void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistry* self) { -#line 835 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self)); -#line 7522 "MediaDataRepresentation.c" +#line 7626 "MediaDataRepresentation.c" { GeeIterator* _sources_it = NULL; - GeeCollection* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; - GeeIterator* _tmp3_ = NULL; -#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; + GeeIterator* _tmp3_; +#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_collection_registry_get_all (self); -#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _tmp2_; -#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _sources_it = _tmp3_; -#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7543 "MediaDataRepresentation.c" - GeeIterator* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; +#line 7647 "MediaDataRepresentation.c" + GeeIterator* _tmp4_; + gboolean _tmp5_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp6_ = NULL; - gpointer _tmp7_ = NULL; - MediaSourceCollection* _tmp8_ = NULL; - TransactionController* _tmp9_ = NULL; - TransactionController* _tmp10_ = NULL; -#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GeeIterator* _tmp6_; + gpointer _tmp7_; + MediaSourceCollection* _tmp8_; + TransactionController* _tmp9_; + TransactionController* _tmp10_; +#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _sources_it; -#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = gee_iterator_next (_tmp4_); -#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp5_) { -#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7560 "MediaDataRepresentation.c" +#line 7664 "MediaDataRepresentation.c" } -#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _sources_it; -#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = gee_iterator_get (_tmp6_); -#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" sources = (MediaSourceCollection*) _tmp7_; -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 848 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = sources; -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 848 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = media_source_collection_get_transaction_controller (_tmp8_); -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 848 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = _tmp9_; -#line 837 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 848 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" transaction_controller_commit (_tmp10_); -#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (sources); -#line 7578 "MediaDataRepresentation.c" +#line 7682 "MediaDataRepresentation.c" } -#line 836 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 847 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_sources_it); -#line 7582 "MediaDataRepresentation.c" +#line 7686 "MediaDataRepresentation.c" } } @@ -7588,206 +7693,206 @@ void media_collection_registry_commit_transaction_on_all (MediaCollectionRegistr MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* self, const gchar* source_id) { MediaSource* result = NULL; gchar* typename = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; MediaSourceCollection* collection = NULL; - const gchar* _tmp2_ = NULL; - MediaSourceCollection* _tmp3_ = NULL; - MediaSourceCollection* _tmp4_ = NULL; - MediaSourceCollection* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - MediaSource* _tmp9_ = NULL; -#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + const gchar* _tmp2_; + MediaSourceCollection* _tmp3_; + MediaSourceCollection* _tmp4_; + MediaSourceCollection* _tmp7_; + const gchar* _tmp8_; + MediaSource* _tmp9_; +#line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL); -#line 840 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 851 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (source_id != NULL, NULL); -#line 841 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 852 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = source_id; -#line 841 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 852 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = media_collection_registry_get_typename_from_source_id (_tmp0_); -#line 841 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 852 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" typename = _tmp1_; -#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 854 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = typename; -#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 854 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = media_collection_registry_get_collection (self, _tmp2_); -#line 843 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 854 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" collection = _tmp3_; -#line 844 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = collection; -#line 844 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp4_ == NULL) { -#line 7619 "MediaDataRepresentation.c" - const gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; -#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 7723 "MediaDataRepresentation.c" + const gchar* _tmp5_; + const gchar* _tmp6_; +#line 856 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = source_id; -#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 856 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = typename; -#line 845 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" - g_critical ("MediaDataRepresentation.vala:845: source id '%s' has unrecognized medi" \ +#line 856 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + g_critical ("MediaDataRepresentation.vala:856: source id '%s' has unrecognized medi" \ "a type '%s'", _tmp5_, _tmp6_); -#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = NULL; -#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (collection); -#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (typename); -#line 846 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 857 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7636 "MediaDataRepresentation.c" +#line 7740 "MediaDataRepresentation.c" } -#line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = collection; -#line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = source_id; -#line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = media_source_collection_fetch_by_source_id (_tmp7_, _tmp8_); -#line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp9_; -#line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (collection); -#line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_free0 (typename); -#line 849 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 860 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7652 "MediaDataRepresentation.c" +#line 7756 "MediaDataRepresentation.c" } static gpointer _import_id_dup0 (gpointer self) { -#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return self ? import_id_dup (self) : NULL; -#line 7659 "MediaDataRepresentation.c" +#line 7763 "MediaDataRepresentation.c" } ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* self) { ImportID* result = NULL; ImportID last_import_id = {0}; - ImportID _tmp16_ = {0}; - gint64 _tmp17_ = 0LL; -#line 852 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + ImportID _tmp16_; + gint64 _tmp17_; +#line 863 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL); -#line 853 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 864 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" import_id_init (&last_import_id, IMPORT_ID_INVALID); -#line 7672 "MediaDataRepresentation.c" +#line 7776 "MediaDataRepresentation.c" { GeeIterator* _current_collection_it = NULL; - GeeCollection* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; - GeeIterator* _tmp3_ = NULL; -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; + GeeIterator* _tmp3_; +#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_collection_registry_get_all (self); -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _tmp2_; -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _current_collection_it = _tmp3_; -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7693 "MediaDataRepresentation.c" - GeeIterator* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; +#line 7797 "MediaDataRepresentation.c" + GeeIterator* _tmp4_; + gboolean _tmp5_; MediaSourceCollection* current_collection = NULL; - GeeIterator* _tmp6_ = NULL; - gpointer _tmp7_ = NULL; + GeeIterator* _tmp6_; + gpointer _tmp7_; ImportID* current_import_id = NULL; - MediaSourceCollection* _tmp8_ = NULL; - ImportID* _tmp9_ = NULL; - ImportID* _tmp10_ = NULL; - ImportID* _tmp11_ = NULL; - gint64 _tmp12_ = 0LL; - ImportID _tmp13_ = {0}; - gint64 _tmp14_ = 0LL; -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + MediaSourceCollection* _tmp8_; + ImportID* _tmp9_; + ImportID* _tmp10_; + ImportID* _tmp11_; + gint64 _tmp12_; + ImportID _tmp13_; + gint64 _tmp14_; +#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _current_collection_it; -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = gee_iterator_next (_tmp4_); -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp5_) { -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7715 "MediaDataRepresentation.c" +#line 7819 "MediaDataRepresentation.c" } -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _current_collection_it; -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = gee_iterator_get (_tmp6_); -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" current_collection = (MediaSourceCollection*) _tmp7_; -#line 856 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = current_collection; -#line 856 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = media_source_collection_get_last_import_id (_tmp8_); -#line 856 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" current_import_id = _tmp9_; -#line 858 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = current_import_id; -#line 858 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 869 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp10_ == NULL) { -#line 859 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _import_id_free0 (current_import_id); -#line 859 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (current_collection); -#line 859 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" continue; -#line 7739 "MediaDataRepresentation.c" +#line 7843 "MediaDataRepresentation.c" } -#line 861 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = current_import_id; -#line 861 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = (*_tmp11_).id; -#line 861 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = last_import_id; -#line 861 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp14_ = _tmp13_.id; -#line 861 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 872 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp12_ > _tmp14_) { -#line 7751 "MediaDataRepresentation.c" - ImportID* _tmp15_ = NULL; -#line 862 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 7855 "MediaDataRepresentation.c" + ImportID* _tmp15_; +#line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp15_ = current_import_id; -#line 862 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" last_import_id = *_tmp15_; -#line 7757 "MediaDataRepresentation.c" +#line 7861 "MediaDataRepresentation.c" } -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _import_id_free0 (current_import_id); -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (current_collection); -#line 7763 "MediaDataRepresentation.c" +#line 7867 "MediaDataRepresentation.c" } -#line 855 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 866 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_current_collection_it); -#line 7767 "MediaDataRepresentation.c" +#line 7871 "MediaDataRepresentation.c" } -#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 878 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp16_ = last_import_id; -#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 878 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp17_ = _tmp16_.id; -#line 867 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 878 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp17_ == IMPORT_ID_INVALID) { -#line 868 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 879 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = NULL; -#line 868 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 879 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7779 "MediaDataRepresentation.c" +#line 7883 "MediaDataRepresentation.c" } else { - ImportID* _tmp18_ = NULL; -#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + ImportID* _tmp18_; +#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp18_ = _import_id_dup0 (&last_import_id); -#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp18_; -#line 870 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 881 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7788 "MediaDataRepresentation.c" +#line 7892 "MediaDataRepresentation.c" } } @@ -7795,460 +7900,460 @@ ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* GeeCollection* media_collection_registry_get_source_ids_for_event_id (MediaCollectionRegistry* self, EventID* event_id) { GeeCollection* result = NULL; GeeArrayList* _result_ = NULL; - GeeArrayList* _tmp0_ = NULL; -#line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GeeArrayList* _tmp0_; +#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL); -#line 873 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (event_id != NULL, NULL); -#line 874 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 885 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); -#line 874 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 885 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _result_ = _tmp0_; -#line 7805 "MediaDataRepresentation.c" +#line 7909 "MediaDataRepresentation.c" { GeeIterator* _current_collection_it = NULL; - GeeCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeIterator* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; -#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GeeCollection* _tmp1_; + GeeCollection* _tmp2_; + GeeIterator* _tmp3_; + GeeIterator* _tmp4_; +#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = media_collection_registry_get_all (self); -#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _tmp1_; -#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _tmp3_; -#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp2_); -#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _current_collection_it = _tmp4_; -#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7826 "MediaDataRepresentation.c" - GeeIterator* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; +#line 7930 "MediaDataRepresentation.c" + GeeIterator* _tmp5_; + gboolean _tmp6_; MediaSourceCollection* current_collection = NULL; - GeeIterator* _tmp7_ = NULL; - gpointer _tmp8_ = NULL; - GeeArrayList* _tmp9_ = NULL; - MediaSourceCollection* _tmp10_ = NULL; - EventID _tmp11_ = {0}; - GeeCollection* _tmp12_ = NULL; - GeeCollection* _tmp13_ = NULL; -#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GeeIterator* _tmp7_; + gpointer _tmp8_; + GeeArrayList* _tmp9_; + MediaSourceCollection* _tmp10_; + EventID _tmp11_; + GeeCollection* _tmp12_; + GeeCollection* _tmp13_; +#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = _current_collection_it; -#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = gee_iterator_next (_tmp5_); -#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp6_) { -#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7845 "MediaDataRepresentation.c" +#line 7949 "MediaDataRepresentation.c" } -#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = _current_collection_it; -#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = gee_iterator_get (_tmp7_); -#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" current_collection = (MediaSourceCollection*) _tmp8_; -#line 877 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = _result_; -#line 877 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = current_collection; -#line 877 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp11_ = *event_id; -#line 877 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp12_ = media_source_collection_get_event_source_ids (_tmp10_, &_tmp11_); -#line 877 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp13_ = _tmp12_; -#line 877 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" gee_array_list_add_all (_tmp9_, _tmp13_); -#line 877 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 888 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp13_); -#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (current_collection); -#line 7869 "MediaDataRepresentation.c" +#line 7973 "MediaDataRepresentation.c" } -#line 876 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 887 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_current_collection_it); -#line 7873 "MediaDataRepresentation.c" +#line 7977 "MediaDataRepresentation.c" } -#line 880 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_COLLECTION, GeeCollection); -#line 880 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 891 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7879 "MediaDataRepresentation.c" +#line 7983 "MediaDataRepresentation.c" } MediaSourceCollection* media_collection_registry_get_collection_for_file (MediaCollectionRegistry* self, GFile* file) { MediaSourceCollection* result = NULL; -#line 883 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), NULL); -#line 883 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); -#line 7889 "MediaDataRepresentation.c" +#line 7993 "MediaDataRepresentation.c" { GeeIterator* _collection_it = NULL; - GeeCollection* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; - GeeIterator* _tmp3_ = NULL; -#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; + GeeIterator* _tmp3_; +#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = media_collection_registry_get_all (self); -#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = _tmp2_; -#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_tmp1_); -#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _collection_it = _tmp3_; -#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" while (TRUE) { -#line 7910 "MediaDataRepresentation.c" - GeeIterator* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; +#line 8014 "MediaDataRepresentation.c" + GeeIterator* _tmp4_; + gboolean _tmp5_; MediaSourceCollection* collection = NULL; - GeeIterator* _tmp6_ = NULL; - gpointer _tmp7_ = NULL; - MediaSourceCollection* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; -#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GeeIterator* _tmp6_; + gpointer _tmp7_; + MediaSourceCollection* _tmp8_; + GFile* _tmp9_; + gboolean _tmp10_; +#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = _collection_it; -#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = gee_iterator_next (_tmp4_); -#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!_tmp5_) { -#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" break; -#line 7927 "MediaDataRepresentation.c" +#line 8031 "MediaDataRepresentation.c" } -#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = _collection_it; -#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp7_ = gee_iterator_get (_tmp6_); -#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" collection = (MediaSourceCollection*) _tmp7_; -#line 885 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp8_ = collection; -#line 885 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp9_ = file; -#line 885 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp10_ = media_source_collection_is_file_recognized (_tmp8_, _tmp9_); -#line 885 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp10_) { -#line 886 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 897 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = collection; -#line 886 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 897 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_collection_it); -#line 886 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 897 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7949 "MediaDataRepresentation.c" +#line 8053 "MediaDataRepresentation.c" } -#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _data_collection_unref0 (collection); -#line 7953 "MediaDataRepresentation.c" +#line 8057 "MediaDataRepresentation.c" } -#line 884 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 895 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (_collection_it); -#line 7957 "MediaDataRepresentation.c" +#line 8061 "MediaDataRepresentation.c" } -#line 889 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 900 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = NULL; -#line 889 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 900 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7963 "MediaDataRepresentation.c" +#line 8067 "MediaDataRepresentation.c" } gboolean media_collection_registry_is_valid_source_id (MediaCollectionRegistry* self, const gchar* source_id) { gboolean result = FALSE; - const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + const gchar* _tmp0_; + gboolean _tmp1_; gboolean _tmp2_ = FALSE; - const gchar* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; -#line 892 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + const gchar* _tmp3_; + gboolean _tmp4_; +#line 903 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (IS_MEDIA_COLLECTION_REGISTRY (self), FALSE); -#line 893 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 904 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = source_id; -#line 893 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 904 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = is_string_empty (_tmp0_); -#line 893 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 904 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp1_) { -#line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 905 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = FALSE; -#line 894 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 905 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 7986 "MediaDataRepresentation.c" +#line 8090 "MediaDataRepresentation.c" } -#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp3_ = source_id; -#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp4_ = g_str_has_prefix (_tmp3_, PHOTO_TYPENAME); -#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (_tmp4_) { -#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = TRUE; -#line 7996 "MediaDataRepresentation.c" +#line 8100 "MediaDataRepresentation.c" } else { - const gchar* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; -#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + const gchar* _tmp5_; + gboolean _tmp6_; +#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp5_ = source_id; -#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp6_ = g_str_has_prefix (_tmp5_, VIDEO_TYPENAME "-"); -#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp2_ = _tmp6_; -#line 8006 "MediaDataRepresentation.c" +#line 8110 "MediaDataRepresentation.c" } -#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" result = _tmp2_; -#line 896 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 907 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return result; -#line 8012 "MediaDataRepresentation.c" +#line 8116 "MediaDataRepresentation.c" } static void value_media_collection_registry_init (GValue* value) { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 8019 "MediaDataRepresentation.c" +#line 8123 "MediaDataRepresentation.c" } static void value_media_collection_registry_free_value (GValue* value) { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (value->data[0].v_pointer) { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_unref (value->data[0].v_pointer); -#line 8028 "MediaDataRepresentation.c" +#line 8132 "MediaDataRepresentation.c" } } static void value_media_collection_registry_copy_value (const GValue* src_value, GValue* dest_value) { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (src_value->data[0].v_pointer) { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" dest_value->data[0].v_pointer = media_collection_registry_ref (src_value->data[0].v_pointer); -#line 8038 "MediaDataRepresentation.c" +#line 8142 "MediaDataRepresentation.c" } else { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" dest_value->data[0].v_pointer = NULL; -#line 8042 "MediaDataRepresentation.c" +#line 8146 "MediaDataRepresentation.c" } } static gpointer value_media_collection_registry_peek_pointer (const GValue* value) { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return value->data[0].v_pointer; -#line 8050 "MediaDataRepresentation.c" +#line 8154 "MediaDataRepresentation.c" } static gchar* value_media_collection_registry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (collect_values[0].v_pointer) { -#line 8057 "MediaDataRepresentation.c" - MediaCollectionRegistry* object; +#line 8161 "MediaDataRepresentation.c" + MediaCollectionRegistry * object; object = collect_values[0].v_pointer; -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (object->parent_instance.g_class == NULL) { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8064 "MediaDataRepresentation.c" +#line 8168 "MediaDataRepresentation.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8068 "MediaDataRepresentation.c" +#line 8172 "MediaDataRepresentation.c" } -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = media_collection_registry_ref (object); -#line 8072 "MediaDataRepresentation.c" +#line 8176 "MediaDataRepresentation.c" } else { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 8076 "MediaDataRepresentation.c" +#line 8180 "MediaDataRepresentation.c" } -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 8080 "MediaDataRepresentation.c" +#line 8184 "MediaDataRepresentation.c" } static gchar* value_media_collection_registry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - MediaCollectionRegistry** object_p; + MediaCollectionRegistry ** object_p; object_p = collect_values[0].v_pointer; -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!object_p) { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8091 "MediaDataRepresentation.c" +#line 8195 "MediaDataRepresentation.c" } -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (!value->data[0].v_pointer) { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = NULL; -#line 8097 "MediaDataRepresentation.c" +#line 8201 "MediaDataRepresentation.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = value->data[0].v_pointer; -#line 8101 "MediaDataRepresentation.c" +#line 8205 "MediaDataRepresentation.c" } else { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" *object_p = media_collection_registry_ref (value->data[0].v_pointer); -#line 8105 "MediaDataRepresentation.c" +#line 8209 "MediaDataRepresentation.c" } -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return NULL; -#line 8109 "MediaDataRepresentation.c" +#line 8213 "MediaDataRepresentation.c" } GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { ParamSpecMediaCollectionRegistry* spec; -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_MEDIA_COLLECTION_REGISTRY), NULL); -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return G_PARAM_SPEC (spec); -#line 8123 "MediaDataRepresentation.c" +#line 8227 "MediaDataRepresentation.c" } gpointer value_get_media_collection_registry (const GValue* value) { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_COLLECTION_REGISTRY), NULL); -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return value->data[0].v_pointer; -#line 8132 "MediaDataRepresentation.c" +#line 8236 "MediaDataRepresentation.c" } void value_set_media_collection_registry (GValue* value, gpointer v_object) { - MediaCollectionRegistry* old; -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + MediaCollectionRegistry * old; +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_COLLECTION_REGISTRY)); -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" old = value->data[0].v_pointer; -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (v_object) { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_MEDIA_COLLECTION_REGISTRY)); -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = v_object; -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_ref (value->data[0].v_pointer); -#line 8152 "MediaDataRepresentation.c" +#line 8256 "MediaDataRepresentation.c" } else { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 8156 "MediaDataRepresentation.c" +#line 8260 "MediaDataRepresentation.c" } -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (old) { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_unref (old); -#line 8162 "MediaDataRepresentation.c" +#line 8266 "MediaDataRepresentation.c" } } void value_take_media_collection_registry (GValue* value, gpointer v_object) { - MediaCollectionRegistry* old; -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + MediaCollectionRegistry * old; +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MEDIA_COLLECTION_REGISTRY)); -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" old = value->data[0].v_pointer; -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (v_object) { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_MEDIA_COLLECTION_REGISTRY)); -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = v_object; -#line 8181 "MediaDataRepresentation.c" +#line 8285 "MediaDataRepresentation.c" } else { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" value->data[0].v_pointer = NULL; -#line 8185 "MediaDataRepresentation.c" +#line 8289 "MediaDataRepresentation.c" } -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (old) { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_unref (old); -#line 8191 "MediaDataRepresentation.c" +#line 8295 "MediaDataRepresentation.c" } } static void media_collection_registry_class_init (MediaCollectionRegistryClass * klass) { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" media_collection_registry_parent_class = g_type_class_peek_parent (klass); -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" ((MediaCollectionRegistryClass *) klass)->finalize = media_collection_registry_finalize; -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_class_add_private (klass, sizeof (MediaCollectionRegistryPrivate)); -#line 8203 "MediaDataRepresentation.c" +#line 8307 "MediaDataRepresentation.c" } static void media_collection_registry_instance_init (MediaCollectionRegistry * self) { - GeeArrayList* _tmp0_ = NULL; - GeeHashMap* _tmp1_ = NULL; -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + GeeArrayList* _tmp0_; + GeeHashMap* _tmp1_; +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv = MEDIA_COLLECTION_REGISTRY_GET_PRIVATE (self); -#line 745 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 756 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL); -#line 745 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 756 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->all = _tmp0_; -#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 757 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_MEDIA_SOURCE_COLLECTION, (GBoxedCopyFunc) data_collection_ref, (GDestroyNotify) data_collection_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 757 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->priv->by_typename = _tmp1_; -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self->ref_count = 1; -#line 8222 "MediaDataRepresentation.c" +#line 8326 "MediaDataRepresentation.c" } -static void media_collection_registry_finalize (MediaCollectionRegistry* obj) { +static void media_collection_registry_finalize (MediaCollectionRegistry * obj) { MediaCollectionRegistry * self; - Application* _tmp0_ = NULL; - Application* _tmp1_ = NULL; - guint _tmp2_ = 0U; -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" + Application* _tmp0_; + Application* _tmp1_; + guint _tmp2_; +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MEDIA_COLLECTION_REGISTRY, MediaCollectionRegistry); -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_handlers_destroy (self); -#line 754 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp0_ = application_get_instance (); -#line 754 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _tmp1_ = _tmp0_; -#line 754 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_parse_name ("init-done", TYPE_APPLICATION, &_tmp2_, NULL, FALSE); -#line 754 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _media_collection_registry_on_init_done_application_init_done, self); -#line 754 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 765 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _application_unref0 (_tmp1_); -#line 745 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 756 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (self->priv->all); -#line 746 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 757 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" _g_object_unref0 (self->priv->by_typename); -#line 8249 "MediaDataRepresentation.c" +#line 8353 "MediaDataRepresentation.c" } @@ -8267,26 +8372,26 @@ GType media_collection_registry_get_type (void) { gpointer media_collection_registry_ref (gpointer instance) { - MediaCollectionRegistry* self; + MediaCollectionRegistry * self; self = instance; -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_atomic_int_inc (&self->ref_count); -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" return instance; -#line 8274 "MediaDataRepresentation.c" +#line 8378 "MediaDataRepresentation.c" } void media_collection_registry_unref (gpointer instance) { - MediaCollectionRegistry* self; + MediaCollectionRegistry * self; self = instance; -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" MEDIA_COLLECTION_REGISTRY_GET_CLASS (self)->finalize (self); -#line 740 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" +#line 751 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8287 "MediaDataRepresentation.c" +#line 8391 "MediaDataRepresentation.c" } } |