summaryrefslogtreecommitdiff
path: root/src/PhotoMonitor.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/PhotoMonitor.c')
-rw-r--r--src/PhotoMonitor.c70
1 files changed, 35 insertions, 35 deletions
diff --git a/src/PhotoMonitor.c b/src/PhotoMonitor.c
index a307aae..a6f5f2e 100644
--- a/src/PhotoMonitor.c
+++ b/src/PhotoMonitor.c
@@ -1,4 +1,4 @@
-/* PhotoMonitor.c generated by valac 0.34.2, the Vala compiler
+/* PhotoMonitor.c generated by valac 0.32.1, the Vala compiler
* generated from PhotoMonitor.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1677,7 +1677,7 @@ static void photo_updates_instance_init (PhotoUpdates * self) {
#line 19 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
self->revert_to_master = FALSE;
#line 20 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
- _tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+ _tmp0_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
#line 20 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
self->developer_files = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
#line 1684 "PhotoMonitor.c"
@@ -6226,7 +6226,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
#line 6225 "PhotoMonitor.c"
GeeHashMap* _tmp17_ = NULL;
#line 936 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
- _tmp17_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp17_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 936 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
_g_object_unref0 (set_editable_file);
#line 936 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6616,7 +6616,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
#line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 6617 "PhotoMonitor.c"
- goto __catch582_database_error;
+ goto __catch580_database_error;
}
#line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
_g_object_unref0 (reimport_raw_developments);
@@ -6641,8 +6641,8 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
#line 6640 "PhotoMonitor.c"
}
}
- goto __finally582;
- __catch582_database_error:
+ goto __finally580;
+ __catch580_database_error:
{
GError* err = NULL;
GError* _tmp97_ = NULL;
@@ -6658,7 +6658,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
_g_error_free0 (err);
#line 6658 "PhotoMonitor.c"
}
- __finally582:
+ __finally580:
#line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6718,7 +6718,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
#line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 6719 "PhotoMonitor.c"
- goto __catch583_database_error;
+ goto __catch581_database_error;
}
#line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
_g_object_unref0 (reimport_raw_developments);
@@ -6743,8 +6743,8 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
#line 6742 "PhotoMonitor.c"
}
}
- goto __finally583;
- __catch583_database_error:
+ goto __finally581;
+ __catch581_database_error:
{
GError* err = NULL;
GError* _tmp105_ = NULL;
@@ -6760,7 +6760,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
_g_error_free0 (err);
#line 6760 "PhotoMonitor.c"
}
- __finally583:
+ __finally581:
#line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7437,7 +7437,7 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo
#line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 7437 "PhotoMonitor.c"
- goto __catch584_database_error;
+ goto __catch582_database_error;
}
#line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
_background_job_unref0 (job);
@@ -7450,8 +7450,8 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo
#line 7448 "PhotoMonitor.c"
}
}
- goto __finally584;
- __catch584_database_error:
+ goto __finally582;
+ __catch582_database_error:
{
GError* err = NULL;
GError* _tmp26_ = NULL;
@@ -7467,7 +7467,7 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo
_g_error_free0 (err);
#line 7466 "PhotoMonitor.c"
}
- __finally584:
+ __finally582:
#line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7650,7 +7650,7 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background
#line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 7650 "PhotoMonitor.c"
- goto __catch585_database_error;
+ goto __catch583_database_error;
}
#line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
_background_job_unref0 (job);
@@ -7663,8 +7663,8 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background
#line 7661 "PhotoMonitor.c"
}
}
- goto __finally585;
- __catch585_database_error:
+ goto __finally583;
+ __catch583_database_error:
{
GError* err = NULL;
GError* _tmp20_ = NULL;
@@ -7680,7 +7680,7 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background
_g_error_free0 (err);
#line 7679 "PhotoMonitor.c"
}
- __finally585:
+ __finally583:
#line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7844,7 +7844,7 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac
#line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 7844 "PhotoMonitor.c"
- goto __catch586_database_error;
+ goto __catch584_database_error;
}
#line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
_background_job_unref0 (job);
@@ -7857,8 +7857,8 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac
#line 7855 "PhotoMonitor.c"
}
}
- goto __finally586;
- __catch586_database_error:
+ goto __finally584;
+ __catch584_database_error:
{
GError* err = NULL;
GError* _tmp20_ = NULL;
@@ -7874,7 +7874,7 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac
_g_error_free0 (err);
#line 7873 "PhotoMonitor.c"
}
- __finally586:
+ __finally584:
#line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8030,14 +8030,14 @@ static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base)
#line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 8030 "PhotoMonitor.c"
- goto __catch587_g_error;
+ goto __catch585_g_error;
}
#line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
self->mark_online = _tmp0_;
#line 8035 "PhotoMonitor.c"
}
- goto __finally587;
- __catch587_g_error:
+ goto __finally585;
+ __catch585_g_error:
{
GError* err = NULL;
GError* _tmp4_ = NULL;
@@ -8058,7 +8058,7 @@ static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base)
_g_error_free0 (err);
#line 8057 "PhotoMonitor.c"
}
- __finally587:
+ __finally585:
#line 175 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 175 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8208,14 +8208,14 @@ static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* bas
#line 198 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 8208 "PhotoMonitor.c"
- goto __catch588_g_error;
+ goto __catch586_g_error;
}
#line 198 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
self->success = _tmp0_;
#line 8213 "PhotoMonitor.c"
}
- goto __finally588;
- __catch588_g_error:
+ goto __finally586;
+ __catch586_g_error:
{
GError* err = NULL;
GError* _tmp4_ = NULL;
@@ -8236,7 +8236,7 @@ static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* bas
_g_error_free0 (err);
#line 8235 "PhotoMonitor.c"
}
- __finally588:
+ __finally586:
#line 197 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 197 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8386,14 +8386,14 @@ static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJ
#line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 8386 "PhotoMonitor.c"
- goto __catch589_g_error;
+ goto __catch587_g_error;
}
#line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
self->success = _tmp0_;
#line 8391 "PhotoMonitor.c"
}
- goto __finally589;
- __catch589_g_error:
+ goto __finally587;
+ __catch587_g_error:
{
GError* err = NULL;
GError* _tmp4_ = NULL;
@@ -8414,7 +8414,7 @@ static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJ
_g_error_free0 (err);
#line 8413 "PhotoMonitor.c"
}
- __finally589:
+ __finally587:
#line 219 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 219 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"