summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-06-03 08:54:49 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-06-03 08:54:49 +0200
commit7dec5f41b2cffafe4d743273600e2868d116166d (patch)
tree1ea5e30103db6e2e8454f5c5c2e885008dc7d99d /src
parent9e7cd144725a270e0460b21747619f447ca87684 (diff)
New upstream version 0.26.2upstream/0.26.2
Diffstat (limited to 'src')
-rw-r--r--src/BatchImport.c12
-rw-r--r--src/DirectoryMonitor.c7488
-rw-r--r--src/DirectoryMonitor.vala24
-rw-r--r--src/data_imports/DataImportsPluginHost.c12
-rw-r--r--src/data_imports/DataImportsUI.c677
-rw-r--r--src/data_imports/DataImportsUI.vala4
-rw-r--r--src/direct/DirectPhotoPage.c56
-rw-r--r--src/events/Branch.c112
-rw-r--r--src/photos/PhotoFileFormat.c24
-rw-r--r--src/photos/PhotoMetadata.c2922
-rw-r--r--src/photos/PhotoMetadata.vala7
-rw-r--r--src/publishing/PublishingUI.c2307
-rw-r--r--src/publishing/PublishingUI.vala2
-rw-r--r--src/searches/SavedSearchDialog.c84
-rw-r--r--src/searches/SearchBoolean.c12
15 files changed, 6980 insertions, 6763 deletions
diff --git a/src/BatchImport.c b/src/BatchImport.c
index 382a63c..0f80e48 100644
--- a/src/BatchImport.c
+++ b/src/BatchImport.c
@@ -2124,9 +2124,9 @@ enum {
};
static void work_sniffer_real_execute (BackgroundJob* base);
static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GError** error);
-static gint __lambda10_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b);
+static gint __lambda11_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b);
gint utf8_cs_compare (void* a, void* b);
-static gint ___lambda10__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
+static gint ___lambda11__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
void disassemble_filename (const gchar* basename, gchar** name, gchar** ext);
gboolean is_string_empty (const gchar* s);
gpointer photo_file_format_properties_ref (gpointer instance);
@@ -11771,7 +11771,7 @@ WorkSniffer* work_sniffer_new (BatchImport* owner, GeeIterable* jobs, Completion
}
-static gint __lambda10_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b) {
+static gint __lambda11_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b) {
gint result = 0;
FileToPrepare* file_a = NULL;
FileToPrepare* _tmp0_ = NULL;
@@ -11826,9 +11826,9 @@ static gint __lambda10_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b)
}
-static gint ___lambda10__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+static gint ___lambda11__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
gint result;
- result = __lambda10_ ((WorkSniffer*) self, (FileToPrepare*) a, (FileToPrepare*) b);
+ result = __lambda11_ ((WorkSniffer*) self, (FileToPrepare*) a, (FileToPrepare*) b);
#line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala"
return result;
#line 11828 "BatchImport.c"
@@ -12106,7 +12106,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
#line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala"
_tmp42_ = sorted;
#line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala"
- gee_list_sort (_tmp42_, ___lambda10__gcompare_data_func, background_job_ref (self), background_job_unref);
+ gee_list_sort (_tmp42_, ___lambda11__gcompare_data_func, background_job_ref (self), background_job_unref);
#line 12104 "BatchImport.c"
{
gint i = 0;
diff --git a/src/DirectoryMonitor.c b/src/DirectoryMonitor.c
index 6467ece..045e3ec 100644
--- a/src/DirectoryMonitor.c
+++ b/src/DirectoryMonitor.c
@@ -395,10 +395,10 @@ struct _DirectoryMonitorExploreAsyncData {
gchar* _tmp29_;
gchar* _tmp30_;
gboolean _tmp31_;
- GFile* _tmp32_;
- gchar* _tmp33_;
+ GFileInfo* _tmp32_;
+ GFile* _tmp33_;
gchar* _tmp34_;
- gboolean _tmp35_;
+ gchar* _tmp35_;
GFileInfo* _tmp36_;
GFileType _tmp37_;
const gchar* _tmp38_;
@@ -429,83 +429,91 @@ struct _DirectoryMonitorExploreAsyncData {
GFileInfo* _tmp57_;
GFileInfo* info;
GFileInfo* _tmp58_;
- gboolean _tmp59_;
- GFile* _tmp60_;
- GFileInfo* _tmp61_;
- const gchar* _tmp62_;
+ gchar* _tmp59_;
+ gchar* _tmp60_;
+ gboolean _tmp61_;
+ GFileInfo* _tmp62_;
GFile* _tmp63_;
- GFile* _tmp64_;
+ gchar* _tmp64_;
gchar* _tmp65_;
- gchar* _tmp66_;
- GFileInfo* _tmp67_;
- gboolean _tmp68_;
+ GFileInfo* _tmp66_;
+ gboolean _tmp67_;
+ GFile* _tmp68_;
GFileInfo* _tmp69_;
- GFileType _tmp70_;
- GeeHashMap* _tmp71_;
- GeeHashMap* _tmp72_;
- GeeHashMap* _tmp73_;
- GFile* _tmp74_;
+ const gchar* _tmp70_;
+ GFile* _tmp71_;
+ GFile* _tmp72_;
+ gchar* _tmp73_;
+ gchar* _tmp74_;
GFileInfo* _tmp75_;
- const gchar* _tmp76_;
- GFile* _tmp77_;
- GFile* _tmp78_;
- GFileInfo* _tmp79_;
+ gboolean _tmp76_;
+ GFileInfo* _tmp77_;
+ GFileType _tmp78_;
+ GeeHashMap* _tmp79_;
GeeHashMap* _tmp80_;
GeeHashMap* _tmp81_;
- GeeHashMap* _tmp82_;
- GFile* _tmp83_;
- GFileInfo* _tmp84_;
- const gchar* _tmp85_;
+ GFile* _tmp82_;
+ GFileInfo* _tmp83_;
+ const gchar* _tmp84_;
+ GFile* _tmp85_;
GFile* _tmp86_;
- GFile* _tmp87_;
- GFileInfo* _tmp88_;
- GError* err2;
- GFile* _tmp89_;
- gchar* _tmp90_;
- gchar* _tmp91_;
- GError* _tmp92_;
+ GFileInfo* _tmp87_;
+ GeeHashMap* _tmp88_;
+ GeeHashMap* _tmp89_;
+ GeeHashMap* _tmp90_;
+ GFile* _tmp91_;
+ GFileInfo* _tmp92_;
const gchar* _tmp93_;
- gboolean _tmp94_;
- gboolean _tmp95_;
- GFile* _tmp96_;
- GFileInfo* _tmp97_;
- GFile* _tmp98_;
- GFileInfo* _tmp99_;
- GFile* _tmp100_;
- GFileInfo* _tmp101_;
- GeeHashMap* _tmp102_;
- GeeHashMap* _tmp103_;
- gboolean _tmp104_;
- gboolean _tmp105_;
- gboolean _tmp106_;
- GeeHashMap* _tmp107_;
+ GFile* _tmp94_;
+ GFile* _tmp95_;
+ GFileInfo* _tmp96_;
+ GError* err2;
+ GFile* _tmp97_;
+ gchar* _tmp98_;
+ gchar* _tmp99_;
+ GError* _tmp100_;
+ const gchar* _tmp101_;
+ gboolean _tmp102_;
+ gboolean _tmp103_;
+ GFile* _tmp104_;
+ GFileInfo* _tmp105_;
+ GFile* _tmp106_;
+ GFileInfo* _tmp107_;
+ GFile* _tmp108_;
+ GFileInfo* _tmp109_;
+ GeeHashMap* _tmp110_;
+ GeeHashMap* _tmp111_;
+ gboolean _tmp112_;
+ gboolean _tmp113_;
+ gboolean _tmp114_;
+ GeeHashMap* _tmp115_;
GeeIterator* _subdir_it;
- GeeHashMap* _tmp108_;
- GeeSet* _tmp109_;
- GeeSet* _tmp110_;
- GeeSet* _tmp111_;
- GeeIterator* _tmp112_;
- GeeIterator* _tmp113_;
- GeeIterator* _tmp114_;
- gboolean _tmp115_;
+ GeeHashMap* _tmp116_;
+ GeeSet* _tmp117_;
+ GeeSet* _tmp118_;
+ GeeSet* _tmp119_;
+ GeeIterator* _tmp120_;
+ GeeIterator* _tmp121_;
+ GeeIterator* _tmp122_;
+ gboolean _tmp123_;
GFile* subdir;
- GeeIterator* _tmp116_;
- gpointer _tmp117_;
- gint _tmp118_;
- gint _tmp119_;
- GFile* _tmp120_;
- GeeHashMap* _tmp121_;
- GFile* _tmp122_;
- gpointer _tmp123_;
- GFileInfo* _tmp124_;
- gboolean _tmp125_;
- GFile* _tmp126_;
- GeeHashMap* _tmp127_;
+ GeeIterator* _tmp124_;
+ gpointer _tmp125_;
+ gint _tmp126_;
+ gint _tmp127_;
GFile* _tmp128_;
- gpointer _tmp129_;
- GFileInfo* _tmp130_;
- gboolean _tmp131_;
- gboolean _tmp132_;
+ GeeHashMap* _tmp129_;
+ GFile* _tmp130_;
+ gpointer _tmp131_;
+ GFileInfo* _tmp132_;
+ gboolean _tmp133_;
+ GFile* _tmp134_;
+ GeeHashMap* _tmp135_;
+ GFile* _tmp136_;
+ gpointer _tmp137_;
+ GFileInfo* _tmp138_;
+ gboolean _tmp139_;
+ gboolean _tmp140_;
GError * _inner_error_;
};
@@ -796,9 +804,9 @@ static GType directory_monitor_ftype_get_type (void) {
static gpointer _g_object_ref0 (gpointer self) {
-#line 459 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 465 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return self ? g_object_ref (self) : NULL;
-#line 802 "DirectoryMonitor.c"
+#line 810 "DirectoryMonitor.c"
}
@@ -808,73 +816,73 @@ DirectoryMonitor* directory_monitor_construct (GType object_type, GFile* root, g
GFile* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
gboolean _tmp3_ = FALSE;
-#line 458 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE (root), NULL);
-#line 458 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self = (DirectoryMonitor*) g_object_new (object_type, NULL);
-#line 459 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 465 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = root;
-#line 459 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 465 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 459 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 465 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (self->priv->root);
-#line 459 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 465 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->root = _tmp1_;
-#line 460 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 466 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = recurse;
-#line 460 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 466 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->recurse = _tmp2_;
-#line 461 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 467 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = monitoring;
-#line 461 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 467 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->monitoring = _tmp3_;
-#line 458 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return self;
-#line 834 "DirectoryMonitor.c"
+#line 842 "DirectoryMonitor.c"
}
DirectoryMonitor* directory_monitor_new (GFile* root, gboolean recurse, gboolean monitoring) {
-#line 458 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return directory_monitor_construct (TYPE_DIRECTORY_MONITOR, root, recurse, monitoring);
-#line 841 "DirectoryMonitor.c"
+#line 849 "DirectoryMonitor.c"
}
void directory_monitor_mdbg (const gchar* msg) {
-#line 464 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 470 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (msg != NULL);
-#line 848 "DirectoryMonitor.c"
+#line 856 "DirectoryMonitor.c"
}
gboolean directory_monitor_is_recursive (DirectoryMonitor* self) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
-#line 470 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 476 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE);
-#line 471 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 477 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->recurse;
-#line 471 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 477 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = _tmp0_;
-#line 471 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 477 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 863 "DirectoryMonitor.c"
+#line 871 "DirectoryMonitor.c"
}
gboolean directory_monitor_is_monitoring (DirectoryMonitor* self) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
-#line 474 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 480 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE);
-#line 475 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 481 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->monitoring;
-#line 475 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 481 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = _tmp0_;
-#line 475 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 481 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 878 "DirectoryMonitor.c"
+#line 886 "DirectoryMonitor.c"
}
@@ -883,32 +891,32 @@ static void directory_monitor_real_notify_root_deleted (DirectoryMonitor* self,
GFile* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
GFile* _tmp3_ = NULL;
-#line 478 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 484 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (root));
-#line 479 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->root;
-#line 479 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = root;
-#line 479 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = g_file_equal (_tmp0_, _tmp1_);
-#line 479 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp2_, "this.root.equal(root)");
-#line 481 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 487 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg ("root deleted");
-#line 482 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 488 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = root;
-#line 482 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 488 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "root-deleted", _tmp3_);
-#line 903 "DirectoryMonitor.c"
+#line 911 "DirectoryMonitor.c"
}
void directory_monitor_notify_root_deleted (DirectoryMonitor* self, GFile* root) {
-#line 478 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 484 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 478 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 484 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_root_deleted (self, root);
-#line 912 "DirectoryMonitor.c"
+#line 920 "DirectoryMonitor.c"
}
@@ -927,53 +935,53 @@ static void directory_monitor_internal_notify_root_moved (DirectoryMonitor* self
GFile* _tmp9_ = NULL;
GFile* _tmp10_ = NULL;
GFileInfo* _tmp11_ = NULL;
-#line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 491 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 491 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (old_root));
-#line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 491 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (new_root));
-#line 485 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 491 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (new_root_info));
-#line 486 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->files;
-#line 486 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = old_root;
-#line 486 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = directory_monitor_file_info_map_remove (_tmp0_, _tmp1_, NULL);
-#line 486 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
removed = _tmp2_;
-#line 487 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 493 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (removed, "removed");
-#line 489 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 495 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = self->priv->files;
-#line 489 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 495 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = new_root;
-#line 489 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 495 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = new_root_info;
-#line 489 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 495 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = directory_monitor_file_info_map_update (_tmp3_, _tmp4_, _tmp5_);
-#line 489 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 495 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
updated = _tmp6_;
-#line 490 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 496 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (updated, "updated");
-#line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = new_root;
-#line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (self->priv->root);
-#line 492 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->root = _tmp8_;
-#line 494 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = old_root;
-#line 494 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = new_root;
-#line 494 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp11_ = new_root_info;
-#line 494 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_root_moved (self, _tmp9_, _tmp10_, _tmp11_);
-#line 977 "DirectoryMonitor.c"
+#line 985 "DirectoryMonitor.c"
}
@@ -992,80 +1000,80 @@ static void directory_monitor_real_notify_root_moved (DirectoryMonitor* self, GF
GFile* _tmp11_ = NULL;
GFile* _tmp12_ = NULL;
GFileInfo* _tmp13_ = NULL;
-#line 497 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (old_root));
-#line 497 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (new_root));
-#line 497 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (new_root_info));
-#line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 504 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->root;
-#line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 504 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = old_root;
-#line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 504 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = g_file_equal (_tmp0_, _tmp1_);
-#line 498 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 504 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp2_, "this.root.equal(old_root)");
-#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = old_root;
-#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = g_file_get_path (_tmp3_);
-#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = _tmp4_;
-#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = new_root;
-#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = g_file_get_path (_tmp6_);
-#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = _tmp7_;
-#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = g_strdup_printf ("root moved: %s -> %s", _tmp5_, _tmp8_);
-#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = _tmp9_;
-#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp10_);
-#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp10_);
-#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp8_);
-#line 500 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp5_);
-#line 501 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 507 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp11_ = old_root;
-#line 501 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 507 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp12_ = new_root;
-#line 501 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 507 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp13_ = new_root_info;
-#line 501 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 507 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "root-moved", _tmp11_, _tmp12_, _tmp13_);
-#line 1042 "DirectoryMonitor.c"
+#line 1050 "DirectoryMonitor.c"
}
void directory_monitor_notify_root_moved (DirectoryMonitor* self, GFile* old_root, GFile* new_root, GFileInfo* new_root_info) {
-#line 497 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 497 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 503 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_root_moved (self, old_root, new_root, new_root_info);
-#line 1051 "DirectoryMonitor.c"
+#line 1059 "DirectoryMonitor.c"
}
static void directory_monitor_real_notify_discovery_started (DirectoryMonitor* self) {
-#line 505 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 511 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg ("discovery started");
-#line 506 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 512 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "discovery-started");
-#line 1060 "DirectoryMonitor.c"
+#line 1068 "DirectoryMonitor.c"
}
void directory_monitor_notify_discovery_started (DirectoryMonitor* self) {
-#line 504 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 510 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 504 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 510 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_discovery_started (self);
-#line 1069 "DirectoryMonitor.c"
+#line 1077 "DirectoryMonitor.c"
}
@@ -1076,55 +1084,55 @@ static void directory_monitor_real_internal_notify_file_discovered (DirectoryMon
gboolean _tmp3_ = FALSE;
GFile* _tmp7_ = NULL;
GFileInfo* _tmp8_ = NULL;
-#line 509 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 515 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 509 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 515 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (info));
-#line 510 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 516 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->files;
-#line 510 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 516 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = file;
-#line 510 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 516 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = info;
-#line 510 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 516 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = directory_monitor_file_info_map_update (_tmp0_, _tmp1_, _tmp2_);
-#line 510 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 516 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_tmp3_) {
-#line 1094 "DirectoryMonitor.c"
+#line 1102 "DirectoryMonitor.c"
GFile* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 511 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = file;
-#line 511 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = g_file_get_path (_tmp4_);
-#line 511 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = _tmp5_;
-#line 511 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_debug ("DirectoryMonitor.vala:511: DirectoryMonitor.internal_notify_file_disco" \
+#line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ g_debug ("DirectoryMonitor.vala:517: DirectoryMonitor.internal_notify_file_disco" \
"vered: %s discovered but not added to file map", _tmp6_);
-#line 511 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp6_);
-#line 514 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 520 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return;
-#line 1110 "DirectoryMonitor.c"
+#line 1118 "DirectoryMonitor.c"
}
-#line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 523 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = file;
-#line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 523 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = info;
-#line 517 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 523 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_file_discovered (self, _tmp7_, _tmp8_);
-#line 1118 "DirectoryMonitor.c"
+#line 1126 "DirectoryMonitor.c"
}
void directory_monitor_internal_notify_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info) {
-#line 509 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 515 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 509 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 515 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->internal_notify_file_discovered (self, file, info);
-#line 1127 "DirectoryMonitor.c"
+#line 1135 "DirectoryMonitor.c"
}
@@ -1136,42 +1144,42 @@ static void directory_monitor_real_notify_file_discovered (DirectoryMonitor* sel
gchar* _tmp4_ = NULL;
GFile* _tmp5_ = NULL;
GFileInfo* _tmp6_ = NULL;
-#line 520 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 520 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (info));
-#line 521 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = file;
-#line 521 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = g_file_get_path (_tmp0_);
-#line 521 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _tmp1_;
-#line 521 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = g_strdup_printf ("file discovered: %s", _tmp2_);
-#line 521 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = _tmp3_;
-#line 521 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp4_);
-#line 521 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp4_);
-#line 521 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp2_);
-#line 522 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 528 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = file;
-#line 522 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 528 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = info;
-#line 522 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 528 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "file-discovered", _tmp5_, _tmp6_);
-#line 1165 "DirectoryMonitor.c"
+#line 1173 "DirectoryMonitor.c"
}
void directory_monitor_notify_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info) {
-#line 520 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 520 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_discovered (self, file, info);
-#line 1174 "DirectoryMonitor.c"
+#line 1182 "DirectoryMonitor.c"
}
@@ -1183,38 +1191,38 @@ static void directory_monitor_real_internal_notify_directory_discovered (Directo
gboolean _tmp3_ = FALSE;
GFile* _tmp4_ = NULL;
GFileInfo* _tmp5_ = NULL;
-#line 525 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 531 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (dir));
-#line 525 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 531 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (info));
-#line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->files;
-#line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = dir;
-#line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = info;
-#line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = directory_monitor_file_info_map_update (_tmp0_, _tmp1_, _tmp2_);
-#line 526 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
updated = _tmp3_;
-#line 527 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 533 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (updated, "updated");
-#line 529 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 535 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = dir;
-#line 529 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 535 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = info;
-#line 529 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 535 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_directory_discovered (self, _tmp4_, _tmp5_);
-#line 1208 "DirectoryMonitor.c"
+#line 1216 "DirectoryMonitor.c"
}
void directory_monitor_internal_notify_directory_discovered (DirectoryMonitor* self, GFile* dir, GFileInfo* info) {
-#line 525 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 531 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 525 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 531 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->internal_notify_directory_discovered (self, dir, info);
-#line 1217 "DirectoryMonitor.c"
+#line 1225 "DirectoryMonitor.c"
}
@@ -1226,84 +1234,84 @@ static void directory_monitor_real_notify_directory_discovered (DirectoryMonitor
gchar* _tmp4_ = NULL;
GFile* _tmp5_ = NULL;
GFileInfo* _tmp6_ = NULL;
-#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (dir));
-#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (info));
-#line 533 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = dir;
-#line 533 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = g_file_get_path (_tmp0_);
-#line 533 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _tmp1_;
-#line 533 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = g_strdup_printf ("directory discovered: %s", _tmp2_);
-#line 533 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = _tmp3_;
-#line 533 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp4_);
-#line 533 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp4_);
-#line 533 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp2_);
-#line 534 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 540 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = dir;
-#line 534 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 540 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = info;
-#line 534 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 540 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "directory-discovered", _tmp5_, _tmp6_);
-#line 1255 "DirectoryMonitor.c"
+#line 1263 "DirectoryMonitor.c"
}
void directory_monitor_notify_directory_discovered (DirectoryMonitor* self, GFile* dir, GFileInfo* info) {
-#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 532 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_discovered (self, dir, info);
-#line 1264 "DirectoryMonitor.c"
+#line 1272 "DirectoryMonitor.c"
}
static void directory_monitor_real_notify_discovery_failed (DirectoryMonitor* self, const gchar* reason) {
const gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 537 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 543 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (reason != NULL);
-#line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 544 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = reason;
-#line 538 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_warning ("DirectoryMonitor.vala:538: discovery failed: %s", _tmp0_);
-#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 544 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ g_warning ("DirectoryMonitor.vala:544: discovery failed: %s", _tmp0_);
+#line 545 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = reason;
-#line 539 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 545 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "discovery-failed", _tmp1_);
-#line 1281 "DirectoryMonitor.c"
+#line 1289 "DirectoryMonitor.c"
}
void directory_monitor_notify_discovery_failed (DirectoryMonitor* self, const gchar* reason) {
-#line 537 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 543 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 537 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 543 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_discovery_failed (self, reason);
-#line 1290 "DirectoryMonitor.c"
+#line 1298 "DirectoryMonitor.c"
}
static void directory_monitor_real_notify_discovery_completed (DirectoryMonitor* self) {
-#line 543 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "discovery-completed");
-#line 1297 "DirectoryMonitor.c"
+#line 1305 "DirectoryMonitor.c"
}
void directory_monitor_notify_discovery_completed (DirectoryMonitor* self) {
-#line 542 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 548 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 542 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 548 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_discovery_completed (self);
-#line 1306 "DirectoryMonitor.c"
+#line 1314 "DirectoryMonitor.c"
}
@@ -1315,41 +1323,41 @@ static void directory_monitor_internal_notify_file_created (DirectoryMonitor* se
GFile* _tmp2_ = NULL;
GFileInfo* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
-#line 546 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 546 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 546 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (info));
-#line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = file;
-#line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = info;
-#line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = directory_monitor_is_file_create_move (self, _tmp0_, _tmp1_, &_tmp2_, &_tmp3_);
-#line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (old_file);
-#line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
old_file = _tmp2_;
-#line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (old_file_info);
-#line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
old_file_info = _tmp3_;
-#line 549 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp4_) {
-#line 1340 "DirectoryMonitor.c"
+#line 1348 "DirectoryMonitor.c"
GFile* _tmp5_ = NULL;
GFile* _tmp6_ = NULL;
GFileInfo* _tmp7_ = NULL;
-#line 550 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 556 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = old_file;
-#line 550 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 556 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = file;
-#line 550 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 556 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = info;
-#line 550 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 556 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_internal_notify_file_moved (self, _tmp5_, _tmp6_, _tmp7_);
-#line 1352 "DirectoryMonitor.c"
+#line 1360 "DirectoryMonitor.c"
} else {
gboolean updated = FALSE;
DirectoryMonitorFileInfoMap* _tmp8_ = NULL;
@@ -1359,33 +1367,33 @@ static void directory_monitor_internal_notify_file_created (DirectoryMonitor* se
gboolean _tmp12_ = FALSE;
GFile* _tmp13_ = NULL;
GFileInfo* _tmp14_ = NULL;
-#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 558 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = self->priv->files;
-#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 558 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = file;
-#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 558 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = info;
-#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 558 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp11_ = directory_monitor_file_info_map_update (_tmp8_, _tmp9_, _tmp10_);
-#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 558 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
updated = _tmp11_;
-#line 553 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 559 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp12_ = updated;
-#line 553 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 559 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp12_, "updated");
-#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 561 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp13_ = file;
-#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 561 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp14_ = info;
-#line 555 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 561 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_file_created (self, _tmp13_, _tmp14_);
-#line 1382 "DirectoryMonitor.c"
+#line 1390 "DirectoryMonitor.c"
}
-#line 546 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (old_file_info);
-#line 546 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 552 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (old_file);
-#line 1388 "DirectoryMonitor.c"
+#line 1396 "DirectoryMonitor.c"
}
@@ -1397,42 +1405,42 @@ static void directory_monitor_real_notify_file_created (DirectoryMonitor* self,
gchar* _tmp4_ = NULL;
GFile* _tmp5_ = NULL;
GFileInfo* _tmp6_ = NULL;
-#line 559 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 565 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 559 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 565 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (info));
-#line 560 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = file;
-#line 560 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = g_file_get_path (_tmp0_);
-#line 560 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _tmp1_;
-#line 560 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = g_strdup_printf ("file created: %s", _tmp2_);
-#line 560 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = _tmp3_;
-#line 560 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp4_);
-#line 560 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp4_);
-#line 560 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 566 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp2_);
-#line 561 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 567 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = file;
-#line 561 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 567 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = info;
-#line 561 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 567 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "file-created", _tmp5_, _tmp6_);
-#line 1426 "DirectoryMonitor.c"
+#line 1434 "DirectoryMonitor.c"
}
void directory_monitor_notify_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info) {
-#line 559 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 565 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 559 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 565 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_created (self, file, info);
-#line 1435 "DirectoryMonitor.c"
+#line 1443 "DirectoryMonitor.c"
}
@@ -1447,41 +1455,41 @@ static void directory_monitor_internal_notify_file_moved (DirectoryMonitor* self
GFile* _tmp6_ = NULL;
GFile* _tmp7_ = NULL;
GFileInfo* _tmp8_ = NULL;
-#line 564 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 570 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 564 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 570 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (old_file));
-#line 564 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 570 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (new_file));
-#line 564 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 570 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (new_file_info));
-#line 567 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 573 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->files;
-#line 567 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 573 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = old_file;
-#line 567 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 573 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_file_info_map_remove (_tmp0_, _tmp1_, NULL);
-#line 569 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = self->priv->files;
-#line 569 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = new_file;
-#line 569 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = new_file_info;
-#line 569 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = directory_monitor_file_info_map_update (_tmp2_, _tmp3_, _tmp4_);
-#line 569 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
updated = _tmp5_;
-#line 570 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (updated, "updated");
-#line 572 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 578 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = old_file;
-#line 572 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 578 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = new_file;
-#line 572 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 578 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = new_file_info;
-#line 572 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 578 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_file_moved (self, _tmp6_, _tmp7_, _tmp8_);
-#line 1484 "DirectoryMonitor.c"
+#line 1492 "DirectoryMonitor.c"
}
@@ -1497,54 +1505,54 @@ static void directory_monitor_real_notify_file_moved (DirectoryMonitor* self, GF
GFile* _tmp8_ = NULL;
GFile* _tmp9_ = NULL;
GFileInfo* _tmp10_ = NULL;
-#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (old_file));
-#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (new_file));
-#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (new_file_info));
-#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = old_file;
-#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = g_file_get_path (_tmp0_);
-#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _tmp1_;
-#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = new_file;
-#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = g_file_get_path (_tmp3_);
-#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = _tmp4_;
-#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = g_strdup_printf ("file moved: %s -> %s", _tmp2_, _tmp5_);
-#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = _tmp6_;
-#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp7_);
-#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp7_);
-#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp5_);
-#line 576 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp2_);
-#line 577 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 583 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = old_file;
-#line 577 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 583 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = new_file;
-#line 577 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 583 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = new_file_info;
-#line 577 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 583 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "file-moved", _tmp8_, _tmp9_, _tmp10_);
-#line 1538 "DirectoryMonitor.c"
+#line 1546 "DirectoryMonitor.c"
}
void directory_monitor_notify_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info) {
-#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 575 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_moved (self, old_file, new_file, new_file_info);
-#line 1547 "DirectoryMonitor.c"
+#line 1555 "DirectoryMonitor.c"
}
@@ -1555,38 +1563,38 @@ static void directory_monitor_real_notify_file_altered (DirectoryMonitor* self,
gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
GFile* _tmp5_ = NULL;
-#line 580 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = file;
-#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = g_file_get_path (_tmp0_);
-#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _tmp1_;
-#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = g_strdup_printf ("file altered: %s", _tmp2_);
-#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = _tmp3_;
-#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp4_);
-#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp4_);
-#line 581 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp2_);
-#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 588 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = file;
-#line 582 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 588 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "file-altered", _tmp5_);
-#line 1580 "DirectoryMonitor.c"
+#line 1588 "DirectoryMonitor.c"
}
void directory_monitor_notify_file_altered (DirectoryMonitor* self, GFile* file) {
-#line 580 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 580 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_altered (self, file);
-#line 1589 "DirectoryMonitor.c"
+#line 1597 "DirectoryMonitor.c"
}
@@ -1598,31 +1606,31 @@ static void directory_monitor_internal_notify_file_alteration_completed (Directo
gboolean _tmp3_ = FALSE;
GFile* _tmp4_ = NULL;
GFileInfo* _tmp5_ = NULL;
-#line 585 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 591 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 585 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 591 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 585 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 591 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (info));
-#line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->files;
-#line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = file;
-#line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = info;
-#line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = directory_monitor_file_info_map_update (_tmp0_, _tmp1_, _tmp2_);
-#line 586 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
updated = _tmp3_;
-#line 587 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 593 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (updated, "updated");
-#line 589 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 595 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = file;
-#line 589 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 595 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = info;
-#line 589 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 595 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_file_alteration_completed (self, _tmp4_, _tmp5_);
-#line 1625 "DirectoryMonitor.c"
+#line 1633 "DirectoryMonitor.c"
}
@@ -1634,42 +1642,42 @@ static void directory_monitor_real_notify_file_alteration_completed (DirectoryMo
gchar* _tmp4_ = NULL;
GFile* _tmp5_ = NULL;
GFileInfo* _tmp6_ = NULL;
-#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (info));
-#line 593 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = file;
-#line 593 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = g_file_get_path (_tmp0_);
-#line 593 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _tmp1_;
-#line 593 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = g_strdup_printf ("file alteration completed: %s", _tmp2_);
-#line 593 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = _tmp3_;
-#line 593 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp4_);
-#line 593 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp4_);
-#line 593 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp2_);
-#line 594 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 600 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = file;
-#line 594 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 600 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = info;
-#line 594 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 600 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "file-alteration-completed", _tmp5_, _tmp6_);
-#line 1663 "DirectoryMonitor.c"
+#line 1671 "DirectoryMonitor.c"
}
void directory_monitor_notify_file_alteration_completed (DirectoryMonitor* self, GFile* file, GFileInfo* info) {
-#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 592 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_alteration_completed (self, file, info);
-#line 1672 "DirectoryMonitor.c"
+#line 1680 "DirectoryMonitor.c"
}
@@ -1680,38 +1688,38 @@ static void directory_monitor_real_notify_file_attributes_altered (DirectoryMoni
gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
GFile* _tmp5_ = NULL;
-#line 597 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = file;
-#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = g_file_get_path (_tmp0_);
-#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _tmp1_;
-#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = g_strdup_printf ("file attributes altered: %s", _tmp2_);
-#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = _tmp3_;
-#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp4_);
-#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp4_);
-#line 598 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp2_);
-#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 605 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = file;
-#line 599 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 605 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "file-attributes-altered", _tmp5_);
-#line 1705 "DirectoryMonitor.c"
+#line 1713 "DirectoryMonitor.c"
}
void directory_monitor_notify_file_attributes_altered (DirectoryMonitor* self, GFile* file) {
-#line 597 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 597 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_attributes_altered (self, file);
-#line 1714 "DirectoryMonitor.c"
+#line 1722 "DirectoryMonitor.c"
}
@@ -1721,25 +1729,25 @@ static void directory_monitor_internal_notify_file_deleted (DirectoryMonitor* se
GFile* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
GFile* _tmp3_ = NULL;
-#line 602 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 608 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 602 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 608 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 609 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->files;
-#line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 609 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = file;
-#line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 609 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = directory_monitor_file_info_map_remove (_tmp0_, _tmp1_, NULL);
-#line 603 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 609 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
removed = _tmp2_;
-#line 604 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 610 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (removed, "removed");
-#line 606 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 612 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = file;
-#line 606 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 612 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_file_deleted (self, _tmp3_);
-#line 1742 "DirectoryMonitor.c"
+#line 1750 "DirectoryMonitor.c"
}
@@ -1750,38 +1758,38 @@ static void directory_monitor_real_notify_file_deleted (DirectoryMonitor* self,
gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
GFile* _tmp5_ = NULL;
-#line 609 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 615 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 610 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = file;
-#line 610 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = g_file_get_path (_tmp0_);
-#line 610 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _tmp1_;
-#line 610 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = g_strdup_printf ("file deleted: %s", _tmp2_);
-#line 610 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = _tmp3_;
-#line 610 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp4_);
-#line 610 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp4_);
-#line 610 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 616 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp2_);
-#line 611 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = file;
-#line 611 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "file-deleted", _tmp5_);
-#line 1775 "DirectoryMonitor.c"
+#line 1783 "DirectoryMonitor.c"
}
void directory_monitor_notify_file_deleted (DirectoryMonitor* self, GFile* file) {
-#line 609 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 615 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 609 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 615 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_file_deleted (self, file);
-#line 1784 "DirectoryMonitor.c"
+#line 1792 "DirectoryMonitor.c"
}
@@ -1793,29 +1801,29 @@ static void directory_monitor_internal_notify_directory_created (DirectoryMonito
GFile* _tmp2_ = NULL;
GFileInfo* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
-#line 614 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 614 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (dir));
-#line 614 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (info));
-#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = dir;
-#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = info;
-#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = directory_monitor_is_file_create_move (self, _tmp0_, _tmp1_, &_tmp2_, &_tmp3_);
-#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (old_dir);
-#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
old_dir = _tmp2_;
-#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (old_dir_info);
-#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
old_dir_info = _tmp3_;
-#line 617 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp4_) {
-#line 1818 "DirectoryMonitor.c"
+#line 1826 "DirectoryMonitor.c"
DirectoryMonitorFileInfoMap* _tmp5_ = NULL;
GFile* _tmp6_ = NULL;
DirectoryMonitorFileInfoMap* _tmp7_ = NULL;
@@ -1823,25 +1831,25 @@ static void directory_monitor_internal_notify_directory_created (DirectoryMonito
GFileInfo* _tmp9_ = NULL;
GFile* _tmp10_ = NULL;
GFileInfo* _tmp11_ = NULL;
-#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 629 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = self->priv->files;
-#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 629 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = old_dir;
-#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 629 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = self->priv->parent_moved;
-#line 623 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 629 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_file_info_map_remove_descendents (_tmp5_, _tmp6_, _tmp7_);
-#line 625 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 631 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = old_dir;
-#line 625 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 631 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = old_dir_info;
-#line 625 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 631 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = dir;
-#line 625 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 631 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp11_ = info;
-#line 625 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 631 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_internal_notify_directory_moved (self, _tmp8_, _tmp9_, _tmp10_, _tmp11_);
-#line 1844 "DirectoryMonitor.c"
+#line 1852 "DirectoryMonitor.c"
} else {
gboolean updated = FALSE;
DirectoryMonitorFileInfoMap* _tmp12_ = NULL;
@@ -1851,33 +1859,33 @@ static void directory_monitor_internal_notify_directory_created (DirectoryMonito
gboolean _tmp16_ = FALSE;
GFile* _tmp17_ = NULL;
GFileInfo* _tmp18_ = NULL;
-#line 627 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 633 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp12_ = self->priv->files;
-#line 627 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 633 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp13_ = dir;
-#line 627 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 633 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp14_ = info;
-#line 627 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 633 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp15_ = directory_monitor_file_info_map_update (_tmp12_, _tmp13_, _tmp14_);
-#line 627 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 633 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
updated = _tmp15_;
-#line 628 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 634 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp16_ = updated;
-#line 628 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 634 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp16_, "updated");
-#line 630 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 636 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp17_ = dir;
-#line 630 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 636 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp18_ = info;
-#line 630 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 636 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_directory_created (self, _tmp17_, _tmp18_);
-#line 1874 "DirectoryMonitor.c"
+#line 1882 "DirectoryMonitor.c"
}
-#line 614 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (old_dir_info);
-#line 614 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 620 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (old_dir);
-#line 1880 "DirectoryMonitor.c"
+#line 1888 "DirectoryMonitor.c"
}
@@ -1889,42 +1897,42 @@ static void directory_monitor_real_notify_directory_created (DirectoryMonitor* s
gchar* _tmp4_ = NULL;
GFile* _tmp5_ = NULL;
GFileInfo* _tmp6_ = NULL;
-#line 634 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 640 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (dir));
-#line 634 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 640 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (info));
-#line 635 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = dir;
-#line 635 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = g_file_get_path (_tmp0_);
-#line 635 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _tmp1_;
-#line 635 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = g_strdup_printf ("directory created: %s", _tmp2_);
-#line 635 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = _tmp3_;
-#line 635 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp4_);
-#line 635 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp4_);
-#line 635 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp2_);
-#line 636 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 642 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = dir;
-#line 636 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 642 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = info;
-#line 636 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 642 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "directory-created", _tmp5_, _tmp6_);
-#line 1918 "DirectoryMonitor.c"
+#line 1926 "DirectoryMonitor.c"
}
void directory_monitor_notify_directory_created (DirectoryMonitor* self, GFile* dir, GFileInfo* info) {
-#line 634 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 640 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 634 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 640 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_created (self, dir, info);
-#line 1927 "DirectoryMonitor.c"
+#line 1935 "DirectoryMonitor.c"
}
@@ -1933,27 +1941,27 @@ static void directory_monitor_internal_notify_directory_moved (DirectoryMonitor*
GFileInfo* _tmp1_ = NULL;
GFile* _tmp2_ = NULL;
GFileInfo* _tmp3_ = NULL;
-#line 639 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 645 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 639 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 645 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (old_dir));
-#line 639 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 645 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (old_dir_info));
-#line 639 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 645 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (new_dir));
-#line 639 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 645 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (new_dir_info));
-#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = old_dir;
-#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = old_dir_info;
-#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = new_dir;
-#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = new_dir_info;
-#line 641 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_async_internal_notify_directory_moved (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_, NULL, NULL);
-#line 1956 "DirectoryMonitor.c"
+#line 1964 "DirectoryMonitor.c"
}
@@ -1972,7 +1980,7 @@ static void directory_monitor_async_internal_notify_directory_moved_data_free (g
_g_object_unref0 (_data_->self);
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_slice_free (DirectoryMonitorAsyncInternalNotifyDirectoryMovedData, _data_);
-#line 1975 "DirectoryMonitor.c"
+#line 1983 "DirectoryMonitor.c"
}
@@ -2031,7 +2039,7 @@ static void directory_monitor_async_internal_notify_directory_moved (DirectoryMo
_data_->new_dir_info = _tmp8_;
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_async_internal_notify_directory_moved_co (_data_);
-#line 2034 "DirectoryMonitor.c"
+#line 2042 "DirectoryMonitor.c"
}
@@ -2039,521 +2047,521 @@ static void directory_monitor_async_internal_notify_directory_moved_finish (Dire
DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _data_;
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
-#line 2042 "DirectoryMonitor.c"
+#line 2050 "DirectoryMonitor.c"
}
static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) {
gboolean result;
result = file_equal ((GFile*) a, (GFile*) b);
-#line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 652 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 2051 "DirectoryMonitor.c"
+#line 2059 "DirectoryMonitor.c"
}
static void directory_monitor_async_internal_notify_directory_moved_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) {
DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _data_;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_ = _user_data_;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_source_object_ = source_object;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_res_ = _res_;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_async_internal_notify_directory_moved_co (_data_);
-#line 2065 "DirectoryMonitor.c"
+#line 2073 "DirectoryMonitor.c"
}
static gboolean _directory_monitor_async_internal_notify_directory_moved_co_gsource_func (gpointer self) {
gboolean result;
result = directory_monitor_async_internal_notify_directory_moved_co (self);
-#line 677 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 683 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 2074 "DirectoryMonitor.c"
+#line 2082 "DirectoryMonitor.c"
}
static gboolean directory_monitor_async_internal_notify_directory_moved_co (DirectoryMonitorAsyncInternalNotifyDirectoryMovedData* _data_) {
-#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
switch (_data_->_state_) {
-#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case 0:
-#line 2083 "DirectoryMonitor.c"
+#line 2091 "DirectoryMonitor.c"
goto _state_0;
-#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case 1:
-#line 2087 "DirectoryMonitor.c"
+#line 2095 "DirectoryMonitor.c"
goto _state_1;
-#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case 2:
-#line 2091 "DirectoryMonitor.c"
+#line 2099 "DirectoryMonitor.c"
goto _state_2;
default:
-#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_assert_not_reached ();
-#line 2096 "DirectoryMonitor.c"
+#line 2104 "DirectoryMonitor.c"
}
_state_0:
-#line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 652 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp0_ = NULL;
-#line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 652 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
-#line 646 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 652 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->file_children = _data_->_tmp0_;
-#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp1_ = NULL;
-#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
-#line 647 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->dir_children = _data_->_tmp1_;
-#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp2_ = NULL;
-#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp2_ = _data_->self->priv->files;
-#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp3_ = NULL;
-#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp3_ = _data_->old_dir;
-#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp4_ = NULL;
-#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp4_ = _data_->file_children;
-#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp5_ = NULL;
-#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp5_ = _data_->dir_children;
-#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp6_ = 0;
-#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp6_ = directory_monitor_file_info_map_get_children (_data_->_tmp2_, _data_->_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 648 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->count = _data_->_tmp6_;
-#line 649 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp7_ = 0;
-#line 649 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp7_ = _data_->count;
-#line 649 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_tmp7_ > 0) {
-#line 2139 "DirectoryMonitor.c"
+#line 2147 "DirectoryMonitor.c"
{
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp8_ = NULL;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp8_ = _data_->dir_children;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp9_ = NULL;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp9_ = _g_object_ref0 (_data_->_tmp8_);
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_dir_child_list = _data_->_tmp9_;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp10_ = NULL;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp10_ = _data_->_dir_child_list;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp11_ = 0;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp12_ = 0;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp12_ = _data_->_tmp11_;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_dir_child_size = _data_->_tmp12_;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_dir_child_index = -1;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
while (TRUE) {
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp13_ = 0;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp13_ = _data_->_dir_child_index;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_dir_child_index = _data_->_tmp13_ + 1;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp14_ = 0;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp14_ = _data_->_dir_child_index;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp15_ = 0;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp15_ = _data_->_dir_child_size;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!(_data_->_tmp14_ < _data_->_tmp15_)) {
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 2187 "DirectoryMonitor.c"
+#line 2195 "DirectoryMonitor.c"
}
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp16_ = NULL;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp16_ = _data_->_dir_child_list;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp17_ = 0;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp17_ = _data_->_dir_child_index;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp18_ = NULL;
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp18_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp17_);
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->dir_child = (GFile*) _data_->_tmp18_;
-#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp19_ = NULL;
-#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp19_ = _data_->self->priv->files;
-#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp20_ = NULL;
-#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp20_ = _data_->dir_child;
-#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp21_ = NULL;
-#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp21_ = directory_monitor_file_info_map_get_info (_data_->_tmp19_, _data_->_tmp20_);
-#line 654 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 660 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->dir_info = _data_->_tmp21_;
-#line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp22_ = NULL;
-#line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp22_ = _data_->dir_info;
-#line 655 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_tmp22_ == NULL) {
-#line 656 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp23_ = NULL;
-#line 656 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp23_ = _data_->dir_child;
-#line 656 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp24_ = NULL;
-#line 656 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp24_ = g_file_get_path (_data_->_tmp23_);
-#line 656 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp25_ = NULL;
-#line 656 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp25_ = _data_->_tmp24_;
-#line 656 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_warning ("DirectoryMonitor.vala:656: Unable to retrieve directory-moved info for" \
+#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ g_warning ("DirectoryMonitor.vala:662: Unable to retrieve directory-moved info for" \
" %s", _data_->_tmp25_);
-#line 656 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 662 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_data_->_tmp25_);
-#line 658 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 664 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->dir_info);
-#line 658 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 664 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->dir_child);
-#line 658 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 664 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
continue;
-#line 2245 "DirectoryMonitor.c"
+#line 2253 "DirectoryMonitor.c"
}
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp26_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp26_ = _data_->dir_child;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp27_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp27_ = _data_->dir_info;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp28_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp28_ = _data_->new_dir;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp29_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp29_ = _data_->dir_child;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp30_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp30_ = g_file_get_basename (_data_->_tmp29_);
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp31_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp31_ = _data_->_tmp30_;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp32_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp32_ = g_file_get_child (_data_->_tmp28_, _data_->_tmp31_);
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp33_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp33_ = _data_->_tmp32_;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp34_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp34_ = _data_->dir_info;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_state_ = 1;
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_async_internal_notify_directory_moved (_data_->self, _data_->_tmp26_, _data_->_tmp27_, _data_->_tmp33_, _data_->_tmp34_, directory_monitor_async_internal_notify_directory_moved_ready, _data_);
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 2289 "DirectoryMonitor.c"
+#line 2297 "DirectoryMonitor.c"
_state_1:
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_async_internal_notify_directory_moved_finish (_data_->self, _data_->_res_);
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->_tmp33_);
-#line 661 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_data_->_tmp31_);
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->dir_info);
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->dir_child);
-#line 2301 "DirectoryMonitor.c"
+#line 2309 "DirectoryMonitor.c"
}
-#line 653 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 659 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->_dir_child_list);
-#line 2305 "DirectoryMonitor.c"
+#line 2313 "DirectoryMonitor.c"
}
{
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp35_ = NULL;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp35_ = _data_->file_children;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp36_ = NULL;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp36_ = _g_object_ref0 (_data_->_tmp35_);
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_file_child_list = _data_->_tmp36_;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp37_ = NULL;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp37_ = _data_->_file_child_list;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp38_ = 0;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp38_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp37_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp39_ = 0;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp39_ = _data_->_tmp38_;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_file_child_size = _data_->_tmp39_;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_file_child_index = -1;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
while (TRUE) {
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp40_ = 0;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp40_ = _data_->_file_child_index;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_file_child_index = _data_->_tmp40_ + 1;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp41_ = 0;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp41_ = _data_->_file_child_index;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp42_ = 0;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp42_ = _data_->_file_child_size;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!(_data_->_tmp41_ < _data_->_tmp42_)) {
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 2354 "DirectoryMonitor.c"
+#line 2362 "DirectoryMonitor.c"
}
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp43_ = NULL;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp43_ = _data_->_file_child_list;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp44_ = 0;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp44_ = _data_->_file_child_index;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp45_ = NULL;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp45_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp43_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp44_);
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->file_child = (GFile*) _data_->_tmp45_;
-#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp46_ = NULL;
-#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp46_ = _data_->self->priv->files;
-#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp47_ = NULL;
-#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp47_ = _data_->file_child;
-#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp48_ = NULL;
-#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp48_ = directory_monitor_file_info_map_get_info (_data_->_tmp46_, _data_->_tmp47_);
-#line 667 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 673 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->file_info = _data_->_tmp48_;
-#line 668 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp49_ = NULL;
-#line 668 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp49_ = _data_->file_info;
-#line 668 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_tmp49_ == NULL) {
-#line 669 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp50_ = NULL;
-#line 669 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp50_ = _data_->file_child;
-#line 669 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp51_ = NULL;
-#line 669 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp51_ = g_file_get_path (_data_->_tmp50_);
-#line 669 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp52_ = NULL;
-#line 669 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp52_ = _data_->_tmp51_;
-#line 669 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_warning ("DirectoryMonitor.vala:669: Unable to retrieve directory-moved info for" \
+#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ g_warning ("DirectoryMonitor.vala:675: Unable to retrieve directory-moved info for" \
" %s", _data_->_tmp52_);
-#line 669 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 675 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_data_->_tmp52_);
-#line 671 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 677 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->file_info);
-#line 671 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 677 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->file_child);
-#line 671 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 677 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
continue;
-#line 2412 "DirectoryMonitor.c"
+#line 2420 "DirectoryMonitor.c"
}
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp53_ = NULL;
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp53_ = _data_->file_child;
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp54_ = NULL;
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp54_ = _data_->new_dir;
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp55_ = NULL;
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp55_ = _data_->file_child;
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp56_ = NULL;
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp56_ = g_file_get_basename (_data_->_tmp55_);
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp57_ = NULL;
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp57_ = _data_->_tmp56_;
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp58_ = NULL;
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp58_ = g_file_get_child (_data_->_tmp54_, _data_->_tmp57_);
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp59_ = NULL;
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp59_ = _data_->_tmp58_;
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp60_ = NULL;
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp60_ = _data_->file_info;
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_internal_notify_file_moved (_data_->self, _data_->_tmp53_, _data_->_tmp59_, _data_->_tmp60_);
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->_tmp59_);
-#line 674 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 680 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_data_->_tmp57_);
-#line 677 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 683 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_idle_add_full (DIRECTORY_MONITOR_DEFAULT_PRIORITY, _directory_monitor_async_internal_notify_directory_moved_co_gsource_func, _data_, NULL);
-#line 678 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 684 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_state_ = 2;
-#line 678 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 684 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 2458 "DirectoryMonitor.c"
+#line 2466 "DirectoryMonitor.c"
_state_2:
;
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->file_info);
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->file_child);
-#line 2465 "DirectoryMonitor.c"
+#line 2473 "DirectoryMonitor.c"
}
-#line 666 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 672 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->_file_child_list);
-#line 2469 "DirectoryMonitor.c"
+#line 2477 "DirectoryMonitor.c"
}
}
-#line 684 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp61_ = NULL;
-#line 684 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp61_ = _data_->self->priv->files;
-#line 684 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp62_ = NULL;
-#line 684 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp62_ = _data_->old_dir;
-#line 684 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_file_info_map_remove (_data_->_tmp61_, _data_->_tmp62_, NULL);
-#line 686 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp63_ = NULL;
-#line 686 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp63_ = _data_->self->priv->files;
-#line 686 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp64_ = NULL;
-#line 686 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp64_ = _data_->new_dir;
-#line 686 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp65_ = NULL;
-#line 686 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp65_ = _data_->new_dir_info;
-#line 686 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp66_ = FALSE;
-#line 686 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp66_ = directory_monitor_file_info_map_update (_data_->_tmp63_, _data_->_tmp64_, _data_->_tmp65_);
-#line 686 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 692 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->updated = _data_->_tmp66_;
-#line 687 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 693 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_data_->updated, "updated");
-#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp67_ = NULL;
-#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp67_ = _data_->old_dir;
-#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp68_ = NULL;
-#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp68_ = _data_->old_dir_info;
-#line 690 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_remove_monitor (_data_->self, _data_->_tmp67_, _data_->_tmp68_);
-#line 691 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp69_ = NULL;
-#line 691 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp69_ = _data_->new_dir;
-#line 691 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp70_ = NULL;
-#line 691 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp70_ = _data_->new_dir_info;
-#line 691 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_add_monitor (_data_->self, _data_->_tmp69_, _data_->_tmp70_);
-#line 693 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp71_ = NULL;
-#line 693 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp71_ = _data_->old_dir;
-#line 693 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp72_ = NULL;
-#line 693 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp72_ = _data_->new_dir;
-#line 693 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp73_ = NULL;
-#line 693 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp73_ = _data_->new_dir_info;
-#line 693 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 699 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_directory_moved (_data_->self, _data_->_tmp71_, _data_->_tmp72_, _data_->_tmp73_);
-#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->dir_children);
-#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->file_children);
-#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_state_ == 0) {
-#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 2544 "DirectoryMonitor.c"
+#line 2552 "DirectoryMonitor.c"
} else {
-#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_simple_async_result_complete (_data_->_async_result);
-#line 2548 "DirectoryMonitor.c"
+#line 2556 "DirectoryMonitor.c"
}
-#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_object_unref (_data_->_async_result);
-#line 644 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 650 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 2554 "DirectoryMonitor.c"
+#line 2562 "DirectoryMonitor.c"
}
@@ -2572,75 +2580,75 @@ static void directory_monitor_real_notify_directory_moved (DirectoryMonitor* sel
GFile* _tmp11_ = NULL;
GFile* _tmp12_ = NULL;
gboolean _tmp13_ = FALSE;
-#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (old_dir));
-#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (new_dir));
-#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (new_dir_info));
-#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = old_dir;
-#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = g_file_get_path (_tmp0_);
-#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _tmp1_;
-#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = new_dir;
-#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = g_file_get_path (_tmp3_);
-#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = _tmp4_;
-#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = g_strdup_printf ("directory moved: %s -> %s", _tmp2_, _tmp5_);
-#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = _tmp6_;
-#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp7_);
-#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp7_);
-#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp5_);
-#line 697 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 703 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp2_);
-#line 698 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = old_dir;
-#line 698 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = new_dir;
-#line 698 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = new_dir_info;
-#line 698 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "directory-moved", _tmp8_, _tmp9_, _tmp10_);
-#line 700 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp11_ = old_dir;
-#line 700 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp12_ = self->priv->root;
-#line 700 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp13_ = g_file_equal (_tmp11_, _tmp12_);
-#line 700 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp13_) {
-#line 2619 "DirectoryMonitor.c"
+#line 2627 "DirectoryMonitor.c"
GFile* _tmp14_ = NULL;
GFile* _tmp15_ = NULL;
GFileInfo* _tmp16_ = NULL;
-#line 701 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 707 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp14_ = old_dir;
-#line 701 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 707 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp15_ = new_dir;
-#line 701 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 707 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp16_ = new_dir_info;
-#line 701 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 707 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_internal_notify_root_moved (self, _tmp14_, _tmp15_, _tmp16_);
-#line 2631 "DirectoryMonitor.c"
+#line 2639 "DirectoryMonitor.c"
}
}
void directory_monitor_notify_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFile* new_dir, GFileInfo* new_dir_info) {
-#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 696 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 702 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_moved (self, old_dir, new_dir, new_dir_info);
-#line 2641 "DirectoryMonitor.c"
+#line 2649 "DirectoryMonitor.c"
}
@@ -2651,38 +2659,38 @@ static void directory_monitor_real_notify_directory_altered (DirectoryMonitor* s
gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
GFile* _tmp5_ = NULL;
-#line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (dir));
-#line 705 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = dir;
-#line 705 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = g_file_get_path (_tmp0_);
-#line 705 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _tmp1_;
-#line 705 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = g_strdup_printf ("directory altered: %s", _tmp2_);
-#line 705 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = _tmp3_;
-#line 705 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp4_);
-#line 705 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp4_);
-#line 705 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp2_);
-#line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 712 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = dir;
-#line 706 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 712 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "directory-altered", _tmp5_);
-#line 2674 "DirectoryMonitor.c"
+#line 2682 "DirectoryMonitor.c"
}
void directory_monitor_notify_directory_altered (DirectoryMonitor* self, GFile* dir) {
-#line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 704 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_altered (self, dir);
-#line 2683 "DirectoryMonitor.c"
+#line 2691 "DirectoryMonitor.c"
}
@@ -2694,31 +2702,31 @@ static void directory_monitor_internal_notify_directory_alteration_completed (Di
gboolean _tmp3_ = FALSE;
GFile* _tmp4_ = NULL;
GFileInfo* _tmp5_ = NULL;
-#line 709 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 715 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 709 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 715 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (dir));
-#line 709 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 715 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (info));
-#line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->files;
-#line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = dir;
-#line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = info;
-#line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = directory_monitor_file_info_map_update (_tmp0_, _tmp1_, _tmp2_);
-#line 710 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
updated = _tmp3_;
-#line 711 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 717 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (updated, "updated");
-#line 713 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 719 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = dir;
-#line 713 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 719 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = info;
-#line 713 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 719 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_directory_alteration_completed (self, _tmp4_, _tmp5_);
-#line 2719 "DirectoryMonitor.c"
+#line 2727 "DirectoryMonitor.c"
}
@@ -2730,42 +2738,42 @@ static void directory_monitor_real_notify_directory_alteration_completed (Direct
gchar* _tmp4_ = NULL;
GFile* _tmp5_ = NULL;
GFileInfo* _tmp6_ = NULL;
-#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (dir));
-#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (info));
-#line 717 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = dir;
-#line 717 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = g_file_get_path (_tmp0_);
-#line 717 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _tmp1_;
-#line 717 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = g_strdup_printf ("directory alteration completed: %s", _tmp2_);
-#line 717 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = _tmp3_;
-#line 717 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp4_);
-#line 717 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp4_);
-#line 717 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp2_);
-#line 718 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 724 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = dir;
-#line 718 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 724 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = info;
-#line 718 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 724 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "directory-alteration-completed", _tmp5_, _tmp6_);
-#line 2757 "DirectoryMonitor.c"
+#line 2765 "DirectoryMonitor.c"
}
void directory_monitor_notify_directory_alteration_completed (DirectoryMonitor* self, GFile* dir, GFileInfo* info) {
-#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 716 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_alteration_completed (self, dir, info);
-#line 2766 "DirectoryMonitor.c"
+#line 2774 "DirectoryMonitor.c"
}
@@ -2776,38 +2784,38 @@ static void directory_monitor_real_notify_directory_attributes_altered (Director
gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
GFile* _tmp5_ = NULL;
-#line 721 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (dir));
-#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = dir;
-#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = g_file_get_path (_tmp0_);
-#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _tmp1_;
-#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = g_strdup_printf ("directory attributes altered: %s", _tmp2_);
-#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = _tmp3_;
-#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp4_);
-#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp4_);
-#line 722 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp2_);
-#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 729 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = dir;
-#line 723 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 729 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "directory-attributes-altered", _tmp5_);
-#line 2799 "DirectoryMonitor.c"
+#line 2807 "DirectoryMonitor.c"
}
void directory_monitor_notify_directory_attributes_altered (DirectoryMonitor* self, GFile* dir) {
-#line 721 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 721 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_attributes_altered (self, dir);
-#line 2808 "DirectoryMonitor.c"
+#line 2816 "DirectoryMonitor.c"
}
@@ -2818,31 +2826,31 @@ static void directory_monitor_internal_notify_directory_deleted (DirectoryMonito
GFileInfo* _tmp2_ = NULL;
GFile* _tmp3_ = NULL;
GFile* _tmp4_ = NULL;
-#line 726 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 732 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 726 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 732 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (dir));
-#line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 733 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->files;
-#line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 733 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = dir;
-#line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 733 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = directory_monitor_file_info_map_get_info (_tmp0_, _tmp1_);
-#line 727 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 733 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
info = _tmp2_;
-#line 728 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 734 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (info != NULL, "info != null");
-#line 731 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 737 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = dir;
-#line 731 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 737 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_remove_monitor (self, _tmp3_, info);
-#line 733 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 739 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = dir;
-#line 733 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 739 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_async_notify_directory_deleted (self, _tmp4_, FALSE, NULL, NULL);
-#line 726 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 732 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (info);
-#line 2843 "DirectoryMonitor.c"
+#line 2851 "DirectoryMonitor.c"
}
@@ -2855,7 +2863,7 @@ static void directory_monitor_async_notify_directory_deleted_data_free (gpointer
_g_object_unref0 (_data_->self);
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_slice_free (DirectoryMonitorAsyncNotifyDirectoryDeletedData, _data_);
-#line 2856 "DirectoryMonitor.c"
+#line 2864 "DirectoryMonitor.c"
}
@@ -2889,7 +2897,7 @@ static void directory_monitor_async_notify_directory_deleted (DirectoryMonitor*
_data_->already_removed = _tmp3_;
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_async_notify_directory_deleted_co (_data_);
-#line 2890 "DirectoryMonitor.c"
+#line 2898 "DirectoryMonitor.c"
}
@@ -2897,320 +2905,320 @@ static void directory_monitor_async_notify_directory_deleted_finish (DirectoryMo
DirectoryMonitorAsyncNotifyDirectoryDeletedData* _data_;
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
-#line 2898 "DirectoryMonitor.c"
+#line 2906 "DirectoryMonitor.c"
}
static void directory_monitor_async_notify_directory_deleted_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) {
DirectoryMonitorAsyncNotifyDirectoryDeletedData* _data_;
-#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_ = _user_data_;
-#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_source_object_ = source_object;
-#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_res_ = _res_;
-#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_async_notify_directory_deleted_co (_data_);
-#line 2912 "DirectoryMonitor.c"
+#line 2920 "DirectoryMonitor.c"
}
static gboolean _directory_monitor_async_notify_directory_deleted_co_gsource_func (gpointer self) {
gboolean result;
result = directory_monitor_async_notify_directory_deleted_co (self);
-#line 765 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 771 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 2921 "DirectoryMonitor.c"
+#line 2929 "DirectoryMonitor.c"
}
static gboolean directory_monitor_async_notify_directory_deleted_co (DirectoryMonitorAsyncNotifyDirectoryDeletedData* _data_) {
-#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
switch (_data_->_state_) {
-#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case 0:
-#line 2930 "DirectoryMonitor.c"
+#line 2938 "DirectoryMonitor.c"
goto _state_0;
-#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case 1:
-#line 2934 "DirectoryMonitor.c"
+#line 2942 "DirectoryMonitor.c"
goto _state_1;
-#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case 2:
-#line 2938 "DirectoryMonitor.c"
+#line 2946 "DirectoryMonitor.c"
goto _state_2;
default:
-#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_assert_not_reached ();
-#line 2943 "DirectoryMonitor.c"
+#line 2951 "DirectoryMonitor.c"
}
_state_0:
-#line 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 750 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp0_ = NULL;
-#line 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 750 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp0_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
-#line 744 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 750 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->file_children = _data_->_tmp0_;
-#line 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 751 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp1_ = NULL;
-#line 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 751 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_equal_gee_equal_data_func, NULL, NULL);
-#line 745 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 751 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->dir_children = _data_->_tmp1_;
-#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp2_ = NULL;
-#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp2_ = _data_->self->priv->files;
-#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp3_ = NULL;
-#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp3_ = _data_->dir;
-#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp4_ = NULL;
-#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp4_ = _data_->file_children;
-#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp5_ = NULL;
-#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp5_ = _data_->dir_children;
-#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp6_ = 0;
-#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp6_ = directory_monitor_file_info_map_get_children (_data_->_tmp2_, _data_->_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 746 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 752 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->count = _data_->_tmp6_;
-#line 747 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 753 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp7_ = 0;
-#line 747 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 753 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp7_ = _data_->count;
-#line 747 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 753 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_tmp7_ > 0) {
-#line 2986 "DirectoryMonitor.c"
+#line 2994 "DirectoryMonitor.c"
{
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp8_ = NULL;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp8_ = _data_->dir_children;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp9_ = NULL;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp9_ = _g_object_ref0 (_data_->_tmp8_);
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_dir_child_list = _data_->_tmp9_;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp10_ = NULL;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp10_ = _data_->_dir_child_list;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp11_ = 0;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp12_ = 0;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp12_ = _data_->_tmp11_;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_dir_child_size = _data_->_tmp12_;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_dir_child_index = -1;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
while (TRUE) {
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp13_ = 0;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp13_ = _data_->_dir_child_index;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_dir_child_index = _data_->_tmp13_ + 1;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp14_ = 0;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp14_ = _data_->_dir_child_index;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp15_ = 0;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp15_ = _data_->_dir_child_size;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!(_data_->_tmp14_ < _data_->_tmp15_)) {
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 3034 "DirectoryMonitor.c"
+#line 3042 "DirectoryMonitor.c"
}
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp16_ = NULL;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp16_ = _data_->_dir_child_list;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp17_ = 0;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp17_ = _data_->_dir_child_index;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp18_ = NULL;
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp18_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp17_);
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->dir_child = (GFile*) _data_->_tmp18_;
-#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp19_ = NULL;
-#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp19_ = _data_->dir_child;
-#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_state_ = 1;
-#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_async_notify_directory_deleted (_data_->self, _data_->_tmp19_, FALSE, directory_monitor_async_notify_directory_deleted_ready, _data_);
-#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 3060 "DirectoryMonitor.c"
+#line 3068 "DirectoryMonitor.c"
_state_1:
-#line 756 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 762 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_async_notify_directory_deleted_finish (_data_->self, _data_->_res_);
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->dir_child);
-#line 3066 "DirectoryMonitor.c"
+#line 3074 "DirectoryMonitor.c"
}
-#line 755 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->_dir_child_list);
-#line 3070 "DirectoryMonitor.c"
+#line 3078 "DirectoryMonitor.c"
}
{
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp20_ = NULL;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp20_ = _data_->file_children;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp21_ = NULL;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp21_ = _g_object_ref0 (_data_->_tmp20_);
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_file_child_list = _data_->_tmp21_;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp22_ = NULL;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp22_ = _data_->_file_child_list;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp23_ = 0;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp23_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp24_ = 0;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp24_ = _data_->_tmp23_;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_file_child_size = _data_->_tmp24_;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_file_child_index = -1;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
while (TRUE) {
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp25_ = 0;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp25_ = _data_->_file_child_index;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_file_child_index = _data_->_tmp25_ + 1;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp26_ = 0;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp26_ = _data_->_file_child_index;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp27_ = 0;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp27_ = _data_->_file_child_size;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!(_data_->_tmp26_ < _data_->_tmp27_)) {
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 3119 "DirectoryMonitor.c"
+#line 3127 "DirectoryMonitor.c"
}
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp28_ = NULL;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp28_ = _data_->_file_child_list;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp29_ = 0;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp29_ = _data_->_file_child_index;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp30_ = NULL;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp30_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp28_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _data_->_tmp29_);
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->file_child = (GFile*) _data_->_tmp30_;
-#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp31_ = NULL;
-#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp31_ = _data_->self->priv->files;
-#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp32_ = NULL;
-#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp32_ = _data_->file_child;
-#line 761 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 767 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_file_info_map_remove (_data_->_tmp31_, _data_->_tmp32_, NULL);
-#line 763 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 769 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp33_ = NULL;
-#line 763 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 769 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp33_ = _data_->file_child;
-#line 763 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 769 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_file_deleted (_data_->self, _data_->_tmp33_);
-#line 765 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 771 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_idle_add_full (DIRECTORY_MONITOR_DEFAULT_PRIORITY, _directory_monitor_async_notify_directory_deleted_co_gsource_func, _data_, NULL);
-#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 772 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_state_ = 2;
-#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 772 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 3157 "DirectoryMonitor.c"
+#line 3165 "DirectoryMonitor.c"
_state_2:
;
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->file_child);
-#line 3162 "DirectoryMonitor.c"
+#line 3170 "DirectoryMonitor.c"
}
-#line 760 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 766 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->_file_child_list);
-#line 3166 "DirectoryMonitor.c"
+#line 3174 "DirectoryMonitor.c"
}
}
-#line 770 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp34_ = FALSE;
-#line 770 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp34_ = _data_->already_removed;
-#line 770 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_data_->_tmp34_) {
-#line 771 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp35_ = NULL;
-#line 771 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp35_ = _data_->self->priv->files;
-#line 771 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp36_ = NULL;
-#line 771 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp36_ = _data_->dir;
-#line 771 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_file_info_map_remove (_data_->_tmp35_, _data_->_tmp36_, NULL);
-#line 3185 "DirectoryMonitor.c"
+#line 3193 "DirectoryMonitor.c"
}
-#line 773 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 779 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp37_ = NULL;
-#line 773 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 779 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp37_ = _data_->dir;
-#line 773 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 779 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_directory_deleted (_data_->self, _data_->_tmp37_);
-#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->dir_children);
-#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->file_children);
-#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_state_ == 0) {
-#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 3201 "DirectoryMonitor.c"
+#line 3209 "DirectoryMonitor.c"
} else {
-#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_simple_async_result_complete (_data_->_async_result);
-#line 3205 "DirectoryMonitor.c"
+#line 3213 "DirectoryMonitor.c"
}
-#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_object_unref (_data_->_async_result);
-#line 736 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 742 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 3211 "DirectoryMonitor.c"
+#line 3219 "DirectoryMonitor.c"
}
@@ -3224,53 +3232,53 @@ static void directory_monitor_real_notify_directory_deleted (DirectoryMonitor* s
GFile* _tmp6_ = NULL;
GFile* _tmp7_ = NULL;
gboolean _tmp8_ = FALSE;
-#line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 782 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (dir));
-#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = dir;
-#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = g_file_get_path (_tmp0_);
-#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _tmp1_;
-#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = g_strdup_printf ("directory deleted: %s", _tmp2_);
-#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = _tmp3_;
-#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp4_);
-#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp4_);
-#line 777 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 783 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp2_);
-#line 778 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 784 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = dir;
-#line 778 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 784 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "directory-deleted", _tmp5_);
-#line 780 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = dir;
-#line 780 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = self->priv->root;
-#line 780 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = g_file_equal (_tmp6_, _tmp7_);
-#line 780 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp8_) {
-#line 3255 "DirectoryMonitor.c"
+#line 3263 "DirectoryMonitor.c"
GFile* _tmp9_ = NULL;
-#line 781 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 787 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = dir;
-#line 781 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 787 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_root_deleted (self, _tmp9_);
-#line 3261 "DirectoryMonitor.c"
+#line 3269 "DirectoryMonitor.c"
}
}
void directory_monitor_notify_directory_deleted (DirectoryMonitor* self, GFile* dir) {
-#line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 782 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 776 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 782 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_directory_deleted (self, dir);
-#line 3271 "DirectoryMonitor.c"
+#line 3279 "DirectoryMonitor.c"
}
@@ -3280,34 +3288,34 @@ static void directory_monitor_real_notify_closed (DirectoryMonitor* self) {
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
-#line 785 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->root;
-#line 785 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = g_file_get_path (_tmp0_);
-#line 785 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _tmp1_;
-#line 785 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = g_strdup_printf ("monitoring of %s closed", _tmp2_);
-#line 785 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = _tmp3_;
-#line 785 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp4_);
-#line 785 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp4_);
-#line 785 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 791 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp2_);
-#line 786 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 792 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_emit_by_name (self, "closed");
-#line 3299 "DirectoryMonitor.c"
+#line 3307 "DirectoryMonitor.c"
}
void directory_monitor_notify_closed (DirectoryMonitor* self) {
-#line 784 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 790 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 784 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 790 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->notify_closed (self);
-#line 3308 "DirectoryMonitor.c"
+#line 3316 "DirectoryMonitor.c"
}
@@ -3315,17 +3323,17 @@ GFile* directory_monitor_get_root (DirectoryMonitor* self) {
GFile* result = NULL;
GFile* _tmp0_ = NULL;
GFile* _tmp1_ = NULL;
-#line 789 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 795 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), NULL);
-#line 790 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 796 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->root;
-#line 790 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 796 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 790 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 796 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = _tmp1_;
-#line 790 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 796 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 3326 "DirectoryMonitor.c"
+#line 3334 "DirectoryMonitor.c"
}
@@ -3334,72 +3342,72 @@ gboolean directory_monitor_is_in_root (DirectoryMonitor* self, GFile* file) {
GFile* _tmp0_ = NULL;
GFile* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
-#line 793 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 799 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE);
-#line 793 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 799 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 794 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 800 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = file;
-#line 794 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 800 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = self->priv->root;
-#line 794 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 800 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = g_file_has_prefix (_tmp0_, _tmp1_);
-#line 794 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 800 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = _tmp2_;
-#line 794 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 800 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 3349 "DirectoryMonitor.c"
+#line 3357 "DirectoryMonitor.c"
}
gboolean directory_monitor_has_started (DirectoryMonitor* self) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
-#line 797 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 803 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE);
-#line 798 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 804 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->started;
-#line 798 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 804 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = _tmp0_;
-#line 798 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 804 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 3364 "DirectoryMonitor.c"
+#line 3372 "DirectoryMonitor.c"
}
void directory_monitor_start_discovery (DirectoryMonitor* self) {
gboolean _tmp0_ = FALSE;
GFile* _tmp1_ = NULL;
-#line 801 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 807 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 802 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 808 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->started;
-#line 802 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 808 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (!_tmp0_, "!started");
-#line 804 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 810 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->has_discovery_started = TRUE;
-#line 805 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 811 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->started = TRUE;
-#line 807 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 813 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_discovery_started (self);
-#line 810 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 816 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->outstanding_exploration_dirs = 1;
-#line 811 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 817 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = self->priv->root;
-#line 811 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 817 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_explore_async (self, _tmp1_, NULL, TRUE, NULL, NULL);
-#line 3389 "DirectoryMonitor.c"
+#line 3397 "DirectoryMonitor.c"
}
static void directory_monitor_real_close (DirectoryMonitor* self) {
GCancellable* _tmp0_ = NULL;
GeeHashMap* _tmp12_ = NULL;
-#line 818 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 824 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->cancellable;
-#line 818 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 824 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_cancellable_cancel (_tmp0_);
-#line 3400 "DirectoryMonitor.c"
+#line 3408 "DirectoryMonitor.c"
{
GeeIterator* _monitor_it = NULL;
GeeHashMap* _tmp1_ = NULL;
@@ -3408,75 +3416,75 @@ static void directory_monitor_real_close (DirectoryMonitor* self) {
GeeCollection* _tmp4_ = NULL;
GeeIterator* _tmp5_ = NULL;
GeeIterator* _tmp6_ = NULL;
-#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = self->priv->monitors;
-#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = _tmp2_;
-#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = _tmp3_;
-#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = _tmp5_;
-#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_tmp4_);
-#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_monitor_it = _tmp6_;
-#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
while (TRUE) {
-#line 3427 "DirectoryMonitor.c"
+#line 3435 "DirectoryMonitor.c"
GeeIterator* _tmp7_ = NULL;
gboolean _tmp8_ = FALSE;
GFileMonitor* monitor = NULL;
GeeIterator* _tmp9_ = NULL;
gpointer _tmp10_ = NULL;
GFileMonitor* _tmp11_ = NULL;
-#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = _monitor_it;
-#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = gee_iterator_next (_tmp7_);
-#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_tmp8_) {
-#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 3442 "DirectoryMonitor.c"
+#line 3450 "DirectoryMonitor.c"
}
-#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = _monitor_it;
-#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = gee_iterator_get (_tmp9_);
-#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
monitor = (GFileMonitor*) _tmp10_;
-#line 822 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 828 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp11_ = monitor;
-#line 822 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 828 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_cancel_monitor (self, _tmp11_);
-#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (monitor);
-#line 3456 "DirectoryMonitor.c"
+#line 3464 "DirectoryMonitor.c"
}
-#line 821 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 827 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_monitor_it);
-#line 3460 "DirectoryMonitor.c"
+#line 3468 "DirectoryMonitor.c"
}
-#line 824 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 830 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp12_ = self->priv->monitors;
-#line 824 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 830 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 826 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 832 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_closed (self);
-#line 3468 "DirectoryMonitor.c"
+#line 3476 "DirectoryMonitor.c"
}
void directory_monitor_close (DirectoryMonitor* self) {
-#line 816 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 822 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 816 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 822 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_GET_CLASS (self)->close (self);
-#line 3477 "DirectoryMonitor.c"
+#line 3485 "DirectoryMonitor.c"
}
@@ -3486,37 +3494,37 @@ static DirectoryMonitorFType directory_monitor_get_ftype (GFileInfo* info) {
GFileInfo* _tmp0_ = NULL;
GFileType _tmp1_ = 0;
GFileType _tmp2_ = 0;
-#line 829 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 835 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE_INFO (info), 0);
-#line 830 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 836 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = info;
-#line 830 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 836 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = g_file_info_get_file_type (_tmp0_);
-#line 830 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 836 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
file_type = _tmp1_;
-#line 831 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 837 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = file_type;
-#line 831 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 837 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
switch (_tmp2_) {
-#line 831 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 837 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case G_FILE_TYPE_REGULAR:
-#line 3501 "DirectoryMonitor.c"
+#line 3509 "DirectoryMonitor.c"
{
-#line 833 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = DIRECTORY_MONITOR_FTYPE_FILE;
-#line 833 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 3507 "DirectoryMonitor.c"
+#line 3515 "DirectoryMonitor.c"
}
-#line 831 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 837 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case G_FILE_TYPE_DIRECTORY:
-#line 3511 "DirectoryMonitor.c"
+#line 3519 "DirectoryMonitor.c"
{
-#line 836 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 842 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = DIRECTORY_MONITOR_FTYPE_DIRECTORY;
-#line 836 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 842 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 3517 "DirectoryMonitor.c"
+#line 3525 "DirectoryMonitor.c"
}
default:
{
@@ -3524,23 +3532,23 @@ static DirectoryMonitorFType directory_monitor_get_ftype (GFileInfo* info) {
GEnumValue* _tmp4_;
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = file_type;
-#line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = g_enum_get_value (g_type_class_ref (g_file_type_get_type ()), _tmp3_);
-#line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = g_strdup_printf ("query_ftype: Unknown file type %s", (_tmp4_ != NULL) ? _tmp4_->value_name : NULL);
-#line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = _tmp5_;
-#line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp6_);
-#line 839 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp6_);
-#line 840 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = DIRECTORY_MONITOR_FTYPE_UNSUPPORTED;
-#line 840 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 3541 "DirectoryMonitor.c"
+#line 3549 "DirectoryMonitor.c"
}
}
}
@@ -3557,7 +3565,7 @@ static void directory_monitor_explore_async_data_free (gpointer _data) {
_g_object_unref0 (_data_->self);
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_slice_free (DirectoryMonitorExploreAsyncData, _data_);
-#line 3558 "DirectoryMonitor.c"
+#line 3566 "DirectoryMonitor.c"
}
@@ -3601,7 +3609,7 @@ static void directory_monitor_explore_async (DirectoryMonitor* self, GFile* dir,
_data_->in_discovery = _tmp5_;
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_explore_async_co (_data_);
-#line 3602 "DirectoryMonitor.c"
+#line 3610 "DirectoryMonitor.c"
}
@@ -3609,1104 +3617,1128 @@ static void directory_monitor_explore_finish (DirectoryMonitor* self, GAsyncResu
DirectoryMonitorExploreAsyncData* _data_;
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
-#line 3610 "DirectoryMonitor.c"
+#line 3618 "DirectoryMonitor.c"
}
static void directory_monitor_explore_async_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) {
DirectoryMonitorExploreAsyncData* _data_;
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_ = _user_data_;
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_source_object_ = source_object;
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_res_ = _res_;
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_explore_async_co (_data_);
-#line 3624 "DirectoryMonitor.c"
+#line 3632 "DirectoryMonitor.c"
}
static void _g_object_unref0_ (gpointer var) {
-#line 911 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
(var == NULL) ? NULL : (var = (g_object_unref (var), NULL));
-#line 3631 "DirectoryMonitor.c"
+#line 3639 "DirectoryMonitor.c"
}
static void _g_list_free__g_object_unref0_ (GList* self) {
-#line 911 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_list_foreach (self, (GFunc) _g_object_unref0_, NULL);
-#line 911 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_list_free (self);
-#line 3640 "DirectoryMonitor.c"
+#line 3648 "DirectoryMonitor.c"
}
static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
guint result;
result = file_hash ((GFile*) v);
-#line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 3649 "DirectoryMonitor.c"
+#line 3657 "DirectoryMonitor.c"
}
static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsyncData* _data_) {
-#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
switch (_data_->_state_) {
-#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case 0:
-#line 3658 "DirectoryMonitor.c"
+#line 3666 "DirectoryMonitor.c"
goto _state_0;
-#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case 1:
-#line 3662 "DirectoryMonitor.c"
+#line 3670 "DirectoryMonitor.c"
goto _state_1;
-#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case 2:
-#line 3666 "DirectoryMonitor.c"
+#line 3674 "DirectoryMonitor.c"
goto _state_2;
-#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case 3:
-#line 3670 "DirectoryMonitor.c"
+#line 3678 "DirectoryMonitor.c"
goto _state_3;
-#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case 4:
-#line 3674 "DirectoryMonitor.c"
+#line 3682 "DirectoryMonitor.c"
goto _state_4;
-#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case 5:
-#line 3678 "DirectoryMonitor.c"
+#line 3686 "DirectoryMonitor.c"
goto _state_5;
default:
-#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_assert_not_reached ();
-#line 3683 "DirectoryMonitor.c"
+#line 3691 "DirectoryMonitor.c"
}
_state_0:
-#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp0_ = NULL;
-#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp0_ = _data_->self->priv->files;
-#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp1_ = NULL;
-#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp1_ = _data_->dir;
-#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp2_ = NULL;
-#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp2_ = _data_->dir_info;
-#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp3_ = FALSE;
-#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp3_ = directory_monitor_file_info_map_contains (_data_->_tmp0_, _data_->_tmp1_, _data_->_tmp2_);
-#line 845 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 851 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_tmp3_) {
-#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp4_ = NULL;
-#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp4_ = _data_->dir;
-#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp5_ = NULL;
-#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp5_ = g_file_get_path (_data_->_tmp4_);
-#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp6_ = NULL;
-#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp6_ = _data_->_tmp5_;
-#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_warning ("DirectoryMonitor.vala:846: Directory loop detected at %s, not explorin" \
+#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ g_warning ("DirectoryMonitor.vala:852: Directory loop detected at %s, not explorin" \
"g", _data_->_tmp6_);
-#line 846 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 852 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_data_->_tmp6_);
-#line 848 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp7_ = FALSE;
-#line 848 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp7_ = _data_->in_discovery;
-#line 848 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp7_);
-#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_state_ == 0) {
-#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 3730 "DirectoryMonitor.c"
+#line 3738 "DirectoryMonitor.c"
} else {
-#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_simple_async_result_complete (_data_->_async_result);
-#line 3734 "DirectoryMonitor.c"
+#line 3742 "DirectoryMonitor.c"
}
-#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_object_unref (_data_->_async_result);
-#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 3740 "DirectoryMonitor.c"
+#line 3748 "DirectoryMonitor.c"
}
-#line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp8_ = NULL;
-#line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp8_ = _data_->dir_info;
-#line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp9_ = NULL;
-#line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp9_ = _g_object_ref0 (_data_->_tmp8_);
-#line 854 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->local_dir_info = _data_->_tmp9_;
-#line 855 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 861 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp10_ = NULL;
-#line 855 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 861 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp10_ = _data_->local_dir_info;
-#line 855 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 861 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_tmp10_ == NULL) {
-#line 3758 "DirectoryMonitor.c"
+#line 3766 "DirectoryMonitor.c"
{
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp12_ = NULL;
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp12_ = _data_->dir;
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp13_ = NULL;
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp13_ = _data_->self->priv->cancellable;
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_state_ = 1;
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_file_query_info_async (_data_->_tmp12_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_DIR_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp13_, directory_monitor_explore_async_ready, _data_);
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 3774 "DirectoryMonitor.c"
+#line 3782 "DirectoryMonitor.c"
_state_1:
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp14_ = NULL;
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp14_ = g_file_query_info_finish (_data_->_tmp12_, _data_->_res_, &_data_->_inner_error_);
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp11_ = _data_->_tmp14_;
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
-#line 3784 "DirectoryMonitor.c"
+#line 3792 "DirectoryMonitor.c"
goto __catch480_g_error;
}
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp15_ = NULL;
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp15_ = _data_->_tmp11_;
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp11_ = NULL;
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->local_dir_info);
-#line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 863 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->local_dir_info = _data_->_tmp15_;
-#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->_tmp11_);
-#line 3799 "DirectoryMonitor.c"
+#line 3807 "DirectoryMonitor.c"
}
goto __finally480;
__catch480_g_error:
{
-#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->err = _data_->_inner_error_;
-#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_inner_error_ = NULL;
-#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp16_ = NULL;
-#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp16_ = _data_->dir;
-#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp17_ = NULL;
-#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp17_ = g_file_get_path (_data_->_tmp16_);
-#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp18_ = NULL;
-#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp18_ = _data_->_tmp17_;
-#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp19_ = NULL;
-#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp19_ = _data_->err;
-#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp20_ = NULL;
-#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp20_ = _data_->_tmp19_->message;
-#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_warning ("DirectoryMonitor.vala:860: Unable to retrieve info on %s: %s", _data_->_tmp18_, _data_->_tmp20_);
-#line 860 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ g_warning ("DirectoryMonitor.vala:866: Unable to retrieve info on %s: %s", _data_->_tmp18_, _data_->_tmp20_);
+#line 866 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_data_->_tmp18_);
-#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp21_ = FALSE;
-#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp21_ = _data_->in_discovery;
-#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp21_);
-#line 864 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_error_free0 (_data_->err);
-#line 864 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->local_dir_info);
-#line 864 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_state_ == 0) {
-#line 864 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 3846 "DirectoryMonitor.c"
+#line 3854 "DirectoryMonitor.c"
} else {
-#line 864 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_simple_async_result_complete (_data_->_async_result);
-#line 3850 "DirectoryMonitor.c"
+#line 3858 "DirectoryMonitor.c"
}
-#line 864 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_object_unref (_data_->_async_result);
-#line 864 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 870 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 3856 "DirectoryMonitor.c"
+#line 3864 "DirectoryMonitor.c"
}
__finally480:
-#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
-#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->local_dir_info);
-#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code);
-#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_clear_error (&_data_->_inner_error_);
-#line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 862 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 3869 "DirectoryMonitor.c"
+#line 3877 "DirectoryMonitor.c"
}
}
-#line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp22_ = NULL;
-#line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp22_ = _data_->local_dir_info;
-#line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp23_ = FALSE;
-#line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp23_ = g_file_info_get_is_hidden (_data_->_tmp22_);
-#line 868 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 874 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_tmp23_) {
-#line 869 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp24_ = NULL;
-#line 869 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp24_ = _data_->dir;
-#line 869 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp25_ = NULL;
-#line 869 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp25_ = g_file_get_path (_data_->_tmp24_);
-#line 869 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp26_ = NULL;
-#line 869 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp26_ = _data_->_tmp25_;
-#line 869 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_warning ("DirectoryMonitor.vala:869: Ignoring hidden directory %s", _data_->_tmp26_);
-#line 869 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ g_warning ("DirectoryMonitor.vala:875: Ignoring hidden directory %s", _data_->_tmp26_);
+#line 875 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_data_->_tmp26_);
-#line 871 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 877 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp27_ = FALSE;
-#line 871 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 877 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp27_ = _data_->in_discovery;
-#line 871 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 877 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp27_);
-#line 873 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->local_dir_info);
-#line 873 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_state_ == 0) {
-#line 873 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 3910 "DirectoryMonitor.c"
+#line 3918 "DirectoryMonitor.c"
} else {
-#line 873 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_simple_async_result_complete (_data_->_async_result);
-#line 3914 "DirectoryMonitor.c"
+#line 3922 "DirectoryMonitor.c"
}
-#line 873 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_object_unref (_data_->_async_result);
-#line 873 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 3920 "DirectoryMonitor.c"
+#line 3928 "DirectoryMonitor.c"
}
-#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp28_ = NULL;
-#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp28_ = _data_->local_dir_info;
-#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp29_ = NULL;
-#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp29_ = get_file_info_id (_data_->_tmp28_);
-#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp30_ = NULL;
-#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp30_ = _data_->_tmp29_;
-#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp31_ = FALSE;
-#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp31_ = _data_->_tmp30_ == NULL;
-#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_data_->_tmp30_);
-#line 879 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_tmp31_) {
-#line 880 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp32_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp32_ = _data_->dir;
-#line 880 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp32_ = _data_->local_dir_info;
+#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp33_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp33_ = g_file_get_path (_data_->_tmp32_);
-#line 880 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp33_ = _data_->dir;
+#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp34_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp34_ = _data_->_tmp33_;
-#line 880 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_warning ("DirectoryMonitor.vala:880: Unable to retrieve file ID on %s: skipping", _data_->_tmp34_);
-#line 880 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _g_free0 (_data_->_tmp34_);
-#line 882 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp35_ = FALSE;
-#line 882 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp35_ = _data_->in_discovery;
-#line 882 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp35_);
-#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _g_object_unref0 (_data_->local_dir_info);
-#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- if (_data_->_state_ == 0) {
-#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_simple_async_result_complete_in_idle (_data_->_async_result);
+#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp34_ = g_file_get_uri (_data_->_tmp33_);
+#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp35_ = NULL;
+#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp35_ = _data_->_tmp34_;
+#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ g_file_info_set_attribute_string (_data_->_tmp32_, G_FILE_ATTRIBUTE_ID_FILE, _data_->_tmp35_);
+#line 885 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _g_free0 (_data_->_tmp35_);
#line 3970 "DirectoryMonitor.c"
- } else {
-#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_simple_async_result_complete (_data_->_async_result);
-#line 3974 "DirectoryMonitor.c"
- }
-#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_object_unref (_data_->_async_result);
-#line 884 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- return FALSE;
-#line 3980 "DirectoryMonitor.c"
}
-#line 888 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp36_ = NULL;
-#line 888 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp36_ = _data_->local_dir_info;
-#line 888 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp37_ = 0;
-#line 888 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp37_ = g_file_info_get_file_type (_data_->_tmp36_);
-#line 888 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_tmp37_ != G_FILE_TYPE_DIRECTORY) {
-#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp38_ = NULL;
-#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp38_ = _ ("Unable to monitor %s: Not a directory (%s)");
-#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp39_ = NULL;
-#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp39_ = _data_->dir;
-#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp40_ = NULL;
-#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp40_ = g_file_get_path (_data_->_tmp39_);
-#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp41_ = NULL;
-#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp41_ = _data_->_tmp40_;
-#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp42_ = NULL;
-#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp42_ = _data_->local_dir_info;
-#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp43_ = 0;
-#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp43_ = g_file_info_get_file_type (_data_->_tmp42_);
-#line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 892 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
memset (&_data_->_tmp44_, 0, sizeof (GEnumValue*));
-#line 890 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 892 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp44_ = g_enum_get_value (g_type_class_ref (g_file_type_get_type ()), _data_->_tmp43_);
-#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp45_ = NULL;
-#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp45_ = g_strdup_printf (_data_->_tmp38_, _data_->_tmp41_, (_data_->_tmp44_ != NULL) ? _data_->_tmp44_->value_name : NULL);
-#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp46_ = NULL;
-#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp46_ = _data_->_tmp45_;
-#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_discovery_failed (_data_->self, _data_->_tmp46_);
-#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_data_->_tmp46_);
-#line 889 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 891 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_data_->_tmp41_);
-#line 892 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp47_ = FALSE;
-#line 892 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp47_ = _data_->in_discovery;
-#line 892 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp47_);
#line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp47_);
+#line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->local_dir_info);
-#line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_state_ == 0) {
-#line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 4046 "DirectoryMonitor.c"
+#line 4036 "DirectoryMonitor.c"
} else {
-#line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_simple_async_result_complete (_data_->_async_result);
-#line 4050 "DirectoryMonitor.c"
+#line 4040 "DirectoryMonitor.c"
}
-#line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_object_unref (_data_->_async_result);
-#line 894 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 896 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 4056 "DirectoryMonitor.c"
+#line 4046 "DirectoryMonitor.c"
}
-#line 901 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 903 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->dir_map = NULL;
-#line 902 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->file_map = NULL;
-#line 4062 "DirectoryMonitor.c"
+#line 4052 "DirectoryMonitor.c"
{
-#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp48_ = NULL;
-#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp48_ = _data_->dir;
-#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp49_ = NULL;
-#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp49_ = _data_->self->priv->cancellable;
-#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_state_ = 2;
-#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_file_enumerate_children_async (_data_->_tmp48_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp49_, directory_monitor_explore_async_ready, _data_);
-#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 4078 "DirectoryMonitor.c"
+#line 4068 "DirectoryMonitor.c"
_state_2:
-#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp50_ = NULL;
-#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp50_ = g_file_enumerate_children_finish (_data_->_tmp48_, _data_->_res_, &_data_->_inner_error_);
-#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->enumerator = _data_->_tmp50_;
-#line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
-#line 4088 "DirectoryMonitor.c"
+#line 4078 "DirectoryMonitor.c"
goto __catch481_g_error;
}
{
-#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp51_ = TRUE;
-#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
while (TRUE) {
-#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_data_->_tmp51_) {
-#line 4098 "DirectoryMonitor.c"
+#line 4088 "DirectoryMonitor.c"
}
-#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp51_ = FALSE;
-#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp52_ = NULL;
-#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp52_ = _data_->enumerator;
-#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp53_ = NULL;
-#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp53_ = _data_->self->priv->cancellable;
-#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_state_ = 3;
-#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_file_enumerator_next_files_async (_data_->_tmp52_, 10, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _data_->_tmp53_, directory_monitor_explore_async_ready, _data_);
-#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 4116 "DirectoryMonitor.c"
+#line 4106 "DirectoryMonitor.c"
_state_3:
-#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp54_ = NULL;
-#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp54_ = g_file_enumerator_next_files_finish (_data_->_tmp52_, _data_->_res_, &_data_->_inner_error_);
-#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->infos = _data_->_tmp54_;
-#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
-#line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->enumerator);
-#line 4128 "DirectoryMonitor.c"
+#line 4118 "DirectoryMonitor.c"
goto __catch481_g_error;
}
-#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 912 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp55_ = NULL;
-#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 912 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp55_ = _data_->infos;
-#line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 912 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_tmp55_ == NULL) {
-#line 911 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
__g_list_free__g_object_unref0_0 (_data_->infos);
-#line 911 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 4141 "DirectoryMonitor.c"
+#line 4131 "DirectoryMonitor.c"
}
-#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp56_ = NULL;
-#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp56_ = _data_->infos;
-#line 4147 "DirectoryMonitor.c"
+#line 4137 "DirectoryMonitor.c"
{
-#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->info_collection = _data_->_tmp56_;
-#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
for (_data_->info_it = _data_->info_collection; _data_->info_it != NULL; _data_->info_it = _data_->info_it->next) {
-#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp57_ = NULL;
-#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp57_ = _g_object_ref0 ((GFileInfo*) _data_->info_it->data);
-#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->info = _data_->_tmp57_;
-#line 4159 "DirectoryMonitor.c"
+#line 4149 "DirectoryMonitor.c"
{
-#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp58_ = NULL;
-#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp58_ = _data_->info;
-#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp59_ = FALSE;
-#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp59_ = g_file_info_get_is_hidden (_data_->_tmp58_);
-#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- if (_data_->_tmp59_) {
#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp60_ = NULL;
+ _data_->_tmp58_ = _data_->info;
#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp60_ = _data_->dir;
+ _data_->_tmp59_ = NULL;
#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp61_ = NULL;
+ _data_->_tmp59_ = get_file_info_id (_data_->_tmp58_);
#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp61_ = _data_->info;
+ _data_->_tmp60_ = NULL;
#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp62_ = NULL;
+ _data_->_tmp60_ = _data_->_tmp59_;
#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp62_ = g_file_info_get_name (_data_->_tmp61_);
+ _data_->_tmp61_ = FALSE;
#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp63_ = NULL;
+ _data_->_tmp61_ = _data_->_tmp60_ == NULL;
#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp63_ = g_file_get_child (_data_->_tmp60_, _data_->_tmp62_);
+ _g_free0 (_data_->_tmp60_);
#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ if (_data_->_tmp61_) {
+#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp62_ = NULL;
+#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp62_ = _data_->info;
+#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp63_ = NULL;
+#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp63_ = _data_->dir;
+#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp64_ = NULL;
-#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp64_ = _data_->_tmp63_;
-#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp64_ = g_file_get_uri (_data_->_tmp63_);
+#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp65_ = NULL;
-#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp65_ = g_file_get_path (_data_->_tmp64_);
-#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp66_ = NULL;
-#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp66_ = _data_->_tmp65_;
-#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_warning ("DirectoryMonitor.vala:916: Skipping hidden file/directory %s", _data_->_tmp66_);
-#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _g_free0 (_data_->_tmp66_);
-#line 916 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _g_object_unref0 (_data_->_tmp64_);
-#line 919 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _g_object_unref0 (_data_->info);
-#line 919 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- continue;
-#line 4209 "DirectoryMonitor.c"
+#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp65_ = _data_->_tmp64_;
+#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ g_file_info_set_attribute_string (_data_->_tmp62_, G_FILE_ATTRIBUTE_ID_FILE, _data_->_tmp65_);
+#line 917 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _g_free0 (_data_->_tmp65_);
+#line 4191 "DirectoryMonitor.c"
}
-#line 923 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp67_ = NULL;
-#line 923 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp67_ = _data_->info;
-#line 923 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp68_ = FALSE;
-#line 923 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp68_ = directory_monitor_is_file_symlink_supported (_data_->_tmp67_);
-#line 923 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- if (!_data_->_tmp68_) {
-#line 924 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp66_ = NULL;
+#line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp66_ = _data_->info;
+#line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp67_ = FALSE;
+#line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp67_ = g_file_info_get_is_hidden (_data_->_tmp66_);
+#line 921 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ if (_data_->_tmp67_) {
+#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp68_ = NULL;
+#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp68_ = _data_->dir;
+#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp69_ = NULL;
+#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp69_ = _data_->info;
+#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp70_ = NULL;
+#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp70_ = g_file_info_get_name (_data_->_tmp69_);
+#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp71_ = NULL;
+#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp71_ = g_file_get_child (_data_->_tmp68_, _data_->_tmp70_);
+#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp72_ = NULL;
+#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp72_ = _data_->_tmp71_;
+#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp73_ = NULL;
+#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp73_ = g_file_get_path (_data_->_tmp72_);
+#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp74_ = NULL;
+#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp74_ = _data_->_tmp73_;
+#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ g_warning ("DirectoryMonitor.vala:922: Skipping hidden file/directory %s", _data_->_tmp74_);
+#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _g_free0 (_data_->_tmp74_);
+#line 922 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _g_object_unref0 (_data_->_tmp72_);
+#line 925 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->info);
-#line 924 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 925 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
continue;
-#line 4225 "DirectoryMonitor.c"
+#line 4241 "DirectoryMonitor.c"
}
-#line 926 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp69_ = NULL;
-#line 926 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp69_ = _data_->info;
-#line 926 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp70_ = 0;
-#line 926 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp70_ = g_file_info_get_file_type (_data_->_tmp69_);
-#line 926 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- switch (_data_->_tmp70_) {
-#line 926 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- case G_FILE_TYPE_REGULAR:
-#line 4239 "DirectoryMonitor.c"
- {
-#line 928 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp71_ = NULL;
-#line 928 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp71_ = _data_->file_map;
-#line 928 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- if (_data_->_tmp71_ == NULL) {
#line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp72_ = NULL;
+ _data_->_tmp75_ = NULL;
#line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp72_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (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);
+ _data_->_tmp75_ = _data_->info;
#line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _g_object_unref0 (_data_->file_map);
+ _data_->_tmp76_ = FALSE;
#line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->file_map = _data_->_tmp72_;
-#line 4255 "DirectoryMonitor.c"
- }
-#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp73_ = NULL;
-#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp73_ = _data_->file_map;
-#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp74_ = NULL;
-#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp74_ = _data_->dir;
-#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp75_ = NULL;
-#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp75_ = _data_->info;
-#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp76_ = NULL;
-#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp76_ = g_file_info_get_name (_data_->_tmp75_);
-#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp77_ = NULL;
-#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp77_ = g_file_get_child (_data_->_tmp74_, _data_->_tmp76_);
-#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp78_ = NULL;
-#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp78_ = _data_->_tmp77_;
-#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp79_ = NULL;
-#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp79_ = _data_->info;
-#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp73_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp78_, _data_->_tmp79_);
-#line 931 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _g_object_unref0 (_data_->_tmp78_);
+ _data_->_tmp76_ = directory_monitor_is_file_symlink_supported (_data_->_tmp75_);
+#line 929 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ if (!_data_->_tmp76_) {
+#line 930 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _g_object_unref0 (_data_->info);
+#line 930 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ continue;
+#line 4257 "DirectoryMonitor.c"
+ }
#line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- break;
-#line 4291 "DirectoryMonitor.c"
- }
-#line 926 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- case G_FILE_TYPE_DIRECTORY:
-#line 4295 "DirectoryMonitor.c"
+ _data_->_tmp77_ = NULL;
+#line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp77_ = _data_->info;
+#line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp78_ = 0;
+#line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp78_ = g_file_info_get_file_type (_data_->_tmp77_);
+#line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ switch (_data_->_tmp78_) {
+#line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ case G_FILE_TYPE_REGULAR:
+#line 4271 "DirectoryMonitor.c"
{
+#line 934 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp79_ = NULL;
+#line 934 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp79_ = _data_->file_map;
+#line 934 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ if (_data_->_tmp79_ == NULL) {
#line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp80_ = NULL;
+ _data_->_tmp80_ = NULL;
#line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp80_ = _data_->dir_map;
+ _data_->_tmp80_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (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 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- if (_data_->_tmp80_ == NULL) {
-#line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp81_ = NULL;
-#line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp81_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (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 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _g_object_unref0 (_data_->dir_map);
-#line 936 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->dir_map = _data_->_tmp81_;
-#line 4311 "DirectoryMonitor.c"
+ _g_object_unref0 (_data_->file_map);
+#line 935 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->file_map = _data_->_tmp80_;
+#line 4287 "DirectoryMonitor.c"
}
-#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp81_ = NULL;
+#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp81_ = _data_->file_map;
+#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp82_ = NULL;
-#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp82_ = _data_->dir_map;
-#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp82_ = _data_->dir;
+#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp83_ = NULL;
-#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp83_ = _data_->dir;
-#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp83_ = _data_->info;
+#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp84_ = NULL;
-#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp84_ = _data_->info;
-#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp84_ = g_file_info_get_name (_data_->_tmp83_);
+#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp85_ = NULL;
-#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp85_ = g_file_info_get_name (_data_->_tmp84_);
-#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp85_ = g_file_get_child (_data_->_tmp82_, _data_->_tmp84_);
+#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp86_ = NULL;
-#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp86_ = g_file_get_child (_data_->_tmp83_, _data_->_tmp85_);
-#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp86_ = _data_->_tmp85_;
+#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp87_ = NULL;
+#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp87_ = _data_->info;
+#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp81_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp86_, _data_->_tmp87_);
+#line 937 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _g_object_unref0 (_data_->_tmp86_);
#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp87_ = _data_->_tmp86_;
-#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ break;
+#line 4323 "DirectoryMonitor.c"
+ }
+#line 932 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ case G_FILE_TYPE_DIRECTORY:
+#line 4327 "DirectoryMonitor.c"
+ {
+#line 941 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp88_ = NULL;
-#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp88_ = _data_->info;
-#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp82_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp87_, _data_->_tmp88_);
-#line 938 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _g_object_unref0 (_data_->_tmp87_);
-#line 939 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 941 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp88_ = _data_->dir_map;
+#line 941 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ if (_data_->_tmp88_ == NULL) {
+#line 942 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp89_ = NULL;
+#line 942 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp89_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (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 942 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _g_object_unref0 (_data_->dir_map);
+#line 942 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->dir_map = _data_->_tmp89_;
+#line 4343 "DirectoryMonitor.c"
+ }
+#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp90_ = NULL;
+#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp90_ = _data_->dir_map;
+#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp91_ = NULL;
+#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp91_ = _data_->dir;
+#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp92_ = NULL;
+#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp92_ = _data_->info;
+#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp93_ = NULL;
+#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp93_ = g_file_info_get_name (_data_->_tmp92_);
+#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp94_ = NULL;
+#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp94_ = g_file_get_child (_data_->_tmp91_, _data_->_tmp93_);
+#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp95_ = NULL;
+#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp95_ = _data_->_tmp94_;
+#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp96_ = NULL;
+#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp96_ = _data_->info;
+#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp90_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp95_, _data_->_tmp96_);
+#line 944 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _g_object_unref0 (_data_->_tmp95_);
+#line 945 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 4347 "DirectoryMonitor.c"
+#line 4379 "DirectoryMonitor.c"
}
default:
{
-#line 943 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 949 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 4353 "DirectoryMonitor.c"
+#line 4385 "DirectoryMonitor.c"
}
}
-#line 913 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 915 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->info);
-#line 4358 "DirectoryMonitor.c"
+#line 4390 "DirectoryMonitor.c"
}
}
}
-#line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 909 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
__g_list_free__g_object_unref0_0 (_data_->infos);
-#line 4364 "DirectoryMonitor.c"
+#line 4396 "DirectoryMonitor.c"
}
}
-#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->enumerator);
-#line 4369 "DirectoryMonitor.c"
+#line 4401 "DirectoryMonitor.c"
}
goto __finally481;
__catch481_g_error:
{
-#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->err2 = _data_->_inner_error_;
-#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_inner_error_ = NULL;
-#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp89_ = NULL;
-#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp89_ = _data_->dir;
-#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp90_ = NULL;
-#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp90_ = g_file_get_path (_data_->_tmp89_);
-#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp91_ = NULL;
-#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp91_ = _data_->_tmp90_;
-#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp92_ = NULL;
-#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp92_ = _data_->err2;
-#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp93_ = NULL;
-#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp93_ = _data_->_tmp92_->message;
-#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_warning ("DirectoryMonitor.vala:948: Aborted directory traversal of %s: %s", _data_->_tmp91_, _data_->_tmp93_);
-#line 948 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _g_free0 (_data_->_tmp91_);
-#line 950 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp94_ = FALSE;
-#line 950 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp94_ = _data_->in_discovery;
-#line 950 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp94_);
-#line 952 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp97_ = NULL;
+#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp97_ = _data_->dir;
+#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp98_ = NULL;
+#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp98_ = g_file_get_path (_data_->_tmp97_);
+#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp99_ = NULL;
+#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp99_ = _data_->_tmp98_;
+#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp100_ = NULL;
+#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp100_ = _data_->err2;
+#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp101_ = NULL;
+#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp101_ = _data_->_tmp100_->message;
+#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ g_warning ("DirectoryMonitor.vala:954: Aborted directory traversal of %s: %s", _data_->_tmp99_, _data_->_tmp101_);
+#line 954 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _g_free0 (_data_->_tmp99_);
+#line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp102_ = FALSE;
+#line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp102_ = _data_->in_discovery;
+#line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp102_);
+#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_error_free0 (_data_->err2);
-#line 952 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->file_map);
-#line 952 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->dir_map);
-#line 952 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->local_dir_info);
-#line 952 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_state_ == 0) {
-#line 952 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 4420 "DirectoryMonitor.c"
+#line 4452 "DirectoryMonitor.c"
} else {
-#line 952 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_simple_async_result_complete (_data_->_async_result);
-#line 4424 "DirectoryMonitor.c"
+#line 4456 "DirectoryMonitor.c"
}
-#line 952 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_object_unref (_data_->_async_result);
-#line 952 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 958 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 4430 "DirectoryMonitor.c"
+#line 4462 "DirectoryMonitor.c"
}
__finally481:
-#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
-#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->file_map);
-#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->dir_map);
-#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->local_dir_info);
-#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code);
-#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_clear_error (&_data_->_inner_error_);
-#line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 906 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 4447 "DirectoryMonitor.c"
- }
-#line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp95_ = FALSE;
-#line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp95_ = _data_->in_discovery;
-#line 956 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- if (_data_->_tmp95_) {
-#line 957 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp96_ = NULL;
-#line 957 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp96_ = _data_->dir;
-#line 957 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp97_ = NULL;
-#line 957 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp97_ = _data_->local_dir_info;
-#line 957 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- directory_monitor_internal_notify_directory_discovered (_data_->self, _data_->_tmp96_, _data_->_tmp97_);
-#line 4465 "DirectoryMonitor.c"
- } else {
-#line 959 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp98_ = NULL;
-#line 959 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp98_ = _data_->dir;
-#line 959 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp99_ = NULL;
-#line 959 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp99_ = _data_->local_dir_info;
-#line 959 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- directory_monitor_internal_notify_directory_created (_data_->self, _data_->_tmp98_, _data_->_tmp99_);
-#line 4477 "DirectoryMonitor.c"
+#line 4479 "DirectoryMonitor.c"
}
+#line 962 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp103_ = FALSE;
+#line 962 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp103_ = _data_->in_discovery;
+#line 962 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ if (_data_->_tmp103_) {
#line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp100_ = NULL;
+ _data_->_tmp104_ = NULL;
#line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp100_ = _data_->dir;
+ _data_->_tmp104_ = _data_->dir;
#line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp101_ = NULL;
+ _data_->_tmp105_ = NULL;
#line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp101_ = _data_->local_dir_info;
+ _data_->_tmp105_ = _data_->local_dir_info;
#line 963 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- directory_monitor_add_monitor (_data_->self, _data_->_tmp100_, _data_->_tmp101_);
-#line 966 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp102_ = NULL;
-#line 966 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp102_ = _data_->file_map;
-#line 966 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- if (_data_->_tmp102_ != NULL) {
-#line 967 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp103_ = NULL;
-#line 967 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp103_ = _data_->file_map;
-#line 967 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp104_ = FALSE;
-#line 967 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp104_ = _data_->in_discovery;
-#line 967 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_state_ = 4;
-#line 967 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- directory_monitor_notify_directory_files (_data_->self, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp103_, GEE_TYPE_MAP, GeeMap), _data_->_tmp104_, directory_monitor_explore_async_ready, _data_);
-#line 967 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- return FALSE;
-#line 4509 "DirectoryMonitor.c"
- _state_4:
-#line 967 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- directory_monitor_notify_directory_files_finish (_data_->self, _data_->_res_);
-#line 4513 "DirectoryMonitor.c"
- }
-#line 970 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp106_ = FALSE;
-#line 970 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp106_ = _data_->self->priv->recurse;
-#line 970 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- if (_data_->_tmp106_) {
-#line 970 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp107_ = NULL;
-#line 970 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp107_ = _data_->dir_map;
-#line 970 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp105_ = _data_->_tmp107_ != NULL;
-#line 4527 "DirectoryMonitor.c"
+ directory_monitor_internal_notify_directory_discovered (_data_->self, _data_->_tmp104_, _data_->_tmp105_);
+#line 4497 "DirectoryMonitor.c"
} else {
-#line 970 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp105_ = FALSE;
-#line 4531 "DirectoryMonitor.c"
+#line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp106_ = NULL;
+#line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp106_ = _data_->dir;
+#line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp107_ = NULL;
+#line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp107_ = _data_->local_dir_info;
+#line 965 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ directory_monitor_internal_notify_directory_created (_data_->self, _data_->_tmp106_, _data_->_tmp107_);
+#line 4509 "DirectoryMonitor.c"
}
-#line 970 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- if (_data_->_tmp105_) {
-#line 4535 "DirectoryMonitor.c"
- {
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp108_ = NULL;
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp108_ = _data_->dir_map;
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp109_ = NULL;
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp109_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp108_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp110_ = NULL;
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp110_ = _data_->_tmp109_;
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp111_ = NULL;
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp111_ = _data_->_tmp110_;
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp112_ = NULL;
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp112_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp111_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp113_ = NULL;
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp113_ = _data_->_tmp112_;
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _g_object_unref0 (_data_->_tmp111_);
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_subdir_it = _data_->_tmp113_;
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- while (TRUE) {
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp114_ = NULL;
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp114_ = _data_->_subdir_it;
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp115_ = FALSE;
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp115_ = gee_iterator_next (_data_->_tmp114_);
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- if (!_data_->_tmp115_) {
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- break;
-#line 4579 "DirectoryMonitor.c"
- }
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp116_ = NULL;
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp116_ = _data_->_subdir_it;
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp117_ = NULL;
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp117_ = gee_iterator_get (_data_->_tmp116_);
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->subdir = (GFile*) _data_->_tmp117_;
-#line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp118_ = 0;
-#line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp118_ = _data_->self->priv->outstanding_exploration_dirs;
+#line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp108_ = NULL;
+#line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp108_ = _data_->dir;
+#line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp109_ = NULL;
+#line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp109_ = _data_->local_dir_info;
+#line 969 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ directory_monitor_add_monitor (_data_->self, _data_->_tmp108_, _data_->_tmp109_);
#line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->self->priv->outstanding_exploration_dirs = _data_->_tmp118_ + 1;
+ _data_->_tmp110_ = NULL;
#line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp119_ = 0;
+ _data_->_tmp110_ = _data_->file_map;
#line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp119_ = _data_->self->priv->outstanding_exploration_dirs;
-#line 972 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- if (_data_->_tmp119_ > DIRECTORY_MONITOR_MAX_EXPLORATION_DIRS) {
-#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp120_ = NULL;
-#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp120_ = _data_->subdir;
-#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp121_ = NULL;
-#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp121_ = _data_->dir_map;
+ if (_data_->_tmp110_ != NULL) {
#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp122_ = NULL;
+ _data_->_tmp111_ = NULL;
#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp122_ = _data_->subdir;
+ _data_->_tmp111_ = _data_->file_map;
#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp123_ = NULL;
+ _data_->_tmp112_ = FALSE;
#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp123_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp121_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp122_);
+ _data_->_tmp112_ = _data_->in_discovery;
#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp124_ = NULL;
-#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp124_ = (GFileInfo*) _data_->_tmp123_;
+ _data_->_state_ = 4;
#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp125_ = FALSE;
+ directory_monitor_notify_directory_files (_data_->self, G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp111_, GEE_TYPE_MAP, GeeMap), _data_->_tmp112_, directory_monitor_explore_async_ready, _data_);
#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp125_ = _data_->in_discovery;
+ return FALSE;
+#line 4541 "DirectoryMonitor.c"
+ _state_4:
#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ directory_monitor_notify_directory_files_finish (_data_->self, _data_->_res_);
+#line 4545 "DirectoryMonitor.c"
+ }
+#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp114_ = FALSE;
+#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp114_ = _data_->self->priv->recurse;
+#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ if (_data_->_tmp114_) {
+#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp115_ = NULL;
+#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp115_ = _data_->dir_map;
+#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp113_ = _data_->_tmp115_ != NULL;
+#line 4559 "DirectoryMonitor.c"
+ } else {
+#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp113_ = FALSE;
+#line 4563 "DirectoryMonitor.c"
+ }
+#line 976 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ if (_data_->_tmp113_) {
+#line 4567 "DirectoryMonitor.c"
+ {
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp116_ = NULL;
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp116_ = _data_->dir_map;
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp117_ = NULL;
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp117_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp116_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp118_ = NULL;
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp118_ = _data_->_tmp117_;
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp119_ = NULL;
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp119_ = _data_->_tmp118_;
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp120_ = NULL;
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp120_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp119_, GEE_TYPE_ITERABLE, GeeIterable));
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp121_ = NULL;
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp121_ = _data_->_tmp120_;
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _g_object_unref0 (_data_->_tmp119_);
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_subdir_it = _data_->_tmp121_;
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ while (TRUE) {
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp122_ = NULL;
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp122_ = _data_->_subdir_it;
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp123_ = FALSE;
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp123_ = gee_iterator_next (_data_->_tmp122_);
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ if (!_data_->_tmp123_) {
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ break;
+#line 4611 "DirectoryMonitor.c"
+ }
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp124_ = NULL;
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp124_ = _data_->_subdir_it;
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp125_ = NULL;
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp125_ = gee_iterator_get (_data_->_tmp124_);
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->subdir = (GFile*) _data_->_tmp125_;
+#line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp126_ = 0;
+#line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp126_ = _data_->self->priv->outstanding_exploration_dirs;
+#line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->self->priv->outstanding_exploration_dirs = _data_->_tmp126_ + 1;
+#line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp127_ = 0;
+#line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp127_ = _data_->self->priv->outstanding_exploration_dirs;
+#line 978 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ if (_data_->_tmp127_ > DIRECTORY_MONITOR_MAX_EXPLORATION_DIRS) {
+#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp128_ = NULL;
+#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp128_ = _data_->subdir;
+#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp129_ = NULL;
+#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp129_ = _data_->dir_map;
+#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp130_ = NULL;
+#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp130_ = _data_->subdir;
+#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp131_ = NULL;
+#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp131_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp129_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp130_);
+#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp132_ = NULL;
+#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp132_ = (GFileInfo*) _data_->_tmp131_;
+#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp133_ = FALSE;
+#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp133_ = _data_->in_discovery;
+#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_state_ = 5;
-#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- directory_monitor_explore_async (_data_->self, _data_->_tmp120_, _data_->_tmp124_, _data_->_tmp125_, directory_monitor_explore_async_ready, _data_);
-#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ directory_monitor_explore_async (_data_->self, _data_->_tmp128_, _data_->_tmp132_, _data_->_tmp133_, directory_monitor_explore_async_ready, _data_);
+#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 4633 "DirectoryMonitor.c"
+#line 4665 "DirectoryMonitor.c"
_state_5:
-#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_explore_finish (_data_->self, _data_->_res_);
-#line 973 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _g_object_unref0 (_data_->_tmp124_);
-#line 4639 "DirectoryMonitor.c"
+#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _g_object_unref0 (_data_->_tmp132_);
+#line 4671 "DirectoryMonitor.c"
} else {
-#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp126_ = NULL;
-#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp126_ = _data_->subdir;
-#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp127_ = NULL;
-#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp127_ = _data_->dir_map;
-#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp128_ = NULL;
-#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp128_ = _data_->subdir;
-#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp129_ = NULL;
-#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp129_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp127_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp128_);
-#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp130_ = NULL;
-#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp130_ = (GFileInfo*) _data_->_tmp129_;
-#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp131_ = FALSE;
-#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp131_ = _data_->in_discovery;
-#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- directory_monitor_explore_async (_data_->self, _data_->_tmp126_, _data_->_tmp130_, _data_->_tmp131_, NULL, NULL);
-#line 975 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _g_object_unref0 (_data_->_tmp130_);
-#line 4669 "DirectoryMonitor.c"
+#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp134_ = NULL;
+#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp134_ = _data_->subdir;
+#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp135_ = NULL;
+#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp135_ = _data_->dir_map;
+#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp136_ = NULL;
+#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp136_ = _data_->subdir;
+#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp137_ = NULL;
+#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp137_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp135_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _data_->_tmp136_);
+#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp138_ = NULL;
+#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp138_ = (GFileInfo*) _data_->_tmp137_;
+#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp139_ = FALSE;
+#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp139_ = _data_->in_discovery;
+#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ directory_monitor_explore_async (_data_->self, _data_->_tmp134_, _data_->_tmp138_, _data_->_tmp139_, NULL, NULL);
+#line 981 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _g_object_unref0 (_data_->_tmp138_);
+#line 4701 "DirectoryMonitor.c"
}
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->subdir);
-#line 4673 "DirectoryMonitor.c"
+#line 4705 "DirectoryMonitor.c"
}
-#line 971 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 977 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->_subdir_it);
-#line 4677 "DirectoryMonitor.c"
+#line 4709 "DirectoryMonitor.c"
}
}
-#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp132_ = FALSE;
-#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _data_->_tmp132_ = _data_->in_discovery;
-#line 979 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp132_);
-#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp140_ = FALSE;
+#line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _data_->_tmp140_ = _data_->in_discovery;
+#line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ directory_monitor_explore_directory_completed (_data_->self, _data_->_tmp140_);
+#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->file_map);
-#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->dir_map);
-#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->local_dir_info);
-#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_state_ == 0) {
-#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 4696 "DirectoryMonitor.c"
+#line 4728 "DirectoryMonitor.c"
} else {
-#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_simple_async_result_complete (_data_->_async_result);
-#line 4700 "DirectoryMonitor.c"
+#line 4732 "DirectoryMonitor.c"
}
-#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_object_unref (_data_->_async_result);
-#line 844 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 850 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 4706 "DirectoryMonitor.c"
+#line 4738 "DirectoryMonitor.c"
}
@@ -4719,7 +4751,7 @@ static void directory_monitor_notify_directory_files_data_free (gpointer _data)
_g_object_unref0 (_data_->self);
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_slice_free (DirectoryMonitorNotifyDirectoryFilesData, _data_);
-#line 4719 "DirectoryMonitor.c"
+#line 4751 "DirectoryMonitor.c"
}
@@ -4753,7 +4785,7 @@ static void directory_monitor_notify_directory_files (DirectoryMonitor* self, Ge
_data_->in_discovery = _tmp3_;
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_directory_files_co (_data_);
-#line 4753 "DirectoryMonitor.c"
+#line 4785 "DirectoryMonitor.c"
}
@@ -4761,159 +4793,159 @@ static void directory_monitor_notify_directory_files_finish (DirectoryMonitor* s
DirectoryMonitorNotifyDirectoryFilesData* _data_;
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
-#line 4761 "DirectoryMonitor.c"
+#line 4793 "DirectoryMonitor.c"
}
static gboolean _directory_monitor_notify_directory_files_co_gsource_func (gpointer self) {
gboolean result;
result = directory_monitor_notify_directory_files_co (self);
-#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 996 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 4770 "DirectoryMonitor.c"
+#line 4802 "DirectoryMonitor.c"
}
static gboolean directory_monitor_notify_directory_files_co (DirectoryMonitorNotifyDirectoryFilesData* _data_) {
-#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
switch (_data_->_state_) {
-#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case 0:
-#line 4779 "DirectoryMonitor.c"
+#line 4811 "DirectoryMonitor.c"
goto _state_0;
-#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case 1:
-#line 4783 "DirectoryMonitor.c"
+#line 4815 "DirectoryMonitor.c"
goto _state_1;
default:
-#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_assert_not_reached ();
-#line 4788 "DirectoryMonitor.c"
+#line 4820 "DirectoryMonitor.c"
}
_state_0:
-#line 983 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp0_ = NULL;
-#line 983 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp0_ = _data_->map;
-#line 983 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp1_ = NULL;
-#line 983 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp1_ = gee_map_map_iterator (_data_->_tmp0_);
-#line 983 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 989 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->iter = _data_->_tmp1_;
-#line 984 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
while (TRUE) {
-#line 984 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp2_ = NULL;
-#line 984 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp2_ = _data_->iter;
-#line 984 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp3_ = FALSE;
-#line 984 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp3_ = gee_map_iterator_next (_data_->_tmp2_);
-#line 984 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_data_->_tmp3_) {
-#line 984 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 4815 "DirectoryMonitor.c"
+#line 4847 "DirectoryMonitor.c"
}
-#line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 991 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp4_ = FALSE;
-#line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 991 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp4_ = _data_->in_discovery;
-#line 985 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 991 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_tmp4_) {
-#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp5_ = NULL;
-#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp5_ = _data_->iter;
-#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp6_ = NULL;
-#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp6_ = gee_map_iterator_get_key (_data_->_tmp5_);
-#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp7_ = NULL;
-#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp7_ = (GFile*) _data_->_tmp6_;
-#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp8_ = NULL;
-#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp8_ = _data_->iter;
-#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp9_ = NULL;
-#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp9_ = gee_map_iterator_get_value (_data_->_tmp8_);
-#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp10_ = NULL;
-#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp10_ = (GFileInfo*) _data_->_tmp9_;
-#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_internal_notify_file_discovered (_data_->self, _data_->_tmp7_, _data_->_tmp10_);
-#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->_tmp10_);
-#line 986 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 992 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->_tmp7_);
-#line 4853 "DirectoryMonitor.c"
+#line 4885 "DirectoryMonitor.c"
} else {
-#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp11_ = NULL;
-#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp11_ = _data_->iter;
-#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp12_ = NULL;
-#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp12_ = gee_map_iterator_get_key (_data_->_tmp11_);
-#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp13_ = NULL;
-#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp13_ = (GFile*) _data_->_tmp12_;
-#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp14_ = NULL;
-#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp14_ = _data_->iter;
-#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp15_ = NULL;
-#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp15_ = gee_map_iterator_get_value (_data_->_tmp14_);
-#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp16_ = NULL;
-#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_tmp16_ = (GFileInfo*) _data_->_tmp15_;
-#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_internal_notify_file_created (_data_->self, _data_->_tmp13_, _data_->_tmp16_);
-#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->_tmp16_);
-#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 994 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->_tmp13_);
-#line 4885 "DirectoryMonitor.c"
+#line 4917 "DirectoryMonitor.c"
}
-#line 990 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 996 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_idle_add_full (DIRECTORY_MONITOR_DEFAULT_PRIORITY, _directory_monitor_notify_directory_files_co_gsource_func, _data_, NULL);
-#line 991 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 997 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_data_->_state_ = 1;
-#line 991 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 997 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 4893 "DirectoryMonitor.c"
+#line 4925 "DirectoryMonitor.c"
_state_1:
;
}
-#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_data_->iter);
-#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_data_->_state_ == 0) {
-#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_simple_async_result_complete_in_idle (_data_->_async_result);
-#line 4903 "DirectoryMonitor.c"
+#line 4935 "DirectoryMonitor.c"
} else {
-#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_simple_async_result_complete (_data_->_async_result);
-#line 4907 "DirectoryMonitor.c"
+#line 4939 "DirectoryMonitor.c"
}
-#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_object_unref (_data_->_async_result);
-#line 982 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 988 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return FALSE;
-#line 4913 "DirectoryMonitor.c"
+#line 4945 "DirectoryMonitor.c"
}
@@ -4922,45 +4954,45 @@ static void directory_monitor_explore_directory_completed (DirectoryMonitor* sel
gint _tmp1_ = 0;
gboolean _tmp2_ = FALSE;
gboolean _tmp3_ = FALSE;
-#line 997 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1003 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 998 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1004 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->outstanding_exploration_dirs;
-#line 998 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1004 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp0_ > 0, "outstanding_exploration_dirs > 0");
-#line 999 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1005 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = self->priv->outstanding_exploration_dirs;
-#line 999 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1005 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->outstanding_exploration_dirs = _tmp1_ - 1;
-#line 1001 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = in_discovery;
-#line 1001 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp3_) {
-#line 4936 "DirectoryMonitor.c"
+#line 4968 "DirectoryMonitor.c"
gint _tmp4_ = 0;
-#line 1001 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = self->priv->outstanding_exploration_dirs;
-#line 1001 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _tmp4_ == 0;
-#line 4942 "DirectoryMonitor.c"
+#line 4974 "DirectoryMonitor.c"
} else {
-#line 1001 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = FALSE;
-#line 4946 "DirectoryMonitor.c"
+#line 4978 "DirectoryMonitor.c"
}
-#line 1001 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1007 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp2_) {
-#line 1002 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1008 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_discovery_completed (self);
-#line 4952 "DirectoryMonitor.c"
+#line 4984 "DirectoryMonitor.c"
}
}
static void _directory_monitor_on_monitor_notification_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self) {
-#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1036 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_on_monitor_notification ((DirectoryMonitor*) self, file, other_file, event_type);
-#line 4960 "DirectoryMonitor.c"
+#line 4992 "DirectoryMonitor.c"
}
@@ -4987,90 +5019,90 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
gchar* _tmp26_ = NULL;
gchar* _tmp27_ = NULL;
GError * _inner_error_ = NULL;
-#line 1008 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1014 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE);
-#line 1008 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1014 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE (dir), FALSE);
-#line 1008 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1014 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE);
-#line 1009 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1015 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->monitoring;
-#line 1009 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1015 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_tmp0_) {
-#line 1010 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1016 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = FALSE;
-#line 1010 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1016 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 5001 "DirectoryMonitor.c"
+#line 5033 "DirectoryMonitor.c"
}
-#line 1012 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = self->priv->files;
-#line 1012 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = dir;
-#line 1012 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = info;
-#line 1012 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = directory_monitor_file_info_map_get_id (_tmp1_, _tmp2_, _tmp3_);
-#line 1012 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
id = _tmp4_;
-#line 1013 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1019 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = id;
-#line 1013 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1019 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp5_ == NULL) {
-#line 1014 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1020 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = FALSE;
-#line 1014 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1020 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 1014 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1020 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 5023 "DirectoryMonitor.c"
+#line 5055 "DirectoryMonitor.c"
}
-#line 1017 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1023 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = self->priv->monitors;
-#line 1017 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1023 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = id;
-#line 1017 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1023 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_);
-#line 1017 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1023 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp8_) {
-#line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = FALSE;
-#line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 1018 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 5039 "DirectoryMonitor.c"
+#line 5071 "DirectoryMonitor.c"
}
-#line 1020 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1026 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
monitor = NULL;
-#line 5043 "DirectoryMonitor.c"
+#line 5075 "DirectoryMonitor.c"
{
GFileMonitor* _tmp9_ = NULL;
GFile* _tmp10_ = NULL;
GFileMonitor* _tmp11_ = NULL;
GFileMonitor* _tmp12_ = NULL;
-#line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = dir;
-#line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp11_ = g_file_monitor_directory (_tmp10_, DIRECTORY_MONITOR_FILE_MONITOR_FLAGS, NULL, &_inner_error_);
-#line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = _tmp11_;
-#line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5057 "DirectoryMonitor.c"
+#line 5089 "DirectoryMonitor.c"
goto __catch482_g_error;
}
-#line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp12_ = _tmp9_;
-#line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = NULL;
-#line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (monitor);
-#line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1028 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
monitor = _tmp12_;
-#line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_tmp9_);
-#line 5070 "DirectoryMonitor.c"
+#line 5102 "DirectoryMonitor.c"
}
goto __finally482;
__catch482_g_error:
@@ -5081,90 +5113,90 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
gchar* _tmp15_ = NULL;
GError* _tmp16_ = NULL;
const gchar* _tmp17_ = NULL;
-#line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
err = _inner_error_;
-#line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_inner_error_ = NULL;
-#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp13_ = dir;
-#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp14_ = g_file_get_path (_tmp13_);
-#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp15_ = _tmp14_;
-#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp16_ = err;
-#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp17_ = _tmp16_->message;
-#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_warning ("DirectoryMonitor.vala:1024: Unable to monitor %s: %s", _tmp15_, _tmp17_);
-#line 1024 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ g_warning ("DirectoryMonitor.vala:1030: Unable to monitor %s: %s", _tmp15_, _tmp17_);
+#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp15_);
-#line 1026 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = FALSE;
-#line 1026 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_error_free0 (err);
-#line 1026 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (monitor);
-#line 1026 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 1026 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 5109 "DirectoryMonitor.c"
+#line 5141 "DirectoryMonitor.c"
}
__finally482:
-#line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5114 "DirectoryMonitor.c"
+#line 5146 "DirectoryMonitor.c"
gboolean _tmp18_ = FALSE;
-#line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (monitor);
-#line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.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 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_clear_error (&_inner_error_);
-#line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1027 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return _tmp18_;
-#line 5126 "DirectoryMonitor.c"
+#line 5158 "DirectoryMonitor.c"
}
-#line 1029 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1035 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp19_ = self->priv->monitors;
-#line 1029 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1035 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp20_ = id;
-#line 1029 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1035 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp21_ = monitor;
-#line 1029 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1035 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_, _tmp21_);
-#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1036 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp22_ = monitor;
-#line 1030 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1036 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_connect_object (_tmp22_, "changed", (GCallback) _directory_monitor_on_monitor_notification_g_file_monitor_changed, self, 0);
-#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp23_ = dir;
-#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp24_ = g_file_get_path (_tmp23_);
-#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp25_ = _tmp24_;
-#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp26_ = g_strdup_printf ("Added monitor for %s", _tmp25_);
-#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp27_ = _tmp26_;
-#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp27_);
-#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp27_);
-#line 1032 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp25_);
-#line 1034 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1040 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = TRUE;
-#line 1034 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1040 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (monitor);
-#line 1034 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1040 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 1034 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1040 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 5164 "DirectoryMonitor.c"
+#line 5196 "DirectoryMonitor.c"
}
@@ -5193,107 +5225,107 @@ static gboolean directory_monitor_remove_monitor (DirectoryMonitor* self, GFile*
gchar* _tmp17_ = NULL;
gchar* _tmp18_ = NULL;
gchar* _tmp19_ = NULL;
-#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE);
-#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE (dir), FALSE);
-#line 1038 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE);
-#line 1039 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1045 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->monitoring;
-#line 1039 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1045 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_tmp0_) {
-#line 1040 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1046 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = FALSE;
-#line 1040 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1046 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 5207 "DirectoryMonitor.c"
+#line 5239 "DirectoryMonitor.c"
}
-#line 1042 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = self->priv->files;
-#line 1042 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = dir;
-#line 1042 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = info;
-#line 1042 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = directory_monitor_file_info_map_get_id (_tmp1_, _tmp2_, _tmp3_);
-#line 1042 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
id = _tmp4_;
-#line 1043 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1049 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = id;
-#line 1043 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1049 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp5_ == NULL) {
-#line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = FALSE;
-#line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 1044 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 5229 "DirectoryMonitor.c"
+#line 5261 "DirectoryMonitor.c"
}
-#line 1046 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1052 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = self->priv->monitors;
-#line 1046 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1052 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = id;
-#line 1046 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1052 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_);
-#line 1046 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1052 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
monitor = (GFileMonitor*) _tmp8_;
-#line 1047 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1053 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = monitor;
-#line 1047 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1053 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp9_ == NULL) {
-#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1054 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = FALSE;
-#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1054 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (monitor);
-#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1054 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 1048 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1054 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 5251 "DirectoryMonitor.c"
+#line 5283 "DirectoryMonitor.c"
}
-#line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1056 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = self->priv->monitors;
-#line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1056 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp11_ = id;
-#line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1056 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp12_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL);
-#line 1050 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1056 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
removed = _tmp12_;
-#line 1051 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1057 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp13_ = removed;
-#line 1051 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1057 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp13_, "removed");
-#line 1053 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1059 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp14_ = monitor;
-#line 1053 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1059 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_cancel_monitor (self, _tmp14_);
-#line 1055 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp15_ = dir;
-#line 1055 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp16_ = g_file_get_path (_tmp15_);
-#line 1055 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp17_ = _tmp16_;
-#line 1055 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp18_ = g_strdup_printf ("Removed monitor for %s", _tmp17_);
-#line 1055 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp19_ = _tmp18_;
-#line 1055 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp19_);
-#line 1055 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp19_);
-#line 1055 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp17_);
-#line 1057 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1063 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = TRUE;
-#line 1057 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1063 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (monitor);
-#line 1057 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1063 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 1057 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1063 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 5293 "DirectoryMonitor.c"
+#line 5325 "DirectoryMonitor.c"
}
@@ -5301,39 +5333,39 @@ static void directory_monitor_cancel_monitor (DirectoryMonitor* self, GFileMonit
GFileMonitor* _tmp0_ = NULL;
guint _tmp1_ = 0U;
GFileMonitor* _tmp2_ = NULL;
-#line 1060 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 1060 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_MONITOR (monitor));
-#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = monitor;
-#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_parse_name ("changed", g_file_monitor_get_type (), &_tmp1_, NULL, FALSE);
-#line 1061 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _directory_monitor_on_monitor_notification_g_file_monitor_changed, self);
-#line 1062 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1068 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = monitor;
-#line 1062 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1068 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_file_monitor_cancel (_tmp2_);
-#line 5315 "DirectoryMonitor.c"
+#line 5347 "DirectoryMonitor.c"
}
static void _directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) {
-#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_query_info_queue_element_on_completed ((DirectoryMonitorQueryInfoQueueElement*) self, source_object, res);
-#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_query_info_queue_element_unref (self);
-#line 5324 "DirectoryMonitor.c"
+#line 5356 "DirectoryMonitor.c"
}
static gboolean _directory_monitor_check_for_expired_delete_events_gsource_func (gpointer self) {
gboolean result;
result = directory_monitor_check_for_expired_delete_events ((DirectoryMonitor*) self);
-#line 1091 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 5333 "DirectoryMonitor.c"
+#line 5365 "DirectoryMonitor.c"
}
@@ -5355,182 +5387,182 @@ static void directory_monitor_on_monitor_notification (DirectoryMonitor* self, G
GeeQueue* _tmp16_ = NULL;
DirectoryMonitorQueryInfoQueueElement* _tmp17_ = NULL;
GFileMonitorEvent _tmp18_ = 0;
-#line 1065 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 1065 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 1065 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail ((other_file == NULL) || G_IS_FILE (other_file));
-#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = other_file;
-#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp1_ != NULL) {
-#line 5365 "DirectoryMonitor.c"
+#line 5397 "DirectoryMonitor.c"
GFile* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = other_file;
-#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = g_file_get_path (_tmp2_);
-#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp0_);
-#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = _tmp3_;
-#line 5376 "DirectoryMonitor.c"
+#line 5408 "DirectoryMonitor.c"
} else {
gchar* _tmp4_ = NULL;
-#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = g_strdup ("(none)");
-#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp0_);
-#line 1067 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1073 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = _tmp4_;
-#line 5385 "DirectoryMonitor.c"
+#line 5417 "DirectoryMonitor.c"
}
-#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = event;
-#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp5_);
-#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = file;
-#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = g_file_get_path (_tmp7_);
-#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = _tmp8_;
-#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = g_strdup_printf ("NOTIFY %s: file=%s other_file=%s", (_tmp6_ != NULL) ? _tmp6_->value_name : NULL, _tmp9_, _tmp0_);
-#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp11_ = _tmp10_;
-#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp11_);
-#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp11_);
-#line 1066 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1072 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp9_);
-#line 1076 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp12_ = file;
-#line 1076 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp13_ = other_file;
-#line 1076 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp14_ = event;
-#line 1076 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp15_ = directory_monitor_query_info_queue_element_new (self, _tmp12_, _tmp13_, _tmp14_);
-#line 1076 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
query_info = _tmp15_;
-#line 1077 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1083 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp16_ = self->priv->query_info_queue;
-#line 1077 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1083 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp17_ = query_info;
-#line 1077 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1083 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
gee_queue_offer (_tmp16_, _tmp17_);
-#line 1079 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp18_ = event;
-#line 1079 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
switch (_tmp18_) {
-#line 1079 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case G_FILE_MONITOR_EVENT_CREATED:
-#line 1079 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
-#line 5431 "DirectoryMonitor.c"
+#line 5463 "DirectoryMonitor.c"
{
GFile* _tmp19_ = NULL;
GCancellable* _tmp20_ = NULL;
DirectoryMonitorQueryInfoQueueElement* _tmp21_ = NULL;
-#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp19_ = file;
-#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp20_ = self->priv->cancellable;
-#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp21_ = query_info;
-#line 1082 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1088 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_file_query_info_async (_tmp19_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _tmp20_, _directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback, directory_monitor_query_info_queue_element_ref (_tmp21_));
-#line 1084 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1090 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 5446 "DirectoryMonitor.c"
+#line 5478 "DirectoryMonitor.c"
}
-#line 1079 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case G_FILE_MONITOR_EVENT_DELETED:
-#line 5450 "DirectoryMonitor.c"
+#line 5482 "DirectoryMonitor.c"
{
guint _tmp22_ = 0U;
-#line 1090 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1096 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp22_ = self->priv->delete_timer_id;
-#line 1090 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1096 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp22_ == ((guint) 0)) {
-#line 5457 "DirectoryMonitor.c"
+#line 5489 "DirectoryMonitor.c"
guint _tmp23_ = 0U;
-#line 1091 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp23_ = g_timeout_add_full (G_PRIORITY_DEFAULT, DIRECTORY_MONITOR_DELETED_EXPIRATION_MSEC / 2, _directory_monitor_check_for_expired_delete_events_gsource_func, g_object_ref (self), g_object_unref);
-#line 1091 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->delete_timer_id = _tmp23_;
-#line 5463 "DirectoryMonitor.c"
+#line 5495 "DirectoryMonitor.c"
}
-#line 1092 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1098 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 5467 "DirectoryMonitor.c"
+#line 5499 "DirectoryMonitor.c"
}
-#line 1079 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1085 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case G_FILE_MONITOR_EVENT_MOVED:
-#line 5471 "DirectoryMonitor.c"
+#line 5503 "DirectoryMonitor.c"
{
GFile* _tmp24_ = NULL;
-#line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1103 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp24_ = other_file;
-#line 1097 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1103 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp24_ != NULL) {
-#line 5478 "DirectoryMonitor.c"
+#line 5510 "DirectoryMonitor.c"
GFile* _tmp25_ = NULL;
GCancellable* _tmp26_ = NULL;
DirectoryMonitorQueryInfoQueueElement* _tmp27_ = NULL;
-#line 1098 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp25_ = other_file;
-#line 1098 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp26_ = self->priv->cancellable;
-#line 1098 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp27_ = query_info;
-#line 1098 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_file_query_info_async (_tmp25_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, DIRECTORY_MONITOR_DEFAULT_PRIORITY, _tmp26_, _directory_monitor_query_info_queue_element_on_completed_gasync_ready_callback, directory_monitor_query_info_queue_element_ref (_tmp27_));
-#line 5490 "DirectoryMonitor.c"
+#line 5522 "DirectoryMonitor.c"
} else {
GeeQueue* _tmp28_ = NULL;
DirectoryMonitorQueryInfoQueueElement* _tmp29_ = NULL;
-#line 1101 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_warning ("DirectoryMonitor.vala:1101: Unable to process MOVED event: no other_fi" \
+#line 1107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ g_warning ("DirectoryMonitor.vala:1107: Unable to process MOVED event: no other_fi" \
"le");
-#line 1102 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1108 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp28_ = self->priv->query_info_queue;
-#line 1102 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1108 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp29_ = query_info;
-#line 1102 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1108 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection), _tmp29_);
-#line 5502 "DirectoryMonitor.c"
+#line 5534 "DirectoryMonitor.c"
}
-#line 1104 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 5506 "DirectoryMonitor.c"
+#line 5538 "DirectoryMonitor.c"
}
default:
{
DirectoryMonitorQueryInfoQueueElement* _tmp30_ = NULL;
DirectoryMonitorQueryInfoQueueElement* _tmp31_ = NULL;
-#line 1108 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1114 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp30_ = query_info;
-#line 1108 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1114 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp30_->completed = TRUE;
-#line 1109 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1115 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp31_ = query_info;
-#line 1109 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1115 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_process_query_queue (self, _tmp31_);
-#line 1110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1116 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 5522 "DirectoryMonitor.c"
+#line 5554 "DirectoryMonitor.c"
}
}
-#line 1065 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_directory_monitor_query_info_queue_element_unref0 (query_info);
-#line 1065 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1071 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp0_);
-#line 5529 "DirectoryMonitor.c"
+#line 5561 "DirectoryMonitor.c"
}
@@ -5538,88 +5570,88 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
DirectoryMonitorQueryInfoQueueElement* _tmp2_ = NULL;
-#line 1114 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 1114 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail ((query_info == NULL) || DIRECTORY_MONITOR_IS_QUERY_INFO_QUEUE_ELEMENT (query_info));
-#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = query_info;
-#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp2_ != NULL) {
-#line 5545 "DirectoryMonitor.c"
+#line 5577 "DirectoryMonitor.c"
DirectoryMonitorQueryInfoQueueElement* _tmp3_ = NULL;
GFileInfo* _tmp4_ = NULL;
-#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = query_info;
-#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = _tmp3_->info;
-#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = _tmp4_ != NULL;
-#line 5554 "DirectoryMonitor.c"
+#line 5586 "DirectoryMonitor.c"
} else {
-#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = FALSE;
-#line 5558 "DirectoryMonitor.c"
+#line 5590 "DirectoryMonitor.c"
}
-#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp1_) {
-#line 5562 "DirectoryMonitor.c"
+#line 5594 "DirectoryMonitor.c"
DirectoryMonitorQueryInfoQueueElement* _tmp5_ = NULL;
GFileMonitorEvent _tmp6_ = 0;
-#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = query_info;
-#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = _tmp5_->event;
-#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = _tmp6_ == G_FILE_MONITOR_EVENT_CREATED;
-#line 5571 "DirectoryMonitor.c"
+#line 5603 "DirectoryMonitor.c"
} else {
-#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = FALSE;
-#line 5575 "DirectoryMonitor.c"
+#line 5607 "DirectoryMonitor.c"
}
-#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp0_) {
-#line 5579 "DirectoryMonitor.c"
+#line 5611 "DirectoryMonitor.c"
GFile* match = NULL;
DirectoryMonitorFileInfoMap* _tmp7_ = NULL;
DirectoryMonitorQueryInfoQueueElement* _tmp8_ = NULL;
GFileInfo* _tmp9_ = NULL;
GFile* _tmp10_ = NULL;
GFile* _tmp11_ = NULL;
-#line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = self->priv->files;
-#line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = query_info;
-#line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = _tmp8_->info;
-#line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = directory_monitor_file_info_map_find_match (_tmp7_, _tmp9_);
-#line 1120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
match = _tmp10_;
-#line 1121 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1127 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp11_ = match;
-#line 1121 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1127 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp11_ != NULL) {
-#line 5600 "DirectoryMonitor.c"
+#line 5632 "DirectoryMonitor.c"
gboolean matched = FALSE;
gboolean _tmp48_ = FALSE;
-#line 1122 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
matched = FALSE;
-#line 5605 "DirectoryMonitor.c"
+#line 5637 "DirectoryMonitor.c"
{
GeeIterator* _enqueued_it = NULL;
GeeQueue* _tmp12_ = NULL;
GeeIterator* _tmp13_ = NULL;
-#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp12_ = self->priv->query_info_queue;
-#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_enqueued_it = _tmp13_;
-#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
while (TRUE) {
-#line 5618 "DirectoryMonitor.c"
+#line 5650 "DirectoryMonitor.c"
GeeIterator* _tmp14_ = NULL;
gboolean _tmp15_ = FALSE;
DirectoryMonitorQueryInfoQueueElement* enqueued = NULL;
@@ -5649,171 +5681,171 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
GFileInfo* _tmp45_ = NULL;
GFileInfo* _tmp46_ = NULL;
DirectoryMonitorQueryInfoQueueElement* _tmp47_ = NULL;
-#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp14_ = _enqueued_it;
-#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp15_ = gee_iterator_next (_tmp14_);
-#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_tmp15_) {
-#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 5656 "DirectoryMonitor.c"
+#line 5688 "DirectoryMonitor.c"
}
-#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp16_ = _enqueued_it;
-#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp17_ = gee_iterator_get (_tmp16_);
-#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
enqueued = (DirectoryMonitorQueryInfoQueueElement*) _tmp17_;
-#line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp20_ = enqueued;
-#line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp21_ = _tmp20_->event;
-#line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp21_ != G_FILE_MONITOR_EVENT_DELETED) {
-#line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp19_ = TRUE;
-#line 5672 "DirectoryMonitor.c"
+#line 5704 "DirectoryMonitor.c"
} else {
DirectoryMonitorQueryInfoQueueElement* _tmp22_ = NULL;
gboolean _tmp23_ = FALSE;
-#line 1125 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp22_ = enqueued;
-#line 1125 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp23_ = _tmp22_->completed;
-#line 1125 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp19_ = _tmp23_;
-#line 5682 "DirectoryMonitor.c"
+#line 5714 "DirectoryMonitor.c"
}
-#line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp19_) {
-#line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp18_ = TRUE;
-#line 5688 "DirectoryMonitor.c"
+#line 5720 "DirectoryMonitor.c"
} else {
GFile* _tmp24_ = NULL;
DirectoryMonitorQueryInfoQueueElement* _tmp25_ = NULL;
GFile* _tmp26_ = NULL;
gboolean _tmp27_ = FALSE;
-#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp24_ = match;
-#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp25_ = enqueued;
-#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp26_ = _tmp25_->file;
-#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp27_ = g_file_equal (_tmp24_, _tmp26_);
-#line 1126 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp18_ = !_tmp27_;
-#line 5704 "DirectoryMonitor.c"
+#line 5736 "DirectoryMonitor.c"
}
-#line 1124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp18_) {
-#line 1127 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_directory_monitor_query_info_queue_element_unref0 (enqueued);
-#line 1127 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
continue;
-#line 5712 "DirectoryMonitor.c"
+#line 5744 "DirectoryMonitor.c"
}
-#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp28_ = query_info;
-#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp29_ = _tmp28_->file;
-#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp30_ = g_file_get_path (_tmp29_);
-#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp31_ = _tmp30_;
-#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp32_ = enqueued;
-#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp33_ = _tmp32_->file;
-#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp34_ = g_file_get_path (_tmp33_);
-#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp35_ = _tmp34_;
-#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp36_ = g_strdup_printf ("Matching CREATED %s to DELETED %s for MOVED", _tmp31_, _tmp35_);
-#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp37_ = _tmp36_;
-#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp37_);
-#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp37_);
-#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp35_);
-#line 1130 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp31_);
-#line 1133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1139 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp38_ = enqueued;
-#line 1133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1139 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp38_->event = G_FILE_MONITOR_EVENT_MOVED;
-#line 1134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp39_ = enqueued;
-#line 1134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp40_ = query_info;
-#line 1134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp41_ = _tmp40_->file;
-#line 1134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp42_ = _g_object_ref0 (_tmp41_);
-#line 1134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_tmp39_->other_file);
-#line 1134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp39_->other_file = _tmp42_;
-#line 1135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp43_ = enqueued;
-#line 1135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp44_ = query_info;
-#line 1135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp45_ = _tmp44_->info;
-#line 1135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp46_ = _g_object_ref0 (_tmp45_);
-#line 1135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_tmp43_->info);
-#line 1135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp43_->info = _tmp46_;
-#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1142 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp47_ = enqueued;
-#line 1136 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1142 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp47_->completed = TRUE;
-#line 1138 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
matched = TRUE;
-#line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_directory_monitor_query_info_queue_element_unref0 (enqueued);
-#line 1140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 5780 "DirectoryMonitor.c"
+#line 5812 "DirectoryMonitor.c"
}
-#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_enqueued_it);
-#line 5784 "DirectoryMonitor.c"
+#line 5816 "DirectoryMonitor.c"
}
-#line 1143 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp48_ = matched;
-#line 1143 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp48_) {
-#line 5790 "DirectoryMonitor.c"
+#line 5822 "DirectoryMonitor.c"
GeeQueue* _tmp49_ = NULL;
DirectoryMonitorQueryInfoQueueElement* _tmp50_ = NULL;
-#line 1144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1150 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp49_ = self->priv->query_info_queue;
-#line 1144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1150 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp50_ = query_info;
-#line 1144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1150 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection), _tmp50_);
-#line 5799 "DirectoryMonitor.c"
+#line 5831 "DirectoryMonitor.c"
}
}
-#line 1117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1123 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (match);
-#line 5804 "DirectoryMonitor.c"
+#line 5836 "DirectoryMonitor.c"
}
{
gboolean _tmp51_ = FALSE;
-#line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp51_ = TRUE;
-#line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
while (TRUE) {
-#line 5812 "DirectoryMonitor.c"
+#line 5844 "DirectoryMonitor.c"
DirectoryMonitorQueryInfoQueueElement* next = NULL;
GeeQueue* _tmp52_ = NULL;
gpointer _tmp53_ = NULL;
@@ -5851,91 +5883,91 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
GFileInfo* _tmp123_ = NULL;
DirectoryMonitorQueryInfoQueueElement* _tmp124_ = NULL;
GFileMonitorEvent _tmp125_ = 0;
-#line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_tmp51_) {
-#line 5852 "DirectoryMonitor.c"
+#line 5884 "DirectoryMonitor.c"
}
-#line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp51_ = FALSE;
-#line 1151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp52_ = self->priv->query_info_queue;
-#line 1151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp53_ = gee_queue_peek (_tmp52_);
-#line 1151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
next = (DirectoryMonitorQueryInfoQueueElement*) _tmp53_;
-#line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp55_ = next;
-#line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp55_ == NULL) {
-#line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp54_ = TRUE;
-#line 5868 "DirectoryMonitor.c"
+#line 5900 "DirectoryMonitor.c"
} else {
DirectoryMonitorQueryInfoQueueElement* _tmp56_ = NULL;
gboolean _tmp57_ = FALSE;
-#line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp56_ = next;
-#line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp57_ = _tmp56_->completed;
-#line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp54_ = !_tmp57_;
-#line 5878 "DirectoryMonitor.c"
+#line 5910 "DirectoryMonitor.c"
}
-#line 1152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp54_) {
-#line 1153 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_directory_monitor_query_info_queue_element_unref0 (next);
-#line 1153 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 5886 "DirectoryMonitor.c"
+#line 5918 "DirectoryMonitor.c"
}
-#line 1156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp58_ = self->priv->query_info_queue;
-#line 1156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp59_ = gee_queue_poll (_tmp58_);
-#line 1156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
n = (DirectoryMonitorQueryInfoQueueElement*) _tmp59_;
-#line 1157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp60_ = next;
-#line 1157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp61_ = n;
-#line 1157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp60_ == _tmp61_, "next == n");
-#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp62_ = next;
-#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp63_ = _tmp62_->position;
-#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp64_ = next;
-#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp65_ = _tmp64_->event;
-#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp66_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp65_);
-#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp67_ = next;
-#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp68_ = _tmp67_->file;
-#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp69_ = g_file_get_path (_tmp68_);
-#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp70_ = _tmp69_;
-#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp71_ = g_strdup_printf ("Completed info query %u for %s on %s", _tmp63_, (_tmp66_ != NULL) ? _tmp66_->value_name : NULL, _tmp70_);
-#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp72_ = _tmp71_;
-#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp72_);
-#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp72_);
-#line 1159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp70_);
-#line 1162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp73_ = next;
-#line 1162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp74_ = _tmp73_->err;
-#line 1162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp74_ != NULL) {
-#line 5934 "DirectoryMonitor.c"
+#line 5966 "DirectoryMonitor.c"
DirectoryMonitorQueryInfoQueueElement* _tmp75_ = NULL;
GFile* _tmp76_ = NULL;
gchar* _tmp77_ = NULL;
@@ -5948,76 +5980,76 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
const gchar* _tmp84_ = NULL;
gchar* _tmp85_ = NULL;
gchar* _tmp86_ = NULL;
-#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp75_ = next;
-#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp76_ = _tmp75_->file;
-#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp77_ = g_file_get_path (_tmp76_);
-#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp78_ = _tmp77_;
-#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp79_ = next;
-#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp80_ = _tmp79_->event;
-#line 1164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp81_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp80_);
-#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp82_ = next;
-#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp83_ = _tmp82_->err;
-#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp84_ = _tmp83_->message;
-#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp85_ = g_strdup_printf ("Unable to retrieve file information for %s, dropping %s: %s", _tmp78_, (_tmp81_ != NULL) ? _tmp81_->value_name : NULL, _tmp84_);
-#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp86_ = _tmp85_;
-#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp86_);
-#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp86_);
-#line 1163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp78_);
-#line 1166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1172 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_directory_monitor_query_info_queue_element_unref0 (n);
-#line 1166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1172 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_directory_monitor_query_info_queue_element_unref0 (next);
-#line 1166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1172 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
continue;
-#line 5983 "DirectoryMonitor.c"
+#line 6015 "DirectoryMonitor.c"
}
-#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp88_ = next;
-#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp89_ = _tmp88_->info;
-#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp89_ != NULL) {
-#line 5991 "DirectoryMonitor.c"
+#line 6023 "DirectoryMonitor.c"
DirectoryMonitorQueryInfoQueueElement* _tmp90_ = NULL;
GFileInfo* _tmp91_ = NULL;
gchar* _tmp92_ = NULL;
gchar* _tmp93_ = NULL;
-#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp90_ = next;
-#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp91_ = _tmp90_->info;
-#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp92_ = get_file_info_id (_tmp91_);
-#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp93_ = _tmp92_;
-#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp87_ = _tmp93_ == NULL;
-#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp93_);
-#line 6008 "DirectoryMonitor.c"
+#line 6040 "DirectoryMonitor.c"
} else {
-#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp87_ = FALSE;
-#line 6012 "DirectoryMonitor.c"
+#line 6044 "DirectoryMonitor.c"
}
-#line 1170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp87_) {
-#line 6016 "DirectoryMonitor.c"
+#line 6048 "DirectoryMonitor.c"
DirectoryMonitorQueryInfoQueueElement* _tmp94_ = NULL;
GFile* _tmp95_ = NULL;
gchar* _tmp96_ = NULL;
@@ -6027,65 +6059,65 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
GEnumValue* _tmp100_;
gchar* _tmp101_ = NULL;
gchar* _tmp102_ = NULL;
-#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp94_ = next;
-#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp95_ = _tmp94_->file;
-#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp96_ = g_file_get_path (_tmp95_);
-#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp97_ = _tmp96_;
-#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp98_ = next;
-#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp99_ = _tmp98_->event;
-#line 1172 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp100_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp99_);
-#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp101_ = g_strdup_printf ("Unable to retrieve file ID for %s, dropping %s", _tmp97_, (_tmp100_ != NULL) ? _tmp100_->value_name : NULL);
-#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp102_ = _tmp101_;
-#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp102_);
-#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp102_);
-#line 1171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp97_);
-#line 1174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_directory_monitor_query_info_queue_element_unref0 (n);
-#line 1174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_directory_monitor_query_info_queue_element_unref0 (next);
-#line 1174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
continue;
-#line 6056 "DirectoryMonitor.c"
+#line 6088 "DirectoryMonitor.c"
}
-#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp104_ = next;
-#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp105_ = _tmp104_->info;
-#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp105_ != NULL) {
-#line 6064 "DirectoryMonitor.c"
+#line 6096 "DirectoryMonitor.c"
DirectoryMonitorQueryInfoQueueElement* _tmp106_ = NULL;
GFileInfo* _tmp107_ = NULL;
gboolean _tmp108_ = FALSE;
-#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp106_ = next;
-#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp107_ = _tmp106_->info;
-#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp108_ = directory_monitor_is_file_symlink_supported (_tmp107_);
-#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp103_ = !_tmp108_;
-#line 6076 "DirectoryMonitor.c"
+#line 6108 "DirectoryMonitor.c"
} else {
-#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp103_ = FALSE;
-#line 6080 "DirectoryMonitor.c"
+#line 6112 "DirectoryMonitor.c"
}
-#line 1178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp103_) {
-#line 6084 "DirectoryMonitor.c"
+#line 6116 "DirectoryMonitor.c"
DirectoryMonitorQueryInfoQueueElement* _tmp109_ = NULL;
GFile* _tmp110_ = NULL;
gchar* _tmp111_ = NULL;
@@ -6095,61 +6127,61 @@ static void directory_monitor_process_query_queue (DirectoryMonitor* self, Direc
GEnumValue* _tmp115_;
gchar* _tmp116_ = NULL;
gchar* _tmp117_ = NULL;
-#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp109_ = next;
-#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp110_ = _tmp109_->file;
-#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp111_ = g_file_get_path (_tmp110_);
-#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp112_ = _tmp111_;
-#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp113_ = next;
-#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp114_ = _tmp113_->event;
-#line 1180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1186 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp115_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp114_);
-#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp116_ = g_strdup_printf ("No symlink support for %s, dropping %s", _tmp112_, (_tmp115_ != NULL) ? _tmp115_->value_name : NULL);
-#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp117_ = _tmp116_;
-#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp117_);
-#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp117_);
-#line 1179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp112_);
-#line 1182 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_directory_monitor_query_info_queue_element_unref0 (n);
-#line 1182 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_directory_monitor_query_info_queue_element_unref0 (next);
-#line 1182 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
continue;
-#line 6124 "DirectoryMonitor.c"
+#line 6156 "DirectoryMonitor.c"
}
-#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp118_ = next;
-#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp119_ = _tmp118_->file;
-#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp120_ = next;
-#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp121_ = _tmp120_->other_file;
-#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp122_ = next;
-#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp123_ = _tmp122_->info;
-#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp124_ = next;
-#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp125_ = _tmp124_->event;
-#line 1185 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_on_monitor_notification_ready (self, _tmp119_, _tmp121_, _tmp123_, _tmp125_);
-#line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_directory_monitor_query_info_queue_element_unref0 (n);
-#line 1149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_directory_monitor_query_info_queue_element_unref0 (next);
-#line 6148 "DirectoryMonitor.c"
+#line 6180 "DirectoryMonitor.c"
}
}
}
@@ -6166,143 +6198,143 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
gchar* _tmp10_ = NULL;
gchar* _tmp11_ = NULL;
GFileMonitorEvent _tmp12_ = 0;
-#line 1189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (IS_DIRECTORY_MONITOR (self));
-#line 1189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 1189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail ((other_file == NULL) || G_IS_FILE (other_file));
-#line 1189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail ((info == NULL) || G_IS_FILE_INFO (info));
-#line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = other_file;
-#line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp1_ != NULL) {
-#line 6177 "DirectoryMonitor.c"
+#line 6209 "DirectoryMonitor.c"
GFile* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = other_file;
-#line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = g_file_get_path (_tmp2_);
-#line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp0_);
-#line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = _tmp3_;
-#line 6188 "DirectoryMonitor.c"
+#line 6220 "DirectoryMonitor.c"
} else {
gchar* _tmp4_ = NULL;
-#line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = g_strdup ("(null)");
-#line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp0_);
-#line 1192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = _tmp4_;
-#line 6197 "DirectoryMonitor.c"
+#line 6229 "DirectoryMonitor.c"
}
-#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = event;
-#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp5_);
-#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = file;
-#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = g_file_get_path (_tmp7_);
-#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = _tmp8_;
-#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = g_strdup_printf ("READY %s: file=%s other_file=%s", (_tmp6_ != NULL) ? _tmp6_->value_name : NULL, _tmp9_, _tmp0_);
-#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp11_ = _tmp10_;
-#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp11_);
-#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp11_);
-#line 1191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1197 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp9_);
-#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp12_ = event;
-#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
switch (_tmp12_) {
-#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case G_FILE_MONITOR_EVENT_CREATED:
-#line 6225 "DirectoryMonitor.c"
+#line 6257 "DirectoryMonitor.c"
{
GFileInfo* _tmp13_ = NULL;
DirectoryMonitorFType ftype = 0;
GFileInfo* _tmp14_ = NULL;
DirectoryMonitorFType _tmp15_ = 0;
DirectoryMonitorFType _tmp16_ = 0;
-#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1204 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp13_ = info;
-#line 1198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1204 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp13_ != NULL, "info != null");
-#line 1200 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1206 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp14_ = info;
-#line 1200 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1206 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp15_ = directory_monitor_get_ftype (_tmp14_);
-#line 1200 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1206 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
ftype = _tmp15_;
-#line 1201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp16_ = ftype;
-#line 1201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
switch (_tmp16_) {
-#line 1201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 6248 "DirectoryMonitor.c"
+#line 6280 "DirectoryMonitor.c"
{
GFile* _tmp17_ = NULL;
GFileInfo* _tmp18_ = NULL;
-#line 1203 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1209 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp17_ = file;
-#line 1203 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1209 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp18_ = info;
-#line 1203 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1209 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_internal_notify_file_created (self, _tmp17_, _tmp18_);
-#line 1204 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1210 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6260 "DirectoryMonitor.c"
+#line 6292 "DirectoryMonitor.c"
}
-#line 1201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 6264 "DirectoryMonitor.c"
+#line 6296 "DirectoryMonitor.c"
{
gint _tmp19_ = 0;
GFile* _tmp20_ = NULL;
GFileInfo* _tmp21_ = NULL;
-#line 1211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp19_ = self->priv->outstanding_exploration_dirs;
-#line 1211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->outstanding_exploration_dirs = _tmp19_ + 1;
-#line 1212 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp20_ = file;
-#line 1212 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp21_ = info;
-#line 1212 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_explore_async (self, _tmp20_, _tmp21_, FALSE, NULL, NULL);
-#line 1213 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6281 "DirectoryMonitor.c"
+#line 6313 "DirectoryMonitor.c"
}
default:
{
DirectoryMonitorFType _tmp22_ = 0;
-#line 1216 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1222 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp22_ = ftype;
-#line 1216 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1222 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp22_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
-#line 1217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6292 "DirectoryMonitor.c"
+#line 6324 "DirectoryMonitor.c"
}
}
-#line 1219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1225 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6297 "DirectoryMonitor.c"
+#line 6329 "DirectoryMonitor.c"
}
-#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case G_FILE_MONITOR_EVENT_CHANGED:
-#line 6301 "DirectoryMonitor.c"
+#line 6333 "DirectoryMonitor.c"
{
GFileInfo* _tmp23_ = NULL;
GFileInfo* local_info = NULL;
@@ -6313,176 +6345,176 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
GFileInfo* _tmp32_ = NULL;
DirectoryMonitorFType _tmp33_ = 0;
DirectoryMonitorFType _tmp34_ = 0;
-#line 1223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1229 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp23_ = info;
-#line 1223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1229 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp23_ == NULL, "info == null");
-#line 1225 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp24_ = file;
-#line 1225 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp25_ = directory_monitor_get_file_info (self, _tmp24_);
-#line 1225 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
local_info = _tmp25_;
-#line 1226 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp26_ = local_info;
-#line 1226 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp26_ == NULL) {
-#line 6326 "DirectoryMonitor.c"
+#line 6358 "DirectoryMonitor.c"
GFile* _tmp27_ = NULL;
gchar* _tmp28_ = NULL;
gchar* _tmp29_ = NULL;
gchar* _tmp30_ = NULL;
gchar* _tmp31_ = NULL;
-#line 1227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp27_ = file;
-#line 1227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp28_ = g_file_get_path (_tmp27_);
-#line 1227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp29_ = _tmp28_;
-#line 1227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp30_ = g_strdup_printf ("Changed event for unknown file %s", _tmp29_);
-#line 1227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp31_ = _tmp30_;
-#line 1227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg (_tmp31_);
-#line 1227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp31_);
-#line 1227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp29_);
-#line 1229 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1235 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (local_info);
-#line 1229 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1235 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6352 "DirectoryMonitor.c"
+#line 6384 "DirectoryMonitor.c"
}
-#line 1232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp32_ = local_info;
-#line 1232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp33_ = directory_monitor_get_ftype (_tmp32_);
-#line 1232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
ftype = _tmp33_;
-#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp34_ = ftype;
-#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
switch (_tmp34_) {
-#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 6366 "DirectoryMonitor.c"
+#line 6398 "DirectoryMonitor.c"
{
GFile* _tmp35_ = NULL;
-#line 1235 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp35_ = file;
-#line 1235 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_file_altered (self, _tmp35_);
-#line 1236 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1242 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6375 "DirectoryMonitor.c"
+#line 6407 "DirectoryMonitor.c"
}
-#line 1233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 6379 "DirectoryMonitor.c"
+#line 6411 "DirectoryMonitor.c"
{
GFile* _tmp36_ = NULL;
-#line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp36_ = file;
-#line 1239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_directory_altered (self, _tmp36_);
-#line 1240 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6388 "DirectoryMonitor.c"
+#line 6420 "DirectoryMonitor.c"
}
default:
{
DirectoryMonitorFType _tmp37_ = 0;
-#line 1243 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp37_ = ftype;
-#line 1243 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp37_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
-#line 1244 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6399 "DirectoryMonitor.c"
+#line 6431 "DirectoryMonitor.c"
}
}
-#line 1246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (local_info);
-#line 1246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6406 "DirectoryMonitor.c"
+#line 6438 "DirectoryMonitor.c"
}
-#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
-#line 6410 "DirectoryMonitor.c"
+#line 6442 "DirectoryMonitor.c"
{
GFileInfo* _tmp38_ = NULL;
DirectoryMonitorFType ftype = 0;
GFileInfo* _tmp39_ = NULL;
DirectoryMonitorFType _tmp40_ = 0;
DirectoryMonitorFType _tmp41_ = 0;
-#line 1249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp38_ = info;
-#line 1249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp38_ != NULL, "info != null");
-#line 1251 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1257 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp39_ = info;
-#line 1251 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1257 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp40_ = directory_monitor_get_ftype (_tmp39_);
-#line 1251 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1257 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
ftype = _tmp40_;
-#line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp41_ = ftype;
-#line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
switch (_tmp41_) {
-#line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 6433 "DirectoryMonitor.c"
+#line 6465 "DirectoryMonitor.c"
{
GFile* _tmp42_ = NULL;
GFileInfo* _tmp43_ = NULL;
-#line 1254 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1260 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp42_ = file;
-#line 1254 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1260 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp43_ = info;
-#line 1254 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1260 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_internal_notify_file_alteration_completed (self, _tmp42_, _tmp43_);
-#line 1255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1261 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6445 "DirectoryMonitor.c"
+#line 6477 "DirectoryMonitor.c"
}
-#line 1252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 6449 "DirectoryMonitor.c"
+#line 6481 "DirectoryMonitor.c"
{
GFile* _tmp44_ = NULL;
GFileInfo* _tmp45_ = NULL;
-#line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1264 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp44_ = file;
-#line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1264 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp45_ = info;
-#line 1258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1264 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_internal_notify_directory_alteration_completed (self, _tmp44_, _tmp45_);
-#line 1259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6461 "DirectoryMonitor.c"
+#line 6493 "DirectoryMonitor.c"
}
default:
{
DirectoryMonitorFType _tmp46_ = 0;
-#line 1262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1268 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp46_ = ftype;
-#line 1262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1268 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp46_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
-#line 1263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1269 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6472 "DirectoryMonitor.c"
+#line 6504 "DirectoryMonitor.c"
}
}
-#line 1265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1271 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6477 "DirectoryMonitor.c"
+#line 6509 "DirectoryMonitor.c"
}
-#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case G_FILE_MONITOR_EVENT_MOVED:
-#line 6481 "DirectoryMonitor.c"
+#line 6513 "DirectoryMonitor.c"
{
GFileInfo* _tmp47_ = NULL;
GFile* _tmp48_ = NULL;
@@ -6490,46 +6522,46 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
GFileInfo* _tmp49_ = NULL;
DirectoryMonitorFType _tmp50_ = 0;
DirectoryMonitorFType _tmp51_ = 0;
-#line 1268 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp47_ = info;
-#line 1268 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp47_ != NULL, "info != null");
-#line 1269 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp48_ = other_file;
-#line 1269 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp48_ != NULL, "other_file != null");
-#line 1273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp49_ = info;
-#line 1273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp50_ = directory_monitor_get_ftype (_tmp49_);
-#line 1273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
ftype = _tmp50_;
-#line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp51_ = ftype;
-#line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
switch (_tmp51_) {
-#line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 6509 "DirectoryMonitor.c"
+#line 6541 "DirectoryMonitor.c"
{
GFile* _tmp52_ = NULL;
GFile* _tmp53_ = NULL;
GFileInfo* _tmp54_ = NULL;
-#line 1276 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp52_ = file;
-#line 1276 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp53_ = other_file;
-#line 1276 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp54_ = info;
-#line 1276 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_internal_notify_file_moved (self, _tmp52_, _tmp53_, _tmp54_);
-#line 1277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6524 "DirectoryMonitor.c"
+#line 6556 "DirectoryMonitor.c"
}
-#line 1274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 6528 "DirectoryMonitor.c"
+#line 6560 "DirectoryMonitor.c"
{
GFileInfo* old_dir_info = NULL;
DirectoryMonitorFileInfoMap* _tmp55_ = NULL;
@@ -6540,73 +6572,73 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
GFileInfo* _tmp63_ = NULL;
GFile* _tmp64_ = NULL;
GFileInfo* _tmp65_ = NULL;
-#line 1281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp55_ = self->priv->files;
-#line 1281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp56_ = file;
-#line 1281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp57_ = directory_monitor_file_info_map_get_info (_tmp55_, _tmp56_);
-#line 1281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
old_dir_info = _tmp57_;
-#line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp58_ = old_dir_info;
-#line 1282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp58_ == NULL) {
-#line 6551 "DirectoryMonitor.c"
+#line 6583 "DirectoryMonitor.c"
GFile* _tmp59_ = NULL;
gchar* _tmp60_ = NULL;
gchar* _tmp61_ = NULL;
-#line 1283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp59_ = file;
-#line 1283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp60_ = g_file_get_path (_tmp59_);
-#line 1283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp61_ = _tmp60_;
-#line 1283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_warning ("DirectoryMonitor.vala:1283: Directory moved event for unknown file %s", _tmp61_);
-#line 1283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ g_warning ("DirectoryMonitor.vala:1289: Directory moved event for unknown file %s", _tmp61_);
+#line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp61_);
-#line 1285 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1291 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (old_dir_info);
-#line 1285 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1291 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6569 "DirectoryMonitor.c"
+#line 6601 "DirectoryMonitor.c"
}
-#line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp62_ = file;
-#line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp63_ = old_dir_info;
-#line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp64_ = other_file;
-#line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp65_ = info;
-#line 1288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_internal_notify_directory_moved (self, _tmp62_, _tmp63_, _tmp64_, _tmp65_);
-#line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (old_dir_info);
-#line 1289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6585 "DirectoryMonitor.c"
+#line 6617 "DirectoryMonitor.c"
}
default:
{
DirectoryMonitorFType _tmp66_ = 0;
-#line 1292 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp66_ = ftype;
-#line 1292 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp66_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
-#line 1293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6596 "DirectoryMonitor.c"
+#line 6628 "DirectoryMonitor.c"
}
}
-#line 1295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1301 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6601 "DirectoryMonitor.c"
+#line 6633 "DirectoryMonitor.c"
}
-#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case G_FILE_MONITOR_EVENT_DELETED:
-#line 6605 "DirectoryMonitor.c"
+#line 6637 "DirectoryMonitor.c"
{
GFileInfo* _tmp67_ = NULL;
GFileInfo* local_info = NULL;
@@ -6617,97 +6649,97 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
GFileInfo* _tmp74_ = NULL;
DirectoryMonitorFType _tmp75_ = 0;
DirectoryMonitorFType _tmp76_ = 0;
-#line 1298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp67_ = info;
-#line 1298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp67_ == NULL, "info == null");
-#line 1300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp68_ = file;
-#line 1300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp69_ = directory_monitor_get_file_info (self, _tmp68_);
-#line 1300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
local_info = _tmp69_;
-#line 1301 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1307 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp70_ = local_info;
-#line 1301 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1307 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp70_ == NULL) {
-#line 6630 "DirectoryMonitor.c"
+#line 6662 "DirectoryMonitor.c"
GFile* _tmp71_ = NULL;
gchar* _tmp72_ = NULL;
gchar* _tmp73_ = NULL;
-#line 1302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp71_ = file;
-#line 1302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp72_ = g_file_get_path (_tmp71_);
-#line 1302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp73_ = _tmp72_;
-#line 1302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_warning ("DirectoryMonitor.vala:1302: Deleted event for unknown file %s", _tmp73_);
-#line 1302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ g_warning ("DirectoryMonitor.vala:1308: Deleted event for unknown file %s", _tmp73_);
+#line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp73_);
-#line 1304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1310 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (local_info);
-#line 1304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1310 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6648 "DirectoryMonitor.c"
+#line 6680 "DirectoryMonitor.c"
}
-#line 1307 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp74_ = local_info;
-#line 1307 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp75_ = directory_monitor_get_ftype (_tmp74_);
-#line 1307 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
ftype = _tmp75_;
-#line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp76_ = ftype;
-#line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
switch (_tmp76_) {
-#line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 6662 "DirectoryMonitor.c"
+#line 6694 "DirectoryMonitor.c"
{
GFile* _tmp77_ = NULL;
-#line 1310 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp77_ = file;
-#line 1310 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_internal_notify_file_deleted (self, _tmp77_);
-#line 1311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6671 "DirectoryMonitor.c"
+#line 6703 "DirectoryMonitor.c"
}
-#line 1308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 6675 "DirectoryMonitor.c"
+#line 6707 "DirectoryMonitor.c"
{
GFile* _tmp78_ = NULL;
-#line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp78_ = file;
-#line 1314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_internal_notify_directory_deleted (self, _tmp78_);
-#line 1315 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6684 "DirectoryMonitor.c"
+#line 6716 "DirectoryMonitor.c"
}
default:
{
DirectoryMonitorFType _tmp79_ = 0;
-#line 1318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp79_ = ftype;
-#line 1318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp79_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
-#line 1319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1325 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6695 "DirectoryMonitor.c"
+#line 6727 "DirectoryMonitor.c"
}
}
-#line 1321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (local_info);
-#line 1321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6702 "DirectoryMonitor.c"
+#line 6734 "DirectoryMonitor.c"
}
-#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
-#line 6706 "DirectoryMonitor.c"
+#line 6738 "DirectoryMonitor.c"
{
GFileInfo* _tmp80_ = NULL;
GFileInfo* local_info = NULL;
@@ -6718,123 +6750,123 @@ static void directory_monitor_on_monitor_notification_ready (DirectoryMonitor* s
GFileInfo* _tmp87_ = NULL;
DirectoryMonitorFType _tmp88_ = 0;
DirectoryMonitorFType _tmp89_ = 0;
-#line 1325 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp80_ = info;
-#line 1325 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp80_ == NULL, "info == null");
-#line 1327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1333 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp81_ = file;
-#line 1327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1333 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp82_ = directory_monitor_get_file_info (self, _tmp81_);
-#line 1327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1333 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
local_info = _tmp82_;
-#line 1328 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1334 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp83_ = local_info;
-#line 1328 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1334 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp83_ == NULL) {
-#line 6731 "DirectoryMonitor.c"
+#line 6763 "DirectoryMonitor.c"
GFile* _tmp84_ = NULL;
gchar* _tmp85_ = NULL;
gchar* _tmp86_ = NULL;
-#line 1329 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp84_ = file;
-#line 1329 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp85_ = g_file_get_path (_tmp84_);
-#line 1329 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp86_ = _tmp85_;
-#line 1329 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_warning ("DirectoryMonitor.vala:1329: Attribute changed event for unknown file %" \
+#line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ g_warning ("DirectoryMonitor.vala:1335: Attribute changed event for unknown file %" \
"s", _tmp86_);
-#line 1329 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp86_);
-#line 1331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (local_info);
-#line 1331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6749 "DirectoryMonitor.c"
+#line 6781 "DirectoryMonitor.c"
}
-#line 1334 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp87_ = local_info;
-#line 1334 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp88_ = directory_monitor_get_ftype (_tmp87_);
-#line 1334 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
ftype = _tmp88_;
-#line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp89_ = ftype;
-#line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
switch (_tmp89_) {
-#line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 6763 "DirectoryMonitor.c"
+#line 6795 "DirectoryMonitor.c"
{
GFile* _tmp90_ = NULL;
-#line 1337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp90_ = file;
-#line 1337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_file_attributes_altered (self, _tmp90_);
-#line 1338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6772 "DirectoryMonitor.c"
+#line 6804 "DirectoryMonitor.c"
}
-#line 1335 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 6776 "DirectoryMonitor.c"
+#line 6808 "DirectoryMonitor.c"
{
GFile* _tmp91_ = NULL;
-#line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp91_ = file;
-#line 1341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_notify_directory_attributes_altered (self, _tmp91_);
-#line 1342 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1348 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6785 "DirectoryMonitor.c"
+#line 6817 "DirectoryMonitor.c"
}
default:
{
DirectoryMonitorFType _tmp92_ = 0;
-#line 1345 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1351 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp92_ = ftype;
-#line 1345 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1351 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp92_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
-#line 1346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6796 "DirectoryMonitor.c"
+#line 6828 "DirectoryMonitor.c"
}
}
-#line 1348 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1354 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (local_info);
-#line 1348 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1354 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6803 "DirectoryMonitor.c"
+#line 6835 "DirectoryMonitor.c"
}
-#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
-#line 1196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case G_FILE_MONITOR_EVENT_UNMOUNTED:
-#line 6809 "DirectoryMonitor.c"
+#line 6841 "DirectoryMonitor.c"
{
-#line 1353 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1359 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6813 "DirectoryMonitor.c"
+#line 6845 "DirectoryMonitor.c"
}
default:
{
GFileMonitorEvent _tmp93_ = 0;
GEnumValue* _tmp94_;
-#line 1356 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp93_ = event;
-#line 1356 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp94_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp93_);
-#line 1356 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_warning ("DirectoryMonitor.vala:1356: Unknown directory monitor event %s", (_tmp94_ != NULL) ? _tmp94_->value_name : NULL);
-#line 1357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ g_warning ("DirectoryMonitor.vala:1362: Unknown directory monitor event %s", (_tmp94_ != NULL) ? _tmp94_->value_name : NULL);
+#line 1363 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 6827 "DirectoryMonitor.c"
+#line 6859 "DirectoryMonitor.c"
}
}
-#line 1189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp0_);
-#line 6832 "DirectoryMonitor.c"
+#line 6864 "DirectoryMonitor.c"
}
@@ -6847,25 +6879,25 @@ static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, G
GFileInfo* _tmp1_ = NULL;
GFile* _tmp2_ = NULL;
GFile* _tmp3_ = NULL;
-#line 1363 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE);
-#line 1363 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 1363 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE);
-#line 1366 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1372 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->parent_moved;
-#line 1366 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1372 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = info;
-#line 1366 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1372 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = directory_monitor_file_info_map_find_match (_tmp0_, _tmp1_);
-#line 1366 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1372 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
match = _tmp2_;
-#line 1367 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = match;
-#line 1367 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp3_ != NULL) {
-#line 6863 "DirectoryMonitor.c"
+#line 6895 "DirectoryMonitor.c"
GFile* _tmp4_ = NULL;
GFile* _tmp5_ = NULL;
DirectoryMonitorFileInfoMap* _tmp6_ = NULL;
@@ -6874,95 +6906,95 @@ static gboolean directory_monitor_is_file_create_move (DirectoryMonitor* self, G
DirectoryMonitorFileInfoMap* _tmp9_ = NULL;
GFile* _tmp10_ = NULL;
GFileInfo* _tmp11_ = NULL;
-#line 1368 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = match;
-#line 1368 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 1368 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_vala_old_file);
-#line 1368 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_old_file = _tmp5_;
-#line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = self->priv->parent_moved;
-#line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = match;
-#line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = directory_monitor_file_info_map_get_info (_tmp6_, _tmp7_);
-#line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_vala_old_file_info);
-#line 1369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_old_file_info = _tmp8_;
-#line 1371 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = self->priv->parent_moved;
-#line 1371 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = match;
-#line 1371 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp11_ = info;
-#line 1371 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_file_info_map_remove (_tmp9_, _tmp10_, _tmp11_);
-#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = TRUE;
-#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (match);
-#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (old_file) {
-#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
*old_file = _vala_old_file;
-#line 6906 "DirectoryMonitor.c"
+#line 6938 "DirectoryMonitor.c"
} else {
-#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_vala_old_file);
-#line 6910 "DirectoryMonitor.c"
+#line 6942 "DirectoryMonitor.c"
}
-#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (old_file_info) {
-#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
*old_file_info = _vala_old_file_info;
-#line 6916 "DirectoryMonitor.c"
+#line 6948 "DirectoryMonitor.c"
} else {
-#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_vala_old_file_info);
-#line 6920 "DirectoryMonitor.c"
+#line 6952 "DirectoryMonitor.c"
}
-#line 1373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 6924 "DirectoryMonitor.c"
+#line 6956 "DirectoryMonitor.c"
}
-#line 1376 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1382 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_vala_old_file);
-#line 1376 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1382 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_old_file = NULL;
-#line 1377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1383 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_vala_old_file_info);
-#line 1377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1383 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_old_file_info = NULL;
-#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = FALSE;
-#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (match);
-#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (old_file) {
-#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
*old_file = _vala_old_file;
-#line 6942 "DirectoryMonitor.c"
+#line 6974 "DirectoryMonitor.c"
} else {
-#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_vala_old_file);
-#line 6946 "DirectoryMonitor.c"
+#line 6978 "DirectoryMonitor.c"
}
-#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (old_file_info) {
-#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
*old_file_info = _vala_old_file_info;
-#line 6952 "DirectoryMonitor.c"
+#line 6984 "DirectoryMonitor.c"
} else {
-#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_vala_old_file_info);
-#line 6956 "DirectoryMonitor.c"
+#line 6988 "DirectoryMonitor.c"
}
-#line 1379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 6960 "DirectoryMonitor.c"
+#line 6992 "DirectoryMonitor.c"
}
@@ -6974,30 +7006,30 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni
gboolean any_expired = FALSE;
gboolean _tmp13_ = FALSE;
gboolean _tmp14_ = FALSE;
-#line 1382 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1388 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), FALSE);
-#line 1383 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1389 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = now_ms ();
-#line 1383 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1389 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
expiration = _tmp0_ - DIRECTORY_MONITOR_DELETED_EXPIRATION_MSEC;
-#line 1385 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1391 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
any_deleted = FALSE;
-#line 1386 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1392 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
any_expired = FALSE;
-#line 6982 "DirectoryMonitor.c"
+#line 7014 "DirectoryMonitor.c"
{
GeeIterator* _element_it = NULL;
GeeQueue* _tmp1_ = NULL;
GeeIterator* _tmp2_ = NULL;
-#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = self->priv->query_info_queue;
-#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_element_it = _tmp2_;
-#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
while (TRUE) {
-#line 6995 "DirectoryMonitor.c"
+#line 7027 "DirectoryMonitor.c"
GeeIterator* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
DirectoryMonitorQueryInfoQueueElement* element = NULL;
@@ -7009,85 +7041,85 @@ static gboolean directory_monitor_check_for_expired_delete_events (DirectoryMoni
gulong _tmp10_ = 0UL;
gulong _tmp11_ = 0UL;
DirectoryMonitorQueryInfoQueueElement* _tmp12_ = NULL;
-#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = _element_it;
-#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = gee_iterator_next (_tmp3_);
-#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_tmp4_) {
-#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 7015 "DirectoryMonitor.c"
+#line 7047 "DirectoryMonitor.c"
}
-#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = _element_it;
-#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = gee_iterator_get (_tmp5_);
-#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
element = (DirectoryMonitorQueryInfoQueueElement*) _tmp6_;
-#line 1388 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = element;
-#line 1388 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = _tmp7_->event;
-#line 1388 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp8_ != G_FILE_MONITOR_EVENT_DELETED) {
-#line 1389 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1395 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_directory_monitor_query_info_queue_element_unref0 (element);
-#line 1389 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1395 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
continue;
-#line 7033 "DirectoryMonitor.c"
+#line 7065 "DirectoryMonitor.c"
}
-#line 1391 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1397 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
any_deleted = TRUE;
-#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1399 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = element;
-#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1399 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = _tmp9_->time_created_msec;
-#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1399 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp11_ = expiration;
-#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1399 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp10_ > _tmp11_) {
-#line 1394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1400 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_directory_monitor_query_info_queue_element_unref0 (element);
-#line 1394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1400 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
continue;
-#line 7049 "DirectoryMonitor.c"
+#line 7081 "DirectoryMonitor.c"
}
-#line 1397 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1403 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp12_ = element;
-#line 1397 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1403 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp12_->completed = TRUE;
-#line 1398 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1404 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
any_expired = TRUE;
-#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_directory_monitor_query_info_queue_element_unref0 (element);
-#line 7059 "DirectoryMonitor.c"
+#line 7091 "DirectoryMonitor.c"
}
-#line 1387 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1393 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_element_it);
-#line 7063 "DirectoryMonitor.c"
+#line 7095 "DirectoryMonitor.c"
}
-#line 1401 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp13_ = any_expired;
-#line 1401 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp13_) {
-#line 1402 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1408 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_process_query_queue (self, NULL);
-#line 7071 "DirectoryMonitor.c"
+#line 7103 "DirectoryMonitor.c"
}
-#line 1404 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1410 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp14_ = any_deleted;
-#line 1404 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1410 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_tmp14_) {
-#line 1405 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1411 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->delete_timer_id = (guint) 0;
-#line 7079 "DirectoryMonitor.c"
+#line 7111 "DirectoryMonitor.c"
}
-#line 1407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = any_deleted;
-#line 1407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 7085 "DirectoryMonitor.c"
+#line 7117 "DirectoryMonitor.c"
}
@@ -7096,21 +7128,21 @@ GFileInfo* directory_monitor_get_file_info (DirectoryMonitor* self, GFile* file)
DirectoryMonitorFileInfoMap* _tmp0_ = NULL;
GFile* _tmp1_ = NULL;
GFileInfo* _tmp2_ = NULL;
-#line 1411 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1417 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), NULL);
-#line 1411 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1417 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 1412 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->files;
-#line 1412 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = file;
-#line 1412 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = directory_monitor_file_info_map_get_info (_tmp0_, _tmp1_);
-#line 1412 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = _tmp2_;
-#line 1412 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 7108 "DirectoryMonitor.c"
+#line 7140 "DirectoryMonitor.c"
}
@@ -7118,17 +7150,17 @@ GeeCollection* directory_monitor_get_files (DirectoryMonitor* self) {
GeeCollection* result = NULL;
DirectoryMonitorFileInfoMap* _tmp0_ = NULL;
GeeCollection* _tmp1_ = NULL;
-#line 1417 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1423 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), NULL);
-#line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1424 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->files;
-#line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1424 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = directory_monitor_file_info_map_get_all (_tmp0_);
-#line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1424 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = _tmp1_;
-#line 1418 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1424 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 7126 "DirectoryMonitor.c"
+#line 7158 "DirectoryMonitor.c"
}
@@ -7138,23 +7170,23 @@ GFileInfo* directory_monitor_query_file_info (DirectoryMonitor* self, GFile* fil
GFile* _tmp1_ = NULL;
GCancellable* _tmp2_ = NULL;
GFileInfo* _tmp3_ = NULL;
-#line 1424 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1430 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (IS_DIRECTORY_MONITOR (self), NULL);
-#line 1424 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1430 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 1425 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->files;
-#line 1425 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = file;
-#line 1425 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = self->priv->cancellable;
-#line 1425 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = directory_monitor_file_info_map_query_info (_tmp0_, _tmp1_, _tmp2_);
-#line 1425 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = _tmp3_;
-#line 1425 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 7152 "DirectoryMonitor.c"
+#line 7184 "DirectoryMonitor.c"
}
@@ -7166,75 +7198,75 @@ gboolean directory_monitor_is_file_symlink_supported (GFileInfo* info) {
GFileInfo* _tmp2_ = NULL;
DirectoryMonitorFType _tmp3_ = 0;
DirectoryMonitorFType _tmp4_ = 0;
-#line 1435 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1441 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE);
-#line 1436 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = info;
-#line 1436 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = g_file_info_get_is_symlink (_tmp0_);
-#line 1436 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_tmp1_) {
-#line 1437 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1443 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = TRUE;
-#line 1437 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1443 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 7176 "DirectoryMonitor.c"
+#line 7208 "DirectoryMonitor.c"
}
-#line 1439 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = info;
-#line 1439 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = directory_monitor_get_ftype (_tmp2_);
-#line 1439 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
ftype = _tmp3_;
-#line 1440 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = ftype;
-#line 1440 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
switch (_tmp4_) {
-#line 1440 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 7190 "DirectoryMonitor.c"
+#line 7222 "DirectoryMonitor.c"
{
-#line 1442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1448 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = DIRECTORY_MONITOR_SUPPORT_DIR_SYMLINKS;
-#line 1442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1448 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 7196 "DirectoryMonitor.c"
+#line 7228 "DirectoryMonitor.c"
}
-#line 1440 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 7200 "DirectoryMonitor.c"
+#line 7232 "DirectoryMonitor.c"
{
-#line 1445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1451 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = DIRECTORY_MONITOR_SUPPORT_FILE_SYMLINKS;
-#line 1445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1451 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 7206 "DirectoryMonitor.c"
+#line 7238 "DirectoryMonitor.c"
}
default:
{
DirectoryMonitorFType _tmp5_ = 0;
-#line 1448 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1454 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = ftype;
-#line 1448 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1454 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp5_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
-#line 1450 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1456 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = FALSE;
-#line 1450 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 1456 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 7219 "DirectoryMonitor.c"
+#line 7251 "DirectoryMonitor.c"
}
}
}
static void directory_monitor_real_root_moved (DirectoryMonitor* self, GFile* old_root, GFile* new_root, GFileInfo* new_root_info) {
-#line 380 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 386 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (old_root));
-#line 380 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 386 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (new_root));
-#line 380 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 386 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (new_root_info));
-#line 7232 "DirectoryMonitor.c"
+#line 7264 "DirectoryMonitor.c"
}
@@ -7253,26 +7285,26 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_OBJECT (GClosure * closu
data1 = closure->data;
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
data2 = param_values->data[0].v_pointer;
-#line 7251 "DirectoryMonitor.c"
+#line 7283 "DirectoryMonitor.c"
} else {
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
data1 = param_values->data[0].v_pointer;
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
data2 = closure->data;
-#line 7257 "DirectoryMonitor.c"
+#line 7289 "DirectoryMonitor.c"
}
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
callback = (GMarshalFunc_VOID__OBJECT_OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.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 7263 "DirectoryMonitor.c"
+#line 7295 "DirectoryMonitor.c"
}
static void directory_monitor_real_root_deleted (DirectoryMonitor* self, GFile* root) {
-#line 388 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (root));
-#line 7270 "DirectoryMonitor.c"
+#line 7302 "DirectoryMonitor.c"
}
@@ -7281,11 +7313,11 @@ static void directory_monitor_real_discovery_started (DirectoryMonitor* self) {
static void directory_monitor_real_file_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info) {
-#line 394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 400 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 394 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 400 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (info));
-#line 7283 "DirectoryMonitor.c"
+#line 7315 "DirectoryMonitor.c"
}
@@ -7304,144 +7336,144 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
data1 = closure->data;
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
data2 = param_values->data[0].v_pointer;
-#line 7302 "DirectoryMonitor.c"
+#line 7334 "DirectoryMonitor.c"
} else {
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
data1 = param_values->data[0].v_pointer;
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
data2 = closure->data;
-#line 7308 "DirectoryMonitor.c"
+#line 7340 "DirectoryMonitor.c"
}
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 7314 "DirectoryMonitor.c"
+#line 7346 "DirectoryMonitor.c"
}
static void directory_monitor_real_directory_discovered (DirectoryMonitor* self, GFile* file, GFileInfo* info) {
-#line 397 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 403 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 397 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 403 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (info));
-#line 7323 "DirectoryMonitor.c"
+#line 7355 "DirectoryMonitor.c"
}
static void directory_monitor_real_discovery_failed (DirectoryMonitor* self, const gchar* reason) {
-#line 402 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 408 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (reason != NULL);
-#line 7330 "DirectoryMonitor.c"
+#line 7362 "DirectoryMonitor.c"
}
static void directory_monitor_real_discovery_completed (DirectoryMonitor* self) {
-#line 406 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 412 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->has_discovery_started = FALSE;
-#line 407 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_mdbg ("discovery completed");
-#line 7339 "DirectoryMonitor.c"
+#line 7371 "DirectoryMonitor.c"
}
static void directory_monitor_real_file_created (DirectoryMonitor* self, GFile* file, GFileInfo* info) {
-#line 410 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 416 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 410 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 416 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (info));
-#line 7348 "DirectoryMonitor.c"
+#line 7380 "DirectoryMonitor.c"
}
static void directory_monitor_real_file_moved (DirectoryMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info) {
-#line 413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 419 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (old_file));
-#line 413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 419 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (new_file));
-#line 413 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 419 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (new_file_info));
-#line 7359 "DirectoryMonitor.c"
+#line 7391 "DirectoryMonitor.c"
}
static void directory_monitor_real_file_altered (DirectoryMonitor* self, GFile* file) {
-#line 417 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 423 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 7366 "DirectoryMonitor.c"
+#line 7398 "DirectoryMonitor.c"
}
static void directory_monitor_real_file_alteration_completed (DirectoryMonitor* self, GFile* file, GFileInfo* info) {
-#line 422 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 428 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 422 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 428 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (info));
-#line 7375 "DirectoryMonitor.c"
+#line 7407 "DirectoryMonitor.c"
}
static void directory_monitor_real_file_attributes_altered (DirectoryMonitor* self, GFile* file) {
-#line 425 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 431 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 7382 "DirectoryMonitor.c"
+#line 7414 "DirectoryMonitor.c"
}
static void directory_monitor_real_file_deleted (DirectoryMonitor* self, GFile* file) {
-#line 428 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 434 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 7389 "DirectoryMonitor.c"
+#line 7421 "DirectoryMonitor.c"
}
static void directory_monitor_real_directory_created (DirectoryMonitor* self, GFile* dir, GFileInfo* info) {
-#line 432 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 438 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (dir));
-#line 432 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 438 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (info));
-#line 7398 "DirectoryMonitor.c"
+#line 7430 "DirectoryMonitor.c"
}
static void directory_monitor_real_directory_moved (DirectoryMonitor* self, GFile* old_dir, GFile* new_dir, GFileInfo* new_dir_info) {
-#line 436 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (old_dir));
-#line 436 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (new_dir));
-#line 436 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 442 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (new_dir_info));
-#line 7409 "DirectoryMonitor.c"
+#line 7441 "DirectoryMonitor.c"
}
static void directory_monitor_real_directory_altered (DirectoryMonitor* self, GFile* dir) {
-#line 440 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 446 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (dir));
-#line 7416 "DirectoryMonitor.c"
+#line 7448 "DirectoryMonitor.c"
}
static void directory_monitor_real_directory_alteration_completed (DirectoryMonitor* self, GFile* dir, GFileInfo* info) {
-#line 445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 451 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (dir));
-#line 445 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 451 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE_INFO (info));
-#line 7425 "DirectoryMonitor.c"
+#line 7457 "DirectoryMonitor.c"
}
static void directory_monitor_real_directory_attributes_altered (DirectoryMonitor* self, GFile* dir) {
-#line 448 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 454 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (dir));
-#line 7432 "DirectoryMonitor.c"
+#line 7464 "DirectoryMonitor.c"
}
static void directory_monitor_real_directory_deleted (DirectoryMonitor* self, GFile* dir) {
-#line 452 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 458 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (dir));
-#line 7439 "DirectoryMonitor.c"
+#line 7471 "DirectoryMonitor.c"
}
@@ -7508,21 +7540,21 @@ static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue
self->time_created_msec = _tmp8_;
#line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return self;
-#line 7506 "DirectoryMonitor.c"
+#line 7538 "DirectoryMonitor.c"
}
static DirectoryMonitorQueryInfoQueueElement* directory_monitor_query_info_queue_element_new (DirectoryMonitor* owner, GFile* file, GFile* other_file, GFileMonitorEvent event) {
#line 96 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return directory_monitor_query_info_queue_element_construct (DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT, owner, file, other_file, event);
-#line 7513 "DirectoryMonitor.c"
+#line 7545 "DirectoryMonitor.c"
}
static gpointer _g_error_copy0 (gpointer self) {
-#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return self ? g_error_copy (self) : NULL;
-#line 7520 "DirectoryMonitor.c"
+#line 7552 "DirectoryMonitor.c"
}
@@ -7530,7 +7562,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
GFile* source_file = NULL;
GObject* _tmp0_ = NULL;
GFile* _tmp1_ = NULL;
- DirectoryMonitor* _tmp8_ = NULL;
+ DirectoryMonitor* _tmp16_ = NULL;
GError * _inner_error_ = NULL;
#line 106 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (DIRECTORY_MONITOR_IS_QUERY_INFO_QUEUE_ELEMENT (self));
@@ -7544,12 +7576,16 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_file_get_type (), GFile));
#line 107 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
source_file = _tmp1_;
-#line 7542 "DirectoryMonitor.c"
+#line 7574 "DirectoryMonitor.c"
{
GFileInfo* _tmp2_ = NULL;
GAsyncResult* _tmp3_ = NULL;
GFileInfo* _tmp4_ = NULL;
GFileInfo* _tmp5_ = NULL;
+ GFileInfo* _tmp6_ = NULL;
+ gchar* _tmp7_ = NULL;
+ gchar* _tmp8_ = NULL;
+ gboolean _tmp9_ = FALSE;
#line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = aresult;
#line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7558,7 +7594,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
_tmp2_ = _tmp4_;
#line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7556 "DirectoryMonitor.c"
+#line 7592 "DirectoryMonitor.c"
goto __catch483_g_error;
}
#line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7569,31 +7605,62 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
_g_object_unref0 (self->info);
#line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->info = _tmp5_;
+#line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _tmp6_ = self->info;
+#line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _tmp7_ = get_file_info_id (_tmp6_);
+#line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _tmp8_ = _tmp7_;
+#line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _tmp9_ = _tmp8_ == NULL;
+#line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _g_free0 (_tmp8_);
+#line 112 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ if (_tmp9_) {
+#line 7615 "DirectoryMonitor.c"
+ GFileInfo* _tmp10_ = NULL;
+ GFile* _tmp11_ = NULL;
+ gchar* _tmp12_ = NULL;
+ gchar* _tmp13_ = NULL;
+#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _tmp10_ = self->info;
+#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _tmp11_ = self->file;
+#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _tmp12_ = g_file_get_uri (_tmp11_);
+#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _tmp13_ = _tmp12_;
+#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ g_file_info_set_attribute_string (_tmp10_, G_FILE_ATTRIBUTE_ID_FILE, _tmp13_);
+#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _g_free0 (_tmp13_);
+#line 7632 "DirectoryMonitor.c"
+ }
#line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_tmp2_);
-#line 7569 "DirectoryMonitor.c"
+#line 7636 "DirectoryMonitor.c"
}
goto __finally483;
__catch483_g_error:
{
GError* err = NULL;
- GError* _tmp6_ = NULL;
- GError* _tmp7_ = NULL;
+ GError* _tmp14_ = NULL;
+ GError* _tmp15_ = NULL;
#line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
err = _inner_error_;
#line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_inner_error_ = NULL;
-#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _tmp6_ = err;
-#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _tmp7_ = _g_error_copy0 (_tmp6_);
-#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _tmp14_ = err;
+#line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _tmp15_ = _g_error_copy0 (_tmp14_);
+#line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_error_free0 (self->err);
-#line 113 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- self->err = _tmp7_;
+#line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ self->err = _tmp15_;
#line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_error_free0 (err);
-#line 7591 "DirectoryMonitor.c"
+#line 7658 "DirectoryMonitor.c"
}
__finally483:
#line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7606,24 +7673,24 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
g_clear_error (&_inner_error_);
#line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return;
-#line 7604 "DirectoryMonitor.c"
+#line 7671 "DirectoryMonitor.c"
}
-#line 117 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 121 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->completed = TRUE;
-#line 120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _tmp8_ = self->owner;
-#line 120 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- directory_monitor_process_query_queue (_tmp8_, self);
+#line 124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _tmp16_ = self->owner;
+#line 124 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ directory_monitor_process_query_queue (_tmp16_, self);
#line 106 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (source_file);
-#line 7614 "DirectoryMonitor.c"
+#line 7681 "DirectoryMonitor.c"
}
static void directory_monitor_value_query_info_queue_element_init (GValue* value) {
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
value->data[0].v_pointer = NULL;
-#line 7621 "DirectoryMonitor.c"
+#line 7688 "DirectoryMonitor.c"
}
@@ -7632,7 +7699,7 @@ static void directory_monitor_value_query_info_queue_element_free_value (GValue*
if (value->data[0].v_pointer) {
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_query_info_queue_element_unref (value->data[0].v_pointer);
-#line 7630 "DirectoryMonitor.c"
+#line 7697 "DirectoryMonitor.c"
}
}
@@ -7642,11 +7709,11 @@ static void directory_monitor_value_query_info_queue_element_copy_value (const G
if (src_value->data[0].v_pointer) {
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
dest_value->data[0].v_pointer = directory_monitor_query_info_queue_element_ref (src_value->data[0].v_pointer);
-#line 7640 "DirectoryMonitor.c"
+#line 7707 "DirectoryMonitor.c"
} else {
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
dest_value->data[0].v_pointer = NULL;
-#line 7644 "DirectoryMonitor.c"
+#line 7711 "DirectoryMonitor.c"
}
}
@@ -7654,37 +7721,37 @@ static void directory_monitor_value_query_info_queue_element_copy_value (const G
static gpointer directory_monitor_value_query_info_queue_element_peek_pointer (const GValue* value) {
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return value->data[0].v_pointer;
-#line 7652 "DirectoryMonitor.c"
+#line 7719 "DirectoryMonitor.c"
}
static gchar* directory_monitor_value_query_info_queue_element_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (collect_values[0].v_pointer) {
-#line 7659 "DirectoryMonitor.c"
+#line 7726 "DirectoryMonitor.c"
DirectoryMonitorQueryInfoQueueElement* object;
object = collect_values[0].v_pointer;
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (object->parent_instance.g_class == NULL) {
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 7666 "DirectoryMonitor.c"
+#line 7733 "DirectoryMonitor.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.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 7670 "DirectoryMonitor.c"
+#line 7737 "DirectoryMonitor.c"
}
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
value->data[0].v_pointer = directory_monitor_query_info_queue_element_ref (object);
-#line 7674 "DirectoryMonitor.c"
+#line 7741 "DirectoryMonitor.c"
} else {
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
value->data[0].v_pointer = NULL;
-#line 7678 "DirectoryMonitor.c"
+#line 7745 "DirectoryMonitor.c"
}
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return NULL;
-#line 7682 "DirectoryMonitor.c"
+#line 7749 "DirectoryMonitor.c"
}
@@ -7695,25 +7762,25 @@ static gchar* directory_monitor_value_query_info_queue_element_lcopy_value (cons
if (!object_p) {
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 7693 "DirectoryMonitor.c"
+#line 7760 "DirectoryMonitor.c"
}
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!value->data[0].v_pointer) {
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
*object_p = NULL;
-#line 7699 "DirectoryMonitor.c"
+#line 7766 "DirectoryMonitor.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
*object_p = value->data[0].v_pointer;
-#line 7703 "DirectoryMonitor.c"
+#line 7770 "DirectoryMonitor.c"
} else {
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
*object_p = directory_monitor_query_info_queue_element_ref (value->data[0].v_pointer);
-#line 7707 "DirectoryMonitor.c"
+#line 7774 "DirectoryMonitor.c"
}
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return NULL;
-#line 7711 "DirectoryMonitor.c"
+#line 7778 "DirectoryMonitor.c"
}
@@ -7727,7 +7794,7 @@ static GParamSpec* directory_monitor_param_spec_query_info_queue_element (const
G_PARAM_SPEC (spec)->value_type = object_type;
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return G_PARAM_SPEC (spec);
-#line 7725 "DirectoryMonitor.c"
+#line 7792 "DirectoryMonitor.c"
}
@@ -7736,7 +7803,7 @@ static gpointer directory_monitor_value_get_query_info_queue_element (const GVal
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT), NULL);
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return value->data[0].v_pointer;
-#line 7734 "DirectoryMonitor.c"
+#line 7801 "DirectoryMonitor.c"
}
@@ -7756,17 +7823,17 @@ static void directory_monitor_value_set_query_info_queue_element (GValue* value,
value->data[0].v_pointer = v_object;
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_query_info_queue_element_ref (value->data[0].v_pointer);
-#line 7754 "DirectoryMonitor.c"
+#line 7821 "DirectoryMonitor.c"
} else {
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
value->data[0].v_pointer = NULL;
-#line 7758 "DirectoryMonitor.c"
+#line 7825 "DirectoryMonitor.c"
}
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (old) {
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_query_info_queue_element_unref (old);
-#line 7764 "DirectoryMonitor.c"
+#line 7831 "DirectoryMonitor.c"
}
}
@@ -7785,17 +7852,17 @@ static void directory_monitor_value_take_query_info_queue_element (GValue* value
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
value->data[0].v_pointer = v_object;
-#line 7783 "DirectoryMonitor.c"
+#line 7850 "DirectoryMonitor.c"
} else {
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
value->data[0].v_pointer = NULL;
-#line 7787 "DirectoryMonitor.c"
+#line 7854 "DirectoryMonitor.c"
}
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (old) {
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_query_info_queue_element_unref (old);
-#line 7793 "DirectoryMonitor.c"
+#line 7860 "DirectoryMonitor.c"
}
}
@@ -7805,7 +7872,7 @@ static void directory_monitor_query_info_queue_element_class_init (DirectoryMoni
directory_monitor_query_info_queue_element_parent_class = g_type_class_peek_parent (klass);
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
((DirectoryMonitorQueryInfoQueueElementClass *) klass)->finalize = directory_monitor_query_info_queue_element_finalize;
-#line 7803 "DirectoryMonitor.c"
+#line 7870 "DirectoryMonitor.c"
}
@@ -7818,7 +7885,7 @@ static void directory_monitor_query_info_queue_element_instance_init (DirectoryM
self->completed = FALSE;
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->ref_count = 1;
-#line 7816 "DirectoryMonitor.c"
+#line 7883 "DirectoryMonitor.c"
}
@@ -7838,7 +7905,7 @@ static void directory_monitor_query_info_queue_element_finalize (DirectoryMonito
_g_object_unref0 (self->info);
#line 93 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_error_free0 (self->err);
-#line 7836 "DirectoryMonitor.c"
+#line 7903 "DirectoryMonitor.c"
}
@@ -7863,7 +7930,7 @@ static gpointer directory_monitor_query_info_queue_element_ref (gpointer instanc
g_atomic_int_inc (&self->ref_count);
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return instance;
-#line 7861 "DirectoryMonitor.c"
+#line 7928 "DirectoryMonitor.c"
}
@@ -7876,25 +7943,25 @@ static void directory_monitor_query_info_queue_element_unref (gpointer instance)
DIRECTORY_MONITOR_QUERY_INFO_QUEUE_ELEMENT_GET_CLASS (self)->finalize (self);
#line 83 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 7874 "DirectoryMonitor.c"
+#line 7941 "DirectoryMonitor.c"
}
}
static DirectoryMonitorFileInfoMap* directory_monitor_file_info_map_construct (GType object_type) {
DirectoryMonitorFileInfoMap* self = NULL;
-#line 134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 138 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self = (DirectoryMonitorFileInfoMap*) g_type_create_instance (object_type);
-#line 134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 138 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return self;
-#line 7885 "DirectoryMonitor.c"
+#line 7952 "DirectoryMonitor.c"
}
static DirectoryMonitorFileInfoMap* directory_monitor_file_info_map_new (void) {
-#line 134 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 138 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return directory_monitor_file_info_map_construct (DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP);
-#line 7892 "DirectoryMonitor.c"
+#line 7959 "DirectoryMonitor.c"
}
@@ -7919,198 +7986,198 @@ static gboolean directory_monitor_file_info_map_normalize_file (DirectoryMonitor
GFile* _tmp15_ = NULL;
GFile* _tmp16_ = NULL;
GFile* _tmp19_ = NULL;
-#line 137 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE);
-#line 137 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 137 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail ((info == NULL) || G_IS_FILE_INFO (info), FALSE);
-#line 140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = info;
-#line 140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 140 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
local_info = _tmp1_;
-#line 141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 145 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = local_info;
-#line 141 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 145 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp2_ == NULL) {
-#line 7933 "DirectoryMonitor.c"
+#line 8000 "DirectoryMonitor.c"
GeeHashMap* _tmp3_ = NULL;
GFile* _tmp4_ = NULL;
gpointer _tmp5_ = NULL;
GFileInfo* _tmp6_ = NULL;
-#line 142 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = self->priv->map;
-#line 142 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = file;
-#line 142 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
-#line 142 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (local_info);
-#line 142 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 146 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
local_info = (GFileInfo*) _tmp5_;
-#line 143 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = local_info;
-#line 143 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp6_ == NULL) {
-#line 144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 148 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_vala_normalized);
-#line 144 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 148 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_normalized = NULL;
-#line 145 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_vala_id);
-#line 145 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 149 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_id = NULL;
-#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = FALSE;
-#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (local_info);
-#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (normalized) {
-#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
*normalized = _vala_normalized;
-#line 7968 "DirectoryMonitor.c"
+#line 8035 "DirectoryMonitor.c"
} else {
-#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_vala_normalized);
-#line 7972 "DirectoryMonitor.c"
+#line 8039 "DirectoryMonitor.c"
}
-#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (id) {
-#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
*id = _vala_id;
-#line 7978 "DirectoryMonitor.c"
+#line 8045 "DirectoryMonitor.c"
} else {
-#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_vala_id);
-#line 7982 "DirectoryMonitor.c"
+#line 8049 "DirectoryMonitor.c"
}
-#line 147 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 7986 "DirectoryMonitor.c"
+#line 8053 "DirectoryMonitor.c"
}
}
-#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = local_info;
-#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = get_file_info_id (_tmp7_);
-#line 151 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 155 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
file_id = _tmp8_;
-#line 152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = file_id;
-#line 152 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp9_ == NULL) {
-#line 153 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_vala_normalized);
-#line 153 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 157 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_normalized = NULL;
-#line 154 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_vala_id);
-#line 154 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 158 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_id = NULL;
-#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = FALSE;
-#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (file_id);
-#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (local_info);
-#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (normalized) {
-#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
*normalized = _vala_normalized;
-#line 8017 "DirectoryMonitor.c"
+#line 8084 "DirectoryMonitor.c"
} else {
-#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_vala_normalized);
-#line 8021 "DirectoryMonitor.c"
+#line 8088 "DirectoryMonitor.c"
}
-#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (id) {
-#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
*id = _vala_id;
-#line 8027 "DirectoryMonitor.c"
+#line 8094 "DirectoryMonitor.c"
} else {
-#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_vala_id);
-#line 8031 "DirectoryMonitor.c"
+#line 8098 "DirectoryMonitor.c"
}
-#line 156 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 160 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8035 "DirectoryMonitor.c"
+#line 8102 "DirectoryMonitor.c"
}
-#line 159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = self->priv->id_map;
-#line 159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp11_ = file_id;
-#line 159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp12_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_);
-#line 159 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 163 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
known_file = (GFile*) _tmp12_;
-#line 161 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp13_ = file_id;
-#line 161 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp14_ = g_strdup ((const gchar*) _tmp13_);
-#line 161 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_vala_id);
-#line 161 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 165 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_id = _tmp14_;
-#line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp16_ = known_file;
-#line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp16_ != NULL) {
-#line 8057 "DirectoryMonitor.c"
+#line 8124 "DirectoryMonitor.c"
GFile* _tmp17_ = NULL;
-#line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp17_ = known_file;
-#line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp15_ = _tmp17_;
-#line 8063 "DirectoryMonitor.c"
+#line 8130 "DirectoryMonitor.c"
} else {
GFile* _tmp18_ = NULL;
-#line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp18_ = file;
-#line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp15_ = _tmp18_;
-#line 8070 "DirectoryMonitor.c"
+#line 8137 "DirectoryMonitor.c"
}
-#line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp19_ = _g_object_ref0 (_tmp15_);
-#line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_vala_normalized);
-#line 162 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 166 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_normalized = _tmp19_;
-#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = TRUE;
-#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (known_file);
-#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (file_id);
-#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (local_info);
-#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (normalized) {
-#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
*normalized = _vala_normalized;
-#line 8090 "DirectoryMonitor.c"
+#line 8157 "DirectoryMonitor.c"
} else {
-#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_vala_normalized);
-#line 8094 "DirectoryMonitor.c"
+#line 8161 "DirectoryMonitor.c"
}
-#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (id) {
-#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
*id = _vala_id;
-#line 8100 "DirectoryMonitor.c"
+#line 8167 "DirectoryMonitor.c"
} else {
-#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_vala_id);
-#line 8104 "DirectoryMonitor.c"
+#line 8171 "DirectoryMonitor.c"
}
-#line 164 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 168 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8108 "DirectoryMonitor.c"
+#line 8175 "DirectoryMonitor.c"
}
@@ -8137,145 +8204,145 @@ static gboolean directory_monitor_file_info_map_update (DirectoryMonitorFileInfo
GeeHashMap* _tmp26_ = NULL;
const gchar* _tmp27_ = NULL;
GFile* _tmp28_ = NULL;
-#line 167 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE);
-#line 167 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 167 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE);
-#line 169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 173 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->map;
-#line 169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 173 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = file;
-#line 169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 173 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 169 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 173 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp2_) {
-#line 8149 "DirectoryMonitor.c"
+#line 8216 "DirectoryMonitor.c"
gboolean removed = FALSE;
GeeHashMap* _tmp3_ = NULL;
GFile* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
gboolean _tmp6_ = FALSE;
-#line 170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = self->priv->map;
-#line 170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = file;
-#line 170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, NULL);
-#line 170 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 174 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
removed = _tmp5_;
-#line 171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 175 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = removed;
-#line 171 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 175 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp6_, "removed");
-#line 8167 "DirectoryMonitor.c"
+#line 8234 "DirectoryMonitor.c"
}
-#line 175 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = info;
-#line 175 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = get_file_info_id (_tmp7_);
-#line 175 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 179 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
existing_id = _tmp8_;
-#line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = existing_id;
-#line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp10_ != NULL) {
-#line 8179 "DirectoryMonitor.c"
+#line 8246 "DirectoryMonitor.c"
GeeHashMap* _tmp11_ = NULL;
const gchar* _tmp12_ = NULL;
gboolean _tmp13_ = FALSE;
-#line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp11_ = self->priv->id_map;
-#line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp12_ = existing_id;
-#line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp13_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_);
-#line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = _tmp13_;
-#line 8191 "DirectoryMonitor.c"
+#line 8258 "DirectoryMonitor.c"
} else {
-#line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = FALSE;
-#line 8195 "DirectoryMonitor.c"
+#line 8262 "DirectoryMonitor.c"
}
-#line 176 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 180 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp9_) {
-#line 8199 "DirectoryMonitor.c"
+#line 8266 "DirectoryMonitor.c"
gboolean removed = FALSE;
GeeHashMap* _tmp14_ = NULL;
const gchar* _tmp15_ = NULL;
gboolean _tmp16_ = FALSE;
gboolean _tmp17_ = FALSE;
-#line 177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 181 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp14_ = self->priv->id_map;
-#line 177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 181 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp15_ = existing_id;
-#line 177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 181 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp16_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_, NULL);
-#line 177 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 181 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
removed = _tmp16_;
-#line 178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 182 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp17_ = removed;
-#line 178 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 182 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp17_, "removed");
-#line 8217 "DirectoryMonitor.c"
+#line 8284 "DirectoryMonitor.c"
}
-#line 183 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp18_ = file;
-#line 183 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp19_ = info;
-#line 183 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp22_ = directory_monitor_file_info_map_normalize_file (self, _tmp18_, _tmp19_, &_tmp20_, &_tmp21_);
-#line 183 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (normalized);
-#line 183 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
normalized = _tmp20_;
-#line 183 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 183 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
id = _tmp21_;
-#line 183 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_tmp22_) {
-#line 184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = FALSE;
-#line 184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (normalized);
-#line 184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (existing_id);
-#line 184 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 188 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8245 "DirectoryMonitor.c"
+#line 8312 "DirectoryMonitor.c"
}
-#line 186 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 190 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp23_ = self->priv->map;
-#line 186 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 190 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp24_ = normalized;
-#line 186 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 190 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp25_ = info;
-#line 186 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 190 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_, _tmp25_);
-#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp26_ = self->priv->id_map;
-#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp27_ = id;
-#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp28_ = normalized;
-#line 187 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 191 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_, _tmp28_);
-#line 189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 193 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = TRUE;
-#line 189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 193 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (normalized);
-#line 189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 193 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 193 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (existing_id);
-#line 189 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 193 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8273 "DirectoryMonitor.c"
+#line 8340 "DirectoryMonitor.c"
}
@@ -8292,114 +8359,114 @@ static gboolean directory_monitor_file_info_map_remove (DirectoryMonitorFileInfo
GFile* _tmp6_ = NULL;
GeeHashMap* _tmp7_ = NULL;
const gchar* _tmp8_ = NULL;
-#line 192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE);
-#line 192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 192 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail ((info == NULL) || G_IS_FILE_INFO (info), FALSE);
-#line 195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = file;
-#line 195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = info;
-#line 195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = directory_monitor_file_info_map_normalize_file (self, _tmp0_, _tmp1_, &_tmp2_, &_tmp3_);
-#line 195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (normalized);
-#line 195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
normalized = _tmp2_;
-#line 195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
id = _tmp3_;
-#line 195 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_tmp4_) {
-#line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 200 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = FALSE;
-#line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 200 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (normalized);
-#line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 200 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 196 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 200 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8320 "DirectoryMonitor.c"
+#line 8387 "DirectoryMonitor.c"
}
-#line 198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = self->priv->map;
-#line 198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = normalized;
-#line 198 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 202 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_, NULL);
-#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 203 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = self->priv->id_map;
-#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 203 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = id;
-#line 199 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 203 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_, NULL);
-#line 201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 205 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = TRUE;
-#line 201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 205 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (normalized);
-#line 201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 205 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 201 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 205 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8342 "DirectoryMonitor.c"
+#line 8409 "DirectoryMonitor.c"
}
static void directory_monitor_file_info_map_remove_all (DirectoryMonitorFileInfoMap* self, GeeCollection* files) {
-#line 206 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 210 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self));
-#line 206 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 210 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (GEE_IS_COLLECTION (files));
-#line 8351 "DirectoryMonitor.c"
+#line 8418 "DirectoryMonitor.c"
{
GeeIterator* _file_it = NULL;
GeeCollection* _tmp0_ = NULL;
GeeIterator* _tmp1_ = NULL;
-#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = files;
-#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_file_it = _tmp1_;
-#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
while (TRUE) {
-#line 8364 "DirectoryMonitor.c"
+#line 8431 "DirectoryMonitor.c"
GeeIterator* _tmp2_ = NULL;
gboolean _tmp3_ = FALSE;
GFile* file = NULL;
GeeIterator* _tmp4_ = NULL;
gpointer _tmp5_ = NULL;
GFile* _tmp6_ = NULL;
-#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _file_it;
-#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = gee_iterator_next (_tmp2_);
-#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_tmp3_) {
-#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 8379 "DirectoryMonitor.c"
+#line 8446 "DirectoryMonitor.c"
}
-#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = _file_it;
-#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = gee_iterator_get (_tmp4_);
-#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
file = (GFile*) _tmp5_;
-#line 208 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 212 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = file;
-#line 208 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 212 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_file_info_map_remove (self, _tmp6_, NULL);
-#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (file);
-#line 8393 "DirectoryMonitor.c"
+#line 8460 "DirectoryMonitor.c"
}
-#line 207 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_file_it);
-#line 8397 "DirectoryMonitor.c"
+#line 8464 "DirectoryMonitor.c"
}
}
@@ -8416,53 +8483,53 @@ static gboolean directory_monitor_file_info_map_contains (DirectoryMonitorFileIn
GeeHashMap* _tmp5_ = NULL;
const gchar* _tmp6_ = NULL;
gboolean _tmp7_ = FALSE;
-#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), FALSE);
-#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 211 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail ((info == NULL) || G_IS_FILE_INFO (info), FALSE);
-#line 214 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = file;
-#line 214 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = info;
-#line 214 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = directory_monitor_file_info_map_normalize_file (self, _tmp0_, _tmp1_, &_tmp2_, &_tmp3_);
-#line 214 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (normalized);
-#line 214 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
normalized = _tmp2_;
-#line 214 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 214 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
id = _tmp3_;
-#line 214 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 218 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_tmp4_) {
-#line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = FALSE;
-#line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (normalized);
-#line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 215 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 219 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8444 "DirectoryMonitor.c"
+#line 8511 "DirectoryMonitor.c"
}
-#line 217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = self->priv->id_map;
-#line 217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = id;
-#line 217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_);
-#line 217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = _tmp7_;
-#line 217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (normalized);
-#line 217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 217 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 221 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8460 "DirectoryMonitor.c"
+#line 8527 "DirectoryMonitor.c"
}
@@ -8475,60 +8542,60 @@ static gchar* directory_monitor_file_info_map_get_id (DirectoryMonitorFileInfoMa
GFile* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
gboolean _tmp6_ = FALSE;
-#line 220 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 224 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL);
-#line 220 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 224 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 220 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 224 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail ((info == NULL) || G_IS_FILE_INFO (info), NULL);
-#line 222 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 226 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = info;
-#line 222 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 226 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp0_ != NULL) {
-#line 8483 "DirectoryMonitor.c"
+#line 8550 "DirectoryMonitor.c"
GFileInfo* _tmp1_ = NULL;
gchar* _tmp2_ = NULL;
-#line 223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = info;
-#line 223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = get_file_info_id (_tmp1_);
-#line 223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = _tmp2_;
-#line 223 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8494 "DirectoryMonitor.c"
+#line 8561 "DirectoryMonitor.c"
}
-#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = file;
-#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = directory_monitor_file_info_map_normalize_file (self, _tmp3_, NULL, &_tmp4_, &_tmp5_);
-#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (normalized);
-#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
normalized = _tmp4_;
-#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
id = _tmp5_;
-#line 227 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 231 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_tmp6_) {
-#line 228 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = NULL;
-#line 228 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (normalized);
-#line 228 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 228 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 232 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8518 "DirectoryMonitor.c"
+#line 8585 "DirectoryMonitor.c"
}
-#line 230 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = id;
-#line 230 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (normalized);
-#line 230 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8526 "DirectoryMonitor.c"
+#line 8593 "DirectoryMonitor.c"
}
@@ -8537,19 +8604,19 @@ static GeeCollection* directory_monitor_file_info_map_get_all (DirectoryMonitorF
GeeHashMap* _tmp0_ = NULL;
GeeSet* _tmp1_ = NULL;
GeeSet* _tmp2_ = NULL;
-#line 233 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 237 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL);
-#line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->map;
-#line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _tmp1_;
-#line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 234 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 238 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8547 "DirectoryMonitor.c"
+#line 8614 "DirectoryMonitor.c"
}
@@ -8569,71 +8636,71 @@ static GFileInfo* directory_monitor_file_info_map_get_info (DirectoryMonitorFile
GeeHashMap* _tmp8_ = NULL;
GFile* _tmp9_ = NULL;
gpointer _tmp10_ = NULL;
-#line 237 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL);
-#line 237 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 243 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->map;
-#line 239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 243 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = file;
-#line 239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 243 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 239 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 243 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
info = (GFileInfo*) _tmp2_;
-#line 240 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 244 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = info;
-#line 240 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 244 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp3_ != NULL) {
-#line 241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = info;
-#line 241 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8587 "DirectoryMonitor.c"
+#line 8654 "DirectoryMonitor.c"
}
-#line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = file;
-#line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = directory_monitor_file_info_map_normalize_file (self, _tmp4_, NULL, &_tmp5_, &_tmp6_);
-#line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (normalized);
-#line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
normalized = _tmp5_;
-#line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
id = _tmp6_;
-#line 245 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 249 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_tmp7_) {
-#line 246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = NULL;
-#line 246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (normalized);
-#line 246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (info);
-#line 246 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 250 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8613 "DirectoryMonitor.c"
+#line 8680 "DirectoryMonitor.c"
}
-#line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = self->priv->map;
-#line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = normalized;
-#line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_);
-#line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = (GFileInfo*) _tmp10_;
-#line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (normalized);
-#line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (info);
-#line 248 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8631 "DirectoryMonitor.c"
+#line 8698 "DirectoryMonitor.c"
}
@@ -8651,35 +8718,35 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
gchar* _tmp17_ = NULL;
const gchar* _tmp18_ = NULL;
GFile* normalized = NULL;
- GeeHashMap* _tmp19_ = NULL;
- const gchar* _tmp20_ = NULL;
- gpointer _tmp21_ = NULL;
- GFile* _tmp22_ = NULL;
GeeHashMap* _tmp23_ = NULL;
- GFile* _tmp24_ = NULL;
+ const gchar* _tmp24_ = NULL;
gpointer _tmp25_ = NULL;
+ GFile* _tmp26_ = NULL;
+ GeeHashMap* _tmp27_ = NULL;
+ GFile* _tmp28_ = NULL;
+ gpointer _tmp29_ = NULL;
GError * _inner_error_ = NULL;
-#line 251 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL);
-#line 251 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 251 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 255 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable), NULL);
-#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 256 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = file;
-#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 256 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = directory_monitor_file_info_map_get_info (self, _tmp0_);
-#line 252 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 256 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
info = _tmp1_;
-#line 253 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 257 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = info;
-#line 253 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 257 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp2_ != NULL) {
-#line 254 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = info;
-#line 254 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8677 "DirectoryMonitor.c"
+#line 8744 "DirectoryMonitor.c"
}
{
GFileInfo* _tmp3_ = NULL;
@@ -8687,30 +8754,30 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
GCancellable* _tmp5_ = NULL;
GFileInfo* _tmp6_ = NULL;
GFileInfo* _tmp7_ = NULL;
-#line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = file;
-#line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = cancellable;
-#line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = g_file_query_info (_tmp4_, G_FILE_ATTRIBUTE_ID_FILE, DIRECTORY_MONITOR_UNKNOWN_INFO_FLAGS, _tmp5_, &_inner_error_);
-#line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = _tmp6_;
-#line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8695 "DirectoryMonitor.c"
+#line 8762 "DirectoryMonitor.c"
goto __catch484_g_error;
}
-#line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = _tmp3_;
-#line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = NULL;
-#line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (info);
-#line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
info = _tmp7_;
-#line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_tmp3_);
-#line 8708 "DirectoryMonitor.c"
+#line 8775 "DirectoryMonitor.c"
}
goto __finally484;
__catch484_g_error:
@@ -8721,124 +8788,133 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
gchar* _tmp10_ = NULL;
GError* _tmp11_ = NULL;
const gchar* _tmp12_ = NULL;
-#line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
err = _inner_error_;
-#line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_inner_error_ = NULL;
-#line 261 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = file;
-#line 261 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = g_file_get_path (_tmp8_);
-#line 261 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = _tmp9_;
-#line 261 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp11_ = err;
-#line 261 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp12_ = _tmp11_->message;
-#line 261 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- g_warning ("DirectoryMonitor.vala:261: Unable to query file ID of %s: %s", _tmp10_, _tmp12_);
-#line 261 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ g_warning ("DirectoryMonitor.vala:265: Unable to query file ID of %s: %s", _tmp10_, _tmp12_);
+#line 265 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp10_);
-#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = NULL;
-#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_error_free0 (err);
-#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (info);
-#line 263 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8745 "DirectoryMonitor.c"
+#line 8812 "DirectoryMonitor.c"
}
__finally484:
-#line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (info);
-#line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.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 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_clear_error (&_inner_error_);
-#line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 262 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return NULL;
-#line 8758 "DirectoryMonitor.c"
+#line 8825 "DirectoryMonitor.c"
}
-#line 266 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 270 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp13_ = info;
-#line 266 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _tmp14_ = directory_monitor_is_file_symlink_supported (_tmp13_);
-#line 266 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- if (!_tmp14_) {
-#line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- result = NULL;
-#line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _g_object_unref0 (info);
-#line 267 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- return result;
-#line 8772 "DirectoryMonitor.c"
- }
-#line 269 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _tmp15_ = info;
-#line 269 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _tmp16_ = g_file_info_get_attribute_string (_tmp15_, G_FILE_ATTRIBUTE_ID_FILE);
-#line 269 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _tmp17_ = g_strdup (_tmp16_);
-#line 269 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- id = _tmp17_;
#line 270 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _tmp18_ = id;
+ _tmp14_ = directory_monitor_is_file_symlink_supported (_tmp13_);
#line 270 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- if (_tmp18_ == NULL) {
+ if (!_tmp14_) {
#line 271 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = NULL;
#line 271 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _g_free0 (id);
-#line 271 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (info);
#line 271 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8794 "DirectoryMonitor.c"
+#line 8839 "DirectoryMonitor.c"
}
#line 273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _tmp19_ = self->priv->id_map;
+ _tmp15_ = info;
#line 273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _tmp20_ = id;
+ _tmp16_ = g_file_info_get_attribute_string (_tmp15_, G_FILE_ATTRIBUTE_ID_FILE);
#line 273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _tmp21_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_);
+ _tmp17_ = g_strdup (_tmp16_);
#line 273 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- normalized = (GFile*) _tmp21_;
+ id = _tmp17_;
#line 274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _tmp22_ = normalized;
+ _tmp18_ = id;
#line 274 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- if (_tmp22_ == NULL) {
+ if (_tmp18_ == NULL) {
+#line 8853 "DirectoryMonitor.c"
+ GFileInfo* _tmp19_ = NULL;
+ GFile* _tmp20_ = NULL;
+ gchar* _tmp21_ = NULL;
+ gchar* _tmp22_ = NULL;
#line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- result = NULL;
+ _tmp19_ = info;
#line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _g_object_unref0 (normalized);
+ _tmp20_ = file;
#line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _g_free0 (id);
+ _tmp21_ = g_file_get_uri (_tmp20_);
#line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _g_object_unref0 (info);
+ _tmp22_ = _tmp21_;
#line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- return result;
-#line 8818 "DirectoryMonitor.c"
+ g_file_info_set_attribute_string (_tmp19_, G_FILE_ATTRIBUTE_ID_FILE, _tmp22_);
+#line 275 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _g_free0 (_tmp22_);
+#line 8870 "DirectoryMonitor.c"
}
-#line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _tmp23_ = self->priv->map;
-#line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- _tmp24_ = file;
-#line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _tmp23_ = self->priv->id_map;
+#line 279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _tmp24_ = id;
+#line 279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp25_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_);
-#line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
- result = (GFileInfo*) _tmp25_;
-#line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 279 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ normalized = (GFile*) _tmp25_;
+#line 280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _tmp26_ = normalized;
+#line 280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ if (_tmp26_ == NULL) {
+#line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ result = NULL;
+#line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _g_object_unref0 (normalized);
+#line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _g_free0 (id);
+#line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _g_object_unref0 (info);
+#line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ return result;
+#line 8894 "DirectoryMonitor.c"
+ }
+#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _tmp27_ = self->priv->map;
+#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _tmp28_ = file;
+#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ _tmp29_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp28_);
+#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+ result = (GFileInfo*) _tmp29_;
+#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (normalized);
-#line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (id);
-#line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (info);
-#line 277 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8836 "DirectoryMonitor.c"
+#line 8912 "DirectoryMonitor.c"
}
@@ -8854,41 +8930,41 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
GTimeVal match_time = {0};
GFileInfo* _tmp5_ = NULL;
GTimeVal _tmp6_ = {0};
-#line 280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 286 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), NULL);
-#line 280 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 286 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE_INFO (match), NULL);
-#line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = match;
-#line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = get_file_info_id (_tmp0_);
-#line 281 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
match_id = _tmp1_;
-#line 282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = match_id;
-#line 282 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 288 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp2_ == NULL) {
-#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = NULL;
-#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (match_id);
-#line 283 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8872 "DirectoryMonitor.c"
+#line 8948 "DirectoryMonitor.c"
}
-#line 286 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 292 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = match;
-#line 286 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 292 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = g_file_info_get_size (_tmp3_);
-#line 286 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 292 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
match_size = _tmp4_;
-#line 287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = match;
-#line 287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_file_info_get_modification_time (_tmp5_, &_tmp6_);
-#line 287 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
match_time = _tmp6_;
-#line 8886 "DirectoryMonitor.c"
+#line 8962 "DirectoryMonitor.c"
{
GeeIterator* _file_it = NULL;
GeeHashMap* _tmp7_ = NULL;
@@ -8897,25 +8973,25 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
GeeSet* _tmp10_ = NULL;
GeeIterator* _tmp11_ = NULL;
GeeIterator* _tmp12_ = NULL;
-#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = self->priv->map;
-#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = _tmp8_;
-#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = _tmp9_;
-#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp12_ = _tmp11_;
-#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_tmp10_);
-#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_file_it = _tmp12_;
-#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
while (TRUE) {
-#line 8913 "DirectoryMonitor.c"
+#line 8989 "DirectoryMonitor.c"
GeeIterator* _tmp13_ = NULL;
gboolean _tmp14_ = FALSE;
GFile* file = NULL;
@@ -8940,134 +9016,134 @@ static GFile* directory_monitor_file_info_map_find_match (DirectoryMonitorFileIn
glong _tmp31_ = 0L;
GTimeVal _tmp32_ = {0};
glong _tmp33_ = 0L;
-#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp13_ = _file_it;
-#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp14_ = gee_iterator_next (_tmp13_);
-#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_tmp14_) {
-#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 8946 "DirectoryMonitor.c"
+#line 9022 "DirectoryMonitor.c"
}
-#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp15_ = _file_it;
-#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp16_ = gee_iterator_get (_tmp15_);
-#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
file = (GFile*) _tmp16_;
-#line 290 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 296 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp17_ = self->priv->map;
-#line 290 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 296 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp18_ = file;
-#line 290 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 296 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp19_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp18_);
-#line 290 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 296 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
info = (GFileInfo*) _tmp19_;
-#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp20_ = info;
-#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp21_ = get_file_info_id (_tmp20_);
-#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp22_ = _tmp21_;
-#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp23_ = match_id;
-#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp24_ = g_strcmp0 (_tmp22_, _tmp23_) == 0;
-#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (_tmp22_);
-#line 293 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 299 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp24_) {
-#line 294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = file;
-#line 294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (info);
-#line 294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_file_it);
-#line 294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (match_id);
-#line 294 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 8986 "DirectoryMonitor.c"
+#line 9062 "DirectoryMonitor.c"
}
-#line 297 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp25_ = match_size;
-#line 297 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp26_ = info;
-#line 297 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp27_ = g_file_info_get_size (_tmp26_);
-#line 297 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp25_ != _tmp27_) {
-#line 298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (info);
-#line 298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (file);
-#line 298 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 304 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
continue;
-#line 9002 "DirectoryMonitor.c"
+#line 9078 "DirectoryMonitor.c"
}
-#line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp28_ = info;
-#line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_file_info_get_modification_time (_tmp28_, &_tmp29_);
-#line 300 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 306 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
time = _tmp29_;
-#line 302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp30_ = time;
-#line 302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp31_ = _tmp30_.tv_sec;
-#line 302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp32_ = match_time;
-#line 302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp33_ = _tmp32_.tv_sec;
-#line 302 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp31_ != _tmp33_) {
-#line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 309 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (info);
-#line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 309 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (file);
-#line 303 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 309 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
continue;
-#line 9026 "DirectoryMonitor.c"
+#line 9102 "DirectoryMonitor.c"
}
-#line 305 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = file;
-#line 305 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (info);
-#line 305 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_file_it);
-#line 305 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (match_id);
-#line 305 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 9038 "DirectoryMonitor.c"
+#line 9114 "DirectoryMonitor.c"
}
-#line 289 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 295 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_file_it);
-#line 9042 "DirectoryMonitor.c"
+#line 9118 "DirectoryMonitor.c"
}
-#line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = NULL;
-#line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_free0 (match_id);
-#line 308 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 9050 "DirectoryMonitor.c"
+#line 9126 "DirectoryMonitor.c"
}
static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitorFileInfoMap* self, GFile* root, DirectoryMonitorFileInfoMap* descendents) {
GeeArrayList* pruned = NULL;
GeeArrayList* _tmp28_ = NULL;
-#line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self));
-#line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_IS_FILE (root));
-#line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (descendents));
-#line 312 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
pruned = NULL;
-#line 9065 "DirectoryMonitor.c"
+#line 9141 "DirectoryMonitor.c"
{
GeeIterator* _file_it = NULL;
GeeHashMap* _tmp0_ = NULL;
@@ -9076,25 +9152,25 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
GeeSet* _tmp3_ = NULL;
GeeIterator* _tmp4_ = NULL;
GeeIterator* _tmp5_ = NULL;
-#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->map;
-#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _tmp1_;
-#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = _tmp2_;
-#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = _tmp4_;
-#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_tmp3_);
-#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_file_it = _tmp5_;
-#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
while (TRUE) {
-#line 9092 "DirectoryMonitor.c"
+#line 9168 "DirectoryMonitor.c"
GeeIterator* _tmp6_ = NULL;
gboolean _tmp7_ = FALSE;
GFile* file = NULL;
@@ -9103,54 +9179,54 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
GFile* parent = NULL;
GFile* _tmp10_ = NULL;
GFile* _tmp11_ = NULL;
-#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = _file_it;
-#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = gee_iterator_next (_tmp6_);
-#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_tmp7_) {
-#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 9109 "DirectoryMonitor.c"
+#line 9185 "DirectoryMonitor.c"
}
-#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = _file_it;
-#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = gee_iterator_get (_tmp8_);
-#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
file = (GFile*) _tmp9_;
-#line 314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = file;
-#line 314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp11_ = g_file_get_parent (_tmp10_);
-#line 314 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
parent = _tmp11_;
-#line 315 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
while (TRUE) {
-#line 9125 "DirectoryMonitor.c"
+#line 9201 "DirectoryMonitor.c"
GFile* _tmp12_ = NULL;
GFile* _tmp13_ = NULL;
GFile* _tmp14_ = NULL;
gboolean _tmp15_ = FALSE;
GFile* _tmp26_ = NULL;
GFile* _tmp27_ = NULL;
-#line 315 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp12_ = parent;
-#line 315 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!(_tmp12_ != NULL)) {
-#line 315 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 9138 "DirectoryMonitor.c"
+#line 9214 "DirectoryMonitor.c"
}
-#line 316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 322 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp13_ = parent;
-#line 316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 322 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp14_ = root;
-#line 316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 322 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp15_ = g_file_equal (_tmp13_, _tmp14_);
-#line 316 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 322 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp15_) {
-#line 9148 "DirectoryMonitor.c"
+#line 9224 "DirectoryMonitor.c"
GeeArrayList* _tmp16_ = NULL;
GeeArrayList* _tmp18_ = NULL;
GFile* _tmp19_ = NULL;
@@ -9160,98 +9236,98 @@ static void directory_monitor_file_info_map_remove_descendents (DirectoryMonitor
GFile* _tmp23_ = NULL;
gpointer _tmp24_ = NULL;
GFileInfo* _tmp25_ = NULL;
-#line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 323 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp16_ = pruned;
-#line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 323 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp16_ == NULL) {
-#line 9162 "DirectoryMonitor.c"
+#line 9238 "DirectoryMonitor.c"
GeeArrayList* _tmp17_ = NULL;
-#line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp17_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (pruned);
-#line 318 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 324 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
pruned = _tmp17_;
-#line 9170 "DirectoryMonitor.c"
+#line 9246 "DirectoryMonitor.c"
}
-#line 320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp18_ = pruned;
-#line 320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp19_ = file;
-#line 320 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_);
-#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp20_ = descendents;
-#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp21_ = file;
-#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp22_ = self->priv->map;
-#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp23_ = file;
-#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp24_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp23_);
-#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp25_ = (GFileInfo*) _tmp24_;
-#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_file_info_map_update (_tmp20_, _tmp21_, _tmp25_);
-#line 321 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 327 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_tmp25_);
-#line 323 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 329 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 9196 "DirectoryMonitor.c"
+#line 9272 "DirectoryMonitor.c"
}
-#line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 332 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp26_ = parent;
-#line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 332 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp27_ = g_file_get_parent (_tmp26_);
-#line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 332 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (parent);
-#line 326 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 332 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
parent = _tmp27_;
-#line 9206 "DirectoryMonitor.c"
+#line 9282 "DirectoryMonitor.c"
}
-#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (parent);
-#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (file);
-#line 9212 "DirectoryMonitor.c"
+#line 9288 "DirectoryMonitor.c"
}
-#line 313 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 319 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_file_it);
-#line 9216 "DirectoryMonitor.c"
+#line 9292 "DirectoryMonitor.c"
}
-#line 330 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 336 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp28_ = pruned;
-#line 330 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 336 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp28_ != NULL) {
-#line 9222 "DirectoryMonitor.c"
+#line 9298 "DirectoryMonitor.c"
GeeArrayList* _tmp29_ = NULL;
-#line 331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp29_ = pruned;
-#line 331 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_file_info_map_remove_all (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 9228 "DirectoryMonitor.c"
+#line 9304 "DirectoryMonitor.c"
}
-#line 311 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 317 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (pruned);
-#line 9232 "DirectoryMonitor.c"
+#line 9308 "DirectoryMonitor.c"
}
static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileInfoMap* self, GFile* root, GeeCollection* files, GeeCollection* dirs) {
gint result = 0;
gint count = 0;
-#line 336 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 342 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (DIRECTORY_MONITOR_IS_FILE_INFO_MAP (self), 0);
-#line 336 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 342 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_IS_FILE (root), 0);
-#line 336 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 342 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (files), 0);
-#line 336 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 342 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (dirs), 0);
-#line 337 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
count = 0;
-#line 9249 "DirectoryMonitor.c"
+#line 9325 "DirectoryMonitor.c"
{
GeeIterator* _file_it = NULL;
GeeHashMap* _tmp0_ = NULL;
@@ -9260,25 +9336,25 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
GeeSet* _tmp3_ = NULL;
GeeIterator* _tmp4_ = NULL;
GeeIterator* _tmp5_ = NULL;
-#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = self->priv->map;
-#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = _tmp1_;
-#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = _tmp2_;
-#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp5_ = _tmp4_;
-#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_tmp3_);
-#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_file_it = _tmp5_;
-#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
while (TRUE) {
-#line 9276 "DirectoryMonitor.c"
+#line 9352 "DirectoryMonitor.c"
GeeIterator* _tmp6_ = NULL;
gboolean _tmp7_ = FALSE;
GFile* file = NULL;
@@ -9297,372 +9373,372 @@ static gint directory_monitor_file_info_map_get_children (DirectoryMonitorFileIn
DirectoryMonitorFType _tmp21_ = 0;
DirectoryMonitorFType _tmp22_ = 0;
DirectoryMonitorFType _tmp23_ = 0;
-#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp6_ = _file_it;
-#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp7_ = gee_iterator_next (_tmp6_);
-#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!_tmp7_) {
-#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 9303 "DirectoryMonitor.c"
+#line 9379 "DirectoryMonitor.c"
}
-#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp8_ = _file_it;
-#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp9_ = gee_iterator_get (_tmp8_);
-#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
file = (GFile*) _tmp9_;
-#line 339 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 345 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp10_ = file;
-#line 339 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 345 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp11_ = g_file_get_parent (_tmp10_);
-#line 339 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 345 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
parent = _tmp11_;
-#line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp13_ = parent;
-#line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp13_ == NULL) {
-#line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp12_ = TRUE;
-#line 9323 "DirectoryMonitor.c"
+#line 9399 "DirectoryMonitor.c"
} else {
GFile* _tmp14_ = NULL;
GFile* _tmp15_ = NULL;
gboolean _tmp16_ = FALSE;
-#line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp14_ = parent;
-#line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp15_ = root;
-#line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp16_ = g_file_equal (_tmp14_, _tmp15_);
-#line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp12_ = !_tmp16_;
-#line 9336 "DirectoryMonitor.c"
+#line 9412 "DirectoryMonitor.c"
}
-#line 340 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (_tmp12_) {
-#line 341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (parent);
-#line 341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (file);
-#line 341 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
continue;
-#line 9346 "DirectoryMonitor.c"
+#line 9422 "DirectoryMonitor.c"
}
-#line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp17_ = self->priv->map;
-#line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp18_ = file;
-#line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp19_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp18_);
-#line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp20_ = (GFileInfo*) _tmp19_;
-#line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp21_ = directory_monitor_get_ftype (_tmp20_);
-#line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp22_ = _tmp21_;
-#line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_tmp20_);
-#line 343 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 349 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
ftype = _tmp22_;
-#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 350 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp23_ = ftype;
-#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 350 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
switch (_tmp23_) {
-#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 350 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case DIRECTORY_MONITOR_FTYPE_FILE:
-#line 9370 "DirectoryMonitor.c"
+#line 9446 "DirectoryMonitor.c"
{
GeeCollection* _tmp24_ = NULL;
GFile* _tmp25_ = NULL;
gint _tmp26_ = 0;
-#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp24_ = files;
-#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp25_ = file;
-#line 346 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
gee_collection_add (_tmp24_, _tmp25_);
-#line 347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 353 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp26_ = count;
-#line 347 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 353 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
count = _tmp26_ + 1;
-#line 348 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 354 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 9387 "DirectoryMonitor.c"
+#line 9463 "DirectoryMonitor.c"
}
-#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 350 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
case DIRECTORY_MONITOR_FTYPE_DIRECTORY:
-#line 9391 "DirectoryMonitor.c"
+#line 9467 "DirectoryMonitor.c"
{
GeeCollection* _tmp27_ = NULL;
GFile* _tmp28_ = NULL;
gint _tmp29_ = 0;
-#line 351 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp27_ = dirs;
-#line 351 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp28_ = file;
-#line 351 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
gee_collection_add (_tmp27_, _tmp28_);
-#line 352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 358 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp29_ = count;
-#line 352 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 358 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
count = _tmp29_ + 1;
-#line 353 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 359 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 9408 "DirectoryMonitor.c"
+#line 9484 "DirectoryMonitor.c"
}
default:
{
DirectoryMonitorFType _tmp30_ = 0;
-#line 356 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp30_ = ftype;
-#line 356 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 362 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_vala_assert (_tmp30_ == DIRECTORY_MONITOR_FTYPE_UNSUPPORTED, "ftype == FType.UNSUPPORTED");
-#line 357 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 363 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
break;
-#line 9419 "DirectoryMonitor.c"
+#line 9495 "DirectoryMonitor.c"
}
}
-#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (parent);
-#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (file);
-#line 9426 "DirectoryMonitor.c"
+#line 9502 "DirectoryMonitor.c"
}
-#line 338 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 344 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (_file_it);
-#line 9430 "DirectoryMonitor.c"
+#line 9506 "DirectoryMonitor.c"
}
-#line 361 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 367 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
result = count;
-#line 361 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 367 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return result;
-#line 9436 "DirectoryMonitor.c"
+#line 9512 "DirectoryMonitor.c"
}
static void directory_monitor_value_file_info_map_init (GValue* value) {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
value->data[0].v_pointer = NULL;
-#line 9443 "DirectoryMonitor.c"
+#line 9519 "DirectoryMonitor.c"
}
static void directory_monitor_value_file_info_map_free_value (GValue* value) {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (value->data[0].v_pointer) {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_file_info_map_unref (value->data[0].v_pointer);
-#line 9452 "DirectoryMonitor.c"
+#line 9528 "DirectoryMonitor.c"
}
}
static void directory_monitor_value_file_info_map_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (src_value->data[0].v_pointer) {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
dest_value->data[0].v_pointer = directory_monitor_file_info_map_ref (src_value->data[0].v_pointer);
-#line 9462 "DirectoryMonitor.c"
+#line 9538 "DirectoryMonitor.c"
} else {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
dest_value->data[0].v_pointer = NULL;
-#line 9466 "DirectoryMonitor.c"
+#line 9542 "DirectoryMonitor.c"
}
}
static gpointer directory_monitor_value_file_info_map_peek_pointer (const GValue* value) {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return value->data[0].v_pointer;
-#line 9474 "DirectoryMonitor.c"
+#line 9550 "DirectoryMonitor.c"
}
static gchar* directory_monitor_value_file_info_map_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (collect_values[0].v_pointer) {
-#line 9481 "DirectoryMonitor.c"
+#line 9557 "DirectoryMonitor.c"
DirectoryMonitorFileInfoMap* object;
object = collect_values[0].v_pointer;
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (object->parent_instance.g_class == NULL) {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9488 "DirectoryMonitor.c"
+#line 9564 "DirectoryMonitor.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.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 9492 "DirectoryMonitor.c"
+#line 9568 "DirectoryMonitor.c"
}
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
value->data[0].v_pointer = directory_monitor_file_info_map_ref (object);
-#line 9496 "DirectoryMonitor.c"
+#line 9572 "DirectoryMonitor.c"
} else {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
value->data[0].v_pointer = NULL;
-#line 9500 "DirectoryMonitor.c"
+#line 9576 "DirectoryMonitor.c"
}
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return NULL;
-#line 9504 "DirectoryMonitor.c"
+#line 9580 "DirectoryMonitor.c"
}
static gchar* directory_monitor_value_file_info_map_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
DirectoryMonitorFileInfoMap** object_p;
object_p = collect_values[0].v_pointer;
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!object_p) {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9515 "DirectoryMonitor.c"
+#line 9591 "DirectoryMonitor.c"
}
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (!value->data[0].v_pointer) {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
*object_p = NULL;
-#line 9521 "DirectoryMonitor.c"
+#line 9597 "DirectoryMonitor.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
*object_p = value->data[0].v_pointer;
-#line 9525 "DirectoryMonitor.c"
+#line 9601 "DirectoryMonitor.c"
} else {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
*object_p = directory_monitor_file_info_map_ref (value->data[0].v_pointer);
-#line 9529 "DirectoryMonitor.c"
+#line 9605 "DirectoryMonitor.c"
}
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return NULL;
-#line 9533 "DirectoryMonitor.c"
+#line 9609 "DirectoryMonitor.c"
}
static GParamSpec* directory_monitor_param_spec_file_info_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
DirectoryMonitorParamSpecFileInfoMap* spec;
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (g_type_is_a (object_type, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP), NULL);
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
G_PARAM_SPEC (spec)->value_type = object_type;
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return G_PARAM_SPEC (spec);
-#line 9547 "DirectoryMonitor.c"
+#line 9623 "DirectoryMonitor.c"
}
static gpointer directory_monitor_value_get_file_info_map (const GValue* value) {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP), NULL);
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return value->data[0].v_pointer;
-#line 9556 "DirectoryMonitor.c"
+#line 9632 "DirectoryMonitor.c"
}
static void directory_monitor_value_set_file_info_map (GValue* value, gpointer v_object) {
DirectoryMonitorFileInfoMap* old;
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP));
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
old = value->data[0].v_pointer;
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (v_object) {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP));
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
value->data[0].v_pointer = v_object;
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_file_info_map_ref (value->data[0].v_pointer);
-#line 9576 "DirectoryMonitor.c"
+#line 9652 "DirectoryMonitor.c"
} else {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
value->data[0].v_pointer = NULL;
-#line 9580 "DirectoryMonitor.c"
+#line 9656 "DirectoryMonitor.c"
}
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (old) {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_file_info_map_unref (old);
-#line 9586 "DirectoryMonitor.c"
+#line 9662 "DirectoryMonitor.c"
}
}
static void directory_monitor_value_take_file_info_map (GValue* value, gpointer v_object) {
DirectoryMonitorFileInfoMap* old;
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP));
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
old = value->data[0].v_pointer;
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (v_object) {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP));
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
value->data[0].v_pointer = v_object;
-#line 9605 "DirectoryMonitor.c"
+#line 9681 "DirectoryMonitor.c"
} else {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
value->data[0].v_pointer = NULL;
-#line 9609 "DirectoryMonitor.c"
+#line 9685 "DirectoryMonitor.c"
}
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (old) {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_file_info_map_unref (old);
-#line 9615 "DirectoryMonitor.c"
+#line 9691 "DirectoryMonitor.c"
}
}
static void directory_monitor_file_info_map_class_init (DirectoryMonitorFileInfoMapClass * klass) {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
directory_monitor_file_info_map_parent_class = g_type_class_peek_parent (klass);
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
((DirectoryMonitorFileInfoMapClass *) klass)->finalize = directory_monitor_file_info_map_finalize;
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_type_class_add_private (klass, sizeof (DirectoryMonitorFileInfoMapPrivate));
-#line 9627 "DirectoryMonitor.c"
+#line 9703 "DirectoryMonitor.c"
}
static void directory_monitor_file_info_map_instance_init (DirectoryMonitorFileInfoMap * self) {
GeeHashMap* _tmp0_ = NULL;
GeeHashMap* _tmp1_ = NULL;
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv = DIRECTORY_MONITOR_FILE_INFO_MAP_GET_PRIVATE (self);
-#line 129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (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 129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->map = _tmp0_;
-#line 131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
-#line 131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->id_map = _tmp1_;
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->ref_count = 1;
-#line 9646 "DirectoryMonitor.c"
+#line 9722 "DirectoryMonitor.c"
}
static void directory_monitor_file_info_map_finalize (DirectoryMonitorFileInfoMap* obj) {
DirectoryMonitorFileInfoMap * self;
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, DIRECTORY_MONITOR_TYPE_FILE_INFO_MAP, DirectoryMonitorFileInfoMap);
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_handlers_destroy (self);
-#line 129 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 133 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (self->priv->map);
-#line 131 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 135 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (self->priv->id_map);
-#line 9660 "DirectoryMonitor.c"
+#line 9736 "DirectoryMonitor.c"
}
@@ -9683,24 +9759,24 @@ static GType directory_monitor_file_info_map_get_type (void) {
static gpointer directory_monitor_file_info_map_ref (gpointer instance) {
DirectoryMonitorFileInfoMap* self;
self = instance;
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_atomic_int_inc (&self->ref_count);
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
return instance;
-#line 9685 "DirectoryMonitor.c"
+#line 9761 "DirectoryMonitor.c"
}
static void directory_monitor_file_info_map_unref (gpointer instance) {
DirectoryMonitorFileInfoMap* self;
self = instance;
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
DIRECTORY_MONITOR_FILE_INFO_MAP_GET_CLASS (self)->finalize (self);
-#line 128 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 132 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 9698 "DirectoryMonitor.c"
+#line 9774 "DirectoryMonitor.c"
}
}
@@ -9838,7 +9914,7 @@ static void directory_monitor_class_init (DirectoryMonitorClass * klass) {
g_signal_new ("directory_deleted", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, directory_deleted), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, g_file_get_type ());
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
g_signal_new ("closed", TYPE_DIRECTORY_MONITOR, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (DirectoryMonitorClass, closed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 9836 "DirectoryMonitor.c"
+#line 9912 "DirectoryMonitor.c"
}
@@ -9850,35 +9926,35 @@ static void directory_monitor_instance_init (DirectoryMonitor * self) {
GCancellable* _tmp4_ = NULL;
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv = DIRECTORY_MONITOR_GET_PRIVATE (self);
-#line 368 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, g_file_monitor_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 368 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->monitors = _tmp0_;
-#line 369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp1_ = gee_linked_list_new (DIRECTORY_MONITOR_TYPE_QUERY_INFO_QUEUE_ELEMENT, (GBoxedCopyFunc) directory_monitor_query_info_queue_element_ref, (GDestroyNotify) directory_monitor_query_info_queue_element_unref, NULL, NULL, NULL);
-#line 369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->query_info_queue = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_QUEUE, GeeQueue);
-#line 371 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp2_ = directory_monitor_file_info_map_new ();
-#line 371 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->files = _tmp2_;
-#line 372 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 378 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp3_ = directory_monitor_file_info_map_new ();
-#line 372 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 378 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->parent_moved = _tmp3_;
-#line 373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_tmp4_ = g_cancellable_new ();
-#line 373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->cancellable = _tmp4_;
-#line 374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 380 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->outstanding_exploration_dirs = 0;
-#line 375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 381 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->started = FALSE;
-#line 376 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 382 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->has_discovery_started = FALSE;
-#line 377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 383 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self->priv->delete_timer_id = (guint) 0;
-#line 9876 "DirectoryMonitor.c"
+#line 9952 "DirectoryMonitor.c"
}
@@ -9886,21 +9962,21 @@ static void directory_monitor_finalize (GObject* obj) {
DirectoryMonitor * self;
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECTORY_MONITOR, DirectoryMonitor);
-#line 365 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 371 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (self->priv->root);
-#line 368 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 374 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (self->priv->monitors);
-#line 369 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 375 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (self->priv->query_info_queue);
-#line 371 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 377 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_directory_monitor_file_info_map_unref0 (self->priv->files);
-#line 372 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 378 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_directory_monitor_file_info_map_unref0 (self->priv->parent_moved);
-#line 373 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
+#line 379 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
_g_object_unref0 (self->priv->cancellable);
#line 60 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
G_OBJECT_CLASS (directory_monitor_parent_class)->finalize (obj);
-#line 9898 "DirectoryMonitor.c"
+#line 9974 "DirectoryMonitor.c"
}
diff --git a/src/DirectoryMonitor.vala b/src/DirectoryMonitor.vala
index 50d0048..a37b124 100644
--- a/src/DirectoryMonitor.vala
+++ b/src/DirectoryMonitor.vala
@@ -109,6 +109,10 @@ public class DirectoryMonitor : Object {
// finish the async operation to get the result
try {
info = source_file.query_info_async.end(aresult);
+ if (get_file_info_id(info) == null) {
+ info.set_attribute_string(FileAttribute.ID_FILE,
+ file.get_uri());
+ }
} catch (Error err) {
this.err = err;
}
@@ -267,8 +271,10 @@ public class DirectoryMonitor : Object {
return null;
string? id = info.get_attribute_string(FileAttribute.ID_FILE);
- if (id == null)
- return null;
+ if (id == null) {
+ info.set_attribute_string(FileAttribute.ID_FILE,
+ file.get_uri());
+ }
File? normalized = id_map.get(id);
if (normalized == null)
@@ -874,14 +880,10 @@ public class DirectoryMonitor : Object {
}
// File ID is required for directory monitoring. No ID, no ride!
- // TODO: Replace the warning with notify_discovery_failed() and provide a user-visible
- // string.
+ // So we just fake it by using the URI
if (get_file_info_id(local_dir_info) == null) {
- warning("Unable to retrieve file ID on %s: skipping", dir.get_path());
-
- explore_directory_completed(in_discovery);
-
- return;
+ local_dir_info.set_attribute_string(FileAttribute.ID_FILE,
+ dir.get_uri());
}
// verify this is a directory
@@ -911,6 +913,10 @@ public class DirectoryMonitor : Object {
break;
foreach (FileInfo info in infos) {
+ if (get_file_info_id(info) == null) {
+ info.set_attribute_string(FileAttribute.ID_FILE,
+ dir.get_uri());
+ }
// we don't deal with hidden files or directories
if (info.get_is_hidden()) {
warning("Skipping hidden file/directory %s",
diff --git a/src/data_imports/DataImportsPluginHost.c b/src/data_imports/DataImportsPluginHost.c
index 3203518..6fea799 100644
--- a/src/data_imports/DataImportsPluginHost.c
+++ b/src/data_imports/DataImportsPluginHost.c
@@ -624,9 +624,9 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled);
gchar* plugins_get_pluggable_module_id (SpitPluggable* needle);
static void _vala_array_add69 (SpitDataImportsService*** array, int* length, int* size, SpitDataImportsService* value);
-static gint __lambda21_ (void* a, void* b);
+static gint __lambda22_ (void* a, void* b);
gint utf8_cs_compare (void* a, void* b);
-static gint ___lambda21____compar_fn_t (void* key1, void* key2);
+static gint ___lambda22____compar_fn_t (void* key1, void* key2);
GType data_object_get_type (void) G_GNUC_CONST;
GType data_source_get_type (void) G_GNUC_CONST;
GType thumbnail_source_get_type (void) G_GNUC_CONST;
@@ -3060,7 +3060,7 @@ static void _vala_array_add69 (SpitDataImportsService*** array, int* length, int
}
-static gint __lambda21_ (void* a, void* b) {
+static gint __lambda22_ (void* a, void* b) {
gint result = 0;
void* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
@@ -3085,9 +3085,9 @@ static gint __lambda21_ (void* a, void* b) {
}
-static gint ___lambda21____compar_fn_t (void* key1, void* key2) {
+static gint ___lambda22____compar_fn_t (void* key1, void* key2) {
gint result;
- result = __lambda21_ (key1, key2);
+ result = __lambda22_ (key1, key2);
#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
return result;
#line 3086 "DataImportsPluginHost.c"
@@ -3259,7 +3259,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp27__length1 = loaded_services_length1;
#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
- qsort (_tmp26_, (gsize) _tmp27__length1, (gsize) sizeof (SpitDataImportsService*), ___lambda21____compar_fn_t);
+ qsort (_tmp26_, (gsize) _tmp27__length1, (gsize) sizeof (SpitDataImportsService*), ___lambda22____compar_fn_t);
#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
_tmp28_ = loaded_services;
#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
diff --git a/src/data_imports/DataImportsUI.c b/src/data_imports/DataImportsUI.c
index 5a1c46a..c5428ba 100644
--- a/src/data_imports/DataImportsUI.c
+++ b/src/data_imports/DataImportsUI.c
@@ -54,8 +54,8 @@ typedef struct _DataImportsUILibrarySelectionPane DataImportsUILibrarySelectionP
typedef struct _DataImportsUILibrarySelectionPaneClass DataImportsUILibrarySelectionPaneClass;
typedef struct _DataImportsUILibrarySelectionPanePrivate DataImportsUILibrarySelectionPanePrivate;
#define _g_free0(var) (var = (g_free (var), NULL))
-typedef struct _Block10Data Block10Data;
typedef struct _Block11Data Block11Data;
+typedef struct _Block12Data Block12Data;
#define DATA_IMPORTS_UI_TYPE_PROGRESS_PANE (data_imports_ui_progress_pane_get_type ())
#define DATA_IMPORTS_UI_PROGRESS_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATA_IMPORTS_UI_TYPE_PROGRESS_PANE, DataImportsUIProgressPane))
@@ -162,13 +162,13 @@ struct _DataImportsUILibrarySelectionPanePrivate {
GtkRadioButton* file_radio;
};
-struct _Block10Data {
+struct _Block11Data {
int _ref_count_;
DataImportsUILibrarySelectionPane* self;
GtkFileChooserButton* file_chooser;
};
-struct _Block11Data {
+struct _Block12Data {
int _ref_count_;
DataImportsUILibrarySelectionPane* self;
GtkRadioButton* button;
@@ -251,18 +251,18 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_new (S
DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_construct (GType object_type, SpitDataImportsPluginHost* host, const gchar* welcome_message, SpitDataImportsImportableLibrary** discovered_libraries, int discovered_libraries_length1, const gchar* file_select_label);
static void data_imports_ui_library_selection_pane_on_file_selected (DataImportsUILibrarySelectionPane* self, GFile* file);
static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_button (DataImportsUILibrarySelectionPane* self, GtkBox* box, GtkRadioButton* group, SpitDataImportsImportableLibrary* library, const gchar* label, gint margin_left, gint margin_right);
-static Block10Data* block10_data_ref (Block10Data* _data10_);
-static void block10_data_unref (void * _userdata_);
-static void ___lambda19_ (Block10Data* _data10_);
-static void data_imports_ui_library_selection_pane_set_import_button_sensitivity (DataImportsUILibrarySelectionPane* self);
-static void ____lambda19__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self);
-static void __lambda20_ (DataImportsUILibrarySelectionPane* self);
-static void data_imports_ui_library_selection_pane_on_library_selected (DataImportsUILibrarySelectionPane* self, SpitDataImportsImportableLibrary* library);
-static void ___lambda20__gtk_button_clicked (GtkButton* _sender, gpointer self);
static Block11Data* block11_data_ref (Block11Data* _data11_);
static void block11_data_unref (void * _userdata_);
-static void __lambda18_ (Block11Data* _data11_);
-static void ___lambda18__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
+static void ___lambda20_ (Block11Data* _data11_);
+static void data_imports_ui_library_selection_pane_set_import_button_sensitivity (DataImportsUILibrarySelectionPane* self);
+static void ____lambda20__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self);
+static void __lambda21_ (DataImportsUILibrarySelectionPane* self);
+static void data_imports_ui_library_selection_pane_on_library_selected (DataImportsUILibrarySelectionPane* self, SpitDataImportsImportableLibrary* library);
+static void ___lambda21__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static Block12Data* block12_data_ref (Block12Data* _data12_);
+static void block12_data_unref (void * _userdata_);
+static void __lambda19_ (Block12Data* _data12_);
+static void ___lambda19__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
static void data_imports_ui_library_selection_pane_finalize (GObject* obj);
GType data_imports_ui_progress_pane_get_type (void) G_GNUC_CONST;
#define DATA_IMPORTS_UI_PROGRESS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_UI_TYPE_PROGRESS_PANE, DataImportsUIProgressPanePrivate))
@@ -596,44 +596,44 @@ GType data_imports_ui_static_message_pane_get_type (void) {
}
-static Block10Data* block10_data_ref (Block10Data* _data10_) {
+static Block11Data* block11_data_ref (Block11Data* _data11_) {
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_atomic_int_inc (&_data10_->_ref_count_);
+ g_atomic_int_inc (&_data11_->_ref_count_);
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- return _data10_;
+ return _data11_;
#line 601 "DataImportsUI.c"
}
-static void block10_data_unref (void * _userdata_) {
- Block10Data* _data10_;
- _data10_ = (Block10Data*) _userdata_;
+static void block11_data_unref (void * _userdata_) {
+ Block11Data* _data11_;
+ _data11_ = (Block11Data*) _userdata_;
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (g_atomic_int_dec_and_test (&_data10_->_ref_count_)) {
+ if (g_atomic_int_dec_and_test (&_data11_->_ref_count_)) {
#line 610 "DataImportsUI.c"
DataImportsUILibrarySelectionPane* self;
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- self = _data10_->self;
+ self = _data11_->self;
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _g_object_unref0 (_data10_->file_chooser);
+ _g_object_unref0 (_data11_->file_chooser);
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (self);
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_slice_free (Block10Data, _data10_);
+ g_slice_free (Block11Data, _data11_);
#line 620 "DataImportsUI.c"
}
}
-static void ___lambda19_ (Block10Data* _data10_) {
+static void ___lambda20_ (Block11Data* _data11_) {
DataImportsUILibrarySelectionPane* self;
GtkFileChooserButton* _tmp0_ = NULL;
GFile* _tmp1_ = NULL;
GtkRadioButton* _tmp2_ = NULL;
#line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- self = _data10_->self;
+ self = _data11_->self;
#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp0_ = _data10_->file_chooser;
+ _tmp0_ = _data11_->file_chooser;
#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = gtk_file_chooser_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
#line 102 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -658,14 +658,14 @@ static void ___lambda19_ (Block10Data* _data10_) {
}
-static void ____lambda19__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self) {
+static void ____lambda20__gtk_file_chooser_selection_changed (GtkFileChooser* _sender, gpointer self) {
#line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- ___lambda19_ (self);
+ ___lambda20_ (self);
#line 661 "DataImportsUI.c"
}
-static void __lambda20_ (DataImportsUILibrarySelectionPane* self) {
+static void __lambda21_ (DataImportsUILibrarySelectionPane* self) {
SpitDataImportsImportableLibrary* _tmp0_ = NULL;
#line 114 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->selected_library;
@@ -701,9 +701,9 @@ static void __lambda20_ (DataImportsUILibrarySelectionPane* self) {
}
-static void ___lambda20__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void ___lambda21__gtk_button_clicked (GtkButton* _sender, gpointer self) {
#line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- __lambda20_ ((DataImportsUILibrarySelectionPane*) self);
+ __lambda21_ ((DataImportsUILibrarySelectionPane*) self);
#line 703 "DataImportsUI.c"
}
@@ -954,7 +954,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp37_ != NULL) {
#line 952 "DataImportsUI.c"
- Block10Data* _data10_;
+ Block11Data* _data11_;
const gchar* _tmp38_ = NULL;
GtkFileChooserButton* _tmp39_ = NULL;
GtkFileChooserButton* _tmp40_ = NULL;
@@ -965,11 +965,11 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
GtkBox* _tmp45_ = NULL;
GtkFileChooserButton* _tmp46_ = NULL;
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _data10_ = g_slice_new0 (Block10Data);
+ _data11_ = g_slice_new0 (Block11Data);
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _data10_->_ref_count_ = 1;
+ _data11_->_ref_count_ = 1;
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _data10_->self = g_object_ref (self);
+ _data11_->self = g_object_ref (self);
#line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp38_ = _ ("Database file:");
#line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -977,19 +977,19 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
#line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_object_ref_sink (_tmp39_);
#line 100 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _data10_->file_chooser = _tmp39_;
+ _data11_->file_chooser = _tmp39_;
#line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp40_ = _data10_->file_chooser;
+ _tmp40_ = _data11_->file_chooser;
#line 101 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "selection-changed", (GCallback) ____lambda19__gtk_file_chooser_selection_changed, block10_data_ref (_data10_), (GClosureNotify) block10_data_unref, 0);
+ g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "selection-changed", (GCallback) ____lambda20__gtk_file_chooser_selection_changed, block11_data_ref (_data11_), (GClosureNotify) block11_data_unref, 0);
#line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp41_ = _data10_->file_chooser;
+ _tmp41_ = _data11_->file_chooser;
#line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp42_ = chooser_margin_left;
#line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), _tmp42_);
#line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp43_ = _data10_->file_chooser;
+ _tmp43_ = _data11_->file_chooser;
#line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp44_ = chooser_margin_right;
#line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -997,13 +997,13 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
#line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp45_ = content_box;
#line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp46_ = _data10_->file_chooser;
+ _tmp46_ = _data11_->file_chooser;
#line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_box_pack_start (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- block10_data_unref (_data10_);
+ block11_data_unref (_data11_);
#line 99 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _data10_ = NULL;
+ _data11_ = NULL;
#line 1003 "DataImportsUI.c"
}
#line 112 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1019,7 +1019,7 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
#line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp49_ = self->priv->import_button;
#line 113 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_signal_connect_object (_tmp49_, "clicked", (GCallback) ___lambda20__gtk_button_clicked, self, 0);
+ g_signal_connect_object (_tmp49_, "clicked", (GCallback) ___lambda21__gtk_button_clicked, self, 0);
#line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp50_ = (GtkButtonBox*) gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
#line 121 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1077,46 +1077,46 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_new (S
}
-static Block11Data* block11_data_ref (Block11Data* _data11_) {
+static Block12Data* block12_data_ref (Block12Data* _data12_) {
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_atomic_int_inc (&_data11_->_ref_count_);
+ g_atomic_int_inc (&_data12_->_ref_count_);
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- return _data11_;
+ return _data12_;
#line 1081 "DataImportsUI.c"
}
-static void block11_data_unref (void * _userdata_) {
- Block11Data* _data11_;
- _data11_ = (Block11Data*) _userdata_;
+static void block12_data_unref (void * _userdata_) {
+ Block12Data* _data12_;
+ _data12_ = (Block12Data*) _userdata_;
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (g_atomic_int_dec_and_test (&_data11_->_ref_count_)) {
+ if (g_atomic_int_dec_and_test (&_data12_->_ref_count_)) {
#line 1090 "DataImportsUI.c"
DataImportsUILibrarySelectionPane* self;
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- self = _data11_->self;
+ self = _data12_->self;
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _g_object_unref0 (_data11_->button);
+ _g_object_unref0 (_data12_->button);
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _g_object_unref0 (_data11_->library);
+ _g_object_unref0 (_data12_->library);
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (self);
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_slice_free (Block11Data, _data11_);
+ g_slice_free (Block12Data, _data12_);
#line 1102 "DataImportsUI.c"
}
}
-static void __lambda18_ (Block11Data* _data11_) {
+static void __lambda19_ (Block12Data* _data12_) {
DataImportsUILibrarySelectionPane* self;
GtkRadioButton* _tmp0_ = NULL;
gboolean _tmp1_ = FALSE;
gboolean _tmp2_ = FALSE;
#line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- self = _data11_->self;
+ self = _data12_->self;
#line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp0_ = _data11_->button;
+ _tmp0_ = _data12_->button;
#line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
#line 141 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1127,7 +1127,7 @@ static void __lambda18_ (Block11Data* _data11_) {
SpitDataImportsImportableLibrary* _tmp3_ = NULL;
SpitDataImportsImportableLibrary* _tmp4_ = NULL;
#line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp3_ = _data11_->library;
+ _tmp3_ = _data12_->library;
#line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp4_ = _g_object_ref0 (_tmp3_);
#line 142 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1141,16 +1141,16 @@ static void __lambda18_ (Block11Data* _data11_) {
}
-static void ___lambda18__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+static void ___lambda19__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
#line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- __lambda18_ (self);
+ __lambda19_ (self);
#line 1143 "DataImportsUI.c"
}
static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_button (DataImportsUILibrarySelectionPane* self, GtkBox* box, GtkRadioButton* group, SpitDataImportsImportableLibrary* library, const gchar* label, gint margin_left, gint margin_right) {
GtkRadioButton* result = NULL;
- Block11Data* _data11_;
+ Block12Data* _data12_;
SpitDataImportsImportableLibrary* _tmp0_ = NULL;
SpitDataImportsImportableLibrary* _tmp1_ = NULL;
GtkRadioButton* _tmp2_ = NULL;
@@ -1177,19 +1177,19 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_val_if_fail (label != NULL, NULL);
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _data11_ = g_slice_new0 (Block11Data);
+ _data12_ = g_slice_new0 (Block12Data);
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _data11_->_ref_count_ = 1;
+ _data12_->_ref_count_ = 1;
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _data11_->self = g_object_ref (self);
+ _data12_->self = g_object_ref (self);
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = library;
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _g_object_unref0 (_data11_->library);
+ _g_object_unref0 (_data12_->library);
#line 131 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _data11_->library = _tmp1_;
+ _data12_->library = _tmp1_;
#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp2_ = group;
#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1199,7 +1199,7 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto
#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_object_ref_sink (_tmp4_);
#line 135 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _data11_->button = _tmp4_;
+ _data12_->button = _tmp4_;
#line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp5_ = group;
#line 136 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1209,11 +1209,11 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto
SpitDataImportsImportableLibrary* _tmp7_ = NULL;
SpitDataImportsImportableLibrary* _tmp8_ = NULL;
#line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp6_ = _data11_->button;
+ _tmp6_ = _data12_->button;
#line 137 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
#line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp7_ = _data11_->library;
+ _tmp7_ = _data12_->library;
#line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp8_ = _g_object_ref0 (_tmp7_);
#line 138 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1223,17 +1223,17 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto
#line 1219 "DataImportsUI.c"
}
#line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp9_ = _data11_->button;
+ _tmp9_ = _data12_->button;
#line 140 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) ___lambda18__gtk_toggle_button_toggled, block11_data_ref (_data11_), (GClosureNotify) block11_data_unref, 0);
+ g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) ___lambda19__gtk_toggle_button_toggled, block12_data_ref (_data12_), (GClosureNotify) block12_data_unref, 0);
#line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp10_ = _data11_->button;
+ _tmp10_ = _data12_->button;
#line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp11_ = margin_left;
#line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), _tmp11_);
#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp12_ = _data11_->button;
+ _tmp12_ = _data12_->button;
#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp13_ = margin_right;
#line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1241,19 +1241,19 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto
#line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp14_ = box;
#line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp15_ = _data11_->button;
+ _tmp15_ = _data12_->button;
#line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
#line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp16_ = _data11_->button;
+ _tmp16_ = _data12_->button;
#line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp17_ = _g_object_ref0 (_tmp16_);
#line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
result = _tmp17_;
#line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- block11_data_unref (_data11_);
+ block12_data_unref (_data12_);
#line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _data11_ = NULL;
+ _data12_ = NULL;
#line 150 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return result;
#line 1255 "DataImportsUI.c"
@@ -1582,7 +1582,7 @@ static void _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_bo
static void _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 306 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_on_close_cancel_clicked ((DataImportsUIDataImportsDialog*) self);
#line 1583 "DataImportsUI.c"
}
@@ -1613,9 +1613,9 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
GtkBox* _tmp68_ = NULL;
GtkBox* _tmp69_ = NULL;
gboolean _tmp70_ = FALSE;
- GtkButton* _tmp80_ = NULL;
- SpitDataImportsService** _tmp81_ = NULL;
- gint _tmp81__length1 = 0;
+ GtkButton* _tmp81_ = NULL;
+ SpitDataImportsService** _tmp82_ = NULL;
+ gint _tmp82__length1 = 0;
#line 211 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
use_header = FALSE;
#line 212 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2023,8 +2023,7 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
GtkButton* _tmp72_ = NULL;
GtkWidget* _tmp73_ = NULL;
GtkButton* _tmp74_ = NULL;
- GtkWidget* _tmp75_ = NULL;
- GtkComboBoxText* _tmp76_ = NULL;
+ GtkComboBoxText* _tmp75_ = NULL;
#line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp71_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
#line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -2044,61 +2043,69 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
#line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
#line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp75_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp76_ = self->priv->service_selector_box;
+ _tmp75_ = self->priv->service_selector_box;
#line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_widget_get_type (), GtkWidget));
-#line 2048 "DataImportsUI.c"
+ if (_tmp75_ != NULL) {
+#line 2045 "DataImportsUI.c"
+ GtkWidget* _tmp76_ = NULL;
+ GtkComboBoxText* _tmp77_ = NULL;
+#line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp76_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp77_ = self->priv->service_selector_box;
+#line 299 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget));
+#line 2054 "DataImportsUI.c"
+ }
} else {
- const gchar* _tmp77_ = NULL;
- GtkWidget* _tmp78_ = NULL;
- GtkButton* _tmp79_ = NULL;
-#line 301 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp77_ = _ ("_Cancel");
-#line 301 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _tmp77_, (gint) GTK_RESPONSE_CANCEL);
-#line 302 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp78_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
-#line 302 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp79_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp78_, gtk_button_get_type ()) ? ((GtkButton*) _tmp78_) : NULL);
-#line 302 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _g_object_unref0 (self->priv->close_cancel_button);
-#line 302 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- self->priv->close_cancel_button = _tmp79_;
-#line 2065 "DataImportsUI.c"
- }
+ const gchar* _tmp78_ = NULL;
+ GtkWidget* _tmp79_ = NULL;
+ GtkButton* _tmp80_ = NULL;
+#line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp78_ = _ ("_Cancel");
+#line 303 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _tmp78_, (gint) GTK_RESPONSE_CANCEL);
+#line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp79_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
#line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp80_ = self->priv->close_cancel_button;
+ _tmp80_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, gtk_button_get_type ()) ? ((GtkButton*) _tmp79_) : NULL);
#line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_signal_connect_object (_tmp80_, "clicked", (GCallback) _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
+ _g_object_unref0 (self->priv->close_cancel_button);
+#line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ self->priv->close_cancel_button = _tmp80_;
+#line 2072 "DataImportsUI.c"
+ }
#line 306 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- data_imports_ui_data_imports_dialog_set_standard_window_mode (self);
-#line 308 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp81_ = loaded_services;
-#line 308 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp81__length1 = loaded_services_length1;
+ _tmp81_ = self->priv->close_cancel_button;
+#line 306 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_signal_connect_object (_tmp81_, "clicked", (GCallback) _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
#line 308 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- if (_tmp81__length1 > 0) {
+ data_imports_ui_data_imports_dialog_set_standard_window_mode (self);
+#line 310 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp82_ = loaded_services;
#line 310 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp82__length1 = loaded_services_length1;
+#line 310 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ if (_tmp82__length1 > 0) {
+#line 312 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_on_service_changed (self);
-#line 2081 "DataImportsUI.c"
+#line 2088 "DataImportsUI.c"
} else {
- DataImportsUIStaticMessagePane* _tmp82_ = NULL;
DataImportsUIStaticMessagePane* _tmp83_ = NULL;
-#line 313 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp82_ = data_imports_ui_static_message_pane_new_with_pango (DATA_IMPORTS_UI_NO_PLUGINS_ENABLED_MESSAGE);
-#line 313 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _tmp83_ = _tmp82_;
-#line 313 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- data_imports_ui_data_imports_dialog_install_pane (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
-#line 313 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _g_object_unref0 (_tmp83_);
-#line 314 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ DataImportsUIStaticMessagePane* _tmp84_ = NULL;
+#line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp83_ = data_imports_ui_static_message_pane_new_with_pango (DATA_IMPORTS_UI_NO_PLUGINS_ENABLED_MESSAGE);
+#line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _tmp84_ = _tmp83_;
+#line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ data_imports_ui_data_imports_dialog_install_pane (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
+#line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _g_object_unref0 (_tmp84_);
+#line 316 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_set_close_button_mode (self);
-#line 2095 "DataImportsUI.c"
+#line 2102 "DataImportsUI.c"
}
-#line 317 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 319 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
loaded_services = (_vala_array_free (loaded_services, loaded_services_length1, (GDestroyNotify) g_object_unref), NULL);
@@ -2108,14 +2115,14 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
_g_free0 (title);
#line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return self;
-#line 2107 "DataImportsUI.c"
+#line 2114 "DataImportsUI.c"
}
DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_new (void) {
#line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return data_imports_ui_data_imports_dialog_construct (DATA_IMPORTS_UI_TYPE_DATA_IMPORTS_DIALOG);
-#line 2114 "DataImportsUI.c"
+#line 2121 "DataImportsUI.c"
}
@@ -2124,72 +2131,72 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_creat
DataImportsUIDataImportsDialog* _tmp0_ = NULL;
DataImportsUIDataImportsDialog* _tmp2_ = NULL;
DataImportsUIDataImportsDialog* _tmp3_ = NULL;
-#line 321 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = data_imports_ui_data_imports_dialog_instance;
-#line 321 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp0_ == NULL) {
-#line 2127 "DataImportsUI.c"
+#line 2134 "DataImportsUI.c"
DataImportsUIDataImportsDialog* _tmp1_ = NULL;
-#line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = data_imports_ui_data_imports_dialog_new ();
-#line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_object_ref_sink (_tmp1_);
-#line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
-#line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_instance = _tmp1_;
-#line 2137 "DataImportsUI.c"
+#line 2144 "DataImportsUI.c"
}
-#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp2_ = data_imports_ui_data_imports_dialog_instance;
-#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
result = _tmp3_;
-#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 326 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return result;
-#line 2147 "DataImportsUI.c"
+#line 2154 "DataImportsUI.c"
}
void data_imports_ui_data_imports_dialog_terminate_instance (void) {
DataImportsUIDataImportsDialog* _tmp0_ = NULL;
-#line 328 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 330 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = data_imports_ui_data_imports_dialog_instance;
-#line 328 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 330 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp0_ != NULL) {
-#line 2157 "DataImportsUI.c"
+#line 2164 "DataImportsUI.c"
DataImportsUIDataImportsDialog* _tmp1_ = NULL;
-#line 329 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 331 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = data_imports_ui_data_imports_dialog_instance;
-#line 329 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 331 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_terminate (_tmp1_);
-#line 2163 "DataImportsUI.c"
+#line 2170 "DataImportsUI.c"
}
-#line 331 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 333 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
-#line 331 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 333 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_instance = NULL;
-#line 2169 "DataImportsUI.c"
+#line 2176 "DataImportsUI.c"
}
static gboolean data_imports_ui_data_imports_dialog_on_window_close (DataImportsUIDataImportsDialog* self, GdkEventAny* evt) {
gboolean result = FALSE;
-#line 334 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_val_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self), FALSE);
-#line 334 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_val_if_fail (evt != NULL, FALSE);
-#line 335 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_debug ("DataImportsUI.vala:335: DataImportsDialog: on_window_close( ): invoked" \
+#line 337 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_debug ("DataImportsUI.vala:337: DataImportsDialog: on_window_close( ): invoked" \
".");
-#line 336 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- data_imports_ui_data_imports_dialog_terminate (self);
#line 338 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ data_imports_ui_data_imports_dialog_terminate (self);
+#line 340 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
result = TRUE;
-#line 338 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return result;
-#line 2187 "DataImportsUI.c"
+#line 2194 "DataImportsUI.c"
}
@@ -2213,232 +2220,232 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU
SpitDataImportsService* _tmp16_ = NULL;
SpitDataImportsConcreteDataImportsHost* _tmp17_ = NULL;
SpitDataImportsConcreteDataImportsHost* _tmp18_ = NULL;
-#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 342 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_debug ("DataImportsUI.vala:342: DataImportsDialog: on_service_changed invoked.");
#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
+#line 344 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_debug ("DataImportsUI.vala:344: DataImportsDialog: on_service_changed invoked.");
+#line 345 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->service_selector_box;
-#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = gtk_combo_box_text_get_active_text (_tmp0_);
-#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- service_name = _tmp1_;
#line 345 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ service_name = _tmp1_;
+#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
selected_service = NULL;
-#line 346 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp3_ = spit_data_imports_load_all_services (&_tmp2_);
-#line 346 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
services = _tmp3_;
-#line 346 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
services_length1 = _tmp2_;
-#line 346 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_services_size_ = services_length1;
-#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp4_ = services;
-#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp4__length1 = services_length1;
-#line 2235 "DataImportsUI.c"
+#line 2242 "DataImportsUI.c"
{
SpitDataImportsService** service_collection = NULL;
gint service_collection_length1 = 0;
gint _service_collection_size_ = 0;
gint service_it = 0;
-#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
service_collection = _tmp4_;
-#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
service_collection_length1 = _tmp4__length1;
-#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
for (service_it = 0; service_it < _tmp4__length1; service_it = service_it + 1) {
-#line 2247 "DataImportsUI.c"
+#line 2254 "DataImportsUI.c"
SpitDataImportsService* _tmp5_ = NULL;
SpitDataImportsService* service = NULL;
-#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp5_ = _g_object_ref0 (service_collection[service_it]);
-#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
service = _tmp5_;
-#line 2254 "DataImportsUI.c"
+#line 2261 "DataImportsUI.c"
{
SpitDataImportsService* _tmp6_ = NULL;
const gchar* _tmp7_ = NULL;
const gchar* _tmp8_ = NULL;
-#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp6_ = service;
-#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp7_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp8_ = service_name;
-#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 2267 "DataImportsUI.c"
+#line 2274 "DataImportsUI.c"
SpitDataImportsService* _tmp9_ = NULL;
SpitDataImportsService* _tmp10_ = NULL;
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp9_ = service;
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp10_ = _g_object_ref0 (_tmp9_);
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (selected_service);
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
selected_service = _tmp10_;
-#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 352 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (service);
-#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 352 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
break;
-#line 2282 "DataImportsUI.c"
+#line 2289 "DataImportsUI.c"
}
-#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (service);
-#line 2286 "DataImportsUI.c"
+#line 2293 "DataImportsUI.c"
}
}
}
-#line 353 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp11_ = selected_service;
-#line 353 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _vala_assert (_tmp11_ != NULL, "selected_service != null");
#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _vala_assert (_tmp11_ != NULL, "selected_service != null");
+#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp12_ = config_facade_get_instance ();
-#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp13_ = _tmp12_;
-#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp14_ = selected_service;
-#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp15_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
configuration_facade_set_last_used_dataimports_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp15_);
-#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- _g_object_unref0 (_tmp13_);
#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ _g_object_unref0 (_tmp13_);
+#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp16_ = selected_service;
-#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp17_ = spit_data_imports_concrete_data_imports_host_new (_tmp16_, self);
-#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (self->priv->host);
-#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self->priv->host = _tmp17_;
-#line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp18_ = self->priv->host;
-#line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
spit_data_imports_plugin_host_start_importing (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
-#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
services = (_vala_array_free (services, services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (selected_service);
-#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_free0 (service_name);
-#line 2324 "DataImportsUI.c"
+#line 2331 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_on_close_cancel_clicked (DataImportsUIDataImportsDialog* self) {
-#line 361 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 362 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_debug ("DataImportsUI.vala:362: DataImportsDialog: on_close_cancel_clicked( ):" \
-" invoked.");
#line 364 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_debug ("DataImportsUI.vala:364: DataImportsDialog: on_close_cancel_clicked( ):" \
+" invoked.");
+#line 366 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_terminate (self);
-#line 2335 "DataImportsUI.c"
+#line 2342 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImportsDialog* self) {
SpitDataImportsConcreteDataImportsHost* _tmp0_ = NULL;
-#line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 368 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_debug ("DataImportsUI.vala:368: DataImportsDialog: terminate( ): invoked.");
#line 370 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_debug ("DataImportsUI.vala:370: DataImportsDialog: terminate( ): invoked.");
+#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->host;
-#line 370 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp0_ != NULL) {
-#line 2349 "DataImportsUI.c"
+#line 2356 "DataImportsUI.c"
SpitDataImportsConcreteDataImportsHost* _tmp1_ = NULL;
-#line 371 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = self->priv->host;
-#line 371 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
spit_data_imports_plugin_host_stop_importing (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
-#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 374 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (self->priv->host);
-#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 374 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self->priv->host = NULL;
-#line 2359 "DataImportsUI.c"
+#line 2366 "DataImportsUI.c"
}
-#line 375 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 376 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 379 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
-#line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 379 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_instance = NULL;
-#line 2369 "DataImportsUI.c"
+#line 2376 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_set_large_window_mode (DataImportsUIDataImportsDialog* self) {
GtkBox* _tmp0_ = NULL;
-#line 380 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 381 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 383 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_HEIGHT);
-#line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 384 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->central_area_layouter;
-#line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
#line 384 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
+#line 386 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2385 "DataImportsUI.c"
+#line 2392 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_set_colossal_window_mode (DataImportsUIDataImportsDialog* self) {
GtkBox* _tmp0_ = NULL;
-#line 387 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 389 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 388 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 390 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_HEIGHT);
-#line 389 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 391 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->central_area_layouter;
-#line 389 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
#line 391 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
+#line 393 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2401 "DataImportsUI.c"
+#line 2408 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_set_standard_window_mode (DataImportsUIDataImportsDialog* self) {
GtkBox* _tmp0_ = NULL;
-#line 394 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 397 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_HEIGHT);
-#line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 398 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->central_area_layouter;
-#line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
#line 398 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
+#line 400 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2417 "DataImportsUI.c"
+#line 2424 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (DataImportsUIDataImportsDialog* self) {
-#line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 403 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 402 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 2426 "DataImportsUI.c"
+#line 2433 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (DataImportsUIDataImportsDialog* self) {
-#line 405 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 407 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 406 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 408 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2435 "DataImportsUI.c"
+#line 2442 "DataImportsUI.c"
}
@@ -2446,17 +2453,17 @@ SpitDataImportsDialogPane* data_imports_ui_data_imports_dialog_get_active_pane (
SpitDataImportsDialogPane* result = NULL;
SpitDataImportsDialogPane* _tmp0_ = NULL;
SpitDataImportsDialogPane* _tmp1_ = NULL;
-#line 409 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 411 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_val_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self), NULL);
-#line 410 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->active_pane;
-#line 410 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 410 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
result = _tmp1_;
-#line 410 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
return result;
-#line 2453 "DataImportsUI.c"
+#line 2460 "DataImportsUI.c"
}
@@ -2464,58 +2471,58 @@ void data_imports_ui_data_imports_dialog_set_close_button_mode (DataImportsUIDat
GtkButton* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
GtkButton* _tmp2_ = NULL;
-#line 413 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 415 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 414 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->close_cancel_button;
-#line 414 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = _ ("_Close");
-#line 414 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_button_set_label (_tmp0_, _tmp1_);
-#line 415 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 417 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp2_ = self->priv->close_cancel_button;
-#line 415 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 417 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 2473 "DataImportsUI.c"
+#line 2480 "DataImportsUI.c"
}
void data_imports_ui_data_imports_dialog_set_cancel_button_mode (DataImportsUIDataImportsDialog* self) {
GtkButton* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 420 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 419 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 421 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->close_cancel_button;
-#line 419 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 421 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = _ ("_Cancel");
-#line 419 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 421 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_button_set_label (_tmp0_, _tmp1_);
-#line 2488 "DataImportsUI.c"
+#line 2495 "DataImportsUI.c"
}
void data_imports_ui_data_imports_dialog_lock_service (DataImportsUIDataImportsDialog* self) {
GtkComboBoxText* _tmp0_ = NULL;
-#line 422 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 424 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 423 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 425 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->service_selector_box;
-#line 423 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 425 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2500 "DataImportsUI.c"
+#line 2507 "DataImportsUI.c"
}
void data_imports_ui_data_imports_dialog_unlock_service (DataImportsUIDataImportsDialog* self) {
GtkComboBoxText* _tmp0_ = NULL;
-#line 426 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 428 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 427 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->service_selector_box;
-#line 427 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 429 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 2512 "DataImportsUI.c"
+#line 2519 "DataImportsUI.c"
}
@@ -2533,110 +2540,110 @@ void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsD
SpitDataImportsDialogPane* _tmp15_ = NULL;
SpitDataImportsDialogPane* _tmp16_ = NULL;
SpitDataImportsDialogPane* _tmp17_ = NULL;
-#line 430 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 432 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 430 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 432 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (pane));
-#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_debug ("DataImportsUI.vala:431: DataImportsDialog: install_pane( ): invoked.");
#line 433 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_debug ("DataImportsUI.vala:433: DataImportsDialog: install_pane( ): invoked.");
+#line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp0_ = self->priv->active_pane;
-#line 433 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if (_tmp0_ != NULL) {
-#line 2540 "DataImportsUI.c"
+#line 2547 "DataImportsUI.c"
SpitDataImportsDialogPane* _tmp1_ = NULL;
GtkBox* _tmp2_ = NULL;
SpitDataImportsDialogPane* _tmp3_ = NULL;
GtkWidget* _tmp4_ = NULL;
GtkWidget* _tmp5_ = NULL;
-#line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- g_debug ("DataImportsUI.vala:434: DataImportsDialog: install_pane( ): a pane is " \
-"already installed; removing it.");
#line 436 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ g_debug ("DataImportsUI.vala:436: DataImportsDialog: install_pane( ): a pane is " \
+"already installed; removing it.");
+#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp1_ = self->priv->active_pane;
-#line 436 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 438 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
spit_data_imports_dialog_pane_on_pane_uninstalled (_tmp1_);
-#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp2_ = self->priv->central_area_layouter;
-#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp3_ = self->priv->active_pane;
-#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp4_ = spit_data_imports_dialog_pane_get_widget (_tmp3_);
-#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp5_ = _tmp4_;
-#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), _tmp5_);
-#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (_tmp5_);
-#line 2564 "DataImportsUI.c"
+#line 2571 "DataImportsUI.c"
}
-#line 440 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp6_ = self->priv->central_area_layouter;
-#line 440 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp7_ = pane;
-#line 440 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp8_ = spit_data_imports_dialog_pane_get_widget (_tmp7_);
-#line 440 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp9_ = _tmp8_;
-#line 440 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
gtk_box_pack_start (_tmp6_, _tmp9_, TRUE, TRUE, (guint) 0);
-#line 440 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (_tmp9_);
-#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 443 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 445 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp10_ = pane;
-#line 443 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 445 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp11_ = spit_data_imports_dialog_pane_get_preferred_geometry (_tmp10_);
-#line 443 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
- geometry_options = _tmp11_;
#line 445 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+ geometry_options = _tmp11_;
+#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp12_ = geometry_options;
-#line 445 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if ((_tmp12_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) {
-#line 446 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 448 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_set_large_window_mode (self);
-#line 2592 "DataImportsUI.c"
+#line 2599 "DataImportsUI.c"
} else {
SpitDataImportsDialogPaneGeometryOptions _tmp13_ = 0;
-#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 449 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp13_ = geometry_options;
-#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 449 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if ((_tmp13_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) {
-#line 448 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 450 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_set_colossal_window_mode (self);
-#line 2601 "DataImportsUI.c"
+#line 2608 "DataImportsUI.c"
} else {
-#line 450 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_set_standard_window_mode (self);
-#line 2605 "DataImportsUI.c"
+#line 2612 "DataImportsUI.c"
}
}
-#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 454 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp14_ = geometry_options;
-#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 454 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
if ((_tmp14_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) {
-#line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 455 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (self);
-#line 2614 "DataImportsUI.c"
+#line 2621 "DataImportsUI.c"
} else {
-#line 455 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (self);
-#line 2618 "DataImportsUI.c"
+#line 2625 "DataImportsUI.c"
}
-#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp15_ = pane;
-#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_g_object_unref0 (self->priv->active_pane);
-#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 459 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self->priv->active_pane = _tmp16_;
-#line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 460 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
_tmp17_ = pane;
-#line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 460 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
spit_data_imports_dialog_pane_on_pane_installed (_tmp17_);
-#line 2632 "DataImportsUI.c"
+#line 2639 "DataImportsUI.c"
}
@@ -2647,14 +2654,14 @@ static void data_imports_ui_data_imports_dialog_class_init (DataImportsUIDataImp
g_type_class_add_private (klass, sizeof (DataImportsUIDataImportsDialogPrivate));
#line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
G_OBJECT_CLASS (klass)->finalize = data_imports_ui_data_imports_dialog_finalize;
-#line 2643 "DataImportsUI.c"
+#line 2650 "DataImportsUI.c"
}
static void data_imports_ui_data_imports_dialog_instance_init (DataImportsUIDataImportsDialog * self) {
#line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
self->priv = DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_GET_PRIVATE (self);
-#line 2650 "DataImportsUI.c"
+#line 2657 "DataImportsUI.c"
}
@@ -2674,7 +2681,7 @@ static void data_imports_ui_data_imports_dialog_finalize (GObject* obj) {
_g_object_unref0 (self->priv->host);
#line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
G_OBJECT_CLASS (data_imports_ui_data_imports_dialog_parent_class)->finalize (obj);
-#line 2670 "DataImportsUI.c"
+#line 2677 "DataImportsUI.c"
}
diff --git a/src/data_imports/DataImportsUI.vala b/src/data_imports/DataImportsUI.vala
index 5b94dcb..2c0cd40 100644
--- a/src/data_imports/DataImportsUI.vala
+++ b/src/data_imports/DataImportsUI.vala
@@ -295,7 +295,9 @@ public class DataImportsDialog : Gtk.Dialog {
close_cancel_button = new Gtk.Button.with_mnemonic("_Cancel");
close_cancel_button.set_can_default(true);
((Gtk.HeaderBar) get_header_bar()).pack_start(close_cancel_button);
- ((Gtk.HeaderBar) get_header_bar()).pack_end(service_selector_box);
+ if (service_selector_box != null) {
+ ((Gtk.HeaderBar) get_header_bar()).pack_end(service_selector_box);
+ }
}
else {
add_button (_("_Cancel"), Gtk.ResponseType.CANCEL);
diff --git a/src/direct/DirectPhotoPage.c b/src/direct/DirectPhotoPage.c
index 6f15462..08a3c07 100644
--- a/src/direct/DirectPhotoPage.c
+++ b/src/direct/DirectPhotoPage.c
@@ -359,7 +359,7 @@ typedef struct _AppWindowClass AppWindowClass;
typedef struct _PrintManager PrintManager;
typedef struct _PrintManagerClass PrintManagerClass;
#define _print_manager_unref0(var) ((var == NULL) ? NULL : (var = (print_manager_unref (var), NULL)))
-typedef struct _Block6Data Block6Data;
+typedef struct _Block7Data Block7Data;
#define TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE (direct_fullscreen_photo_page_get_type ())
#define DIRECT_FULLSCREEN_PHOTO_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, DirectFullscreenPhotoPage))
@@ -577,7 +577,7 @@ struct _ExportFormatParameters {
gboolean export_metadata;
};
-struct _Block6Data {
+struct _Block7Data {
int _ref_count_;
DirectPhotoPage* self;
gboolean should_allow_rotation;
@@ -844,11 +844,11 @@ GType print_manager_get_type (void) G_GNUC_CONST;
PrintManager* print_manager_get_instance (void);
void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print);
GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t);
-static Block6Data* block6_data_ref (Block6Data* _data6_);
-static void block6_data_unref (void * _userdata_);
-static gboolean __lambda15_ (Block6Data* _data6_);
+static Block7Data* block7_data_ref (Block7Data* _data7_);
+static void block7_data_unref (void * _userdata_);
+static gboolean __lambda16_ (Block7Data* _data7_);
void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable);
-static gboolean ___lambda15__gsource_func (gpointer self);
+static gboolean ___lambda16__gsource_func (gpointer self);
static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base, DataSource* source);
static void direct_photo_page_finalize (GObject* obj);
GType direct_fullscreen_photo_page_get_type (void) G_GNUC_CONST;
@@ -3679,41 +3679,41 @@ static void direct_photo_page_on_print (DirectPhotoPage* self) {
}
-static Block6Data* block6_data_ref (Block6Data* _data6_) {
+static Block7Data* block7_data_ref (Block7Data* _data7_) {
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- g_atomic_int_inc (&_data6_->_ref_count_);
+ g_atomic_int_inc (&_data7_->_ref_count_);
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- return _data6_;
+ return _data7_;
#line 3688 "DirectPhotoPage.c"
}
-static void block6_data_unref (void * _userdata_) {
- Block6Data* _data6_;
- _data6_ = (Block6Data*) _userdata_;
+static void block7_data_unref (void * _userdata_) {
+ Block7Data* _data7_;
+ _data7_ = (Block7Data*) _userdata_;
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) {
+ if (g_atomic_int_dec_and_test (&_data7_->_ref_count_)) {
#line 3697 "DirectPhotoPage.c"
DirectPhotoPage* self;
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- self = _data6_->self;
+ self = _data7_->self;
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_g_object_unref0 (self);
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- g_slice_free (Block6Data, _data6_);
+ g_slice_free (Block7Data, _data7_);
#line 3705 "DirectPhotoPage.c"
}
}
-static gboolean __lambda15_ (Block6Data* _data6_) {
+static gboolean __lambda16_ (Block7Data* _data7_) {
DirectPhotoPage* self;
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- self = _data6_->self;
+ self = _data7_->self;
#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _tmp0_ = _data6_->should_allow_rotation;
+ _tmp0_ = _data7_->should_allow_rotation;
#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
editing_host_page_enable_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp0_);
#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -3724,9 +3724,9 @@ static gboolean __lambda15_ (Block6Data* _data6_) {
}
-static gboolean ___lambda15__gsource_func (gpointer self) {
+static gboolean ___lambda16__gsource_func (gpointer self) {
gboolean result;
- result = __lambda15_ (self);
+ result = __lambda16_ (self);
#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
return result;
#line 3733 "DirectPhotoPage.c"
@@ -3734,26 +3734,26 @@ static gboolean ___lambda15__gsource_func (gpointer self) {
static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* self, gboolean should_allow_rotation) {
- Block6Data* _data6_;
+ Block7Data* _data7_;
gboolean _tmp0_ = FALSE;
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _data6_ = g_slice_new0 (Block6Data);
+ _data7_ = g_slice_new0 (Block7Data);
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _data6_->_ref_count_ = 1;
+ _data7_->_ref_count_ = 1;
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _data6_->self = g_object_ref (self);
+ _data7_->self = g_object_ref (self);
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
_tmp0_ = should_allow_rotation;
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _data6_->should_allow_rotation = _tmp0_;
+ _data7_->should_allow_rotation = _tmp0_;
#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda15__gsource_func, block6_data_ref (_data6_), block6_data_unref);
+ g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda16__gsource_func, block7_data_ref (_data7_), block7_data_unref);
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- block6_data_unref (_data6_);
+ block7_data_unref (_data7_);
#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
- _data6_ = NULL;
+ _data7_ = NULL;
#line 3758 "DirectPhotoPage.c"
}
diff --git a/src/events/Branch.c b/src/events/Branch.c
index 2320a00..c73d166 100644
--- a/src/events/Branch.c
+++ b/src/events/Branch.c
@@ -303,8 +303,8 @@ typedef struct _EventID EventID;
typedef struct _SidebarRenameableEntry SidebarRenameableEntry;
typedef struct _SidebarRenameableEntryIface SidebarRenameableEntryIface;
#define _alteration_unref0(var) ((var == NULL) ? NULL : (var = (alteration_unref (var), NULL)))
-typedef struct _Block7Data Block7Data;
typedef struct _Block8Data Block8Data;
+typedef struct _Block9Data Block9Data;
#define SIDEBAR_TYPE_SELECTABLE_ENTRY (sidebar_selectable_entry_get_type ())
#define SIDEBAR_SELECTABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY, SidebarSelectableEntry))
@@ -594,14 +594,14 @@ struct _SidebarRenameableEntryIface {
gboolean (*is_user_renameable) (SidebarRenameableEntry* self);
};
-struct _Block7Data {
+struct _Block8Data {
int _ref_count_;
EventsBranch* self;
gint event_month;
};
typedef gboolean (*Locator) (gconstpointer item, void* user_data);
-struct _Block8Data {
+struct _Block9Data {
int _ref_count_;
EventsBranch* self;
gint event_year;
@@ -871,16 +871,16 @@ static void events_branch_reparent_event (EventsBranch* self, Event* event, Side
SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry);
void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent);
-static Block7Data* block7_data_ref (Block7Data* _data7_);
-static void block7_data_unref (void * _userdata_);
+static Block8Data* block8_data_ref (Block8Data* _data8_);
+static void block8_data_unref (void * _userdata_);
static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* event, struct tm* event_tm);
SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry* parent, Locator locator, void* locator_target);
-static gboolean __lambda17_ (Block7Data* _data7_, SidebarEntry* entry);
+static gboolean __lambda18_ (Block8Data* _data8_, SidebarEntry* entry);
+static gboolean ___lambda18__locator (gconstpointer item, gpointer self);
+static Block9Data* block9_data_ref (Block9Data* _data9_);
+static void block9_data_unref (void * _userdata_);
+static gboolean __lambda17_ (Block9Data* _data9_, SidebarEntry* entry);
static gboolean ___lambda17__locator (gconstpointer item, gpointer self);
-static Block8Data* block8_data_ref (Block8Data* _data8_);
-static void block8_data_unref (void * _userdata_);
-static gboolean __lambda16_ (Block8Data* _data8_, SidebarEntry* entry);
-static gboolean ___lambda16__locator (gconstpointer item, gpointer self);
gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry);
static gint _events_branch_undated_event_comparator_gcompare_func (gconstpointer a, gconstpointer b);
EventsEventEntry* events_event_entry_new (Event* event);
@@ -2646,41 +2646,41 @@ static void events_branch_remove_event (EventsBranch* self, Event* event) {
}
-static Block7Data* block7_data_ref (Block7Data* _data7_) {
+static Block8Data* block8_data_ref (Block8Data* _data8_) {
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
- g_atomic_int_inc (&_data7_->_ref_count_);
+ g_atomic_int_inc (&_data8_->_ref_count_);
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
- return _data7_;
+ return _data8_;
#line 2655 "Branch.c"
}
-static void block7_data_unref (void * _userdata_) {
- Block7Data* _data7_;
- _data7_ = (Block7Data*) _userdata_;
+static void block8_data_unref (void * _userdata_) {
+ Block8Data* _data8_;
+ _data8_ = (Block8Data*) _userdata_;
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
- if (g_atomic_int_dec_and_test (&_data7_->_ref_count_)) {
+ if (g_atomic_int_dec_and_test (&_data8_->_ref_count_)) {
#line 2664 "Branch.c"
EventsBranch* self;
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
- self = _data7_->self;
+ self = _data8_->self;
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (self);
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
- g_slice_free (Block7Data, _data7_);
+ g_slice_free (Block8Data, _data8_);
#line 2672 "Branch.c"
}
}
-static gboolean __lambda17_ (Block7Data* _data7_, SidebarEntry* entry) {
+static gboolean __lambda18_ (Block8Data* _data8_, SidebarEntry* entry) {
EventsBranch* self;
gboolean result = FALSE;
SidebarEntry* _tmp0_ = NULL;
gint _tmp1_ = 0;
gint _tmp2_ = 0;
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
- self = _data7_->self;
+ self = _data8_->self;
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
#line 308 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2688,7 +2688,7 @@ static gboolean __lambda17_ (Block7Data* _data7_, SidebarEntry* entry) {
#line 308 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp1_ = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry));
#line 308 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp2_ = _data7_->event_month;
+ _tmp2_ = _data8_->event_month;
#line 308 "/home/jens/Source/shotwell/src/events/Branch.vala"
result = _tmp1_ == _tmp2_;
#line 308 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2697,9 +2697,9 @@ static gboolean __lambda17_ (Block7Data* _data7_, SidebarEntry* entry) {
}
-static gboolean ___lambda17__locator (gconstpointer item, gpointer self) {
+static gboolean ___lambda18__locator (gconstpointer item, gpointer self) {
gboolean result;
- result = __lambda17_ (self, (SidebarEntry*) item);
+ result = __lambda18_ (self, (SidebarEntry*) item);
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
#line 2706 "Branch.c"
@@ -2709,7 +2709,7 @@ static gboolean ___lambda17__locator (gconstpointer item, gpointer self) {
static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* event, struct tm* event_tm, SidebarEntry** found_year) {
SidebarEntry* _vala_found_year = NULL;
SidebarEntry* result = NULL;
- Block7Data* _data7_;
+ Block8Data* _data8_;
Event* _tmp0_ = NULL;
struct tm _tmp1_ = {0};
SidebarEntry* _tmp2_ = NULL;
@@ -2725,11 +2725,11 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event*
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (event_tm != NULL, NULL);
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data7_ = g_slice_new0 (Block7Data);
+ _data8_ = g_slice_new0 (Block8Data);
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data7_->_ref_count_ = 1;
+ _data8_->_ref_count_ = 1;
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data7_->self = g_object_ref (self);
+ _data8_->self = g_object_ref (self);
#line 300 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp0_ = event;
#line 300 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2747,9 +2747,9 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event*
#line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
result = NULL;
#line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
- block7_data_unref (_data7_);
+ block8_data_unref (_data8_);
#line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data7_ = NULL;
+ _data8_ = NULL;
#line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (found_year) {
#line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2769,17 +2769,17 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event*
#line 304 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp5_ = _tmp4_.tm_mon;
#line 304 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data7_->event_month = _tmp5_ + 1;
+ _data8_->event_month = _tmp5_ + 1;
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp6_ = _vala_found_year;
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp7_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp6_, ___lambda17__locator, _data7_);
+ _tmp7_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp6_, ___lambda18__locator, _data8_);
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
result = _tmp7_;
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
- block7_data_unref (_data7_);
+ block8_data_unref (_data8_);
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data7_ = NULL;
+ _data8_ = NULL;
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (found_year) {
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2796,41 +2796,41 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event*
}
-static Block8Data* block8_data_ref (Block8Data* _data8_) {
+static Block9Data* block9_data_ref (Block9Data* _data9_) {
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
- g_atomic_int_inc (&_data8_->_ref_count_);
+ g_atomic_int_inc (&_data9_->_ref_count_);
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
- return _data8_;
+ return _data9_;
#line 2805 "Branch.c"
}
-static void block8_data_unref (void * _userdata_) {
- Block8Data* _data8_;
- _data8_ = (Block8Data*) _userdata_;
+static void block9_data_unref (void * _userdata_) {
+ Block9Data* _data9_;
+ _data9_ = (Block9Data*) _userdata_;
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
- if (g_atomic_int_dec_and_test (&_data8_->_ref_count_)) {
+ if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) {
#line 2814 "Branch.c"
EventsBranch* self;
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
- self = _data8_->self;
+ self = _data9_->self;
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (self);
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
- g_slice_free (Block8Data, _data8_);
+ g_slice_free (Block9Data, _data9_);
#line 2822 "Branch.c"
}
}
-static gboolean __lambda16_ (Block8Data* _data8_, SidebarEntry* entry) {
+static gboolean __lambda17_ (Block9Data* _data9_, SidebarEntry* entry) {
EventsBranch* self;
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
SidebarEntry* _tmp2_ = NULL;
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
- self = _data8_->self;
+ self = _data9_->self;
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
#line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2876,7 +2876,7 @@ static gboolean __lambda16_ (Block8Data* _data8_, SidebarEntry* entry) {
#line 320 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp6_ = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry));
#line 320 "/home/jens/Source/shotwell/src/events/Branch.vala"
- result = _tmp6_ == _data8_->event_year;
+ result = _tmp6_ == _data9_->event_year;
#line 320 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
#line 2883 "Branch.c"
@@ -2884,9 +2884,9 @@ static gboolean __lambda16_ (Block8Data* _data8_, SidebarEntry* entry) {
}
-static gboolean ___lambda16__locator (gconstpointer item, gpointer self) {
+static gboolean ___lambda17__locator (gconstpointer item, gpointer self) {
gboolean result;
- result = __lambda16_ (self, (SidebarEntry*) item);
+ result = __lambda17_ (self, (SidebarEntry*) item);
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
#line 2893 "Branch.c"
@@ -2895,7 +2895,7 @@ static gboolean ___lambda16__locator (gconstpointer item, gpointer self) {
static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* event, struct tm* event_tm) {
SidebarEntry* result = NULL;
- Block8Data* _data8_;
+ Block9Data* _data9_;
struct tm _tmp0_ = {0};
gint _tmp1_ = 0;
SidebarEntry* _tmp2_ = NULL;
@@ -2909,23 +2909,23 @@ static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* e
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (event_tm != NULL, NULL);
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data8_ = g_slice_new0 (Block8Data);
+ _data9_ = g_slice_new0 (Block9Data);
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data8_->_ref_count_ = 1;
+ _data9_->_ref_count_ = 1;
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data8_->self = g_object_ref (self);
+ _data9_->self = g_object_ref (self);
#line 313 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp0_ = *event_tm;
#line 313 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp1_ = _tmp0_.tm_year;
#line 313 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data8_->event_year = _tmp1_ + 1900;
+ _data9_->event_year = _tmp1_ + 1900;
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp3_ = _tmp2_;
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp4_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, ___lambda16__locator, _data8_);
+ _tmp4_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, ___lambda17__locator, _data9_);
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp5_ = _tmp4_;
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2933,9 +2933,9 @@ static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* e
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
result = _tmp5_;
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
- block8_data_unref (_data8_);
+ block9_data_unref (_data9_);
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data8_ = NULL;
+ _data9_ = NULL;
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
#line 2942 "Branch.c"
diff --git a/src/photos/PhotoFileFormat.c b/src/photos/PhotoFileFormat.c
index f34e451..578b1b3 100644
--- a/src/photos/PhotoFileFormat.c
+++ b/src/photos/PhotoFileFormat.c
@@ -270,14 +270,14 @@ gboolean photo_file_format_can_write (PhotoFileFormat self);
static gboolean ____lambda4__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
static PhotoFileFormat* _vala_array_dup1 (PhotoFileFormat* self, int length);
PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1);
-static gboolean ___lambda22_ (PhotoFileFormat format);
+static gboolean ___lambda23_ (PhotoFileFormat format);
gboolean photo_file_format_can_write_image (PhotoFileFormat self);
-static gboolean ____lambda22__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
+static gboolean ____lambda23__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, int length);
PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_length1);
-static gboolean ___lambda23_ (PhotoFileFormat format);
+static gboolean ___lambda24_ (PhotoFileFormat format);
gboolean photo_file_format_can_write_metadata (PhotoFileFormat self);
-static gboolean ____lambda23__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
+static gboolean ____lambda24__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self);
static PhotoFileFormat* _vala_array_dup3 (PhotoFileFormat* self, int length);
PhotoFileFormat* photo_file_format_get_writeable (int* result_length1);
PhotoFileFormat* photo_file_format_get_image_writeable (int* result_length1);
@@ -610,7 +610,7 @@ PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) {
}
-static gboolean ___lambda22_ (PhotoFileFormat format) {
+static gboolean ___lambda23_ (PhotoFileFormat format) {
gboolean result = FALSE;
PhotoFileFormat _tmp0_ = 0;
gboolean _tmp1_ = FALSE;
@@ -626,9 +626,9 @@ static gboolean ___lambda22_ (PhotoFileFormat format) {
}
-static gboolean ____lambda22__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) {
+static gboolean ____lambda23__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) {
gboolean result;
- result = ___lambda22_ (format);
+ result = ___lambda23_ (format);
#line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return result;
#line 635 "PhotoFileFormat.c"
@@ -662,7 +662,7 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1
gint _tmp1_ = 0;
PhotoFileFormat* _tmp2_ = NULL;
#line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- _tmp2_ = photo_file_format_data_find_applicable (____lambda22__photo_file_format_data_applicable_test, NULL, &_tmp1_);
+ _tmp2_ = photo_file_format_data_find_applicable (____lambda23__photo_file_format_data_applicable_test, NULL, &_tmp1_);
#line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
photo_file_format_data_image_writeable = (g_free (photo_file_format_data_image_writeable), NULL);
#line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -699,7 +699,7 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1
}
-static gboolean ___lambda23_ (PhotoFileFormat format) {
+static gboolean ___lambda24_ (PhotoFileFormat format) {
gboolean result = FALSE;
PhotoFileFormat _tmp0_ = 0;
gboolean _tmp1_ = FALSE;
@@ -715,9 +715,9 @@ static gboolean ___lambda23_ (PhotoFileFormat format) {
}
-static gboolean ____lambda23__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) {
+static gboolean ____lambda24__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) {
gboolean result;
- result = ___lambda23_ (format);
+ result = ___lambda24_ (format);
#line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return result;
#line 724 "PhotoFileFormat.c"
@@ -751,7 +751,7 @@ PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_leng
gint _tmp1_ = 0;
PhotoFileFormat* _tmp2_ = NULL;
#line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- _tmp2_ = photo_file_format_data_find_applicable (____lambda23__photo_file_format_data_applicable_test, NULL, &_tmp1_);
+ _tmp2_ = photo_file_format_data_find_applicable (____lambda24__photo_file_format_data_applicable_test, NULL, &_tmp1_);
#line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
photo_file_format_data_metadata_writeable = (g_free (photo_file_format_data_metadata_writeable), NULL);
#line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
diff --git a/src/photos/PhotoMetadata.c b/src/photos/PhotoMetadata.c
index a30a3b4..6f7c8c7 100644
--- a/src/photos/PhotoMetadata.c
+++ b/src/photos/PhotoMetadata.c
@@ -164,6 +164,7 @@ typedef struct _Block5Data Block5Data;
typedef struct _PhotoMetadataInternalPhotoPreview PhotoMetadataInternalPhotoPreview;
typedef struct _PhotoMetadataInternalPhotoPreviewClass PhotoMetadataInternalPhotoPreviewClass;
+typedef struct _Block6Data Block6Data;
#define TYPE_HIERARCHICAL_TAG_INDEX (hierarchical_tag_index_get_type ())
#define HIERARCHICAL_TAG_INDEX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_HIERARCHICAL_TAG_INDEX, HierarchicalTagIndex))
@@ -373,6 +374,12 @@ struct _Block5Data {
MetadataDateTime* date_time;
};
+struct _Block6Data {
+ int _ref_count_;
+ PhotoMetadata* self;
+ gchar* comment;
+};
+
typedef enum {
ORIENTATION_MIN = 1,
ORIENTATION_TOP_LEFT = 1,
@@ -681,6 +688,10 @@ gboolean is_string_empty (const gchar* s);
void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMetadataSetOption option);
static gchar* photo_metadata_real_get_comment (MediaMetadata* base);
void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, PhotoMetadataSetOption option);
+static Block6Data* block6_data_ref (Block6Data* _data6_);
+static void block6_data_unref (void * _userdata_);
+static void ___lambda10_ (Block6Data* _data6_, const gchar* tag);
+static void ____lambda10__photo_metadata_set_generic_value (const gchar* tag, gpointer self);
GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify);
gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag);
gpointer hierarchical_tag_index_ref (gpointer instance);
@@ -761,7 +772,7 @@ static GeeList* keyword_transformer_real_transform (KeywordTransformer* self, co
g_critical ("Type `%s' does not implement abstract method `keyword_transformer_transform'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 32 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 765 "PhotoMetadata.c"
+#line 776 "PhotoMetadata.c"
}
@@ -770,7 +781,7 @@ GeeList* keyword_transformer_transform (KeywordTransformer* self, const gchar* i
g_return_val_if_fail (IS_KEYWORD_TRANSFORMER (self), NULL);
#line 32 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return KEYWORD_TRANSFORMER_GET_CLASS (self)->transform (self, input, error);
-#line 774 "PhotoMetadata.c"
+#line 785 "PhotoMetadata.c"
}
@@ -780,14 +791,14 @@ KeywordTransformer* keyword_transformer_construct (GType object_type) {
self = (KeywordTransformer*) g_type_create_instance (object_type);
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self;
-#line 784 "PhotoMetadata.c"
+#line 795 "PhotoMetadata.c"
}
static void value_keyword_transformer_init (GValue* value) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 791 "PhotoMetadata.c"
+#line 802 "PhotoMetadata.c"
}
@@ -796,7 +807,7 @@ static void value_keyword_transformer_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
keyword_transformer_unref (value->data[0].v_pointer);
-#line 800 "PhotoMetadata.c"
+#line 811 "PhotoMetadata.c"
}
}
@@ -806,11 +817,11 @@ static void value_keyword_transformer_copy_value (const GValue* src_value, GValu
if (src_value->data[0].v_pointer) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
dest_value->data[0].v_pointer = keyword_transformer_ref (src_value->data[0].v_pointer);
-#line 810 "PhotoMetadata.c"
+#line 821 "PhotoMetadata.c"
} else {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
dest_value->data[0].v_pointer = NULL;
-#line 814 "PhotoMetadata.c"
+#line 825 "PhotoMetadata.c"
}
}
@@ -818,37 +829,37 @@ static void value_keyword_transformer_copy_value (const GValue* src_value, GValu
static gpointer value_keyword_transformer_peek_pointer (const GValue* value) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return value->data[0].v_pointer;
-#line 822 "PhotoMetadata.c"
+#line 833 "PhotoMetadata.c"
}
static gchar* value_keyword_transformer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (collect_values[0].v_pointer) {
-#line 829 "PhotoMetadata.c"
+#line 840 "PhotoMetadata.c"
KeywordTransformer* object;
object = collect_values[0].v_pointer;
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (object->parent_instance.g_class == NULL) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 836 "PhotoMetadata.c"
+#line 847 "PhotoMetadata.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.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 840 "PhotoMetadata.c"
+#line 851 "PhotoMetadata.c"
}
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = keyword_transformer_ref (object);
-#line 844 "PhotoMetadata.c"
+#line 855 "PhotoMetadata.c"
} else {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 848 "PhotoMetadata.c"
+#line 859 "PhotoMetadata.c"
}
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 852 "PhotoMetadata.c"
+#line 863 "PhotoMetadata.c"
}
@@ -859,25 +870,25 @@ static gchar* value_keyword_transformer_lcopy_value (const GValue* value, guint
if (!object_p) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 863 "PhotoMetadata.c"
+#line 874 "PhotoMetadata.c"
}
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!value->data[0].v_pointer) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*object_p = NULL;
-#line 869 "PhotoMetadata.c"
+#line 880 "PhotoMetadata.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*object_p = value->data[0].v_pointer;
-#line 873 "PhotoMetadata.c"
+#line 884 "PhotoMetadata.c"
} else {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*object_p = keyword_transformer_ref (value->data[0].v_pointer);
-#line 877 "PhotoMetadata.c"
+#line 888 "PhotoMetadata.c"
}
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 881 "PhotoMetadata.c"
+#line 892 "PhotoMetadata.c"
}
@@ -891,7 +902,7 @@ GParamSpec* param_spec_keyword_transformer (const gchar* name, const gchar* nick
G_PARAM_SPEC (spec)->value_type = object_type;
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return G_PARAM_SPEC (spec);
-#line 895 "PhotoMetadata.c"
+#line 906 "PhotoMetadata.c"
}
@@ -900,7 +911,7 @@ gpointer value_get_keyword_transformer (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEYWORD_TRANSFORMER), NULL);
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return value->data[0].v_pointer;
-#line 904 "PhotoMetadata.c"
+#line 915 "PhotoMetadata.c"
}
@@ -920,17 +931,17 @@ void value_set_keyword_transformer (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
keyword_transformer_ref (value->data[0].v_pointer);
-#line 924 "PhotoMetadata.c"
+#line 935 "PhotoMetadata.c"
} else {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 928 "PhotoMetadata.c"
+#line 939 "PhotoMetadata.c"
}
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (old) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
keyword_transformer_unref (old);
-#line 934 "PhotoMetadata.c"
+#line 945 "PhotoMetadata.c"
}
}
@@ -949,17 +960,17 @@ void value_take_keyword_transformer (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = v_object;
-#line 953 "PhotoMetadata.c"
+#line 964 "PhotoMetadata.c"
} else {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 957 "PhotoMetadata.c"
+#line 968 "PhotoMetadata.c"
}
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (old) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
keyword_transformer_unref (old);
-#line 963 "PhotoMetadata.c"
+#line 974 "PhotoMetadata.c"
}
}
@@ -971,14 +982,14 @@ static void keyword_transformer_class_init (KeywordTransformerClass * klass) {
((KeywordTransformerClass *) klass)->finalize = keyword_transformer_finalize;
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
((KeywordTransformerClass *) klass)->transform = (GeeList* (*)(KeywordTransformer*, const gchar*, GError**)) keyword_transformer_real_transform;
-#line 975 "PhotoMetadata.c"
+#line 986 "PhotoMetadata.c"
}
static void keyword_transformer_instance_init (KeywordTransformer * self) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->ref_count = 1;
-#line 982 "PhotoMetadata.c"
+#line 993 "PhotoMetadata.c"
}
@@ -988,7 +999,7 @@ static void keyword_transformer_finalize (KeywordTransformer* obj) {
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer);
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_signal_handlers_destroy (self);
-#line 992 "PhotoMetadata.c"
+#line 1003 "PhotoMetadata.c"
}
@@ -1013,7 +1024,7 @@ gpointer keyword_transformer_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return instance;
-#line 1017 "PhotoMetadata.c"
+#line 1028 "PhotoMetadata.c"
}
@@ -1026,7 +1037,7 @@ void keyword_transformer_unref (gpointer instance) {
KEYWORD_TRANSFORMER_GET_CLASS (self)->finalize (self);
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1030 "PhotoMetadata.c"
+#line 1041 "PhotoMetadata.c"
}
}
@@ -1053,7 +1064,7 @@ static GeeList* null_keyword_transformer_real_transform (KeywordTransformer* bas
result = G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_LIST, GeeList);
#line 40 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1057 "PhotoMetadata.c"
+#line 1068 "PhotoMetadata.c"
}
@@ -1063,14 +1074,14 @@ NullKeywordTransformer* null_keyword_transformer_construct (GType object_type) {
self = (NullKeywordTransformer*) keyword_transformer_construct (object_type);
#line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self;
-#line 1067 "PhotoMetadata.c"
+#line 1078 "PhotoMetadata.c"
}
NullKeywordTransformer* null_keyword_transformer_new (void) {
#line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return null_keyword_transformer_construct (TYPE_NULL_KEYWORD_TRANSFORMER);
-#line 1074 "PhotoMetadata.c"
+#line 1085 "PhotoMetadata.c"
}
@@ -1079,7 +1090,7 @@ static void null_keyword_transformer_class_init (NullKeywordTransformerClass * k
null_keyword_transformer_parent_class = g_type_class_peek_parent (klass);
#line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
((KeywordTransformerClass *) klass)->transform = (GeeList* (*)(KeywordTransformer*, const gchar*, GError**)) null_keyword_transformer_real_transform;
-#line 1083 "PhotoMetadata.c"
+#line 1094 "PhotoMetadata.c"
}
@@ -1102,28 +1113,28 @@ GType null_keyword_transformer_get_type (void) {
static void _acd_see_keyword_transformer_on_start_gmarkup_parser_start_element_func (GMarkupParseContext* context, const gchar* element_name, gchar** attribute_names, gchar** attribute_values, gpointer self, GError** error) {
#line 64 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
acd_see_keyword_transformer_on_start ((ACDSeeKeywordTransformer*) self, context, element_name, attribute_names, attribute_values, error);
-#line 1106 "PhotoMetadata.c"
+#line 1117 "PhotoMetadata.c"
}
static void _acd_see_keyword_transformer_on_end_gmarkup_parser_end_element_func (GMarkupParseContext* context, const gchar* element_name, gpointer self, GError** error) {
#line 65 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
acd_see_keyword_transformer_on_end ((ACDSeeKeywordTransformer*) self, context, element_name, error);
-#line 1113 "PhotoMetadata.c"
+#line 1124 "PhotoMetadata.c"
}
static void _acd_see_keyword_transformer_on_text_gmarkup_parser_text_func (GMarkupParseContext* context, const gchar* text, gsize text_len, gpointer self, GError** error) {
#line 66 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
acd_see_keyword_transformer_on_text ((ACDSeeKeywordTransformer*) self, context, text, error);
-#line 1120 "PhotoMetadata.c"
+#line 1131 "PhotoMetadata.c"
}
static void _acd_see_keyword_transformer_on_error_gmarkup_parser_error_func (GMarkupParseContext* context, GError* _error_, gpointer self) {
#line 67 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
acd_see_keyword_transformer_on_error ((ACDSeeKeywordTransformer*) self, context, _error_);
-#line 1127 "PhotoMetadata.c"
+#line 1138 "PhotoMetadata.c"
}
@@ -1157,21 +1168,21 @@ ACDSeeKeywordTransformer* acd_see_keyword_transformer_construct (GType object_ty
self->priv->stack = _tmp1_;
#line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self;
-#line 1161 "PhotoMetadata.c"
+#line 1172 "PhotoMetadata.c"
}
ACDSeeKeywordTransformer* acd_see_keyword_transformer_new (void) {
#line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return acd_see_keyword_transformer_construct (TYPE_ACD_SEE_KEYWORD_TRANSFORMER);
-#line 1168 "PhotoMetadata.c"
+#line 1179 "PhotoMetadata.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self ? g_object_ref (self) : NULL;
-#line 1175 "PhotoMetadata.c"
+#line 1186 "PhotoMetadata.c"
}
@@ -1216,7 +1227,7 @@ static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer*
_g_markup_parse_context_unref0 (ctx);
#line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 1220 "PhotoMetadata.c"
+#line 1231 "PhotoMetadata.c"
}
#line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = self->priv->result;
@@ -1228,7 +1239,7 @@ static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer*
_g_markup_parse_context_unref0 (ctx);
#line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1232 "PhotoMetadata.c"
+#line 1243 "PhotoMetadata.c"
}
@@ -1255,7 +1266,7 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self
if (g_strcmp0 (_tmp0_, "Categories") == 0) {
#line 90 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 1259 "PhotoMetadata.c"
+#line 1270 "PhotoMetadata.c"
}
#line 93 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = name;
@@ -1263,7 +1274,7 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self
if (g_strcmp0 (_tmp1_, "Category") != 0) {
#line 94 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 1267 "PhotoMetadata.c"
+#line 1278 "PhotoMetadata.c"
}
#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = name;
@@ -1285,7 +1296,7 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self
g_propagate_error (error, _inner_error_);
#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 1289 "PhotoMetadata.c"
+#line 1300 "PhotoMetadata.c"
} else {
#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.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);
@@ -1293,7 +1304,7 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self
g_clear_error (&_inner_error_);
#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 1297 "PhotoMetadata.c"
+#line 1308 "PhotoMetadata.c"
}
}
}
@@ -1311,7 +1322,7 @@ static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self,
_tmp0_ = name;
#line 106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (g_strcmp0 (_tmp0_, "Category") == 0) {
-#line 1315 "PhotoMetadata.c"
+#line 1326 "PhotoMetadata.c"
GeeArrayQueue* _tmp1_ = NULL;
gpointer _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
@@ -1323,7 +1334,7 @@ static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self,
_tmp3_ = (gchar*) _tmp2_;
#line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_tmp3_);
-#line 1327 "PhotoMetadata.c"
+#line 1338 "PhotoMetadata.c"
}
}
@@ -1345,7 +1356,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
if (g_strcmp0 (_tmp0_, "") == 0) {
#line 114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 1349 "PhotoMetadata.c"
+#line 1360 "PhotoMetadata.c"
}
#line 117 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = self->priv->stack;
@@ -1357,7 +1368,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
_tmp3_ = self->priv->assigned;
#line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp3_) {
-#line 1361 "PhotoMetadata.c"
+#line 1372 "PhotoMetadata.c"
GString* builder = NULL;
GString* _tmp4_ = NULL;
GString* _tmp13_ = NULL;
@@ -1369,7 +1380,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
_tmp4_ = g_string_new ("");
#line 119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
builder = _tmp4_;
-#line 1373 "PhotoMetadata.c"
+#line 1384 "PhotoMetadata.c"
{
GeeIterator* _f_it = NULL;
GeeArrayQueue* _tmp5_ = NULL;
@@ -1382,7 +1393,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
_f_it = _tmp6_;
#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 1386 "PhotoMetadata.c"
+#line 1397 "PhotoMetadata.c"
GeeIterator* _tmp7_ = NULL;
gboolean _tmp8_ = FALSE;
gchar* f = NULL;
@@ -1398,7 +1409,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
if (!_tmp8_) {
#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 1402 "PhotoMetadata.c"
+#line 1413 "PhotoMetadata.c"
}
#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = _f_it;
@@ -1414,11 +1425,11 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
g_string_append_printf (_tmp11_, "%s|", _tmp12_);
#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (f);
-#line 1418 "PhotoMetadata.c"
+#line 1429 "PhotoMetadata.c"
}
#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_f_it);
-#line 1422 "PhotoMetadata.c"
+#line 1433 "PhotoMetadata.c"
}
#line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13_ = builder;
@@ -1426,7 +1437,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
_tmp14_ = _tmp13_->len;
#line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp14_ > ((gssize) 0)) {
-#line 1430 "PhotoMetadata.c"
+#line 1441 "PhotoMetadata.c"
GString* _tmp15_ = NULL;
GString* _tmp16_ = NULL;
gssize _tmp17_ = 0L;
@@ -1438,7 +1449,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
_tmp17_ = _tmp16_->len;
#line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_string_truncate (_tmp15_, (gsize) (_tmp17_ - 1));
-#line 1442 "PhotoMetadata.c"
+#line 1453 "PhotoMetadata.c"
}
#line 126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp18_ = self->priv->result;
@@ -1450,7 +1461,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_);
#line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_string_free0 (builder);
-#line 1454 "PhotoMetadata.c"
+#line 1465 "PhotoMetadata.c"
}
}
@@ -1458,7 +1469,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self,
static gpointer _g_error_copy0 (gpointer self) {
#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self ? g_error_copy (self) : NULL;
-#line 1462 "PhotoMetadata.c"
+#line 1473 "PhotoMetadata.c"
}
@@ -1477,7 +1488,7 @@ static void acd_see_keyword_transformer_on_error (ACDSeeKeywordTransformer* self
_g_error_free0 (self->priv->error);
#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->priv->error = _tmp1_;
-#line 1481 "PhotoMetadata.c"
+#line 1492 "PhotoMetadata.c"
}
@@ -1490,14 +1501,14 @@ static void acd_see_keyword_transformer_class_init (ACDSeeKeywordTransformerClas
g_type_class_add_private (klass, sizeof (ACDSeeKeywordTransformerPrivate));
#line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
((KeywordTransformerClass *) klass)->transform = (GeeList* (*)(KeywordTransformer*, const gchar*, GError**)) acd_see_keyword_transformer_real_transform;
-#line 1494 "PhotoMetadata.c"
+#line 1505 "PhotoMetadata.c"
}
static void acd_see_keyword_transformer_instance_init (ACDSeeKeywordTransformer * self) {
#line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->priv = ACD_SEE_KEYWORD_TRANSFORMER_GET_PRIVATE (self);
-#line 1501 "PhotoMetadata.c"
+#line 1512 "PhotoMetadata.c"
}
@@ -1513,7 +1524,7 @@ static void acd_see_keyword_transformer_finalize (KeywordTransformer* obj) {
_g_object_unref0 (self->priv->result);
#line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
KEYWORD_TRANSFORMER_CLASS (acd_see_keyword_transformer_parent_class)->finalize (obj);
-#line 1517 "PhotoMetadata.c"
+#line 1528 "PhotoMetadata.c"
}
@@ -1532,7 +1543,7 @@ GType acd_see_keyword_transformer_get_type (void) {
static gpointer _keyword_transformer_ref0 (gpointer self) {
#line 154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self ? keyword_transformer_ref (self) : NULL;
-#line 1536 "PhotoMetadata.c"
+#line 1547 "PhotoMetadata.c"
}
@@ -1588,21 +1599,21 @@ HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_typ
self->transformer = _tmp7_;
#line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self;
-#line 1592 "PhotoMetadata.c"
+#line 1603 "PhotoMetadata.c"
}
HierarchicalKeywordField* hierarchical_keyword_field_new (const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer) {
#line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return hierarchical_keyword_field_construct (TYPE_HIERARCHICAL_KEYWORD_FIELD, field_name, path_separator, wants_leading_separator, is_writeable, transformer);
-#line 1599 "PhotoMetadata.c"
+#line 1610 "PhotoMetadata.c"
}
static void value_hierarchical_keyword_field_init (GValue* value) {
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 1606 "PhotoMetadata.c"
+#line 1617 "PhotoMetadata.c"
}
@@ -1611,7 +1622,7 @@ static void value_hierarchical_keyword_field_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
hierarchical_keyword_field_unref (value->data[0].v_pointer);
-#line 1615 "PhotoMetadata.c"
+#line 1626 "PhotoMetadata.c"
}
}
@@ -1621,11 +1632,11 @@ static void value_hierarchical_keyword_field_copy_value (const GValue* src_value
if (src_value->data[0].v_pointer) {
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
dest_value->data[0].v_pointer = hierarchical_keyword_field_ref (src_value->data[0].v_pointer);
-#line 1625 "PhotoMetadata.c"
+#line 1636 "PhotoMetadata.c"
} else {
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1629 "PhotoMetadata.c"
+#line 1640 "PhotoMetadata.c"
}
}
@@ -1633,37 +1644,37 @@ static void value_hierarchical_keyword_field_copy_value (const GValue* src_value
static gpointer value_hierarchical_keyword_field_peek_pointer (const GValue* value) {
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return value->data[0].v_pointer;
-#line 1637 "PhotoMetadata.c"
+#line 1648 "PhotoMetadata.c"
}
static gchar* value_hierarchical_keyword_field_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (collect_values[0].v_pointer) {
-#line 1644 "PhotoMetadata.c"
+#line 1655 "PhotoMetadata.c"
HierarchicalKeywordField* object;
object = collect_values[0].v_pointer;
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (object->parent_instance.g_class == NULL) {
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1651 "PhotoMetadata.c"
+#line 1662 "PhotoMetadata.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.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 1655 "PhotoMetadata.c"
+#line 1666 "PhotoMetadata.c"
}
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = hierarchical_keyword_field_ref (object);
-#line 1659 "PhotoMetadata.c"
+#line 1670 "PhotoMetadata.c"
} else {
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 1663 "PhotoMetadata.c"
+#line 1674 "PhotoMetadata.c"
}
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 1667 "PhotoMetadata.c"
+#line 1678 "PhotoMetadata.c"
}
@@ -1674,25 +1685,25 @@ static gchar* value_hierarchical_keyword_field_lcopy_value (const GValue* value,
if (!object_p) {
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1678 "PhotoMetadata.c"
+#line 1689 "PhotoMetadata.c"
}
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!value->data[0].v_pointer) {
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*object_p = NULL;
-#line 1684 "PhotoMetadata.c"
+#line 1695 "PhotoMetadata.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*object_p = value->data[0].v_pointer;
-#line 1688 "PhotoMetadata.c"
+#line 1699 "PhotoMetadata.c"
} else {
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*object_p = hierarchical_keyword_field_ref (value->data[0].v_pointer);
-#line 1692 "PhotoMetadata.c"
+#line 1703 "PhotoMetadata.c"
}
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 1696 "PhotoMetadata.c"
+#line 1707 "PhotoMetadata.c"
}
@@ -1706,7 +1717,7 @@ GParamSpec* param_spec_hierarchical_keyword_field (const gchar* name, const gcha
G_PARAM_SPEC (spec)->value_type = object_type;
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return G_PARAM_SPEC (spec);
-#line 1710 "PhotoMetadata.c"
+#line 1721 "PhotoMetadata.c"
}
@@ -1715,7 +1726,7 @@ gpointer value_get_hierarchical_keyword_field (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_KEYWORD_FIELD), NULL);
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return value->data[0].v_pointer;
-#line 1719 "PhotoMetadata.c"
+#line 1730 "PhotoMetadata.c"
}
@@ -1735,17 +1746,17 @@ void value_set_hierarchical_keyword_field (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
hierarchical_keyword_field_ref (value->data[0].v_pointer);
-#line 1739 "PhotoMetadata.c"
+#line 1750 "PhotoMetadata.c"
} else {
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 1743 "PhotoMetadata.c"
+#line 1754 "PhotoMetadata.c"
}
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (old) {
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
hierarchical_keyword_field_unref (old);
-#line 1749 "PhotoMetadata.c"
+#line 1760 "PhotoMetadata.c"
}
}
@@ -1764,17 +1775,17 @@ void value_take_hierarchical_keyword_field (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = v_object;
-#line 1768 "PhotoMetadata.c"
+#line 1779 "PhotoMetadata.c"
} else {
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 1772 "PhotoMetadata.c"
+#line 1783 "PhotoMetadata.c"
}
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (old) {
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
hierarchical_keyword_field_unref (old);
-#line 1778 "PhotoMetadata.c"
+#line 1789 "PhotoMetadata.c"
}
}
@@ -1784,14 +1795,14 @@ static void hierarchical_keyword_field_class_init (HierarchicalKeywordFieldClass
hierarchical_keyword_field_parent_class = g_type_class_peek_parent (klass);
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
((HierarchicalKeywordFieldClass *) klass)->finalize = hierarchical_keyword_field_finalize;
-#line 1788 "PhotoMetadata.c"
+#line 1799 "PhotoMetadata.c"
}
static void hierarchical_keyword_field_instance_init (HierarchicalKeywordField * self) {
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->ref_count = 1;
-#line 1795 "PhotoMetadata.c"
+#line 1806 "PhotoMetadata.c"
}
@@ -1807,7 +1818,7 @@ static void hierarchical_keyword_field_finalize (HierarchicalKeywordField* obj)
_g_free0 (self->path_separator);
#line 142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_keyword_transformer_unref0 (self->transformer);
-#line 1811 "PhotoMetadata.c"
+#line 1822 "PhotoMetadata.c"
}
@@ -1832,7 +1843,7 @@ gpointer hierarchical_keyword_field_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return instance;
-#line 1836 "PhotoMetadata.c"
+#line 1847 "PhotoMetadata.c"
}
@@ -1845,7 +1856,7 @@ void hierarchical_keyword_field_unref (gpointer instance) {
HIERARCHICAL_KEYWORD_FIELD_GET_CLASS (self)->finalize (self);
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1849 "PhotoMetadata.c"
+#line 1860 "PhotoMetadata.c"
}
}
@@ -1904,7 +1915,7 @@ PhotoPreview* photo_preview_construct (GType object_type, const gchar* name, Dim
self->priv->extension = _tmp7_;
#line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self;
-#line 1908 "PhotoMetadata.c"
+#line 1919 "PhotoMetadata.c"
}
@@ -1922,7 +1933,7 @@ gchar* photo_preview_get_name (PhotoPreview* self) {
result = _tmp1_;
#line 174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1926 "PhotoMetadata.c"
+#line 1937 "PhotoMetadata.c"
}
@@ -1936,7 +1947,7 @@ void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result)
*result = _tmp0_;
#line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 1940 "PhotoMetadata.c"
+#line 1951 "PhotoMetadata.c"
}
@@ -1951,7 +1962,7 @@ guint32 photo_preview_get_size (PhotoPreview* self) {
result = _tmp0_;
#line 182 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1955 "PhotoMetadata.c"
+#line 1966 "PhotoMetadata.c"
}
@@ -1969,7 +1980,7 @@ gchar* photo_preview_get_mime_type (PhotoPreview* self) {
result = _tmp1_;
#line 186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1973 "PhotoMetadata.c"
+#line 1984 "PhotoMetadata.c"
}
@@ -1987,7 +1998,7 @@ gchar* photo_preview_get_extension (PhotoPreview* self) {
result = _tmp1_;
#line 190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1991 "PhotoMetadata.c"
+#line 2002 "PhotoMetadata.c"
}
@@ -1996,7 +2007,7 @@ static guint8* photo_preview_real_flatten (PhotoPreview* self, int* result_lengt
g_critical ("Type `%s' does not implement abstract method `photo_preview_flatten'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 2000 "PhotoMetadata.c"
+#line 2011 "PhotoMetadata.c"
}
@@ -2005,14 +2016,14 @@ guint8* photo_preview_flatten (PhotoPreview* self, int* result_length1, GError**
g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL);
#line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return PHOTO_PREVIEW_GET_CLASS (self)->flatten (self, result_length1, error);
-#line 2009 "PhotoMetadata.c"
+#line 2020 "PhotoMetadata.c"
}
static guint8* _vala_array_dup4 (guint8* self, int length) {
#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_memdup (self, length * sizeof (guint8));
-#line 2016 "PhotoMetadata.c"
+#line 2027 "PhotoMetadata.c"
}
@@ -2038,7 +2049,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
g_propagate_error (error, _inner_error_);
#line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 2042 "PhotoMetadata.c"
+#line 2053 "PhotoMetadata.c"
}
{
GdkPixbuf* _tmp2_ = NULL;
@@ -2067,7 +2078,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
_tmp2_ = _tmp7_;
#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2071 "PhotoMetadata.c"
+#line 2082 "PhotoMetadata.c"
goto __catch25_g_error;
}
#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2082,7 +2093,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
flattened = (g_free (flattened), NULL);
#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2086 "PhotoMetadata.c"
+#line 2097 "PhotoMetadata.c"
}
goto __finally25;
__catch25_g_error:
@@ -2111,7 +2122,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
flattened = (g_free (flattened), NULL);
#line 206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2115 "PhotoMetadata.c"
+#line 2126 "PhotoMetadata.c"
}
__finally25:
#line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2120,7 +2131,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
flattened = (g_free (flattened), NULL);
#line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 2124 "PhotoMetadata.c"
+#line 2135 "PhotoMetadata.c"
}
@@ -2129,14 +2140,14 @@ GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error) {
g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL);
#line 195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return PHOTO_PREVIEW_GET_CLASS (self)->get_pixbuf (self, error);
-#line 2133 "PhotoMetadata.c"
+#line 2144 "PhotoMetadata.c"
}
static void value_photo_preview_init (GValue* value) {
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 2140 "PhotoMetadata.c"
+#line 2151 "PhotoMetadata.c"
}
@@ -2145,7 +2156,7 @@ static void value_photo_preview_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_preview_unref (value->data[0].v_pointer);
-#line 2149 "PhotoMetadata.c"
+#line 2160 "PhotoMetadata.c"
}
}
@@ -2155,11 +2166,11 @@ static void value_photo_preview_copy_value (const GValue* src_value, GValue* des
if (src_value->data[0].v_pointer) {
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
dest_value->data[0].v_pointer = photo_preview_ref (src_value->data[0].v_pointer);
-#line 2159 "PhotoMetadata.c"
+#line 2170 "PhotoMetadata.c"
} else {
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
dest_value->data[0].v_pointer = NULL;
-#line 2163 "PhotoMetadata.c"
+#line 2174 "PhotoMetadata.c"
}
}
@@ -2167,37 +2178,37 @@ static void value_photo_preview_copy_value (const GValue* src_value, GValue* des
static gpointer value_photo_preview_peek_pointer (const GValue* value) {
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return value->data[0].v_pointer;
-#line 2171 "PhotoMetadata.c"
+#line 2182 "PhotoMetadata.c"
}
static gchar* value_photo_preview_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (collect_values[0].v_pointer) {
-#line 2178 "PhotoMetadata.c"
+#line 2189 "PhotoMetadata.c"
PhotoPreview* object;
object = collect_values[0].v_pointer;
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (object->parent_instance.g_class == NULL) {
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2185 "PhotoMetadata.c"
+#line 2196 "PhotoMetadata.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.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 2189 "PhotoMetadata.c"
+#line 2200 "PhotoMetadata.c"
}
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = photo_preview_ref (object);
-#line 2193 "PhotoMetadata.c"
+#line 2204 "PhotoMetadata.c"
} else {
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 2197 "PhotoMetadata.c"
+#line 2208 "PhotoMetadata.c"
}
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 2201 "PhotoMetadata.c"
+#line 2212 "PhotoMetadata.c"
}
@@ -2208,25 +2219,25 @@ static gchar* value_photo_preview_lcopy_value (const GValue* value, guint n_coll
if (!object_p) {
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2212 "PhotoMetadata.c"
+#line 2223 "PhotoMetadata.c"
}
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!value->data[0].v_pointer) {
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*object_p = NULL;
-#line 2218 "PhotoMetadata.c"
+#line 2229 "PhotoMetadata.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*object_p = value->data[0].v_pointer;
-#line 2222 "PhotoMetadata.c"
+#line 2233 "PhotoMetadata.c"
} else {
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*object_p = photo_preview_ref (value->data[0].v_pointer);
-#line 2226 "PhotoMetadata.c"
+#line 2237 "PhotoMetadata.c"
}
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 2230 "PhotoMetadata.c"
+#line 2241 "PhotoMetadata.c"
}
@@ -2240,7 +2251,7 @@ GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, cons
G_PARAM_SPEC (spec)->value_type = object_type;
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return G_PARAM_SPEC (spec);
-#line 2244 "PhotoMetadata.c"
+#line 2255 "PhotoMetadata.c"
}
@@ -2249,7 +2260,7 @@ gpointer value_get_photo_preview (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_PREVIEW), NULL);
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return value->data[0].v_pointer;
-#line 2253 "PhotoMetadata.c"
+#line 2264 "PhotoMetadata.c"
}
@@ -2269,17 +2280,17 @@ void value_set_photo_preview (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_preview_ref (value->data[0].v_pointer);
-#line 2273 "PhotoMetadata.c"
+#line 2284 "PhotoMetadata.c"
} else {
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 2277 "PhotoMetadata.c"
+#line 2288 "PhotoMetadata.c"
}
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (old) {
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_preview_unref (old);
-#line 2283 "PhotoMetadata.c"
+#line 2294 "PhotoMetadata.c"
}
}
@@ -2298,17 +2309,17 @@ void value_take_photo_preview (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = v_object;
-#line 2302 "PhotoMetadata.c"
+#line 2313 "PhotoMetadata.c"
} else {
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 2306 "PhotoMetadata.c"
+#line 2317 "PhotoMetadata.c"
}
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (old) {
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_preview_unref (old);
-#line 2312 "PhotoMetadata.c"
+#line 2323 "PhotoMetadata.c"
}
}
@@ -2324,7 +2335,7 @@ static void photo_preview_class_init (PhotoPreviewClass * klass) {
((PhotoPreviewClass *) klass)->flatten = (guint8* (*)(PhotoPreview*, int*, GError**)) photo_preview_real_flatten;
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
((PhotoPreviewClass *) klass)->get_pixbuf = (GdkPixbuf* (*)(PhotoPreview*, GError**)) photo_preview_real_get_pixbuf;
-#line 2328 "PhotoMetadata.c"
+#line 2339 "PhotoMetadata.c"
}
@@ -2333,7 +2344,7 @@ static void photo_preview_instance_init (PhotoPreview * self) {
self->priv = PHOTO_PREVIEW_GET_PRIVATE (self);
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->ref_count = 1;
-#line 2337 "PhotoMetadata.c"
+#line 2348 "PhotoMetadata.c"
}
@@ -2349,7 +2360,7 @@ static void photo_preview_finalize (PhotoPreview* obj) {
_g_free0 (self->priv->mime_type);
#line 163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (self->priv->extension);
-#line 2353 "PhotoMetadata.c"
+#line 2364 "PhotoMetadata.c"
}
@@ -2374,7 +2385,7 @@ gpointer photo_preview_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return instance;
-#line 2378 "PhotoMetadata.c"
+#line 2389 "PhotoMetadata.c"
}
@@ -2387,7 +2398,7 @@ void photo_preview_unref (gpointer instance) {
PHOTO_PREVIEW_GET_CLASS (self)->finalize (self);
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 2391 "PhotoMetadata.c"
+#line 2402 "PhotoMetadata.c"
}
}
@@ -2410,14 +2421,14 @@ PhotoMetadata* photo_metadata_construct (GType object_type) {
self = (PhotoMetadata*) media_metadata_construct (object_type);
#line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self;
-#line 2414 "PhotoMetadata.c"
+#line 2425 "PhotoMetadata.c"
}
PhotoMetadata* photo_metadata_new (void) {
#line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return photo_metadata_construct (TYPE_PHOTO_METADATA);
-#line 2421 "PhotoMetadata.c"
+#line 2432 "PhotoMetadata.c"
}
@@ -2467,7 +2478,7 @@ static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file
g_propagate_error (error, _inner_error_);
#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 2471 "PhotoMetadata.c"
+#line 2482 "PhotoMetadata.c"
}
#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = file;
@@ -2491,7 +2502,7 @@ static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file
_g_free0 (self->priv->source_name);
#line 260 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->priv->source_name = _tmp10_;
-#line 2495 "PhotoMetadata.c"
+#line 2506 "PhotoMetadata.c"
}
@@ -2523,7 +2534,7 @@ void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** er
g_propagate_error (error, _inner_error_);
#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 2527 "PhotoMetadata.c"
+#line 2538 "PhotoMetadata.c"
}
}
@@ -2551,7 +2562,7 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b
_tmp0_ = length;
#line 268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ <= 0) {
-#line 2555 "PhotoMetadata.c"
+#line 2566 "PhotoMetadata.c"
guint8* _tmp1_ = NULL;
gint _tmp1__length1 = 0;
#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2560,7 +2571,7 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b
_tmp1__length1 = buffer_length1;
#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
length = _tmp1__length1;
-#line 2564 "PhotoMetadata.c"
+#line 2575 "PhotoMetadata.c"
}
#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = buffer;
@@ -2596,7 +2607,7 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b
g_propagate_error (error, _inner_error_);
#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 2600 "PhotoMetadata.c"
+#line 2611 "PhotoMetadata.c"
}
#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp8_ = buffer;
@@ -2618,7 +2629,7 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b
_g_free0 (self->priv->source_name);
#line 278 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->priv->source_name = _tmp12_;
-#line 2622 "PhotoMetadata.c"
+#line 2633 "PhotoMetadata.c"
}
@@ -2645,7 +2656,7 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer,
_tmp0_ = length;
#line 282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ <= 0) {
-#line 2649 "PhotoMetadata.c"
+#line 2660 "PhotoMetadata.c"
guint8* _tmp1_ = NULL;
gint _tmp1__length1 = 0;
#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2654,7 +2665,7 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer,
_tmp1__length1 = buffer_length1;
#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
length = _tmp1__length1;
-#line 2658 "PhotoMetadata.c"
+#line 2669 "PhotoMetadata.c"
}
#line 285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = buffer;
@@ -2690,7 +2701,7 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer,
g_propagate_error (error, _inner_error_);
#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 2694 "PhotoMetadata.c"
+#line 2705 "PhotoMetadata.c"
}
#line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp8_ = buffer;
@@ -2712,7 +2723,7 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer,
_g_free0 (self->priv->source_name);
#line 292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->priv->source_name = _tmp12_;
-#line 2716 "PhotoMetadata.c"
+#line 2727 "PhotoMetadata.c"
}
@@ -2736,7 +2747,7 @@ MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) {
result = METADATA_DOMAIN_EXIF;
#line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2740 "PhotoMetadata.c"
+#line 2751 "PhotoMetadata.c"
}
#line 299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = tag;
@@ -2748,7 +2759,7 @@ MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) {
result = METADATA_DOMAIN_XMP;
#line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2752 "PhotoMetadata.c"
+#line 2763 "PhotoMetadata.c"
}
#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = tag;
@@ -2760,13 +2771,13 @@ MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) {
result = METADATA_DOMAIN_IPTC;
#line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2764 "PhotoMetadata.c"
+#line 2775 "PhotoMetadata.c"
}
#line 305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = METADATA_DOMAIN_UNKNOWN;
#line 305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2770 "PhotoMetadata.c"
+#line 2781 "PhotoMetadata.c"
}
@@ -2781,7 +2792,7 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain)
switch (_tmp0_) {
#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_EXIF:
-#line 2785 "PhotoMetadata.c"
+#line 2796 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
@@ -2793,11 +2804,11 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain)
result = _tmp2_;
#line 311 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2797 "PhotoMetadata.c"
+#line 2808 "PhotoMetadata.c"
}
#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_XMP:
-#line 2801 "PhotoMetadata.c"
+#line 2812 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
@@ -2809,11 +2820,11 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain)
result = _tmp4_;
#line 314 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2813 "PhotoMetadata.c"
+#line 2824 "PhotoMetadata.c"
}
#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_IPTC:
-#line 2817 "PhotoMetadata.c"
+#line 2828 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp5_ = NULL;
gboolean _tmp6_ = FALSE;
@@ -2825,18 +2836,18 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain)
result = _tmp6_;
#line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2829 "PhotoMetadata.c"
+#line 2840 "PhotoMetadata.c"
}
default:
#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_UNKNOWN:
-#line 2834 "PhotoMetadata.c"
+#line 2845 "PhotoMetadata.c"
{
#line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = FALSE;
#line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2840 "PhotoMetadata.c"
+#line 2851 "PhotoMetadata.c"
}
}
}
@@ -2853,7 +2864,7 @@ gboolean photo_metadata_has_exif (PhotoMetadata* self) {
result = _tmp0_;
#line 326 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2857 "PhotoMetadata.c"
+#line 2868 "PhotoMetadata.c"
}
@@ -2868,7 +2879,7 @@ gboolean photo_metadata_has_xmp (PhotoMetadata* self) {
result = _tmp0_;
#line 330 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2872 "PhotoMetadata.c"
+#line 2883 "PhotoMetadata.c"
}
@@ -2883,7 +2894,7 @@ gboolean photo_metadata_has_iptc (PhotoMetadata* self) {
result = _tmp0_;
#line 334 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2887 "PhotoMetadata.c"
+#line 2898 "PhotoMetadata.c"
}
@@ -2898,7 +2909,7 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain
switch (_tmp0_) {
#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_EXIF:
-#line 2902 "PhotoMetadata.c"
+#line 2913 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
@@ -2910,11 +2921,11 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain
result = _tmp2_;
#line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2914 "PhotoMetadata.c"
+#line 2925 "PhotoMetadata.c"
}
#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_XMP:
-#line 2918 "PhotoMetadata.c"
+#line 2929 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
@@ -2926,11 +2937,11 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain
result = _tmp4_;
#line 343 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2930 "PhotoMetadata.c"
+#line 2941 "PhotoMetadata.c"
}
#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_IPTC:
-#line 2934 "PhotoMetadata.c"
+#line 2945 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp5_ = NULL;
gboolean _tmp6_ = FALSE;
@@ -2942,18 +2953,18 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain
result = _tmp6_;
#line 346 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2946 "PhotoMetadata.c"
+#line 2957 "PhotoMetadata.c"
}
default:
#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_UNKNOWN:
-#line 2951 "PhotoMetadata.c"
+#line 2962 "PhotoMetadata.c"
{
#line 350 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = FALSE;
#line 350 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2957 "PhotoMetadata.c"
+#line 2968 "PhotoMetadata.c"
}
}
}
@@ -2970,7 +2981,7 @@ gboolean photo_metadata_can_write_exif (PhotoMetadata* self) {
result = _tmp0_;
#line 355 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2974 "PhotoMetadata.c"
+#line 2985 "PhotoMetadata.c"
}
@@ -2985,7 +2996,7 @@ gboolean photo_metadata_can_write_xmp (PhotoMetadata* self) {
result = _tmp0_;
#line 359 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2989 "PhotoMetadata.c"
+#line 3000 "PhotoMetadata.c"
}
@@ -3000,7 +3011,7 @@ gboolean photo_metadata_can_write_iptc (PhotoMetadata* self) {
result = _tmp0_;
#line 363 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3004 "PhotoMetadata.c"
+#line 3015 "PhotoMetadata.c"
}
@@ -3023,7 +3034,7 @@ gboolean photo_metadata_has_tag (PhotoMetadata* self, const gchar* tag) {
result = _tmp2_;
#line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3027 "PhotoMetadata.c"
+#line 3038 "PhotoMetadata.c"
}
@@ -3039,7 +3050,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
_tmp0__target = compare_func_target;
#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ == NULL) {
-#line 3043 "PhotoMetadata.c"
+#line 3054 "PhotoMetadata.c"
GeeHashSet* _tmp1_ = NULL;
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -3055,7 +3066,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
compare_func_target_destroy_notify = NULL;
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3059 "PhotoMetadata.c"
+#line 3070 "PhotoMetadata.c"
} else {
GCompareDataFunc _tmp2_ = NULL;
void* _tmp2__target = NULL;
@@ -3087,7 +3098,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
compare_func_target_destroy_notify = NULL;
#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3091 "PhotoMetadata.c"
+#line 3102 "PhotoMetadata.c"
}
#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
@@ -3097,7 +3108,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
compare_func_target = NULL;
#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
compare_func_target_destroy_notify = NULL;
-#line 3101 "PhotoMetadata.c"
+#line 3112 "PhotoMetadata.c"
}
@@ -3131,7 +3142,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
switch (_tmp0_) {
#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_EXIF:
-#line 3135 "PhotoMetadata.c"
+#line 3146 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp1_ = NULL;
gchar** _tmp2_ = NULL;
@@ -3150,11 +3161,11 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
_tags_size_ = tags_length1;
#line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 3154 "PhotoMetadata.c"
+#line 3165 "PhotoMetadata.c"
}
#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_XMP:
-#line 3158 "PhotoMetadata.c"
+#line 3169 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp4_ = NULL;
gchar** _tmp5_ = NULL;
@@ -3173,11 +3184,11 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
_tags_size_ = tags_length1;
#line 388 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 3177 "PhotoMetadata.c"
+#line 3188 "PhotoMetadata.c"
}
#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_IPTC:
-#line 3181 "PhotoMetadata.c"
+#line 3192 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp7_ = NULL;
gchar** _tmp8_ = NULL;
@@ -3196,12 +3207,12 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
_tags_size_ = tags_length1;
#line 392 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 3200 "PhotoMetadata.c"
+#line 3211 "PhotoMetadata.c"
}
default:
#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 3205 "PhotoMetadata.c"
+#line 3216 "PhotoMetadata.c"
}
#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = tags;
@@ -3211,7 +3222,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
if (_tmp11_ == NULL) {
#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = TRUE;
-#line 3215 "PhotoMetadata.c"
+#line 3226 "PhotoMetadata.c"
} else {
gchar** _tmp12_ = NULL;
gint _tmp12__length1 = 0;
@@ -3221,7 +3232,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
_tmp12__length1 = tags_length1;
#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = _tmp12__length1 == 0;
-#line 3225 "PhotoMetadata.c"
+#line 3236 "PhotoMetadata.c"
}
#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp10_) {
@@ -3239,7 +3250,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
compare_func_target_destroy_notify = NULL;
#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3243 "PhotoMetadata.c"
+#line 3254 "PhotoMetadata.c"
}
#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13_ = compare_func;
@@ -3261,7 +3272,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
_tmp15_ = tags;
#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp15__length1 = tags_length1;
-#line 3265 "PhotoMetadata.c"
+#line 3276 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -3273,14 +3284,14 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
tag_collection_length1 = _tmp15__length1;
#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp15__length1; tag_it = tag_it + 1) {
-#line 3277 "PhotoMetadata.c"
+#line 3288 "PhotoMetadata.c"
gchar* _tmp16_ = NULL;
gchar* tag = NULL;
#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp16_ = g_strdup (tag_collection[tag_it]);
#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp16_;
-#line 3284 "PhotoMetadata.c"
+#line 3295 "PhotoMetadata.c"
{
GeeCollection* _tmp17_ = NULL;
const gchar* _tmp18_ = NULL;
@@ -3292,7 +3303,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
gee_collection_add (_tmp17_, _tmp18_);
#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 3296 "PhotoMetadata.c"
+#line 3307 "PhotoMetadata.c"
}
}
}
@@ -3310,7 +3321,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
compare_func_target_destroy_notify = NULL;
#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3314 "PhotoMetadata.c"
+#line 3325 "PhotoMetadata.c"
}
@@ -3364,7 +3375,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp4_ = exif_tags;
#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_ != NULL) {
-#line 3368 "PhotoMetadata.c"
+#line 3379 "PhotoMetadata.c"
GeeCollection* _tmp5_ = NULL;
gint _tmp6_ = 0;
gint _tmp7_ = 0;
@@ -3376,15 +3387,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp7_ = _tmp6_;
#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = _tmp7_ > 0;
-#line 3380 "PhotoMetadata.c"
+#line 3391 "PhotoMetadata.c"
} else {
#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = FALSE;
-#line 3384 "PhotoMetadata.c"
+#line 3395 "PhotoMetadata.c"
}
#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp3_) {
-#line 3388 "PhotoMetadata.c"
+#line 3399 "PhotoMetadata.c"
GeeCollection* _tmp8_ = NULL;
GeeCollection* _tmp9_ = NULL;
#line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3393,7 +3404,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp9_ = exif_tags;
#line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_collection_add_all (_tmp8_, _tmp9_);
-#line 3397 "PhotoMetadata.c"
+#line 3408 "PhotoMetadata.c"
}
#line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = photo_metadata_get_tags (self, METADATA_DOMAIN_XMP, NULL, NULL, NULL);
@@ -3403,7 +3414,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp12_ = xmp_tags;
#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp12_ != NULL) {
-#line 3407 "PhotoMetadata.c"
+#line 3418 "PhotoMetadata.c"
GeeCollection* _tmp13_ = NULL;
gint _tmp14_ = 0;
gint _tmp15_ = 0;
@@ -3415,15 +3426,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp15_ = _tmp14_;
#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = _tmp15_ > 0;
-#line 3419 "PhotoMetadata.c"
+#line 3430 "PhotoMetadata.c"
} else {
#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = FALSE;
-#line 3423 "PhotoMetadata.c"
+#line 3434 "PhotoMetadata.c"
}
#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp11_) {
-#line 3427 "PhotoMetadata.c"
+#line 3438 "PhotoMetadata.c"
GeeCollection* _tmp16_ = NULL;
GeeCollection* _tmp17_ = NULL;
#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3432,7 +3443,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp17_ = xmp_tags;
#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_collection_add_all (_tmp16_, _tmp17_);
-#line 3436 "PhotoMetadata.c"
+#line 3447 "PhotoMetadata.c"
}
#line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp18_ = photo_metadata_get_tags (self, METADATA_DOMAIN_IPTC, NULL, NULL, NULL);
@@ -3442,7 +3453,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp20_ = iptc_tags;
#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp20_ != NULL) {
-#line 3446 "PhotoMetadata.c"
+#line 3457 "PhotoMetadata.c"
GeeCollection* _tmp21_ = NULL;
gint _tmp22_ = 0;
gint _tmp23_ = 0;
@@ -3454,15 +3465,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp23_ = _tmp22_;
#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp19_ = _tmp23_ > 0;
-#line 3458 "PhotoMetadata.c"
+#line 3469 "PhotoMetadata.c"
} else {
#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp19_ = FALSE;
-#line 3462 "PhotoMetadata.c"
+#line 3473 "PhotoMetadata.c"
}
#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp19_) {
-#line 3466 "PhotoMetadata.c"
+#line 3477 "PhotoMetadata.c"
GeeCollection* _tmp24_ = NULL;
GeeCollection* _tmp25_ = NULL;
#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3471,7 +3482,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp25_ = iptc_tags;
#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_collection_add_all (_tmp24_, _tmp25_);
-#line 3475 "PhotoMetadata.c"
+#line 3486 "PhotoMetadata.c"
}
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp27_ = all_tags;
@@ -3481,17 +3492,17 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp29_ = _tmp28_;
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp29_ > 0) {
-#line 3485 "PhotoMetadata.c"
+#line 3496 "PhotoMetadata.c"
GeeCollection* _tmp30_ = NULL;
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp30_ = all_tags;
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp26_ = _tmp30_;
-#line 3491 "PhotoMetadata.c"
+#line 3502 "PhotoMetadata.c"
} else {
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp26_ = NULL;
-#line 3495 "PhotoMetadata.c"
+#line 3506 "PhotoMetadata.c"
}
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp31_ = _g_object_ref0 (_tmp26_);
@@ -3515,7 +3526,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
compare_func_target_destroy_notify = NULL;
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3519 "PhotoMetadata.c"
+#line 3530 "PhotoMetadata.c"
}
@@ -3538,7 +3549,7 @@ gchar* photo_metadata_get_tag_label (PhotoMetadata* self, const gchar* tag) {
result = _tmp2_;
#line 425 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3542 "PhotoMetadata.c"
+#line 3553 "PhotoMetadata.c"
}
@@ -3561,7 +3572,7 @@ gchar* photo_metadata_get_tag_description (PhotoMetadata* self, const gchar* tag
result = _tmp2_;
#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3565 "PhotoMetadata.c"
+#line 3576 "PhotoMetadata.c"
}
@@ -3598,7 +3609,7 @@ gchar* photo_metadata_get_string (PhotoMetadata* self, const gchar* tag, Prepare
result = _tmp6_;
#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3602 "PhotoMetadata.c"
+#line 3613 "PhotoMetadata.c"
}
@@ -3635,7 +3646,7 @@ gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, const gchar*
result = _tmp6_;
#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3639 "PhotoMetadata.c"
+#line 3650 "PhotoMetadata.c"
}
@@ -3649,7 +3660,7 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
_tmp0_ = tags;
#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 3653 "PhotoMetadata.c"
+#line 3664 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -3661,14 +3672,14 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
tag_collection_length1 = _tmp0__length1;
#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 3665 "PhotoMetadata.c"
+#line 3676 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 3672 "PhotoMetadata.c"
+#line 3683 "PhotoMetadata.c"
{
gchar* value = NULL;
const gchar* _tmp2_ = NULL;
@@ -3690,13 +3701,13 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
_g_free0 (tag);
#line 444 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3694 "PhotoMetadata.c"
+#line 3705 "PhotoMetadata.c"
}
#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (value);
#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 3700 "PhotoMetadata.c"
+#line 3711 "PhotoMetadata.c"
}
}
}
@@ -3704,7 +3715,7 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
result = NULL;
#line 447 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3708 "PhotoMetadata.c"
+#line 3719 "PhotoMetadata.c"
}
@@ -3718,7 +3729,7 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
_tmp0_ = tags;
#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 3722 "PhotoMetadata.c"
+#line 3733 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -3730,14 +3741,14 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
tag_collection_length1 = _tmp0__length1;
#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 3734 "PhotoMetadata.c"
+#line 3745 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 3741 "PhotoMetadata.c"
+#line 3752 "PhotoMetadata.c"
{
gchar* value = NULL;
const gchar* _tmp2_ = NULL;
@@ -3759,13 +3770,13 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
_g_free0 (tag);
#line 454 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3763 "PhotoMetadata.c"
+#line 3774 "PhotoMetadata.c"
}
#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (value);
#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 3769 "PhotoMetadata.c"
+#line 3780 "PhotoMetadata.c"
}
}
}
@@ -3773,7 +3784,7 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
result = NULL;
#line 457 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3777 "PhotoMetadata.c"
+#line 3788 "PhotoMetadata.c"
}
@@ -3824,7 +3835,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
if (_tmp5_ == NULL) {
#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = TRUE;
-#line 3828 "PhotoMetadata.c"
+#line 3839 "PhotoMetadata.c"
} else {
gchar** _tmp6_ = NULL;
gint _tmp6__length1 = 0;
@@ -3834,7 +3845,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
_tmp6__length1 = values_length1;
#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = _tmp6__length1 == 0;
-#line 3838 "PhotoMetadata.c"
+#line 3849 "PhotoMetadata.c"
}
#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_) {
@@ -3844,7 +3855,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
#line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3848 "PhotoMetadata.c"
+#line 3859 "PhotoMetadata.c"
}
#line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
@@ -3858,7 +3869,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
_tmp9_ = values;
#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9__length1 = values_length1;
-#line 3862 "PhotoMetadata.c"
+#line 3873 "PhotoMetadata.c"
{
gchar** value_collection = NULL;
gint value_collection_length1 = 0;
@@ -3870,14 +3881,14 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
value_collection_length1 = _tmp9__length1;
#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (value_it = 0; value_it < _tmp9__length1; value_it = value_it + 1) {
-#line 3874 "PhotoMetadata.c"
+#line 3885 "PhotoMetadata.c"
gchar* _tmp10_ = NULL;
gchar* value = NULL;
#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = g_strdup (value_collection[value_it]);
#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value = _tmp10_;
-#line 3881 "PhotoMetadata.c"
+#line 3892 "PhotoMetadata.c"
{
gchar* prepped = NULL;
const gchar* _tmp11_ = NULL;
@@ -3894,7 +3905,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
_tmp14_ = prepped;
#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp14_ != NULL) {
-#line 3898 "PhotoMetadata.c"
+#line 3909 "PhotoMetadata.c"
GeeHashSet* _tmp15_ = NULL;
const gchar* _tmp16_ = NULL;
gboolean _tmp17_ = FALSE;
@@ -3906,15 +3917,15 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
_tmp17_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_);
#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13_ = !_tmp17_;
-#line 3910 "PhotoMetadata.c"
+#line 3921 "PhotoMetadata.c"
} else {
#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13_ = FALSE;
-#line 3914 "PhotoMetadata.c"
+#line 3925 "PhotoMetadata.c"
}
#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp13_) {
-#line 3918 "PhotoMetadata.c"
+#line 3929 "PhotoMetadata.c"
GeeList* _tmp18_ = NULL;
const gchar* _tmp19_ = NULL;
GeeHashSet* _tmp20_ = NULL;
@@ -3931,13 +3942,13 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
_tmp21_ = prepped;
#line 480 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_);
-#line 3935 "PhotoMetadata.c"
+#line 3946 "PhotoMetadata.c"
}
#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (prepped);
#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (value);
-#line 3941 "PhotoMetadata.c"
+#line 3952 "PhotoMetadata.c"
}
}
}
@@ -3949,17 +3960,17 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
_tmp25_ = _tmp24_;
#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp25_ > 0) {
-#line 3953 "PhotoMetadata.c"
+#line 3964 "PhotoMetadata.c"
GeeList* _tmp26_ = NULL;
#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp26_ = list;
#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp22_ = _tmp26_;
-#line 3959 "PhotoMetadata.c"
+#line 3970 "PhotoMetadata.c"
} else {
#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp22_ = NULL;
-#line 3963 "PhotoMetadata.c"
+#line 3974 "PhotoMetadata.c"
}
#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp27_ = _g_object_ref0 (_tmp22_);
@@ -3973,7 +3984,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3977 "PhotoMetadata.c"
+#line 3988 "PhotoMetadata.c"
}
@@ -3987,7 +3998,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
_tmp0_ = tags;
#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 3991 "PhotoMetadata.c"
+#line 4002 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -3999,14 +4010,14 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
tag_collection_length1 = _tmp0__length1;
#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 4003 "PhotoMetadata.c"
+#line 4014 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 4010 "PhotoMetadata.c"
+#line 4021 "PhotoMetadata.c"
{
GeeList* values = NULL;
const gchar* _tmp2_ = NULL;
@@ -4023,7 +4034,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
_tmp5_ = values;
#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp5_ != NULL) {
-#line 4027 "PhotoMetadata.c"
+#line 4038 "PhotoMetadata.c"
GeeList* _tmp6_ = NULL;
gint _tmp7_ = 0;
gint _tmp8_ = 0;
@@ -4035,11 +4046,11 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
_tmp8_ = _tmp7_;
#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = _tmp8_ > 0;
-#line 4039 "PhotoMetadata.c"
+#line 4050 "PhotoMetadata.c"
} else {
#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = FALSE;
-#line 4043 "PhotoMetadata.c"
+#line 4054 "PhotoMetadata.c"
}
#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_) {
@@ -4049,13 +4060,13 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
_g_free0 (tag);
#line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4053 "PhotoMetadata.c"
+#line 4064 "PhotoMetadata.c"
}
#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (values);
#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 4059 "PhotoMetadata.c"
+#line 4070 "PhotoMetadata.c"
}
}
}
@@ -4063,7 +4074,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
result = NULL;
#line 500 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4067 "PhotoMetadata.c"
+#line 4078 "PhotoMetadata.c"
}
@@ -4095,7 +4106,7 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
_tmp3_ = prepped;
#line 505 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp3_ == NULL) {
-#line 4099 "PhotoMetadata.c"
+#line 4110 "PhotoMetadata.c"
const gchar* _tmp4_ = NULL;
const gchar* _tmp5_ = NULL;
#line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4108,7 +4119,7 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
_g_free0 (prepped);
#line 508 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 4112 "PhotoMetadata.c"
+#line 4123 "PhotoMetadata.c"
}
#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = self->priv->exiv2;
@@ -4120,7 +4131,7 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
_tmp9_ = gexiv2_metadata_set_tag_string (_tmp6_, _tmp7_, _tmp8_);
#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp9_) {
-#line 4124 "PhotoMetadata.c"
+#line 4135 "PhotoMetadata.c"
const gchar* _tmp10_ = NULL;
const gchar* _tmp11_ = NULL;
const gchar* _tmp12_ = NULL;
@@ -4133,11 +4144,11 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_warning ("PhotoMetadata.vala:512: Unable to set tag %s to string %s from source " \
"%s", _tmp10_, _tmp11_, _tmp12_);
-#line 4136 "PhotoMetadata.c"
+#line 4147 "PhotoMetadata.c"
}
#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (prepped);
-#line 4140 "PhotoMetadata.c"
+#line 4151 "PhotoMetadata.c"
}
@@ -4156,7 +4167,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp0_ = tags;
#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 4159 "PhotoMetadata.c"
+#line 4170 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -4168,14 +4179,14 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
tag_collection_length1 = _tmp0__length1;
#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 4171 "PhotoMetadata.c"
+#line 4182 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 4178 "PhotoMetadata.c"
+#line 4189 "PhotoMetadata.c"
{
gboolean _tmp2_ = FALSE;
PhotoMetadataSetOption _tmp3_ = 0;
@@ -4185,7 +4196,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
if (_tmp3_ == PHOTO_METADATA_SET_OPTION_ALL_DOMAINS) {
#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = TRUE;
-#line 4188 "PhotoMetadata.c"
+#line 4199 "PhotoMetadata.c"
} else {
const gchar* _tmp4_ = NULL;
MetadataDomain _tmp5_ = 0;
@@ -4198,11 +4209,11 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp6_ = photo_metadata_has_domain (self, _tmp5_);
#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = _tmp6_;
-#line 4201 "PhotoMetadata.c"
+#line 4212 "PhotoMetadata.c"
}
#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp2_) {
-#line 4205 "PhotoMetadata.c"
+#line 4216 "PhotoMetadata.c"
PhotoMetadataSetGenericValue _tmp7_ = NULL;
void* _tmp7__target = NULL;
const gchar* _tmp8_ = NULL;
@@ -4216,11 +4227,11 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp7_ (_tmp8_, _tmp7__target);
#line 522 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
written = TRUE;
-#line 4219 "PhotoMetadata.c"
+#line 4230 "PhotoMetadata.c"
}
#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 4223 "PhotoMetadata.c"
+#line 4234 "PhotoMetadata.c"
}
}
}
@@ -4228,21 +4239,21 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp11_ = option;
#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp11_ == PHOTO_METADATA_SET_OPTION_AT_LEAST_DEFAULT_DOMAIN) {
-#line 4231 "PhotoMetadata.c"
+#line 4242 "PhotoMetadata.c"
gboolean _tmp12_ = FALSE;
#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp12_ = written;
#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = !_tmp12_;
-#line 4237 "PhotoMetadata.c"
+#line 4248 "PhotoMetadata.c"
} else {
#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = FALSE;
-#line 4241 "PhotoMetadata.c"
+#line 4252 "PhotoMetadata.c"
}
#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp10_) {
-#line 4245 "PhotoMetadata.c"
+#line 4256 "PhotoMetadata.c"
gchar** _tmp13_ = NULL;
gint _tmp13__length1 = 0;
#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4251,15 +4262,15 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp13__length1 = tags_length1;
#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = _tmp13__length1 > 0;
-#line 4254 "PhotoMetadata.c"
+#line 4265 "PhotoMetadata.c"
} else {
#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = FALSE;
-#line 4258 "PhotoMetadata.c"
+#line 4269 "PhotoMetadata.c"
}
#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp9_) {
-#line 4262 "PhotoMetadata.c"
+#line 4273 "PhotoMetadata.c"
MetadataDomain default_domain = 0;
gchar** _tmp14_ = NULL;
gint _tmp14__length1 = 0;
@@ -4292,19 +4303,19 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp19_ = _tmp18_[0];
#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp17_ (_tmp19_, _tmp17__target);
-#line 4295 "PhotoMetadata.c"
+#line 4306 "PhotoMetadata.c"
{
gint ctr = 0;
#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
ctr = 1;
-#line 4300 "PhotoMetadata.c"
+#line 4311 "PhotoMetadata.c"
{
gboolean _tmp20_ = FALSE;
#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp20_ = TRUE;
#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 4307 "PhotoMetadata.c"
+#line 4318 "PhotoMetadata.c"
gint _tmp22_ = 0;
gchar** _tmp23_ = NULL;
gint _tmp23__length1 = 0;
@@ -4316,13 +4327,13 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
MetadataDomain _tmp28_ = 0;
#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp20_) {
-#line 4319 "PhotoMetadata.c"
+#line 4330 "PhotoMetadata.c"
gint _tmp21_ = 0;
#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp21_ = ctr;
#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
ctr = _tmp21_ + 1;
-#line 4325 "PhotoMetadata.c"
+#line 4336 "PhotoMetadata.c"
}
#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp20_ = FALSE;
@@ -4336,7 +4347,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
if (!(_tmp22_ < _tmp23__length1)) {
#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 4339 "PhotoMetadata.c"
+#line 4350 "PhotoMetadata.c"
}
#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp24_ = tags;
@@ -4352,7 +4363,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp28_ = default_domain;
#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp27_ == _tmp28_) {
-#line 4355 "PhotoMetadata.c"
+#line 4366 "PhotoMetadata.c"
PhotoMetadataSetGenericValue _tmp29_ = NULL;
void* _tmp29__target = NULL;
gchar** _tmp30_ = NULL;
@@ -4373,7 +4384,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp32_ = _tmp30_[_tmp31_];
#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp29_ (_tmp32_, _tmp29__target);
-#line 4376 "PhotoMetadata.c"
+#line 4387 "PhotoMetadata.c"
}
}
}
@@ -4387,7 +4398,7 @@ static Block1Data* block1_data_ref (Block1Data* _data1_) {
g_atomic_int_inc (&_data1_->_ref_count_);
#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return _data1_;
-#line 4390 "PhotoMetadata.c"
+#line 4401 "PhotoMetadata.c"
}
@@ -4396,7 +4407,7 @@ static void block1_data_unref (void * _userdata_) {
_data1_ = (Block1Data*) _userdata_;
#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
-#line 4399 "PhotoMetadata.c"
+#line 4410 "PhotoMetadata.c"
PhotoMetadata* self;
#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self = _data1_->self;
@@ -4406,7 +4417,7 @@ static void block1_data_unref (void * _userdata_) {
_media_metadata_unref0 (self);
#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_slice_free (Block1Data, _data1_);
-#line 4409 "PhotoMetadata.c"
+#line 4420 "PhotoMetadata.c"
}
}
@@ -4425,14 +4436,14 @@ static void __lambda5_ (Block1Data* _data1_, const gchar* tag) {
_tmp1_ = _data1_->value;
#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string (self, _tmp0_, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 4428 "PhotoMetadata.c"
+#line 4439 "PhotoMetadata.c"
}
static void ___lambda5__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__lambda5_ (self, tag);
-#line 4435 "PhotoMetadata.c"
+#line 4446 "PhotoMetadata.c"
}
@@ -4473,7 +4484,7 @@ void photo_metadata_set_all_string (PhotoMetadata* self, gchar** tags, int tags_
block1_data_unref (_data1_);
#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_data1_ = NULL;
-#line 4476 "PhotoMetadata.c"
+#line 4487 "PhotoMetadata.c"
}
@@ -4484,13 +4495,13 @@ static void _vala_array_add45 (gchar*** array, int* length, int* size, gchar* va
*size = (*size) ? (2 * (*size)) : 4;
#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 4487 "PhotoMetadata.c"
+#line 4498 "PhotoMetadata.c"
}
#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
(*array)[(*length)++] = value;
#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
(*array)[*length] = NULL;
-#line 4493 "PhotoMetadata.c"
+#line 4504 "PhotoMetadata.c"
}
@@ -4501,13 +4512,13 @@ static void _vala_array_add46 (gchar*** array, int* length, int* size, gchar* va
*size = (*size) ? (2 * (*size)) : 4;
#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 4504 "PhotoMetadata.c"
+#line 4515 "PhotoMetadata.c"
}
#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
(*array)[(*length)++] = value;
#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
(*array)[*length] = NULL;
-#line 4510 "PhotoMetadata.c"
+#line 4521 "PhotoMetadata.c"
}
@@ -4539,7 +4550,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
values_length1 = 0;
#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_values_size_ = values_length1;
-#line 4542 "PhotoMetadata.c"
+#line 4553 "PhotoMetadata.c"
{
GeeIterator* _value_it = NULL;
GeeCollection* _tmp1_ = NULL;
@@ -4552,7 +4563,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
_value_it = _tmp2_;
#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 4555 "PhotoMetadata.c"
+#line 4566 "PhotoMetadata.c"
GeeIterator* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
gchar* value = NULL;
@@ -4570,7 +4581,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
if (!_tmp4_) {
#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 4573 "PhotoMetadata.c"
+#line 4584 "PhotoMetadata.c"
}
#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = _value_it;
@@ -4588,7 +4599,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
_tmp9_ = prepped;
#line 548 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp9_ != NULL) {
-#line 4591 "PhotoMetadata.c"
+#line 4602 "PhotoMetadata.c"
gchar** _tmp10_ = NULL;
gint _tmp10__length1 = 0;
const gchar* _tmp11_ = NULL;
@@ -4603,7 +4614,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
_tmp12_ = g_strdup (_tmp11_);
#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_array_add45 (&values, &values_length1, &_values_size_, _tmp12_);
-#line 4606 "PhotoMetadata.c"
+#line 4617 "PhotoMetadata.c"
} else {
const gchar* _tmp13_ = NULL;
const gchar* _tmp14_ = NULL;
@@ -4613,17 +4624,17 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
_tmp14_ = tag;
#line 551 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_warning ("PhotoMetadata.vala:551: Unable to set string %s to %s: invalid UTF-8", _tmp13_, _tmp14_);
-#line 4616 "PhotoMetadata.c"
+#line 4627 "PhotoMetadata.c"
}
#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (prepped);
#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (value);
-#line 4622 "PhotoMetadata.c"
+#line 4633 "PhotoMetadata.c"
}
#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_value_it);
-#line 4626 "PhotoMetadata.c"
+#line 4637 "PhotoMetadata.c"
}
#line 554 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp15_ = values;
@@ -4635,7 +4646,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
#line 555 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 4638 "PhotoMetadata.c"
+#line 4649 "PhotoMetadata.c"
}
#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp16_ = values;
@@ -4655,7 +4666,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
_tmp20_ = gexiv2_metadata_set_tag_multiple (_tmp17_, _tmp18_, _tmp19_);
#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp20_) {
-#line 4658 "PhotoMetadata.c"
+#line 4669 "PhotoMetadata.c"
gchar** _tmp21_ = NULL;
gint _tmp21__length1 = 0;
const gchar* _tmp22_ = NULL;
@@ -4671,11 +4682,11 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
#line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_warning ("PhotoMetadata.vala:564: Unable to set %d strings to tag %s from source" \
" %s", _tmp21__length1, _tmp22_, _tmp23_);
-#line 4673 "PhotoMetadata.c"
+#line 4684 "PhotoMetadata.c"
}
#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 4677 "PhotoMetadata.c"
+#line 4688 "PhotoMetadata.c"
}
@@ -4684,7 +4695,7 @@ static Block2Data* block2_data_ref (Block2Data* _data2_) {
g_atomic_int_inc (&_data2_->_ref_count_);
#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return _data2_;
-#line 4686 "PhotoMetadata.c"
+#line 4697 "PhotoMetadata.c"
}
@@ -4693,7 +4704,7 @@ static void block2_data_unref (void * _userdata_) {
_data2_ = (Block2Data*) _userdata_;
#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) {
-#line 4695 "PhotoMetadata.c"
+#line 4706 "PhotoMetadata.c"
PhotoMetadata* self;
#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self = _data2_->self;
@@ -4703,7 +4714,7 @@ static void block2_data_unref (void * _userdata_) {
_media_metadata_unref0 (self);
#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_slice_free (Block2Data, _data2_);
-#line 4705 "PhotoMetadata.c"
+#line 4716 "PhotoMetadata.c"
}
}
@@ -4722,14 +4733,14 @@ static void __lambda6_ (Block2Data* _data2_, const gchar* tag) {
_tmp1_ = _data2_->values;
#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string_multiple (self, _tmp0_, _tmp1_);
-#line 4724 "PhotoMetadata.c"
+#line 4735 "PhotoMetadata.c"
}
static void ___lambda6__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__lambda6_ (self, tag);
-#line 4731 "PhotoMetadata.c"
+#line 4742 "PhotoMetadata.c"
}
@@ -4770,7 +4781,7 @@ void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags,
block2_data_unref (_data2_);
#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_data2_ = NULL;
-#line 4772 "PhotoMetadata.c"
+#line 4783 "PhotoMetadata.c"
}
@@ -4800,11 +4811,11 @@ gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong*
if (value) {
#line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*value = _vala_value;
-#line 4802 "PhotoMetadata.c"
+#line 4813 "PhotoMetadata.c"
}
#line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4806 "PhotoMetadata.c"
+#line 4817 "PhotoMetadata.c"
}
#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = self->priv->exiv2;
@@ -4820,11 +4831,11 @@ gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong*
if (value) {
#line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*value = _vala_value;
-#line 4822 "PhotoMetadata.c"
+#line 4833 "PhotoMetadata.c"
}
#line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4826 "PhotoMetadata.c"
+#line 4837 "PhotoMetadata.c"
}
@@ -4839,7 +4850,7 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
_tmp0_ = tags;
#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 4841 "PhotoMetadata.c"
+#line 4852 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -4851,14 +4862,14 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
tag_collection_length1 = _tmp0__length1;
#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 4853 "PhotoMetadata.c"
+#line 4864 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 4860 "PhotoMetadata.c"
+#line 4871 "PhotoMetadata.c"
{
const gchar* _tmp2_ = NULL;
glong _tmp3_ = 0L;
@@ -4879,15 +4890,15 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
if (value) {
#line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*value = _vala_value;
-#line 4881 "PhotoMetadata.c"
+#line 4892 "PhotoMetadata.c"
}
#line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4885 "PhotoMetadata.c"
+#line 4896 "PhotoMetadata.c"
}
#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 4889 "PhotoMetadata.c"
+#line 4900 "PhotoMetadata.c"
}
}
}
@@ -4899,11 +4910,11 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
if (value) {
#line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*value = _vala_value;
-#line 4901 "PhotoMetadata.c"
+#line 4912 "PhotoMetadata.c"
}
#line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4905 "PhotoMetadata.c"
+#line 4916 "PhotoMetadata.c"
}
@@ -4926,7 +4937,7 @@ void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value
_tmp3_ = gexiv2_metadata_set_tag_long (_tmp0_, _tmp1_, _tmp2_);
#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp3_) {
-#line 4928 "PhotoMetadata.c"
+#line 4939 "PhotoMetadata.c"
const gchar* _tmp4_ = NULL;
glong _tmp5_ = 0L;
const gchar* _tmp6_ = NULL;
@@ -4939,7 +4950,7 @@ void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value
#line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_warning ("PhotoMetadata.vala:596: Unable to set tag %s to long %ld from source %" \
"s", _tmp4_, _tmp5_, _tmp6_);
-#line 4940 "PhotoMetadata.c"
+#line 4951 "PhotoMetadata.c"
}
}
@@ -4949,7 +4960,7 @@ static Block3Data* block3_data_ref (Block3Data* _data3_) {
g_atomic_int_inc (&_data3_->_ref_count_);
#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return _data3_;
-#line 4950 "PhotoMetadata.c"
+#line 4961 "PhotoMetadata.c"
}
@@ -4958,7 +4969,7 @@ static void block3_data_unref (void * _userdata_) {
_data3_ = (Block3Data*) _userdata_;
#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) {
-#line 4959 "PhotoMetadata.c"
+#line 4970 "PhotoMetadata.c"
PhotoMetadata* self;
#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self = _data3_->self;
@@ -4966,7 +4977,7 @@ static void block3_data_unref (void * _userdata_) {
_media_metadata_unref0 (self);
#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_slice_free (Block3Data, _data3_);
-#line 4967 "PhotoMetadata.c"
+#line 4978 "PhotoMetadata.c"
}
}
@@ -4985,14 +4996,14 @@ static void __lambda7_ (Block3Data* _data3_, const gchar* tag) {
_tmp1_ = _data3_->value;
#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_long (self, _tmp0_, _tmp1_);
-#line 4986 "PhotoMetadata.c"
+#line 4997 "PhotoMetadata.c"
}
static void ___lambda7__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__lambda7_ (self, tag);
-#line 4993 "PhotoMetadata.c"
+#line 5004 "PhotoMetadata.c"
}
@@ -5026,7 +5037,7 @@ void photo_metadata_set_all_long (PhotoMetadata* self, gchar** tags, int tags_le
block3_data_unref (_data3_);
#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_data3_ = NULL;
-#line 5027 "PhotoMetadata.c"
+#line 5038 "PhotoMetadata.c"
}
@@ -5065,11 +5076,11 @@ gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, Met
if (rational) {
#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*rational = _vala_rational;
-#line 5066 "PhotoMetadata.c"
+#line 5077 "PhotoMetadata.c"
}
#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5070 "PhotoMetadata.c"
+#line 5081 "PhotoMetadata.c"
}
@@ -5084,7 +5095,7 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
_tmp0_ = tags;
#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 5085 "PhotoMetadata.c"
+#line 5096 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -5096,14 +5107,14 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
tag_collection_length1 = _tmp0__length1;
#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 5097 "PhotoMetadata.c"
+#line 5108 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 5104 "PhotoMetadata.c"
+#line 5115 "PhotoMetadata.c"
{
const gchar* _tmp2_ = NULL;
MetadataRational _tmp3_ = {0};
@@ -5124,15 +5135,15 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
if (rational) {
#line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*rational = _vala_rational;
-#line 5125 "PhotoMetadata.c"
+#line 5136 "PhotoMetadata.c"
}
#line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5129 "PhotoMetadata.c"
+#line 5140 "PhotoMetadata.c"
}
#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 5133 "PhotoMetadata.c"
+#line 5144 "PhotoMetadata.c"
}
}
}
@@ -5144,11 +5155,11 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
if (rational) {
#line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*rational = _vala_rational;
-#line 5145 "PhotoMetadata.c"
+#line 5156 "PhotoMetadata.c"
}
#line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5149 "PhotoMetadata.c"
+#line 5160 "PhotoMetadata.c"
}
@@ -5182,7 +5193,7 @@ void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, Metadat
_tmp6_ = gexiv2_metadata_set_exif_tag_rational (_tmp0_, _tmp1_, _tmp3_, _tmp5_);
#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp6_) {
-#line 5183 "PhotoMetadata.c"
+#line 5194 "PhotoMetadata.c"
const gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
@@ -5200,7 +5211,7 @@ void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, Metadat
"e %s", _tmp7_, _tmp9_, _tmp10_);
#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_tmp9_);
-#line 5200 "PhotoMetadata.c"
+#line 5211 "PhotoMetadata.c"
}
}
@@ -5210,7 +5221,7 @@ static Block4Data* block4_data_ref (Block4Data* _data4_) {
g_atomic_int_inc (&_data4_->_ref_count_);
#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return _data4_;
-#line 5210 "PhotoMetadata.c"
+#line 5221 "PhotoMetadata.c"
}
@@ -5219,7 +5230,7 @@ static void block4_data_unref (void * _userdata_) {
_data4_ = (Block4Data*) _userdata_;
#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) {
-#line 5219 "PhotoMetadata.c"
+#line 5230 "PhotoMetadata.c"
PhotoMetadata* self;
#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self = _data4_->self;
@@ -5227,7 +5238,7 @@ static void block4_data_unref (void * _userdata_) {
_media_metadata_unref0 (self);
#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_slice_free (Block4Data, _data4_);
-#line 5227 "PhotoMetadata.c"
+#line 5238 "PhotoMetadata.c"
}
}
@@ -5246,14 +5257,14 @@ static void __lambda8_ (Block4Data* _data4_, const gchar* tag) {
_tmp1_ = _data4_->rational;
#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_rational (self, _tmp0_, &_tmp1_);
-#line 5246 "PhotoMetadata.c"
+#line 5257 "PhotoMetadata.c"
}
static void ___lambda8__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__lambda8_ (self, tag);
-#line 5253 "PhotoMetadata.c"
+#line 5264 "PhotoMetadata.c"
}
@@ -5289,7 +5300,7 @@ void photo_metadata_set_all_rational (PhotoMetadata* self, gchar** tags, int tag
block4_data_unref (_data4_);
#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_data4_ = NULL;
-#line 5289 "PhotoMetadata.c"
+#line 5300 "PhotoMetadata.c"
}
@@ -5320,7 +5331,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_g_free0 (value);
#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5320 "PhotoMetadata.c"
+#line 5331 "PhotoMetadata.c"
}
{
const gchar* _tmp3_ = NULL;
@@ -5333,7 +5344,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
switch (_tmp4_) {
#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_XMP:
-#line 5333 "PhotoMetadata.c"
+#line 5344 "PhotoMetadata.c"
{
MetadataDateTime* _tmp5_ = NULL;
const gchar* _tmp6_ = NULL;
@@ -5347,7 +5358,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_tmp5_ = _tmp7_;
#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5347 "PhotoMetadata.c"
+#line 5358 "PhotoMetadata.c"
goto __catch26_g_error;
}
#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5362,11 +5373,11 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_g_free0 (value);
#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5362 "PhotoMetadata.c"
+#line 5373 "PhotoMetadata.c"
}
#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_IPTC:
-#line 5366 "PhotoMetadata.c"
+#line 5377 "PhotoMetadata.c"
{
#line 647 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = NULL;
@@ -5374,12 +5385,12 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_g_free0 (value);
#line 647 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5374 "PhotoMetadata.c"
+#line 5385 "PhotoMetadata.c"
}
default:
#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_EXIF:
-#line 5379 "PhotoMetadata.c"
+#line 5390 "PhotoMetadata.c"
{
MetadataDateTime* _tmp9_ = NULL;
const gchar* _tmp10_ = NULL;
@@ -5393,7 +5404,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_tmp9_ = _tmp11_;
#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5393 "PhotoMetadata.c"
+#line 5404 "PhotoMetadata.c"
goto __catch26_g_error;
}
#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5408,7 +5419,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_g_free0 (value);
#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5408 "PhotoMetadata.c"
+#line 5419 "PhotoMetadata.c"
}
}
}
@@ -5442,7 +5453,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_g_free0 (value);
#line 656 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5442 "PhotoMetadata.c"
+#line 5453 "PhotoMetadata.c"
}
__finally26:
#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5453,7 +5464,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
g_clear_error (&_inner_error_);
#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 5453 "PhotoMetadata.c"
+#line 5464 "PhotoMetadata.c"
}
@@ -5467,7 +5478,7 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
_tmp0_ = tags;
#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 5467 "PhotoMetadata.c"
+#line 5478 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -5479,14 +5490,14 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
tag_collection_length1 = _tmp0__length1;
#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 5479 "PhotoMetadata.c"
+#line 5490 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 5486 "PhotoMetadata.c"
+#line 5497 "PhotoMetadata.c"
{
MetadataDateTime* date_time = NULL;
const gchar* _tmp2_ = NULL;
@@ -5508,13 +5519,13 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
_g_free0 (tag);
#line 664 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5508 "PhotoMetadata.c"
+#line 5519 "PhotoMetadata.c"
}
#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_metadata_date_time_unref0 (date_time);
#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 5514 "PhotoMetadata.c"
+#line 5525 "PhotoMetadata.c"
}
}
}
@@ -5522,7 +5533,7 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
result = NULL;
#line 667 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5522 "PhotoMetadata.c"
+#line 5533 "PhotoMetadata.c"
}
@@ -5543,7 +5554,7 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
switch (_tmp1_) {
#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_EXIF:
-#line 5543 "PhotoMetadata.c"
+#line 5554 "PhotoMetadata.c"
{
const gchar* _tmp2_ = NULL;
MetadataDateTime* _tmp3_ = NULL;
@@ -5563,11 +5574,11 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
_g_free0 (_tmp5_);
#line 674 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 5563 "PhotoMetadata.c"
+#line 5574 "PhotoMetadata.c"
}
#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_XMP:
-#line 5567 "PhotoMetadata.c"
+#line 5578 "PhotoMetadata.c"
{
const gchar* _tmp6_ = NULL;
MetadataDateTime* _tmp7_ = NULL;
@@ -5587,12 +5598,12 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
_g_free0 (_tmp9_);
#line 678 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 5587 "PhotoMetadata.c"
+#line 5598 "PhotoMetadata.c"
}
default:
#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_IPTC:
-#line 5592 "PhotoMetadata.c"
+#line 5603 "PhotoMetadata.c"
{
const gchar* _tmp10_ = NULL;
const gchar* _tmp11_ = NULL;
@@ -5614,7 +5625,7 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
"supported metadata domain %s", _tmp10_, _tmp11_, (_tmp14_ != NULL) ? _tmp14_->value_name : NULL);
#line 685 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 5613 "PhotoMetadata.c"
+#line 5624 "PhotoMetadata.c"
}
}
}
@@ -5623,7 +5634,7 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
static gpointer _metadata_date_time_ref0 (gpointer self) {
#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self ? metadata_date_time_ref (self) : NULL;
-#line 5622 "PhotoMetadata.c"
+#line 5633 "PhotoMetadata.c"
}
@@ -5632,7 +5643,7 @@ static Block5Data* block5_data_ref (Block5Data* _data5_) {
g_atomic_int_inc (&_data5_->_ref_count_);
#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return _data5_;
-#line 5631 "PhotoMetadata.c"
+#line 5642 "PhotoMetadata.c"
}
@@ -5641,7 +5652,7 @@ static void block5_data_unref (void * _userdata_) {
_data5_ = (Block5Data*) _userdata_;
#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) {
-#line 5640 "PhotoMetadata.c"
+#line 5651 "PhotoMetadata.c"
PhotoMetadata* self;
#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self = _data5_->self;
@@ -5651,7 +5662,7 @@ static void block5_data_unref (void * _userdata_) {
_media_metadata_unref0 (self);
#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_slice_free (Block5Data, _data5_);
-#line 5650 "PhotoMetadata.c"
+#line 5661 "PhotoMetadata.c"
}
}
@@ -5670,14 +5681,14 @@ static void __lambda9_ (Block5Data* _data5_, const gchar* tag) {
_tmp1_ = _data5_->date_time;
#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_date_time (self, _tmp0_, _tmp1_);
-#line 5669 "PhotoMetadata.c"
+#line 5680 "PhotoMetadata.c"
}
static void ___lambda9__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__lambda9_ (self, tag);
-#line 5676 "PhotoMetadata.c"
+#line 5687 "PhotoMetadata.c"
}
@@ -5718,7 +5729,7 @@ void photo_metadata_set_all_date_time (PhotoMetadata* self, gchar** tags, int ta
block5_data_unref (_data5_);
#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_data5_ = NULL;
-#line 5717 "PhotoMetadata.c"
+#line 5728 "PhotoMetadata.c"
}
@@ -5752,7 +5763,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
_tmp0_ = self->priv->exif;
#line 695 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ == NULL) {
-#line 5751 "PhotoMetadata.c"
+#line 5762 "PhotoMetadata.c"
guint8* _tmp1_ = NULL;
gint _tmp1__length1 = 0;
#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5763,13 +5774,13 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
if (result_length1) {
#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*result_length1 = _tmp1__length1;
-#line 5762 "PhotoMetadata.c"
+#line 5773 "PhotoMetadata.c"
}
#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp1_;
#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5768 "PhotoMetadata.c"
+#line 5779 "PhotoMetadata.c"
}
#line 700 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = self->priv->exif;
@@ -5787,7 +5798,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
_tmp6_ = include_preview;
#line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp6_) {
-#line 5786 "PhotoMetadata.c"
+#line 5797 "PhotoMetadata.c"
ExifData* _tmp7_ = NULL;
ExifData* _tmp8_ = NULL;
#line 703 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5798,7 +5809,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
_tmp8_ = self->priv->exif;
#line 704 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp8_->size = (guint) 0;
-#line 5797 "PhotoMetadata.c"
+#line 5808 "PhotoMetadata.c"
}
#line 707 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
flattened = NULL;
@@ -5818,21 +5829,21 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
_tmp11_ = saved_size;
#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp11_ > ((guint) 0)) {
-#line 5817 "PhotoMetadata.c"
+#line 5828 "PhotoMetadata.c"
guchar* _tmp12_ = NULL;
#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp12_ = saved_data;
#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = _tmp12_ != NULL;
-#line 5823 "PhotoMetadata.c"
+#line 5834 "PhotoMetadata.c"
} else {
#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = FALSE;
-#line 5827 "PhotoMetadata.c"
+#line 5838 "PhotoMetadata.c"
}
#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp10_) {
-#line 5831 "PhotoMetadata.c"
+#line 5842 "PhotoMetadata.c"
guint _tmp13_ = 0U;
guint8* _tmp14_ = NULL;
guint8* _tmp15_ = NULL;
@@ -5874,7 +5885,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
exif_mem_free (_tmp19_, _tmp20_);
#line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_exif_mem_unref0 (_tmp19_);
-#line 5873 "PhotoMetadata.c"
+#line 5884 "PhotoMetadata.c"
}
#line 721 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp21_ = self->priv->exif;
@@ -5896,20 +5907,20 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
if (result_length1) {
#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*result_length1 = _tmp25__length1;
-#line 5895 "PhotoMetadata.c"
+#line 5906 "PhotoMetadata.c"
}
#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp25_;
#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5901 "PhotoMetadata.c"
+#line 5912 "PhotoMetadata.c"
}
static guint8* _vala_array_dup5 (guint8* self, int length) {
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_memdup (self, length * sizeof (guint8));
-#line 5908 "PhotoMetadata.c"
+#line 5919 "PhotoMetadata.c"
}
@@ -5945,7 +5956,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
_buffer_size_ = buffer_length1;
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_) {
-#line 5944 "PhotoMetadata.c"
+#line 5955 "PhotoMetadata.c"
guchar* _tmp5_ = NULL;
gint _tmp5__length1 = 0;
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5958,7 +5969,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
_tmp0__length1 = _tmp5__length1;
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__tmp0__size_ = _tmp0__length1;
-#line 5957 "PhotoMetadata.c"
+#line 5968 "PhotoMetadata.c"
} else {
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = NULL;
@@ -5966,7 +5977,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
_tmp0__length1 = 0;
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__tmp0__size_ = _tmp0__length1;
-#line 5965 "PhotoMetadata.c"
+#line 5976 "PhotoMetadata.c"
}
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = (_tmp0_ != NULL) ? _vala_array_dup5 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
@@ -5980,7 +5991,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
if (result_length1) {
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*result_length1 = _tmp7__length1;
-#line 5979 "PhotoMetadata.c"
+#line 5990 "PhotoMetadata.c"
}
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp7_;
@@ -5988,7 +5999,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
buffer = (g_free (buffer), NULL);
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5987 "PhotoMetadata.c"
+#line 5998 "PhotoMetadata.c"
}
@@ -6021,7 +6032,7 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) {
_tmp4__length1 = props_length1;
#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_ != NULL) {
-#line 6020 "PhotoMetadata.c"
+#line 6031 "PhotoMetadata.c"
GExiv2PreviewProperties** _tmp5_ = NULL;
gint _tmp5__length1 = 0;
#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6030,17 +6041,17 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) {
_tmp5__length1 = props_length1;
#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = _tmp5__length1;
-#line 6029 "PhotoMetadata.c"
+#line 6040 "PhotoMetadata.c"
} else {
#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = 0;
-#line 6033 "PhotoMetadata.c"
+#line 6044 "PhotoMetadata.c"
}
#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = (guint) _tmp3_;
#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6039 "PhotoMetadata.c"
+#line 6050 "PhotoMetadata.c"
}
@@ -6082,7 +6093,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
if (_tmp4_ == NULL) {
#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = TRUE;
-#line 6081 "PhotoMetadata.c"
+#line 6092 "PhotoMetadata.c"
} else {
GExiv2PreviewProperties** _tmp5_ = NULL;
gint _tmp5__length1 = 0;
@@ -6095,7 +6106,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
_tmp6_ = number;
#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = ((guint) _tmp5__length1) <= _tmp6_;
-#line 6094 "PhotoMetadata.c"
+#line 6105 "PhotoMetadata.c"
}
#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp3_) {
@@ -6103,7 +6114,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
result = NULL;
#line 743 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6102 "PhotoMetadata.c"
+#line 6113 "PhotoMetadata.c"
}
#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = self->priv->source_name;
@@ -6123,7 +6134,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_PREVIEW, PhotoPreview);
#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6122 "PhotoMetadata.c"
+#line 6133 "PhotoMetadata.c"
}
@@ -6140,7 +6151,7 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) {
_tmp1_ = self->priv->exif;
#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp1_ != NULL) {
-#line 6139 "PhotoMetadata.c"
+#line 6150 "PhotoMetadata.c"
ExifMem* _tmp2_ = NULL;
ExifMem* _tmp3_ = NULL;
ExifData* _tmp4_ = NULL;
@@ -6167,7 +6178,7 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) {
_tmp7_ = self->priv->exif;
#line 753 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_->size = (guint) 0;
-#line 6166 "PhotoMetadata.c"
+#line 6177 "PhotoMetadata.c"
}
}
@@ -6185,7 +6196,7 @@ void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag) {
_tmp1_ = tag;
#line 758 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gexiv2_metadata_clear_tag (_tmp0_, _tmp1_);
-#line 6184 "PhotoMetadata.c"
+#line 6195 "PhotoMetadata.c"
}
@@ -6198,7 +6209,7 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
_tmp0_ = tags;
#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 6197 "PhotoMetadata.c"
+#line 6208 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -6210,14 +6221,14 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
tag_collection_length1 = _tmp0__length1;
#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 6209 "PhotoMetadata.c"
+#line 6220 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 6216 "PhotoMetadata.c"
+#line 6227 "PhotoMetadata.c"
{
const gchar* _tmp2_ = NULL;
#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6226,7 +6237,7 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
photo_metadata_remove_tag (self, _tmp2_);
#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 6225 "PhotoMetadata.c"
+#line 6236 "PhotoMetadata.c"
}
}
}
@@ -6243,7 +6254,7 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
switch (_tmp0_) {
#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_EXIF:
-#line 6242 "PhotoMetadata.c"
+#line 6253 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp1_ = NULL;
#line 769 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6252,11 +6263,11 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
gexiv2_metadata_clear_exif (_tmp1_);
#line 770 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 6251 "PhotoMetadata.c"
+#line 6262 "PhotoMetadata.c"
}
#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_XMP:
-#line 6255 "PhotoMetadata.c"
+#line 6266 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp2_ = NULL;
#line 773 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6265,11 +6276,11 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
gexiv2_metadata_clear_xmp (_tmp2_);
#line 774 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 6264 "PhotoMetadata.c"
+#line 6275 "PhotoMetadata.c"
}
#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_IPTC:
-#line 6268 "PhotoMetadata.c"
+#line 6279 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp3_ = NULL;
#line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6278,12 +6289,12 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
gexiv2_metadata_clear_iptc (_tmp3_);
#line 778 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 6277 "PhotoMetadata.c"
+#line 6288 "PhotoMetadata.c"
}
default:
#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 6282 "PhotoMetadata.c"
+#line 6293 "PhotoMetadata.c"
}
}
@@ -6296,7 +6307,7 @@ void photo_metadata_clear (PhotoMetadata* self) {
_tmp0_ = self->priv->exiv2;
#line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gexiv2_metadata_clear (_tmp0_);
-#line 6295 "PhotoMetadata.c"
+#line 6306 "PhotoMetadata.c"
}
@@ -6317,7 +6328,7 @@ MetadataDateTime* photo_metadata_get_modification_date_time (PhotoMetadata* self
result = _tmp1_;
#line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6316 "PhotoMetadata.c"
+#line 6327 "PhotoMetadata.c"
}
@@ -6331,7 +6342,7 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat
_tmp0_ = date_time;
#line 799 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ != NULL) {
-#line 6330 "PhotoMetadata.c"
+#line 6341 "PhotoMetadata.c"
gchar** _tmp1_ = NULL;
gint _tmp1__length1 = 0;
MetadataDateTime* _tmp2_ = NULL;
@@ -6346,7 +6357,7 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat
_tmp3_ = option;
#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 6345 "PhotoMetadata.c"
+#line 6356 "PhotoMetadata.c"
} else {
gchar** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
@@ -6356,7 +6367,7 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat
_tmp4__length1 = photo_metadata_DATE_TIME_TAGS_length1;
#line 802 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 6355 "PhotoMetadata.c"
+#line 6366 "PhotoMetadata.c"
}
}
@@ -6378,7 +6389,7 @@ MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self) {
result = _tmp1_;
#line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6377 "PhotoMetadata.c"
+#line 6388 "PhotoMetadata.c"
}
@@ -6392,7 +6403,7 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim
_tmp0_ = date_time;
#line 820 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ != NULL) {
-#line 6391 "PhotoMetadata.c"
+#line 6402 "PhotoMetadata.c"
gchar** _tmp1_ = NULL;
gint _tmp1__length1 = 0;
MetadataDateTime* _tmp2_ = NULL;
@@ -6407,7 +6418,7 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim
_tmp3_ = option;
#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 6406 "PhotoMetadata.c"
+#line 6417 "PhotoMetadata.c"
} else {
gchar** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
@@ -6417,7 +6428,7 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim
_tmp4__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1;
#line 823 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 6416 "PhotoMetadata.c"
+#line 6427 "PhotoMetadata.c"
}
}
@@ -6439,7 +6450,7 @@ MetadataDateTime* photo_metadata_get_digitized_date_time (PhotoMetadata* self) {
result = _tmp1_;
#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6438 "PhotoMetadata.c"
+#line 6449 "PhotoMetadata.c"
}
@@ -6453,7 +6464,7 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi
_tmp0_ = date_time;
#line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ != NULL) {
-#line 6452 "PhotoMetadata.c"
+#line 6463 "PhotoMetadata.c"
gchar** _tmp1_ = NULL;
gint _tmp1__length1 = 0;
MetadataDateTime* _tmp2_ = NULL;
@@ -6468,7 +6479,7 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi
_tmp3_ = option;
#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 6467 "PhotoMetadata.c"
+#line 6478 "PhotoMetadata.c"
} else {
gchar** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
@@ -6478,7 +6489,7 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi
_tmp4__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1;
#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 6477 "PhotoMetadata.c"
+#line 6488 "PhotoMetadata.c"
}
}
@@ -6499,7 +6510,7 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada
_tmp1_ = creation;
#line 845 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp1_ == NULL) {
-#line 6498 "PhotoMetadata.c"
+#line 6509 "PhotoMetadata.c"
MetadataDateTime* _tmp2_ = NULL;
#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = photo_metadata_get_digitized_date_time (self);
@@ -6507,20 +6518,20 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada
_metadata_date_time_unref0 (creation);
#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
creation = _tmp2_;
-#line 6506 "PhotoMetadata.c"
+#line 6517 "PhotoMetadata.c"
}
#line 848 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = creation;
#line 848 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6512 "PhotoMetadata.c"
+#line 6523 "PhotoMetadata.c"
}
static gpointer _dimensions_dup0 (gpointer self) {
#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self ? dimensions_dup (self) : NULL;
-#line 6519 "PhotoMetadata.c"
+#line 6530 "PhotoMetadata.c"
}
@@ -6542,19 +6553,19 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
_tmp1__length1 = photo_metadata_HEIGHT_TAGS_length1;
#line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_assert (_tmp0__length1 == _tmp1__length1, "WIDTH_TAGS.length == HEIGHT_TAGS.length");
-#line 6541 "PhotoMetadata.c"
+#line 6552 "PhotoMetadata.c"
{
gint ctr = 0;
#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
ctr = 0;
-#line 6546 "PhotoMetadata.c"
+#line 6557 "PhotoMetadata.c"
{
gboolean _tmp2_ = FALSE;
#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = TRUE;
#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 6553 "PhotoMetadata.c"
+#line 6564 "PhotoMetadata.c"
gint _tmp4_ = 0;
gchar** _tmp5_ = NULL;
gint _tmp5__length1 = 0;
@@ -6578,13 +6589,13 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
Dimensions* _tmp19_ = NULL;
#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp2_) {
-#line 6577 "PhotoMetadata.c"
+#line 6588 "PhotoMetadata.c"
gint _tmp3_ = 0;
#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = ctr;
#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
ctr = _tmp3_ + 1;
-#line 6583 "PhotoMetadata.c"
+#line 6594 "PhotoMetadata.c"
}
#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = FALSE;
@@ -6598,7 +6609,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
if (!(_tmp4_ < _tmp5__length1)) {
#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 6597 "PhotoMetadata.c"
+#line 6608 "PhotoMetadata.c"
}
#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = photo_metadata_WIDTH_TAGS;
@@ -6616,7 +6627,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
if (!_tmp10_) {
#line 873 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
continue;
-#line 6615 "PhotoMetadata.c"
+#line 6626 "PhotoMetadata.c"
}
#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = photo_metadata_HEIGHT_TAGS;
@@ -6634,7 +6645,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
if (!_tmp15_) {
#line 877 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
continue;
-#line 6633 "PhotoMetadata.c"
+#line 6644 "PhotoMetadata.c"
}
#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp16_ = width;
@@ -6648,7 +6659,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
result = _tmp19_;
#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6647 "PhotoMetadata.c"
+#line 6658 "PhotoMetadata.c"
}
}
}
@@ -6656,7 +6667,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
result = NULL;
#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6655 "PhotoMetadata.c"
+#line 6666 "PhotoMetadata.c"
}
@@ -6668,7 +6679,7 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
_tmp0_ = dim;
#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ != NULL) {
-#line 6667 "PhotoMetadata.c"
+#line 6678 "PhotoMetadata.c"
gchar** _tmp1_ = NULL;
gint _tmp1__length1 = 0;
Dimensions* _tmp2_ = NULL;
@@ -6703,7 +6714,7 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
_tmp8_ = option;
#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_all_long (self, _tmp5_, _tmp5__length1, (glong) _tmp7_, _tmp8_);
-#line 6702 "PhotoMetadata.c"
+#line 6713 "PhotoMetadata.c"
} else {
gchar** _tmp9_ = NULL;
gint _tmp9__length1 = 0;
@@ -6721,7 +6732,7 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
_tmp10__length1 = photo_metadata_HEIGHT_TAGS_length1;
#line 891 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tags (self, _tmp10_, _tmp10__length1);
-#line 6720 "PhotoMetadata.c"
+#line 6731 "PhotoMetadata.c"
}
}
@@ -6745,7 +6756,7 @@ static gchar* string_strip (const gchar* self) {
result = _result_;
#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 6744 "PhotoMetadata.c"
+#line 6755 "PhotoMetadata.c"
}
@@ -6765,7 +6776,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
result = _tmp1_ != NULL;
#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 6764 "PhotoMetadata.c"
+#line 6775 "PhotoMetadata.c"
}
@@ -6794,7 +6805,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp1_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp1_) {
-#line 6793 "PhotoMetadata.c"
+#line 6804 "PhotoMetadata.c"
GeeList* _tmp2_ = NULL;
#line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = photo_metadata_get_string_multiple (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
@@ -6802,7 +6813,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_g_object_unref0 (_tmp0_);
#line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = _tmp2_;
-#line 6801 "PhotoMetadata.c"
+#line 6812 "PhotoMetadata.c"
} else {
gchar** _tmp3_ = NULL;
gint _tmp3__length1 = 0;
@@ -6817,7 +6828,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_g_object_unref0 (_tmp0_);
#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = _tmp4_;
-#line 6816 "PhotoMetadata.c"
+#line 6827 "PhotoMetadata.c"
}
#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = _g_object_ref0 (_tmp0_);
@@ -6827,7 +6838,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp8_ = titles;
#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp8_ != NULL) {
-#line 6826 "PhotoMetadata.c"
+#line 6837 "PhotoMetadata.c"
GeeList* _tmp9_ = NULL;
gint _tmp10_ = 0;
gint _tmp11_ = 0;
@@ -6839,15 +6850,15 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp11_ = _tmp10_;
#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = _tmp11_ > 0;
-#line 6838 "PhotoMetadata.c"
+#line 6849 "PhotoMetadata.c"
} else {
#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = FALSE;
-#line 6842 "PhotoMetadata.c"
+#line 6853 "PhotoMetadata.c"
}
#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp7_) {
-#line 6846 "PhotoMetadata.c"
+#line 6857 "PhotoMetadata.c"
GeeList* _tmp12_ = NULL;
gpointer _tmp13_ = NULL;
#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6858,13 +6869,13 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_g_free0 (_tmp6_);
#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = (gchar*) _tmp13_;
-#line 6857 "PhotoMetadata.c"
+#line 6868 "PhotoMetadata.c"
} else {
#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_tmp6_);
#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = NULL;
-#line 6863 "PhotoMetadata.c"
+#line 6874 "PhotoMetadata.c"
}
#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp14_ = g_strdup (_tmp6_);
@@ -6874,7 +6885,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp15_ = title;
#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp15_ != NULL) {
-#line 6873 "PhotoMetadata.c"
+#line 6884 "PhotoMetadata.c"
const gchar* _tmp16_ = NULL;
gchar* _tmp17_ = NULL;
#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6885,7 +6896,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_g_free0 (title);
#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
title = _tmp17_;
-#line 6884 "PhotoMetadata.c"
+#line 6895 "PhotoMetadata.c"
}
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp21_ = title;
@@ -6893,7 +6904,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp22_ = is_string_empty (_tmp21_);
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp22_) {
-#line 6892 "PhotoMetadata.c"
+#line 6903 "PhotoMetadata.c"
const gchar* _tmp23_ = NULL;
gboolean _tmp24_ = FALSE;
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6902,15 +6913,15 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp24_ = string_contains (_tmp23_, "\n");
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp20_ = !_tmp24_;
-#line 6901 "PhotoMetadata.c"
+#line 6912 "PhotoMetadata.c"
} else {
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp20_ = FALSE;
-#line 6905 "PhotoMetadata.c"
+#line 6916 "PhotoMetadata.c"
}
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp20_) {
-#line 6909 "PhotoMetadata.c"
+#line 6920 "PhotoMetadata.c"
const gchar* _tmp25_ = NULL;
gboolean _tmp26_ = FALSE;
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6919,25 +6930,25 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp26_ = string_contains (_tmp25_, "\r");
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp19_ = !_tmp26_;
-#line 6918 "PhotoMetadata.c"
+#line 6929 "PhotoMetadata.c"
} else {
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp19_ = FALSE;
-#line 6922 "PhotoMetadata.c"
+#line 6933 "PhotoMetadata.c"
}
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp19_) {
-#line 6926 "PhotoMetadata.c"
+#line 6937 "PhotoMetadata.c"
const gchar* _tmp27_ = NULL;
#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp27_ = title;
#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp18_ = _tmp27_;
-#line 6932 "PhotoMetadata.c"
+#line 6943 "PhotoMetadata.c"
} else {
#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp18_ = NULL;
-#line 6936 "PhotoMetadata.c"
+#line 6947 "PhotoMetadata.c"
}
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp28_ = g_strdup (_tmp18_);
@@ -6953,7 +6964,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_g_object_unref0 (_tmp0_);
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6952 "PhotoMetadata.c"
+#line 6963 "PhotoMetadata.c"
}
@@ -6968,19 +6979,19 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet
_tmp1_ = is_string_empty (_tmp0_);
#line 952 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp1_) {
-#line 6967 "PhotoMetadata.c"
+#line 6978 "PhotoMetadata.c"
gboolean _tmp2_ = FALSE;
#line 953 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
#line 953 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp2_) {
-#line 6973 "PhotoMetadata.c"
+#line 6984 "PhotoMetadata.c"
const gchar* _tmp3_ = NULL;
#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = title;
#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string (self, PHOTO_METADATA_IPHOTO_TITLE_TAG, _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 6979 "PhotoMetadata.c"
+#line 6990 "PhotoMetadata.c"
} else {
gchar** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
@@ -6996,7 +7007,7 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet
_tmp6_ = option;
#line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_all_string (self, _tmp4_, _tmp4__length1, _tmp5_, _tmp6_);
-#line 6995 "PhotoMetadata.c"
+#line 7006 "PhotoMetadata.c"
}
} else {
gchar** _tmp7_ = NULL;
@@ -7007,7 +7018,7 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet
_tmp7__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1;
#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tags (self, _tmp7_, _tmp7__length1);
-#line 7006 "PhotoMetadata.c"
+#line 7017 "PhotoMetadata.c"
}
}
@@ -7030,48 +7041,121 @@ static gchar* photo_metadata_real_get_comment (MediaMetadata* base) {
result = _tmp1_;
#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7029 "PhotoMetadata.c"
+#line 7040 "PhotoMetadata.c"
+}
+
+
+static Block6Data* block6_data_ref (Block6Data* _data6_) {
+#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ g_atomic_int_inc (&_data6_->_ref_count_);
+#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ return _data6_;
+#line 7049 "PhotoMetadata.c"
+}
+
+
+static void block6_data_unref (void * _userdata_) {
+ Block6Data* _data6_;
+ _data6_ = (Block6Data*) _userdata_;
+#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) {
+#line 7058 "PhotoMetadata.c"
+ PhotoMetadata* self;
+#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ self = _data6_->self;
+#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ _g_free0 (_data6_->comment);
+#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ _media_metadata_unref0 (self);
+#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ g_slice_free (Block6Data, _data6_);
+#line 7068 "PhotoMetadata.c"
+ }
+}
+
+
+static void ___lambda10_ (Block6Data* _data6_, const gchar* tag) {
+ PhotoMetadata* self;
+ const gchar* _tmp0_ = NULL;
+ const gchar* _tmp1_ = NULL;
+#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ self = _data6_->self;
+#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ g_return_if_fail (tag != NULL);
+#line 977 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ _tmp0_ = tag;
+#line 977 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ _tmp1_ = _data6_->comment;
+#line 977 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ photo_metadata_set_string (self, _tmp0_, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS & (~PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF));
+#line 7087 "PhotoMetadata.c"
+}
+
+
+static void ____lambda10__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
+#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ ___lambda10_ (self, tag);
+#line 7094 "PhotoMetadata.c"
}
void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, PhotoMetadataSetOption option) {
+ Block6Data* _data6_;
const gchar* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ gchar* _tmp1_ = NULL;
+ const gchar* _tmp2_ = NULL;
+ gboolean _tmp3_ = FALSE;
#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 973 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ _data6_ = g_slice_new0 (Block6Data);
+#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ _data6_->_ref_count_ = 1;
+#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ _data6_->self = media_metadata_ref (self);
+#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = comment;
-#line 973 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _tmp1_ = is_string_empty (_tmp0_);
-#line 973 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- if (!_tmp1_) {
-#line 7044 "PhotoMetadata.c"
- gchar** _tmp2_ = NULL;
- gint _tmp2__length1 = 0;
- const gchar* _tmp3_ = NULL;
- PhotoMetadataSetOption _tmp4_ = 0;
-#line 974 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _tmp2_ = photo_metadata_COMMENT_TAGS;
-#line 974 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _tmp2__length1 = photo_metadata_COMMENT_TAGS_length1;
-#line 974 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _tmp3_ = comment;
-#line 974 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _tmp4_ = option;
-#line 974 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- photo_metadata_set_all_string (self, _tmp2_, _tmp2__length1, _tmp3_, _tmp4_);
-#line 7059 "PhotoMetadata.c"
- } else {
- gchar** _tmp5_ = NULL;
- gint _tmp5__length1 = 0;
+#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ _tmp1_ = g_strdup (_tmp0_);
+#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ _g_free0 (_data6_->comment);
+#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ _data6_->comment = _tmp1_;
+#line 975 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ _tmp2_ = _data6_->comment;
+#line 975 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ _tmp3_ = is_string_empty (_tmp2_);
+#line 975 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ if (!_tmp3_) {
+#line 7126 "PhotoMetadata.c"
+ gchar** _tmp4_ = NULL;
+ gint _tmp4__length1 = 0;
+ PhotoMetadataSetOption _tmp5_ = 0;
#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _tmp5_ = photo_metadata_COMMENT_TAGS;
+ _tmp4_ = photo_metadata_COMMENT_TAGS;
#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _tmp5__length1 = photo_metadata_COMMENT_TAGS_length1;
+ _tmp4__length1 = photo_metadata_COMMENT_TAGS_length1;
#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- photo_metadata_remove_tags (self, _tmp5_, _tmp5__length1);
-#line 7069 "PhotoMetadata.c"
+ _tmp5_ = option;
+#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ photo_metadata_set_all_generic (self, _tmp4_, _tmp4__length1, _tmp5_, ____lambda10__photo_metadata_set_generic_value, _data6_);
+#line 7138 "PhotoMetadata.c"
+ } else {
+ gchar** _tmp6_ = NULL;
+ gint _tmp6__length1 = 0;
+#line 981 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ _tmp6_ = photo_metadata_COMMENT_TAGS;
+#line 981 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ _tmp6__length1 = photo_metadata_COMMENT_TAGS_length1;
+#line 981 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ photo_metadata_remove_tags (self, _tmp6_, _tmp6__length1);
+#line 7148 "PhotoMetadata.c"
}
+#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ block6_data_unref (_data6_);
+#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ _data6_ = NULL;
+#line 7154 "PhotoMetadata.c"
}
@@ -7084,114 +7168,114 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
gboolean _tmp23_ = FALSE;
GeeSet* _tmp24_ = NULL;
GeeSet* _tmp29_ = NULL;
-#line 996 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1001 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 997 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
keywords = NULL;
-#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = photo_metadata_KEYWORD_TAGS;
-#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = photo_metadata_KEYWORD_TAGS_length1;
-#line 7091 "PhotoMetadata.c"
+#line 7175 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
gint _tag_collection_size_ = 0;
gint tag_it = 0;
-#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag_collection = _tmp0_;
-#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag_collection_length1 = _tmp0__length1;
-#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 7103 "PhotoMetadata.c"
+#line 7187 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
-#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
-#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 7110 "PhotoMetadata.c"
+#line 7194 "PhotoMetadata.c"
{
GeeCollection* values = NULL;
const gchar* _tmp2_ = NULL;
GeeList* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
GeeCollection* _tmp5_ = NULL;
-#line 999 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = tag;
-#line 999 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = photo_metadata_get_string_multiple (self, _tmp2_);
-#line 999 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
values = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = values;
-#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp5_ != NULL) {
-#line 7127 "PhotoMetadata.c"
+#line 7211 "PhotoMetadata.c"
GeeCollection* _tmp6_ = NULL;
gint _tmp7_ = 0;
gint _tmp8_ = 0;
-#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = values;
-#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = gee_collection_get_size (_tmp6_);
-#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp8_ = _tmp7_;
-#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = _tmp8_ > 0;
-#line 7139 "PhotoMetadata.c"
+#line 7223 "PhotoMetadata.c"
} else {
-#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = FALSE;
-#line 7143 "PhotoMetadata.c"
+#line 7227 "PhotoMetadata.c"
}
-#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_) {
-#line 7147 "PhotoMetadata.c"
+#line 7231 "PhotoMetadata.c"
GeeSet* _tmp9_ = NULL;
-#line 1001 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1006 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = keywords;
-#line 1001 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1006 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp9_ == NULL) {
-#line 7153 "PhotoMetadata.c"
+#line 7237 "PhotoMetadata.c"
GCompareDataFunc _tmp10_ = NULL;
void* _tmp10__target = NULL;
GDestroyNotify _tmp10__target_destroy_notify = NULL;
GeeSet* _tmp11_ = NULL;
-#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = compare_func;
-#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10__target = compare_func_target;
-#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10__target_destroy_notify = compare_func_target_destroy_notify;
-#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
compare_func = NULL;
-#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
compare_func_target = NULL;
-#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
compare_func_target_destroy_notify = NULL;
-#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = photo_metadata_create_string_set (self, _tmp10_, _tmp10__target, _tmp10__target_destroy_notify);
-#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (keywords);
-#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
keywords = _tmp11_;
-#line 7176 "PhotoMetadata.c"
+#line 7260 "PhotoMetadata.c"
}
{
GeeIterator* _current_value_it = NULL;
GeeCollection* _tmp12_ = NULL;
GeeIterator* _tmp13_ = NULL;
-#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp12_ = values;
-#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_current_value_it = _tmp13_;
-#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 7190 "PhotoMetadata.c"
+#line 7274 "PhotoMetadata.c"
GeeIterator* _tmp14_ = NULL;
gboolean _tmp15_ = FALSE;
gchar* current_value = NULL;
@@ -7201,111 +7285,111 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
const gchar* _tmp19_ = NULL;
gchar* _tmp20_ = NULL;
gchar* _tmp21_ = NULL;
-#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp14_ = _current_value_it;
-#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp15_ = gee_iterator_next (_tmp14_);
-#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp15_) {
-#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 7208 "PhotoMetadata.c"
+#line 7292 "PhotoMetadata.c"
}
-#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp16_ = _current_value_it;
-#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp17_ = gee_iterator_get (_tmp16_);
-#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
current_value = (gchar*) _tmp17_;
-#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp18_ = keywords;
-#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp19_ = current_value;
-#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp20_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp19_);
-#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp21_ = _tmp20_;
-#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_);
-#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_tmp21_);
-#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (current_value);
-#line 7230 "PhotoMetadata.c"
+#line 7314 "PhotoMetadata.c"
}
-#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_current_value_it);
-#line 7234 "PhotoMetadata.c"
+#line 7318 "PhotoMetadata.c"
}
}
-#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (values);
-#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 7241 "PhotoMetadata.c"
+#line 7325 "PhotoMetadata.c"
}
}
}
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp24_ = keywords;
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp24_ != NULL) {
-#line 7249 "PhotoMetadata.c"
+#line 7333 "PhotoMetadata.c"
GeeSet* _tmp25_ = NULL;
gint _tmp26_ = 0;
gint _tmp27_ = 0;
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp25_ = keywords;
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp27_ = _tmp26_;
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp23_ = _tmp27_ > 0;
-#line 7261 "PhotoMetadata.c"
+#line 7345 "PhotoMetadata.c"
} else {
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp23_ = FALSE;
-#line 7265 "PhotoMetadata.c"
+#line 7349 "PhotoMetadata.c"
}
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp23_) {
-#line 7269 "PhotoMetadata.c"
+#line 7353 "PhotoMetadata.c"
GeeSet* _tmp28_ = NULL;
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp28_ = keywords;
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp22_ = _tmp28_;
-#line 7275 "PhotoMetadata.c"
+#line 7359 "PhotoMetadata.c"
} else {
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp22_ = NULL;
-#line 7279 "PhotoMetadata.c"
+#line 7363 "PhotoMetadata.c"
}
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp29_ = _g_object_ref0 (_tmp22_);
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp29_;
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (keywords);
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
compare_func = NULL;
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
compare_func_target = NULL;
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
compare_func_target_destroy_notify = NULL;
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7297 "PhotoMetadata.c"
+#line 7381 "PhotoMetadata.c"
}
static gpointer _hierarchical_keyword_field_ref0 (gpointer self) {
-#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self ? hierarchical_keyword_field_ref (self) : NULL;
-#line 7304 "PhotoMetadata.c"
+#line 7388 "PhotoMetadata.c"
}
@@ -7318,7 +7402,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_return_val_if_fail (old != NULL, NULL);
#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
-#line 7317 "PhotoMetadata.c"
+#line 7401 "PhotoMetadata.c"
{
GRegex* regex = NULL;
const gchar* _tmp0_ = NULL;
@@ -7349,7 +7433,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 7348 "PhotoMetadata.c"
+#line 7432 "PhotoMetadata.c"
goto __catch27_g_regex_error;
}
#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7358,7 +7442,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_clear_error (&_inner_error_);
#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
-#line 7357 "PhotoMetadata.c"
+#line 7441 "PhotoMetadata.c"
}
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = regex;
@@ -7374,7 +7458,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_g_regex_unref0 (regex);
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 7373 "PhotoMetadata.c"
+#line 7457 "PhotoMetadata.c"
goto __catch27_g_regex_error;
}
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7385,7 +7469,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_clear_error (&_inner_error_);
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
-#line 7384 "PhotoMetadata.c"
+#line 7468 "PhotoMetadata.c"
}
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = _tmp5_;
@@ -7399,7 +7483,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_g_regex_unref0 (regex);
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 7398 "PhotoMetadata.c"
+#line 7482 "PhotoMetadata.c"
}
goto __finally27;
__catch27_g_regex_error:
@@ -7413,7 +7497,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_assert_not_reached ();
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_error_free0 (e);
-#line 7412 "PhotoMetadata.c"
+#line 7496 "PhotoMetadata.c"
}
__finally27:
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7424,7 +7508,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_clear_error (&_inner_error_);
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
-#line 7423 "PhotoMetadata.c"
+#line 7507 "PhotoMetadata.c"
}
}
@@ -7448,7 +7532,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
_tmp3_ = end;
#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
-#line 7447 "PhotoMetadata.c"
+#line 7531 "PhotoMetadata.c"
glong _tmp4_ = 0L;
#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
@@ -7456,7 +7540,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
result = _tmp4_;
#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 7455 "PhotoMetadata.c"
+#line 7539 "PhotoMetadata.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
@@ -7468,7 +7552,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
result = (glong) (_tmp5_ - _tmp6_);
#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 7467 "PhotoMetadata.c"
+#line 7551 "PhotoMetadata.c"
}
}
@@ -7492,21 +7576,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp1_ = offset;
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
-#line 7491 "PhotoMetadata.c"
+#line 7575 "PhotoMetadata.c"
glong _tmp2_ = 0L;
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 7497 "PhotoMetadata.c"
+#line 7581 "PhotoMetadata.c"
} else {
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 7501 "PhotoMetadata.c"
+#line 7585 "PhotoMetadata.c"
}
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 7505 "PhotoMetadata.c"
+#line 7589 "PhotoMetadata.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
@@ -7518,7 +7602,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
-#line 7517 "PhotoMetadata.c"
+#line 7601 "PhotoMetadata.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
@@ -7528,13 +7612,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp7_ = _tmp6_;
#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
-#line 7527 "PhotoMetadata.c"
+#line 7611 "PhotoMetadata.c"
}
#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
-#line 7533 "PhotoMetadata.c"
+#line 7617 "PhotoMetadata.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
@@ -7548,7 +7632,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp11_ = offset;
#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 7547 "PhotoMetadata.c"
+#line 7631 "PhotoMetadata.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
@@ -7558,13 +7642,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp13_ = string_length;
#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 7557 "PhotoMetadata.c"
+#line 7641 "PhotoMetadata.c"
}
#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
-#line 7563 "PhotoMetadata.c"
+#line 7647 "PhotoMetadata.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7573,7 +7657,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp16_ = offset;
#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
-#line 7572 "PhotoMetadata.c"
+#line 7656 "PhotoMetadata.c"
}
#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
@@ -7593,7 +7677,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
result = _tmp22_;
#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 7592 "PhotoMetadata.c"
+#line 7676 "PhotoMetadata.c"
}
@@ -7603,81 +7687,81 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
HierarchicalTagIndex* _tmp4_ = NULL;
HierarchicalKeywordField** _tmp5_ = NULL;
gint _tmp5__length1 = 0;
-#line 1012 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 1012 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_if_fail ((index == NULL) || IS_HIERARCHICAL_TAG_INDEX (index));
-#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
-#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 7610 "PhotoMetadata.c"
+#line 7694 "PhotoMetadata.c"
{
HierarchicalKeywordField** current_field_collection = NULL;
gint current_field_collection_length1 = 0;
gint _current_field_collection_size_ = 0;
gint current_field_it = 0;
-#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
current_field_collection = _tmp0_;
-#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
current_field_collection_length1 = _tmp0__length1;
-#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (current_field_it = 0; current_field_it < _tmp0__length1; current_field_it = current_field_it + 1) {
-#line 7622 "PhotoMetadata.c"
+#line 7706 "PhotoMetadata.c"
HierarchicalKeywordField* _tmp1_ = NULL;
HierarchicalKeywordField* current_field = NULL;
-#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]);
-#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
current_field = _tmp1_;
-#line 7629 "PhotoMetadata.c"
+#line 7713 "PhotoMetadata.c"
{
HierarchicalKeywordField* _tmp2_ = NULL;
const gchar* _tmp3_ = NULL;
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = current_field;
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = _tmp2_->field_name;
-#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tag (self, _tmp3_);
-#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_hierarchical_keyword_field_unref0 (current_field);
-#line 7641 "PhotoMetadata.c"
+#line 7725 "PhotoMetadata.c"
}
}
}
-#line 1016 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = index;
-#line 1016 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_ == NULL) {
-#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1022 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 7651 "PhotoMetadata.c"
+#line 7735 "PhotoMetadata.c"
}
-#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
-#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 7657 "PhotoMetadata.c"
+#line 7741 "PhotoMetadata.c"
{
HierarchicalKeywordField** current_field_collection = NULL;
gint current_field_collection_length1 = 0;
gint _current_field_collection_size_ = 0;
gint current_field_it = 0;
-#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
current_field_collection = _tmp5_;
-#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
current_field_collection_length1 = _tmp5__length1;
-#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (current_field_it = 0; current_field_it < _tmp5__length1; current_field_it = current_field_it + 1) {
-#line 7669 "PhotoMetadata.c"
+#line 7753 "PhotoMetadata.c"
HierarchicalKeywordField* _tmp6_ = NULL;
HierarchicalKeywordField* current_field = NULL;
-#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]);
-#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
current_field = _tmp6_;
-#line 7676 "PhotoMetadata.c"
+#line 7760 "PhotoMetadata.c"
{
HierarchicalKeywordField* _tmp7_ = NULL;
gboolean _tmp8_ = FALSE;
@@ -7686,23 +7770,23 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
HierarchicalKeywordField* _tmp29_ = NULL;
const gchar* _tmp30_ = NULL;
GeeSet* _tmp31_ = NULL;
-#line 1020 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = current_field;
-#line 1020 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp8_ = _tmp7_->is_writeable;
-#line 1020 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp8_) {
-#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_hierarchical_keyword_field_unref0 (current_field);
-#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
continue;
-#line 7695 "PhotoMetadata.c"
+#line 7779 "PhotoMetadata.c"
}
-#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
-#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
writeable_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_SET, GeeSet);
-#line 7701 "PhotoMetadata.c"
+#line 7785 "PhotoMetadata.c"
{
GeeIterator* _current_path_it = NULL;
HierarchicalTagIndex* _tmp10_ = NULL;
@@ -7710,23 +7794,23 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
GeeCollection* _tmp12_ = NULL;
GeeIterator* _tmp13_ = NULL;
GeeIterator* _tmp14_ = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = index;
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = hierarchical_tag_index_get_all_paths (_tmp10_);
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp12_ = _tmp11_;
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp14_ = _tmp13_;
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_tmp12_);
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_current_path_it = _tmp14_;
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 7725 "PhotoMetadata.c"
+#line 7809 "PhotoMetadata.c"
GeeIterator* _tmp15_ = NULL;
gboolean _tmp16_ = FALSE;
gchar* current_path = NULL;
@@ -7741,80 +7825,80 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
gboolean _tmp24_ = FALSE;
GeeSet* _tmp27_ = NULL;
const gchar* _tmp28_ = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp15_ = _current_path_it;
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp16_ = gee_iterator_next (_tmp15_);
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp16_) {
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 7748 "PhotoMetadata.c"
+#line 7832 "PhotoMetadata.c"
}
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp17_ = _current_path_it;
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp18_ = gee_iterator_get (_tmp17_);
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
current_path = (gchar*) _tmp18_;
-#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp19_ = current_path;
-#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp20_ = current_field;
-#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp21_ = _tmp20_->path_separator;
-#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp22_ = string_replace (_tmp19_, TAG_PATH_SEPARATOR_STRING, _tmp21_);
-#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
writeable_path = _tmp22_;
-#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp23_ = current_field;
-#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp24_ = _tmp23_->wants_leading_separator;
-#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp24_) {
-#line 7772 "PhotoMetadata.c"
+#line 7856 "PhotoMetadata.c"
const gchar* _tmp25_ = NULL;
gchar* _tmp26_ = NULL;
-#line 1029 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp25_ = writeable_path;
-#line 1029 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp26_ = string_substring (_tmp25_, (glong) 1, (glong) -1);
-#line 1029 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (writeable_path);
-#line 1029 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
writeable_path = _tmp26_;
-#line 7783 "PhotoMetadata.c"
+#line 7867 "PhotoMetadata.c"
}
-#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp27_ = writeable_set;
-#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp28_ = writeable_path;
-#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_);
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (writeable_path);
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (current_path);
-#line 7795 "PhotoMetadata.c"
+#line 7879 "PhotoMetadata.c"
}
-#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_current_path_it);
-#line 7799 "PhotoMetadata.c"
+#line 7883 "PhotoMetadata.c"
}
-#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp29_ = current_field;
-#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp30_ = _tmp29_->field_name;
-#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp31_ = writeable_set;
-#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string_multiple (self, _tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (writeable_set);
-#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_hierarchical_keyword_field_unref0 (current_field);
-#line 7813 "PhotoMetadata.c"
+#line 7897 "PhotoMetadata.c"
}
}
}
@@ -7828,23 +7912,23 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
GeeTreeSet* _tmp1_ = NULL;
GeeCollection* _tmp2_ = NULL;
GeeCollection* _tmp28_ = NULL;
-#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_if_fail ((keywords == NULL) || GEE_IS_COLLECTION (keywords));
-#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = hierarchical_tag_index_new ();
-#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
htag_index = _tmp0_;
-#line 1040 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
-#line 1040 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
flat_keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet);
-#line 1042 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = keywords;
-#line 1042 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp2_ != NULL) {
-#line 7843 "PhotoMetadata.c"
+#line 7927 "PhotoMetadata.c"
GeeSet* _tmp24_ = NULL;
HierarchicalTagIndex* _tmp25_ = NULL;
GeeCollection* _tmp26_ = NULL;
@@ -7853,15 +7937,15 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
GeeIterator* _keyword_it = NULL;
GeeCollection* _tmp3_ = NULL;
GeeIterator* _tmp4_ = NULL;
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = keywords;
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_keyword_it = _tmp4_;
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 7860 "PhotoMetadata.c"
+#line 7944 "PhotoMetadata.c"
GeeIterator* _tmp5_ = NULL;
gboolean _tmp6_ = FALSE;
gchar* keyword = NULL;
@@ -7869,52 +7953,52 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
gpointer _tmp8_ = NULL;
const gchar* _tmp9_ = NULL;
gboolean _tmp10_ = FALSE;
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = _keyword_it;
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = gee_iterator_next (_tmp5_);
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp6_) {
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 7876 "PhotoMetadata.c"
+#line 7960 "PhotoMetadata.c"
}
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = _keyword_it;
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp8_ = gee_iterator_get (_tmp7_);
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
keyword = (gchar*) _tmp8_;
-#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = keyword;
-#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = g_str_has_prefix (_tmp9_, TAG_PATH_SEPARATOR_STRING);
-#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp10_) {
-#line 7890 "PhotoMetadata.c"
+#line 7974 "PhotoMetadata.c"
GeeCollection* path_components = NULL;
const gchar* _tmp11_ = NULL;
GeeList* _tmp12_ = NULL;
-#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = keyword;
-#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_);
-#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
path_components = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 7900 "PhotoMetadata.c"
+#line 7984 "PhotoMetadata.c"
{
GeeIterator* _component_it = NULL;
GeeCollection* _tmp13_ = NULL;
GeeIterator* _tmp14_ = NULL;
-#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13_ = path_components;
-#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_component_it = _tmp14_;
-#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 7913 "PhotoMetadata.c"
+#line 7997 "PhotoMetadata.c"
GeeIterator* _tmp15_ = NULL;
gboolean _tmp16_ = FALSE;
gchar* component = NULL;
@@ -7923,117 +8007,117 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
HierarchicalTagIndex* _tmp19_ = NULL;
const gchar* _tmp20_ = NULL;
const gchar* _tmp21_ = NULL;
-#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp15_ = _component_it;
-#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp16_ = gee_iterator_next (_tmp15_);
-#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp16_) {
-#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 7930 "PhotoMetadata.c"
+#line 8014 "PhotoMetadata.c"
}
-#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp17_ = _component_it;
-#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp18_ = gee_iterator_get (_tmp17_);
-#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
component = (gchar*) _tmp18_;
-#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp19_ = htag_index;
-#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp20_ = component;
-#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp21_ = keyword;
-#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
hierarchical_tag_index_add_path (_tmp19_, _tmp20_, _tmp21_);
-#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (component);
-#line 7948 "PhotoMetadata.c"
+#line 8032 "PhotoMetadata.c"
}
-#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_component_it);
-#line 7952 "PhotoMetadata.c"
+#line 8036 "PhotoMetadata.c"
}
-#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (path_components);
-#line 7956 "PhotoMetadata.c"
+#line 8040 "PhotoMetadata.c"
} else {
GeeSet* _tmp22_ = NULL;
const gchar* _tmp23_ = NULL;
-#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp22_ = flat_keywords;
-#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp23_ = keyword;
-#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
-#line 7966 "PhotoMetadata.c"
+#line 8050 "PhotoMetadata.c"
}
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (keyword);
-#line 7970 "PhotoMetadata.c"
+#line 8054 "PhotoMetadata.c"
}
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_keyword_it);
-#line 7974 "PhotoMetadata.c"
+#line 8058 "PhotoMetadata.c"
}
-#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp24_ = flat_keywords;
-#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp25_ = htag_index;
-#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp26_ = hierarchical_tag_index_get_all_tags (_tmp25_);
-#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp27_ = _tmp26_;
-#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_);
-#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_tmp27_);
-#line 7988 "PhotoMetadata.c"
+#line 8072 "PhotoMetadata.c"
}
-#line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp28_ = keywords;
-#line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp28_ != NULL) {
-#line 7994 "PhotoMetadata.c"
+#line 8078 "PhotoMetadata.c"
gchar** _tmp29_ = NULL;
gint _tmp29__length1 = 0;
GeeSet* _tmp30_ = NULL;
PhotoMetadataSetOption _tmp31_ = 0;
HierarchicalTagIndex* _tmp32_ = NULL;
-#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp29_ = photo_metadata_KEYWORD_TAGS;
-#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp29__length1 = photo_metadata_KEYWORD_TAGS_length1;
-#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp30_ = flat_keywords;
-#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp31_ = option;
-#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_all_string_multiple (self, _tmp29_, _tmp29__length1, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), _tmp31_);
-#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp32_ = htag_index;
-#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_internal_set_hierarchical_keywords (self, _tmp32_);
-#line 8014 "PhotoMetadata.c"
+#line 8098 "PhotoMetadata.c"
} else {
gchar** _tmp33_ = NULL;
gint _tmp33__length1 = 0;
-#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp33_ = photo_metadata_KEYWORD_TAGS;
-#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp33__length1 = photo_metadata_KEYWORD_TAGS_length1;
-#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tags (self, _tmp33_, _tmp33__length1);
-#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_internal_set_hierarchical_keywords (self, NULL);
-#line 8026 "PhotoMetadata.c"
+#line 8110 "PhotoMetadata.c"
}
-#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (flat_keywords);
-#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_hierarchical_tag_index_unref0 (htag_index);
-#line 8032 "PhotoMetadata.c"
+#line 8116 "PhotoMetadata.c"
}
@@ -8041,32 +8125,32 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
gboolean result = FALSE;
HierarchicalKeywordField** _tmp0_ = NULL;
gint _tmp0__length1 = 0;
-#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
-#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 8046 "PhotoMetadata.c"
+#line 8130 "PhotoMetadata.c"
{
HierarchicalKeywordField** field_collection = NULL;
gint field_collection_length1 = 0;
gint _field_collection_size_ = 0;
gint field_it = 0;
-#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
field_collection = _tmp0_;
-#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
field_collection_length1 = _tmp0__length1;
-#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (field_it = 0; field_it < _tmp0__length1; field_it = field_it + 1) {
-#line 8058 "PhotoMetadata.c"
+#line 8142 "PhotoMetadata.c"
HierarchicalKeywordField* _tmp1_ = NULL;
HierarchicalKeywordField* field = NULL;
-#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]);
-#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
field = _tmp1_;
-#line 8065 "PhotoMetadata.c"
+#line 8149 "PhotoMetadata.c"
{
GeeCollection* values = NULL;
HierarchicalKeywordField* _tmp2_ = NULL;
@@ -8074,61 +8158,61 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
GeeList* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
GeeCollection* _tmp6_ = NULL;
-#line 1068 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = field;
-#line 1068 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = _tmp2_->field_name;
-#line 1068 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = photo_metadata_get_string_multiple (self, _tmp3_);
-#line 1068 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
values = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = values;
-#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp6_ != NULL) {
-#line 8085 "PhotoMetadata.c"
+#line 8169 "PhotoMetadata.c"
GeeCollection* _tmp7_ = NULL;
gint _tmp8_ = 0;
gint _tmp9_ = 0;
-#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = values;
-#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp8_ = gee_collection_get_size (_tmp7_);
-#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = _tmp8_;
-#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = _tmp9_ > 0;
-#line 8097 "PhotoMetadata.c"
+#line 8181 "PhotoMetadata.c"
} else {
-#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = FALSE;
-#line 8101 "PhotoMetadata.c"
+#line 8185 "PhotoMetadata.c"
}
-#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp5_) {
-#line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = TRUE;
-#line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (values);
-#line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_hierarchical_keyword_field_unref0 (field);
-#line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8113 "PhotoMetadata.c"
+#line 8197 "PhotoMetadata.c"
}
-#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (values);
-#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_hierarchical_keyword_field_unref0 (field);
-#line 8119 "PhotoMetadata.c"
+#line 8203 "PhotoMetadata.c"
}
}
}
-#line 1074 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1079 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = FALSE;
-#line 1074 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1079 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8127 "PhotoMetadata.c"
+#line 8211 "PhotoMetadata.c"
}
@@ -8140,40 +8224,40 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
HierarchicalKeywordField** _tmp2_ = NULL;
gint _tmp2__length1 = 0;
GError * _inner_error_ = NULL;
-#line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1078 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = photo_metadata_has_hierarchical_keywords (self);
-#line 1078 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_assert (_tmp0_, "has_hierarchical_keywords()");
-#line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = photo_metadata_create_string_set (self, NULL, NULL, NULL);
-#line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
h_keywords = _tmp1_;
-#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
-#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 8153 "PhotoMetadata.c"
+#line 8237 "PhotoMetadata.c"
{
HierarchicalKeywordField** field_collection = NULL;
gint field_collection_length1 = 0;
gint _field_collection_size_ = 0;
gint field_it = 0;
-#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
field_collection = _tmp2_;
-#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
field_collection_length1 = _tmp2__length1;
-#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (field_it = 0; field_it < _tmp2__length1; field_it = field_it + 1) {
-#line 8165 "PhotoMetadata.c"
+#line 8249 "PhotoMetadata.c"
HierarchicalKeywordField* _tmp3_ = NULL;
HierarchicalKeywordField* field = NULL;
-#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]);
-#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
field = _tmp3_;
-#line 8172 "PhotoMetadata.c"
+#line 8256 "PhotoMetadata.c"
{
GeeCollection* values = NULL;
HierarchicalKeywordField* _tmp4_ = NULL;
@@ -8183,85 +8267,85 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
GeeCollection* _tmp8_ = NULL;
GeeArrayList* transformed_values = NULL;
GeeArrayList* _tmp12_ = NULL;
-#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = field;
-#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = _tmp4_->field_name;
-#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = photo_metadata_get_string_multiple (self, _tmp5_);
-#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
values = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp8_ = values;
-#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp8_ == NULL) {
-#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = TRUE;
-#line 8196 "PhotoMetadata.c"
+#line 8280 "PhotoMetadata.c"
} else {
GeeCollection* _tmp9_ = NULL;
gint _tmp10_ = 0;
gint _tmp11_ = 0;
-#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = values;
-#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = gee_collection_get_size (_tmp9_);
-#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = _tmp10_;
-#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = _tmp11_ < 1;
-#line 8209 "PhotoMetadata.c"
+#line 8293 "PhotoMetadata.c"
}
-#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp7_) {
-#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (values);
-#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_hierarchical_keyword_field_unref0 (field);
-#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
continue;
-#line 8219 "PhotoMetadata.c"
+#line 8303 "PhotoMetadata.c"
}
-#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1093 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp12_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
-#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1093 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
transformed_values = _tmp12_;
-#line 8225 "PhotoMetadata.c"
+#line 8309 "PhotoMetadata.c"
{
GeeIterator* _current_value_it = NULL;
GeeCollection* _tmp13_ = NULL;
GeeIterator* _tmp14_ = NULL;
-#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13_ = values;
-#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_current_value_it = _tmp14_;
-#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 8238 "PhotoMetadata.c"
+#line 8322 "PhotoMetadata.c"
GeeIterator* _tmp15_ = NULL;
gboolean _tmp16_ = FALSE;
gchar* current_value = NULL;
GeeIterator* _tmp17_ = NULL;
gpointer _tmp18_ = NULL;
-#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp15_ = _current_value_it;
-#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp16_ = gee_iterator_next (_tmp15_);
-#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp16_) {
-#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 8252 "PhotoMetadata.c"
+#line 8336 "PhotoMetadata.c"
}
-#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp17_ = _current_value_it;
-#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp18_ = gee_iterator_get (_tmp17_);
-#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
current_value = (gchar*) _tmp18_;
-#line 8260 "PhotoMetadata.c"
+#line 8344 "PhotoMetadata.c"
{
GeeList* transformed = NULL;
HierarchicalKeywordField* _tmp19_ = NULL;
@@ -8270,30 +8354,30 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
GeeList* _tmp22_ = NULL;
GeeArrayList* _tmp23_ = NULL;
GeeList* _tmp24_ = NULL;
-#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp19_ = field;
-#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp20_ = _tmp19_->transformer;
-#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp21_ = current_value;
-#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp22_ = keyword_transformer_transform (_tmp20_, _tmp21_, &_inner_error_);
-#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
transformed = _tmp22_;
-#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8281 "PhotoMetadata.c"
+#line 8365 "PhotoMetadata.c"
goto __catch28_g_error;
}
-#line 1092 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp23_ = transformed_values;
-#line 1092 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp24_ = transformed;
-#line 1092 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_array_list_add_all (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (transformed);
-#line 8292 "PhotoMetadata.c"
+#line 8376 "PhotoMetadata.c"
}
goto __finally28;
__catch28_g_error:
@@ -8302,52 +8386,52 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
const gchar* _tmp25_ = NULL;
GError* _tmp26_ = NULL;
const gchar* _tmp27_ = NULL;
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_error_ = _inner_error_;
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_inner_error_ = NULL;
-#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp25_ = current_value;
-#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp26_ = _error_;
-#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp27_ = _tmp26_->message;
-#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- g_critical ("PhotoMetadata.vala:1094: Failed to transform tag value %s: %s", _tmp25_, _tmp27_);
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ g_critical ("PhotoMetadata.vala:1099: Failed to transform tag value %s: %s", _tmp25_, _tmp27_);
+#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_error_free0 (_error_);
-#line 8315 "PhotoMetadata.c"
+#line 8399 "PhotoMetadata.c"
}
__finally28:
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (current_value);
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_current_value_it);
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (transformed_values);
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (values);
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_hierarchical_keyword_field_unref0 (field);
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (h_keywords);
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.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 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_clear_error (&_inner_error_);
-#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 8338 "PhotoMetadata.c"
+#line 8422 "PhotoMetadata.c"
}
-#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (current_value);
-#line 8342 "PhotoMetadata.c"
+#line 8426 "PhotoMetadata.c"
}
-#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_current_value_it);
-#line 8346 "PhotoMetadata.c"
+#line 8430 "PhotoMetadata.c"
}
{
GeeArrayList* _current_value_list = NULL;
@@ -8358,25 +8442,25 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
gint _tmp31_ = 0;
gint _tmp32_ = 0;
gint _current_value_index = 0;
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp28_ = transformed_values;
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp29_ = _g_object_ref0 (_tmp28_);
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_current_value_list = _tmp29_;
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp30_ = _current_value_list;
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp31_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp32_ = _tmp31_;
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_current_value_size = _tmp32_;
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_current_value_index = -1;
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 8375 "PhotoMetadata.c"
+#line 8459 "PhotoMetadata.c"
gint _tmp33_ = 0;
gint _tmp34_ = 0;
gint _tmp35_ = 0;
@@ -8390,78 +8474,78 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
const gchar* _tmp41_ = NULL;
gchar* _tmp42_ = NULL;
const gchar* _tmp43_ = NULL;
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp33_ = _current_value_index;
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_current_value_index = _tmp33_ + 1;
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp34_ = _current_value_index;
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp35_ = _current_value_size;
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!(_tmp34_ < _tmp35_)) {
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 8401 "PhotoMetadata.c"
+#line 8485 "PhotoMetadata.c"
}
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp36_ = _current_value_list;
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp37_ = _current_value_index;
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp38_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp37_);
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
current_value = (gchar*) _tmp38_;
-#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp39_ = current_value;
-#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp40_ = field;
-#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp41_ = _tmp40_->path_separator;
-#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp42_ = hierarchical_tag_utilities_canonicalize (_tmp39_, _tmp41_);
-#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
canonicalized = _tmp42_;
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp43_ = canonicalized;
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp43_ != NULL) {
-#line 8425 "PhotoMetadata.c"
+#line 8509 "PhotoMetadata.c"
GeeSet* _tmp44_ = NULL;
const gchar* _tmp45_ = NULL;
-#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp44_ = h_keywords;
-#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp45_ = canonicalized;
-#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection), _tmp45_);
-#line 8434 "PhotoMetadata.c"
+#line 8518 "PhotoMetadata.c"
}
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (canonicalized);
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (current_value);
-#line 8440 "PhotoMetadata.c"
+#line 8524 "PhotoMetadata.c"
}
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_current_value_list);
-#line 8444 "PhotoMetadata.c"
+#line 8528 "PhotoMetadata.c"
}
-#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (transformed_values);
-#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (values);
-#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_hierarchical_keyword_field_unref0 (field);
-#line 8452 "PhotoMetadata.c"
+#line 8536 "PhotoMetadata.c"
}
}
}
-#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1115 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = h_keywords;
-#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1115 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8460 "PhotoMetadata.c"
+#line 8544 "PhotoMetadata.c"
}
@@ -8469,17 +8553,17 @@ gboolean photo_metadata_has_orientation (PhotoMetadata* self) {
gboolean result = FALSE;
GExiv2Metadata* _tmp0_ = NULL;
GExiv2Orientation _tmp1_ = 0;
-#line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = self->priv->exiv2;
-#line 1114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = gexiv2_metadata_get_orientation (_tmp0_);
-#line 1114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp1_ == GEXIV2_ORIENTATION_UNSPECIFIED;
-#line 1114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8478 "PhotoMetadata.c"
+#line 8562 "PhotoMetadata.c"
}
@@ -8491,58 +8575,58 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
gboolean _tmp2_ = FALSE;
gboolean _tmp3_ = FALSE;
GExiv2Orientation _tmp4_ = 0;
-#line 1118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), 0);
-#line 1121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = self->priv->exiv2;
-#line 1121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = gexiv2_metadata_get_orientation (_tmp0_);
-#line 1121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
orientation = _tmp1_;
-#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = orientation;
-#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_ == GEXIV2_ORIENTATION_UNSPECIFIED) {
-#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = TRUE;
-#line 8504 "PhotoMetadata.c"
+#line 8588 "PhotoMetadata.c"
} else {
GExiv2Orientation _tmp5_ = 0;
-#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = orientation;
-#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = _tmp5_ < ORIENTATION_MIN;
-#line 8511 "PhotoMetadata.c"
+#line 8595 "PhotoMetadata.c"
}
-#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp3_) {
-#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = TRUE;
-#line 8517 "PhotoMetadata.c"
+#line 8601 "PhotoMetadata.c"
} else {
GExiv2Orientation _tmp6_ = 0;
-#line 1123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = orientation;
-#line 1123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = _tmp6_ > ORIENTATION_MAX;
-#line 8524 "PhotoMetadata.c"
+#line 8608 "PhotoMetadata.c"
}
-#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp2_) {
-#line 1124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = ORIENTATION_TOP_LEFT;
-#line 1124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8532 "PhotoMetadata.c"
+#line 8616 "PhotoMetadata.c"
} else {
GExiv2Orientation _tmp7_ = 0;
-#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = orientation;
-#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = (Orientation) _tmp7_;
-#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8541 "PhotoMetadata.c"
+#line 8625 "PhotoMetadata.c"
}
}
@@ -8550,15 +8634,15 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientation) {
GExiv2Metadata* _tmp0_ = NULL;
Orientation _tmp1_ = 0;
-#line 1129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1134 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = self->priv->exiv2;
-#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = orientation;
-#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gexiv2_metadata_set_orientation (_tmp0_, (GExiv2Orientation) _tmp1_);
-#line 8557 "PhotoMetadata.c"
+#line 8641 "PhotoMetadata.c"
}
@@ -8576,127 +8660,127 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar*
gboolean _tmp4_ = FALSE;
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1134 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1139 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = self->priv->exiv2;
-#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = gexiv2_metadata_get_gps_info (_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_longitude = _tmp1_;
-#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_latitude = _tmp2_;
-#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_altitude = _tmp3_;
-#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp4_) {
-#line 1137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_vala_long_ref);
-#line 1137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_long_ref = NULL;
-#line 1138 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_vala_lat_ref);
-#line 1138 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_lat_ref = NULL;
-#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = FALSE;
-#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (longitude) {
-#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*longitude = _vala_longitude;
-#line 8603 "PhotoMetadata.c"
+#line 8687 "PhotoMetadata.c"
}
-#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (long_ref) {
-#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*long_ref = _vala_long_ref;
-#line 8609 "PhotoMetadata.c"
+#line 8693 "PhotoMetadata.c"
} else {
-#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_vala_long_ref);
-#line 8613 "PhotoMetadata.c"
+#line 8697 "PhotoMetadata.c"
}
-#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (latitude) {
-#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*latitude = _vala_latitude;
-#line 8619 "PhotoMetadata.c"
+#line 8703 "PhotoMetadata.c"
}
-#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (lat_ref) {
-#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*lat_ref = _vala_lat_ref;
-#line 8625 "PhotoMetadata.c"
+#line 8709 "PhotoMetadata.c"
} else {
-#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_vala_lat_ref);
-#line 8629 "PhotoMetadata.c"
+#line 8713 "PhotoMetadata.c"
}
-#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (altitude) {
-#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*altitude = _vala_altitude;
-#line 8635 "PhotoMetadata.c"
+#line 8719 "PhotoMetadata.c"
}
-#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8639 "PhotoMetadata.c"
+#line 8723 "PhotoMetadata.c"
}
-#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = photo_metadata_get_string (self, "Exif.GPSInfo.GPSLongitudeRef", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_vala_long_ref);
-#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_long_ref = _tmp5_;
-#line 1144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1149 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = photo_metadata_get_string (self, "Exif.GPSInfo.GPSLatitudeRef", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1149 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_vala_lat_ref);
-#line 1144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1149 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_lat_ref = _tmp6_;
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = TRUE;
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (longitude) {
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*longitude = _vala_longitude;
-#line 8659 "PhotoMetadata.c"
+#line 8743 "PhotoMetadata.c"
}
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (long_ref) {
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*long_ref = _vala_long_ref;
-#line 8665 "PhotoMetadata.c"
+#line 8749 "PhotoMetadata.c"
} else {
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_vala_long_ref);
-#line 8669 "PhotoMetadata.c"
+#line 8753 "PhotoMetadata.c"
}
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (latitude) {
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*latitude = _vala_latitude;
-#line 8675 "PhotoMetadata.c"
+#line 8759 "PhotoMetadata.c"
}
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (lat_ref) {
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*lat_ref = _vala_lat_ref;
-#line 8681 "PhotoMetadata.c"
+#line 8765 "PhotoMetadata.c"
} else {
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_vala_lat_ref);
-#line 8685 "PhotoMetadata.c"
+#line 8769 "PhotoMetadata.c"
}
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (altitude) {
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*altitude = _vala_altitude;
-#line 8691 "PhotoMetadata.c"
+#line 8775 "PhotoMetadata.c"
}
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8695 "PhotoMetadata.c"
+#line 8779 "PhotoMetadata.c"
}
@@ -8705,23 +8789,23 @@ gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exp
gboolean result = FALSE;
MetadataRational _tmp0_ = {0};
gboolean _tmp1_ = FALSE;
-#line 1149 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.ExposureTime", &_tmp0_);
-#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_exposure = _tmp0_;
-#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp1_;
-#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (exposure) {
-#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*exposure = _vala_exposure;
-#line 8716 "PhotoMetadata.c"
+#line 8800 "PhotoMetadata.c"
}
-#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8720 "PhotoMetadata.c"
+#line 8804 "PhotoMetadata.c"
}
@@ -8732,37 +8816,37 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) {
gboolean _tmp1_ = FALSE;
gboolean _tmp2_ = FALSE;
gchar* _tmp3_ = NULL;
-#line 1153 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1160 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.ExposureTime", &_tmp0_);
-#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1160 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
exposure_time = _tmp0_;
-#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1160 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp1_) {
-#line 1156 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = NULL;
-#line 1156 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8743 "PhotoMetadata.c"
+#line 8827 "PhotoMetadata.c"
}
-#line 1158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = metadata_rational_is_valid (&exposure_time);
-#line 1158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp2_) {
-#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = NULL;
-#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8753 "PhotoMetadata.c"
+#line 8837 "PhotoMetadata.c"
}
-#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ExposureTime", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp3_;
-#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8761 "PhotoMetadata.c"
+#line 8845 "PhotoMetadata.c"
}
@@ -8775,70 +8859,70 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
gboolean _tmp2_ = FALSE;
gboolean _tmp3_ = FALSE;
glong _tmp4_ = 0L;
-#line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = photo_metadata_get_long (self, "Exif.Photo.ISOSpeedRatings", &_tmp0_);
-#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_iso = _tmp0_;
-#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
fetched_ok = _tmp1_;
-#line 1167 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = fetched_ok;
-#line 1167 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp2_ == FALSE) {
-#line 1168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = FALSE;
-#line 1168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (iso) {
-#line 1168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*iso = _vala_iso;
-#line 8792 "PhotoMetadata.c"
+#line 8876 "PhotoMetadata.c"
}
-#line 1168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8796 "PhotoMetadata.c"
+#line 8880 "PhotoMetadata.c"
}
-#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = _vala_iso;
-#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_ < ((glong) 6)) {
-#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = TRUE;
-#line 8804 "PhotoMetadata.c"
+#line 8888 "PhotoMetadata.c"
} else {
glong _tmp5_ = 0L;
-#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = _vala_iso;
-#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = _tmp5_ > ((glong) 409600);
-#line 8811 "PhotoMetadata.c"
+#line 8895 "PhotoMetadata.c"
}
-#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp3_) {
-#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = FALSE;
-#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (iso) {
-#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*iso = _vala_iso;
-#line 8821 "PhotoMetadata.c"
+#line 8905 "PhotoMetadata.c"
}
-#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8825 "PhotoMetadata.c"
+#line 8909 "PhotoMetadata.c"
}
-#line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = TRUE;
-#line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (iso) {
-#line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*iso = _vala_iso;
-#line 8833 "PhotoMetadata.c"
+#line 8917 "PhotoMetadata.c"
}
-#line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8837 "PhotoMetadata.c"
+#line 8921 "PhotoMetadata.c"
}
@@ -8848,27 +8932,27 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) {
glong _tmp0_ = 0L;
gboolean _tmp1_ = FALSE;
gchar* _tmp2_ = NULL;
-#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = photo_metadata_get_iso (self, &_tmp0_);
-#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
iso = _tmp0_;
-#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp1_) {
-#line 1181 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = NULL;
-#line 1181 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8859 "PhotoMetadata.c"
+#line 8943 "PhotoMetadata.c"
}
-#line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ISOSpeedRatings", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp2_;
-#line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8867 "PhotoMetadata.c"
+#line 8951 "PhotoMetadata.c"
}
@@ -8877,23 +8961,23 @@ gboolean photo_metadata_get_aperture (PhotoMetadata* self, MetadataRational* ape
gboolean result = FALSE;
MetadataRational _tmp0_ = {0};
gboolean _tmp1_ = FALSE;
-#line 1186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.FNumber", &_tmp0_);
-#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_aperture = _tmp0_;
-#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp1_;
-#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (aperture) {
-#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*aperture = _vala_aperture;
-#line 8888 "PhotoMetadata.c"
+#line 8972 "PhotoMetadata.c"
}
-#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8892 "PhotoMetadata.c"
+#line 8976 "PhotoMetadata.c"
}
@@ -8917,105 +9001,105 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
gchar* _tmp13_ = NULL;
gchar* _tmp14_ = NULL;
gchar* _tmp15_ = NULL;
-#line 1190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = photo_metadata_get_aperture (self, &_tmp0_);
-#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
aperture = _tmp0_;
-#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp1_) {
-#line 1193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = NULL;
-#line 1193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8928 "PhotoMetadata.c"
+#line 9012 "PhotoMetadata.c"
}
-#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = aperture;
-#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = _tmp2_.numerator;
-#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = aperture;
-#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = _tmp4_.denominator;
-#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
aperture_value = ((gdouble) _tmp3_) / ((gdouble) _tmp5_);
-#line 1196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = aperture_value;
-#line 1196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
aperture_value = ((gint) (_tmp6_ * 10.0)) / 10.0;
-#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp8_ = pango_formatted;
-#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp8_) {
-#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = "<i>f</i>/";
-#line 8950 "PhotoMetadata.c"
+#line 9034 "PhotoMetadata.c"
} else {
-#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = "f/";
-#line 8954 "PhotoMetadata.c"
+#line 9038 "PhotoMetadata.c"
}
-#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = aperture_value;
-#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (fmod (_tmp10_, 1) == ((gdouble) 0)) {
-#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = "%.0f";
-#line 8962 "PhotoMetadata.c"
+#line 9046 "PhotoMetadata.c"
} else {
-#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = "%.1f";
-#line 8966 "PhotoMetadata.c"
+#line 9050 "PhotoMetadata.c"
}
-#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = aperture_value;
-#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp12_ = g_strdup_printf (_tmp9_, _tmp11_);
-#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13_ = _tmp12_;
-#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp14_ = g_strconcat (_tmp7_, _tmp13_, NULL);
-#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp15_ = _tmp14_;
-#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_tmp13_);
-#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp15_;
-#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8984 "PhotoMetadata.c"
+#line 9068 "PhotoMetadata.c"
}
gchar* photo_metadata_get_camera_make (PhotoMetadata* self) {
gchar* result = NULL;
gchar* _tmp0_ = NULL;
-#line 1202 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1207 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1208 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Make", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1208 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp0_;
-#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1208 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8999 "PhotoMetadata.c"
+#line 9083 "PhotoMetadata.c"
}
gchar* photo_metadata_get_camera_model (PhotoMetadata* self) {
gchar* result = NULL;
gchar* _tmp0_ = NULL;
-#line 1206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1207 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Model", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1207 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp0_;
-#line 1207 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9014 "PhotoMetadata.c"
+#line 9098 "PhotoMetadata.c"
}
@@ -9024,38 +9108,38 @@ gboolean photo_metadata_get_flash (PhotoMetadata* self, glong* flash) {
gboolean result = FALSE;
glong _tmp0_ = 0L;
gboolean _tmp1_ = FALSE;
-#line 1210 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1215 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = photo_metadata_get_long (self, "Exif.Photo.Flash", &_tmp0_);
-#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_flash = _tmp0_;
-#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp1_;
-#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (flash) {
-#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*flash = _vala_flash;
-#line 9035 "PhotoMetadata.c"
+#line 9119 "PhotoMetadata.c"
}
-#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9039 "PhotoMetadata.c"
+#line 9123 "PhotoMetadata.c"
}
gchar* photo_metadata_get_flash_string (PhotoMetadata* self) {
gchar* result = NULL;
gchar* _tmp0_ = NULL;
-#line 1215 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1220 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.Flash", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp0_;
-#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9054 "PhotoMetadata.c"
+#line 9138 "PhotoMetadata.c"
}
@@ -9064,38 +9148,38 @@ gboolean photo_metadata_get_focal_length (PhotoMetadata* self, MetadataRational*
gboolean result = FALSE;
MetadataRational _tmp0_ = {0};
gboolean _tmp1_ = FALSE;
-#line 1220 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.FocalLength", &_tmp0_);
-#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_focal_length = _tmp0_;
-#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp1_;
-#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (focal_length) {
-#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*focal_length = _vala_focal_length;
-#line 9075 "PhotoMetadata.c"
+#line 9159 "PhotoMetadata.c"
}
-#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9079 "PhotoMetadata.c"
+#line 9163 "PhotoMetadata.c"
}
gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self) {
gchar* result = NULL;
gchar* _tmp0_ = NULL;
-#line 1224 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1229 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.FocalLength", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp0_;
-#line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9094 "PhotoMetadata.c"
+#line 9178 "PhotoMetadata.c"
}
@@ -9104,49 +9188,49 @@ gchar* photo_metadata_get_artist (PhotoMetadata* self) {
gchar** _tmp0_ = NULL;
gint _tmp0__length1 = 0;
gchar* _tmp1_ = NULL;
-#line 1234 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = photo_metadata_ARTIST_TAGS;
-#line 1235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = photo_metadata_ARTIST_TAGS_length1;
-#line 1235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = photo_metadata_get_first_string_interpreted (self, _tmp0_, _tmp0__length1);
-#line 1235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp1_;
-#line 1235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9115 "PhotoMetadata.c"
+#line 9199 "PhotoMetadata.c"
}
gchar* photo_metadata_get_copyright (PhotoMetadata* self) {
gchar* result = NULL;
gchar* _tmp0_ = NULL;
-#line 1238 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Copyright", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp0_;
-#line 1239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9130 "PhotoMetadata.c"
+#line 9214 "PhotoMetadata.c"
}
gchar* photo_metadata_get_software (PhotoMetadata* self) {
gchar* result = NULL;
gchar* _tmp0_ = NULL;
-#line 1242 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Software", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp0_;
-#line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9145 "PhotoMetadata.c"
+#line 9229 "PhotoMetadata.c"
}
@@ -9156,69 +9240,69 @@ void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, co
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
-#line 1246 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 1246 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_if_fail (software != NULL);
-#line 1246 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_if_fail (version != NULL);
-#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = software;
-#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = version;
-#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = g_strdup_printf ("%s %s", _tmp0_, _tmp1_);
-#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = _tmp2_;
-#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string (self, "Exif.Image.Software", _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_tmp3_);
-#line 1250 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = photo_metadata_has_iptc (self);
-#line 1250 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_) {
-#line 9177 "PhotoMetadata.c"
+#line 9261 "PhotoMetadata.c"
const gchar* _tmp5_ = NULL;
const gchar* _tmp6_ = NULL;
-#line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = software;
-#line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string (self, "Iptc.Application2.Program", _tmp5_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1252 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = version;
-#line 1252 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string (self, "Iptc.Application2.ProgramVersion", _tmp6_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 9188 "PhotoMetadata.c"
+#line 9272 "PhotoMetadata.c"
}
}
void photo_metadata_remove_software (PhotoMetadata* self) {
-#line 1256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 1257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tag (self, "Exif.Image.Software");
-#line 1258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tag (self, "Iptc.Application2.Program");
-#line 1259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tag (self, "Iptc.Application2.ProgramVersion");
-#line 9202 "PhotoMetadata.c"
+#line 9286 "PhotoMetadata.c"
}
gchar* photo_metadata_get_exposure_bias (PhotoMetadata* self) {
gchar* result = NULL;
gchar* _tmp0_ = NULL;
-#line 1262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ExposureBiasValue", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp0_;
-#line 1263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9217 "PhotoMetadata.c"
+#line 9301 "PhotoMetadata.c"
}
@@ -9235,134 +9319,134 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
const gchar* _tmp8_ = NULL;
gint _tmp9_ = 0;
Rating _tmp18_ = 0;
-#line 1274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (IS_PHOTO_METADATA (self), 0);
-#line 1275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = photo_metadata_RATING_TAGS;
-#line 1275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = photo_metadata_RATING_TAGS_length1;
-#line 1275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = photo_metadata_get_first_string (self, _tmp0_, _tmp0__length1);
-#line 1275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
rating_string = _tmp1_;
-#line 1276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = rating_string;
-#line 1276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp2_ != NULL) {
-#line 9248 "PhotoMetadata.c"
+#line 9332 "PhotoMetadata.c"
const gchar* _tmp3_ = NULL;
gint _tmp4_ = 0;
Rating _tmp5_ = 0;
-#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = rating_string;
-#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = atoi (_tmp3_);
-#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = rating_unserialize (_tmp4_);
-#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp5_;
-#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (rating_string);
-#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9264 "PhotoMetadata.c"
+#line 9348 "PhotoMetadata.c"
}
-#line 1279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = photo_metadata_get_string (self, "Exif.Image.RatingPercent", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (rating_string);
-#line 1279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
rating_string = _tmp6_;
-#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = rating_string;
-#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp7_ == NULL) {
-#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = RATING_UNRATED;
-#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (rating_string);
-#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9282 "PhotoMetadata.c"
+#line 9366 "PhotoMetadata.c"
}
-#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp8_ = rating_string;
-#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = atoi (_tmp8_);
-#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
int_percent_rating = _tmp9_;
-#line 9290 "PhotoMetadata.c"
+#line 9374 "PhotoMetadata.c"
{
gint i = 0;
-#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
i = 5;
-#line 9295 "PhotoMetadata.c"
+#line 9379 "PhotoMetadata.c"
{
gboolean _tmp10_ = FALSE;
-#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = TRUE;
-#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 9302 "PhotoMetadata.c"
+#line 9386 "PhotoMetadata.c"
gint _tmp12_ = 0;
gint _tmp13_ = 0;
gint _tmp14_ = 0;
gint _tmp15_ = 0;
-#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp10_) {
-#line 9309 "PhotoMetadata.c"
+#line 9393 "PhotoMetadata.c"
gint _tmp11_ = 0;
-#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = i;
-#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
i = _tmp11_ - 1;
-#line 9315 "PhotoMetadata.c"
+#line 9399 "PhotoMetadata.c"
}
-#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = FALSE;
-#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp12_ = i;
-#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!(_tmp12_ >= 0)) {
-#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 9325 "PhotoMetadata.c"
+#line 9409 "PhotoMetadata.c"
}
-#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13_ = int_percent_rating;
-#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp14_ = i;
-#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp15_ = RESOURCES_rating_thresholds[_tmp14_];
-#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp13_ >= _tmp15_) {
-#line 9335 "PhotoMetadata.c"
+#line 9419 "PhotoMetadata.c"
gint _tmp16_ = 0;
Rating _tmp17_ = 0;
-#line 1287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp16_ = i;
-#line 1287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp17_ = rating_unserialize (_tmp16_);
-#line 1287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp17_;
-#line 1287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (rating_string);
-#line 1287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9348 "PhotoMetadata.c"
+#line 9432 "PhotoMetadata.c"
}
}
}
}
-#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp18_ = rating_unserialize (-1);
-#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp18_;
-#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (rating_string);
-#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9361 "PhotoMetadata.c"
+#line 9445 "PhotoMetadata.c"
}
@@ -9377,71 +9461,71 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
gchar* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
gint _tmp8_ = 0;
-#line 1297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = rating;
-#line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = rating_serialize (_tmp0_);
-#line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
int_rating = _tmp1_;
-#line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = int_rating;
-#line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = g_strdup_printf ("%i", _tmp2_);
-#line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = _tmp3_;
-#line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string (self, "Xmp.xmp.Rating", _tmp4_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_tmp4_);
-#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = int_rating;
-#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = g_strdup_printf ("%i", _tmp5_);
-#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = _tmp6_;
-#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string (self, "Exif.Image.Rating", _tmp7_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_tmp7_);
-#line 1302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp8_ = int_rating;
-#line 1302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (0 <= _tmp8_) {
-#line 9408 "PhotoMetadata.c"
+#line 9492 "PhotoMetadata.c"
gint _tmp9_ = 0;
gint _tmp10_ = 0;
gchar* _tmp11_ = NULL;
gchar* _tmp12_ = NULL;
-#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = int_rating;
-#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = RESOURCES_rating_thresholds[_tmp9_];
-#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = g_strdup_printf ("%i", _tmp10_);
-#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp12_ = _tmp11_;
-#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp12_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_tmp12_);
-#line 9425 "PhotoMetadata.c"
+#line 9509 "PhotoMetadata.c"
} else {
gint _tmp13_ = 0;
gchar* _tmp14_ = NULL;
gchar* _tmp15_ = NULL;
-#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13_ = int_rating;
-#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp14_ = g_strdup_printf ("%i", _tmp13_);
-#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp15_ = _tmp14_;
-#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp15_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_tmp15_);
-#line 9440 "PhotoMetadata.c"
+#line 9524 "PhotoMetadata.c"
}
}
@@ -9449,7 +9533,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
static gpointer _media_metadata_ref0 (gpointer self) {
#line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self ? media_metadata_ref (self) : NULL;
-#line 9448 "PhotoMetadata.c"
+#line 9532 "PhotoMetadata.c"
}
@@ -9516,21 +9600,21 @@ static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_
self->number = _tmp14_;
#line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self;
-#line 9515 "PhotoMetadata.c"
+#line 9599 "PhotoMetadata.c"
}
static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_new (PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props) {
#line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return photo_metadata_internal_photo_preview_construct (PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, owner, name, number, props);
-#line 9522 "PhotoMetadata.c"
+#line 9606 "PhotoMetadata.c"
}
static guint8* _vala_array_dup6 (guint8* self, int length) {
#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_memdup (self, length * sizeof (guint8));
-#line 9529 "PhotoMetadata.c"
+#line 9613 "PhotoMetadata.c"
}
@@ -9583,7 +9667,7 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
_tmp5__length1 = props_length1;
#line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp5_ != NULL) {
-#line 9582 "PhotoMetadata.c"
+#line 9666 "PhotoMetadata.c"
GExiv2PreviewProperties** _tmp6_ = NULL;
gint _tmp6__length1 = 0;
guint _tmp7_ = 0U;
@@ -9595,11 +9679,11 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
_tmp7_ = self->number;
#line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = ((guint) _tmp6__length1) > _tmp7_;
-#line 9594 "PhotoMetadata.c"
+#line 9678 "PhotoMetadata.c"
} else {
#line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = FALSE;
-#line 9598 "PhotoMetadata.c"
+#line 9682 "PhotoMetadata.c"
}
#line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_assert (_tmp4_, "props != null && props.length > number");
@@ -9639,13 +9723,13 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
if (result_length1) {
#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*result_length1 = _tmp19__length1;
-#line 9638 "PhotoMetadata.c"
+#line 9722 "PhotoMetadata.c"
}
#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp19_;
#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9644 "PhotoMetadata.c"
+#line 9728 "PhotoMetadata.c"
}
@@ -9656,7 +9740,7 @@ static void photo_metadata_internal_photo_preview_class_init (PhotoMetadataInter
((PhotoPreviewClass *) klass)->finalize = photo_metadata_internal_photo_preview_finalize;
#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
((PhotoPreviewClass *) klass)->flatten = (guint8* (*)(PhotoPreview*, int*, GError**)) photo_metadata_internal_photo_preview_real_flatten;
-#line 9655 "PhotoMetadata.c"
+#line 9739 "PhotoMetadata.c"
}
@@ -9672,7 +9756,7 @@ static void photo_metadata_internal_photo_preview_finalize (PhotoPreview* obj) {
_media_metadata_unref0 (self->owner);
#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
PHOTO_PREVIEW_CLASS (photo_metadata_internal_photo_preview_parent_class)->finalize (obj);
-#line 9671 "PhotoMetadata.c"
+#line 9755 "PhotoMetadata.c"
}
@@ -9917,115 +10001,115 @@ static void photo_metadata_class_init (PhotoMetadataClass * klass) {
photo_metadata_COMMENT_TAGS = _tmp33_;
#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_COMMENT_TAGS_length1 = 2;
-#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp34_ = g_strdup ("Xmp.dc.subject");
-#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp35_ = g_strdup ("Iptc.Application2.Keywords");
-#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp36_ = g_strdup ("Xmp.xmp.Label");
-#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp37_ = g_new0 (gchar*, 3 + 1);
-#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp37_[0] = _tmp34_;
-#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp37_[1] = _tmp35_;
-#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp37_[2] = _tmp36_;
-#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_KEYWORD_TAGS = _tmp37_;
-#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_KEYWORD_TAGS_length1 = 3;
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp38_ = null_keyword_transformer_new ();
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp39_ = _tmp38_;
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp40_ = hierarchical_keyword_field_new ("Xmp.lr.hierarchicalSubject", "|", FALSE, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer));
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp41_ = null_keyword_transformer_new ();
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp42_ = _tmp41_;
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp43_ = hierarchical_keyword_field_new ("Xmp.acdsee.keywords", "|", FALSE, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer));
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp44_ = acd_see_keyword_transformer_new ();
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp45_ = _tmp44_;
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp46_ = hierarchical_keyword_field_new ("Xmp.acdsee.categories", "|", FALSE, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer));
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp47_ = null_keyword_transformer_new ();
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp48_ = _tmp47_;
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp49_ = hierarchical_keyword_field_new ("Xmp.digiKam.TagsList", "/", FALSE, TRUE, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer));
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp50_ = null_keyword_transformer_new ();
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp51_ = _tmp50_;
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp52_ = hierarchical_keyword_field_new ("Xmp.MicrosoftPhoto.LastKeywordXMP", "/", FALSE, TRUE, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer));
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp53_ = g_new0 (HierarchicalKeywordField*, 5 + 1);
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp53_[0] = _tmp40_;
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp53_[1] = _tmp43_;
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp53_[2] = _tmp46_;
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp53_[3] = _tmp49_;
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp53_[4] = _tmp52_;
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_HIERARCHICAL_KEYWORD_TAGS = _tmp53_;
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1 = 5;
-#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp54_ = g_strdup ("Exif.Image.Artist");
-#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp55_ = g_strdup ("Exif.Canon.OwnerName");
-#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp56_ = g_strdup ("Xmp.acdsee.author");
-#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp57_ = g_new0 (gchar*, 3 + 1);
-#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp57_[0] = _tmp54_;
-#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp57_[1] = _tmp55_;
-#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp57_[2] = _tmp56_;
-#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_ARTIST_TAGS = _tmp57_;
-#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_ARTIST_TAGS_length1 = 3;
-#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp58_ = g_strdup ("Xmp.xmp.Rating");
-#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp59_ = g_strdup ("Iptc.Application2.Urgency");
-#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp60_ = g_strdup ("Xmp.photoshop.Urgency");
-#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp61_ = g_strdup ("Exif.Image.Rating");
-#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp62_ = g_strdup ("Xmp.acdsee.rating");
-#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp63_ = g_new0 (gchar*, 5 + 1);
-#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp63_[0] = _tmp58_;
-#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp63_[1] = _tmp59_;
-#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp63_[2] = _tmp60_;
-#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp63_[3] = _tmp61_;
-#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp63_[4] = _tmp62_;
-#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_RATING_TAGS = _tmp63_;
-#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_RATING_TAGS_length1 = 5;
-#line 10024 "PhotoMetadata.c"
+#line 10108 "PhotoMetadata.c"
}
@@ -10044,7 +10128,7 @@ static void photo_metadata_instance_init (PhotoMetadata * self) {
_tmp1_ = g_strdup ("<uninitialized>");
#line 249 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->priv->source_name = _tmp1_;
-#line 10043 "PhotoMetadata.c"
+#line 10127 "PhotoMetadata.c"
}
@@ -10060,7 +10144,7 @@ static void photo_metadata_finalize (MediaMetadata* obj) {
_g_free0 (self->priv->source_name);
#line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
MEDIA_METADATA_CLASS (photo_metadata_parent_class)->finalize (obj);
-#line 10059 "PhotoMetadata.c"
+#line 10143 "PhotoMetadata.c"
}
diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala
index 7764415..e9a9042 100644
--- a/src/photos/PhotoMetadata.vala
+++ b/src/photos/PhotoMetadata.vala
@@ -970,8 +970,13 @@ public class PhotoMetadata : MediaMetadata {
public void set_comment(string? comment,
SetOption option = SetOption.ALL_DOMAINS) {
+ /* https://bugzilla.gnome.org/show_bug.cgi?id=781897 - Do not strip
+ * newlines from comments */
if (!is_string_empty(comment))
- set_all_string(COMMENT_TAGS, comment, option);
+ set_all_generic(COMMENT_TAGS, option, (tag) => {
+ set_string(tag, comment, PREPARE_STRING_OPTIONS &
+ ~PrepareInputTextOptions.STRIP_CRLF);
+ });
else
remove_tags(COMMENT_TAGS);
}
diff --git a/src/publishing/PublishingUI.c b/src/publishing/PublishingUI.c
index c54634b..0da6971 100644
--- a/src/publishing/PublishingUI.c
+++ b/src/publishing/PublishingUI.c
@@ -171,6 +171,26 @@ typedef struct _ThumbnailSourceClass ThumbnailSourceClass;
typedef struct _MediaSource MediaSource;
typedef struct _MediaSourceClass MediaSourceClass;
+#define TYPE_PAGE_WINDOW (page_window_get_type ())
+#define PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_WINDOW, PageWindow))
+#define PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE_WINDOW, PageWindowClass))
+#define IS_PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_WINDOW))
+#define IS_PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE_WINDOW))
+#define PAGE_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE_WINDOW, PageWindowClass))
+
+typedef struct _PageWindow PageWindow;
+typedef struct _PageWindowClass PageWindowClass;
+
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
+
#define PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER (publishing_glue_media_source_publishable_wrapper_get_type ())
#define PUBLISHING_GLUE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper))
#define PUBLISHING_GLUE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapperClass))
@@ -455,6 +475,9 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST;
GType media_source_get_type (void) G_GNUC_CONST;
PublishingUIPublishingDialog* publishing_ui_publishing_dialog_new (GeeCollection* to_publish);
PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType object_type, GeeCollection* to_publish);
+GType page_window_get_type (void) G_GNUC_CONST;
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
static gboolean publishing_ui_publishing_dialog_on_window_close (PublishingUIPublishingDialog* self, GdkEventAny* evt);
static gboolean _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_new (MediaSource* to_wrap);
@@ -478,9 +501,9 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled);
gchar* plugins_get_pluggable_module_id (SpitPluggable* needle);
static void _vala_array_add56 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value);
-static gint __lambda14_ (void* a, void* b);
+static gint __lambda15_ (void* a, void* b);
gint utf8_cs_compare (void* a, void* b);
-static gint ___lambda14____compar_fn_t (void* key1, void* key2);
+static gint ___lambda15____compar_fn_t (void* key1, void* key2);
static void _vala_array_add57 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value);
static void _vala_array_add58 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value);
static void _vala_array_add59 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value);
@@ -525,21 +548,21 @@ PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_construct (GT
self->builder = _tmp0_;
#line 13 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 529 "PublishingUI.c"
+#line 552 "PublishingUI.c"
}
PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_new (void) {
#line 13 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_concrete_dialog_pane_construct (PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE);
-#line 536 "PublishingUI.c"
+#line 559 "PublishingUI.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 18 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self ? g_object_ref (self) : NULL;
-#line 543 "PublishingUI.c"
+#line 566 "PublishingUI.c"
}
@@ -558,7 +581,7 @@ static GtkWidget* publishing_ui_concrete_dialog_pane_real_get_widget (SpitPublis
result = _tmp1_;
#line 18 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 562 "PublishingUI.c"
+#line 585 "PublishingUI.c"
}
@@ -571,7 +594,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_ui_concrete_dialog_pan
result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
#line 22 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 575 "PublishingUI.c"
+#line 598 "PublishingUI.c"
}
@@ -579,7 +602,7 @@ static void publishing_ui_concrete_dialog_pane_real_on_pane_installed (SpitPubli
PublishingUIConcreteDialogPane * self;
#line 25 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane);
-#line 583 "PublishingUI.c"
+#line 606 "PublishingUI.c"
}
@@ -587,7 +610,7 @@ static void publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitPub
PublishingUIConcreteDialogPane * self;
#line 28 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane);
-#line 591 "PublishingUI.c"
+#line 614 "PublishingUI.c"
}
@@ -596,7 +619,7 @@ static void publishing_ui_concrete_dialog_pane_class_init (PublishingUIConcreteD
publishing_ui_concrete_dialog_pane_parent_class = g_type_class_peek_parent (klass);
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_ui_concrete_dialog_pane_finalize;
-#line 600 "PublishingUI.c"
+#line 623 "PublishingUI.c"
}
@@ -611,7 +634,7 @@ static void publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_inter
iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_ui_concrete_dialog_pane_real_on_pane_installed;
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled;
-#line 615 "PublishingUI.c"
+#line 638 "PublishingUI.c"
}
@@ -620,7 +643,7 @@ static void publishing_ui_concrete_dialog_pane_instance_init (PublishingUIConcre
self->pane_widget = NULL;
#line 11 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->builder = NULL;
-#line 624 "PublishingUI.c"
+#line 647 "PublishingUI.c"
}
@@ -634,7 +657,7 @@ static void publishing_ui_concrete_dialog_pane_finalize (GObject* obj) {
_g_object_unref0 (self->builder);
#line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (publishing_ui_concrete_dialog_pane_parent_class)->finalize (obj);
-#line 638 "PublishingUI.c"
+#line 661 "PublishingUI.c"
}
@@ -689,7 +712,7 @@ PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GTyp
_tmp6_ = enable_markup;
#line 40 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp6_) {
-#line 693 "PublishingUI.c"
+#line 716 "PublishingUI.c"
GtkLabel* _tmp7_ = NULL;
const gchar* _tmp8_ = NULL;
GtkLabel* _tmp9_ = NULL;
@@ -708,7 +731,7 @@ PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GTyp
_tmp10_ = self->priv->msg_label;
#line 43 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_label_set_use_markup (_tmp10_, TRUE);
-#line 712 "PublishingUI.c"
+#line 735 "PublishingUI.c"
} else {
GtkLabel* _tmp11_ = NULL;
const gchar* _tmp12_ = NULL;
@@ -718,18 +741,18 @@ PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GTyp
_tmp12_ = message_string;
#line 45 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_label_set_label (_tmp11_, _tmp12_);
-#line 722 "PublishingUI.c"
+#line 745 "PublishingUI.c"
}
#line 35 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 726 "PublishingUI.c"
+#line 749 "PublishingUI.c"
}
PublishingUIStaticMessagePane* publishing_ui_static_message_pane_new (const gchar* message_string, gboolean enable_markup) {
#line 35 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_static_message_pane_construct (PUBLISHING_UI_TYPE_STATIC_MESSAGE_PANE, message_string, enable_markup);
-#line 733 "PublishingUI.c"
+#line 756 "PublishingUI.c"
}
@@ -740,7 +763,7 @@ static void publishing_ui_static_message_pane_class_init (PublishingUIStaticMess
g_type_class_add_private (klass, sizeof (PublishingUIStaticMessagePanePrivate));
#line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_ui_static_message_pane_finalize;
-#line 744 "PublishingUI.c"
+#line 767 "PublishingUI.c"
}
@@ -749,7 +772,7 @@ static void publishing_ui_static_message_pane_instance_init (PublishingUIStaticM
self->priv = PUBLISHING_UI_STATIC_MESSAGE_PANE_GET_PRIVATE (self);
#line 33 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->msg_label = NULL;
-#line 753 "PublishingUI.c"
+#line 776 "PublishingUI.c"
}
@@ -761,7 +784,7 @@ static void publishing_ui_static_message_pane_finalize (GObject* obj) {
_g_object_unref0 (self->priv->msg_label);
#line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (publishing_ui_static_message_pane_parent_class)->finalize (obj);
-#line 765 "PublishingUI.c"
+#line 788 "PublishingUI.c"
}
@@ -780,7 +803,7 @@ GType publishing_ui_static_message_pane_get_type (void) {
static void _publishing_ui_login_welcome_pane_on_login_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
#line 62 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_login_welcome_pane_on_login_clicked ((PublishingUILoginWelcomePane*) self);
-#line 784 "PublishingUI.c"
+#line 807 "PublishingUI.c"
}
@@ -849,14 +872,14 @@ PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType
gtk_label_set_markup (_tmp11_, _tmp12_);
#line 56 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 853 "PublishingUI.c"
+#line 876 "PublishingUI.c"
}
PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_new (const gchar* service_welcome_message) {
#line 56 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_login_welcome_pane_construct (PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, service_welcome_message);
-#line 860 "PublishingUI.c"
+#line 883 "PublishingUI.c"
}
@@ -865,7 +888,7 @@ static void publishing_ui_login_welcome_pane_on_login_clicked (PublishingUILogin
g_return_if_fail (PUBLISHING_UI_IS_LOGIN_WELCOME_PANE (self));
#line 68 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_signal_emit_by_name (self, "login-requested");
-#line 869 "PublishingUI.c"
+#line 892 "PublishingUI.c"
}
@@ -878,7 +901,7 @@ static void publishing_ui_login_welcome_pane_class_init (PublishingUILoginWelcom
G_OBJECT_CLASS (klass)->finalize = publishing_ui_login_welcome_pane_finalize;
#line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_signal_new ("login_requested", PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 882 "PublishingUI.c"
+#line 905 "PublishingUI.c"
}
@@ -889,7 +912,7 @@ static void publishing_ui_login_welcome_pane_instance_init (PublishingUILoginWel
self->priv->login_button = NULL;
#line 52 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->not_logged_in_label = NULL;
-#line 893 "PublishingUI.c"
+#line 916 "PublishingUI.c"
}
@@ -903,7 +926,7 @@ static void publishing_ui_login_welcome_pane_finalize (GObject* obj) {
_g_object_unref0 (self->priv->not_logged_in_label);
#line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (publishing_ui_login_welcome_pane_parent_class)->finalize (obj);
-#line 907 "PublishingUI.c"
+#line 930 "PublishingUI.c"
}
@@ -951,14 +974,14 @@ PublishingUIProgressPane* publishing_ui_progress_pane_construct (GType object_ty
self->priv->progress_bar = _tmp5_;
#line 75 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 955 "PublishingUI.c"
+#line 978 "PublishingUI.c"
}
PublishingUIProgressPane* publishing_ui_progress_pane_new (void) {
#line 75 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_progress_pane_construct (PUBLISHING_UI_TYPE_PROGRESS_PANE);
-#line 962 "PublishingUI.c"
+#line 985 "PublishingUI.c"
}
@@ -975,7 +998,7 @@ void publishing_ui_progress_pane_set_text (PublishingUIProgressPane* self, const
_tmp1_ = text;
#line 82 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 979 "PublishingUI.c"
+#line 1002 "PublishingUI.c"
}
@@ -990,7 +1013,7 @@ void publishing_ui_progress_pane_set_progress (PublishingUIProgressPane* self, g
_tmp1_ = progress;
#line 86 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_progress_bar_set_fraction (_tmp0_, _tmp1_);
-#line 994 "PublishingUI.c"
+#line 1017 "PublishingUI.c"
}
@@ -1011,7 +1034,7 @@ void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, con
_tmp2_ = gtk_progress_bar_get_text (_tmp1_);
#line 90 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (g_strcmp0 (_tmp0_, _tmp2_) != 0) {
-#line 1015 "PublishingUI.c"
+#line 1038 "PublishingUI.c"
GtkProgressBar* _tmp3_ = NULL;
const gchar* _tmp4_ = NULL;
#line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1020,13 +1043,13 @@ void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, con
_tmp4_ = status_text;
#line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_progress_bar_set_text (_tmp3_, _tmp4_);
-#line 1024 "PublishingUI.c"
+#line 1047 "PublishingUI.c"
}
#line 93 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp5_ = progress;
#line 93 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_progress_pane_set_progress (self, _tmp5_);
-#line 1030 "PublishingUI.c"
+#line 1053 "PublishingUI.c"
}
@@ -1037,7 +1060,7 @@ static void publishing_ui_progress_pane_class_init (PublishingUIProgressPaneClas
g_type_class_add_private (klass, sizeof (PublishingUIProgressPanePrivate));
#line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_ui_progress_pane_finalize;
-#line 1041 "PublishingUI.c"
+#line 1064 "PublishingUI.c"
}
@@ -1046,7 +1069,7 @@ static void publishing_ui_progress_pane_instance_init (PublishingUIProgressPane
self->priv = PUBLISHING_UI_PROGRESS_PANE_GET_PRIVATE (self);
#line 73 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->progress_bar = NULL;
-#line 1050 "PublishingUI.c"
+#line 1073 "PublishingUI.c"
}
@@ -1058,7 +1081,7 @@ static void publishing_ui_progress_pane_finalize (GObject* obj) {
_g_object_unref0 (self->priv->progress_bar);
#line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (publishing_ui_progress_pane_parent_class)->finalize (obj);
-#line 1062 "PublishingUI.c"
+#line 1085 "PublishingUI.c"
}
@@ -1085,7 +1108,7 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type
_tmp0_ = published_media;
#line 103 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 1089 "PublishingUI.c"
+#line 1112 "PublishingUI.c"
gint _tmp1_ = 0;
const gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
@@ -1099,14 +1122,14 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type
_g_free0 (message_string);
#line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
message_string = _tmp3_;
-#line 1103 "PublishingUI.c"
+#line 1126 "PublishingUI.c"
} else {
SpitPublishingPublisherMediaType _tmp4_ = 0;
#line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp4_ = published_media;
#line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp4_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 1110 "PublishingUI.c"
+#line 1133 "PublishingUI.c"
gint _tmp5_ = 0;
const gchar* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
@@ -1120,14 +1143,14 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type
_g_free0 (message_string);
#line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
message_string = _tmp7_;
-#line 1124 "PublishingUI.c"
+#line 1147 "PublishingUI.c"
} else {
SpitPublishingPublisherMediaType _tmp8_ = 0;
#line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp8_ = published_media;
#line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp8_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
-#line 1131 "PublishingUI.c"
+#line 1154 "PublishingUI.c"
const gchar* _tmp9_ = NULL;
gchar* _tmp10_ = NULL;
#line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1138,11 +1161,11 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type
_g_free0 (message_string);
#line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
message_string = _tmp10_;
-#line 1142 "PublishingUI.c"
+#line 1165 "PublishingUI.c"
} else {
#line 118 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_assert_not_reached ();
-#line 1146 "PublishingUI.c"
+#line 1169 "PublishingUI.c"
}
}
}
@@ -1154,21 +1177,21 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type
_g_free0 (message_string);
#line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 1158 "PublishingUI.c"
+#line 1181 "PublishingUI.c"
}
PublishingUISuccessPane* publishing_ui_success_pane_new (SpitPublishingPublisherMediaType published_media, gint num_uploaded) {
#line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_success_pane_construct (PUBLISHING_UI_TYPE_SUCCESS_PANE, published_media, num_uploaded);
-#line 1165 "PublishingUI.c"
+#line 1188 "PublishingUI.c"
}
static void publishing_ui_success_pane_class_init (PublishingUISuccessPaneClass * klass) {
#line 97 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_success_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1172 "PublishingUI.c"
+#line 1195 "PublishingUI.c"
}
@@ -1197,21 +1220,21 @@ PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_construc
self = (PublishingUIAccountFetchWaitPane*) publishing_ui_static_message_pane_construct (object_type, _tmp0_, FALSE);
#line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 1201 "PublishingUI.c"
+#line 1224 "PublishingUI.c"
}
PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_new (void) {
#line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_account_fetch_wait_pane_construct (PUBLISHING_UI_TYPE_ACCOUNT_FETCH_WAIT_PANE);
-#line 1208 "PublishingUI.c"
+#line 1231 "PublishingUI.c"
}
static void publishing_ui_account_fetch_wait_pane_class_init (PublishingUIAccountFetchWaitPaneClass * klass) {
#line 125 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_account_fetch_wait_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1215 "PublishingUI.c"
+#line 1238 "PublishingUI.c"
}
@@ -1240,21 +1263,21 @@ PublishingUILoginWaitPane* publishing_ui_login_wait_pane_construct (GType object
self = (PublishingUILoginWaitPane*) publishing_ui_static_message_pane_construct (object_type, _tmp0_, FALSE);
#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 1244 "PublishingUI.c"
+#line 1267 "PublishingUI.c"
}
PublishingUILoginWaitPane* publishing_ui_login_wait_pane_new (void) {
#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_login_wait_pane_construct (PUBLISHING_UI_TYPE_LOGIN_WAIT_PANE);
-#line 1251 "PublishingUI.c"
+#line 1274 "PublishingUI.c"
}
static void publishing_ui_login_wait_pane_class_init (PublishingUILoginWaitPaneClass * klass) {
#line 131 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_login_wait_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1258 "PublishingUI.c"
+#line 1281 "PublishingUI.c"
}
@@ -1277,40 +1300,40 @@ GType publishing_ui_login_wait_pane_get_type (void) {
static gboolean _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
gboolean result;
result = publishing_ui_publishing_dialog_on_window_close ((PublishingUIPublishingDialog*) self, event);
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 1283 "PublishingUI.c"
+#line 1306 "PublishingUI.c"
}
static void _vala_array_add55 (SpitPublishingPublishable*** array, int* length, int* size, SpitPublishingPublishable* value) {
-#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((*length) == (*size)) {
-#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*array = g_renew (SpitPublishingPublishable*, *array, (*size) + 1);
-#line 1294 "PublishingUI.c"
+#line 1317 "PublishingUI.c"
}
-#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[(*length)++] = value;
-#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[*length] = NULL;
-#line 1300 "PublishingUI.c"
+#line 1323 "PublishingUI.c"
}
static void _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_on_service_changed ((PublishingUIPublishingDialog*) self);
-#line 1307 "PublishingUI.c"
+#line 1330 "PublishingUI.c"
}
static void _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_on_close_cancel_clicked ((PublishingUIPublishingDialog*) self);
-#line 1314 "PublishingUI.c"
+#line 1337 "PublishingUI.c"
}
@@ -1324,52 +1347,54 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
gint _tmp4_ = 0;
gboolean _tmp5_ = FALSE;
gboolean _tmp6_ = FALSE;
- SpitPublishingPublishable** _tmp8_ = NULL;
+ AppWindow* _tmp8_ = NULL;
+ AppWindow* _tmp9_ = NULL;
+ SpitPublishingPublishable** _tmp10_ = NULL;
gboolean has_photos = FALSE;
gboolean has_videos = FALSE;
gchar* title = NULL;
gchar* label = NULL;
- gboolean _tmp24_ = FALSE;
- gboolean _tmp25_ = FALSE;
- const gchar* _tmp42_ = NULL;
- GtkListStore* _tmp43_ = NULL;
- GtkListStore* _tmp44_ = NULL;
- GtkComboBox* _tmp45_ = NULL;
- GtkCellRendererPixbuf* renderer_pix = NULL;
- GtkCellRendererPixbuf* _tmp46_ = NULL;
+ gboolean _tmp26_ = FALSE;
+ gboolean _tmp27_ = FALSE;
+ const gchar* _tmp44_ = NULL;
+ GtkListStore* _tmp45_ = NULL;
+ GtkListStore* _tmp46_ = NULL;
GtkComboBox* _tmp47_ = NULL;
+ GtkCellRendererPixbuf* renderer_pix = NULL;
GtkCellRendererPixbuf* _tmp48_ = NULL;
GtkComboBox* _tmp49_ = NULL;
GtkCellRendererPixbuf* _tmp50_ = NULL;
+ GtkComboBox* _tmp51_ = NULL;
+ GtkCellRendererPixbuf* _tmp52_ = NULL;
GtkCellRendererText* renderer_text = NULL;
- GtkCellRendererText* _tmp51_ = NULL;
- GtkComboBox* _tmp52_ = NULL;
GtkCellRendererText* _tmp53_ = NULL;
GtkComboBox* _tmp54_ = NULL;
GtkCellRendererText* _tmp55_ = NULL;
GtkComboBox* _tmp56_ = NULL;
+ GtkCellRendererText* _tmp57_ = NULL;
+ GtkComboBox* _tmp58_ = NULL;
gchar* last_used_service = NULL;
- ConfigFacade* _tmp57_ = NULL;
- ConfigFacade* _tmp58_ = NULL;
- gchar* _tmp59_ = NULL;
- gchar* _tmp60_ = NULL;
+ ConfigFacade* _tmp59_ = NULL;
+ ConfigFacade* _tmp60_ = NULL;
+ gchar* _tmp61_ = NULL;
+ gchar* _tmp62_ = NULL;
SpitPublishingService** loaded_services = NULL;
- gboolean _tmp61_ = FALSE;
- gboolean _tmp62_ = FALSE;
- gint _tmp63_ = 0;
- SpitPublishingService** _tmp64_ = NULL;
+ gboolean _tmp63_ = FALSE;
+ gboolean _tmp64_ = FALSE;
+ gint _tmp65_ = 0;
+ SpitPublishingService** _tmp66_ = NULL;
gint loaded_services_length1 = 0;
gint _loaded_services_size_ = 0;
GtkTreeIter iter = {0};
- SpitPublishingService** _tmp65_ = NULL;
- gint _tmp65__length1 = 0;
- GtkComboBox* _tmp103_ = NULL;
- gboolean _tmp104_ = FALSE;
- GtkBox* _tmp134_ = NULL;
- GtkBox* _tmp135_ = NULL;
+ SpitPublishingService** _tmp67_ = NULL;
+ gint _tmp67__length1 = 0;
+ GtkComboBox* _tmp105_ = NULL;
+ gboolean _tmp106_ = FALSE;
GtkBox* _tmp136_ = NULL;
- gboolean _tmp137_ = FALSE;
- GtkButton* _tmp147_ = NULL;
+ GtkBox* _tmp137_ = NULL;
+ GtkBox* _tmp138_ = NULL;
+ gboolean _tmp139_ = FALSE;
+ GtkButton* _tmp149_ = NULL;
#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (to_publish), NULL);
#line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1392,11 +1417,11 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
if (_tmp5_) {
#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp4_ = 1;
-#line 1396 "PublishingUI.c"
+#line 1421 "PublishingUI.c"
} else {
#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp4_ = 0;
-#line 1400 "PublishingUI.c"
+#line 1425 "PublishingUI.c"
}
#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self = (PublishingUIPublishingDialog*) g_object_new (object_type, "use-header-bar", _tmp4_, NULL);
@@ -1404,760 +1429,770 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
_tmp6_ = use_header;
#line 167 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp6_) {
-#line 1408 "PublishingUI.c"
+#line 1433 "PublishingUI.c"
GtkWidget* _tmp7_ = NULL;
#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp7_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE);
-#line 1414 "PublishingUI.c"
+#line 1439 "PublishingUI.c"
}
#line 170 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event, self, 0);
-#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp8_ = g_new0 (SpitPublishingPublishable*, 0 + 1);
+ gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
+#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp8_ = app_window_get_instance ();
+#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp9_ = _tmp8_;
+#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow));
+#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (_tmp9_);
#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event, self, 0);
+#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp10_ = g_new0 (SpitPublishingPublishable*, 0 + 1);
+#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self->priv->publishables = _tmp8_;
-#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ self->priv->publishables = _tmp10_;
+#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->publishables_length1 = 0;
-#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->_publishables_size_ = self->priv->publishables_length1;
-#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
has_photos = FALSE;
-#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
has_videos = FALSE;
-#line 1434 "PublishingUI.c"
+#line 1469 "PublishingUI.c"
{
GeeIterator* _media_it = NULL;
- GeeCollection* _tmp9_ = NULL;
- GeeIterator* _tmp10_ = NULL;
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp9_ = to_publish;
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _media_it = _tmp10_;
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ GeeCollection* _tmp11_ = NULL;
+ GeeIterator* _tmp12_ = NULL;
+#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp11_ = to_publish;
+#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable));
+#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _media_it = _tmp12_;
+#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
while (TRUE) {
-#line 1447 "PublishingUI.c"
- GeeIterator* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
- MediaSource* media = NULL;
+#line 1482 "PublishingUI.c"
GeeIterator* _tmp13_ = NULL;
- gpointer _tmp14_ = NULL;
+ gboolean _tmp14_ = FALSE;
+ MediaSource* media = NULL;
+ GeeIterator* _tmp15_ = NULL;
+ gpointer _tmp16_ = NULL;
SpitPublishingPublishable* publishable = NULL;
- MediaSource* _tmp15_ = NULL;
- PublishingGlueMediaSourcePublishableWrapper* _tmp16_ = NULL;
- SpitPublishingPublishable* _tmp17_ = NULL;
- SpitPublishingPublisherMediaType _tmp18_ = 0;
- SpitPublishingPublishable** _tmp21_ = NULL;
- gint _tmp21__length1 = 0;
- SpitPublishingPublishable* _tmp22_ = NULL;
- SpitPublishingPublishable* _tmp23_ = NULL;
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp11_ = _media_it;
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp12_ = gee_iterator_next (_tmp11_);
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (!_tmp12_) {
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ MediaSource* _tmp17_ = NULL;
+ PublishingGlueMediaSourcePublishableWrapper* _tmp18_ = NULL;
+ SpitPublishingPublishable* _tmp19_ = NULL;
+ SpitPublishingPublisherMediaType _tmp20_ = 0;
+ SpitPublishingPublishable** _tmp23_ = NULL;
+ gint _tmp23__length1 = 0;
+ SpitPublishingPublishable* _tmp24_ = NULL;
+ SpitPublishingPublishable* _tmp25_ = NULL;
+#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp13_ = _media_it;
+#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp14_ = gee_iterator_next (_tmp13_);
+#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (!_tmp14_) {
+#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
break;
-#line 1470 "PublishingUI.c"
+#line 1505 "PublishingUI.c"
}
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp13_ = _media_it;
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp14_ = gee_iterator_get (_tmp13_);
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- media = (MediaSource*) _tmp14_;
-#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp15_ = media;
-#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp16_ = publishing_glue_media_source_publishable_wrapper_new (_tmp15_);
-#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- publishable = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_PUBLISHING_TYPE_PUBLISHABLE, SpitPublishingPublishable);
+#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp15_ = _media_it;
+#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp16_ = gee_iterator_get (_tmp15_);
+#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ media = (MediaSource*) _tmp16_;
#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp17_ = publishable;
+ _tmp17_ = media;
#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp18_ = spit_publishing_publishable_get_media_type (_tmp17_);
+ _tmp18_ = publishing_glue_media_source_publishable_wrapper_new (_tmp17_);
#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp18_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- has_photos = TRUE;
-#line 1492 "PublishingUI.c"
- } else {
- SpitPublishingPublishable* _tmp19_ = NULL;
- SpitPublishingPublisherMediaType _tmp20_ = 0;
+ publishable = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_PUBLISHABLE, SpitPublishingPublishable);
#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp19_ = publishable;
+ _tmp19_ = publishable;
#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp20_ = spit_publishing_publishable_get_media_type (_tmp19_);
+ _tmp20_ = spit_publishing_publishable_get_media_type (_tmp19_);
#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp20_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+ if (_tmp20_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
#line 182 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ has_photos = TRUE;
+#line 1527 "PublishingUI.c"
+ } else {
+ SpitPublishingPublishable* _tmp21_ = NULL;
+ SpitPublishingPublisherMediaType _tmp22_ = 0;
+#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp21_ = publishable;
+#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp22_ = spit_publishing_publishable_get_media_type (_tmp21_);
+#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (_tmp22_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 184 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
has_videos = TRUE;
-#line 1504 "PublishingUI.c"
+#line 1539 "PublishingUI.c"
} else {
-#line 184 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_assert_not_reached ();
-#line 1508 "PublishingUI.c"
+#line 1543 "PublishingUI.c"
}
}
-#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp21_ = self->priv->publishables;
-#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp21__length1 = self->priv->publishables_length1;
-#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp22_ = publishable;
-#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp23_ = _g_object_ref0 (_tmp22_);
-#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _vala_array_add55 (&self->priv->publishables, &self->priv->publishables_length1, &self->priv->_publishables_size_, _tmp23_);
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp23_ = self->priv->publishables;
+#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp23__length1 = self->priv->publishables_length1;
+#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp24_ = publishable;
+#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp25_ = _g_object_ref0 (_tmp24_);
+#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _vala_array_add55 (&self->priv->publishables, &self->priv->publishables_length1, &self->priv->_publishables_size_, _tmp25_);
+#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (publishable);
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (media);
-#line 1525 "PublishingUI.c"
+#line 1560 "PublishingUI.c"
}
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (_media_it);
-#line 1529 "PublishingUI.c"
+#line 1564 "PublishingUI.c"
}
-#line 189 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 191 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
title = NULL;
-#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- label = NULL;
-#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp25_ = has_photos;
-#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp25_) {
-#line 1539 "PublishingUI.c"
- gboolean _tmp26_ = FALSE;
-#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp26_ = has_videos;
-#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp24_ = !_tmp26_;
-#line 1545 "PublishingUI.c"
- } else {
#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp24_ = FALSE;
-#line 1549 "PublishingUI.c"
- }
-#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp24_) {
-#line 1553 "PublishingUI.c"
- const gchar* _tmp27_ = NULL;
- gchar* _tmp28_ = NULL;
- const gchar* _tmp29_ = NULL;
- gchar* _tmp30_ = NULL;
-#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp27_ = _ ("Publish Photos");
-#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp28_ = g_strdup (_tmp27_);
-#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_free0 (title);
-#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- title = _tmp28_;
+ label = NULL;
#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp29_ = _ ("Publish photos _to:");
+ _tmp27_ = has_photos;
#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp30_ = g_strdup (_tmp29_);
+ if (_tmp27_) {
+#line 1574 "PublishingUI.c"
+ gboolean _tmp28_ = FALSE;
#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_free0 (label);
+ _tmp28_ = has_videos;
#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- label = _tmp30_;
-#line 1574 "PublishingUI.c"
+ _tmp26_ = !_tmp28_;
+#line 1580 "PublishingUI.c"
} else {
- gboolean _tmp31_ = FALSE;
- gboolean _tmp32_ = FALSE;
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp32_ = has_photos;
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (!_tmp32_) {
-#line 1582 "PublishingUI.c"
- gboolean _tmp33_ = FALSE;
+#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp26_ = FALSE;
+#line 1584 "PublishingUI.c"
+ }
+#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (_tmp26_) {
+#line 1588 "PublishingUI.c"
+ const gchar* _tmp29_ = NULL;
+ gchar* _tmp30_ = NULL;
+ const gchar* _tmp31_ = NULL;
+ gchar* _tmp32_ = NULL;
#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp33_ = has_videos;
+ _tmp29_ = _ ("Publish Photos");
#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp31_ = _tmp33_;
-#line 1588 "PublishingUI.c"
- } else {
+ _tmp30_ = g_strdup (_tmp29_);
#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp31_ = FALSE;
-#line 1592 "PublishingUI.c"
- }
+ _g_free0 (title);
#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp31_) {
-#line 1596 "PublishingUI.c"
- const gchar* _tmp34_ = NULL;
- gchar* _tmp35_ = NULL;
- const gchar* _tmp36_ = NULL;
- gchar* _tmp37_ = NULL;
+ title = _tmp30_;
#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp34_ = _ ("Publish Videos");
+ _tmp31_ = _ ("Publish photos _to:");
#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp35_ = g_strdup (_tmp34_);
+ _tmp32_ = g_strdup (_tmp31_);
#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_free0 (title);
+ _g_free0 (label);
#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- title = _tmp35_;
+ label = _tmp32_;
+#line 1609 "PublishingUI.c"
+ } else {
+ gboolean _tmp33_ = FALSE;
+ gboolean _tmp34_ = FALSE;
#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp36_ = _ ("Publish videos _to");
+ _tmp34_ = has_photos;
#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp37_ = g_strdup (_tmp36_);
+ if (!_tmp34_) {
+#line 1617 "PublishingUI.c"
+ gboolean _tmp35_ = FALSE;
#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_free0 (label);
+ _tmp35_ = has_videos;
#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- label = _tmp37_;
-#line 1617 "PublishingUI.c"
+ _tmp33_ = _tmp35_;
+#line 1623 "PublishingUI.c"
} else {
+#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp33_ = FALSE;
+#line 1627 "PublishingUI.c"
+ }
+#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (_tmp33_) {
+#line 1631 "PublishingUI.c"
+ const gchar* _tmp36_ = NULL;
+ gchar* _tmp37_ = NULL;
const gchar* _tmp38_ = NULL;
gchar* _tmp39_ = NULL;
- const gchar* _tmp40_ = NULL;
- gchar* _tmp41_ = NULL;
+#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp36_ = _ ("Publish Videos");
+#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp37_ = g_strdup (_tmp36_);
+#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_free0 (title);
+#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ title = _tmp37_;
#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp38_ = _ ("Publish Photos and Videos");
+ _tmp38_ = _ ("Publish videos _to");
#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp39_ = g_strdup (_tmp38_);
#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_free0 (title);
+ _g_free0 (label);
#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- title = _tmp39_;
-#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp40_ = _ ("Publish photos and videos _to");
-#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ label = _tmp39_;
+#line 1652 "PublishingUI.c"
+ } else {
+ const gchar* _tmp40_ = NULL;
+ gchar* _tmp41_ = NULL;
+ const gchar* _tmp42_ = NULL;
+ gchar* _tmp43_ = NULL;
+#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp40_ = _ ("Publish Photos and Videos");
+#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp41_ = g_strdup (_tmp40_);
-#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_free0 (title);
+#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ title = _tmp41_;
+#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp42_ = _ ("Publish photos and videos _to");
+#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp43_ = g_strdup (_tmp42_);
+#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (label);
-#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- label = _tmp41_;
-#line 1639 "PublishingUI.c"
+#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ label = _tmp43_;
+#line 1674 "PublishingUI.c"
}
}
-#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp42_ = title;
-#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp42_);
#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp43_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
+ _tmp44_ = title;
#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp44_);
+#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp45_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
+#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->service_selector_box_model);
-#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self->priv->service_selector_box_model = _tmp43_;
-#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp44_ = self->priv->service_selector_box_model;
-#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp45_ = (GtkComboBox*) gtk_combo_box_new_with_model (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp45_);
-#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (self->priv->service_selector_box);
-#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self->priv->service_selector_box = _tmp45_;
+#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ self->priv->service_selector_box_model = _tmp45_;
+#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp46_ = self->priv->service_selector_box_model;
#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp46_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
+ _tmp47_ = (GtkComboBox*) gtk_combo_box_new_with_model (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp46_);
+ g_object_ref_sink (_tmp47_);
#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- renderer_pix = _tmp46_;
-#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp47_ = self->priv->service_selector_box;
-#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp48_ = renderer_pix;
-#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
+ _g_object_unref0 (self->priv->service_selector_box);
+#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ self->priv->service_selector_box = _tmp47_;
#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp49_ = self->priv->service_selector_box;
+ _tmp48_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp50_ = renderer_pix;
+ g_object_ref_sink (_tmp48_);
#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
+ renderer_pix = _tmp48_;
+#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp49_ = self->priv->service_selector_box;
+#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp50_ = renderer_pix;
+#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp51_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+ _tmp51_ = self->priv->service_selector_box;
#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp51_);
+ _tmp52_ = renderer_pix;
#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- renderer_text = _tmp51_;
-#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp52_ = self->priv->service_selector_box;
-#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp53_ = renderer_text;
-#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
+ gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp54_ = self->priv->service_selector_box;
+ _tmp53_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp55_ = renderer_text;
+ g_object_ref_sink (_tmp53_);
#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1);
+ renderer_text = _tmp53_;
+#line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp54_ = self->priv->service_selector_box;
+#line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp55_ = renderer_text;
+#line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp56_ = self->priv->service_selector_box;
#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_combo_box_set_active (_tmp56_, 0);
-#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp57_ = config_facade_get_instance ();
-#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp58_ = _tmp57_;
-#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp59_ = configuration_facade_get_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp60_ = _tmp59_;
-#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (_tmp58_);
-#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- last_used_service = _tmp60_;
+ _tmp57_ = renderer_text;
+#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1);
+#line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp58_ = self->priv->service_selector_box;
+#line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_combo_box_set_active (_tmp58_, 0);
#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp61_ = has_photos;
+ _tmp59_ = config_facade_get_instance ();
#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp62_ = has_videos;
+ _tmp60_ = _tmp59_;
#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp64_ = publishing_ui_publishing_dialog_load_services (_tmp61_, _tmp62_, &_tmp63_);
+ _tmp61_ = configuration_facade_get_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- loaded_services = _tmp64_;
+ _tmp62_ = _tmp61_;
#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- loaded_services_length1 = _tmp63_;
+ _g_object_unref0 (_tmp60_);
#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ last_used_service = _tmp62_;
+#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp63_ = has_photos;
+#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp64_ = has_videos;
+#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp66_ = publishing_ui_publishing_dialog_load_services (_tmp63_, _tmp64_, &_tmp65_);
+#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ loaded_services = _tmp66_;
+#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ loaded_services_length1 = _tmp65_;
+#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_loaded_services_size_ = loaded_services_length1;
-#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp65_ = loaded_services;
-#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp65__length1 = loaded_services_length1;
-#line 1730 "PublishingUI.c"
+#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp67_ = loaded_services;
+#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp67__length1 = loaded_services_length1;
+#line 1765 "PublishingUI.c"
{
SpitPublishingService** service_collection = NULL;
gint service_collection_length1 = 0;
gint _service_collection_size_ = 0;
gint service_it = 0;
-#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_collection = _tmp65_;
-#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_collection_length1 = _tmp65__length1;
-#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- for (service_it = 0; service_it < _tmp65__length1; service_it = service_it + 1) {
-#line 1742 "PublishingUI.c"
- SpitPublishingService* _tmp66_ = NULL;
+#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ service_collection = _tmp67_;
+#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ service_collection_length1 = _tmp67__length1;
+#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ for (service_it = 0; service_it < _tmp67__length1; service_it = service_it + 1) {
+#line 1777 "PublishingUI.c"
+ SpitPublishingService* _tmp68_ = NULL;
SpitPublishingService* service = NULL;
-#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp66_ = _g_object_ref0 (service_collection[service_it]);
-#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service = _tmp66_;
-#line 1749 "PublishingUI.c"
+#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp68_ = _g_object_ref0 (service_collection[service_it]);
+#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ service = _tmp68_;
+#line 1784 "PublishingUI.c"
{
- GtkListStore* _tmp67_ = NULL;
- GtkTreeIter _tmp68_ = {0};
+ GtkListStore* _tmp69_ = NULL;
+ GtkTreeIter _tmp70_ = {0};
gchar* curr_service_id = NULL;
- SpitPublishingService* _tmp69_ = NULL;
- const gchar* _tmp70_ = NULL;
- gchar* _tmp71_ = NULL;
- SpitPublishingService* _tmp72_ = NULL;
- gboolean _tmp73_ = FALSE;
- SpitPluggableInfo _tmp74_ = {0};
- GdkPixbuf** _tmp75_ = NULL;
- gint _tmp75__length1 = 0;
- const gchar* _tmp93_ = NULL;
-#line 225 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp67_ = self->priv->service_selector_box_model;
-#line 225 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_list_store_append (_tmp67_, &_tmp68_);
-#line 225 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- iter = _tmp68_;
-#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp69_ = service;
+ SpitPublishingService* _tmp71_ = NULL;
+ const gchar* _tmp72_ = NULL;
+ gchar* _tmp73_ = NULL;
+ SpitPublishingService* _tmp74_ = NULL;
+ gboolean _tmp75_ = FALSE;
+ SpitPluggableInfo _tmp76_ = {0};
+ GdkPixbuf** _tmp77_ = NULL;
+ gint _tmp77__length1 = 0;
+ const gchar* _tmp95_ = NULL;
#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp70_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _tmp69_ = self->priv->service_selector_box_model;
#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp71_ = g_strdup (_tmp70_);
+ gtk_list_store_append (_tmp69_, &_tmp70_);
#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- curr_service_id = _tmp71_;
+ iter = _tmp70_;
#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp72_ = service;
+ _tmp71_ = service;
#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- spit_pluggable_get_info (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, SPIT_TYPE_PLUGGABLE, SpitPluggable), &self->priv->info);
-#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp74_ = self->priv->info;
-#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp75_ = _tmp74_.icons;
-#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp75__length1 = _tmp74_.icons_length1;
-#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (NULL != _tmp75_) {
-#line 1789 "PublishingUI.c"
- SpitPluggableInfo _tmp76_ = {0};
- GdkPixbuf** _tmp77_ = NULL;
- gint _tmp77__length1 = 0;
-#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp76_ = self->priv->info;
-#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp77_ = _tmp76_.icons;
-#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp77__length1 = _tmp76_.icons_length1;
-#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp73_ = 0 < _tmp77__length1;
-#line 1801 "PublishingUI.c"
- } else {
+ _tmp72_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp73_ = g_strdup (_tmp72_);
+#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ curr_service_id = _tmp73_;
#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp73_ = FALSE;
-#line 1805 "PublishingUI.c"
- }
+ _tmp74_ = service;
#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp73_) {
-#line 1809 "PublishingUI.c"
- GtkListStore* _tmp78_ = NULL;
- GtkTreeIter _tmp79_ = {0};
- SpitPluggableInfo _tmp80_ = {0};
- GdkPixbuf** _tmp81_ = NULL;
- gint _tmp81__length1 = 0;
- GdkPixbuf* _tmp82_ = NULL;
- SpitPublishingService* _tmp83_ = NULL;
- const gchar* _tmp84_ = NULL;
- GdkPixbuf* _tmp85_ = NULL;
- GdkPixbuf* _tmp86_ = NULL;
+ spit_pluggable_get_info (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, SPIT_TYPE_PLUGGABLE, SpitPluggable), &self->priv->info);
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp78_ = self->priv->service_selector_box_model;
+ _tmp76_ = self->priv->info;
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp79_ = iter;
+ _tmp77_ = _tmp76_.icons;
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp80_ = self->priv->info;
+ _tmp77__length1 = _tmp76_.icons_length1;
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp81_ = _tmp80_.icons;
+ if (NULL != _tmp77_) {
+#line 1824 "PublishingUI.c"
+ SpitPluggableInfo _tmp78_ = {0};
+ GdkPixbuf** _tmp79_ = NULL;
+ gint _tmp79__length1 = 0;
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp81__length1 = _tmp80_.icons_length1;
+ _tmp78_ = self->priv->info;
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp82_ = _tmp81_[0];
+ _tmp79_ = _tmp78_.icons;
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp83_ = service;
+ _tmp79__length1 = _tmp78_.icons_length1;
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp84_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+ _tmp75_ = 0 < _tmp79__length1;
+#line 1836 "PublishingUI.c"
+ } else {
#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_list_store_set (_tmp78_, &_tmp79_, 0, _tmp82_, 1, _tmp84_, -1);
-#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp85_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
-#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp75_ = FALSE;
+#line 1840 "PublishingUI.c"
+ }
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (_tmp75_) {
+#line 1844 "PublishingUI.c"
+ GtkListStore* _tmp80_ = NULL;
+ GtkTreeIter _tmp81_ = {0};
+ SpitPluggableInfo _tmp82_ = {0};
+ GdkPixbuf** _tmp83_ = NULL;
+ gint _tmp83__length1 = 0;
+ GdkPixbuf* _tmp84_ = NULL;
+ SpitPublishingService* _tmp85_ = NULL;
+ const gchar* _tmp86_ = NULL;
+ GdkPixbuf* _tmp87_ = NULL;
+ GdkPixbuf* _tmp88_ = NULL;
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp80_ = self->priv->service_selector_box_model;
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp81_ = iter;
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp82_ = self->priv->info;
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp83_ = _tmp82_.icons;
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp83__length1 = _tmp82_.icons_length1;
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp84_ = _tmp83_[0];
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp85_ = service;
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp86_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_list_store_set (_tmp80_, &_tmp81_, 0, _tmp84_, 1, _tmp86_, -1);
+#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp87_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
+#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->info.icons[0]);
-#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self->priv->info.icons[0] = _tmp85_;
-#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp86_ = self->priv->info.icons[0];
-#line 1846 "PublishingUI.c"
+#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ self->priv->info.icons[0] = _tmp87_;
+#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp88_ = self->priv->info.icons[0];
+#line 1881 "PublishingUI.c"
} else {
- GtkListStore* _tmp87_ = NULL;
- GtkTreeIter _tmp88_ = {0};
- GdkPixbuf* _tmp89_ = NULL;
- GdkPixbuf* _tmp90_ = NULL;
- SpitPublishingService* _tmp91_ = NULL;
- const gchar* _tmp92_ = NULL;
-#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp87_ = self->priv->service_selector_box_model;
-#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp88_ = iter;
-#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp89_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
-#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp90_ = _tmp89_;
-#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp91_ = service;
-#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp92_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_list_store_set (_tmp87_, &_tmp88_, 0, _tmp90_, 1, _tmp92_, -1);
-#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (_tmp90_);
-#line 1870 "PublishingUI.c"
+ GtkListStore* _tmp89_ = NULL;
+ GtkTreeIter _tmp90_ = {0};
+ GdkPixbuf* _tmp91_ = NULL;
+ GdkPixbuf* _tmp92_ = NULL;
+ SpitPublishingService* _tmp93_ = NULL;
+ const gchar* _tmp94_ = NULL;
+#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp89_ = self->priv->service_selector_box_model;
+#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp90_ = iter;
+#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp91_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
+#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp92_ = _tmp91_;
+#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp93_ = service;
+#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp94_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_list_store_set (_tmp89_, &_tmp90_, 0, _tmp92_, 1, _tmp94_, -1);
+#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (_tmp92_);
+#line 1905 "PublishingUI.c"
}
-#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp93_ = last_used_service;
-#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp93_ == NULL) {
-#line 1876 "PublishingUI.c"
- GtkComboBox* _tmp94_ = NULL;
- GtkTreeIter _tmp95_ = {0};
- SpitPublishingService* _tmp96_ = NULL;
- const gchar* _tmp97_ = NULL;
- gchar* _tmp98_ = NULL;
-#line 245 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp94_ = self->priv->service_selector_box;
-#line 245 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp95_ = iter;
-#line 245 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_combo_box_set_active_iter (_tmp94_, &_tmp95_);
-#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp96_ = service;
-#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp97_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp98_ = g_strdup (_tmp97_);
-#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_free0 (last_used_service);
+ _tmp95_ = last_used_service;
#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- last_used_service = _tmp98_;
-#line 1898 "PublishingUI.c"
- } else {
+ if (_tmp95_ == NULL) {
+#line 1911 "PublishingUI.c"
+ GtkComboBox* _tmp96_ = NULL;
+ GtkTreeIter _tmp97_ = {0};
+ SpitPublishingService* _tmp98_ = NULL;
const gchar* _tmp99_ = NULL;
- const gchar* _tmp100_ = NULL;
+ gchar* _tmp100_ = NULL;
#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp99_ = last_used_service;
+ _tmp96_ = self->priv->service_selector_box;
#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp100_ = curr_service_id;
+ _tmp97_ = iter;
#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (g_strcmp0 (_tmp99_, _tmp100_) == 0) {
-#line 1908 "PublishingUI.c"
- GtkComboBox* _tmp101_ = NULL;
- GtkTreeIter _tmp102_ = {0};
+ gtk_combo_box_set_active_iter (_tmp96_, &_tmp97_);
+#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp98_ = service;
#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp101_ = self->priv->service_selector_box;
+ _tmp99_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp102_ = iter;
+ _tmp100_ = g_strdup (_tmp99_);
+#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_free0 (last_used_service);
#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_combo_box_set_active_iter (_tmp101_, &_tmp102_);
-#line 1917 "PublishingUI.c"
+ last_used_service = _tmp100_;
+#line 1933 "PublishingUI.c"
+ } else {
+ const gchar* _tmp101_ = NULL;
+ const gchar* _tmp102_ = NULL;
+#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp101_ = last_used_service;
+#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp102_ = curr_service_id;
+#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (g_strcmp0 (_tmp101_, _tmp102_) == 0) {
+#line 1943 "PublishingUI.c"
+ GtkComboBox* _tmp103_ = NULL;
+ GtkTreeIter _tmp104_ = {0};
+#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp103_ = self->priv->service_selector_box;
+#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp104_ = iter;
+#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_combo_box_set_active_iter (_tmp103_, &_tmp104_);
+#line 1952 "PublishingUI.c"
}
}
-#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (curr_service_id);
-#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service);
-#line 1924 "PublishingUI.c"
+#line 1959 "PublishingUI.c"
}
}
}
-#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp103_ = self->priv->service_selector_box;
-#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_signal_connect_object (_tmp103_, "changed", (GCallback) _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp104_ = use_header;
+ _tmp105_ = self->priv->service_selector_box;
#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (!_tmp104_) {
-#line 1936 "PublishingUI.c"
+ g_signal_connect_object (_tmp105_, "changed", (GCallback) _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
+#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp106_ = use_header;
+#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (!_tmp106_) {
+#line 1971 "PublishingUI.c"
GtkLabel* service_selector_box_label = NULL;
- const gchar* _tmp105_ = NULL;
- GtkLabel* _tmp106_ = NULL;
- GtkLabel* _tmp107_ = NULL;
- GtkComboBox* _tmp108_ = NULL;
+ const gchar* _tmp107_ = NULL;
+ GtkLabel* _tmp108_ = NULL;
GtkLabel* _tmp109_ = NULL;
- GtkLabel* _tmp110_ = NULL;
- GtkComboBox* _tmp111_ = NULL;
- GtkComboBox* _tmp112_ = NULL;
+ GtkComboBox* _tmp110_ = NULL;
+ GtkLabel* _tmp111_ = NULL;
+ GtkLabel* _tmp112_ = NULL;
GtkComboBox* _tmp113_ = NULL;
GtkComboBox* _tmp114_ = NULL;
+ GtkComboBox* _tmp115_ = NULL;
+ GtkComboBox* _tmp116_ = NULL;
GtkBox* service_selector_layouter = NULL;
- GtkBox* _tmp115_ = NULL;
- GtkBox* _tmp116_ = NULL;
GtkBox* _tmp117_ = NULL;
GtkBox* _tmp118_ = NULL;
- GtkLabel* _tmp119_ = NULL;
+ GtkBox* _tmp119_ = NULL;
GtkBox* _tmp120_ = NULL;
- GtkComboBox* _tmp121_ = NULL;
- GtkBox* service_area_layouter = NULL;
+ GtkLabel* _tmp121_ = NULL;
GtkBox* _tmp122_ = NULL;
- GtkBox* _tmp123_ = NULL;
+ GtkComboBox* _tmp123_ = NULL;
+ GtkBox* service_area_layouter = NULL;
GtkBox* _tmp124_ = NULL;
GtkBox* _tmp125_ = NULL;
- GtkSeparator* _tmp126_ = NULL;
- GtkSeparator* _tmp127_ = NULL;
- GtkBox* _tmp128_ = NULL;
- GtkBox* _tmp129_ = NULL;
+ GtkBox* _tmp126_ = NULL;
+ GtkBox* _tmp127_ = NULL;
+ GtkSeparator* _tmp128_ = NULL;
+ GtkSeparator* _tmp129_ = NULL;
GtkBox* _tmp130_ = NULL;
GtkBox* _tmp131_ = NULL;
GtkBox* _tmp132_ = NULL;
GtkBox* _tmp133_ = NULL;
-#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp105_ = label;
-#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp106_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp105_);
-#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp106_);
-#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_selector_box_label = _tmp106_;
-#line 257 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp107_ = service_selector_box_label;
-#line 257 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp108_ = self->priv->service_selector_box;
-#line 257 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_label_set_mnemonic_widget (_tmp107_, G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_widget_get_type (), GtkWidget));
+ GtkBox* _tmp134_ = NULL;
+ GtkBox* _tmp135_ = NULL;
#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp109_ = service_selector_box_label;
+ _tmp107_ = label;
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp108_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp107_);
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_object_ref_sink (_tmp108_);
#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+ service_selector_box_label = _tmp108_;
+#line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp109_ = service_selector_box_label;
#line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp110_ = service_selector_box_label;
+ _tmp110_ = self->priv->service_selector_box;
#line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 265 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp111_ = self->priv->service_selector_box;
-#line 265 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
-#line 266 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp112_ = self->priv->service_selector_box;
-#line 266 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_label_set_mnemonic_widget (_tmp109_, G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget));
+#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp111_ = service_selector_box_label;
+#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+#line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp112_ = service_selector_box_label;
+#line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
#line 267 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp113_ = self->priv->service_selector_box;
#line 267 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp113_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp113_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
#line 268 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp114_ = self->priv->service_selector_box;
#line 268 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_widget_get_type (), GtkWidget), FALSE);
+ gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp115_ = self->priv->service_selector_box;
+#line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, gtk_widget_get_type (), GtkWidget), FALSE);
#line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp115_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+ _tmp116_ = self->priv->service_selector_box;
#line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp115_);
-#line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_selector_layouter = _tmp115_;
-#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp116_ = service_selector_layouter;
-#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, gtk_container_get_type (), GtkContainer), (guint) 12);
+ gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp117_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
#line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp117_ = service_selector_layouter;
+ g_object_ref_sink (_tmp117_);
#line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, gtk_widget_get_type (), GtkWidget), TRUE);
+ service_selector_layouter = _tmp117_;
#line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp118_ = service_selector_layouter;
#line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp119_ = service_selector_box_label;
-#line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, gtk_widget_get_type (), GtkWidget));
-#line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp120_ = service_selector_layouter;
+ gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, gtk_container_get_type (), GtkContainer), (guint) 12);
#line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp121_ = self->priv->service_selector_box;
+ _tmp119_ = service_selector_layouter;
#line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_box_pack_start (_tmp120_, G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp122_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp122_);
-#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_area_layouter = _tmp122_;
-#line 279 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp123_ = service_area_layouter;
-#line 279 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp124_ = service_selector_layouter;
-#line 279 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, gtk_widget_get_type (), GtkWidget));
-#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp125_ = service_area_layouter;
-#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp126_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp126_);
+ gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp120_ = service_selector_layouter;
+#line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp121_ = service_selector_box_label;
+#line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_widget_get_type (), GtkWidget));
+#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp122_ = service_selector_layouter;
+#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp123_ = self->priv->service_selector_box;
+#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_box_pack_start (_tmp122_, G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp127_ = _tmp126_;
+ _tmp124_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, gtk_widget_get_type (), GtkWidget));
+ g_object_ref_sink (_tmp124_);
#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (_tmp127_);
+ service_area_layouter = _tmp124_;
+#line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp125_ = service_area_layouter;
#line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp128_ = service_area_layouter;
+ _tmp126_ = service_selector_layouter;
#line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp128_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, gtk_widget_get_type (), GtkWidget));
+#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp127_ = service_area_layouter;
+#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp128_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp129_ = service_area_layouter;
+ g_object_ref_sink (_tmp128_);
#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+ _tmp129_ = _tmp128_;
+#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, gtk_widget_get_type (), GtkWidget));
+#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (_tmp129_);
#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp130_ = service_area_layouter;
#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, gtk_widget_get_type (), GtkWidget), TRUE);
+ gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp131_ = service_area_layouter;
#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp131_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp132_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+ gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp131_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+#line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp132_ = service_area_layouter;
+#line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, gtk_widget_get_type (), GtkWidget), TRUE);
#line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp133_ = service_area_layouter;
#line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_box_pack_start (_tmp132_, G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp134_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp135_ = service_area_layouter;
+#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_box_pack_start (_tmp134_, G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service_area_layouter);
-#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service_selector_layouter);
-#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service_selector_box_label);
-#line 2085 "PublishingUI.c"
+#line 2120 "PublishingUI.c"
}
-#line 289 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp134_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 289 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp134_);
-#line 289 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (self->priv->central_area_layouter);
-#line 289 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self->priv->central_area_layouter = _tmp134_;
#line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp135_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+ _tmp136_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_object_ref_sink (_tmp136_);
#line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp136_ = self->priv->central_area_layouter;
+ _g_object_unref0 (self->priv->central_area_layouter);
#line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_box_pack_start (_tmp135_, G_TYPE_CHECK_INSTANCE_CAST (_tmp136_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+ self->priv->central_area_layouter = _tmp136_;
#line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp137_ = use_header;
+ _tmp137_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
#line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- if (_tmp137_) {
-#line 2105 "PublishingUI.c"
- GtkButton* _tmp138_ = NULL;
- GtkButton* _tmp139_ = NULL;
- GtkWidget* _tmp140_ = NULL;
+ _tmp138_ = self->priv->central_area_layouter;
+#line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_box_pack_start (_tmp137_, G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp139_ = use_header;
+#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ if (_tmp139_) {
+#line 2140 "PublishingUI.c"
+ GtkButton* _tmp140_ = NULL;
GtkButton* _tmp141_ = NULL;
GtkWidget* _tmp142_ = NULL;
- GtkComboBox* _tmp143_ = NULL;
-#line 294 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp138_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
-#line 294 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_object_ref_sink (_tmp138_);
-#line 294 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ GtkButton* _tmp143_ = NULL;
+ GtkWidget* _tmp144_ = NULL;
+ GtkComboBox* _tmp145_ = NULL;
+#line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp140_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
+#line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_object_ref_sink (_tmp140_);
+#line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->close_cancel_button);
-#line 294 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self->priv->close_cancel_button = _tmp138_;
-#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp139_ = self->priv->close_cancel_button;
-#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp140_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ self->priv->close_cancel_button = _tmp140_;
#line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp141_ = self->priv->close_cancel_button;
#line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp140_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, gtk_widget_get_type (), GtkWidget));
-#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp142_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp143_ = self->priv->service_selector_box;
-#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, gtk_widget_get_type (), GtkWidget));
-#line 2136 "PublishingUI.c"
+#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp143_ = self->priv->close_cancel_button;
+#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, gtk_widget_get_type (), GtkWidget));
+#line 300 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp144_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 300 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp145_ = self->priv->service_selector_box;
+#line 300 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp144_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp145_, gtk_widget_get_type (), GtkWidget));
+#line 2171 "PublishingUI.c"
} else {
- const gchar* _tmp144_ = NULL;
- GtkWidget* _tmp145_ = NULL;
- GtkButton* _tmp146_ = NULL;
-#line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp144_ = _ ("_Cancel");
-#line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _tmp144_, (gint) GTK_RESPONSE_CANCEL);
-#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp145_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
-#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp146_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp145_, gtk_button_get_type ()) ? ((GtkButton*) _tmp145_) : NULL);
-#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (self->priv->close_cancel_button);
-#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self->priv->close_cancel_button = _tmp146_;
-#line 2153 "PublishingUI.c"
- }
+ const gchar* _tmp146_ = NULL;
+ GtkWidget* _tmp147_ = NULL;
+ GtkButton* _tmp148_ = NULL;
+#line 303 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp146_ = _ ("_Cancel");
+#line 303 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _tmp146_, (gint) GTK_RESPONSE_CANCEL);
+#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _tmp147_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _tmp147_ = self->priv->close_cancel_button;
+ _tmp148_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp147_, gtk_button_get_type ()) ? ((GtkButton*) _tmp147_) : NULL);
+#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (self->priv->close_cancel_button);
#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_signal_connect_object (_tmp147_, "clicked", (GCallback) _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
+ self->priv->close_cancel_button = _tmp148_;
+#line 2188 "PublishingUI.c"
+ }
#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- publishing_ui_publishing_dialog_set_standard_window_mode (self);
+ _tmp149_ = self->priv->close_cancel_button;
+#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_signal_connect_object (_tmp149_, "clicked", (GCallback) _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
#line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ publishing_ui_publishing_dialog_set_standard_window_mode (self);
+#line 310 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
loaded_services = (_vala_array_free (loaded_services, loaded_services_length1, (GDestroyNotify) g_object_unref), NULL);
@@ -2173,65 +2208,65 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
_g_free0 (title);
#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return self;
-#line 2177 "PublishingUI.c"
+#line 2212 "PublishingUI.c"
}
PublishingUIPublishingDialog* publishing_ui_publishing_dialog_new (GeeCollection* to_publish) {
#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return publishing_ui_publishing_dialog_construct (PUBLISHING_UI_TYPE_PUBLISHING_DIALOG, to_publish);
-#line 2184 "PublishingUI.c"
+#line 2219 "PublishingUI.c"
}
static void _vala_array_add56 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((*length) == (*size)) {
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2195 "PublishingUI.c"
+#line 2230 "PublishingUI.c"
}
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[(*length)++] = value;
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[*length] = NULL;
-#line 2201 "PublishingUI.c"
+#line 2236 "PublishingUI.c"
}
-static gint __lambda14_ (void* a, void* b) {
+static gint __lambda15_ (void* a, void* b) {
gint result = 0;
void* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
void* _tmp2_ = NULL;
const gchar* _tmp3_ = NULL;
gint _tmp4_ = 0;
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = a;
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) _tmp0_), SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp2_ = b;
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) _tmp2_), SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp4_ = utf8_cs_compare (_tmp1_, _tmp3_);
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
result = _tmp4_;
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 2226 "PublishingUI.c"
+#line 2261 "PublishingUI.c"
}
-static gint ___lambda14____compar_fn_t (void* key1, void* key2) {
+static gint ___lambda15____compar_fn_t (void* key1, void* key2) {
gint result;
- result = __lambda14_ (key1, key2);
-#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ result = __lambda15_ (key1, key2);
+#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 2235 "PublishingUI.c"
+#line 2270 "PublishingUI.c"
}
@@ -2252,41 +2287,41 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
gint _tmp26__length1 = 0;
SpitPublishingService** _tmp27_ = NULL;
gint _tmp27__length1 = 0;
-#line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = g_new0 (SpitPublishingService*, 0 + 1);
-#line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
loaded_services = _tmp0_;
-#line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
loaded_services_length1 = 0;
-#line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_loaded_services_size_ = loaded_services_length1;
-#line 315 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 317 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = plugins_get_pluggables_for_type (SPIT_PUBLISHING_TYPE_SERVICE, NULL, NULL, NULL, FALSE);
-#line 315 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 317 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
pluggables = _tmp1_;
-#line 318 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp2_ = pluggables;
-#line 318 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp3_ = gee_collection_get_size (_tmp2_);
-#line 318 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp4_ = _tmp3_;
-#line 318 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_debug ("PublishingUI.vala:318: PublisingDialog: discovered %d pluggable publis" \
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_debug ("PublishingUI.vala:320: PublisingDialog: discovered %d pluggable publis" \
"hing services.", _tmp4_);
-#line 2276 "PublishingUI.c"
+#line 2311 "PublishingUI.c"
{
GeeIterator* _pluggable_it = NULL;
GeeCollection* _tmp5_ = NULL;
GeeIterator* _tmp6_ = NULL;
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp5_ = pluggables;
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_pluggable_it = _tmp6_;
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
while (TRUE) {
-#line 2289 "PublishingUI.c"
+#line 2324 "PublishingUI.c"
GeeIterator* _tmp7_ = NULL;
gboolean _tmp8_ = FALSE;
SpitPluggable* pluggable = NULL;
@@ -2305,167 +2340,167 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
gint _tmp22__length1 = 0;
SpitPublishingService* _tmp23_ = NULL;
SpitPublishingService* _tmp24_ = NULL;
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp7_ = _pluggable_it;
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp8_ = gee_iterator_next (_tmp7_);
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (!_tmp8_) {
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
break;
-#line 2316 "PublishingUI.c"
+#line 2351 "PublishingUI.c"
}
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp9_ = _pluggable_it;
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp10_ = gee_iterator_get (_tmp9_);
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
pluggable = (SpitPluggable*) _tmp10_;
-#line 321 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp11_ = pluggable;
-#line 321 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp12_ = spit_pluggable_get_pluggable_interface (_tmp11_, SPIT_PUBLISHING_CURRENT_INTERFACE, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 321 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- pluggable_interface = _tmp12_;
#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ pluggable_interface = _tmp12_;
+#line 325 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp13_ = pluggable_interface;
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 325 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp13_ != SPIT_PUBLISHING_CURRENT_INTERFACE) {
-#line 2334 "PublishingUI.c"
+#line 2369 "PublishingUI.c"
SpitPluggable* _tmp14_ = NULL;
gchar* _tmp15_ = NULL;
gchar* _tmp16_ = NULL;
gint _tmp17_ = 0;
-#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp14_ = pluggable;
-#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp15_ = plugins_get_pluggable_module_id (_tmp14_);
-#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp16_ = _tmp15_;
-#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp17_ = pluggable_interface;
-#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_warning ("PublishingUI.vala:324: Unable to load publisher %s: reported interface" \
+#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_warning ("PublishingUI.vala:326: Unable to load publisher %s: reported interface" \
" %d.", _tmp16_, _tmp17_);
-#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (_tmp16_);
-#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 329 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (pluggable);
-#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 329 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
continue;
-#line 2355 "PublishingUI.c"
+#line 2390 "PublishingUI.c"
}
-#line 330 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp18_ = pluggable;
-#line 330 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService));
-#line 330 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service = _tmp19_;
-#line 333 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 335 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp20_ = service;
-#line 333 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 335 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp21_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 333 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_debug ("PublishingUI.vala:333: PublishingDialog: discovered pluggable publishi" \
+#line 335 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_debug ("PublishingUI.vala:335: PublishingDialog: discovered pluggable publishi" \
"ng service '%s'.", _tmp21_);
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp22_ = loaded_services;
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp22__length1 = loaded_services_length1;
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp23_ = service;
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_vala_array_add56 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp24_);
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service);
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (pluggable);
-#line 2383 "PublishingUI.c"
+#line 2418 "PublishingUI.c"
}
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (_pluggable_it);
-#line 2387 "PublishingUI.c"
+#line 2422 "PublishingUI.c"
}
-#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp25_ = loaded_services;
-#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp25__length1 = loaded_services_length1;
-#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp26_ = loaded_services;
-#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp26__length1 = loaded_services_length1;
-#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- qsort (_tmp25_, (gsize) _tmp26__length1, (gsize) sizeof (SpitPublishingService*), ___lambda14____compar_fn_t);
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ qsort (_tmp25_, (gsize) _tmp26__length1, (gsize) sizeof (SpitPublishingService*), ___lambda15____compar_fn_t);
+#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp27_ = loaded_services;
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp27__length1 = loaded_services_length1;
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (result_length1) {
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*result_length1 = _tmp27__length1;
-#line 2407 "PublishingUI.c"
+#line 2442 "PublishingUI.c"
}
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
result = _tmp27_;
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (pluggables);
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 2415 "PublishingUI.c"
+#line 2450 "PublishingUI.c"
}
static void _vala_array_add57 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((*length) == (*size)) {
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2426 "PublishingUI.c"
+#line 2461 "PublishingUI.c"
}
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[(*length)++] = value;
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[*length] = NULL;
-#line 2432 "PublishingUI.c"
+#line 2467 "PublishingUI.c"
}
static void _vala_array_add58 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((*length) == (*size)) {
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2443 "PublishingUI.c"
+#line 2478 "PublishingUI.c"
}
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[(*length)++] = value;
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[*length] = NULL;
-#line 2449 "PublishingUI.c"
+#line 2484 "PublishingUI.c"
}
static void _vala_array_add59 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
-#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((*length) == (*size)) {
-#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2460 "PublishingUI.c"
+#line 2495 "PublishingUI.c"
}
-#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[(*length)++] = value;
-#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
(*array)[*length] = NULL;
-#line 2466 "PublishingUI.c"
+#line 2501 "PublishingUI.c"
}
@@ -2486,226 +2521,226 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb
gint _tmp6__length1 = 0;
SpitPublishingService** _tmp32_ = NULL;
gint _tmp32__length1 = 0;
-#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = has_photos;
-#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp1_) {
-#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = TRUE;
-#line 2493 "PublishingUI.c"
+#line 2528 "PublishingUI.c"
} else {
gboolean _tmp2_ = FALSE;
-#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp2_ = has_videos;
-#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = _tmp2_;
-#line 2500 "PublishingUI.c"
+#line 2535 "PublishingUI.c"
}
-#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _vala_assert (_tmp0_, "has_photos || has_videos");
#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _vala_assert (_tmp0_, "has_photos || has_videos");
+#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp3_ = g_new0 (SpitPublishingService*, 0 + 1);
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
filtered_services = _tmp3_;
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
filtered_services_length1 = 0;
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_filtered_services_size_ = filtered_services_length1;
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp5_ = publishing_ui_publishing_dialog_load_all_services (&_tmp4_);
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
all_services = _tmp5_;
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
all_services_length1 = _tmp4_;
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _all_services_size_ = all_services_length1;
#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _all_services_size_ = all_services_length1;
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp6_ = all_services;
-#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp6__length1 = all_services_length1;
-#line 2524 "PublishingUI.c"
+#line 2559 "PublishingUI.c"
{
SpitPublishingService** service_collection = NULL;
gint service_collection_length1 = 0;
gint _service_collection_size_ = 0;
gint service_it = 0;
-#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service_collection = _tmp6_;
-#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service_collection_length1 = _tmp6__length1;
-#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
for (service_it = 0; service_it < _tmp6__length1; service_it = service_it + 1) {
-#line 2536 "PublishingUI.c"
+#line 2571 "PublishingUI.c"
SpitPublishingService* _tmp7_ = NULL;
SpitPublishingService* service = NULL;
-#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp7_ = _g_object_ref0 (service_collection[service_it]);
-#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service = _tmp7_;
-#line 2543 "PublishingUI.c"
+#line 2578 "PublishingUI.c"
{
gboolean _tmp8_ = FALSE;
gboolean _tmp9_ = FALSE;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp9_ = has_photos;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp9_) {
-#line 2551 "PublishingUI.c"
+#line 2586 "PublishingUI.c"
gboolean _tmp10_ = FALSE;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp10_ = has_videos;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp8_ = !_tmp10_;
-#line 2557 "PublishingUI.c"
+#line 2592 "PublishingUI.c"
} else {
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp8_ = FALSE;
-#line 2561 "PublishingUI.c"
+#line 2596 "PublishingUI.c"
}
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp8_) {
-#line 2565 "PublishingUI.c"
+#line 2600 "PublishingUI.c"
SpitPublishingService* _tmp11_ = NULL;
SpitPublishingPublisherMediaType _tmp12_ = 0;
-#line 357 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp11_ = service;
-#line 357 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp12_ = spit_publishing_service_get_supported_media (_tmp11_);
-#line 357 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((_tmp12_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 2574 "PublishingUI.c"
+#line 2609 "PublishingUI.c"
SpitPublishingService** _tmp13_ = NULL;
gint _tmp13__length1 = 0;
SpitPublishingService* _tmp14_ = NULL;
SpitPublishingService* _tmp15_ = NULL;
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp13_ = filtered_services;
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp13__length1 = filtered_services_length1;
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp14_ = service;
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp15_ = _g_object_ref0 (_tmp14_);
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_vala_array_add57 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp15_);
-#line 2589 "PublishingUI.c"
+#line 2624 "PublishingUI.c"
}
} else {
gboolean _tmp16_ = FALSE;
gboolean _tmp17_ = FALSE;
-#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp17_ = has_photos;
-#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (!_tmp17_) {
-#line 2598 "PublishingUI.c"
+#line 2633 "PublishingUI.c"
gboolean _tmp18_ = FALSE;
-#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp18_ = has_videos;
-#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp16_ = _tmp18_;
-#line 2604 "PublishingUI.c"
+#line 2639 "PublishingUI.c"
} else {
-#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp16_ = FALSE;
-#line 2608 "PublishingUI.c"
+#line 2643 "PublishingUI.c"
}
-#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp16_) {
-#line 2612 "PublishingUI.c"
+#line 2647 "PublishingUI.c"
SpitPublishingService* _tmp19_ = NULL;
SpitPublishingPublisherMediaType _tmp20_ = 0;
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp19_ = service;
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp20_ = spit_publishing_service_get_supported_media (_tmp19_);
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((_tmp20_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0) {
-#line 2621 "PublishingUI.c"
+#line 2656 "PublishingUI.c"
SpitPublishingService** _tmp21_ = NULL;
gint _tmp21__length1 = 0;
SpitPublishingService* _tmp22_ = NULL;
SpitPublishingService* _tmp23_ = NULL;
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp21_ = filtered_services;
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp21__length1 = filtered_services_length1;
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp22_ = service;
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp23_ = _g_object_ref0 (_tmp22_);
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_vala_array_add58 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp23_);
-#line 2636 "PublishingUI.c"
+#line 2671 "PublishingUI.c"
}
} else {
gboolean _tmp24_ = FALSE;
SpitPublishingService* _tmp25_ = NULL;
SpitPublishingPublisherMediaType _tmp26_ = 0;
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp25_ = service;
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp26_ = spit_publishing_service_get_supported_media (_tmp25_);
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((_tmp26_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 2648 "PublishingUI.c"
+#line 2683 "PublishingUI.c"
SpitPublishingService* _tmp27_ = NULL;
SpitPublishingPublisherMediaType _tmp28_ = 0;
-#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp27_ = service;
-#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp28_ = spit_publishing_service_get_supported_media (_tmp27_);
-#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp24_ = (_tmp28_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0;
-#line 2657 "PublishingUI.c"
+#line 2692 "PublishingUI.c"
} else {
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp24_ = FALSE;
-#line 2661 "PublishingUI.c"
+#line 2696 "PublishingUI.c"
}
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp24_) {
-#line 2665 "PublishingUI.c"
+#line 2700 "PublishingUI.c"
SpitPublishingService** _tmp29_ = NULL;
gint _tmp29__length1 = 0;
SpitPublishingService* _tmp30_ = NULL;
SpitPublishingService* _tmp31_ = NULL;
-#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp29_ = filtered_services;
-#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp29__length1 = filtered_services_length1;
-#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp30_ = service;
-#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp31_ = _g_object_ref0 (_tmp30_);
-#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_vala_array_add59 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp31_);
-#line 2680 "PublishingUI.c"
+#line 2715 "PublishingUI.c"
}
}
}
-#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service);
-#line 2686 "PublishingUI.c"
+#line 2721 "PublishingUI.c"
}
}
}
-#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp32_ = filtered_services;
-#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp32__length1 = filtered_services_length1;
-#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (result_length1) {
-#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
*result_length1 = _tmp32__length1;
-#line 2698 "PublishingUI.c"
+#line 2733 "PublishingUI.c"
}
-#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
result = _tmp32_;
-#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
all_services = (_vala_array_free (all_services, all_services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 2706 "PublishingUI.c"
+#line 2741 "PublishingUI.c"
}
@@ -2736,208 +2771,208 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
PublishingUIPublishingDialog* _tmp29_ = NULL;
PublishingUIPublishingDialog* _tmp30_ = NULL;
GTimer* _tmp31_ = NULL;
-#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (GEE_IS_COLLECTION (to_publish));
-#line 384 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 386 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = publishing_ui_publishing_dialog_active_instance;
-#line 384 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 386 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp0_ != NULL) {
-#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return;
-#line 2745 "PublishingUI.c"
+#line 2780 "PublishingUI.c"
}
-#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = publishing_ui_publishing_dialog_since_last_start;
-#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp1_ == NULL) {
-#line 2751 "PublishingUI.c"
+#line 2786 "PublishingUI.c"
GTimer* _tmp2_ = NULL;
GTimer* _tmp3_ = NULL;
GTimer* _tmp4_ = NULL;
-#line 390 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp2_ = g_timer_new ();
-#line 390 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_timer_destroy0 (publishing_ui_publishing_dialog_since_last_start);
-#line 390 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_since_last_start = _tmp2_;
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 393 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp3_ = publishing_ui_publishing_dialog_since_last_start;
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 393 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_timer_stop (_tmp3_);
-#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp4_ = publishing_ui_publishing_dialog_since_last_start;
-#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_timer_reset (_tmp4_);
-#line 393 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_elapsed_is_valid = FALSE;
-#line 2771 "PublishingUI.c"
+#line 2806 "PublishingUI.c"
} else {
gdouble elapsed = 0.0;
GTimer* _tmp5_ = NULL;
gdouble _tmp6_ = 0.0;
gboolean _tmp7_ = FALSE;
gdouble _tmp8_ = 0.0;
-#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp5_ = publishing_ui_publishing_dialog_since_last_start;
-#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp6_ = g_timer_elapsed (_tmp5_, NULL);
-#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
elapsed = _tmp6_;
-#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp8_ = elapsed;
-#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp8_ < 0.05) {
-#line 2788 "PublishingUI.c"
+#line 2823 "PublishingUI.c"
gboolean _tmp9_ = FALSE;
-#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp9_ = publishing_ui_publishing_dialog_elapsed_is_valid;
-#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp7_ = _tmp9_;
-#line 2794 "PublishingUI.c"
+#line 2829 "PublishingUI.c"
} else {
-#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp7_ = FALSE;
-#line 2798 "PublishingUI.c"
+#line 2833 "PublishingUI.c"
}
-#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp7_) {
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 399 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return;
-#line 2804 "PublishingUI.c"
+#line 2839 "PublishingUI.c"
}
}
-#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp10_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
photos = _tmp10_;
-#line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 403 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp11_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 403 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
videos = _tmp11_;
-#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp12_ = to_publish;
-#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp13_ = photos;
-#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp14_ = videos;
-#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- media_source_collection_filter_media (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ media_source_collection_filter_media (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp15_ = photos;
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp17_ = _tmp16_;
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp18_ = videos;
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp20_ = _tmp19_;
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp22_ = publishing_ui_publishing_dialog_load_services (_tmp17_ > 0, _tmp20_ > 0, &_tmp21_);
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
avail_services = _tmp22_;
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
avail_services_length1 = _tmp21_;
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_avail_services_size_ = avail_services_length1;
-#line 407 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp23_ = avail_services;
-#line 407 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp23__length1 = avail_services_length1;
-#line 407 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp23__length1 == 0) {
-#line 2849 "PublishingUI.c"
+#line 2884 "PublishingUI.c"
const gchar* _tmp24_ = NULL;
const gchar* _tmp25_ = NULL;
gchar* _tmp26_ = NULL;
gchar* _tmp27_ = NULL;
-#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp24_ = _ ("Unable to publish");
-#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp25_ = _ ("Shotwell cannot publish the selected items because you do not have a c" \
"ompatible publishing plugin enabled. To correct this, choose <b>Edit %" \
"s Preferences</b> and enable one or more of the publishing plugins on " \
"the <b>Plugins</b> tab.");
-#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp26_ = g_strdup_printf (_tmp25_, "▸");
-#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp27_ = _tmp26_;
-#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
app_window_error_message_with_title (_tmp24_, _tmp27_, NULL, FALSE);
-#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (_tmp27_);
-#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
avail_services = (_vala_array_free (avail_services, avail_services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (videos);
-#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (photos);
-#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return;
-#line 2874 "PublishingUI.c"
+#line 2909 "PublishingUI.c"
}
-#line 420 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_debug ("PublishingUI.vala:420: PublishingDialog.go( )");
#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_debug ("PublishingUI.vala:422: PublishingDialog.go( )");
+#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp28_ = to_publish;
-#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp29_ = publishing_ui_publishing_dialog_new (_tmp28_);
-#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_object_ref_sink (_tmp29_);
-#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (publishing_ui_publishing_dialog_active_instance);
-#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- publishing_ui_publishing_dialog_active_instance = _tmp29_;
#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ publishing_ui_publishing_dialog_active_instance = _tmp29_;
+#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp30_ = publishing_ui_publishing_dialog_active_instance;
-#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- publishing_ui_publishing_dialog_run (_tmp30_);
#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ publishing_ui_publishing_dialog_run (_tmp30_);
+#line 428 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (publishing_ui_publishing_dialog_active_instance);
-#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 428 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_active_instance = NULL;
-#line 429 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 431 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp31_ = publishing_ui_publishing_dialog_since_last_start;
-#line 429 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 431 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_timer_start (_tmp31_);
-#line 430 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 432 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_elapsed_is_valid = TRUE;
-#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
avail_services = (_vala_array_free (avail_services, avail_services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (videos);
-#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (photos);
-#line 2908 "PublishingUI.c"
+#line 2943 "PublishingUI.c"
}
static gboolean publishing_ui_publishing_dialog_on_window_close (PublishingUIPublishingDialog* self, GdkEventAny* evt) {
gboolean result = FALSE;
SpitPublishingConcretePublishingHost* _tmp0_ = NULL;
-#line 433 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), FALSE);
-#line 433 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_val_if_fail (evt != NULL, FALSE);
-#line 434 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 436 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->host;
-#line 434 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 436 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
spit_publishing_plugin_host_stop_publishing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost));
-#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->host);
-#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->host = NULL;
-#line 436 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 438 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 439 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 441 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
result = TRUE;
-#line 439 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 441 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 2935 "PublishingUI.c"
+#line 2970 "PublishingUI.c"
}
@@ -2973,253 +3008,253 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
gint _tmp27__length1 = 0;
SpitPublishingConcretePublishingHost* _tmp28_ = NULL;
SpitPublishingConcretePublishingHost* _tmp29_ = NULL;
-#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
+#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
have_active_iter = FALSE;
-#line 445 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->service_selector_box;
-#line 445 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 445 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
iter = _tmp1_;
-#line 445 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
have_active_iter = _tmp2_;
-#line 448 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp3_ = have_active_iter;
-#line 448 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (!_tmp3_) {
-#line 2987 "PublishingUI.c"
+#line 3022 "PublishingUI.c"
GtkComboBox* _tmp4_ = NULL;
GtkComboBox* _tmp5_ = NULL;
GtkTreeIter _tmp6_ = {0};
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp4_ = self->priv->service_selector_box;
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_combo_box_set_active (_tmp4_, 0);
-#line 453 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 455 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp5_ = self->priv->service_selector_box;
-#line 453 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 455 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_combo_box_get_active_iter (_tmp5_, &_tmp6_);
-#line 453 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 455 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
iter = _tmp6_;
-#line 3001 "PublishingUI.c"
+#line 3036 "PublishingUI.c"
}
-#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp7_ = self->priv->service_selector_box_model;
-#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp8_ = iter;
-#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_tree_model_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp8_, 1, &_tmp9_);
-#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_IS_VALUE (&service_name_val) ? (g_value_unset (&service_name_val), NULL) : NULL;
-#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_name_val = _tmp9_;
#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ service_name_val = _tmp9_;
+#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp10_ = service_name_val;
-#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp11_ = g_strdup (g_value_get_string (&_tmp10_));
-#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- service_name = _tmp11_;
#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ service_name = _tmp11_;
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
selected_service = NULL;
-#line 462 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp13_ = publishing_ui_publishing_dialog_load_all_services (&_tmp12_);
-#line 462 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
services = _tmp13_;
-#line 462 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
services_length1 = _tmp12_;
-#line 462 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_services_size_ = services_length1;
-#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp14_ = services;
-#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp14__length1 = services_length1;
-#line 3033 "PublishingUI.c"
+#line 3068 "PublishingUI.c"
{
SpitPublishingService** service_collection = NULL;
gint service_collection_length1 = 0;
gint _service_collection_size_ = 0;
gint service_it = 0;
-#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service_collection = _tmp14_;
-#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service_collection_length1 = _tmp14__length1;
-#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
for (service_it = 0; service_it < _tmp14__length1; service_it = service_it + 1) {
-#line 3045 "PublishingUI.c"
+#line 3080 "PublishingUI.c"
SpitPublishingService* _tmp15_ = NULL;
SpitPublishingService* service = NULL;
-#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp15_ = _g_object_ref0 (service_collection[service_it]);
-#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
service = _tmp15_;
-#line 3052 "PublishingUI.c"
+#line 3087 "PublishingUI.c"
{
SpitPublishingService* _tmp16_ = NULL;
const gchar* _tmp17_ = NULL;
const gchar* _tmp18_ = NULL;
-#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp16_ = service;
-#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp17_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp18_ = service_name;
-#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (g_strcmp0 (_tmp17_, _tmp18_) == 0) {
-#line 3065 "PublishingUI.c"
+#line 3100 "PublishingUI.c"
SpitPublishingService* _tmp19_ = NULL;
SpitPublishingService* _tmp20_ = NULL;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp19_ = service;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (selected_service);
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
selected_service = _tmp20_;
-#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service);
-#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
break;
-#line 3080 "PublishingUI.c"
+#line 3115 "PublishingUI.c"
}
-#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (service);
-#line 3084 "PublishingUI.c"
+#line 3119 "PublishingUI.c"
}
}
}
-#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp21_ = selected_service;
-#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _vala_assert (_tmp21_ != NULL, "selected_service != null");
#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _vala_assert (_tmp21_ != NULL, "selected_service != null");
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp22_ = config_facade_get_instance ();
-#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp23_ = _tmp22_;
-#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp24_ = selected_service;
-#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp25_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
configuration_facade_set_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp25_);
-#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _g_object_unref0 (_tmp23_);
#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _g_object_unref0 (_tmp23_);
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp26_ = selected_service;
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp27_ = self->priv->publishables;
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp27__length1 = self->priv->publishables_length1;
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp28_ = spit_publishing_concrete_publishing_host_new (_tmp26_, self, _tmp27_, _tmp27__length1);
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->host);
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->host = _tmp28_;
-#line 474 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 476 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp29_ = self->priv->host;
-#line 474 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 476 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
spit_publishing_concrete_publishing_host_start_publishing (_tmp29_);
-#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
services = (_vala_array_free (services, services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (selected_service);
-#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_free0 (service_name);
-#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_IS_VALUE (&service_name_val) ? (g_value_unset (&service_name_val), NULL) : NULL;
-#line 3128 "PublishingUI.c"
+#line 3163 "PublishingUI.c"
}
static void publishing_ui_publishing_dialog_on_close_cancel_clicked (PublishingUIPublishingDialog* self) {
SpitPublishingConcretePublishingHost* _tmp0_ = NULL;
-#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 479 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 478 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_debug ("PublishingUI.vala:478: PublishingDialog: on_close_cancel_clicked( ): i" \
-"nvoked.");
#line 480 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_debug ("PublishingUI.vala:480: PublishingDialog: on_close_cancel_clicked( ): i" \
+"nvoked.");
+#line 482 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->host;
-#line 480 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 482 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
spit_publishing_plugin_host_stop_publishing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost));
-#line 481 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 483 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->host);
-#line 481 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 483 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->host = NULL;
-#line 482 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 484 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 483 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 485 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 3150 "PublishingUI.c"
+#line 3185 "PublishingUI.c"
}
static void publishing_ui_publishing_dialog_set_large_window_mode (PublishingUIPublishingDialog* self) {
GtkBox* _tmp0_ = NULL;
-#line 486 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 488 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 487 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 489 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT);
-#line 488 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 490 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->central_area_layouter;
-#line 488 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
#line 490 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
+#line 492 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3166 "PublishingUI.c"
+#line 3201 "PublishingUI.c"
}
static void publishing_ui_publishing_dialog_set_colossal_window_mode (PublishingUIPublishingDialog* self) {
GtkBox* _tmp0_ = NULL;
-#line 493 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 495 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 494 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 496 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT);
-#line 495 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 497 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->central_area_layouter;
-#line 495 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
#line 497 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
+#line 499 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3182 "PublishingUI.c"
+#line 3217 "PublishingUI.c"
}
static void publishing_ui_publishing_dialog_set_standard_window_mode (PublishingUIPublishingDialog* self) {
GtkBox* _tmp0_ = NULL;
-#line 500 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 502 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 501 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 503 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT);
-#line 502 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 504 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->central_area_layouter;
-#line 502 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
#line 504 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
+#line 506 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3198 "PublishingUI.c"
+#line 3233 "PublishingUI.c"
}
static void publishing_ui_publishing_dialog_set_free_sizable_window_mode (PublishingUIPublishingDialog* self) {
-#line 507 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 509 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 508 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 510 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 3207 "PublishingUI.c"
+#line 3242 "PublishingUI.c"
}
static void publishing_ui_publishing_dialog_clear_free_sizable_window_mode (PublishingUIPublishingDialog* self) {
-#line 511 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 513 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 512 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 514 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3216 "PublishingUI.c"
+#line 3251 "PublishingUI.c"
}
@@ -3227,17 +3262,17 @@ SpitPublishingDialogPane* publishing_ui_publishing_dialog_get_active_pane (Publi
SpitPublishingDialogPane* result = NULL;
SpitPublishingDialogPane* _tmp0_ = NULL;
SpitPublishingDialogPane* _tmp1_ = NULL;
-#line 515 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 517 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), NULL);
-#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->active_pane;
-#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
result = _tmp1_;
-#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 3234 "PublishingUI.c"
+#line 3269 "PublishingUI.c"
}
@@ -3245,58 +3280,58 @@ void publishing_ui_publishing_dialog_set_close_button_mode (PublishingUIPublishi
GtkButton* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
GtkButton* _tmp2_ = NULL;
-#line 519 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 521 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 522 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->close_cancel_button;
-#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 522 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = _ ("_Close");
-#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 522 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_button_set_label (_tmp0_, _tmp1_);
-#line 521 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp2_ = self->priv->close_cancel_button;
-#line 521 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 3254 "PublishingUI.c"
+#line 3289 "PublishingUI.c"
}
void publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublishingDialog* self) {
GtkButton* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 524 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 526 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 525 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 527 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->close_cancel_button;
-#line 525 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 527 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = _ ("_Cancel");
-#line 525 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 527 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_button_set_label (_tmp0_, _tmp1_);
-#line 3269 "PublishingUI.c"
+#line 3304 "PublishingUI.c"
}
void publishing_ui_publishing_dialog_lock_service (PublishingUIPublishingDialog* self) {
GtkComboBox* _tmp0_ = NULL;
-#line 528 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 530 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 529 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 531 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->service_selector_box;
-#line 529 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 531 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 3281 "PublishingUI.c"
+#line 3316 "PublishingUI.c"
}
void publishing_ui_publishing_dialog_unlock_service (PublishingUIPublishingDialog* self) {
GtkComboBox* _tmp0_ = NULL;
-#line 532 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 534 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 535 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->service_selector_box;
-#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 535 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3293 "PublishingUI.c"
+#line 3328 "PublishingUI.c"
}
@@ -3314,110 +3349,110 @@ void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog*
SpitPublishingDialogPane* _tmp15_ = NULL;
SpitPublishingDialogPane* _tmp16_ = NULL;
SpitPublishingDialogPane* _tmp17_ = NULL;
-#line 536 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 538 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 536 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 538 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (pane));
-#line 537 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_debug ("PublishingUI.vala:537: PublishingDialog: install_pane( ): invoked.");
#line 539 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_debug ("PublishingUI.vala:539: PublishingDialog: install_pane( ): invoked.");
+#line 541 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = self->priv->active_pane;
-#line 539 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 541 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if (_tmp0_ != NULL) {
-#line 3321 "PublishingUI.c"
+#line 3356 "PublishingUI.c"
SpitPublishingDialogPane* _tmp1_ = NULL;
GtkBox* _tmp2_ = NULL;
SpitPublishingDialogPane* _tmp3_ = NULL;
GtkWidget* _tmp4_ = NULL;
GtkWidget* _tmp5_ = NULL;
-#line 540 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- g_debug ("PublishingUI.vala:540: PublishingDialog: install_pane( ): a pane is al" \
-"ready installed; removing it.");
#line 542 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ g_debug ("PublishingUI.vala:542: PublishingDialog: install_pane( ): a pane is al" \
+"ready installed; removing it.");
+#line 544 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp1_ = self->priv->active_pane;
-#line 542 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 544 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
spit_publishing_dialog_pane_on_pane_uninstalled (_tmp1_);
-#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp2_ = self->priv->central_area_layouter;
-#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp3_ = self->priv->active_pane;
-#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp4_ = spit_publishing_dialog_pane_get_widget (_tmp3_);
-#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp5_ = _tmp4_;
-#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), _tmp5_);
-#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (_tmp5_);
-#line 3345 "PublishingUI.c"
+#line 3380 "PublishingUI.c"
}
-#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp6_ = self->priv->central_area_layouter;
-#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp7_ = pane;
-#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp8_ = spit_publishing_dialog_pane_get_widget (_tmp7_);
-#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp9_ = _tmp8_;
-#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
gtk_box_pack_start (_tmp6_, _tmp9_, TRUE, TRUE, (guint) 0);
-#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (_tmp9_);
-#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 549 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp10_ = pane;
-#line 549 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp11_ = spit_publishing_dialog_pane_get_preferred_geometry (_tmp10_);
-#line 549 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- geometry_options = _tmp11_;
#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ geometry_options = _tmp11_;
+#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp12_ = geometry_options;
-#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((_tmp12_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) {
-#line 552 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 554 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_set_large_window_mode (self);
-#line 3373 "PublishingUI.c"
+#line 3408 "PublishingUI.c"
} else {
SpitPublishingDialogPaneGeometryOptions _tmp13_ = 0;
-#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp13_ = geometry_options;
-#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((_tmp13_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) {
-#line 554 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 556 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_set_colossal_window_mode (self);
-#line 3382 "PublishingUI.c"
+#line 3417 "PublishingUI.c"
} else {
-#line 556 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 558 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_set_standard_window_mode (self);
-#line 3386 "PublishingUI.c"
+#line 3421 "PublishingUI.c"
}
}
-#line 558 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 560 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp14_ = geometry_options;
-#line 558 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 560 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
if ((_tmp14_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) {
-#line 559 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 561 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_set_free_sizable_window_mode (self);
-#line 3395 "PublishingUI.c"
+#line 3430 "PublishingUI.c"
} else {
-#line 561 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
publishing_ui_publishing_dialog_clear_free_sizable_window_mode (self);
-#line 3399 "PublishingUI.c"
+#line 3434 "PublishingUI.c"
}
-#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp15_ = pane;
-#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->active_pane);
-#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv->active_pane = _tmp16_;
-#line 564 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 566 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp17_ = pane;
-#line 564 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 566 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
spit_publishing_dialog_pane_on_pane_installed (_tmp17_);
-#line 3413 "PublishingUI.c"
+#line 3448 "PublishingUI.c"
}
@@ -3425,23 +3460,23 @@ gint publishing_ui_publishing_dialog_run (PublishingUIPublishingDialog* self) {
gint result = 0;
gint _result_ = 0;
gint _tmp0_ = 0;
-#line 567 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 569 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), 0);
-#line 568 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- publishing_ui_publishing_dialog_on_service_changed (self);
#line 570 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ publishing_ui_publishing_dialog_on_service_changed (self);
+#line 572 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 570 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- _result_ = _tmp0_;
#line 572 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ _result_ = _tmp0_;
+#line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
_g_object_unref0 (self->priv->host);
-#line 572 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
- self->priv->host = NULL;
#line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+ self->priv->host = NULL;
+#line 576 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
result = _result_;
-#line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 576 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
return result;
-#line 3437 "PublishingUI.c"
+#line 3472 "PublishingUI.c"
}
@@ -3452,14 +3487,14 @@ static void publishing_ui_publishing_dialog_class_init (PublishingUIPublishingDi
g_type_class_add_private (klass, sizeof (PublishingUIPublishingDialogPrivate));
#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_ui_publishing_dialog_finalize;
-#line 3448 "PublishingUI.c"
+#line 3483 "PublishingUI.c"
}
static void publishing_ui_publishing_dialog_instance_init (PublishingUIPublishingDialog * self) {
#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
self->priv = PUBLISHING_UI_PUBLISHING_DIALOG_GET_PRIVATE (self);
-#line 3455 "PublishingUI.c"
+#line 3490 "PublishingUI.c"
}
@@ -3485,7 +3520,7 @@ static void publishing_ui_publishing_dialog_finalize (GObject* obj) {
spit_pluggable_info_destroy (&self->priv->info);
#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
G_OBJECT_CLASS (publishing_ui_publishing_dialog_parent_class)->finalize (obj);
-#line 3481 "PublishingUI.c"
+#line 3516 "PublishingUI.c"
}
diff --git a/src/publishing/PublishingUI.vala b/src/publishing/PublishingUI.vala
index 91a2bf4..c975564 100644
--- a/src/publishing/PublishingUI.vala
+++ b/src/publishing/PublishingUI.vala
@@ -168,6 +168,8 @@ public class PublishingDialog : Gtk.Dialog {
((Gtk.HeaderBar) get_header_bar()).set_show_close_button(false);
resizable = false;
+ modal = true;
+ set_transient_for(AppWindow.get_instance());
delete_event.connect(on_window_close);
publishables = new Spit.Publishing.Publishable[0];
diff --git a/src/searches/SavedSearchDialog.c b/src/searches/SavedSearchDialog.c
index 5050916..2489f21 100644
--- a/src/searches/SavedSearchDialog.c
+++ b/src/searches/SavedSearchDialog.c
@@ -278,7 +278,7 @@ typedef struct _SavedSearchDialogSearchRowDatePrivate SavedSearchDialogSearchRow
typedef struct _SearchConditionDate SearchConditionDate;
typedef struct _SearchConditionDateClass SearchConditionDateClass;
-typedef struct _Block9Data Block9Data;
+typedef struct _Block10Data Block10Data;
typedef struct _ParamSpecSavedSearchDialog ParamSpecSavedSearchDialog;
#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
@@ -534,7 +534,7 @@ typedef enum {
SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET
} SearchConditionDateContext;
-struct _Block9Data {
+struct _Block10Data {
int _ref_count_;
SavedSearchDialogSearchRowDate* self;
GtkDialog* d;
@@ -808,14 +808,14 @@ GDateTime* search_condition_date_get_date_one (SearchConditionDate* self);
GDateTime* search_condition_date_get_date_two (SearchConditionDate* self);
static gboolean saved_search_dialog_search_row_date_real_is_complete (SavedSearchDialogSearchRow* base);
static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialogSearchRowDate* self, GtkCalendar* cal);
-static Block9Data* block9_data_ref (Block9Data* _data9_);
-static void block9_data_unref (void * _userdata_);
+static Block10Data* block10_data_ref (Block10Data* _data10_);
+static void block10_data_unref (void * _userdata_);
#define RESOURCES_CANCEL_LABEL _ ("_Cancel")
#define RESOURCES_OK_LABEL _ ("_OK")
-static void __lambda12_ (SavedSearchDialogSearchRowDate* self);
-static void ___lambda12__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self);
-static void __lambda13_ (Block9Data* _data9_);
-static void ___lambda13__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self);
+static void __lambda13_ (SavedSearchDialogSearchRowDate* self);
+static void ___lambda13__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self);
+static void __lambda14_ (Block10Data* _data10_);
+static void ___lambda14__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self);
static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow* obj);
static void saved_search_dialog_finalize (SavedSearchDialog* obj);
@@ -5838,71 +5838,71 @@ static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSea
}
-static Block9Data* block9_data_ref (Block9Data* _data9_) {
+static Block10Data* block10_data_ref (Block10Data* _data10_) {
#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- g_atomic_int_inc (&_data9_->_ref_count_);
+ g_atomic_int_inc (&_data10_->_ref_count_);
#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- return _data9_;
+ return _data10_;
#line 5847 "SavedSearchDialog.c"
}
-static void block9_data_unref (void * _userdata_) {
- Block9Data* _data9_;
- _data9_ = (Block9Data*) _userdata_;
+static void block10_data_unref (void * _userdata_) {
+ Block10Data* _data10_;
+ _data10_ = (Block10Data*) _userdata_;
#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) {
+ if (g_atomic_int_dec_and_test (&_data10_->_ref_count_)) {
#line 5856 "SavedSearchDialog.c"
SavedSearchDialogSearchRowDate* self;
#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- self = _data9_->self;
+ self = _data10_->self;
#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- _g_object_unref0 (_data9_->d);
+ _g_object_unref0 (_data10_->d);
#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
_saved_search_dialog_search_row_unref0 (self);
#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- g_slice_free (Block9Data, _data9_);
+ g_slice_free (Block10Data, _data10_);
#line 5866 "SavedSearchDialog.c"
}
}
-static void __lambda12_ (SavedSearchDialogSearchRowDate* self) {
+static void __lambda13_ (SavedSearchDialogSearchRowDate* self) {
#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
saved_search_dialog_search_row_date_update_date_labels (self);
#line 5874 "SavedSearchDialog.c"
}
-static void ___lambda12__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) {
+static void ___lambda13__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) {
#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- __lambda12_ ((SavedSearchDialogSearchRowDate*) self);
+ __lambda13_ ((SavedSearchDialogSearchRowDate*) self);
#line 5881 "SavedSearchDialog.c"
}
-static void __lambda13_ (Block9Data* _data9_) {
+static void __lambda14_ (Block10Data* _data10_) {
SavedSearchDialogSearchRowDate* self;
GtkDialog* _tmp0_ = NULL;
#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- self = _data9_->self;
+ self = _data10_->self;
#line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- _tmp0_ = _data9_->d;
+ _tmp0_ = _data10_->d;
#line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
gtk_dialog_response (_tmp0_, (gint) GTK_RESPONSE_ACCEPT);
#line 5894 "SavedSearchDialog.c"
}
-static void ___lambda13__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) {
+static void ___lambda14__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) {
#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- __lambda13_ (self);
+ __lambda14_ (self);
#line 5901 "SavedSearchDialog.c"
}
static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialogSearchRowDate* self, GtkCalendar* cal) {
- Block9Data* _data9_;
+ Block10Data* _data10_;
gint orig_day = 0;
GtkCalendar* _tmp0_ = NULL;
gint _tmp1_ = 0;
@@ -5943,11 +5943,11 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo
#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
g_return_if_fail (GTK_IS_CALENDAR (cal));
#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- _data9_ = g_slice_new0 (Block9Data);
+ _data10_ = g_slice_new0 (Block10Data);
#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- _data9_->_ref_count_ = 1;
+ _data10_->_ref_count_ = 1;
#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- _data9_->self = saved_search_dialog_search_row_ref (self);
+ _data10_->self = saved_search_dialog_search_row_ref (self);
#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
_tmp0_ = cal;
#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5977,21 +5977,21 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo
#line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
g_object_ref_sink (_tmp9_);
#line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- _data9_->d = _tmp9_;
+ _data10_->d = _tmp9_;
#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- _tmp10_ = _data9_->d;
+ _tmp10_ = _data10_->d;
#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow), TRUE);
#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- _tmp11_ = _data9_->d;
+ _tmp11_ = _data10_->d;
#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow), FALSE);
#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- _tmp12_ = _data9_->d;
+ _tmp12_ = _data10_->d;
#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
gtk_window_set_decorated (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow), FALSE);
#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- _tmp13_ = _data9_->d;
+ _tmp13_ = _data10_->d;
#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
_tmp14_ = (GtkBox*) gtk_dialog_get_content_area (_tmp13_);
#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -6001,21 +6001,21 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo
#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
_tmp16_ = cal;
#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- _tmp17_ = g_signal_connect (_tmp16_, "day-selected", (GCallback) ___lambda12__gtk_calendar_day_selected, self);
+ _tmp17_ = g_signal_connect (_tmp16_, "day-selected", (GCallback) ___lambda13__gtk_calendar_day_selected, self);
#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
id_1 = _tmp17_;
#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
_tmp18_ = cal;
#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- _tmp19_ = g_signal_connect_data (_tmp18_, "day-selected-double-click", (GCallback) ___lambda13__gtk_calendar_day_selected_double_click, block9_data_ref (_data9_), (GClosureNotify) block9_data_unref, 0);
+ _tmp19_ = g_signal_connect_data (_tmp18_, "day-selected-double-click", (GCallback) ___lambda14__gtk_calendar_day_selected_double_click, block10_data_ref (_data10_), (GClosureNotify) block10_data_unref, 0);
#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
id_2 = _tmp19_;
#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- _tmp20_ = _data9_->d;
+ _tmp20_ = _data10_->d;
#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget));
#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- _tmp21_ = _data9_->d;
+ _tmp21_ = _data10_->d;
#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
_tmp22_ = gtk_dialog_run (_tmp21_);
#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -6064,15 +6064,15 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo
#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, G_TYPE_OBJECT, GObject), _tmp33_);
#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- _tmp34_ = _data9_->d;
+ _tmp34_ = _data10_->d;
#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
#line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
saved_search_dialog_search_row_date_update_date_labels (self);
#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- block9_data_unref (_data9_);
+ block10_data_unref (_data10_);
#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
- _data9_ = NULL;
+ _data10_ = NULL;
#line 6077 "SavedSearchDialog.c"
}
diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c
index 2667236..86c96d0 100644
--- a/src/searches/SearchBoolean.c
+++ b/src/searches/SearchBoolean.c
@@ -742,10 +742,10 @@ enum {
};
SearchConditionSearchType* search_condition_search_type_as_array (int* result_length1);
void search_condition_search_type_sort_array (SearchConditionSearchType** array, int* array_length1);
-static gint __lambda11_ (void* a, void* b);
+static gint __lambda12_ (void* a, void* b);
gint utf8_cs_compare (void* a, void* b);
gchar* search_condition_search_type_display_text (SearchConditionSearchType self);
-static gint ___lambda11____compar_fn_t (void* key1, void* key2);
+static gint ___lambda12____compar_fn_t (void* key1, void* key2);
gchar* search_condition_search_type_to_string (SearchConditionSearchType self);
SearchConditionSearchType search_condition_search_type_from_string (const gchar* str);
gboolean search_condition_predicate (SearchCondition* self, MediaSource* source);
@@ -1156,7 +1156,7 @@ SearchConditionSearchType* search_condition_search_type_as_array (int* result_le
}
-static gint __lambda11_ (void* a, void* b) {
+static gint __lambda12_ (void* a, void* b) {
gint result = 0;
void* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
@@ -1181,9 +1181,9 @@ static gint __lambda11_ (void* a, void* b) {
}
-static gint ___lambda11____compar_fn_t (void* key1, void* key2) {
+static gint ___lambda12____compar_fn_t (void* key1, void* key2) {
gint result;
- result = __lambda11_ (key1, key2);
+ result = __lambda12_ (key1, key2);
#line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
return result;
#line 1190 "SearchBoolean.c"
@@ -1204,7 +1204,7 @@ void search_condition_search_type_sort_array (SearchConditionSearchType** array,
#line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
_tmp1__length1 = *array_length1;
#line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
- qsort (_tmp0_, (gsize) _tmp1__length1, (gsize) sizeof (SearchConditionSearchType), ___lambda11____compar_fn_t);
+ qsort (_tmp0_, (gsize) _tmp1__length1, (gsize) sizeof (SearchConditionSearchType), ___lambda12____compar_fn_t);
#line 1209 "SearchBoolean.c"
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 10:56:11 +0000