summaryrefslogtreecommitdiff
path: root/src/MediaMonitor.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-04-14 18:53:12 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-04-14 18:53:12 +0200
commitdfdb61e578cccb4b7ec2e9ccfa16a66ec481fab5 (patch)
treedee893916166ac1c8b479b74e7f341429945260e /src/MediaMonitor.c
parenta5ea701acc282ade4ccb9b08a8613a8d66ca82a5 (diff)
parent9e7cd144725a270e0460b21747619f447ca87684 (diff)
Merge tag 'upstream/0.26.1'
Upstream version 0.26.1
Diffstat (limited to 'src/MediaMonitor.c')
-rw-r--r--src/MediaMonitor.c459
1 files changed, 234 insertions, 225 deletions
diff --git a/src/MediaMonitor.c b/src/MediaMonitor.c
index f723c0f..6bf6a2d 100644
--- a/src/MediaMonitor.c
+++ b/src/MediaMonitor.c
@@ -1,4 +1,4 @@
-/* MediaMonitor.c generated by valac 0.34.4, the Vala compiler
+/* MediaMonitor.c generated by valac 0.34.7, the Vala compiler
* generated from MediaMonitor.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1031,25 +1031,25 @@ static void monitorable_updates_class_init (MonitorableUpdatesClass * klass) {
#line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
g_type_class_add_private (klass, sizeof (MonitorableUpdatesPrivate));
#line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MonitorableUpdatesClass *) klass)->is_in_alteration = monitorable_updates_real_is_in_alteration;
+ ((MonitorableUpdatesClass *) klass)->is_in_alteration = (gboolean (*)(MonitorableUpdates*)) monitorable_updates_real_is_in_alteration;
#line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MonitorableUpdatesClass *) klass)->set_master_file = monitorable_updates_real_set_master_file;
+ ((MonitorableUpdatesClass *) klass)->set_master_file = (void (*)(MonitorableUpdates*, GFile*)) monitorable_updates_real_set_master_file;
#line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MonitorableUpdatesClass *) klass)->set_master_file_info_altered = monitorable_updates_real_set_master_file_info_altered;
+ ((MonitorableUpdatesClass *) klass)->set_master_file_info_altered = (void (*)(MonitorableUpdates*, gboolean)) monitorable_updates_real_set_master_file_info_altered;
#line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MonitorableUpdatesClass *) klass)->set_master_file_info = monitorable_updates_real_set_master_file_info;
+ ((MonitorableUpdatesClass *) klass)->set_master_file_info = (void (*)(MonitorableUpdates*, GFileInfo*)) monitorable_updates_real_set_master_file_info;
#line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MonitorableUpdatesClass *) klass)->set_master_in_alteration = monitorable_updates_real_set_master_in_alteration;
+ ((MonitorableUpdatesClass *) klass)->set_master_in_alteration = (void (*)(MonitorableUpdates*, gboolean)) monitorable_updates_real_set_master_in_alteration;
#line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MonitorableUpdatesClass *) klass)->set_master_alterations_complete = monitorable_updates_real_set_master_alterations_complete;
+ ((MonitorableUpdatesClass *) klass)->set_master_alterations_complete = (void (*)(MonitorableUpdates*, GFileInfo*)) monitorable_updates_real_set_master_alterations_complete;
#line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MonitorableUpdatesClass *) klass)->mark_offline = monitorable_updates_real_mark_offline;
+ ((MonitorableUpdatesClass *) klass)->mark_offline = (void (*)(MonitorableUpdates*)) monitorable_updates_real_mark_offline;
#line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MonitorableUpdatesClass *) klass)->mark_online = monitorable_updates_real_mark_online;
+ ((MonitorableUpdatesClass *) klass)->mark_online = (void (*)(MonitorableUpdates*)) monitorable_updates_real_mark_online;
#line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MonitorableUpdatesClass *) klass)->reset_online_offline = monitorable_updates_real_reset_online_offline;
+ ((MonitorableUpdatesClass *) klass)->reset_online_offline = (void (*)(MonitorableUpdates*)) monitorable_updates_real_reset_online_offline;
#line 7 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MonitorableUpdatesClass *) klass)->is_all_updated = monitorable_updates_real_is_all_updated;
+ ((MonitorableUpdatesClass *) klass)->is_all_updated = (gboolean (*)(MonitorableUpdates*)) monitorable_updates_real_is_all_updated;
#line 1054 "MediaMonitor.c"
}
@@ -1457,11 +1457,12 @@ void media_monitor_notify_discovery_completing (MediaMonitor* self) {
static gboolean media_monitor_real_is_file_represented (MediaMonitor* self, GFile* file) {
+ gboolean _tmp0_ = FALSE;
#line 189 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
g_critical ("Type `%s' does not implement abstract method `media_monitor_is_file_represented'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 189 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- return FALSE;
-#line 1465 "MediaMonitor.c"
+ return _tmp0_;
+#line 1466 "MediaMonitor.c"
}
@@ -1470,16 +1471,17 @@ gboolean media_monitor_is_file_represented (MediaMonitor* self, GFile* file) {
g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
#line 189 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return MEDIA_MONITOR_GET_CLASS (self)->is_file_represented (self, file);
-#line 1474 "MediaMonitor.c"
+#line 1475 "MediaMonitor.c"
}
static gboolean media_monitor_real_notify_file_created (MediaMonitor* self, GFile* file, GFileInfo* info) {
+ gboolean _tmp0_ = FALSE;
#line 191 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_created'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 191 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- return FALSE;
-#line 1483 "MediaMonitor.c"
+ return _tmp0_;
+#line 1485 "MediaMonitor.c"
}
@@ -1488,16 +1490,17 @@ gboolean media_monitor_notify_file_created (MediaMonitor* self, GFile* file, GFi
g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
#line 191 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return MEDIA_MONITOR_GET_CLASS (self)->notify_file_created (self, file, info);
-#line 1492 "MediaMonitor.c"
+#line 1494 "MediaMonitor.c"
}
static gboolean media_monitor_real_notify_file_moved (MediaMonitor* self, GFile* old_file, GFile* new_file, GFileInfo* new_file_info) {
+ gboolean _tmp0_ = FALSE;
#line 193 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_moved'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 193 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- return FALSE;
-#line 1501 "MediaMonitor.c"
+ return _tmp0_;
+#line 1504 "MediaMonitor.c"
}
@@ -1506,16 +1509,17 @@ gboolean media_monitor_notify_file_moved (MediaMonitor* self, GFile* old_file, G
g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
#line 193 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return MEDIA_MONITOR_GET_CLASS (self)->notify_file_moved (self, old_file, new_file, new_file_info);
-#line 1510 "MediaMonitor.c"
+#line 1513 "MediaMonitor.c"
}
static gboolean media_monitor_real_notify_file_altered (MediaMonitor* self, GFile* file) {
+ gboolean _tmp0_ = FALSE;
#line 195 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_altered'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 195 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- return FALSE;
-#line 1519 "MediaMonitor.c"
+ return _tmp0_;
+#line 1523 "MediaMonitor.c"
}
@@ -1524,16 +1528,17 @@ gboolean media_monitor_notify_file_altered (MediaMonitor* self, GFile* file) {
g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
#line 195 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return MEDIA_MONITOR_GET_CLASS (self)->notify_file_altered (self, file);
-#line 1528 "MediaMonitor.c"
+#line 1532 "MediaMonitor.c"
}
static gboolean media_monitor_real_notify_file_attributes_altered (MediaMonitor* self, GFile* file) {
+ gboolean _tmp0_ = FALSE;
#line 197 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_attributes_altered'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 197 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- return FALSE;
-#line 1537 "MediaMonitor.c"
+ return _tmp0_;
+#line 1542 "MediaMonitor.c"
}
@@ -1542,16 +1547,17 @@ gboolean media_monitor_notify_file_attributes_altered (MediaMonitor* self, GFile
g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
#line 197 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return MEDIA_MONITOR_GET_CLASS (self)->notify_file_attributes_altered (self, file);
-#line 1546 "MediaMonitor.c"
+#line 1551 "MediaMonitor.c"
}
static gboolean media_monitor_real_notify_file_alteration_completed (MediaMonitor* self, GFile* file, GFileInfo* info) {
+ gboolean _tmp0_ = FALSE;
#line 199 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_alteration_completed'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 199 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- return FALSE;
-#line 1555 "MediaMonitor.c"
+ return _tmp0_;
+#line 1561 "MediaMonitor.c"
}
@@ -1560,16 +1566,17 @@ gboolean media_monitor_notify_file_alteration_completed (MediaMonitor* self, GFi
g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
#line 199 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return MEDIA_MONITOR_GET_CLASS (self)->notify_file_alteration_completed (self, file, info);
-#line 1564 "MediaMonitor.c"
+#line 1570 "MediaMonitor.c"
}
static gboolean media_monitor_real_notify_file_deleted (MediaMonitor* self, GFile* file) {
+ gboolean _tmp0_ = FALSE;
#line 201 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
g_critical ("Type `%s' does not implement abstract method `media_monitor_notify_file_deleted'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 201 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- return FALSE;
-#line 1573 "MediaMonitor.c"
+ return _tmp0_;
+#line 1580 "MediaMonitor.c"
}
@@ -1578,14 +1585,14 @@ gboolean media_monitor_notify_file_deleted (MediaMonitor* self, GFile* file) {
g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
#line 201 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return MEDIA_MONITOR_GET_CLASS (self)->notify_file_deleted (self, file);
-#line 1582 "MediaMonitor.c"
+#line 1589 "MediaMonitor.c"
}
void media_monitor_mdbg (const gchar* msg) {
#line 203 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
g_return_if_fail (msg != NULL);
-#line 1589 "MediaMonitor.c"
+#line 1596 "MediaMonitor.c"
}
@@ -1599,14 +1606,14 @@ gboolean media_monitor_has_pending_updates (MediaMonitor* self) {
#line 210 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp0_ = self->priv->pending_updates;
#line 210 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+ _tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 210 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp2_ = _tmp1_;
#line 210 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
result = _tmp2_ > 0;
#line 210 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return result;
-#line 1610 "MediaMonitor.c"
+#line 1617 "MediaMonitor.c"
}
@@ -1620,14 +1627,14 @@ GeeCollection* media_monitor_get_monitorables (MediaMonitor* self) {
#line 214 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp0_ = self->priv->pending_updates;
#line 214 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+ _tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 214 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp2_ = _tmp1_;
#line 214 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
#line 214 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return result;
-#line 1631 "MediaMonitor.c"
+#line 1638 "MediaMonitor.c"
}
@@ -1663,7 +1670,7 @@ MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, Monitorable
result = updates;
#line 222 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return result;
-#line 1667 "MediaMonitor.c"
+#line 1674 "MediaMonitor.c"
}
#line 224 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp4_ = monitorable;
@@ -1685,7 +1692,7 @@ MonitorableUpdates* media_monitor_fetch_updates (MediaMonitor* self, Monitorable
result = updates;
#line 227 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return result;
-#line 1689 "MediaMonitor.c"
+#line 1696 "MediaMonitor.c"
}
@@ -1708,7 +1715,7 @@ MonitorableUpdates* media_monitor_get_existing_updates (MediaMonitor* self, Moni
result = (MonitorableUpdates*) _tmp2_;
#line 231 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return result;
-#line 1712 "MediaMonitor.c"
+#line 1719 "MediaMonitor.c"
}
@@ -1725,7 +1732,7 @@ void media_monitor_remove_updates (MediaMonitor* self, Monitorable* monitorable)
_tmp1_ = monitorable;
#line 235 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL);
-#line 1729 "MediaMonitor.c"
+#line 1736 "MediaMonitor.c"
}
@@ -1750,7 +1757,7 @@ gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable)
_tmp3_ = updates;
#line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp3_ != NULL) {
-#line 1754 "MediaMonitor.c"
+#line 1761 "MediaMonitor.c"
MonitorableUpdates* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
#line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1759,7 +1766,7 @@ gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable)
_tmp5_ = monitorable_updates_is_set_online (_tmp4_);
#line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp2_ = _tmp5_;
-#line 1763 "MediaMonitor.c"
+#line 1770 "MediaMonitor.c"
} else {
Monitorable* _tmp6_ = NULL;
gboolean _tmp7_ = FALSE;
@@ -1769,7 +1776,7 @@ gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable)
_tmp7_ = monitorable_is_offline (_tmp6_);
#line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp2_ = !_tmp7_;
-#line 1773 "MediaMonitor.c"
+#line 1780 "MediaMonitor.c"
}
#line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
result = _tmp2_;
@@ -1777,7 +1784,7 @@ gboolean media_monitor_is_online (MediaMonitor* self, Monitorable* monitorable)
_monitorable_updates_unref0 (updates);
#line 241 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return result;
-#line 1781 "MediaMonitor.c"
+#line 1788 "MediaMonitor.c"
}
@@ -1802,7 +1809,7 @@ gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable)
_tmp3_ = updates;
#line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp3_ != NULL) {
-#line 1806 "MediaMonitor.c"
+#line 1813 "MediaMonitor.c"
MonitorableUpdates* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
#line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1811,7 +1818,7 @@ gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable)
_tmp5_ = monitorable_updates_is_set_offline (_tmp4_);
#line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp2_ = _tmp5_;
-#line 1815 "MediaMonitor.c"
+#line 1822 "MediaMonitor.c"
} else {
Monitorable* _tmp6_ = NULL;
gboolean _tmp7_ = FALSE;
@@ -1821,7 +1828,7 @@ gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable)
_tmp7_ = monitorable_is_offline (_tmp6_);
#line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp2_ = _tmp7_;
-#line 1825 "MediaMonitor.c"
+#line 1832 "MediaMonitor.c"
}
#line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
result = _tmp2_;
@@ -1829,7 +1836,7 @@ gboolean media_monitor_is_offline (MediaMonitor* self, Monitorable* monitorable)
_monitorable_updates_unref0 (updates);
#line 247 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return result;
-#line 1833 "MediaMonitor.c"
+#line 1840 "MediaMonitor.c"
}
@@ -1855,7 +1862,7 @@ GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorab
_tmp4_ = updates;
#line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp4_ != NULL) {
-#line 1859 "MediaMonitor.c"
+#line 1866 "MediaMonitor.c"
MonitorableUpdates* _tmp5_ = NULL;
GFile* _tmp6_ = NULL;
GFile* _tmp7_ = NULL;
@@ -1869,15 +1876,15 @@ GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorab
_tmp3_ = _tmp7_ != NULL;
#line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_g_object_unref0 (_tmp7_);
-#line 1873 "MediaMonitor.c"
+#line 1880 "MediaMonitor.c"
} else {
#line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp3_ = FALSE;
-#line 1877 "MediaMonitor.c"
+#line 1884 "MediaMonitor.c"
}
#line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp3_) {
-#line 1881 "MediaMonitor.c"
+#line 1888 "MediaMonitor.c"
MonitorableUpdates* _tmp8_ = NULL;
GFile* _tmp9_ = NULL;
#line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -1888,7 +1895,7 @@ GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorab
_g_object_unref0 (_tmp2_);
#line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp2_ = _tmp9_;
-#line 1892 "MediaMonitor.c"
+#line 1899 "MediaMonitor.c"
} else {
Monitorable* _tmp10_ = NULL;
GFile* _tmp11_ = NULL;
@@ -1900,7 +1907,7 @@ GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorab
_g_object_unref0 (_tmp2_);
#line 254 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp2_ = _tmp11_;
-#line 1904 "MediaMonitor.c"
+#line 1911 "MediaMonitor.c"
}
#line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
result = _tmp2_;
@@ -1908,7 +1915,7 @@ GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorab
_monitorable_updates_unref0 (updates);
#line 253 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return result;
-#line 1912 "MediaMonitor.c"
+#line 1919 "MediaMonitor.c"
}
@@ -1935,7 +1942,7 @@ void media_monitor_update_master_file (MediaMonitor* self, Monitorable* monitora
monitorable_updates_set_master_file (_tmp2_, _tmp3_);
#line 258 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_monitorable_updates_unref0 (_tmp2_);
-#line 1939 "MediaMonitor.c"
+#line 1946 "MediaMonitor.c"
}
@@ -1957,7 +1964,7 @@ void media_monitor_update_master_file_info_altered (MediaMonitor* self, Monitora
monitorable_updates_set_master_file_info_altered (_tmp2_, TRUE);
#line 262 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_monitorable_updates_unref0 (_tmp2_);
-#line 1961 "MediaMonitor.c"
+#line 1968 "MediaMonitor.c"
}
@@ -1982,7 +1989,7 @@ void media_monitor_update_master_file_in_alteration (MediaMonitor* self, Monitor
monitorable_updates_set_master_in_alteration (_tmp2_, _tmp3_);
#line 266 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_monitorable_updates_unref0 (_tmp2_);
-#line 1986 "MediaMonitor.c"
+#line 1993 "MediaMonitor.c"
}
@@ -2009,7 +2016,7 @@ void media_monitor_update_master_file_alterations_completed (MediaMonitor* self,
monitorable_updates_set_master_alterations_complete (_tmp2_, _tmp3_);
#line 270 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_monitorable_updates_unref0 (_tmp2_);
-#line 2013 "MediaMonitor.c"
+#line 2020 "MediaMonitor.c"
}
@@ -2031,7 +2038,7 @@ void media_monitor_update_online (MediaMonitor* self, Monitorable* monitorable)
monitorable_updates_mark_online (_tmp2_);
#line 274 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_monitorable_updates_unref0 (_tmp2_);
-#line 2035 "MediaMonitor.c"
+#line 2042 "MediaMonitor.c"
}
@@ -2053,7 +2060,7 @@ void media_monitor_update_offline (MediaMonitor* self, Monitorable* monitorable)
monitorable_updates_mark_offline (_tmp2_);
#line 278 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_monitorable_updates_unref0 (_tmp2_);
-#line 2057 "MediaMonitor.c"
+#line 2064 "MediaMonitor.c"
}
@@ -2079,7 +2086,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
to_offline = NULL;
#line 290 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
to_online = NULL;
-#line 2083 "MediaMonitor.c"
+#line 2090 "MediaMonitor.c"
{
GeeIterator* _updates_it = NULL;
GeeCollection* _tmp0_ = NULL;
@@ -2092,7 +2099,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
_updates_it = _tmp1_;
#line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
while (TRUE) {
-#line 2096 "MediaMonitor.c"
+#line 2103 "MediaMonitor.c"
GeeIterator* _tmp2_ = NULL;
gboolean _tmp3_ = FALSE;
MonitorableUpdates* updates = NULL;
@@ -2119,7 +2126,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
if (!_tmp3_) {
#line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
break;
-#line 2123 "MediaMonitor.c"
+#line 2130 "MediaMonitor.c"
}
#line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp4_ = _updates_it;
@@ -2135,7 +2142,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
_monitorable_updates_unref0 (updates);
#line 294 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
break;
-#line 2139 "MediaMonitor.c"
+#line 2146 "MediaMonitor.c"
}
#line 296 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp7_ = updates;
@@ -2149,7 +2156,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
_g_object_unref0 (_tmp9_);
#line 296 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp10_) {
-#line 2153 "MediaMonitor.c"
+#line 2160 "MediaMonitor.c"
GeeMap* _tmp11_ = NULL;
GeeMap* _tmp13_ = NULL;
MonitorableUpdates* _tmp14_ = NULL;
@@ -2163,15 +2170,15 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
_tmp11_ = set_master_file;
#line 297 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp11_ == NULL) {
-#line 2167 "MediaMonitor.c"
+#line 2174 "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_file_get_type (), (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, (GDestroyNotify) g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) 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"
set_master_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_MAP, GeeMap);
-#line 2175 "MediaMonitor.c"
+#line 2182 "MediaMonitor.c"
}
#line 300 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp13_ = set_master_file;
@@ -2197,7 +2204,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
_tmp20_ = *op_count;
#line 302 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
*op_count = _tmp20_ + 1;
-#line 2201 "MediaMonitor.c"
+#line 2208 "MediaMonitor.c"
}
#line 305 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp21_ = updates;
@@ -2211,7 +2218,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
_g_object_unref0 (_tmp23_);
#line 305 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp24_) {
-#line 2215 "MediaMonitor.c"
+#line 2222 "MediaMonitor.c"
GeeMap* _tmp25_ = NULL;
GeeMap* _tmp27_ = NULL;
MonitorableUpdates* _tmp28_ = NULL;
@@ -2225,15 +2232,15 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
_tmp25_ = set_master_file_info;
#line 306 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp25_ == NULL) {
-#line 2229 "MediaMonitor.c"
+#line 2236 "MediaMonitor.c"
GeeHashMap* _tmp26_ = NULL;
#line 307 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp26_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp26_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, g_file_info_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 307 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_g_object_unref0 (set_master_file_info);
#line 307 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
set_master_file_info = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_MAP, GeeMap);
-#line 2237 "MediaMonitor.c"
+#line 2244 "MediaMonitor.c"
}
#line 309 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp27_ = set_master_file_info;
@@ -2259,7 +2266,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
_tmp34_ = *op_count;
#line 311 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
*op_count = _tmp34_ + 1;
-#line 2263 "MediaMonitor.c"
+#line 2270 "MediaMonitor.c"
}
#line 314 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp35_ = updates;
@@ -2267,7 +2274,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
_tmp36_ = monitorable_updates_is_set_offline (_tmp35_);
#line 314 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp36_) {
-#line 2271 "MediaMonitor.c"
+#line 2278 "MediaMonitor.c"
GeeArrayList* _tmp37_ = NULL;
GeeArrayList* _tmp39_ = NULL;
MonitorableUpdates* _tmp40_ = NULL;
@@ -2278,15 +2285,15 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
_tmp37_ = to_offline;
#line 315 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp37_ == NULL) {
-#line 2282 "MediaMonitor.c"
+#line 2289 "MediaMonitor.c"
GeeArrayList* _tmp38_ = NULL;
#line 316 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp38_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+ _tmp38_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 316 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_g_object_unref0 (to_offline);
#line 316 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
to_offline = _tmp38_;
-#line 2290 "MediaMonitor.c"
+#line 2297 "MediaMonitor.c"
}
#line 318 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp39_ = to_offline;
@@ -2304,7 +2311,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
_tmp43_ = *op_count;
#line 320 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
*op_count = _tmp43_ + 1;
-#line 2308 "MediaMonitor.c"
+#line 2315 "MediaMonitor.c"
}
#line 323 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp44_ = updates;
@@ -2312,7 +2319,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
_tmp45_ = monitorable_updates_is_set_online (_tmp44_);
#line 323 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp45_) {
-#line 2316 "MediaMonitor.c"
+#line 2323 "MediaMonitor.c"
GeeArrayList* _tmp46_ = NULL;
GeeArrayList* _tmp48_ = NULL;
MonitorableUpdates* _tmp49_ = NULL;
@@ -2323,15 +2330,15 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
_tmp46_ = to_online;
#line 324 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp46_ == NULL) {
-#line 2327 "MediaMonitor.c"
+#line 2334 "MediaMonitor.c"
GeeArrayList* _tmp47_ = NULL;
#line 325 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp47_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+ _tmp47_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 325 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_g_object_unref0 (to_online);
#line 325 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
to_online = _tmp47_;
-#line 2335 "MediaMonitor.c"
+#line 2342 "MediaMonitor.c"
}
#line 327 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp48_ = to_online;
@@ -2349,21 +2356,21 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
_tmp52_ = *op_count;
#line 329 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
*op_count = _tmp52_ + 1;
-#line 2353 "MediaMonitor.c"
+#line 2360 "MediaMonitor.c"
}
#line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_monitorable_updates_unref0 (updates);
-#line 2357 "MediaMonitor.c"
+#line 2364 "MediaMonitor.c"
}
#line 292 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_g_object_unref0 (_updates_it);
-#line 2361 "MediaMonitor.c"
+#line 2368 "MediaMonitor.c"
}
#line 333 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp53_ = set_master_file;
#line 333 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp53_ != NULL) {
-#line 2367 "MediaMonitor.c"
+#line 2374 "MediaMonitor.c"
GeeMap* _tmp54_ = NULL;
gint _tmp55_ = 0;
gint _tmp56_ = 0;
@@ -2413,14 +2420,14 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
_g_object_unref0 (set_master_file);
#line 336 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return;
-#line 2417 "MediaMonitor.c"
+#line 2424 "MediaMonitor.c"
}
}
#line 339 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp63_ = set_master_file_info;
#line 339 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp63_ != NULL) {
-#line 2424 "MediaMonitor.c"
+#line 2431 "MediaMonitor.c"
GeeMap* _tmp64_ = NULL;
gint _tmp65_ = 0;
gint _tmp66_ = 0;
@@ -2470,7 +2477,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
_g_object_unref0 (set_master_file);
#line 343 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return;
-#line 2474 "MediaMonitor.c"
+#line 2481 "MediaMonitor.c"
}
}
#line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2479,18 +2486,18 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
if (_tmp74_ != NULL) {
#line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp73_ = TRUE;
-#line 2483 "MediaMonitor.c"
+#line 2490 "MediaMonitor.c"
} else {
GeeArrayList* _tmp75_ = NULL;
#line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp75_ = to_online;
#line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp73_ = _tmp75_ != NULL;
-#line 2490 "MediaMonitor.c"
+#line 2497 "MediaMonitor.c"
}
#line 346 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp73_) {
-#line 2494 "MediaMonitor.c"
+#line 2501 "MediaMonitor.c"
gint _tmp76_ = 0;
GeeArrayList* _tmp77_ = NULL;
gint _tmp81_ = 0;
@@ -2506,45 +2513,45 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
_tmp77_ = to_online;
#line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp77_ != NULL) {
-#line 2510 "MediaMonitor.c"
+#line 2517 "MediaMonitor.c"
GeeArrayList* _tmp78_ = NULL;
gint _tmp79_ = 0;
gint _tmp80_ = 0;
#line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp78_ = to_online;
#line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp79_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp79_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp80_ = _tmp79_;
#line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp76_ = _tmp80_;
-#line 2522 "MediaMonitor.c"
+#line 2529 "MediaMonitor.c"
} else {
#line 348 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp76_ = 0;
-#line 2526 "MediaMonitor.c"
+#line 2533 "MediaMonitor.c"
}
#line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp82_ = to_offline;
#line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp82_ != NULL) {
-#line 2532 "MediaMonitor.c"
+#line 2539 "MediaMonitor.c"
GeeArrayList* _tmp83_ = NULL;
gint _tmp84_ = 0;
gint _tmp85_ = 0;
#line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp83_ = to_offline;
#line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp84_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp84_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp85_ = _tmp84_;
#line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp81_ = _tmp85_;
-#line 2544 "MediaMonitor.c"
+#line 2551 "MediaMonitor.c"
} else {
#line 349 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp81_ = 0;
-#line 2548 "MediaMonitor.c"
+#line 2555 "MediaMonitor.c"
}
#line 347 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp86_ = media_monitor_to_string (self);
@@ -2582,7 +2589,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
_g_object_unref0 (set_master_file);
#line 352 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return;
-#line 2586 "MediaMonitor.c"
+#line 2593 "MediaMonitor.c"
}
}
#line 285 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2593,7 +2600,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
_g_object_unref0 (set_master_file_info);
#line 285 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_g_object_unref0 (set_master_file);
-#line 2597 "MediaMonitor.c"
+#line 2604 "MediaMonitor.c"
}
@@ -2602,14 +2609,14 @@ void media_monitor_process_updates (MediaMonitor* self, GeeCollection* all_updat
g_return_if_fail (IS_MEDIA_MONITOR (self));
#line 285 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
MEDIA_MONITOR_GET_CLASS (self)->process_updates (self, all_updates, controller, op_count, error);
-#line 2606 "MediaMonitor.c"
+#line 2613 "MediaMonitor.c"
}
static gpointer _transaction_controller_ref0 (gpointer self) {
#line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return self ? transaction_controller_ref (self) : NULL;
-#line 2613 "MediaMonitor.c"
+#line 2620 "MediaMonitor.c"
}
@@ -2626,12 +2633,12 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
GeeArrayList* to_remove = NULL;
gint op_count = 0;
GeeArrayList* _tmp29_ = NULL;
- GeeArrayList* _tmp47_ = NULL;
+ GeeArrayList* _tmp48_ = NULL;
gdouble elapsed = 0.0;
- GTimer* _tmp60_ = NULL;
- gdouble _tmp61_ = 0.0;
- gboolean _tmp62_ = FALSE;
- gdouble _tmp63_ = 0.0;
+ GTimer* _tmp61_ = NULL;
+ gdouble _tmp62_ = 0.0;
+ gboolean _tmp63_ = FALSE;
+ gdouble _tmp64_ = 0.0;
GError * _inner_error_ = NULL;
#line 356 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
g_return_val_if_fail (IS_MEDIA_MONITOR (self), FALSE);
@@ -2645,12 +2652,12 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
result = FALSE;
#line 358 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return result;
-#line 2649 "MediaMonitor.c"
+#line 2656 "MediaMonitor.c"
}
#line 360 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp2_ = self->priv->pending_updates;
#line 360 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp3_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MAP, GeeMap));
+ _tmp3_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 360 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp4_ = _tmp3_;
#line 360 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2659,7 +2666,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
result = TRUE;
#line 361 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return result;
-#line 2663 "MediaMonitor.c"
+#line 2670 "MediaMonitor.c"
}
#line 363 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp5_ = g_timer_new ();
@@ -2669,7 +2676,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
to_process = NULL;
#line 369 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
to_remove = NULL;
-#line 2673 "MediaMonitor.c"
+#line 2680 "MediaMonitor.c"
{
GeeIterator* _updates_it = NULL;
GeeHashMap* _tmp6_ = NULL;
@@ -2681,7 +2688,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
#line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp6_ = self->priv->pending_updates;
#line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp7_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_MAP, GeeMap));
+ _tmp7_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
#line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp8_ = _tmp7_;
#line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2696,7 +2703,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
_updates_it = _tmp11_;
#line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
while (TRUE) {
-#line 2700 "MediaMonitor.c"
+#line 2707 "MediaMonitor.c"
GeeIterator* _tmp12_ = NULL;
gboolean _tmp13_ = FALSE;
MonitorableUpdates* updates = NULL;
@@ -2717,7 +2724,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
if (!_tmp13_) {
#line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
break;
-#line 2721 "MediaMonitor.c"
+#line 2728 "MediaMonitor.c"
}
#line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp14_ = _updates_it;
@@ -2735,7 +2742,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
_monitorable_updates_unref0 (updates);
#line 372 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
continue;
-#line 2739 "MediaMonitor.c"
+#line 2746 "MediaMonitor.c"
}
#line 374 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp18_ = updates;
@@ -2743,7 +2750,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
_tmp19_ = monitorable_updates_is_all_updated (_tmp18_);
#line 374 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp19_) {
-#line 2747 "MediaMonitor.c"
+#line 2754 "MediaMonitor.c"
GeeArrayList* _tmp20_ = NULL;
GeeArrayList* _tmp22_ = NULL;
MonitorableUpdates* _tmp23_ = NULL;
@@ -2752,15 +2759,15 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
_tmp20_ = to_remove;
#line 375 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp20_ == NULL) {
-#line 2756 "MediaMonitor.c"
+#line 2763 "MediaMonitor.c"
GeeArrayList* _tmp21_ = NULL;
#line 376 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp21_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+ _tmp21_ = gee_array_list_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 376 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_g_object_unref0 (to_remove);
#line 376 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
to_remove = _tmp21_;
-#line 2764 "MediaMonitor.c"
+#line 2771 "MediaMonitor.c"
}
#line 378 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp22_ = to_remove;
@@ -2774,21 +2781,21 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
_monitorable_updates_unref0 (updates);
#line 379 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
continue;
-#line 2778 "MediaMonitor.c"
+#line 2785 "MediaMonitor.c"
}
#line 382 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp25_ = to_process;
#line 382 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp25_ == NULL) {
-#line 2784 "MediaMonitor.c"
+#line 2791 "MediaMonitor.c"
GeeArrayList* _tmp26_ = NULL;
#line 383 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp26_ = gee_array_list_new (TYPE_MONITORABLE_UPDATES, (GBoxedCopyFunc) monitorable_updates_ref, monitorable_updates_unref, NULL, NULL, NULL);
+ _tmp26_ = gee_array_list_new (TYPE_MONITORABLE_UPDATES, (GBoxedCopyFunc) monitorable_updates_ref, (GDestroyNotify) monitorable_updates_unref, NULL, NULL, NULL);
#line 383 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_g_object_unref0 (to_process);
#line 383 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
to_process = _tmp26_;
-#line 2792 "MediaMonitor.c"
+#line 2799 "MediaMonitor.c"
}
#line 385 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp27_ = to_process;
@@ -2798,11 +2805,11 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_);
#line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_monitorable_updates_unref0 (updates);
-#line 2802 "MediaMonitor.c"
+#line 2809 "MediaMonitor.c"
}
#line 370 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_g_object_unref0 (_updates_it);
-#line 2806 "MediaMonitor.c"
+#line 2813 "MediaMonitor.c"
}
#line 388 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
op_count = 0;
@@ -2810,7 +2817,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
_tmp29_ = to_process;
#line 389 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp29_ != NULL) {
-#line 2814 "MediaMonitor.c"
+#line 2821 "MediaMonitor.c"
TransactionController* controller = NULL;
MediaSourceCollection* _tmp30_ = NULL;
MediaSourceCollection* _tmp31_ = NULL;
@@ -2834,7 +2841,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
_data_collection_unref0 (_tmp31_);
#line 390 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
controller = _tmp35_;
-#line 2838 "MediaMonitor.c"
+#line 2845 "MediaMonitor.c"
{
TransactionController* _tmp36_ = NULL;
GeeArrayList* _tmp37_ = NULL;
@@ -2852,14 +2859,14 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
media_monitor_process_updates (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), _tmp38_, &op_count, &_inner_error_);
#line 394 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2856 "MediaMonitor.c"
+#line 2863 "MediaMonitor.c"
goto __catch583_g_error;
}
#line 395 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp39_ = controller;
#line 395 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
transaction_controller_commit (_tmp39_);
-#line 2863 "MediaMonitor.c"
+#line 2870 "MediaMonitor.c"
}
goto __finally583;
__catch583_g_error:
@@ -2874,13 +2881,13 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
_tmp40_ = err;
#line 397 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (_tmp40_->domain == DATABASE_ERROR) {
-#line 2878 "MediaMonitor.c"
+#line 2885 "MediaMonitor.c"
GError* _tmp41_ = NULL;
#line 398 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp41_ = err;
#line 398 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
app_window_database_error ((GError*) _tmp41_);
-#line 2884 "MediaMonitor.c"
+#line 2891 "MediaMonitor.c"
} else {
const gchar* _tmp42_ = NULL;
GError* _tmp43_ = NULL;
@@ -2901,15 +2908,17 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
app_window_panic (_tmp46_);
#line 400 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_g_free0 (_tmp46_);
-#line 2905 "MediaMonitor.c"
+#line 2912 "MediaMonitor.c"
}
#line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_g_error_free0 (err);
-#line 2909 "MediaMonitor.c"
+#line 2916 "MediaMonitor.c"
}
__finally583:
#line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2921 "MediaMonitor.c"
+ gboolean _tmp47_ = FALSE;
#line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_transaction_controller_unref0 (controller);
#line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2923,138 +2932,138 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
#line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
g_clear_error (&_inner_error_);
#line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- return FALSE;
-#line 2928 "MediaMonitor.c"
+ return _tmp47_;
+#line 2937 "MediaMonitor.c"
}
#line 389 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_transaction_controller_unref0 (controller);
-#line 2932 "MediaMonitor.c"
+#line 2941 "MediaMonitor.c"
}
#line 404 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp47_ = to_remove;
+ _tmp48_ = to_remove;
#line 404 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- if (_tmp47_ != NULL) {
-#line 2938 "MediaMonitor.c"
+ if (_tmp48_ != NULL) {
+#line 2947 "MediaMonitor.c"
{
GeeArrayList* _monitorable_list = NULL;
- GeeArrayList* _tmp48_ = NULL;
GeeArrayList* _tmp49_ = NULL;
- gint _monitorable_size = 0;
GeeArrayList* _tmp50_ = NULL;
- gint _tmp51_ = 0;
+ gint _monitorable_size = 0;
+ GeeArrayList* _tmp51_ = NULL;
gint _tmp52_ = 0;
+ gint _tmp53_ = 0;
gint _monitorable_index = 0;
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp48_ = to_remove;
+ _tmp49_ = to_remove;
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp49_ = _g_object_ref0 (_tmp48_);
+ _tmp50_ = _g_object_ref0 (_tmp49_);
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _monitorable_list = _tmp49_;
+ _monitorable_list = _tmp50_;
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp50_ = _monitorable_list;
+ _tmp51_ = _monitorable_list;
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp51_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp52_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp52_ = _tmp51_;
+ _tmp53_ = _tmp52_;
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _monitorable_size = _tmp52_;
+ _monitorable_size = _tmp53_;
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_monitorable_index = -1;
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
while (TRUE) {
-#line 2966 "MediaMonitor.c"
- gint _tmp53_ = 0;
+#line 2975 "MediaMonitor.c"
gint _tmp54_ = 0;
gint _tmp55_ = 0;
+ gint _tmp56_ = 0;
Monitorable* monitorable = NULL;
- GeeArrayList* _tmp56_ = NULL;
- gint _tmp57_ = 0;
- gpointer _tmp58_ = NULL;
- Monitorable* _tmp59_ = NULL;
+ GeeArrayList* _tmp57_ = NULL;
+ gint _tmp58_ = 0;
+ gpointer _tmp59_ = NULL;
+ Monitorable* _tmp60_ = NULL;
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp53_ = _monitorable_index;
+ _tmp54_ = _monitorable_index;
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _monitorable_index = _tmp53_ + 1;
+ _monitorable_index = _tmp54_ + 1;
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp54_ = _monitorable_index;
+ _tmp55_ = _monitorable_index;
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp55_ = _monitorable_size;
+ _tmp56_ = _monitorable_size;
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- if (!(_tmp54_ < _tmp55_)) {
+ if (!(_tmp55_ < _tmp56_)) {
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
break;
-#line 2987 "MediaMonitor.c"
+#line 2996 "MediaMonitor.c"
}
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp56_ = _monitorable_list;
+ _tmp57_ = _monitorable_list;
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp57_ = _monitorable_index;
+ _tmp58_ = _monitorable_index;
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp58_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp57_);
+ _tmp59_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp58_);
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- monitorable = (Monitorable*) _tmp58_;
+ monitorable = (Monitorable*) _tmp59_;
#line 406 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp59_ = monitorable;
+ _tmp60_ = monitorable;
#line 406 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- media_monitor_remove_updates (self, _tmp59_);
+ media_monitor_remove_updates (self, _tmp60_);
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_g_object_unref0 (monitorable);
-#line 3003 "MediaMonitor.c"
+#line 3012 "MediaMonitor.c"
}
#line 405 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_g_object_unref0 (_monitorable_list);
-#line 3007 "MediaMonitor.c"
+#line 3016 "MediaMonitor.c"
}
}
#line 409 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp60_ = timer;
+ _tmp61_ = timer;
#line 409 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp61_ = g_timer_elapsed (_tmp60_, NULL);
+ _tmp62_ = g_timer_elapsed (_tmp61_, NULL);
#line 409 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- elapsed = _tmp61_;
+ elapsed = _tmp62_;
#line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp63_ = elapsed;
+ _tmp64_ = elapsed;
#line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- if (_tmp63_ > 0.01) {
+ if (_tmp64_ > 0.01) {
#line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp62_ = TRUE;
-#line 3022 "MediaMonitor.c"
+ _tmp63_ = TRUE;
+#line 3031 "MediaMonitor.c"
} else {
- gint _tmp64_ = 0;
+ gint _tmp65_ = 0;
#line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp64_ = op_count;
+ _tmp65_ = op_count;
#line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp62_ = _tmp64_ > 0;
-#line 3029 "MediaMonitor.c"
+ _tmp63_ = _tmp65_ > 0;
+#line 3038 "MediaMonitor.c"
}
#line 410 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- if (_tmp62_) {
-#line 3033 "MediaMonitor.c"
- gchar* _tmp65_ = NULL;
+ if (_tmp63_) {
+#line 3042 "MediaMonitor.c"
gchar* _tmp66_ = NULL;
- gdouble _tmp67_ = 0.0;
- gint _tmp68_ = 0;
- gchar* _tmp69_ = NULL;
+ gchar* _tmp67_ = NULL;
+ gdouble _tmp68_ = 0.0;
+ gint _tmp69_ = 0;
gchar* _tmp70_ = NULL;
+ gchar* _tmp71_ = NULL;
#line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp65_ = media_monitor_to_string (self);
+ _tmp66_ = media_monitor_to_string (self);
#line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp66_ = _tmp65_;
+ _tmp67_ = _tmp66_;
#line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp67_ = elapsed;
+ _tmp68_ = elapsed;
#line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp68_ = op_count;
+ _tmp69_ = op_count;
#line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp69_ = g_strdup_printf ("Total pending queue time for %s: %lf (%d ops)", _tmp66_, _tmp67_, _tmp68_);
+ _tmp70_ = g_strdup_printf ("Total pending queue time for %s: %lf (%d ops)", _tmp67_, _tmp68_, _tmp69_);
#line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp70_ = _tmp69_;
+ _tmp71_ = _tmp70_;
#line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- media_monitor_mdbg (_tmp70_);
+ media_monitor_mdbg (_tmp71_);
#line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _g_free0 (_tmp70_);
+ _g_free0 (_tmp71_);
#line 411 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _g_free0 (_tmp66_);
-#line 3058 "MediaMonitor.c"
+ _g_free0 (_tmp67_);
+#line 3067 "MediaMonitor.c"
}
#line 415 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
result = TRUE;
@@ -3066,7 +3075,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
_g_timer_destroy0 (timer);
#line 415 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
return result;
-#line 3070 "MediaMonitor.c"
+#line 3079 "MediaMonitor.c"
}
@@ -3076,46 +3085,46 @@ static void media_monitor_class_init (MediaMonitorClass * klass) {
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
g_type_class_add_private (klass, sizeof (MediaMonitorPrivate));
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MediaMonitorClass *) klass)->get_media_source_collection = media_monitor_real_get_media_source_collection;
+ ((MediaMonitorClass *) klass)->get_media_source_collection = (MediaSourceCollection* (*)(MediaMonitor*)) media_monitor_real_get_media_source_collection;
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MediaMonitorClass *) klass)->close = media_monitor_real_close;
+ ((MediaMonitorClass *) klass)->close = (void (*)(MediaMonitor*)) media_monitor_real_close;
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MediaMonitorClass *) klass)->to_string = media_monitor_real_to_string;
+ ((MediaMonitorClass *) klass)->to_string = (gchar* (*)(MediaMonitor*)) media_monitor_real_to_string;
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MediaMonitorClass *) klass)->create_updates = media_monitor_real_create_updates;
+ ((MediaMonitorClass *) klass)->create_updates = (MonitorableUpdates* (*)(MediaMonitor*, Monitorable*)) media_monitor_real_create_updates;
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MediaMonitorClass *) klass)->on_media_source_destroyed = media_monitor_real_on_media_source_destroyed;
+ ((MediaMonitorClass *) klass)->on_media_source_destroyed = (void (*)(MediaMonitor*, DataSource*)) media_monitor_real_on_media_source_destroyed;
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MediaMonitorClass *) klass)->notify_discovery_started = media_monitor_real_notify_discovery_started;
+ ((MediaMonitorClass *) klass)->notify_discovery_started = (void (*)(MediaMonitor*)) media_monitor_real_notify_discovery_started;
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MediaMonitorClass *) klass)->notify_file_discovered = media_monitor_real_notify_file_discovered;
+ ((MediaMonitorClass *) klass)->notify_file_discovered = (MediaMonitorDiscoveredFile (*)(MediaMonitor*, GFile*, GFileInfo*, Monitorable**)) media_monitor_real_notify_file_discovered;
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MediaMonitorClass *) klass)->candidates_for_unknown_file = media_monitor_real_candidates_for_unknown_file;
+ ((MediaMonitorClass *) klass)->candidates_for_unknown_file = (GeeCollection* (*)(MediaMonitor*, GFile*, GFileInfo*, MediaMonitorDiscoveredFile*)) media_monitor_real_candidates_for_unknown_file;
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MediaMonitorClass *) klass)->get_auxilliary_backing_files = media_monitor_real_get_auxilliary_backing_files;
+ ((MediaMonitorClass *) klass)->get_auxilliary_backing_files = (GFile** (*)(MediaMonitor*, Monitorable*, int*)) media_monitor_real_get_auxilliary_backing_files;
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MediaMonitorClass *) klass)->update_backing_file_info = media_monitor_real_update_backing_file_info;
+ ((MediaMonitorClass *) klass)->update_backing_file_info = (void (*)(MediaMonitor*, Monitorable*, GFile*, GFileInfo*)) media_monitor_real_update_backing_file_info;
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MediaMonitorClass *) klass)->notify_discovery_completing = media_monitor_real_notify_discovery_completing;
+ ((MediaMonitorClass *) klass)->notify_discovery_completing = (void (*)(MediaMonitor*)) media_monitor_real_notify_discovery_completing;
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MediaMonitorClass *) klass)->is_file_represented = media_monitor_real_is_file_represented;
+ ((MediaMonitorClass *) klass)->is_file_represented = (gboolean (*)(MediaMonitor*, GFile*)) media_monitor_real_is_file_represented;
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MediaMonitorClass *) klass)->notify_file_created = media_monitor_real_notify_file_created;
+ ((MediaMonitorClass *) klass)->notify_file_created = (gboolean (*)(MediaMonitor*, GFile*, GFileInfo*)) media_monitor_real_notify_file_created;
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MediaMonitorClass *) klass)->notify_file_moved = media_monitor_real_notify_file_moved;
+ ((MediaMonitorClass *) klass)->notify_file_moved = (gboolean (*)(MediaMonitor*, GFile*, GFile*, GFileInfo*)) media_monitor_real_notify_file_moved;
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MediaMonitorClass *) klass)->notify_file_altered = media_monitor_real_notify_file_altered;
+ ((MediaMonitorClass *) klass)->notify_file_altered = (gboolean (*)(MediaMonitor*, GFile*)) media_monitor_real_notify_file_altered;
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MediaMonitorClass *) klass)->notify_file_attributes_altered = media_monitor_real_notify_file_attributes_altered;
+ ((MediaMonitorClass *) klass)->notify_file_attributes_altered = (gboolean (*)(MediaMonitor*, GFile*)) media_monitor_real_notify_file_attributes_altered;
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MediaMonitorClass *) klass)->notify_file_alteration_completed = media_monitor_real_notify_file_alteration_completed;
+ ((MediaMonitorClass *) klass)->notify_file_alteration_completed = (gboolean (*)(MediaMonitor*, GFile*, GFileInfo*)) media_monitor_real_notify_file_alteration_completed;
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MediaMonitorClass *) klass)->notify_file_deleted = media_monitor_real_notify_file_deleted;
+ ((MediaMonitorClass *) klass)->notify_file_deleted = (gboolean (*)(MediaMonitor*, GFile*)) media_monitor_real_notify_file_deleted;
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- ((MediaMonitorClass *) klass)->process_updates = media_monitor_real_process_updates;
+ ((MediaMonitorClass *) klass)->process_updates = (void (*)(MediaMonitor*, GeeCollection*, TransactionController*, gint*, GError**)) media_monitor_real_process_updates;
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
G_OBJECT_CLASS (klass)->finalize = media_monitor_finalize;
-#line 3119 "MediaMonitor.c"
+#line 3128 "MediaMonitor.c"
}
@@ -3124,12 +3133,12 @@ static void media_monitor_instance_init (MediaMonitor * self) {
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
self->priv = MEDIA_MONITOR_GET_PRIVATE (self);
#line 114 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- _tmp0_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_MONITORABLE_UPDATES, (GBoxedCopyFunc) monitorable_updates_ref, monitorable_updates_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp0_ = gee_hash_map_new (TYPE_MONITORABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_MONITORABLE_UPDATES, (GBoxedCopyFunc) monitorable_updates_ref, (GDestroyNotify) monitorable_updates_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 114 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
self->priv->pending_updates = _tmp0_;
#line 116 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
self->priv->pending_updates_timer_id = (guint) 0;
-#line 3133 "MediaMonitor.c"
+#line 3142 "MediaMonitor.c"
}
@@ -3161,7 +3170,7 @@ static void media_monitor_finalize (GObject* obj) {
_g_object_unref0 (self->priv->pending_updates);
#line 101 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
G_OBJECT_CLASS (media_monitor_parent_class)->finalize (obj);
-#line 3165 "MediaMonitor.c"
+#line 3174 "MediaMonitor.c"
}