summaryrefslogtreecommitdiff
path: root/src/MediaMonitor.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:19:04 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:19:04 +0100
commitf39ea21098340bd99c48669f152c9068046c2c99 (patch)
treed1166fce1a4a8c470dfaf364816f767678c4729e /src/MediaMonitor.c
parentbc48a4cff815ed156b603c92e684779c317417ba (diff)
parenta7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e (diff)
Merge tag 'upstream/0.25.3'
Upstream version 0.25.3
Diffstat (limited to 'src/MediaMonitor.c')
-rw-r--r--src/MediaMonitor.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/MediaMonitor.c b/src/MediaMonitor.c
index aa1cd67..f741331 100644
--- a/src/MediaMonitor.c
+++ b/src/MediaMonitor.c
@@ -1,4 +1,4 @@
-/* MediaMonitor.c generated by valac 0.32.1, the Vala compiler
+/* MediaMonitor.c generated by valac 0.34.4, the Vala compiler
* generated from MediaMonitor.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2166,7 +2166,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
#line 2167 "MediaMonitor.c"
GeeHashMap* _tmp12_ = NULL;
#line 298 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp12_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp12_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 298 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_g_object_unref0 (set_master_file);
#line 298 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2853,7 +2853,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
#line 394 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2856 "MediaMonitor.c"
- goto __catch579_g_error;
+ goto __catch581_g_error;
}
#line 395 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp39_ = controller;
@@ -2861,8 +2861,8 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
transaction_controller_commit (_tmp39_);
#line 2863 "MediaMonitor.c"
}
- goto __finally579;
- __catch579_g_error:
+ goto __finally581;
+ __catch581_g_error:
{
GError* err = NULL;
GError* _tmp40_ = NULL;
@@ -2907,7 +2907,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
_g_error_free0 (err);
#line 2909 "MediaMonitor.c"
}
- __finally579:
+ __finally581:
#line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"