summaryrefslogtreecommitdiff
path: root/src/MediaDataRepresentation.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-02 11:25:40 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-02 11:25:40 +0100
commitcd16e7b4a394b6ce885a618d8a96eccd662208bb (patch)
treec9bcd713dbea9467783f8d82c63218af91192da1 /src/MediaDataRepresentation.c
parentb1cb72d29fa13b3b6f9f5fe66083dd60930a2b71 (diff)
parent66f6a7bd3f7e00022191f16cb0e82a39e7333a76 (diff)
Merge tag 'upstream/0.25.2'
Upstream version 0.25.2
Diffstat (limited to 'src/MediaDataRepresentation.c')
-rw-r--r--src/MediaDataRepresentation.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/MediaDataRepresentation.c b/src/MediaDataRepresentation.c
index 66be0bd..5e80e43 100644
--- a/src/MediaDataRepresentation.c
+++ b/src/MediaDataRepresentation.c
@@ -1,4 +1,4 @@
-/* MediaDataRepresentation.c generated by valac 0.34.2, the Vala compiler
+/* MediaDataRepresentation.c generated by valac 0.32.1, the Vala compiler
* generated from MediaDataRepresentation.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2081,14 +2081,14 @@ gboolean media_source_delete_original_file (MediaSource* self) {
#line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2084 "MediaDataRepresentation.c"
- goto __catch559_g_error;
+ goto __catch557_g_error;
}
#line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
ret = _tmp1_;
#line 2089 "MediaDataRepresentation.c"
}
- goto __finally559;
- __catch559_g_error:
+ goto __finally557;
+ __catch557_g_error:
{
GError* err = NULL;
GFile* _tmp4_ = NULL;
@@ -2119,7 +2119,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
_g_error_free0 (err);
#line 2120 "MediaDataRepresentation.c"
}
- __finally559:
+ __finally557:
#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2239,7 +2239,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
#line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2241 "MediaDataRepresentation.c"
- goto __catch560_g_error;
+ goto __catch558_g_error;
}
#line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
if (!_tmp29_) {
@@ -2248,8 +2248,8 @@ gboolean media_source_delete_original_file (MediaSource* self) {
#line 2248 "MediaDataRepresentation.c"
}
}
- goto __finally560;
- __catch560_g_error:
+ goto __finally558;
+ __catch558_g_error:
{
GError* err = NULL;
GFile* _tmp32_ = NULL;
@@ -2281,7 +2281,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
break;
#line 2282 "MediaDataRepresentation.c"
}
- __finally560:
+ __finally558:
#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2308,7 +2308,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
#line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2310 "MediaDataRepresentation.c"
- goto __catch561_g_error;
+ goto __catch559_g_error;
}
#line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
_tmp38_ = parent;
@@ -2322,8 +2322,8 @@ gboolean media_source_delete_original_file (MediaSource* self) {
_g_free0 (_tmp40_);
#line 2323 "MediaDataRepresentation.c"
}
- goto __finally561;
- __catch561_g_error:
+ goto __finally559;
+ __catch559_g_error:
{
GError* err = NULL;
GFile* _tmp41_ = NULL;
@@ -2354,7 +2354,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
_g_error_free0 (err);
#line 2354 "MediaDataRepresentation.c"
}
- __finally561:
+ __finally559:
#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -3481,7 +3481,7 @@ static void media_source_class_init (MediaSourceClass * klass) {
#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 ());
+ 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_TYPE_FILE, G_TYPE_FILE);
#line 3484 "MediaDataRepresentation.c"
}
@@ -3970,7 +3970,7 @@ static void media_source_holding_tank_instance_init (MediaSourceHoldingTank * se
#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, g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+ _tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, 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 3975 "MediaDataRepresentation.c"
@@ -6399,7 +6399,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 6400 "MediaDataRepresentation.c"
- goto __catch562_database_error;
+ goto __catch560_database_error;
}
#line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
_aggregate_progress_monitor_unref0 (agg_monitor);
@@ -6422,8 +6422,8 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
#line 6421 "MediaDataRepresentation.c"
}
}
- goto __finally562;
- __catch562_database_error:
+ goto __finally560;
+ __catch560_database_error:
{
GError* err = NULL;
GError* _tmp78_ = NULL;
@@ -6439,7 +6439,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
_g_error_free0 (err);
#line 6439 "MediaDataRepresentation.c"
}
- __finally562:
+ __finally560:
#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6564,11 +6564,11 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
#line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 6565 "MediaDataRepresentation.c"
- goto __catch563_g_error;
+ goto __catch561_g_error;
}
}
- goto __finally563;
- __catch563_g_error:
+ goto __finally561;
+ __catch561_g_error:
{
GError* err = NULL;
GFile* _tmp12_ = NULL;
@@ -6598,7 +6598,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
_g_error_free0 (err);
#line 6598 "MediaDataRepresentation.c"
}
- __finally563:
+ __finally561:
#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6839,7 +6839,7 @@ static void media_source_collection_class_init (MediaSourceCollectionClass * kla
#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);
#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 ());
+ 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_TYPE_FILE, G_TYPE_FILE);
#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);
#line 341 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6864,7 +6864,7 @@ static void media_source_collection_instance_init (MediaSourceCollection * self)
#line 345 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
self->priv->offline_bin = NULL;
#line 346 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
- _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
+ _tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
#line 346 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
self->priv->by_master_file = _tmp0_;
#line 348 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"