diff options
Diffstat (limited to 'src/util/misc.c')
| -rw-r--r-- | src/util/misc.c | 2047 |
1 files changed, 1010 insertions, 1037 deletions
diff --git a/src/util/misc.c b/src/util/misc.c index beac274..cfc0b70 100644 --- a/src/util/misc.c +++ b/src/util/misc.c @@ -1,4 +1,4 @@ -/* misc.c generated by valac 0.36.6, the Vala compiler +/* misc.c generated by valac 0.40.4, the Vala compiler * generated from misc.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include <glib.h> #include <glib-object.h> #include <time.h> @@ -184,44 +185,67 @@ static gpointer one_shot_scheduler_parent_class = NULL; static gpointer op_timer_parent_class = NULL; guint int64_hash (gint64* n); -gboolean int64_equal (gint64* a, gint64* b); -gint int64_compare (gint64* a, gint64* b); -gint uint64_compare (guint64* a, guint64* b); -gboolean bool_value_equals (GValue* a, GValue* b); -gboolean int_value_equals (GValue* a, GValue* b); +gboolean int64_equal (gint64* a, + gint64* b); +gint int64_compare (gint64* a, + gint64* b); +gint uint64_compare (guint64* a, + guint64* b); +gboolean bool_value_equals (GValue* a, + GValue* b); +gboolean int_value_equals (GValue* a, + GValue* b); gulong timeval_to_ms (GTimeVal* time_val); gulong now_ms (void); gulong now_sec (void); time_t now_time_t (void); -gchar* md5_file (GFile* file, GError** error); -gboolean equal_sets (GeeSet* a, GeeSet* b); -GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded); +gchar* md5_file (GFile* file, + GError** error); +gboolean equal_sets (GeeSet* a, + GeeSet* b); +GeeSet* intersection_of_sets (GeeSet* a, + GeeSet* b, + GeeSet* excluded); 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; GType media_source_get_type (void) G_GNUC_CONST; GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; -guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1); +guchar* serialize_photo_ids (GeeCollection* photos, + int* result_length1); GType photo_id_get_type (void) G_GNUC_CONST; PhotoID* photo_id_dup (const PhotoID* self); void photo_id_free (PhotoID* self); -void photo_get_photo_id (Photo* self, PhotoID* result); -GeeList* unserialize_photo_ids (guchar* serialized, gint size); -void photo_id_init (PhotoID *self, gint64 id); -guchar* serialize_media_sources (GeeCollection* media, int* result_length1); +void photo_get_photo_id (Photo* self, + PhotoID* result); +GeeList* unserialize_photo_ids (guchar* serialized, + gint size); +void photo_id_init (PhotoID *self, + gint64 id); +guchar* serialize_media_sources (GeeCollection* media, + int* result_length1); gchar* data_source_get_source_id (DataSource* self); -GeeList* unserialize_media_sources (guchar* serialized, gint size); +GeeList* unserialize_media_sources (guchar* serialized, + gint size); gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); -MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* self, const gchar* source_id); -gchar* format_local_datespan (struct tm* from_date, struct tm* to_date); +MediaSource* media_collection_registry_fetch_media (MediaCollectionRegistry* self, + const gchar* source_id); +gchar* format_local_datespan (struct tm* from_date, + struct tm* to_date); gchar* resources_get_start_multiday_span_format_string (void); gchar* resources_get_end_multiday_span_format_string (void); gchar* resources_get_start_multimonth_span_format_string (void); @@ -231,104 +255,121 @@ gchar* string_strip_leading_zeroes (const gchar* str); gchar* format_local_date (struct tm* date); gpointer one_shot_scheduler_ref (gpointer instance); void one_shot_scheduler_unref (gpointer instance); -GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_one_shot_scheduler (GValue* value, gpointer v_object); -void value_take_one_shot_scheduler (GValue* value, gpointer v_object); +GParamSpec* param_spec_one_shot_scheduler (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_one_shot_scheduler (GValue* value, + gpointer v_object); +void value_take_one_shot_scheduler (GValue* value, + gpointer v_object); gpointer value_get_one_shot_scheduler (const GValue* value); GType one_shot_scheduler_get_type (void) G_GNUC_CONST; #define ONE_SHOT_SCHEDULER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ONE_SHOT_SCHEDULER, OneShotSchedulerPrivate)) -enum { - ONE_SHOT_SCHEDULER_DUMMY_PROPERTY -}; void one_shot_scheduler_cancel (OneShotScheduler* self); -OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target); -OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target); +OneShotScheduler* one_shot_scheduler_new (const gchar* name, + OneShotCallback callback, + void* callback_target); +OneShotScheduler* one_shot_scheduler_construct (GType object_type, + const gchar* name, + OneShotCallback callback, + void* callback_target); gboolean one_shot_scheduler_is_scheduled (OneShotScheduler* self); void one_shot_scheduler_at_idle (OneShotScheduler* self); -void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority); +void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, + gint priority); static gboolean one_shot_scheduler_callback_wrapper (OneShotScheduler* self); static gboolean _one_shot_scheduler_callback_wrapper_gsource_func (gpointer self); -void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule); -void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint priority, guint msec, gboolean reschedule); +void one_shot_scheduler_after_timeout (OneShotScheduler* self, + guint msec, + gboolean reschedule); +void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, + gint priority, + guint msec, + gboolean reschedule); static void one_shot_scheduler_finalize (OneShotScheduler * obj); gpointer op_timer_ref (gpointer instance); void op_timer_unref (gpointer instance); -GParamSpec* param_spec_op_timer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_op_timer (GValue* value, gpointer v_object); -void value_take_op_timer (GValue* value, gpointer v_object); +GParamSpec* param_spec_op_timer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_op_timer (GValue* value, + gpointer v_object); +void value_take_op_timer (GValue* value, + gpointer v_object); gpointer value_get_op_timer (const GValue* value); GType op_timer_get_type (void) G_GNUC_CONST; #define OP_TIMER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_OP_TIMER, OpTimerPrivate)) -enum { - OP_TIMER_DUMMY_PROPERTY -}; OpTimer* op_timer_new (const gchar* name); -OpTimer* op_timer_construct (GType object_type, const gchar* name); +OpTimer* op_timer_construct (GType object_type, + const gchar* name); void op_timer_start (OpTimer* self); void op_timer_stop (OpTimer* self); gchar* op_timer_to_string (OpTimer* self); static void op_timer_finalize (OpTimer * obj); -guint int64_hash (gint64* n) { +guint +int64_hash (gint64* n) +{ guint result = 0U; guint8* u8 = NULL; - gint64* _tmp0_; guint hash = 0U; #line 9 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = n; -#line 9 "/home/jens/Source/shotwell/src/util/misc.vala" - u8 = (guint8*) _tmp0_; + u8 = (guint8*) n; #line 10 "/home/jens/Source/shotwell/src/util/misc.vala" hash = (guint) 0; -#line 285 "misc.c" +#line 326 "misc.c" { gint ctr = 0; #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" ctr = 0; -#line 290 "misc.c" +#line 331 "misc.c" { - gboolean _tmp1_ = FALSE; + gboolean _tmp0_ = FALSE; #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = TRUE; + _tmp0_ = TRUE; #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" while (TRUE) { -#line 297 "misc.c" - gint _tmp3_; +#line 338 "misc.c" + gint _tmp2_; + guint _tmp3_; guint _tmp4_; - guint _tmp5_; - guint8* _tmp6_; + guint8* _tmp5_; #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" - if (!_tmp1_) { -#line 304 "misc.c" - gint _tmp2_; + if (!_tmp0_) { +#line 345 "misc.c" + gint _tmp1_; #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = ctr; + _tmp1_ = ctr; #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" - ctr = _tmp2_ + 1; -#line 310 "misc.c" + ctr = _tmp1_ + 1; +#line 351 "misc.c" } #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = FALSE; + _tmp0_ = FALSE; #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = ctr; + _tmp2_ = ctr; #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" - if (!(((gulong) _tmp3_) < (sizeof (gint64) / sizeof (guint8)))) { + if (!(((gulong) _tmp2_) < (sizeof (gint64) / sizeof (guint8)))) { #line 11 "/home/jens/Source/shotwell/src/util/misc.vala" break; -#line 320 "misc.c" +#line 361 "misc.c" } #line 12 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = hash; + _tmp3_ = hash; #line 12 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = hash; + _tmp4_ = hash; #line 12 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = u8; + _tmp5_ = u8; #line 12 "/home/jens/Source/shotwell/src/util/misc.vala" - u8 = _tmp6_ + 1; + u8 = _tmp5_ + 1; #line 12 "/home/jens/Source/shotwell/src/util/misc.vala" - hash = ((_tmp4_ << 4) ^ (_tmp5_ >> 28)) ^ (*_tmp6_); -#line 332 "misc.c" + hash = ((_tmp3_ << 4) ^ (_tmp4_ >> 28)) ^ (*_tmp5_); +#line 373 "misc.c" } } } @@ -336,128 +377,122 @@ guint int64_hash (gint64* n) { result = hash; #line 15 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 340 "misc.c" +#line 381 "misc.c" } -gboolean int64_equal (gint64* a, gint64* b) { +gboolean +int64_equal (gint64* a, + gint64* b) +{ gboolean result = FALSE; gint64* bia = NULL; - gint64* _tmp0_; gint64* bib = NULL; - gint64* _tmp1_; -#line 19 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = a; #line 19 "/home/jens/Source/shotwell/src/util/misc.vala" - bia = (gint64*) _tmp0_; + bia = (gint64*) a; #line 20 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = b; -#line 20 "/home/jens/Source/shotwell/src/util/misc.vala" - bib = (gint64*) _tmp1_; + bib = (gint64*) b; #line 22 "/home/jens/Source/shotwell/src/util/misc.vala" result = (*bia) == (*bib); #line 22 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 362 "misc.c" +#line 400 "misc.c" } -gint int64_compare (gint64* a, gint64* b) { +gint +int64_compare (gint64* a, + gint64* b) +{ gint result = 0; gint64 diff = 0LL; - gint64* _tmp0_; - gint64* _tmp1_; - gint64 _tmp2_; -#line 26 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = a; + gint64 _tmp0_; #line 26 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = b; -#line 26 "/home/jens/Source/shotwell/src/util/misc.vala" - diff = (*((gint64*) _tmp0_)) - (*((gint64*) _tmp1_)); + diff = (*((gint64*) a)) - (*((gint64*) b)); #line 27 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = diff; + _tmp0_ = diff; #line 27 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp2_ < ((gint64) 0)) { + if (_tmp0_ < ((gint64) 0)) { #line 28 "/home/jens/Source/shotwell/src/util/misc.vala" result = -1; #line 28 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 386 "misc.c" +#line 421 "misc.c" } else { - gint64 _tmp3_; + gint64 _tmp1_; #line 29 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = diff; + _tmp1_ = diff; #line 29 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp3_ > ((gint64) 0)) { + if (_tmp1_ > ((gint64) 0)) { #line 30 "/home/jens/Source/shotwell/src/util/misc.vala" result = 1; #line 30 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 397 "misc.c" +#line 432 "misc.c" } else { #line 32 "/home/jens/Source/shotwell/src/util/misc.vala" result = 0; #line 32 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 403 "misc.c" +#line 438 "misc.c" } } } -gint uint64_compare (guint64* a, guint64* b) { +gint +uint64_compare (guint64* a, + guint64* b) +{ gint result = 0; guint64 a64 = 0ULL; - guint64* _tmp0_; guint64 b64 = 0ULL; - guint64* _tmp1_; - guint64 _tmp2_; - guint64 _tmp3_; -#line 36 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = a; + guint64 _tmp0_; + guint64 _tmp1_; #line 36 "/home/jens/Source/shotwell/src/util/misc.vala" - a64 = *((guint64*) _tmp0_); + a64 = *((guint64*) a); #line 37 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = b; -#line 37 "/home/jens/Source/shotwell/src/util/misc.vala" - b64 = *((guint64*) _tmp1_); + b64 = *((guint64*) b); #line 39 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = a64; + _tmp0_ = a64; #line 39 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = b64; + _tmp1_ = b64; #line 39 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp2_ < _tmp3_) { + if (_tmp0_ < _tmp1_) { #line 40 "/home/jens/Source/shotwell/src/util/misc.vala" result = -1; #line 40 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 435 "misc.c" +#line 467 "misc.c" } else { - guint64 _tmp4_; - guint64 _tmp5_; + guint64 _tmp2_; + guint64 _tmp3_; #line 41 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = a64; + _tmp2_ = a64; #line 41 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = b64; + _tmp3_ = b64; #line 41 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp4_ > _tmp5_) { + if (_tmp2_ > _tmp3_) { #line 42 "/home/jens/Source/shotwell/src/util/misc.vala" result = 1; #line 42 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 449 "misc.c" +#line 481 "misc.c" } else { #line 44 "/home/jens/Source/shotwell/src/util/misc.vala" result = 0; #line 44 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 455 "misc.c" +#line 487 "misc.c" } } } -gboolean bool_value_equals (GValue* a, GValue* b) { +gboolean +bool_value_equals (GValue* a, + GValue* b) +{ gboolean result = FALSE; GValue _tmp0_; GValue _tmp1_; @@ -473,11 +508,14 @@ gboolean bool_value_equals (GValue* a, GValue* b) { result = g_value_get_boolean (&_tmp0_) == g_value_get_boolean (&_tmp1_); #line 50 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 477 "misc.c" +#line 512 "misc.c" } -gboolean int_value_equals (GValue* a, GValue* b) { +gboolean +int_value_equals (GValue* a, + GValue* b) +{ gboolean result = FALSE; GValue _tmp0_; GValue _tmp1_; @@ -493,11 +531,13 @@ gboolean int_value_equals (GValue* a, GValue* b) { result = g_value_get_int (&_tmp0_) == g_value_get_int (&_tmp1_); #line 54 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 497 "misc.c" +#line 535 "misc.c" } -gulong timeval_to_ms (GTimeVal* time_val) { +gulong +timeval_to_ms (GTimeVal* time_val) +{ gulong result = 0UL; GTimeVal _tmp0_; glong _tmp1_; @@ -517,27 +557,28 @@ gulong timeval_to_ms (GTimeVal* time_val) { result = (((gulong) _tmp1_) * 1000) + (((gulong) _tmp3_) / 1000); #line 58 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 521 "misc.c" +#line 561 "misc.c" } -gulong now_ms (void) { +gulong +now_ms (void) +{ gulong result = 0UL; GTimeVal _tmp0_ = {0}; - gulong _tmp1_; #line 62 "/home/jens/Source/shotwell/src/util/misc.vala" g_get_current_time (&_tmp0_); #line 62 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = timeval_to_ms (&_tmp0_); -#line 62 "/home/jens/Source/shotwell/src/util/misc.vala" - result = _tmp1_; + result = timeval_to_ms (&_tmp0_); #line 62 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 537 "misc.c" +#line 576 "misc.c" } -gulong now_sec (void) { +gulong +now_sec (void) +{ gulong result = 0UL; GTimeVal time_val = {0}; GTimeVal _tmp0_; @@ -552,24 +593,26 @@ gulong now_sec (void) { result = (gulong) _tmp1_; #line 68 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 556 "misc.c" +#line 597 "misc.c" } -inline time_t now_time_t (void) { +inline time_t +now_time_t (void) +{ time_t result = 0; - gulong _tmp0_; -#line 72 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = now_sec (); #line 72 "/home/jens/Source/shotwell/src/util/misc.vala" - result = (time_t) _tmp0_; + result = (time_t) now_sec (); #line 72 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 569 "misc.c" +#line 609 "misc.c" } -gchar* md5_file (GFile* file, GError** error) { +gchar* +md5_file (GFile* file, + GError** error) +{ gchar* result = NULL; GChecksum* md5 = NULL; GChecksum* _tmp0_; @@ -578,11 +621,10 @@ gchar* md5_file (GFile* file, GError** error) { gint buffer_length1; gint _buffer_size_; GFileInputStream* fins = NULL; - GFile* _tmp2_; - GFileInputStream* _tmp3_; - GChecksum* _tmp18_; - const gchar* _tmp19_; - gchar* _tmp20_; + GFileInputStream* _tmp2_; + GChecksum* _tmp15_; + const gchar* _tmp16_; + gchar* _tmp17_; GError * _inner_error_ = NULL; #line 75 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); @@ -599,11 +641,9 @@ gchar* md5_file (GFile* file, GError** error) { #line 77 "/home/jens/Source/shotwell/src/util/misc.vala" _buffer_size_ = buffer_length1; #line 79 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = file; + _tmp2_ = g_file_read (file, NULL, &_inner_error_); #line 79 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = g_file_read (_tmp2_, NULL, &_inner_error_); -#line 79 "/home/jens/Source/shotwell/src/util/misc.vala" - fins = _tmp3_; + fins = _tmp2_; #line 79 "/home/jens/Source/shotwell/src/util/misc.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 79 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -614,41 +654,38 @@ gchar* md5_file (GFile* file, GError** error) { _g_checksum_free0 (md5); #line 79 "/home/jens/Source/shotwell/src/util/misc.vala" return NULL; -#line 618 "misc.c" +#line 658 "misc.c" } { - gboolean _tmp4_ = FALSE; + gboolean _tmp3_ = FALSE; #line 80 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = TRUE; + _tmp3_ = TRUE; #line 80 "/home/jens/Source/shotwell/src/util/misc.vala" while (TRUE) { -#line 626 "misc.c" +#line 666 "misc.c" gsize bytes_read = 0UL; - GFileInputStream* _tmp5_; - guint8* _tmp6_; - gint _tmp6__length1; - gssize _tmp7_; - gsize _tmp8_; - GChecksum* _tmp9_; - guint8* _tmp10_; - gint _tmp10__length1; - gsize _tmp11_; + GFileInputStream* _tmp4_; + guint8* _tmp5_; + gint _tmp5__length1; + gsize _tmp6_; + GChecksum* _tmp7_; + guint8* _tmp8_; + gint _tmp8__length1; + gsize _tmp9_; #line 80 "/home/jens/Source/shotwell/src/util/misc.vala" - if (!_tmp4_) { -#line 639 "misc.c" + if (!_tmp3_) { +#line 678 "misc.c" } #line 80 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = FALSE; -#line 81 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = fins; + _tmp3_ = FALSE; #line 81 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = buffer; + _tmp4_ = fins; #line 81 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6__length1 = buffer_length1; + _tmp5_ = buffer; #line 81 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp7_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_input_stream_get_type (), GInputStream), _tmp6_, (gsize) _tmp6__length1, NULL, &_inner_error_); + _tmp5__length1 = buffer_length1; #line 81 "/home/jens/Source/shotwell/src/util/misc.vala" - bytes_read = (gsize) _tmp7_; + bytes_read = (gsize) g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, g_input_stream_get_type (), GInputStream), _tmp5_, (gsize) _tmp5__length1, NULL, &_inner_error_); #line 81 "/home/jens/Source/shotwell/src/util/misc.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 81 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -661,38 +698,38 @@ gchar* md5_file (GFile* file, GError** error) { _g_checksum_free0 (md5); #line 81 "/home/jens/Source/shotwell/src/util/misc.vala" return NULL; -#line 665 "misc.c" +#line 702 "misc.c" } #line 82 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp8_ = bytes_read; + _tmp6_ = bytes_read; #line 82 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp8_ <= ((gsize) 0)) { + if (_tmp6_ <= ((gsize) 0)) { #line 83 "/home/jens/Source/shotwell/src/util/misc.vala" break; -#line 673 "misc.c" +#line 710 "misc.c" } #line 85 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp9_ = md5; + _tmp7_ = md5; #line 85 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10_ = buffer; + _tmp8_ = buffer; #line 85 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10__length1 = buffer_length1; + _tmp8__length1 = buffer_length1; #line 85 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp11_ = bytes_read; + _tmp9_ = bytes_read; #line 85 "/home/jens/Source/shotwell/src/util/misc.vala" - g_checksum_update (_tmp9_, (guchar*) _tmp10_, _tmp11_); -#line 685 "misc.c" + g_checksum_update (_tmp7_, (guchar*) _tmp8_, _tmp9_); +#line 722 "misc.c" } } { - GFileInputStream* _tmp12_; + GFileInputStream* _tmp10_; #line 89 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp12_ = fins; + _tmp10_ = fins; #line 89 "/home/jens/Source/shotwell/src/util/misc.vala" - g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); + g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); #line 89 "/home/jens/Source/shotwell/src/util/misc.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 696 "misc.c" +#line 733 "misc.c" goto __catch5_g_error; } } @@ -700,32 +737,29 @@ gchar* md5_file (GFile* file, GError** error) { __catch5_g_error: { GError* err = NULL; - GFile* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; - GError* _tmp16_; - const gchar* _tmp17_; + gchar* _tmp11_; + gchar* _tmp12_; + GError* _tmp13_; + const gchar* _tmp14_; #line 88 "/home/jens/Source/shotwell/src/util/misc.vala" err = _inner_error_; #line 88 "/home/jens/Source/shotwell/src/util/misc.vala" _inner_error_ = NULL; #line 91 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp13_ = file; -#line 91 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp14_ = g_file_get_path (_tmp13_); + _tmp11_ = g_file_get_path (file); #line 91 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp15_ = _tmp14_; + _tmp12_ = _tmp11_; #line 91 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp16_ = err; + _tmp13_ = err; #line 91 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp17_ = _tmp16_->message; + _tmp14_ = _tmp13_->message; #line 91 "/home/jens/Source/shotwell/src/util/misc.vala" - g_warning ("misc.vala:91: Unable to close MD5 input stream for %s: %s", _tmp15_, _tmp17_); + g_warning ("misc.vala:91: Unable to close MD5 input stream for %s: %s", _tmp12_, _tmp14_); #line 91 "/home/jens/Source/shotwell/src/util/misc.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp12_); #line 88 "/home/jens/Source/shotwell/src/util/misc.vala" _g_error_free0 (err); -#line 729 "misc.c" +#line 763 "misc.c" } __finally5: #line 88 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -740,16 +774,16 @@ gchar* md5_file (GFile* file, GError** error) { _g_checksum_free0 (md5); #line 88 "/home/jens/Source/shotwell/src/util/misc.vala" return NULL; -#line 744 "misc.c" +#line 778 "misc.c" } #line 94 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp18_ = md5; + _tmp15_ = md5; #line 94 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp19_ = g_checksum_get_string (_tmp18_); + _tmp16_ = g_checksum_get_string (_tmp15_); #line 94 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp20_ = g_strdup (_tmp19_); + _tmp17_ = g_strdup (_tmp16_); #line 94 "/home/jens/Source/shotwell/src/util/misc.vala" - result = _tmp20_; + result = _tmp17_; #line 94 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (fins); #line 94 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -758,67 +792,55 @@ gchar* md5_file (GFile* file, GError** error) { _g_checksum_free0 (md5); #line 94 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 762 "misc.c" +#line 796 "misc.c" } -gboolean equal_sets (GeeSet* a, GeeSet* b) { +gboolean +equal_sets (GeeSet* a, + GeeSet* b) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GeeSet* _tmp2_; - gboolean _tmp7_ = FALSE; - GeeSet* _tmp8_; - gboolean _tmp14_ = FALSE; - gboolean _tmp15_ = FALSE; - GeeSet* _tmp16_; - gboolean _tmp21_ = FALSE; - GeeSet* _tmp22_; - GeeSet* _tmp24_; - gint _tmp25_; - gint _tmp26_; - GeeSet* _tmp27_; - gint _tmp28_; - gint _tmp29_; + gboolean _tmp4_ = FALSE; + gboolean _tmp8_ = FALSE; + gboolean _tmp9_ = FALSE; + gboolean _tmp11_ = FALSE; + gint _tmp12_; + gint _tmp13_; + gint _tmp14_; + gint _tmp15_; #line 98 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail ((a == NULL) || GEE_IS_SET (a), FALSE); #line 98 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail ((b == NULL) || GEE_IS_SET (b), FALSE); #line 99 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = a; -#line 99 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp2_ != NULL) { -#line 792 "misc.c" - GeeSet* _tmp3_; - gint _tmp4_; - gint _tmp5_; -#line 99 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = a; + if (a != NULL) { +#line 821 "misc.c" + gint _tmp2_; + gint _tmp3_; #line 99 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_COLLECTION, GeeCollection)); #line 99 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 99 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = _tmp5_ == 0; -#line 804 "misc.c" + _tmp1_ = _tmp3_ == 0; +#line 830 "misc.c" } else { #line 99 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp1_ = FALSE; -#line 808 "misc.c" +#line 834 "misc.c" } #line 99 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp1_) { -#line 812 "misc.c" - GeeSet* _tmp6_; -#line 99 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = b; #line 99 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = _tmp6_ == NULL; -#line 818 "misc.c" + _tmp0_ = b == NULL; +#line 840 "misc.c" } else { #line 99 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp0_ = FALSE; -#line 822 "misc.c" +#line 844 "misc.c" } #line 99 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp0_) { @@ -826,194 +848,151 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) { result = TRUE; #line 100 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 830 "misc.c" +#line 852 "misc.c" } #line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp8_ = a; + if (a == NULL) { +#line 856 "misc.c" + gboolean _tmp5_ = FALSE; #line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp8_ == NULL) { -#line 836 "misc.c" - gboolean _tmp9_ = FALSE; - GeeSet* _tmp10_; + if (b != NULL) { +#line 860 "misc.c" + gint _tmp6_; + gint _tmp7_; #line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10_ = b; + _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (b, GEE_TYPE_COLLECTION, GeeCollection)); #line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp10_ != NULL) { -#line 843 "misc.c" - GeeSet* _tmp11_; - gint _tmp12_; - gint _tmp13_; -#line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp11_ = b; -#line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp13_ = _tmp12_; + _tmp7_ = _tmp6_; #line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp9_ = _tmp13_ == 0; -#line 855 "misc.c" + _tmp5_ = _tmp7_ == 0; +#line 869 "misc.c" } else { #line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp9_ = FALSE; -#line 859 "misc.c" + _tmp5_ = FALSE; +#line 873 "misc.c" } #line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp7_ = _tmp9_; -#line 863 "misc.c" + _tmp4_ = _tmp5_; +#line 877 "misc.c" } else { #line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp7_ = FALSE; -#line 867 "misc.c" + _tmp4_ = FALSE; +#line 881 "misc.c" } #line 102 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp7_) { + if (_tmp4_) { #line 103 "/home/jens/Source/shotwell/src/util/misc.vala" result = TRUE; #line 103 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 875 "misc.c" +#line 889 "misc.c" } #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp16_ = a; -#line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp16_ == NULL) { -#line 881 "misc.c" - GeeSet* _tmp17_; + if (a == NULL) { #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp17_ = b; -#line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp15_ = _tmp17_ != NULL; -#line 887 "misc.c" + _tmp9_ = b != NULL; +#line 895 "misc.c" } else { #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp15_ = FALSE; -#line 891 "misc.c" + _tmp9_ = FALSE; +#line 899 "misc.c" } #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp15_) { -#line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp14_ = TRUE; -#line 897 "misc.c" - } else { - gboolean _tmp18_ = FALSE; - GeeSet* _tmp19_; -#line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp19_ = a; + if (_tmp9_) { #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp19_ != NULL) { + _tmp8_ = TRUE; #line 905 "misc.c" - GeeSet* _tmp20_; + } else { + gboolean _tmp10_ = FALSE; #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp20_ = b; + if (a != NULL) { #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp18_ = _tmp20_ == NULL; -#line 911 "misc.c" + _tmp10_ = b == NULL; +#line 912 "misc.c" } else { #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp18_ = FALSE; -#line 915 "misc.c" + _tmp10_ = FALSE; +#line 916 "misc.c" } #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp14_ = _tmp18_; -#line 919 "misc.c" + _tmp8_ = _tmp10_; +#line 920 "misc.c" } #line 105 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp14_) { + if (_tmp8_) { #line 106 "/home/jens/Source/shotwell/src/util/misc.vala" result = FALSE; #line 106 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 927 "misc.c" +#line 928 "misc.c" } #line 108 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp22_ = a; -#line 108 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp22_ == NULL) { -#line 933 "misc.c" - GeeSet* _tmp23_; -#line 108 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp23_ = b; + if (a == NULL) { #line 108 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp21_ = _tmp23_ == NULL; -#line 939 "misc.c" + _tmp11_ = b == NULL; +#line 934 "misc.c" } else { #line 108 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp21_ = FALSE; -#line 943 "misc.c" + _tmp11_ = FALSE; +#line 938 "misc.c" } #line 108 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp21_) { + if (_tmp11_) { #line 109 "/home/jens/Source/shotwell/src/util/misc.vala" result = TRUE; #line 109 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 951 "misc.c" +#line 946 "misc.c" } #line 111 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp24_ = a; + _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_COLLECTION, GeeCollection)); #line 111 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp25_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 111 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp26_ = _tmp25_; + _tmp13_ = _tmp12_; #line 111 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp27_ = b; + _tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (b, GEE_TYPE_COLLECTION, GeeCollection)); #line 111 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp28_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp15_ = _tmp14_; #line 111 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp29_ = _tmp28_; -#line 111 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp26_ != _tmp29_) { + if (_tmp13_ != _tmp15_) { #line 112 "/home/jens/Source/shotwell/src/util/misc.vala" result = FALSE; #line 112 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 971 "misc.c" +#line 962 "misc.c" } { GeeIterator* _element_it = NULL; - GeeSet* _tmp30_; - GeeIterator* _tmp31_; -#line 116 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp30_ = a; + GeeIterator* _tmp16_; #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp31_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_ITERABLE, GeeIterable)); #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" - _element_it = _tmp31_; + _element_it = _tmp16_; #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" while (TRUE) { -#line 985 "misc.c" - GeeIterator* _tmp32_; - gboolean _tmp33_; +#line 973 "misc.c" + GeeIterator* _tmp17_; gchar* element = NULL; - GeeIterator* _tmp34_; - gpointer _tmp35_; - GeeSet* _tmp36_; - const gchar* _tmp37_; - gboolean _tmp38_; -#line 116 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp32_ = _element_it; + GeeIterator* _tmp18_; + gpointer _tmp19_; + const gchar* _tmp20_; #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp33_ = gee_iterator_next (_tmp32_); + _tmp17_ = _element_it; #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" - if (!_tmp33_) { + if (!gee_iterator_next (_tmp17_)) { #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" break; -#line 1002 "misc.c" +#line 985 "misc.c" } #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp34_ = _element_it; + _tmp18_ = _element_it; #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp35_ = gee_iterator_get (_tmp34_); + _tmp19_ = gee_iterator_get (_tmp18_); #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" - element = (gchar*) _tmp35_; -#line 117 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp36_ = b; + element = (gchar*) _tmp19_; #line 117 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp37_ = element; -#line 117 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp38_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_); + _tmp20_ = element; #line 117 "/home/jens/Source/shotwell/src/util/misc.vala" - if (!_tmp38_) { + if (!gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (b, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_)) { #line 118 "/home/jens/Source/shotwell/src/util/misc.vala" result = FALSE; #line 118 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -1022,44 +1001,48 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) { _g_object_unref0 (_element_it); #line 118 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1026 "misc.c" +#line 1005 "misc.c" } #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" _g_free0 (element); -#line 1030 "misc.c" +#line 1009 "misc.c" } #line 116 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (_element_it); -#line 1034 "misc.c" +#line 1013 "misc.c" } #line 121 "/home/jens/Source/shotwell/src/util/misc.vala" result = TRUE; #line 121 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1040 "misc.c" +#line 1019 "misc.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" return self ? g_object_ref (self) : NULL; -#line 1047 "misc.c" +#line 1028 "misc.c" } -GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) { +GeeSet* +intersection_of_sets (GeeSet* a, + GeeSet* b, + GeeSet* excluded) +{ GeeSet* result = NULL; gboolean _tmp0_ = FALSE; - GeeSet* _tmp1_; - gboolean _tmp6_ = FALSE; - GeeSet* _tmp7_; + gboolean _tmp1_ = FALSE; GeeSet* intersection = NULL; - GeeHashSet* _tmp12_; - GeeSet* _tmp41_ = NULL; - GeeSet* _tmp42_; - gint _tmp43_; - gint _tmp44_; - GeeSet* _tmp46_; + GeeHashSet* _tmp2_; + GeeSet* _tmp19_ = NULL; + GeeSet* _tmp20_; + gint _tmp21_; + gint _tmp22_; + GeeSet* _tmp24_; #line 125 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail ((a == NULL) || GEE_IS_SET (a), NULL); #line 125 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -1067,540 +1050,452 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) { #line 125 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail ((excluded == NULL) || GEE_IS_SET (excluded), NULL); #line 127 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = a; + if (a != NULL) { #line 127 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp1_ != NULL) { -#line 1074 "misc.c" - GeeSet* _tmp2_; -#line 127 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = b; -#line 127 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = _tmp2_ == NULL; -#line 1080 "misc.c" + _tmp0_ = b == NULL; +#line 1057 "misc.c" } else { #line 127 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp0_ = FALSE; -#line 1084 "misc.c" +#line 1061 "misc.c" } #line 127 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp0_) { -#line 1088 "misc.c" - GeeSet* _tmp3_; -#line 128 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = excluded; #line 128 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp3_ != NULL) { -#line 1094 "misc.c" - GeeSet* _tmp4_; - GeeSet* _tmp5_; + if (excluded != NULL) { #line 129 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = excluded; -#line 129 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = a; -#line 129 "/home/jens/Source/shotwell/src/util/misc.vala" - gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1103 "misc.c" + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (excluded, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_COLLECTION, GeeCollection)); +#line 1069 "misc.c" } #line 131 "/home/jens/Source/shotwell/src/util/misc.vala" result = NULL; #line 131 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1109 "misc.c" +#line 1075 "misc.c" } #line 134 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp7_ = a; -#line 134 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp7_ == NULL) { -#line 1115 "misc.c" - GeeSet* _tmp8_; -#line 134 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp8_ = b; + if (a == NULL) { #line 134 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = _tmp8_ != NULL; -#line 1121 "misc.c" + _tmp1_ = b != NULL; +#line 1081 "misc.c" } else { #line 134 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = FALSE; -#line 1125 "misc.c" + _tmp1_ = FALSE; +#line 1085 "misc.c" } #line 134 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp6_) { -#line 1129 "misc.c" - GeeSet* _tmp9_; -#line 135 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp9_ = excluded; + if (_tmp1_) { #line 135 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp9_ != NULL) { -#line 1135 "misc.c" - GeeSet* _tmp10_; - GeeSet* _tmp11_; -#line 136 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10_ = excluded; -#line 136 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp11_ = b; + if (excluded != NULL) { #line 136 "/home/jens/Source/shotwell/src/util/misc.vala" - gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1144 "misc.c" + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (excluded, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (b, GEE_TYPE_COLLECTION, GeeCollection)); +#line 1093 "misc.c" } #line 138 "/home/jens/Source/shotwell/src/util/misc.vala" result = NULL; #line 138 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1150 "misc.c" +#line 1099 "misc.c" } #line 141 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp12_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp2_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 141 "/home/jens/Source/shotwell/src/util/misc.vala" - intersection = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_SET, GeeSet); -#line 1156 "misc.c" + intersection = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_SET, GeeSet); +#line 1105 "misc.c" { GeeIterator* _element_it = NULL; - GeeSet* _tmp13_; - GeeIterator* _tmp14_; + GeeIterator* _tmp3_; #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp13_ = a; + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_ITERABLE, GeeIterable)); #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 143 "/home/jens/Source/shotwell/src/util/misc.vala" - _element_it = _tmp14_; + _element_it = _tmp3_; #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" while (TRUE) { -#line 1169 "misc.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 1115 "misc.c" + GeeIterator* _tmp4_; gchar* element = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; - GeeSet* _tmp19_; - const gchar* _tmp20_; - gboolean _tmp21_; -#line 143 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp15_ = _element_it; + GeeIterator* _tmp5_; + gpointer _tmp6_; + const gchar* _tmp7_; #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp16_ = gee_iterator_next (_tmp15_); + _tmp4_ = _element_it; #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp4_)) { #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" break; -#line 1186 "misc.c" +#line 1127 "misc.c" } #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp17_ = _element_it; + _tmp5_ = _element_it; #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" - element = (gchar*) _tmp18_; -#line 144 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp19_ = b; -#line 144 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp20_ = element; + element = (gchar*) _tmp6_; #line 144 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp21_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_); + _tmp7_ = element; #line 144 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp21_) { -#line 1202 "misc.c" - GeeSet* _tmp22_; - const gchar* _tmp23_; + if (gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (b, GEE_TYPE_COLLECTION, GeeCollection), _tmp7_)) { +#line 1139 "misc.c" + GeeSet* _tmp8_; + const gchar* _tmp9_; #line 145 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp22_ = intersection; + _tmp8_ = intersection; #line 145 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp23_ = element; + _tmp9_ = element; #line 145 "/home/jens/Source/shotwell/src/util/misc.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_); -#line 1211 "misc.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp9_); +#line 1148 "misc.c" } else { - GeeSet* _tmp24_; #line 146 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp24_ = excluded; -#line 146 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp24_ != NULL) { -#line 1218 "misc.c" - GeeSet* _tmp25_; - const gchar* _tmp26_; -#line 147 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp25_ = excluded; + if (excluded != NULL) { +#line 1152 "misc.c" + const gchar* _tmp10_; #line 147 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp26_ = element; + _tmp10_ = element; #line 147 "/home/jens/Source/shotwell/src/util/misc.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), _tmp26_); -#line 1227 "misc.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (excluded, GEE_TYPE_COLLECTION, GeeCollection), _tmp10_); +#line 1158 "misc.c" } } #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" _g_free0 (element); -#line 1232 "misc.c" +#line 1163 "misc.c" } #line 143 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (_element_it); -#line 1236 "misc.c" +#line 1167 "misc.c" } { GeeIterator* _element_it = NULL; - GeeSet* _tmp27_; - GeeIterator* _tmp28_; + GeeIterator* _tmp11_; #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp27_ = b; + _tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (b, GEE_TYPE_ITERABLE, GeeIterable)); #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp28_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 150 "/home/jens/Source/shotwell/src/util/misc.vala" - _element_it = _tmp28_; + _element_it = _tmp11_; #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" while (TRUE) { -#line 1250 "misc.c" - GeeIterator* _tmp29_; - gboolean _tmp30_; +#line 1178 "misc.c" + GeeIterator* _tmp12_; gchar* element = NULL; - GeeIterator* _tmp31_; - gpointer _tmp32_; - GeeSet* _tmp33_; - const gchar* _tmp34_; - gboolean _tmp35_; -#line 150 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp29_ = _element_it; + GeeIterator* _tmp13_; + gpointer _tmp14_; + const gchar* _tmp15_; #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp30_ = gee_iterator_next (_tmp29_); + _tmp12_ = _element_it; #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" - if (!_tmp30_) { + if (!gee_iterator_next (_tmp12_)) { #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" break; -#line 1267 "misc.c" +#line 1190 "misc.c" } #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp31_ = _element_it; + _tmp13_ = _element_it; #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp32_ = gee_iterator_get (_tmp31_); + _tmp14_ = gee_iterator_get (_tmp13_); #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" - element = (gchar*) _tmp32_; + element = (gchar*) _tmp14_; #line 151 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp33_ = a; + _tmp15_ = element; #line 151 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp34_ = element; -#line 151 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp35_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), _tmp34_); -#line 151 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp35_) { -#line 1283 "misc.c" - GeeSet* _tmp36_; - const gchar* _tmp37_; + if (gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (a, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_)) { +#line 1202 "misc.c" + GeeSet* _tmp16_; + const gchar* _tmp17_; #line 152 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp36_ = intersection; + _tmp16_ = intersection; #line 152 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp37_ = element; + _tmp17_ = element; #line 152 "/home/jens/Source/shotwell/src/util/misc.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_); -#line 1292 "misc.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_); +#line 1211 "misc.c" } else { - GeeSet* _tmp38_; -#line 153 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp38_ = excluded; #line 153 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp38_ != NULL) { -#line 1299 "misc.c" - GeeSet* _tmp39_; - const gchar* _tmp40_; -#line 154 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp39_ = excluded; + if (excluded != NULL) { +#line 1215 "misc.c" + const gchar* _tmp18_; #line 154 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp40_ = element; + _tmp18_ = element; #line 154 "/home/jens/Source/shotwell/src/util/misc.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection), _tmp40_); -#line 1308 "misc.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (excluded, GEE_TYPE_COLLECTION, GeeCollection), _tmp18_); +#line 1221 "misc.c" } } #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" _g_free0 (element); -#line 1313 "misc.c" +#line 1226 "misc.c" } #line 150 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (_element_it); -#line 1317 "misc.c" +#line 1230 "misc.c" } #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp42_ = intersection; + _tmp20_ = intersection; #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp43_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection)); #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp44_ = _tmp43_; + _tmp22_ = _tmp21_; #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp44_ > 0) { -#line 1327 "misc.c" - GeeSet* _tmp45_; + if (_tmp22_ > 0) { +#line 1240 "misc.c" + GeeSet* _tmp23_; #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp45_ = intersection; + _tmp23_ = intersection; #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp41_ = _tmp45_; -#line 1333 "misc.c" + _tmp19_ = _tmp23_; +#line 1246 "misc.c" } else { #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp41_ = NULL; -#line 1337 "misc.c" + _tmp19_ = NULL; +#line 1250 "misc.c" } #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp46_ = _g_object_ref0 (_tmp41_); + _tmp24_ = _g_object_ref0 (_tmp19_); #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" - result = _tmp46_; + result = _tmp24_; #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (intersection); #line 157 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1347 "misc.c" +#line 1260 "misc.c" } -guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) { +guchar* +serialize_photo_ids (GeeCollection* photos, + int* result_length1) +{ guchar* result = NULL; gint64* ids = NULL; - GeeCollection* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; - gint64* _tmp3_; + gint64* _tmp2_; gint ids_length1; gint _ids_size_; gint ctr = 0; gsize bytes = 0UL; - GeeCollection* _tmp16_; - gint _tmp17_; - gint _tmp18_; + gint _tmp13_; + gint _tmp14_; guchar* serialized = NULL; - guchar* _tmp19_; + guchar* _tmp15_; gint serialized_length1; gint _serialized_size_; - gint64* _tmp20_; - gint _tmp20__length1; - guchar* _tmp21_; - gint _tmp21__length1; + gint64* _tmp16_; + gint _tmp16__length1; + guchar* _tmp17_; + gint _tmp17__length1; #line 160 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail (GEE_IS_COLLECTION (photos), NULL); #line 161 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = photos; + _tmp0_ = gee_collection_get_size (photos); #line 161 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp1_ = _tmp0_; #line 161 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = _tmp1_; + _tmp2_ = g_new0 (gint64, _tmp1_); #line 161 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = g_new0 (gint64, _tmp2_); + ids = _tmp2_; #line 161 "/home/jens/Source/shotwell/src/util/misc.vala" - ids = _tmp3_; -#line 161 "/home/jens/Source/shotwell/src/util/misc.vala" - ids_length1 = _tmp2_; + ids_length1 = _tmp1_; #line 161 "/home/jens/Source/shotwell/src/util/misc.vala" _ids_size_ = ids_length1; #line 162 "/home/jens/Source/shotwell/src/util/misc.vala" ctr = 0; -#line 1391 "misc.c" +#line 1303 "misc.c" { GeeIterator* _photo_it = NULL; - GeeCollection* _tmp4_; - GeeIterator* _tmp5_; + GeeIterator* _tmp3_; #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = photos; + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (photos, GEE_TYPE_ITERABLE, GeeIterable)); #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 163 "/home/jens/Source/shotwell/src/util/misc.vala" - _photo_it = _tmp5_; + _photo_it = _tmp3_; #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" while (TRUE) { -#line 1404 "misc.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 1313 "misc.c" + GeeIterator* _tmp4_; Photo* photo = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - gint64* _tmp10_; - gint _tmp10__length1; - gint _tmp11_; - Photo* _tmp12_; - PhotoID _tmp13_ = {0}; - gint64 _tmp14_; - gint64 _tmp15_; -#line 163 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = _photo_it; + GeeIterator* _tmp5_; + gpointer _tmp6_; + gint64* _tmp7_; + gint _tmp7__length1; + gint _tmp8_; + Photo* _tmp9_; + PhotoID _tmp10_ = {0}; + gint64 _tmp11_; + gint64 _tmp12_; #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp4_ = _photo_it; #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp4_)) { #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" break; -#line 1425 "misc.c" +#line 1331 "misc.c" } #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp8_ = _photo_it; + _tmp5_ = _photo_it; #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" - photo = (Photo*) _tmp9_; + photo = (Photo*) _tmp6_; #line 164 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10_ = ids; + _tmp7_ = ids; #line 164 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10__length1 = ids_length1; + _tmp7__length1 = ids_length1; #line 164 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp11_ = ctr; + _tmp8_ = ctr; #line 164 "/home/jens/Source/shotwell/src/util/misc.vala" - ctr = _tmp11_ + 1; + ctr = _tmp8_ + 1; #line 164 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp12_ = photo; + _tmp9_ = photo; #line 164 "/home/jens/Source/shotwell/src/util/misc.vala" - photo_get_photo_id (_tmp12_, &_tmp13_); + photo_get_photo_id (_tmp9_, &_tmp10_); #line 164 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp14_ = _tmp13_.id; + _tmp11_ = _tmp10_.id; #line 164 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10_[_tmp11_] = _tmp14_; + _tmp7_[_tmp8_] = _tmp11_; #line 164 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp15_ = _tmp10_[_tmp11_]; + _tmp12_ = _tmp7_[_tmp8_]; #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (photo); -#line 1453 "misc.c" +#line 1359 "misc.c" } #line 163 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (_photo_it); -#line 1457 "misc.c" +#line 1363 "misc.c" } #line 166 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp16_ = photos; + _tmp13_ = gee_collection_get_size (photos); #line 166 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp17_ = gee_collection_get_size (_tmp16_); + _tmp14_ = _tmp13_; #line 166 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp18_ = _tmp17_; -#line 166 "/home/jens/Source/shotwell/src/util/misc.vala" - bytes = (gsize) (_tmp18_ * sizeof (gint64)); + bytes = (gsize) (_tmp14_ * sizeof (gint64)); #line 167 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp19_ = g_new0 (guchar, bytes); + _tmp15_ = g_new0 (guchar, bytes); #line 167 "/home/jens/Source/shotwell/src/util/misc.vala" - serialized = _tmp19_; + serialized = _tmp15_; #line 167 "/home/jens/Source/shotwell/src/util/misc.vala" serialized_length1 = bytes; #line 167 "/home/jens/Source/shotwell/src/util/misc.vala" _serialized_size_ = serialized_length1; #line 168 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp20_ = ids; + _tmp16_ = ids; #line 168 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp20__length1 = ids_length1; + _tmp16__length1 = ids_length1; #line 168 "/home/jens/Source/shotwell/src/util/misc.vala" - memcpy (serialized, _tmp20_, bytes); + memcpy (serialized, _tmp16_, bytes); #line 170 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp21_ = serialized; + _tmp17_ = serialized; #line 170 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp21__length1 = serialized_length1; + _tmp17__length1 = serialized_length1; #line 170 "/home/jens/Source/shotwell/src/util/misc.vala" if (result_length1) { #line 170 "/home/jens/Source/shotwell/src/util/misc.vala" - *result_length1 = _tmp21__length1; -#line 1489 "misc.c" + *result_length1 = _tmp17__length1; +#line 1393 "misc.c" } #line 170 "/home/jens/Source/shotwell/src/util/misc.vala" - result = _tmp21_; + result = _tmp17_; #line 170 "/home/jens/Source/shotwell/src/util/misc.vala" ids = (g_free (ids), NULL); #line 170 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1497 "misc.c" +#line 1401 "misc.c" } -GeeList* unserialize_photo_ids (guchar* serialized, gint size) { +GeeList* +unserialize_photo_ids (guchar* serialized, + gint size) +{ GeeList* result = NULL; gsize count = 0UL; - gint _tmp0_; - gboolean _tmp1_ = FALSE; - gsize _tmp2_; + gboolean _tmp0_ = FALSE; + gsize _tmp1_; gint64* ids = NULL; - gsize _tmp4_; - gint64* _tmp5_; + gsize _tmp2_; + gint64* _tmp3_; gint ids_length1; gint _ids_size_; + gint64* _tmp4_; + gint _tmp4__length1; + GeeArrayList* list = NULL; + GeeArrayList* _tmp5_; gint64* _tmp6_; gint _tmp6__length1; - guchar* _tmp7_; - gint _tmp8_; - GeeArrayList* list = NULL; - GeeArrayList* _tmp9_; - gint64* _tmp10_; - gint _tmp10__length1; #line 174 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = size; -#line 174 "/home/jens/Source/shotwell/src/util/misc.vala" - count = (gsize) (_tmp0_ / sizeof (gint64)); + count = (gsize) (size / sizeof (gint64)); #line 175 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = count; + _tmp1_ = count; #line 175 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp2_ <= ((gsize) 0)) { + if (_tmp1_ <= ((gsize) 0)) { #line 175 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = TRUE; -#line 1530 "misc.c" + _tmp0_ = TRUE; +#line 1432 "misc.c" } else { - guchar* _tmp3_; #line 175 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = serialized; -#line 175 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = _tmp3_ == NULL; -#line 1537 "misc.c" + _tmp0_ = serialized == NULL; +#line 1436 "misc.c" } #line 175 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp1_) { + if (_tmp0_) { #line 176 "/home/jens/Source/shotwell/src/util/misc.vala" result = NULL; #line 176 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1545 "misc.c" +#line 1444 "misc.c" } #line 178 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = count; + _tmp2_ = count; #line 178 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = g_new0 (gint64, _tmp4_); + _tmp3_ = g_new0 (gint64, _tmp2_); #line 178 "/home/jens/Source/shotwell/src/util/misc.vala" - ids = _tmp5_; + ids = _tmp3_; #line 178 "/home/jens/Source/shotwell/src/util/misc.vala" - ids_length1 = _tmp4_; + ids_length1 = _tmp2_; #line 178 "/home/jens/Source/shotwell/src/util/misc.vala" _ids_size_ = ids_length1; #line 179 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = ids; -#line 179 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6__length1 = ids_length1; + _tmp4_ = ids; #line 179 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp7_ = serialized; + _tmp4__length1 = ids_length1; #line 179 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp8_ = size; -#line 179 "/home/jens/Source/shotwell/src/util/misc.vala" - memcpy (_tmp6_, _tmp7_, (gsize) _tmp8_); + memcpy (_tmp4_, serialized, (gsize) size); #line 181 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp9_ = gee_array_list_new (TYPE_PHOTO_ID, (GBoxedCopyFunc) photo_id_dup, (GDestroyNotify) photo_id_free, NULL, NULL, NULL); + _tmp5_ = gee_array_list_new (TYPE_PHOTO_ID, (GBoxedCopyFunc) photo_id_dup, (GDestroyNotify) photo_id_free, NULL, NULL, NULL); #line 181 "/home/jens/Source/shotwell/src/util/misc.vala" - list = _tmp9_; + list = _tmp5_; #line 182 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10_ = ids; + _tmp6_ = ids; #line 182 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10__length1 = ids_length1; -#line 1575 "misc.c" + _tmp6__length1 = ids_length1; +#line 1470 "misc.c" { gint64* id_collection = NULL; gint id_collection_length1 = 0; gint _id_collection_size_ = 0; gint id_it = 0; #line 182 "/home/jens/Source/shotwell/src/util/misc.vala" - id_collection = _tmp10_; + id_collection = _tmp6_; #line 182 "/home/jens/Source/shotwell/src/util/misc.vala" - id_collection_length1 = _tmp10__length1; + id_collection_length1 = _tmp6__length1; #line 182 "/home/jens/Source/shotwell/src/util/misc.vala" - for (id_it = 0; id_it < _tmp10__length1; id_it = id_it + 1) { -#line 1587 "misc.c" + for (id_it = 0; id_it < _tmp6__length1; id_it = id_it + 1) { +#line 1482 "misc.c" gint64 id = 0LL; #line 182 "/home/jens/Source/shotwell/src/util/misc.vala" id = id_collection[id_it]; -#line 1591 "misc.c" +#line 1486 "misc.c" { - GeeArrayList* _tmp11_; - gint64 _tmp12_; - PhotoID _tmp13_ = {0}; + GeeArrayList* _tmp7_; + gint64 _tmp8_; + PhotoID _tmp9_ = {0}; #line 183 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp11_ = list; + _tmp7_ = list; #line 183 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp12_ = id; + _tmp8_ = id; #line 183 "/home/jens/Source/shotwell/src/util/misc.vala" - photo_id_init (&_tmp13_, _tmp12_); + photo_id_init (&_tmp9_, _tmp8_); #line 183 "/home/jens/Source/shotwell/src/util/misc.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp13_); -#line 1604 "misc.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp9_); +#line 1499 "misc.c" } } } @@ -1610,301 +1505,280 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) { ids = (g_free (ids), NULL); #line 185 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1614 "misc.c" +#line 1509 "misc.c" } -guchar* serialize_media_sources (GeeCollection* media, int* result_length1) { +guchar* +serialize_media_sources (GeeCollection* media, + int* result_length1) +{ guchar* result = NULL; GdkAtom* atoms = NULL; - GeeCollection* _tmp0_; + gint _tmp0_; gint _tmp1_; - gint _tmp2_; - GdkAtom* _tmp3_; + GdkAtom* _tmp2_; gint atoms_length1; gint _atoms_size_; gint ctr = 0; gsize bytes = 0UL; - GeeCollection* _tmp17_; - gint _tmp18_; - gint _tmp19_; + gint _tmp13_; + gint _tmp14_; guchar* serialized = NULL; - guchar* _tmp20_; + guchar* _tmp15_; gint serialized_length1; gint _serialized_size_; - GdkAtom* _tmp21_; - gint _tmp21__length1; - guchar* _tmp22_; - gint _tmp22__length1; + GdkAtom* _tmp16_; + gint _tmp16__length1; + guchar* _tmp17_; + gint _tmp17__length1; #line 188 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail (GEE_IS_COLLECTION (media), NULL); #line 189 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = media; + _tmp0_ = gee_collection_get_size (media); #line 189 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = gee_collection_get_size (_tmp0_); + _tmp1_ = _tmp0_; #line 189 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = _tmp1_; + _tmp2_ = g_new0 (GdkAtom, _tmp1_); #line 189 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = g_new0 (GdkAtom, _tmp2_); + atoms = _tmp2_; #line 189 "/home/jens/Source/shotwell/src/util/misc.vala" - atoms = _tmp3_; -#line 189 "/home/jens/Source/shotwell/src/util/misc.vala" - atoms_length1 = _tmp2_; + atoms_length1 = _tmp1_; #line 189 "/home/jens/Source/shotwell/src/util/misc.vala" _atoms_size_ = atoms_length1; #line 190 "/home/jens/Source/shotwell/src/util/misc.vala" ctr = 0; -#line 1658 "misc.c" +#line 1552 "misc.c" { GeeIterator* _current_media_it = NULL; - GeeCollection* _tmp4_; - GeeIterator* _tmp5_; -#line 191 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = media; + GeeIterator* _tmp3_; #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_ITERABLE, GeeIterable)); #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" - _current_media_it = _tmp5_; + _current_media_it = _tmp3_; #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" while (TRUE) { -#line 1671 "misc.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 1562 "misc.c" + GeeIterator* _tmp4_; MediaSource* current_media = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - GdkAtom* _tmp10_; - gint _tmp10__length1; - gint _tmp11_; - MediaSource* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; - GdkAtom _tmp15_; - GdkAtom _tmp16_; -#line 191 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = _current_media_it; + GeeIterator* _tmp5_; + gpointer _tmp6_; + GdkAtom* _tmp7_; + gint _tmp7__length1; + gint _tmp8_; + MediaSource* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + GdkAtom _tmp12_; #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp4_ = _current_media_it; #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp4_)) { #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" break; -#line 1693 "misc.c" +#line 1580 "misc.c" } #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp8_ = _current_media_it; + _tmp5_ = _current_media_it; #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp6_ = gee_iterator_get (_tmp5_); #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" - current_media = (MediaSource*) _tmp9_; -#line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10_ = atoms; + current_media = (MediaSource*) _tmp6_; #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10__length1 = atoms_length1; + _tmp7_ = atoms; #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp11_ = ctr; + _tmp7__length1 = atoms_length1; #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - ctr = _tmp11_ + 1; + _tmp8_ = ctr; #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp12_ = current_media; + ctr = _tmp8_ + 1; #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp13_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_SOURCE, DataSource)); + _tmp9_ = current_media; #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp14_ = _tmp13_; + _tmp10_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_SOURCE, DataSource)); #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp15_ = gdk_atom_intern (_tmp14_, FALSE); + _tmp11_ = _tmp10_; #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10_[_tmp11_] = _tmp15_; + _tmp7_[_tmp8_] = gdk_atom_intern (_tmp11_, FALSE); #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp16_ = _tmp10_[_tmp11_]; + _tmp12_ = _tmp7_[_tmp8_]; #line 192 "/home/jens/Source/shotwell/src/util/misc.vala" - _g_free0 (_tmp14_); + _g_free0 (_tmp11_); #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (current_media); -#line 1725 "misc.c" +#line 1610 "misc.c" } #line 191 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (_current_media_it); -#line 1729 "misc.c" +#line 1614 "misc.c" } #line 194 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp17_ = media; -#line 194 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp18_ = gee_collection_get_size (_tmp17_); + _tmp13_ = gee_collection_get_size (media); #line 194 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp19_ = _tmp18_; + _tmp14_ = _tmp13_; #line 194 "/home/jens/Source/shotwell/src/util/misc.vala" - bytes = (gsize) (_tmp19_ * sizeof (GdkAtom)); + bytes = (gsize) (_tmp14_ * sizeof (GdkAtom)); #line 195 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp20_ = g_new0 (guchar, bytes); + _tmp15_ = g_new0 (guchar, bytes); #line 195 "/home/jens/Source/shotwell/src/util/misc.vala" - serialized = _tmp20_; + serialized = _tmp15_; #line 195 "/home/jens/Source/shotwell/src/util/misc.vala" serialized_length1 = bytes; #line 195 "/home/jens/Source/shotwell/src/util/misc.vala" _serialized_size_ = serialized_length1; #line 196 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp21_ = atoms; + _tmp16_ = atoms; #line 196 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp21__length1 = atoms_length1; + _tmp16__length1 = atoms_length1; #line 196 "/home/jens/Source/shotwell/src/util/misc.vala" - memcpy (serialized, _tmp21_, bytes); + memcpy (serialized, _tmp16_, bytes); #line 198 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp22_ = serialized; + _tmp17_ = serialized; #line 198 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp22__length1 = serialized_length1; + _tmp17__length1 = serialized_length1; #line 198 "/home/jens/Source/shotwell/src/util/misc.vala" if (result_length1) { #line 198 "/home/jens/Source/shotwell/src/util/misc.vala" - *result_length1 = _tmp22__length1; -#line 1761 "misc.c" + *result_length1 = _tmp17__length1; +#line 1644 "misc.c" } #line 198 "/home/jens/Source/shotwell/src/util/misc.vala" - result = _tmp22_; + result = _tmp17_; #line 198 "/home/jens/Source/shotwell/src/util/misc.vala" atoms = (g_free (atoms), NULL); #line 198 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1769 "misc.c" +#line 1652 "misc.c" } -GeeList* unserialize_media_sources (guchar* serialized, gint size) { +GeeList* +unserialize_media_sources (guchar* serialized, + gint size) +{ GeeList* result = NULL; gsize count = 0UL; - gint _tmp0_; - gboolean _tmp1_ = FALSE; - gsize _tmp2_; + gboolean _tmp0_ = FALSE; + gsize _tmp1_; GdkAtom* atoms = NULL; - gsize _tmp4_; - GdkAtom* _tmp5_; + gsize _tmp2_; + GdkAtom* _tmp3_; gint atoms_length1; gint _atoms_size_; + GdkAtom* _tmp4_; + gint _tmp4__length1; + GeeArrayList* list = NULL; + GeeArrayList* _tmp5_; GdkAtom* _tmp6_; gint _tmp6__length1; - guchar* _tmp7_; - gint _tmp8_; - GeeArrayList* list = NULL; - GeeArrayList* _tmp9_; - GdkAtom* _tmp10_; - gint _tmp10__length1; #line 202 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = size; -#line 202 "/home/jens/Source/shotwell/src/util/misc.vala" - count = (gsize) (_tmp0_ / sizeof (GdkAtom)); + count = (gsize) (size / sizeof (GdkAtom)); #line 203 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = count; + _tmp1_ = count; #line 203 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp2_ <= ((gsize) 0)) { + if (_tmp1_ <= ((gsize) 0)) { #line 203 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = TRUE; -#line 1802 "misc.c" + _tmp0_ = TRUE; +#line 1683 "misc.c" } else { - guchar* _tmp3_; -#line 203 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = serialized; #line 203 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = _tmp3_ == NULL; -#line 1809 "misc.c" + _tmp0_ = serialized == NULL; +#line 1687 "misc.c" } #line 203 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp1_) { + if (_tmp0_) { #line 204 "/home/jens/Source/shotwell/src/util/misc.vala" result = NULL; #line 204 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1817 "misc.c" +#line 1695 "misc.c" } #line 206 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = count; + _tmp2_ = count; #line 206 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = g_new0 (GdkAtom, _tmp4_); + _tmp3_ = g_new0 (GdkAtom, _tmp2_); #line 206 "/home/jens/Source/shotwell/src/util/misc.vala" - atoms = _tmp5_; + atoms = _tmp3_; #line 206 "/home/jens/Source/shotwell/src/util/misc.vala" - atoms_length1 = _tmp4_; + atoms_length1 = _tmp2_; #line 206 "/home/jens/Source/shotwell/src/util/misc.vala" _atoms_size_ = atoms_length1; #line 207 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = atoms; -#line 207 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6__length1 = atoms_length1; -#line 207 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp7_ = serialized; + _tmp4_ = atoms; #line 207 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp8_ = size; + _tmp4__length1 = atoms_length1; #line 207 "/home/jens/Source/shotwell/src/util/misc.vala" - memcpy (_tmp6_, _tmp7_, (gsize) _tmp8_); + memcpy (_tmp4_, serialized, (gsize) size); #line 209 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp9_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); + _tmp5_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 209 "/home/jens/Source/shotwell/src/util/misc.vala" - list = _tmp9_; + list = _tmp5_; #line 210 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10_ = atoms; + _tmp6_ = atoms; #line 210 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp10__length1 = atoms_length1; -#line 1847 "misc.c" + _tmp6__length1 = atoms_length1; +#line 1721 "misc.c" { GdkAtom* current_atom_collection = NULL; gint current_atom_collection_length1 = 0; gint _current_atom_collection_size_ = 0; gint current_atom_it = 0; #line 210 "/home/jens/Source/shotwell/src/util/misc.vala" - current_atom_collection = _tmp10_; + current_atom_collection = _tmp6_; #line 210 "/home/jens/Source/shotwell/src/util/misc.vala" - current_atom_collection_length1 = _tmp10__length1; + current_atom_collection_length1 = _tmp6__length1; #line 210 "/home/jens/Source/shotwell/src/util/misc.vala" - for (current_atom_it = 0; current_atom_it < _tmp10__length1; current_atom_it = current_atom_it + 1) { -#line 1859 "misc.c" + for (current_atom_it = 0; current_atom_it < _tmp6__length1; current_atom_it = current_atom_it + 1) { +#line 1733 "misc.c" GdkAtom current_atom = 0U; #line 210 "/home/jens/Source/shotwell/src/util/misc.vala" current_atom = current_atom_collection[current_atom_it]; -#line 1863 "misc.c" +#line 1737 "misc.c" { MediaSource* media = NULL; - MediaCollectionRegistry* _tmp11_; - MediaCollectionRegistry* _tmp12_; - GdkAtom _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; + MediaCollectionRegistry* _tmp7_; + MediaCollectionRegistry* _tmp8_; + GdkAtom _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + MediaSource* _tmp12_; + MediaSource* _tmp13_; + MediaSource* _tmp14_; + GeeArrayList* _tmp15_; MediaSource* _tmp16_; - MediaSource* _tmp17_; - MediaSource* _tmp18_; - GeeArrayList* _tmp19_; - MediaSource* _tmp20_; #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp11_ = media_collection_registry_get_instance (); + _tmp7_ = media_collection_registry_get_instance (); #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp13_ = current_atom; + _tmp9_ = current_atom; #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp14_ = gdk_atom_name (_tmp13_); + _tmp10_ = gdk_atom_name (_tmp9_); #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp15_ = _tmp14_; + _tmp11_ = _tmp10_; #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp16_ = media_collection_registry_fetch_media (_tmp12_, _tmp15_); + _tmp12_ = media_collection_registry_fetch_media (_tmp8_, _tmp11_); #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp17_ = _tmp16_; + _tmp13_ = _tmp12_; #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp11_); #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - _media_collection_registry_unref0 (_tmp12_); + _media_collection_registry_unref0 (_tmp8_); #line 211 "/home/jens/Source/shotwell/src/util/misc.vala" - media = _tmp17_; + media = _tmp13_; #line 212 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp18_ = media; + _tmp14_ = media; #line 212 "/home/jens/Source/shotwell/src/util/misc.vala" - _vala_assert (_tmp18_ != NULL, "media != null"); + _vala_assert (_tmp14_ != NULL, "media != null"); #line 213 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp19_ = list; + _tmp15_ = list; #line 213 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp20_ = media; + _tmp16_ = media; #line 213 "/home/jens/Source/shotwell/src/util/misc.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_); #line 210 "/home/jens/Source/shotwell/src/util/misc.vala" _g_object_unref0 (media); -#line 1908 "misc.c" +#line 1782 "misc.c" } } } @@ -1914,11 +1788,14 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) { atoms = (g_free (atoms), NULL); #line 216 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 1918 "misc.c" +#line 1792 "misc.c" } -static gchar* g_time_format (struct tm *self, const gchar* format) { +static gchar* +g_time_format (struct tm *self, + const gchar* format) +{ gchar* result = NULL; gchar* buffer = NULL; gchar* _tmp0_; @@ -1926,45 +1803,45 @@ static gchar* g_time_format (struct tm *self, const gchar* format) { gint _buffer_size_; gchar* _tmp1_; gint _tmp1__length1; - const gchar* _tmp2_; + gchar* _tmp2_; + gint _tmp2__length1; gchar* _tmp3_; - gint _tmp3__length1; - gchar* _tmp4_; -#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2874 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (format != NULL, NULL); -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_new0 (gchar, 64); -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer = _tmp0_; -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer_length1 = 64; -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _buffer_size_ = buffer_length1; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = buffer; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1__length1 = buffer_length1; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = format; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self)); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = buffer; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3__length1 = buffer_length1; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = g_strdup ((const gchar*) _tmp3_); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + strftime (_tmp1_, _tmp1__length1, format, &(*self)); +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = buffer; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2__length1 = buffer_length1; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_strdup ((const gchar*) _tmp2_); +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp3_; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer = (g_free (buffer), NULL); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 1964 "misc.c" +#line 1838 "misc.c" } -gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) { +gchar* +format_local_datespan (struct tm* from_date, + struct tm* to_date) +{ gchar* result = NULL; gchar* from_format = NULL; gchar* to_format = NULL; @@ -1996,7 +1873,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) { _tmp3_ = _tmp2_.tm_year; #line 224 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp1_ == _tmp3_) { -#line 2000 "misc.c" +#line 1877 "misc.c" gboolean _tmp4_ = FALSE; struct tm _tmp5_; gint _tmp6_; @@ -2012,7 +1889,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) { _tmp8_ = _tmp7_.tm_mon; #line 226 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp6_ == _tmp8_) { -#line 2016 "misc.c" +#line 1893 "misc.c" struct tm _tmp9_; gint _tmp10_; struct tm _tmp11_; @@ -2027,15 +1904,15 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) { _tmp12_ = _tmp11_.tm_mday; #line 226 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp4_ = _tmp10_ == (_tmp12_ - 1); -#line 2031 "misc.c" +#line 1908 "misc.c" } else { #line 226 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp4_ = FALSE; -#line 2035 "misc.c" +#line 1912 "misc.c" } #line 226 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp4_) { -#line 2039 "misc.c" +#line 1916 "misc.c" gchar* _tmp13_; gchar* _tmp14_; #line 228 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -2050,7 +1927,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) { _g_free0 (to_format); #line 229 "/home/jens/Source/shotwell/src/util/misc.vala" to_format = _tmp14_; -#line 2054 "misc.c" +#line 1931 "misc.c" } else { gchar* _tmp15_; gchar* _tmp16_; @@ -2066,7 +1943,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) { _g_free0 (to_format); #line 234 "/home/jens/Source/shotwell/src/util/misc.vala" to_format = _tmp16_; -#line 2070 "misc.c" +#line 1947 "misc.c" } } else { gchar* _tmp17_; @@ -2083,7 +1960,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) { _g_free0 (to_format); #line 240 "/home/jens/Source/shotwell/src/util/misc.vala" to_format = _tmp18_; -#line 2087 "misc.c" +#line 1964 "misc.c" } #line 243 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp19_ = from_format; @@ -2119,11 +1996,13 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) { _g_free0 (from_format); #line 243 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 2123 "misc.c" +#line 2000 "misc.c" } -gchar* format_local_date (struct tm* date) { +gchar* +format_local_date (struct tm* date) +{ gchar* result = NULL; gchar* _tmp0_; gchar* _tmp1_; @@ -2153,50 +2032,52 @@ gchar* format_local_date (struct tm* date) { result = _tmp5_; #line 248 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 2157 "misc.c" +#line 2036 "misc.c" } -OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target) { +OneShotScheduler* +one_shot_scheduler_construct (GType object_type, + const gchar* name, + OneShotCallback callback, + void* callback_target) +{ OneShotScheduler* self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - OneShotCallback _tmp2_; - void* _tmp2__target; + gchar* _tmp0_; #line 258 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail (name != NULL, NULL); #line 258 "/home/jens/Source/shotwell/src/util/misc.vala" self = (OneShotScheduler*) g_type_create_instance (object_type); #line 259 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = name; -#line 259 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 259 "/home/jens/Source/shotwell/src/util/misc.vala" _g_free0 (self->priv->name); #line 259 "/home/jens/Source/shotwell/src/util/misc.vala" - self->priv->name = _tmp1_; + self->priv->name = _tmp0_; #line 260 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = callback; + self->priv->callback = callback; #line 260 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2__target = callback_target; -#line 260 "/home/jens/Source/shotwell/src/util/misc.vala" - self->priv->callback = _tmp2_; -#line 260 "/home/jens/Source/shotwell/src/util/misc.vala" - self->priv->callback_target = _tmp2__target; + self->priv->callback_target = callback_target; #line 258 "/home/jens/Source/shotwell/src/util/misc.vala" return self; -#line 2189 "misc.c" +#line 2064 "misc.c" } -OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target) { +OneShotScheduler* +one_shot_scheduler_new (const gchar* name, + OneShotCallback callback, + void* callback_target) +{ #line 258 "/home/jens/Source/shotwell/src/util/misc.vala" return one_shot_scheduler_construct (TYPE_ONE_SHOT_SCHEDULER, name, callback, callback_target); -#line 2196 "misc.c" +#line 2075 "misc.c" } -gboolean one_shot_scheduler_is_scheduled (OneShotScheduler* self) { +gboolean +one_shot_scheduler_is_scheduled (OneShotScheduler* self) +{ gboolean result = FALSE; guint _tmp0_; #line 271 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -2207,29 +2088,36 @@ gboolean one_shot_scheduler_is_scheduled (OneShotScheduler* self) { result = _tmp0_ != ((guint) 0); #line 272 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 2211 "misc.c" +#line 2092 "misc.c" } -void one_shot_scheduler_at_idle (OneShotScheduler* self) { +void +one_shot_scheduler_at_idle (OneShotScheduler* self) +{ #line 275 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self)); #line 276 "/home/jens/Source/shotwell/src/util/misc.vala" one_shot_scheduler_at_priority_idle (self, G_PRIORITY_DEFAULT_IDLE); -#line 2220 "misc.c" +#line 2103 "misc.c" } -static gboolean _one_shot_scheduler_callback_wrapper_gsource_func (gpointer self) { +static gboolean +_one_shot_scheduler_callback_wrapper_gsource_func (gpointer self) +{ gboolean result; result = one_shot_scheduler_callback_wrapper ((OneShotScheduler*) self); #line 281 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 2229 "misc.c" +#line 2114 "misc.c" } -void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority) { +void +one_shot_scheduler_at_priority_idle (OneShotScheduler* self, + gint priority) +{ guint _tmp0_; #line 279 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self)); @@ -2237,91 +2125,76 @@ void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority) _tmp0_ = self->priv->scheduled; #line 280 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp0_ == ((guint) 0)) { -#line 2241 "misc.c" - gint _tmp1_; - guint _tmp2_; #line 281 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = priority; -#line 281 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = g_idle_add_full (_tmp1_, _one_shot_scheduler_callback_wrapper_gsource_func, one_shot_scheduler_ref (self), one_shot_scheduler_unref); -#line 281 "/home/jens/Source/shotwell/src/util/misc.vala" - self->priv->scheduled = _tmp2_; -#line 2250 "misc.c" + self->priv->scheduled = g_idle_add_full (priority, _one_shot_scheduler_callback_wrapper_gsource_func, one_shot_scheduler_ref (self), one_shot_scheduler_unref); +#line 2131 "misc.c" } } -void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule) { - guint _tmp0_; - gboolean _tmp1_; +void +one_shot_scheduler_after_timeout (OneShotScheduler* self, + guint msec, + gboolean reschedule) +{ #line 284 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self)); #line 285 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = msec; -#line 285 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = reschedule; -#line 285 "/home/jens/Source/shotwell/src/util/misc.vala" - one_shot_scheduler_priority_after_timeout (self, G_PRIORITY_DEFAULT, _tmp0_, _tmp1_); -#line 2266 "misc.c" + one_shot_scheduler_priority_after_timeout (self, G_PRIORITY_DEFAULT, msec, reschedule); +#line 2145 "misc.c" } -void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint priority, guint msec, gboolean reschedule) { +void +one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, + gint priority, + guint msec, + gboolean reschedule) +{ gboolean _tmp0_ = FALSE; guint _tmp1_; - guint _tmp3_; - gint _tmp5_; - guint _tmp6_; - guint _tmp7_; + guint _tmp2_; #line 288 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self)); #line 289 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp1_ = self->priv->scheduled; #line 289 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp1_ != ((guint) 0)) { -#line 2283 "misc.c" - gboolean _tmp2_; -#line 289 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp2_ = reschedule; #line 289 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = !_tmp2_; -#line 2289 "misc.c" + _tmp0_ = !reschedule; +#line 2166 "misc.c" } else { #line 289 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp0_ = FALSE; -#line 2293 "misc.c" +#line 2170 "misc.c" } #line 289 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp0_) { #line 290 "/home/jens/Source/shotwell/src/util/misc.vala" return; -#line 2299 "misc.c" +#line 2176 "misc.c" } #line 292 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp3_ = self->priv->scheduled; + _tmp2_ = self->priv->scheduled; #line 292 "/home/jens/Source/shotwell/src/util/misc.vala" - if (_tmp3_ != ((guint) 0)) { -#line 2305 "misc.c" - guint _tmp4_; + if (_tmp2_ != ((guint) 0)) { +#line 2182 "misc.c" + guint _tmp3_; #line 293 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp4_ = self->priv->scheduled; + _tmp3_ = self->priv->scheduled; #line 293 "/home/jens/Source/shotwell/src/util/misc.vala" - g_source_remove (_tmp4_); -#line 2311 "misc.c" + g_source_remove (_tmp3_); +#line 2188 "misc.c" } #line 295 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp5_ = priority; -#line 295 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp6_ = msec; -#line 295 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp7_ = g_timeout_add_full (_tmp5_, _tmp6_, _one_shot_scheduler_callback_wrapper_gsource_func, one_shot_scheduler_ref (self), one_shot_scheduler_unref); -#line 295 "/home/jens/Source/shotwell/src/util/misc.vala" - self->priv->scheduled = _tmp7_; -#line 2321 "misc.c" + self->priv->scheduled = g_timeout_add_full (priority, msec, _one_shot_scheduler_callback_wrapper_gsource_func, one_shot_scheduler_ref (self), one_shot_scheduler_unref); +#line 2192 "misc.c" } -void one_shot_scheduler_cancel (OneShotScheduler* self) { +void +one_shot_scheduler_cancel (OneShotScheduler* self) +{ guint _tmp0_; guint _tmp1_; #line 298 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -2332,7 +2205,7 @@ void one_shot_scheduler_cancel (OneShotScheduler* self) { if (_tmp0_ == ((guint) 0)) { #line 300 "/home/jens/Source/shotwell/src/util/misc.vala" return; -#line 2336 "misc.c" +#line 2209 "misc.c" } #line 302 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp1_ = self->priv->scheduled; @@ -2340,11 +2213,13 @@ void one_shot_scheduler_cancel (OneShotScheduler* self) { g_source_remove (_tmp1_); #line 303 "/home/jens/Source/shotwell/src/util/misc.vala" self->priv->scheduled = (guint) 0; -#line 2344 "misc.c" +#line 2217 "misc.c" } -static gboolean one_shot_scheduler_callback_wrapper (OneShotScheduler* self) { +static gboolean +one_shot_scheduler_callback_wrapper (OneShotScheduler* self) +{ gboolean result = FALSE; OneShotCallback _tmp0_; void* _tmp0__target; @@ -2362,108 +2237,133 @@ static gboolean one_shot_scheduler_callback_wrapper (OneShotScheduler* self) { result = FALSE; #line 310 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 2366 "misc.c" +#line 2241 "misc.c" } -static void value_one_shot_scheduler_init (GValue* value) { +static void +value_one_shot_scheduler_init (GValue* value) +{ #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = NULL; -#line 2373 "misc.c" +#line 2250 "misc.c" } -static void value_one_shot_scheduler_free_value (GValue* value) { +static void +value_one_shot_scheduler_free_value (GValue* value) +{ #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" if (value->data[0].v_pointer) { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" one_shot_scheduler_unref (value->data[0].v_pointer); -#line 2382 "misc.c" +#line 2261 "misc.c" } } -static void value_one_shot_scheduler_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_one_shot_scheduler_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" if (src_value->data[0].v_pointer) { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" dest_value->data[0].v_pointer = one_shot_scheduler_ref (src_value->data[0].v_pointer); -#line 2392 "misc.c" +#line 2274 "misc.c" } else { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" dest_value->data[0].v_pointer = NULL; -#line 2396 "misc.c" +#line 2278 "misc.c" } } -static gpointer value_one_shot_scheduler_peek_pointer (const GValue* value) { +static gpointer +value_one_shot_scheduler_peek_pointer (const GValue* value) +{ #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" return value->data[0].v_pointer; -#line 2404 "misc.c" +#line 2288 "misc.c" } -static gchar* value_one_shot_scheduler_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_one_shot_scheduler_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" if (collect_values[0].v_pointer) { -#line 2411 "misc.c" +#line 2300 "misc.c" OneShotScheduler * object; object = collect_values[0].v_pointer; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" if (object->parent_instance.g_class == NULL) { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2418 "misc.c" +#line 2307 "misc.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 253 "/home/jens/Source/shotwell/src/util/misc.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 2422 "misc.c" +#line 2311 "misc.c" } #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = one_shot_scheduler_ref (object); -#line 2426 "misc.c" +#line 2315 "misc.c" } else { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = NULL; -#line 2430 "misc.c" +#line 2319 "misc.c" } #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" return NULL; -#line 2434 "misc.c" +#line 2323 "misc.c" } -static gchar* value_one_shot_scheduler_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_one_shot_scheduler_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ OneShotScheduler ** object_p; object_p = collect_values[0].v_pointer; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" if (!object_p) { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2445 "misc.c" +#line 2339 "misc.c" } #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" if (!value->data[0].v_pointer) { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" *object_p = NULL; -#line 2451 "misc.c" +#line 2345 "misc.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" *object_p = value->data[0].v_pointer; -#line 2455 "misc.c" +#line 2349 "misc.c" } else { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" *object_p = one_shot_scheduler_ref (value->data[0].v_pointer); -#line 2459 "misc.c" +#line 2353 "misc.c" } #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" return NULL; -#line 2463 "misc.c" +#line 2357 "misc.c" } -GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_one_shot_scheduler (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecOneShotScheduler* spec; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_ONE_SHOT_SCHEDULER), NULL); @@ -2473,20 +2373,25 @@ GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" return G_PARAM_SPEC (spec); -#line 2477 "misc.c" +#line 2377 "misc.c" } -gpointer value_get_one_shot_scheduler (const GValue* value) { +gpointer +value_get_one_shot_scheduler (const GValue* value) +{ #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ONE_SHOT_SCHEDULER), NULL); #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" return value->data[0].v_pointer; -#line 2486 "misc.c" +#line 2388 "misc.c" } -void value_set_one_shot_scheduler (GValue* value, gpointer v_object) { +void +value_set_one_shot_scheduler (GValue* value, + gpointer v_object) +{ OneShotScheduler * old; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ONE_SHOT_SCHEDULER)); @@ -2502,22 +2407,25 @@ void value_set_one_shot_scheduler (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" one_shot_scheduler_ref (value->data[0].v_pointer); -#line 2506 "misc.c" +#line 2411 "misc.c" } else { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = NULL; -#line 2510 "misc.c" +#line 2415 "misc.c" } #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" if (old) { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" one_shot_scheduler_unref (old); -#line 2516 "misc.c" +#line 2421 "misc.c" } } -void value_take_one_shot_scheduler (GValue* value, gpointer v_object) { +void +value_take_one_shot_scheduler (GValue* value, + gpointer v_object) +{ OneShotScheduler * old; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ONE_SHOT_SCHEDULER)); @@ -2531,44 +2439,50 @@ void value_take_one_shot_scheduler (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = v_object; -#line 2535 "misc.c" +#line 2443 "misc.c" } else { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = NULL; -#line 2539 "misc.c" +#line 2447 "misc.c" } #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" if (old) { #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" one_shot_scheduler_unref (old); -#line 2545 "misc.c" +#line 2453 "misc.c" } } -static void one_shot_scheduler_class_init (OneShotSchedulerClass * klass) { +static void +one_shot_scheduler_class_init (OneShotSchedulerClass * klass) +{ #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" one_shot_scheduler_parent_class = g_type_class_peek_parent (klass); #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" ((OneShotSchedulerClass *) klass)->finalize = one_shot_scheduler_finalize; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" g_type_class_add_private (klass, sizeof (OneShotSchedulerPrivate)); -#line 2557 "misc.c" +#line 2467 "misc.c" } -static void one_shot_scheduler_instance_init (OneShotScheduler * self) { +static void +one_shot_scheduler_instance_init (OneShotScheduler * self) +{ #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" self->priv = ONE_SHOT_SCHEDULER_GET_PRIVATE (self); #line 256 "/home/jens/Source/shotwell/src/util/misc.vala" self->priv->scheduled = (guint) 0; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" self->ref_count = 1; -#line 2568 "misc.c" +#line 2480 "misc.c" } -static void one_shot_scheduler_finalize (OneShotScheduler * obj) { +static void +one_shot_scheduler_finalize (OneShotScheduler * obj) +{ OneShotScheduler * self; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ONE_SHOT_SCHEDULER, OneShotScheduler); @@ -2578,11 +2492,13 @@ static void one_shot_scheduler_finalize (OneShotScheduler * obj) { one_shot_scheduler_cancel (self); #line 254 "/home/jens/Source/shotwell/src/util/misc.vala" _g_free0 (self->priv->name); -#line 2582 "misc.c" +#line 2496 "misc.c" } -GType one_shot_scheduler_get_type (void) { +GType +one_shot_scheduler_get_type (void) +{ static volatile gsize one_shot_scheduler_type_id__volatile = 0; if (g_once_init_enter (&one_shot_scheduler_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_one_shot_scheduler_init, value_one_shot_scheduler_free_value, value_one_shot_scheduler_copy_value, value_one_shot_scheduler_peek_pointer, "p", value_one_shot_scheduler_collect_value, "p", value_one_shot_scheduler_lcopy_value }; @@ -2596,18 +2512,22 @@ GType one_shot_scheduler_get_type (void) { } -gpointer one_shot_scheduler_ref (gpointer instance) { +gpointer +one_shot_scheduler_ref (gpointer instance) +{ OneShotScheduler * self; self = instance; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" g_atomic_int_inc (&self->ref_count); #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" return instance; -#line 2607 "misc.c" +#line 2525 "misc.c" } -void one_shot_scheduler_unref (gpointer instance) { +void +one_shot_scheduler_unref (gpointer instance) +{ OneShotScheduler * self; self = instance; #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -2616,41 +2536,45 @@ void one_shot_scheduler_unref (gpointer instance) { ONE_SHOT_SCHEDULER_GET_CLASS (self)->finalize (self); #line 253 "/home/jens/Source/shotwell/src/util/misc.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2620 "misc.c" +#line 2540 "misc.c" } } -OpTimer* op_timer_construct (GType object_type, const gchar* name) { +OpTimer* +op_timer_construct (GType object_type, + const gchar* name) +{ OpTimer* self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; + gchar* _tmp0_; #line 322 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail (name != NULL, NULL); #line 322 "/home/jens/Source/shotwell/src/util/misc.vala" self = (OpTimer*) g_type_create_instance (object_type); #line 323 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp0_ = name; -#line 323 "/home/jens/Source/shotwell/src/util/misc.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 323 "/home/jens/Source/shotwell/src/util/misc.vala" _g_free0 (self->priv->name); #line 323 "/home/jens/Source/shotwell/src/util/misc.vala" - self->priv->name = _tmp1_; + self->priv->name = _tmp0_; #line 322 "/home/jens/Source/shotwell/src/util/misc.vala" return self; -#line 2643 "misc.c" +#line 2563 "misc.c" } -OpTimer* op_timer_new (const gchar* name) { +OpTimer* +op_timer_new (const gchar* name) +{ #line 322 "/home/jens/Source/shotwell/src/util/misc.vala" return op_timer_construct (TYPE_OP_TIMER, name); -#line 2650 "misc.c" +#line 2572 "misc.c" } -void op_timer_start (OpTimer* self) { +void +op_timer_start (OpTimer* self) +{ GTimer* _tmp0_; #line 326 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_if_fail (IS_OP_TIMER (self)); @@ -2658,11 +2582,13 @@ void op_timer_start (OpTimer* self) { _tmp0_ = self->priv->timer; #line 327 "/home/jens/Source/shotwell/src/util/misc.vala" g_timer_start (_tmp0_); -#line 2662 "misc.c" +#line 2586 "misc.c" } -void op_timer_stop (OpTimer* self) { +void +op_timer_stop (OpTimer* self) +{ gdouble time = 0.0; GTimer* _tmp0_; gdouble _tmp1_; @@ -2693,13 +2619,13 @@ void op_timer_stop (OpTimer* self) { _tmp5_ = self->priv->shortest; #line 335 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp4_ < _tmp5_) { -#line 2697 "misc.c" +#line 2623 "misc.c" gdouble _tmp6_; #line 336 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp6_ = time; #line 336 "/home/jens/Source/shotwell/src/util/misc.vala" self->priv->shortest = _tmp6_; -#line 2703 "misc.c" +#line 2629 "misc.c" } #line 338 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp7_ = time; @@ -2707,23 +2633,25 @@ void op_timer_stop (OpTimer* self) { _tmp8_ = self->priv->longest; #line 338 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp7_ > _tmp8_) { -#line 2711 "misc.c" +#line 2637 "misc.c" gdouble _tmp9_; #line 339 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp9_ = time; #line 339 "/home/jens/Source/shotwell/src/util/misc.vala" self->priv->longest = _tmp9_; -#line 2717 "misc.c" +#line 2643 "misc.c" } #line 341 "/home/jens/Source/shotwell/src/util/misc.vala" _tmp10_ = self->priv->count; #line 341 "/home/jens/Source/shotwell/src/util/misc.vala" self->priv->count = _tmp10_ + 1; -#line 2723 "misc.c" +#line 2649 "misc.c" } -gchar* op_timer_to_string (OpTimer* self) { +gchar* +op_timer_to_string (OpTimer* self) +{ gchar* result = NULL; glong _tmp0_; #line 344 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -2732,7 +2660,7 @@ gchar* op_timer_to_string (OpTimer* self) { _tmp0_ = self->priv->count; #line 345 "/home/jens/Source/shotwell/src/util/misc.vala" if (_tmp0_ > ((glong) 0)) { -#line 2736 "misc.c" +#line 2664 "misc.c" const gchar* _tmp1_; glong _tmp2_; gdouble _tmp3_; @@ -2761,7 +2689,7 @@ gchar* op_timer_to_string (OpTimer* self) { result = _tmp8_; #line 346 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 2765 "misc.c" +#line 2693 "misc.c" } else { const gchar* _tmp9_; gchar* _tmp10_; @@ -2773,109 +2701,134 @@ gchar* op_timer_to_string (OpTimer* self) { result = _tmp10_; #line 349 "/home/jens/Source/shotwell/src/util/misc.vala" return result; -#line 2777 "misc.c" +#line 2705 "misc.c" } } -static void value_op_timer_init (GValue* value) { +static void +value_op_timer_init (GValue* value) +{ #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = NULL; -#line 2785 "misc.c" +#line 2715 "misc.c" } -static void value_op_timer_free_value (GValue* value) { +static void +value_op_timer_free_value (GValue* value) +{ #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" if (value->data[0].v_pointer) { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" op_timer_unref (value->data[0].v_pointer); -#line 2794 "misc.c" +#line 2726 "misc.c" } } -static void value_op_timer_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_op_timer_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" if (src_value->data[0].v_pointer) { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" dest_value->data[0].v_pointer = op_timer_ref (src_value->data[0].v_pointer); -#line 2804 "misc.c" +#line 2739 "misc.c" } else { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" dest_value->data[0].v_pointer = NULL; -#line 2808 "misc.c" +#line 2743 "misc.c" } } -static gpointer value_op_timer_peek_pointer (const GValue* value) { +static gpointer +value_op_timer_peek_pointer (const GValue* value) +{ #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" return value->data[0].v_pointer; -#line 2816 "misc.c" +#line 2753 "misc.c" } -static gchar* value_op_timer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_op_timer_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" if (collect_values[0].v_pointer) { -#line 2823 "misc.c" +#line 2765 "misc.c" OpTimer * object; object = collect_values[0].v_pointer; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" if (object->parent_instance.g_class == NULL) { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2830 "misc.c" +#line 2772 "misc.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 314 "/home/jens/Source/shotwell/src/util/misc.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 2834 "misc.c" +#line 2776 "misc.c" } #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = op_timer_ref (object); -#line 2838 "misc.c" +#line 2780 "misc.c" } else { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = NULL; -#line 2842 "misc.c" +#line 2784 "misc.c" } #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" return NULL; -#line 2846 "misc.c" +#line 2788 "misc.c" } -static gchar* value_op_timer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_op_timer_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ OpTimer ** object_p; object_p = collect_values[0].v_pointer; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" if (!object_p) { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2857 "misc.c" +#line 2804 "misc.c" } #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" if (!value->data[0].v_pointer) { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" *object_p = NULL; -#line 2863 "misc.c" +#line 2810 "misc.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" *object_p = value->data[0].v_pointer; -#line 2867 "misc.c" +#line 2814 "misc.c" } else { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" *object_p = op_timer_ref (value->data[0].v_pointer); -#line 2871 "misc.c" +#line 2818 "misc.c" } #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" return NULL; -#line 2875 "misc.c" +#line 2822 "misc.c" } -GParamSpec* param_spec_op_timer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_op_timer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecOpTimer* spec; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_OP_TIMER), NULL); @@ -2885,20 +2838,25 @@ GParamSpec* param_spec_op_timer (const gchar* name, const gchar* nick, const gch G_PARAM_SPEC (spec)->value_type = object_type; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" return G_PARAM_SPEC (spec); -#line 2889 "misc.c" +#line 2842 "misc.c" } -gpointer value_get_op_timer (const GValue* value) { +gpointer +value_get_op_timer (const GValue* value) +{ #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_OP_TIMER), NULL); #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" return value->data[0].v_pointer; -#line 2898 "misc.c" +#line 2853 "misc.c" } -void value_set_op_timer (GValue* value, gpointer v_object) { +void +value_set_op_timer (GValue* value, + gpointer v_object) +{ OpTimer * old; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_OP_TIMER)); @@ -2914,22 +2872,25 @@ void value_set_op_timer (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" op_timer_ref (value->data[0].v_pointer); -#line 2918 "misc.c" +#line 2876 "misc.c" } else { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = NULL; -#line 2922 "misc.c" +#line 2880 "misc.c" } #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" if (old) { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" op_timer_unref (old); -#line 2928 "misc.c" +#line 2886 "misc.c" } } -void value_take_op_timer (GValue* value, gpointer v_object) { +void +value_take_op_timer (GValue* value, + gpointer v_object) +{ OpTimer * old; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_OP_TIMER)); @@ -2943,33 +2904,37 @@ void value_take_op_timer (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = v_object; -#line 2947 "misc.c" +#line 2908 "misc.c" } else { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" value->data[0].v_pointer = NULL; -#line 2951 "misc.c" +#line 2912 "misc.c" } #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" if (old) { #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" op_timer_unref (old); -#line 2957 "misc.c" +#line 2918 "misc.c" } } -static void op_timer_class_init (OpTimerClass * klass) { +static void +op_timer_class_init (OpTimerClass * klass) +{ #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" op_timer_parent_class = g_type_class_peek_parent (klass); #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" ((OpTimerClass *) klass)->finalize = op_timer_finalize; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" g_type_class_add_private (klass, sizeof (OpTimerPrivate)); -#line 2969 "misc.c" +#line 2932 "misc.c" } -static void op_timer_instance_init (OpTimer * self) { +static void +op_timer_instance_init (OpTimer * self) +{ GTimer* _tmp0_; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" self->priv = OP_TIMER_GET_PRIVATE (self); @@ -2987,11 +2952,13 @@ static void op_timer_instance_init (OpTimer * self) { self->priv->longest = DBL_MIN; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" self->ref_count = 1; -#line 2991 "misc.c" +#line 2956 "misc.c" } -static void op_timer_finalize (OpTimer * obj) { +static void +op_timer_finalize (OpTimer * obj) +{ OpTimer * self; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_OP_TIMER, OpTimer); @@ -3001,11 +2968,13 @@ static void op_timer_finalize (OpTimer * obj) { _g_free0 (self->priv->name); #line 316 "/home/jens/Source/shotwell/src/util/misc.vala" _g_timer_destroy0 (self->priv->timer); -#line 3005 "misc.c" +#line 2972 "misc.c" } -GType op_timer_get_type (void) { +GType +op_timer_get_type (void) +{ static volatile gsize op_timer_type_id__volatile = 0; if (g_once_init_enter (&op_timer_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_op_timer_init, value_op_timer_free_value, value_op_timer_copy_value, value_op_timer_peek_pointer, "p", value_op_timer_collect_value, "p", value_op_timer_lcopy_value }; @@ -3019,18 +2988,22 @@ GType op_timer_get_type (void) { } -gpointer op_timer_ref (gpointer instance) { +gpointer +op_timer_ref (gpointer instance) +{ OpTimer * self; self = instance; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" g_atomic_int_inc (&self->ref_count); #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" return instance; -#line 3030 "misc.c" +#line 3001 "misc.c" } -void op_timer_unref (gpointer instance) { +void +op_timer_unref (gpointer instance) +{ OpTimer * self; self = instance; #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" @@ -3039,7 +3012,7 @@ void op_timer_unref (gpointer instance) { OP_TIMER_GET_CLASS (self)->finalize (self); #line 314 "/home/jens/Source/shotwell/src/util/misc.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3043 "misc.c" +#line 3016 "misc.c" } } |