From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 20:55:59 +0200 Subject: New upstream version 0.28.3 --- src/events/EventDirectoryItem.c | 1375 ++++++++++--------- src/events/EventPage.c | 901 +++++++----- src/events/Events.c | 15 +- src/events/EventsBranch.c | 2818 ++++++++++++++++++++------------------ src/events/EventsDirectoryPage.c | 1919 ++++++++++++++------------ 5 files changed, 3741 insertions(+), 3287 deletions(-) (limited to 'src/events') diff --git a/src/events/EventDirectoryItem.c b/src/events/EventDirectoryItem.c index 5141809..9862c4b 100644 --- a/src/events/EventDirectoryItem.c +++ b/src/events/EventDirectoryItem.c @@ -1,4 +1,4 @@ -/* EventDirectoryItem.c generated by valac 0.36.6, the Vala compiler +/* EventDirectoryItem.c generated by valac 0.40.4, the Vala compiler * generated from EventDirectoryItem.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -139,6 +140,11 @@ typedef struct _EventSourceClass EventSourceClass; typedef struct _Event Event; typedef struct _EventClass EventClass; +enum { + EVENT_DIRECTORY_ITEM_0_PROPERTY, + EVENT_DIRECTORY_ITEM_NUM_PROPERTIES +}; +static GParamSpec* event_directory_item_properties[EVENT_DIRECTORY_ITEM_NUM_PROPERTIES]; #define TYPE_SOURCE_COLLECTION (source_collection_get_type ()) #define SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SOURCE_COLLECTION, SourceCollection)) @@ -357,16 +363,28 @@ Scaling event_directory_item_squared_scaling = {0}; GType data_object_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType data_view_get_type (void) G_GNUC_CONST; @@ -381,48 +399,85 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST; GType event_source_get_type (void) G_GNUC_CONST; GType event_get_type (void) G_GNUC_CONST; #define EVENT_DIRECTORY_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItemPrivate)) -enum { - EVENT_DIRECTORY_ITEM_DUMMY_PROPERTY -}; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType event_source_collection_get_type (void) G_GNUC_CONST; -static void event_directory_item_on_events_altered (EventDirectoryItem* self, GeeMap* map); -static void _event_directory_item_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void event_directory_item_on_events_altered (EventDirectoryItem* self, + GeeMap* map); +static void _event_directory_item_on_events_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); GType scaling_get_type (void) G_GNUC_CONST; GType scale_constraint_get_type (void) G_GNUC_CONST; Scaling* scaling_dup (const Scaling* self); void scaling_free (Scaling* self); -void scaling_to_fill_viewport (Dimensions* viewport, Scaling* result); +void scaling_to_fill_viewport (Dimensions* viewport, + Scaling* result); static gint event_directory_item_get_CROPPED_SCALE (void); -void dimensions_init (Dimensions *self, gint width, gint height); +void dimensions_init (Dimensions *self, + gint width, + gint height); EventDirectoryItem* event_directory_item_new (Event* event); -EventDirectoryItem* event_directory_item_construct (GType object_type, Event* event); +EventDirectoryItem* event_directory_item_construct (GType object_type, + Event* event); static gchar* event_directory_item_get_formatted_title (Event* event); gchar* event_source_get_comment (EventSource* self); -CheckerboardItem* checkerboard_item_construct (GType object_type, ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment); +CheckerboardItem* checkerboard_item_construct (GType object_type, + ThumbnailSource* source, + Dimensions* initial_pixbuf_dim, + const gchar* title, + const gchar* comment, + gboolean marked_up, + PangoAlignment alignment); GType media_source_get_type (void) G_GNUC_CONST; -static void event_directory_item_get_paul_lynde_rect (MediaSource* source, GdkRectangle* result); +static void event_directory_item_get_paul_lynde_rect (MediaSource* source, + GdkRectangle* result); MediaSource* event_get_primary_source (Event* self); -void checkerboard_item_clear_image (CheckerboardItem* self, Dimensions* dim); -void dimensions_for_rectangle (GdkRectangle* rect, Dimensions* result); -void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensions* result); +void checkerboard_item_clear_image (CheckerboardItem* self, + Dimensions* dim); +void dimensions_for_rectangle (GdkRectangle* rect, + Dimensions* result); +void scaling_get_scaled_dimensions (Scaling *self, + Dimensions* original, + Dimensions* result); GType photo_exception_get_type (void) G_GNUC_CONST; -void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result); -static GdkPixbuf* event_directory_item_get_paul_lynde (MediaSource* media, GdkRectangle* paul_lynde, GError** error); -GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, Scaling* scaling, GError** error); -void thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, gint scale, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable); +void media_source_get_dimensions (MediaSource* self, + PhotoException disallowed_steps, + Dimensions* result); +static GdkPixbuf* event_directory_item_get_paul_lynde (MediaSource* media, + GdkRectangle* paul_lynde, + GError** error); +GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, + Scaling* scaling, + GError** error); +void thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, + gint scale, + Dimensions* dim, + GdkInterpType interp, + ThumbnailCacheAsyncFetchCallback callback, + void* callback_target, + GCancellable* cancellable); GType thumbnail_cache_size_get_type (void) G_GNUC_CONST; #define THUMBNAIL_CACHE_DEFAULT_INTERP GDK_INTERP_HYPER static void ___lambda19_ (void); -static void ____lambda19__thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self); +static void ____lambda19__thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, + GdkPixbuf* unscaled, + Dimensions* dim, + GdkInterpType interp, + GError* err, + gpointer self); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; -GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error); -void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result); -void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* result); +GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, + Scaling* scaling, + GError** error); +void dimensions_for_pixbuf (GdkPixbuf* pixbuf, + Dimensions* result); +void clamp_rectangle (GdkRectangle* original, + Dimensions* max, + GdkRectangle* result); gboolean media_source_collection_has_photo (GeeCollection* media); GeeCollection* event_source_get_media (EventSource* self); gboolean media_source_collection_has_video (GeeCollection* media); @@ -432,392 +487,423 @@ gchar* data_object_get_name (DataObject* self); gchar* guarded_markup_escape_text (const gchar* plain); static void event_directory_item_real_exposed (CheckerboardItem* base); gboolean checkerboard_item_is_exposed (CheckerboardItem* self); -void checkerboard_item_set_image (CheckerboardItem* self, GdkPixbuf* pixbuf); +void checkerboard_item_set_image (CheckerboardItem* self, + GdkPixbuf* pixbuf); gchar* data_object_to_string (DataObject* self); -static void event_directory_item_update_comment (EventDirectoryItem* self, gboolean init); +static void event_directory_item_update_comment (EventDirectoryItem* self, + gboolean init); void checkerboard_item_exposed (CheckerboardItem* self); static void event_directory_item_real_unexposed (CheckerboardItem* base); void checkerboard_item_unexposed (CheckerboardItem* self); -void checkerboard_item_set_title (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment); +void checkerboard_item_set_title (CheckerboardItem* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment); static void event_directory_item_real_thumbnail_altered (ThumbnailView* base); -static void event_directory_item_real_paint_shadow (CheckerboardItem* base, cairo_t* ctx, Dimensions* dimensions, GdkPoint* origin, gint radius, gfloat initial_alpha); -void checkerboard_item_paint_shadow (CheckerboardItem* self, cairo_t* ctx, Dimensions* dimensions, GdkPoint* origin, gint radius, gfloat initial_alpha); -static void event_directory_item_real_paint_border (CheckerboardItem* base, cairo_t* ctx, Dimensions* object_dimensions, GdkPoint* object_origin, gint border_width); -void checkerboard_item_get_border_dimensions (Dimensions* object_dim, gint border_width, Dimensions* result); -void checkerboard_item_get_border_origin (GdkPoint* object_origin, gint border_width, GdkPoint* result); -void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion); -static void event_directory_item_real_paint_image (CheckerboardItem* base, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin); -void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion); +static void event_directory_item_real_paint_shadow (CheckerboardItem* base, + cairo_t* ctx, + Dimensions* dimensions, + GdkPoint* origin, + gint radius, + gfloat initial_alpha); +void checkerboard_item_paint_shadow (CheckerboardItem* self, + cairo_t* ctx, + Dimensions* dimensions, + GdkPoint* origin, + gint radius, + gfloat initial_alpha); +static void event_directory_item_real_paint_border (CheckerboardItem* base, + cairo_t* ctx, + Dimensions* object_dimensions, + GdkPoint* object_origin, + gint border_width); +void checkerboard_item_get_border_dimensions (Dimensions* object_dim, + gint border_width, + Dimensions* result); +void checkerboard_item_get_border_origin (GdkPoint* object_origin, + gint border_width, + GdkPoint* result); +void draw_rounded_corners_filled (cairo_t* ctx, + Dimensions* dim, + GdkPoint* origin, + gdouble radius_proportion); +static void event_directory_item_real_paint_image (CheckerboardItem* base, + cairo_t* ctx, + GdkPixbuf* pixbuf, + GdkPoint* origin); +void context_rounded_corners (cairo_t* cx, + Dimensions* dim, + GdkPoint* origin, + gdouble radius_proportion); gboolean is_string_empty (const gchar* s); void checkerboard_item_clear_comment (CheckerboardItem* self); -void checkerboard_item_set_comment (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment); +void checkerboard_item_set_comment (CheckerboardItem* self, + const gchar* text, + gboolean marked_up, + PangoAlignment alignment); gint thumbnail_cache_size_get_scale (ThumbnailCacheSize self); static void event_directory_item_finalize (GObject * obj); -static void _vala_event_directory_item_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); +static void _vala_event_directory_item_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec); -static void _event_directory_item_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_event_directory_item_on_events_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 39 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" event_directory_item_on_events_altered ((EventDirectoryItem*) self, items); -#line 463 "EventDirectoryItem.c" +#line 560 "EventDirectoryItem.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 26 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return self ? g_object_ref (self) : NULL; -#line 470 "EventDirectoryItem.c" +#line 569 "EventDirectoryItem.c" } -EventDirectoryItem* event_directory_item_construct (GType object_type, Event* event) { +EventDirectoryItem* +event_directory_item_construct (GType object_type, + Event* event) +{ EventDirectoryItem * self = NULL; - Event* _tmp0_; + gint _tmp0_; gint _tmp1_; gint _tmp2_; gint _tmp3_; - gint _tmp4_; - Dimensions _tmp5_ = {0}; - Event* _tmp6_; + Dimensions _tmp4_ = {0}; + gchar* _tmp5_; + gchar* _tmp6_; gchar* _tmp7_; gchar* _tmp8_; Event* _tmp9_; - gchar* _tmp10_; - gchar* _tmp11_; - Event* _tmp12_; - Event* _tmp13_; - Event* _tmp14_; - MediaSource* _tmp15_; - MediaSource* _tmp16_; - GdkRectangle _tmp17_ = {0}; - GdkRectangle _tmp18_; - Dimensions _tmp19_ = {0}; - EventSourceCollection* _tmp20_; + MediaSource* _tmp10_; + MediaSource* _tmp11_; + GdkRectangle _tmp12_ = {0}; + GdkRectangle _tmp13_; + Dimensions _tmp14_ = {0}; + EventSourceCollection* _tmp15_; #line 22 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" g_return_val_if_fail (IS_EVENT (event), NULL); #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp0_ = event; + _tmp0_ = event_directory_item_get_CROPPED_SCALE (); #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp1_ = event_directory_item_get_CROPPED_SCALE (); + _tmp1_ = _tmp0_; #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp2_ = _tmp1_; + _tmp2_ = event_directory_item_get_CROPPED_SCALE (); #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp3_ = event_directory_item_get_CROPPED_SCALE (); + _tmp3_ = _tmp2_; #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = _tmp3_; + dimensions_init (&_tmp4_, _tmp1_, _tmp3_); #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions_init (&_tmp5_, _tmp2_, _tmp4_); + _tmp5_ = event_directory_item_get_formatted_title (event); #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp6_ = event; + _tmp6_ = _tmp5_; #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp7_ = event_directory_item_get_formatted_title (_tmp6_); + _tmp7_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_EVENT_SOURCE, EventSource)); #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _tmp8_ = _tmp7_; #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp9_ = event; -#line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp10_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_EVENT_SOURCE, EventSource)); -#line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp11_ = _tmp10_; -#line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - self = (EventDirectoryItem*) checkerboard_item_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), &_tmp5_, _tmp8_, _tmp11_, TRUE, PANGO_ALIGN_CENTER); -#line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_free0 (_tmp11_); + self = (EventDirectoryItem*) checkerboard_item_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), &_tmp4_, _tmp6_, _tmp8_, TRUE, PANGO_ALIGN_CENTER); #line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_free0 (_tmp8_); +#line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" + _g_free0 (_tmp6_); #line 26 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp12_ = event; -#line 26 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp13_ = _g_object_ref0 (_tmp12_); + _tmp9_ = _g_object_ref0 (event); #line 26 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (self->event); #line 26 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - self->event = _tmp13_; + self->event = _tmp9_; #line 29 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp14_ = event; + _tmp10_ = event_get_primary_source (event); #line 29 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp15_ = event_get_primary_source (_tmp14_); -#line 29 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp16_ = _tmp15_; + _tmp11_ = _tmp10_; #line 29 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - event_directory_item_get_paul_lynde_rect (_tmp16_, &_tmp17_); + event_directory_item_get_paul_lynde_rect (_tmp11_, &_tmp12_); #line 29 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - self->priv->paul_lynde = _tmp17_; + self->priv->paul_lynde = _tmp12_; #line 29 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_object_unref0 (_tmp16_); + _g_object_unref0 (_tmp11_); #line 32 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp18_ = self->priv->paul_lynde; + _tmp13_ = self->priv->paul_lynde; #line 32 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions_for_rectangle (&_tmp18_, &_tmp19_); + dimensions_for_rectangle (&_tmp13_, &_tmp14_); #line 32 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp19_); + checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp14_); #line 35 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp20_ = event_global; + _tmp15_ = event_global; #line 35 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _event_directory_item_on_events_altered_data_collection_items_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _event_directory_item_on_events_altered_data_collection_items_altered, self, 0); #line 22 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return self; -#line 561 "EventDirectoryItem.c" +#line 648 "EventDirectoryItem.c" } -EventDirectoryItem* event_directory_item_new (Event* event) { +EventDirectoryItem* +event_directory_item_new (Event* event) +{ #line 22 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return event_directory_item_construct (TYPE_EVENT_DIRECTORY_ITEM, event); -#line 568 "EventDirectoryItem.c" +#line 657 "EventDirectoryItem.c" } -static void event_directory_item_get_paul_lynde_rect (MediaSource* source, GdkRectangle* result) { +static void +event_directory_item_get_paul_lynde_rect (MediaSource* source, + GdkRectangle* result) +{ Dimensions scaled = {0}; - MediaSource* _tmp0_; + Dimensions _tmp0_ = {0}; Dimensions _tmp1_ = {0}; - Dimensions _tmp2_ = {0}; GdkRectangle paul_lynde = {0}; - Dimensions _tmp3_; + Dimensions _tmp2_; + gint _tmp3_; gint _tmp4_; gint _tmp5_; - gint _tmp6_; - Dimensions _tmp7_; - gint _tmp8_; + Dimensions _tmp6_; + gint _tmp7_; + Dimensions _tmp8_; gint _tmp9_; - Dimensions _tmp10_; + gint _tmp10_; gint _tmp11_; - gint _tmp12_; + Dimensions _tmp12_; gint _tmp13_; - Dimensions _tmp14_; + gint _tmp14_; gint _tmp15_; gint _tmp16_; gint _tmp17_; - gint _tmp18_; - gint _tmp19_; - gint _tmp20_; #line 43 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" g_return_if_fail (IS_MEDIA_SOURCE (source)); #line 44 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp0_ = source; -#line 44 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - media_source_get_dimensions (_tmp0_, PHOTO_EXCEPTION_NONE, &_tmp1_); + media_source_get_dimensions (source, PHOTO_EXCEPTION_NONE, &_tmp0_); #line 44 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - scaling_get_scaled_dimensions (&event_directory_item_squared_scaling, &_tmp1_, &_tmp2_); + scaling_get_scaled_dimensions (&event_directory_item_squared_scaling, &_tmp0_, &_tmp1_); #line 44 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - scaled = _tmp2_; + scaled = _tmp1_; #line 46 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" memset (&paul_lynde, 0, sizeof (GdkRectangle)); #line 47 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp3_ = scaled; + _tmp2_ = scaled; #line 47 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = _tmp3_.width; + _tmp3_ = _tmp2_.width; #line 47 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp5_ = event_directory_item_get_CROPPED_SCALE (); + _tmp4_ = event_directory_item_get_CROPPED_SCALE (); #line 47 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp6_ = _tmp5_; -#line 47 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp7_ = scaled; + _tmp5_ = _tmp4_; #line 47 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp8_ = _tmp7_.width; + _tmp6_ = scaled; #line 47 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp9_ = CLAMP (_tmp4_ - _tmp6_, 0, _tmp8_); + _tmp7_ = _tmp6_.width; #line 47 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - paul_lynde.x = _tmp9_ / 2; + paul_lynde.x = CLAMP (_tmp3_ - _tmp5_, 0, _tmp7_) / 2; #line 48 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp10_ = scaled; + _tmp8_ = scaled; #line 48 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp11_ = _tmp10_.height; + _tmp9_ = _tmp8_.height; #line 48 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp12_ = event_directory_item_get_CROPPED_SCALE (); + _tmp10_ = event_directory_item_get_CROPPED_SCALE (); #line 48 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp13_ = _tmp12_; -#line 48 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp14_ = scaled; + _tmp11_ = _tmp10_; #line 48 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp15_ = _tmp14_.height; + _tmp12_ = scaled; #line 48 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp16_ = CLAMP (_tmp11_ - _tmp13_, 0, _tmp15_); + _tmp13_ = _tmp12_.height; #line 48 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - paul_lynde.y = _tmp16_ / 2; + paul_lynde.y = CLAMP (_tmp9_ - _tmp11_, 0, _tmp13_) / 2; #line 49 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp17_ = event_directory_item_get_CROPPED_SCALE (); + _tmp14_ = event_directory_item_get_CROPPED_SCALE (); #line 49 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp18_ = _tmp17_; + _tmp15_ = _tmp14_; #line 49 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - paul_lynde.width = _tmp18_; + paul_lynde.width = _tmp15_; #line 50 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp19_ = event_directory_item_get_CROPPED_SCALE (); + _tmp16_ = event_directory_item_get_CROPPED_SCALE (); #line 50 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp20_ = _tmp19_; + _tmp17_ = _tmp16_; #line 50 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - paul_lynde.height = _tmp20_; + paul_lynde.height = _tmp17_; #line 52 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" *result = paul_lynde; #line 52 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return; -#line 656 "EventDirectoryItem.c" +#line 739 "EventDirectoryItem.c" } -static void ___lambda19_ (void) { +static void +___lambda19_ (void) +{ } -static void ____lambda19__thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self) { +static void +____lambda19__thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, + GdkPixbuf* unscaled, + Dimensions* dim, + GdkInterpType interp, + GError* err, + gpointer self) +{ #line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" ___lambda19_ (); -#line 667 "EventDirectoryItem.c" +#line 759 "EventDirectoryItem.c" } -static gpointer _g_error_copy0 (gpointer self) { +static gpointer +_g_error_copy0 (gpointer self) +{ #line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return self ? g_error_copy (self) : NULL; -#line 674 "EventDirectoryItem.c" +#line 768 "EventDirectoryItem.c" } -static GdkPixbuf* event_directory_item_get_paul_lynde (MediaSource* media, GdkRectangle* paul_lynde, GError** error) { +static GdkPixbuf* +event_directory_item_get_paul_lynde (MediaSource* media, + GdkRectangle* paul_lynde, + GError** error) +{ GdkPixbuf* result = NULL; GdkPixbuf* pixbuf = NULL; Dimensions thumbnail_dimensions = {0}; - GdkPixbuf* _tmp17_; - Dimensions _tmp18_ = {0}; - gboolean _tmp19_ = FALSE; - Dimensions _tmp20_; - gint _tmp21_; - GdkRectangle _tmp22_; - gint _tmp23_; - GdkRectangle _tmp37_; - Dimensions _tmp38_; - GdkRectangle _tmp39_ = {0}; - GdkPixbuf* _tmp40_; - GdkRectangle _tmp41_; - gint _tmp42_; - GdkRectangle _tmp43_; - gint _tmp44_; - GdkRectangle _tmp45_; - gint _tmp46_; - GdkRectangle _tmp47_; - gint _tmp48_; - GdkPixbuf* _tmp49_; + GdkPixbuf* _tmp13_; + Dimensions _tmp14_ = {0}; + gboolean _tmp15_ = FALSE; + Dimensions _tmp16_; + gint _tmp17_; + GdkRectangle _tmp18_; + gint _tmp19_; + GdkRectangle _tmp32_; + Dimensions _tmp33_; + GdkRectangle _tmp34_ = {0}; + GdkPixbuf* _tmp35_; + GdkRectangle _tmp36_; + gint _tmp37_; + GdkRectangle _tmp38_; + gint _tmp39_; + GdkRectangle _tmp40_; + gint _tmp41_; + GdkRectangle _tmp42_; + gint _tmp43_; + GdkPixbuf* _tmp44_; GError * _inner_error_ = NULL; #line 56 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" g_return_val_if_fail (IS_MEDIA_SOURCE (media), NULL); #line 56 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" g_return_val_if_fail (paul_lynde != NULL, NULL); -#line 707 "EventDirectoryItem.c" +#line 805 "EventDirectoryItem.c" { GdkPixbuf* _tmp0_ = NULL; - MediaSource* _tmp1_; - Scaling _tmp2_; + Scaling _tmp1_; + GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; - GdkPixbuf* _tmp4_; #line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp1_ = media; + _tmp1_ = event_directory_item_squared_scaling; #line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp2_ = event_directory_item_squared_scaling; + _tmp2_ = media_source_get_preview_pixbuf (media, &_tmp1_, &_inner_error_); #line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp3_ = media_source_get_preview_pixbuf (_tmp1_, &_tmp2_, &_inner_error_); -#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp0_ = _tmp3_; + _tmp0_ = _tmp2_; #line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 724 "EventDirectoryItem.c" +#line 819 "EventDirectoryItem.c" goto __catch58_g_error; } #line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = _tmp0_; + _tmp3_ = _tmp0_; #line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _tmp0_ = NULL; #line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (pixbuf); #line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - pixbuf = _tmp4_; + pixbuf = _tmp3_; #line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (_tmp0_); -#line 737 "EventDirectoryItem.c" +#line 832 "EventDirectoryItem.c" } goto __finally58; __catch58_g_error: { GError* _error_ = NULL; - MediaSource* _tmp5_; - Dimensions _tmp6_ = {0}; - MediaSource* _tmp7_; + Dimensions _tmp4_ = {0}; #line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _error_ = _inner_error_; #line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _inner_error_ = NULL; #line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp5_ = media; + dimensions_init (&_tmp4_, (gint) THUMBNAIL_CACHE_SIZE_BIG, (gint) THUMBNAIL_CACHE_SIZE_BIG); #line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions_init (&_tmp6_, (gint) THUMBNAIL_CACHE_SIZE_BIG, (gint) THUMBNAIL_CACHE_SIZE_BIG); -#line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - thumbnail_cache_fetch_async_scaled (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), (gint) THUMBNAIL_CACHE_SIZE_BIG, &_tmp6_, THUMBNAIL_CACHE_DEFAULT_INTERP, ____lambda19__thumbnail_cache_async_fetch_callback, NULL, NULL); -#line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp7_ = media; + thumbnail_cache_fetch_async_scaled (G_TYPE_CHECK_INSTANCE_CAST (media, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), (gint) THUMBNAIL_CACHE_SIZE_BIG, &_tmp4_, THUMBNAIL_CACHE_DEFAULT_INTERP, ____lambda19__thumbnail_cache_async_fetch_callback, NULL, NULL); #line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO)) { -#line 760 "EventDirectoryItem.c" + if (G_TYPE_CHECK_INSTANCE_TYPE (media, TYPE_LIBRARY_PHOTO)) { +#line 849 "EventDirectoryItem.c" LibraryPhoto* photo = NULL; - MediaSource* _tmp8_; - LibraryPhoto* _tmp9_; - GdkPixbuf* _tmp10_ = NULL; - LibraryPhoto* _tmp11_; - Scaling _tmp12_; - GdkPixbuf* _tmp13_; - GdkPixbuf* _tmp14_; -#line 66 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp8_ = media; + LibraryPhoto* _tmp5_; + GdkPixbuf* _tmp6_ = NULL; + LibraryPhoto* _tmp7_; + Scaling _tmp8_; + GdkPixbuf* _tmp9_; + GdkPixbuf* _tmp10_; #line 66 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (media, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 66 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - photo = _tmp9_; + photo = _tmp5_; #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp11_ = photo; + _tmp7_ = photo; #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp12_ = event_directory_item_squared_scaling; + _tmp8_ = event_directory_item_squared_scaling; #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp13_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp12_, &_inner_error_); + _tmp9_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp8_, &_inner_error_); #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp10_ = _tmp13_; + _tmp6_ = _tmp9_; #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (photo); #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_error_free0 (_error_); -#line 789 "EventDirectoryItem.c" +#line 875 "EventDirectoryItem.c" goto __finally58; } #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp14_ = _tmp10_; + _tmp10_ = _tmp6_; #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp10_ = NULL; + _tmp6_ = NULL; #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (pixbuf); #line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - pixbuf = _tmp14_; + pixbuf = _tmp10_; #line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp6_); #line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (photo); -#line 804 "EventDirectoryItem.c" +#line 890 "EventDirectoryItem.c" } else { - GError* _tmp15_; - GError* _tmp16_; + GError* _tmp11_; + GError* _tmp12_; #line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp15_ = _error_; + _tmp11_ = _error_; #line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp16_ = _g_error_copy0 (_tmp15_); + _tmp12_ = _g_error_copy0 (_tmp11_); #line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _inner_error_ = _tmp16_; + _inner_error_ = _tmp12_; #line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_error_free0 (_error_); -#line 816 "EventDirectoryItem.c" +#line 902 "EventDirectoryItem.c" goto __finally58; } #line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_error_free0 (_error_); -#line 821 "EventDirectoryItem.c" +#line 907 "EventDirectoryItem.c" } __finally58: #line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -828,71 +914,68 @@ static GdkPixbuf* event_directory_item_get_paul_lynde (MediaSource* media, GdkRe _g_object_unref0 (pixbuf); #line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return NULL; -#line 832 "EventDirectoryItem.c" +#line 918 "EventDirectoryItem.c" } #line 73 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp17_ = pixbuf; + _tmp13_ = pixbuf; #line 73 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions_for_pixbuf (_tmp17_, &_tmp18_); + dimensions_for_pixbuf (_tmp13_, &_tmp14_); #line 73 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - thumbnail_dimensions = _tmp18_; + thumbnail_dimensions = _tmp14_; #line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp20_ = thumbnail_dimensions; + _tmp16_ = thumbnail_dimensions; #line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp21_ = _tmp20_.width; + _tmp17_ = _tmp16_.width; #line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp22_ = *paul_lynde; + _tmp18_ = *paul_lynde; #line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp23_ = _tmp22_.width; + _tmp19_ = _tmp18_.width; #line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp21_ > (2 * _tmp23_)) { + if (_tmp17_ > (2 * _tmp19_)) { #line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp19_ = TRUE; -#line 852 "EventDirectoryItem.c" + _tmp15_ = TRUE; +#line 938 "EventDirectoryItem.c" } else { - Dimensions _tmp24_; - gint _tmp25_; - GdkRectangle _tmp26_; - gint _tmp27_; + Dimensions _tmp20_; + gint _tmp21_; + GdkRectangle _tmp22_; + gint _tmp23_; #line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp24_ = thumbnail_dimensions; + _tmp20_ = thumbnail_dimensions; #line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp25_ = _tmp24_.height; + _tmp21_ = _tmp20_.height; #line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp26_ = *paul_lynde; + _tmp22_ = *paul_lynde; #line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp27_ = _tmp26_.height; + _tmp23_ = _tmp22_.height; #line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp19_ = _tmp25_ > (_tmp27_ * 2); -#line 868 "EventDirectoryItem.c" + _tmp15_ = _tmp21_ > (_tmp23_ * 2); +#line 954 "EventDirectoryItem.c" } #line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp19_) { -#line 872 "EventDirectoryItem.c" + if (_tmp15_) { +#line 958 "EventDirectoryItem.c" LibraryPhoto* photo = NULL; - MediaSource* _tmp28_; - LibraryPhoto* _tmp29_; - GdkPixbuf* _tmp30_ = NULL; - LibraryPhoto* _tmp31_; - Scaling _tmp32_; - GdkPixbuf* _tmp33_; - GdkPixbuf* _tmp34_; - GdkPixbuf* _tmp35_; - Dimensions _tmp36_ = {0}; -#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp28_ = media; + LibraryPhoto* _tmp24_; + GdkPixbuf* _tmp25_ = NULL; + LibraryPhoto* _tmp26_; + Scaling _tmp27_; + GdkPixbuf* _tmp28_; + GdkPixbuf* _tmp29_; + GdkPixbuf* _tmp30_; + Dimensions _tmp31_ = {0}; #line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_LIBRARY_PHOTO, LibraryPhoto)); + _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (media, TYPE_LIBRARY_PHOTO, LibraryPhoto)); #line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - photo = _tmp29_; + photo = _tmp24_; #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp31_ = photo; + _tmp26_ = photo; #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp32_ = event_directory_item_squared_scaling; + _tmp27_ = event_directory_item_squared_scaling; #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp33_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp32_, &_inner_error_); + _tmp28_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp27_, &_inner_error_); #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp30_ = _tmp33_; + _tmp25_ = _tmp28_; #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -903,269 +986,247 @@ static GdkPixbuf* event_directory_item_get_paul_lynde (MediaSource* media, GdkRe _g_object_unref0 (pixbuf); #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return NULL; -#line 907 "EventDirectoryItem.c" +#line 990 "EventDirectoryItem.c" } #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp34_ = _tmp30_; + _tmp29_ = _tmp25_; #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp30_ = NULL; + _tmp25_ = NULL; #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (pixbuf); #line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - pixbuf = _tmp34_; + pixbuf = _tmp29_; #line 79 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp35_ = pixbuf; + _tmp30_ = pixbuf; #line 79 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions_for_pixbuf (_tmp35_, &_tmp36_); + dimensions_for_pixbuf (_tmp30_, &_tmp31_); #line 79 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - thumbnail_dimensions = _tmp36_; + thumbnail_dimensions = _tmp31_; #line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_object_unref0 (_tmp30_); + _g_object_unref0 (_tmp25_); #line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (photo); -#line 927 "EventDirectoryItem.c" +#line 1010 "EventDirectoryItem.c" } #line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp37_ = *paul_lynde; + _tmp32_ = *paul_lynde; #line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp38_ = thumbnail_dimensions; + _tmp33_ = thumbnail_dimensions; #line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - clamp_rectangle (&_tmp37_, &_tmp38_, &_tmp39_); + clamp_rectangle (&_tmp32_, &_tmp33_, &_tmp34_); #line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - *paul_lynde = _tmp39_; + *paul_lynde = _tmp34_; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp40_ = pixbuf; + _tmp35_ = pixbuf; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp41_ = *paul_lynde; + _tmp36_ = *paul_lynde; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp42_ = _tmp41_.x; + _tmp37_ = _tmp36_.x; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp43_ = *paul_lynde; + _tmp38_ = *paul_lynde; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp44_ = _tmp43_.y; + _tmp39_ = _tmp38_.y; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp45_ = *paul_lynde; + _tmp40_ = *paul_lynde; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp46_ = _tmp45_.width; + _tmp41_ = _tmp40_.width; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp47_ = *paul_lynde; + _tmp42_ = *paul_lynde; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp48_ = _tmp47_.height; + _tmp43_ = _tmp42_.height; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp49_ = gdk_pixbuf_new_subpixbuf (_tmp40_, _tmp42_, _tmp44_, _tmp46_, _tmp48_); + _tmp44_ = gdk_pixbuf_new_subpixbuf (_tmp35_, _tmp37_, _tmp39_, _tmp41_, _tmp43_); #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - result = _tmp49_; + result = _tmp44_; #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (pixbuf); #line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return result; -#line 963 "EventDirectoryItem.c" +#line 1046 "EventDirectoryItem.c" } -static gchar* event_directory_item_get_formatted_title (Event* event) { +static gchar* +event_directory_item_get_formatted_title (Event* event) +{ gchar* result = NULL; gboolean has_photos = FALSE; - Event* _tmp0_; + GeeCollection* _tmp0_; GeeCollection* _tmp1_; - GeeCollection* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; + gboolean _tmp2_; gboolean has_videos = FALSE; - Event* _tmp5_; - GeeCollection* _tmp6_; - GeeCollection* _tmp7_; - gboolean _tmp8_; - gboolean _tmp9_; + GeeCollection* _tmp3_; + GeeCollection* _tmp4_; + gboolean _tmp5_; gint count = 0; - Event* _tmp10_; - gint _tmp11_; gchar* count_text = NULL; - gchar* _tmp12_; - gboolean _tmp13_ = FALSE; - gboolean _tmp14_; + gchar* _tmp6_; + gboolean _tmp7_ = FALSE; + gboolean _tmp8_; gchar* daterange = NULL; - Event* _tmp26_; - gchar* _tmp27_; + gchar* _tmp20_; gchar* name = NULL; - Event* _tmp28_; - gchar* _tmp29_; - gboolean _tmp30_ = FALSE; - const gchar* _tmp31_; + gchar* _tmp21_; + gboolean _tmp22_ = FALSE; + const gchar* _tmp23_; #line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" g_return_val_if_fail (IS_EVENT (event), NULL); #line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp0_ = event; + _tmp0_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_EVENT_SOURCE, EventSource)); #line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp1_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource)); -#line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp3_ = media_source_collection_has_photo (_tmp2_); + _tmp2_ = media_source_collection_has_photo (_tmp1_); #line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = _tmp3_; + _g_object_unref0 (_tmp1_); #line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_object_unref0 (_tmp2_); -#line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - has_photos = _tmp4_; -#line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp5_ = event; + has_photos = _tmp2_; #line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp6_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_EVENT_SOURCE, EventSource)); + _tmp3_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_EVENT_SOURCE, EventSource)); #line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp7_ = _tmp6_; -#line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp8_ = media_source_collection_has_video (_tmp7_); + _tmp4_ = _tmp3_; #line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp9_ = _tmp8_; + _tmp5_ = media_source_collection_has_video (_tmp4_); #line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp4_); #line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - has_videos = _tmp9_; -#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp10_ = event; -#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp11_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_EVENT_SOURCE, EventSource)); + has_videos = _tmp5_; #line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - count = _tmp11_; + count = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_EVENT_SOURCE, EventSource)); #line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp12_ = g_strdup (""); + _tmp6_ = g_strdup (""); #line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - count_text = _tmp12_; + count_text = _tmp6_; #line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp14_ = has_photos; + _tmp8_ = has_photos; #line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp14_) { -#line 1040 "EventDirectoryItem.c" - gboolean _tmp15_; + if (_tmp8_) { +#line 1105 "EventDirectoryItem.c" + gboolean _tmp9_; #line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp15_ = has_videos; + _tmp9_ = has_videos; #line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp13_ = _tmp15_; -#line 1046 "EventDirectoryItem.c" + _tmp7_ = _tmp9_; +#line 1111 "EventDirectoryItem.c" } else { #line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp13_ = FALSE; -#line 1050 "EventDirectoryItem.c" + _tmp7_ = FALSE; +#line 1115 "EventDirectoryItem.c" } #line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp13_) { -#line 1054 "EventDirectoryItem.c" - gint _tmp16_; - gint _tmp17_; - gchar* _tmp18_; + if (_tmp7_) { +#line 1119 "EventDirectoryItem.c" + gint _tmp10_; + gint _tmp11_; + gchar* _tmp12_; #line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp16_ = count; + _tmp10_ = count; #line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp17_ = count; + _tmp11_ = count; #line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp18_ = g_strdup_printf (ngettext ("%d Photo/Video", "%d Photos/Videos", (gulong) _tmp16_), _tmp17_); + _tmp12_ = g_strdup_printf (ngettext ("%d Photo/Video", "%d Photos/Videos", (gulong) _tmp10_), _tmp11_); #line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_free0 (count_text); #line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - count_text = _tmp18_; -#line 1068 "EventDirectoryItem.c" + count_text = _tmp12_; +#line 1133 "EventDirectoryItem.c" } else { - gboolean _tmp19_; + gboolean _tmp13_; #line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp19_ = has_videos; + _tmp13_ = has_videos; #line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp19_) { -#line 1075 "EventDirectoryItem.c" - gint _tmp20_; - gint _tmp21_; - gchar* _tmp22_; + if (_tmp13_) { +#line 1140 "EventDirectoryItem.c" + gint _tmp14_; + gint _tmp15_; + gchar* _tmp16_; #line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp20_ = count; + _tmp14_ = count; #line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp21_ = count; + _tmp15_ = count; #line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp22_ = g_strdup_printf (ngettext ("%d Video", "%d Videos", (gulong) _tmp20_), _tmp21_); + _tmp16_ = g_strdup_printf (ngettext ("%d Video", "%d Videos", (gulong) _tmp14_), _tmp15_); #line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_free0 (count_text); #line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - count_text = _tmp22_; -#line 1089 "EventDirectoryItem.c" + count_text = _tmp16_; +#line 1154 "EventDirectoryItem.c" } else { - gint _tmp23_; - gint _tmp24_; - gchar* _tmp25_; + gint _tmp17_; + gint _tmp18_; + gchar* _tmp19_; #line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp23_ = count; + _tmp17_ = count; #line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp24_ = count; + _tmp18_ = count; #line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp25_ = g_strdup_printf (ngettext ("%d Photo", "%d Photos", (gulong) _tmp23_), _tmp24_); + _tmp19_ = g_strdup_printf (ngettext ("%d Photo", "%d Photos", (gulong) _tmp17_), _tmp18_); #line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_free0 (count_text); #line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - count_text = _tmp25_; -#line 1104 "EventDirectoryItem.c" + count_text = _tmp19_; +#line 1169 "EventDirectoryItem.c" } } #line 103 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp26_ = event; -#line 103 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp27_ = event_get_formatted_daterange (_tmp26_); + _tmp20_ = event_get_formatted_daterange (event); #line 103 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - daterange = _tmp27_; -#line 104 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp28_ = event; + daterange = _tmp20_; #line 104 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp29_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject)); + _tmp21_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_DATA_OBJECT, DataObject)); #line 104 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - name = _tmp29_; + name = _tmp21_; #line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp31_ = daterange; + _tmp23_ = daterange; #line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp31_ == NULL) { + if (_tmp23_ == NULL) { #line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp30_ = TRUE; -#line 1125 "EventDirectoryItem.c" + _tmp22_ = TRUE; +#line 1186 "EventDirectoryItem.c" } else { - const gchar* _tmp32_; - const gchar* _tmp33_; + const gchar* _tmp24_; + const gchar* _tmp25_; #line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp32_ = daterange; + _tmp24_ = daterange; #line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp33_ = name; + _tmp25_ = name; #line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp30_ = g_strcmp0 (_tmp32_, _tmp33_) == 0; -#line 1135 "EventDirectoryItem.c" + _tmp22_ = g_strcmp0 (_tmp24_, _tmp25_) == 0; +#line 1196 "EventDirectoryItem.c" } #line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp30_) { -#line 1139 "EventDirectoryItem.c" - const gchar* _tmp34_; - gchar* _tmp35_; - gchar* _tmp36_; - const gchar* _tmp37_; - gchar* _tmp38_; - gchar* _tmp39_; - gchar* _tmp40_; - gchar* _tmp41_; + if (_tmp22_) { +#line 1200 "EventDirectoryItem.c" + const gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + const gchar* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp34_ = name; + _tmp26_ = name; #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp35_ = guarded_markup_escape_text (_tmp34_); + _tmp27_ = guarded_markup_escape_text (_tmp26_); #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp36_ = _tmp35_; + _tmp28_ = _tmp27_; #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp37_ = count_text; + _tmp29_ = count_text; #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp38_ = guarded_markup_escape_text (_tmp37_); + _tmp30_ = guarded_markup_escape_text (_tmp29_); #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp39_ = _tmp38_; + _tmp31_ = _tmp30_; #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp40_ = g_strdup_printf ("%s\n%s", _tmp36_, _tmp39_); + _tmp32_ = g_strdup_printf ("%s\n%s", _tmp28_, _tmp31_); #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp41_ = _tmp40_; + _tmp33_ = _tmp32_; #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_free0 (_tmp39_); + _g_free0 (_tmp31_); #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_free0 (_tmp36_); + _g_free0 (_tmp28_); #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - result = _tmp41_; + result = _tmp33_; #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_free0 (name); #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -1174,49 +1235,49 @@ static gchar* event_directory_item_get_formatted_title (Event* event) { _g_free0 (count_text); #line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return result; -#line 1178 "EventDirectoryItem.c" +#line 1239 "EventDirectoryItem.c" } else { - const gchar* _tmp42_; + const gchar* _tmp34_; + gchar* _tmp35_; + gchar* _tmp36_; + const gchar* _tmp37_; + gchar* _tmp38_; + gchar* _tmp39_; + const gchar* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; gchar* _tmp43_; gchar* _tmp44_; - const gchar* _tmp45_; - gchar* _tmp46_; - gchar* _tmp47_; - const gchar* _tmp48_; - gchar* _tmp49_; - gchar* _tmp50_; - gchar* _tmp51_; - gchar* _tmp52_; #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp42_ = name; + _tmp34_ = name; #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp43_ = guarded_markup_escape_text (_tmp42_); + _tmp35_ = guarded_markup_escape_text (_tmp34_); #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp44_ = _tmp43_; + _tmp36_ = _tmp35_; #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp45_ = count_text; + _tmp37_ = count_text; #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp46_ = guarded_markup_escape_text (_tmp45_); + _tmp38_ = guarded_markup_escape_text (_tmp37_); #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp47_ = _tmp46_; + _tmp39_ = _tmp38_; #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp48_ = daterange; + _tmp40_ = daterange; #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp49_ = guarded_markup_escape_text (_tmp48_); + _tmp41_ = guarded_markup_escape_text (_tmp40_); #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp50_ = _tmp49_; + _tmp42_ = _tmp41_; #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp51_ = g_strdup_printf ("%s\n%s\n%s", _tmp44_, _tmp47_, _tmp50_); + _tmp43_ = g_strdup_printf ("%s\n%s\n%s", _tmp36_, _tmp39_, _tmp42_); #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp52_ = _tmp51_; + _tmp44_ = _tmp43_; #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_free0 (_tmp50_); + _g_free0 (_tmp42_); #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_free0 (_tmp47_); + _g_free0 (_tmp39_); #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_free0 (_tmp44_); + _g_free0 (_tmp36_); #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - result = _tmp52_; + result = _tmp44_; #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_free0 (name); #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -1225,7 +1286,7 @@ static gchar* event_directory_item_get_formatted_title (Event* event) { _g_free0 (count_text); #line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return result; -#line 1229 "EventDirectoryItem.c" +#line 1290 "EventDirectoryItem.c" } #line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_free0 (name); @@ -1233,89 +1294,88 @@ static gchar* event_directory_item_get_formatted_title (Event* event) { _g_free0 (daterange); #line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_free0 (count_text); -#line 1237 "EventDirectoryItem.c" +#line 1298 "EventDirectoryItem.c" } -static void event_directory_item_real_exposed (CheckerboardItem* base) { +static void +event_directory_item_real_exposed (CheckerboardItem* base) +{ EventDirectoryItem * self; - gboolean _tmp0_; GError * _inner_error_ = NULL; #line 116 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); #line 117 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp0_ = checkerboard_item_is_exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 117 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp0_) { + if (checkerboard_item_is_exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem))) { #line 118 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return; -#line 1253 "EventDirectoryItem.c" +#line 1313 "EventDirectoryItem.c" } { - GdkPixbuf* _tmp1_ = NULL; - Event* _tmp2_; + GdkPixbuf* _tmp0_ = NULL; + Event* _tmp1_; + MediaSource* _tmp2_; MediaSource* _tmp3_; - MediaSource* _tmp4_; - GdkRectangle _tmp5_; + GdkRectangle _tmp4_; + GdkPixbuf* _tmp5_; GdkPixbuf* _tmp6_; - GdkPixbuf* _tmp7_; #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp2_ = self->event; + _tmp1_ = self->event; #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp3_ = event_get_primary_source (_tmp2_); + _tmp2_ = event_get_primary_source (_tmp1_); #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp5_ = self->priv->paul_lynde; + _tmp4_ = self->priv->paul_lynde; #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp6_ = event_directory_item_get_paul_lynde (_tmp4_, &_tmp5_, &_inner_error_); + _tmp5_ = event_directory_item_get_paul_lynde (_tmp3_, &_tmp4_, &_inner_error_); #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp1_ = _tmp7_; + _tmp0_ = _tmp6_; #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1281 "EventDirectoryItem.c" +#line 1341 "EventDirectoryItem.c" goto __catch59_g_error; } #line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp1_); + checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp0_); #line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_object_unref0 (_tmp1_); -#line 1288 "EventDirectoryItem.c" + _g_object_unref0 (_tmp0_); +#line 1348 "EventDirectoryItem.c" } goto __finally59; __catch59_g_error: { GError* err = NULL; - Event* _tmp8_; + Event* _tmp7_; + gchar* _tmp8_; gchar* _tmp9_; - gchar* _tmp10_; - GError* _tmp11_; - const gchar* _tmp12_; + GError* _tmp10_; + const gchar* _tmp11_; #line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" err = _inner_error_; #line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _inner_error_ = NULL; #line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp8_ = self->event; + _tmp7_ = self->event; #line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); + _tmp8_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject)); #line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp11_ = err; + _tmp10_ = err; #line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp12_ = _tmp11_->message; + _tmp11_ = _tmp10_->message; #line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - g_critical ("EventDirectoryItem.vala:123: Unable to fetch preview for %s: %s", _tmp10_, _tmp12_); + g_critical ("EventDirectoryItem.vala:123: Unable to fetch preview for %s: %s", _tmp9_, _tmp11_); #line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_free0 (_tmp10_); + _g_free0 (_tmp9_); #line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_error_free0 (err); -#line 1319 "EventDirectoryItem.c" +#line 1379 "EventDirectoryItem.c" } __finally59: #line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -1326,47 +1386,47 @@ static void event_directory_item_real_exposed (CheckerboardItem* base) { g_clear_error (&_inner_error_); #line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return; -#line 1330 "EventDirectoryItem.c" +#line 1390 "EventDirectoryItem.c" } #line 126 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" event_directory_item_update_comment (self, FALSE); #line 128 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" CHECKERBOARD_ITEM_CLASS (event_directory_item_parent_class)->exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 1336 "EventDirectoryItem.c" +#line 1396 "EventDirectoryItem.c" } -static void event_directory_item_real_unexposed (CheckerboardItem* base) { +static void +event_directory_item_real_unexposed (CheckerboardItem* base) +{ EventDirectoryItem * self; - gboolean _tmp0_; - GdkRectangle _tmp1_; - Dimensions _tmp2_ = {0}; + GdkRectangle _tmp0_; + Dimensions _tmp1_ = {0}; #line 131 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); #line 132 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp0_ = checkerboard_item_is_exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 132 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (!_tmp0_) { + if (!checkerboard_item_is_exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem))) { #line 133 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return; -#line 1353 "EventDirectoryItem.c" +#line 1412 "EventDirectoryItem.c" } #line 135 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp1_ = self->priv->paul_lynde; + _tmp0_ = self->priv->paul_lynde; #line 135 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions_for_rectangle (&_tmp1_, &_tmp2_); + dimensions_for_rectangle (&_tmp0_, &_tmp1_); #line 135 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp2_); + checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp1_); #line 137 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" CHECKERBOARD_ITEM_CLASS (event_directory_item_parent_class)->unexposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 1363 "EventDirectoryItem.c" +#line 1422 "EventDirectoryItem.c" } -static void event_directory_item_on_events_altered (EventDirectoryItem* self, GeeMap* map) { - GeeMap* _tmp0_; - Event* _tmp1_; - gboolean _tmp2_; +static void +event_directory_item_on_events_altered (EventDirectoryItem* self, + GeeMap* map) +{ + Event* _tmp0_; #line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" g_return_if_fail (IS_EVENT_DIRECTORY_ITEM (self)); #line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -1374,40 +1434,37 @@ static void event_directory_item_on_events_altered (EventDirectoryItem* self, Ge #line 141 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" event_directory_item_update_comment (self, FALSE); #line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp0_ = map; -#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp1_ = self->event; -#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp2_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = self->event; #line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp2_) { -#line 1385 "EventDirectoryItem.c" - Event* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; + if (gee_map_has_key (map, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject))) { +#line 1441 "EventDirectoryItem.c" + Event* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp3_ = self->event; + _tmp1_ = self->event; #line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = event_directory_item_get_formatted_title (_tmp3_); + _tmp2_ = event_directory_item_get_formatted_title (_tmp1_); #line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - checkerboard_item_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_, TRUE, PANGO_ALIGN_CENTER); + checkerboard_item_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp3_, TRUE, PANGO_ALIGN_CENTER); #line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_free0 (_tmp5_); -#line 1399 "EventDirectoryItem.c" + _g_free0 (_tmp3_); +#line 1455 "EventDirectoryItem.c" } } -static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) { +static void +event_directory_item_real_thumbnail_altered (ThumbnailView* base) +{ EventDirectoryItem * self; MediaSource* media = NULL; Event* _tmp0_; MediaSource* _tmp1_; MediaSource* _tmp2_; GdkRectangle _tmp3_ = {0}; - gboolean _tmp4_; GError * _inner_error_ = NULL; #line 146 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); @@ -1424,64 +1481,62 @@ static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) { #line 150 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" self->priv->paul_lynde = _tmp3_; #line 152 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = checkerboard_item_is_exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 152 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp4_) { -#line 1431 "EventDirectoryItem.c" + if (checkerboard_item_is_exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem))) { +#line 1486 "EventDirectoryItem.c" { - GdkPixbuf* _tmp5_ = NULL; - MediaSource* _tmp6_; - GdkRectangle _tmp7_; - GdkPixbuf* _tmp8_; + GdkPixbuf* _tmp4_ = NULL; + MediaSource* _tmp5_; + GdkRectangle _tmp6_; + GdkPixbuf* _tmp7_; #line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp6_ = media; + _tmp5_ = media; #line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp7_ = self->priv->paul_lynde; + _tmp6_ = self->priv->paul_lynde; #line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp8_ = event_directory_item_get_paul_lynde (_tmp6_, &_tmp7_, &_inner_error_); + _tmp7_ = event_directory_item_get_paul_lynde (_tmp5_, &_tmp6_, &_inner_error_); #line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp5_ = _tmp8_; + _tmp4_ = _tmp7_; #line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1447 "EventDirectoryItem.c" +#line 1502 "EventDirectoryItem.c" goto __catch60_g_error; } #line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_); + checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp4_); #line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_object_unref0 (_tmp5_); -#line 1454 "EventDirectoryItem.c" + _g_object_unref0 (_tmp4_); +#line 1509 "EventDirectoryItem.c" } goto __finally60; __catch60_g_error: { GError* err = NULL; - Event* _tmp9_; + Event* _tmp8_; + gchar* _tmp9_; gchar* _tmp10_; - gchar* _tmp11_; - GError* _tmp12_; - const gchar* _tmp13_; + GError* _tmp11_; + const gchar* _tmp12_; #line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" err = _inner_error_; #line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _inner_error_ = NULL; #line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp9_ = self->event; + _tmp8_ = self->event; #line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); + _tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); #line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp12_ = err; + _tmp11_ = err; #line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp13_ = _tmp12_->message; + _tmp12_ = _tmp11_->message; #line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - g_critical ("EventDirectoryItem.vala:156: Unable to fetch preview for %s: %s", _tmp11_, _tmp13_); + g_critical ("EventDirectoryItem.vala:156: Unable to fetch preview for %s: %s", _tmp10_, _tmp12_); #line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp10_); #line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_error_free0 (err); -#line 1485 "EventDirectoryItem.c" +#line 1540 "EventDirectoryItem.c" } __finally60: #line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -1494,38 +1549,43 @@ static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) { g_clear_error (&_inner_error_); #line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return; -#line 1498 "EventDirectoryItem.c" +#line 1553 "EventDirectoryItem.c" } } else { - GdkRectangle _tmp14_; - Dimensions _tmp15_ = {0}; + GdkRectangle _tmp13_; + Dimensions _tmp14_ = {0}; #line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp14_ = self->priv->paul_lynde; + _tmp13_ = self->priv->paul_lynde; #line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions_for_rectangle (&_tmp14_, &_tmp15_); + dimensions_for_rectangle (&_tmp13_, &_tmp14_); #line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp15_); -#line 1509 "EventDirectoryItem.c" + checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp14_); +#line 1564 "EventDirectoryItem.c" } #line 162 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" THUMBNAIL_VIEW_CLASS (event_directory_item_parent_class)->thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), TYPE_THUMBNAIL_VIEW, ThumbnailView)); #line 146 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_object_unref0 (media); -#line 1515 "EventDirectoryItem.c" +#line 1570 "EventDirectoryItem.c" } -static void event_directory_item_real_paint_shadow (CheckerboardItem* base, cairo_t* ctx, Dimensions* dimensions, GdkPoint* origin, gint radius, gfloat initial_alpha) { +static void +event_directory_item_real_paint_shadow (CheckerboardItem* base, + cairo_t* ctx, + Dimensions* dimensions, + GdkPoint* origin, + gint radius, + gfloat initial_alpha) +{ EventDirectoryItem * self; Dimensions altered = {0}; Dimensions _tmp0_; gint _tmp1_; Dimensions _tmp2_; gint _tmp3_; - cairo_t* _tmp4_; - Dimensions _tmp5_; - GdkPoint _tmp6_; - gfloat _tmp7_; + Dimensions _tmp4_; + GdkPoint _tmp5_; #line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); #line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -1545,32 +1605,31 @@ static void event_directory_item_real_paint_shadow (CheckerboardItem* base, cair #line 167 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" dimensions_init (&altered, _tmp1_ - 25, _tmp3_ - 25); #line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = ctx; -#line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp5_ = altered; + _tmp4_ = altered; #line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp6_ = *origin; + _tmp5_ = *origin; #line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp7_ = initial_alpha; -#line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - CHECKERBOARD_ITEM_CLASS (event_directory_item_parent_class)->paint_shadow (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp4_, &_tmp5_, &_tmp6_, 36, _tmp7_); -#line 1558 "EventDirectoryItem.c" + CHECKERBOARD_ITEM_CLASS (event_directory_item_parent_class)->paint_shadow (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), ctx, &_tmp4_, &_tmp5_, 36, initial_alpha); +#line 1614 "EventDirectoryItem.c" } -static void event_directory_item_real_paint_border (CheckerboardItem* base, cairo_t* ctx, Dimensions* object_dimensions, GdkPoint* object_origin, gint border_width) { +static void +event_directory_item_real_paint_border (CheckerboardItem* base, + cairo_t* ctx, + Dimensions* object_dimensions, + GdkPoint* object_origin, + gint border_width) +{ EventDirectoryItem * self; Dimensions dimensions = {0}; Dimensions _tmp0_; - gint _tmp1_; - Dimensions _tmp2_ = {0}; + Dimensions _tmp1_ = {0}; GdkPoint origin = {0}; - GdkPoint _tmp3_; - gint _tmp4_; - GdkPoint _tmp5_ = {0}; - cairo_t* _tmp6_; - Dimensions _tmp7_; - GdkPoint _tmp8_; + GdkPoint _tmp2_; + GdkPoint _tmp3_ = {0}; + Dimensions _tmp4_; + GdkPoint _tmp5_; #line 171 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); #line 171 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -1582,48 +1641,40 @@ static void event_directory_item_real_paint_border (CheckerboardItem* base, cair #line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _tmp0_ = *object_dimensions; #line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp1_ = border_width; -#line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - checkerboard_item_get_border_dimensions (&_tmp0_, _tmp1_, &_tmp2_); + checkerboard_item_get_border_dimensions (&_tmp0_, border_width, &_tmp1_); #line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions = _tmp2_; -#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp3_ = *object_origin; + dimensions = _tmp1_; #line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = border_width; + _tmp2_ = *object_origin; #line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - checkerboard_item_get_border_origin (&_tmp3_, _tmp4_, &_tmp5_); + checkerboard_item_get_border_origin (&_tmp2_, border_width, &_tmp3_); #line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - origin = _tmp5_; + origin = _tmp3_; #line 176 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp6_ = ctx; + _tmp4_ = dimensions; #line 176 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp7_ = dimensions; + _tmp5_ = origin; #line 176 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp8_ = origin; -#line 176 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - draw_rounded_corners_filled (_tmp6_, &_tmp7_, &_tmp8_, 6.0); -#line 1607 "EventDirectoryItem.c" + draw_rounded_corners_filled (ctx, &_tmp4_, &_tmp5_, 6.0); +#line 1660 "EventDirectoryItem.c" } -static void event_directory_item_real_paint_image (CheckerboardItem* base, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin) { +static void +event_directory_item_real_paint_image (CheckerboardItem* base, + cairo_t* ctx, + GdkPixbuf* pixbuf, + GdkPoint* origin) +{ EventDirectoryItem * self; Dimensions dimensions = {0}; - GdkPixbuf* _tmp0_; - Dimensions _tmp1_ = {0}; - GdkPixbuf* _tmp2_; - gboolean _tmp3_; - cairo_t* _tmp7_; - Dimensions _tmp8_; - GdkPoint _tmp9_; - cairo_t* _tmp10_; - GdkPixbuf* _tmp11_; - GdkPoint _tmp12_; - gint _tmp13_; - GdkPoint _tmp14_; - gint _tmp15_; - cairo_t* _tmp16_; + Dimensions _tmp0_ = {0}; + Dimensions _tmp3_; + GdkPoint _tmp4_; + GdkPoint _tmp5_; + gint _tmp6_; + GdkPoint _tmp7_; + gint _tmp8_; #line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); #line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -1633,67 +1684,52 @@ static void event_directory_item_real_paint_image (CheckerboardItem* base, cairo #line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" g_return_if_fail (origin != NULL); #line 181 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp0_ = pixbuf; + dimensions_for_pixbuf (pixbuf, &_tmp0_); #line 181 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions_for_pixbuf (_tmp0_, &_tmp1_); -#line 181 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - dimensions = _tmp1_; -#line 183 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp2_ = pixbuf; + dimensions = _tmp0_; #line 183 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp3_ = gdk_pixbuf_get_has_alpha (_tmp2_); -#line 183 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp3_) { -#line 1648 "EventDirectoryItem.c" - cairo_t* _tmp4_; - Dimensions _tmp5_; - GdkPoint _tmp6_; -#line 184 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = ctx; + if (gdk_pixbuf_get_has_alpha (pixbuf)) { +#line 1693 "EventDirectoryItem.c" + Dimensions _tmp1_; + GdkPoint _tmp2_; #line 184 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp5_ = dimensions; + _tmp1_ = dimensions; #line 184 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp6_ = *origin; + _tmp2_ = *origin; #line 184 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - draw_rounded_corners_filled (_tmp4_, &_tmp5_, &_tmp6_, 6.0); -#line 1660 "EventDirectoryItem.c" + draw_rounded_corners_filled (ctx, &_tmp1_, &_tmp2_, 6.0); +#line 1702 "EventDirectoryItem.c" } #line 187 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp7_ = ctx; -#line 187 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp8_ = dimensions; + _tmp3_ = dimensions; #line 187 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp9_ = *origin; + _tmp4_ = *origin; #line 187 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - context_rounded_corners (_tmp7_, &_tmp8_, &_tmp9_, 6.0); -#line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp10_ = ctx; -#line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp11_ = pixbuf; + context_rounded_corners (ctx, &_tmp3_, &_tmp4_, 6.0); #line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp12_ = *origin; + _tmp5_ = *origin; #line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp13_ = _tmp12_.x; + _tmp6_ = _tmp5_.x; #line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp14_ = *origin; + _tmp7_ = *origin; #line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp15_ = _tmp14_.y; + _tmp8_ = _tmp7_.y; #line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - gdk_cairo_set_source_pixbuf (_tmp10_, _tmp11_, (gdouble) _tmp13_, (gdouble) _tmp15_); + gdk_cairo_set_source_pixbuf (ctx, pixbuf, (gdouble) _tmp6_, (gdouble) _tmp8_); #line 189 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp16_ = ctx; -#line 189 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - cairo_paint (_tmp16_); -#line 1688 "EventDirectoryItem.c" + cairo_paint (ctx); +#line 1722 "EventDirectoryItem.c" } -static void event_directory_item_update_comment (EventDirectoryItem* self, gboolean init) { +static void +event_directory_item_update_comment (EventDirectoryItem* self, + gboolean init) +{ gchar* comment = NULL; Event* _tmp0_; gchar* _tmp1_; const gchar* _tmp2_; - gboolean _tmp3_; #line 192 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" g_return_if_fail (IS_EVENT_DIRECTORY_ITEM (self)); #line 193 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" @@ -1705,57 +1741,47 @@ static void event_directory_item_update_comment (EventDirectoryItem* self, gbool #line 194 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _tmp2_ = comment; #line 194 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp3_ = is_string_empty (_tmp2_); -#line 194 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (_tmp3_) { + if (is_string_empty (_tmp2_)) { #line 195 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" checkerboard_item_clear_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem)); -#line 1714 "EventDirectoryItem.c" +#line 1748 "EventDirectoryItem.c" } else { - gboolean _tmp4_; -#line 196 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp4_ = init; #line 196 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - if (!_tmp4_) { -#line 1721 "EventDirectoryItem.c" - const gchar* _tmp5_; + if (!init) { +#line 1752 "EventDirectoryItem.c" + const gchar* _tmp3_; #line 197 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp5_ = comment; + _tmp3_ = comment; #line 197 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - checkerboard_item_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_, FALSE, PANGO_ALIGN_LEFT); -#line 1727 "EventDirectoryItem.c" + checkerboard_item_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp3_, FALSE, PANGO_ALIGN_LEFT); +#line 1758 "EventDirectoryItem.c" } else { #line 199 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" checkerboard_item_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), "", FALSE, PANGO_ALIGN_LEFT); -#line 1731 "EventDirectoryItem.c" +#line 1762 "EventDirectoryItem.c" } } #line 192 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" _g_free0 (comment); -#line 1736 "EventDirectoryItem.c" +#line 1767 "EventDirectoryItem.c" } -static gint event_directory_item_get_CROPPED_SCALE (void) { +static gint +event_directory_item_get_CROPPED_SCALE (void) +{ gint result; - gint _tmp0_; - gint _tmp1_; - gint _tmp2_; -#line 10 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp0_ = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_MEDIUM); -#line 10 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp1_ = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_BIG); -#line 10 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - _tmp2_ = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_MEDIUM); #line 10 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" - result = _tmp0_ + ((_tmp1_ - _tmp2_) / 2); + result = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_MEDIUM) + ((thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_BIG) - thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_MEDIUM)) / 2); #line 10 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" return result; -#line 1755 "EventDirectoryItem.c" +#line 1779 "EventDirectoryItem.c" } -static void event_directory_item_class_init (EventDirectoryItemClass * klass) { +static void +event_directory_item_class_init (EventDirectoryItemClass * klass) +{ gint _tmp0_; gint _tmp1_; gint _tmp2_; @@ -1796,20 +1822,24 @@ static void event_directory_item_class_init (EventDirectoryItemClass * klass) { scaling_to_fill_viewport (&_tmp4_, &_tmp5_); #line 15 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" event_directory_item_squared_scaling = _tmp5_; -#line 1800 "EventDirectoryItem.c" +#line 1826 "EventDirectoryItem.c" } -static void event_directory_item_instance_init (EventDirectoryItem * self) { +static void +event_directory_item_instance_init (EventDirectoryItem * self) +{ #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" self->priv = EVENT_DIRECTORY_ITEM_GET_PRIVATE (self); #line 20 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" memset (&self->priv->paul_lynde, 0, sizeof (GdkRectangle)); -#line 1809 "EventDirectoryItem.c" +#line 1837 "EventDirectoryItem.c" } -static void event_directory_item_finalize (GObject * obj) { +static void +event_directory_item_finalize (GObject * obj) +{ EventDirectoryItem * self; EventSourceCollection* _tmp0_; guint _tmp1_; @@ -1825,11 +1855,13 @@ static void event_directory_item_finalize (GObject * obj) { _g_object_unref0 (self->event); #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" G_OBJECT_CLASS (event_directory_item_parent_class)->finalize (obj); -#line 1829 "EventDirectoryItem.c" +#line 1859 "EventDirectoryItem.c" } -GType event_directory_item_get_type (void) { +GType +event_directory_item_get_type (void) +{ static volatile gsize event_directory_item_type_id__volatile = 0; if (g_once_init_enter (&event_directory_item_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventDirectoryItemClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_directory_item_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventDirectoryItem), 0, (GInstanceInitFunc) event_directory_item_instance_init, NULL }; @@ -1841,18 +1873,23 @@ GType event_directory_item_get_type (void) { } -static void _vala_event_directory_item_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { +static void +_vala_event_directory_item_get_property (GObject * object, + guint property_id, + GValue * value, + GParamSpec * pspec) +{ EventDirectoryItem * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" switch (property_id) { -#line 1850 "EventDirectoryItem.c" +#line 1887 "EventDirectoryItem.c" default: #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala" break; -#line 1856 "EventDirectoryItem.c" +#line 1893 "EventDirectoryItem.c" } } diff --git a/src/events/EventPage.c b/src/events/EventPage.c index d701b8e..d7da2f4 100644 --- a/src/events/EventPage.c +++ b/src/events/EventPage.c @@ -1,4 +1,4 @@ -/* EventPage.c generated by valac 0.36.6, the Vala compiler +/* EventPage.c generated by valac 0.40.4, the Vala compiler * generated from EventPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -231,6 +232,11 @@ typedef struct _EventSourceClass EventSourceClass; typedef struct _Event Event; typedef struct _EventClass EventClass; +enum { + EVENT_PAGE_0_PROPERTY, + EVENT_PAGE_NUM_PROPERTIES +}; +static GParamSpec* event_page_properties[EVENT_PAGE_NUM_PROPERTIES]; #define TYPE_DATA_COLLECTION (data_collection_get_type ()) #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection)) @@ -437,6 +443,11 @@ typedef struct _LibraryWindowClass LibraryWindowClass; typedef struct _NoEventPage NoEventPage; typedef struct _NoEventPageClass NoEventPageClass; typedef struct _NoEventPagePrivate NoEventPagePrivate; +enum { + NO_EVENT_PAGE_0_PROPERTY, + NO_EVENT_PAGE_NUM_PROPERTIES +}; +static GParamSpec* no_event_page_properties[NO_EVENT_PAGE_NUM_PROPERTIES]; #define TYPE_VIEW_MANAGER (view_manager_get_type ()) #define VIEW_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIEW_MANAGER, ViewManager)) @@ -744,9 +755,15 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType checkerboard_page_get_type (void) G_GNUC_CONST; @@ -760,17 +777,29 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType search_view_filter_get_type (void) G_GNUC_CONST; gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; @@ -784,14 +813,17 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST; GType event_source_get_type (void) G_GNUC_CONST; GType event_get_type (void) G_GNUC_CONST; #define EVENT_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EVENT_PAGE, EventPagePrivate)) -enum { - EVENT_PAGE_DUMMY_PROPERTY -}; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -800,244 +832,359 @@ GType container_source_collection_get_type (void) G_GNUC_CONST; GType event_source_collection_get_type (void) G_GNUC_CONST; gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; -static void event_page_on_events_altered (EventPage* self, GeeMap* map); -static void _event_page_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void event_page_on_events_altered (EventPage* self, + GeeMap* map); +static void _event_page_on_events_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); GType view_collection_get_type (void) G_GNUC_CONST; ViewCollection* page_get_view (Page* self); void view_collection_halt_mirroring (ViewCollection* self); static void event_page_on_make_primary (EventPage* self); -static void _event_page_on_make_primary_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _event_page_on_make_primary_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void event_page_on_rename (EventPage* self); -static void _event_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _event_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void media_page_on_edit_comment (MediaPage* self); -static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); EventPage* event_page_new (Event* page_event); -EventPage* event_page_construct (GType object_type, Event* page_event); +EventPage* event_page_construct (GType object_type, + Event* page_event); gchar* data_object_get_name (DataObject* self); -CollectionPage* collection_page_construct (GType object_type, const gchar* page_name); -void event_mirror_photos (Event* self, ViewCollection* view, CreateView mirroring_ctor, void* mirroring_ctor_target); -DataView* media_page_create_thumbnail (MediaPage* self, DataSource* source); -static DataView* _media_page_create_thumbnail_create_view (DataSource* source, gpointer self); -void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path); +CollectionPage* collection_page_construct (GType object_type, + const gchar* page_name); +void event_mirror_photos (Event* self, + ViewCollection* view, + CreateView mirroring_ctor, + void* mirroring_ctor_target); +DataView* media_page_create_thumbnail (MediaPage* self, + DataSource* source); +static DataView* _media_page_create_thumbnail_create_view (DataSource* source, + gpointer self); +void checkerboard_page_init_page_context_menu (CheckerboardPage* self, + const gchar* path); Event* event_page_get_event (EventPage* self); -static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* event); +static gboolean event_page_real_on_app_key_pressed (Page* base, + GdkEventKey* event); gint view_collection_get_selected_count (ViewCollection* self); -gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event); -static void event_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static void event_page_real_add_actions (Page* base, GActionMap* map); -void page_add_actions (Page* self, GActionMap* map); -static void event_page_real_remove_actions (Page* base, GActionMap* map); -void page_remove_actions (Page* self, GActionMap* map); -static void event_page_real_init_actions (Page* base, gint selected_count, gint count); -void page_init_actions (Page* self, gint selected_count, gint count); -static void event_page_real_update_actions (Page* base, gint selected_count, gint count); -void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); -void page_update_actions (Page* self, gint selected_count, gint count); -static void event_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by); +gboolean page_on_app_key_pressed (Page* self, + GdkEventKey* event); +static void event_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames); +void page_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames); +static void event_page_real_add_actions (Page* base, + GActionMap* map); +void page_add_actions (Page* self, + GActionMap* map); +static void event_page_real_remove_actions (Page* base, + GActionMap* map); +void page_remove_actions (Page* self, + GActionMap* map); +static void event_page_real_init_actions (Page* base, + gint selected_count, + gint count); +void page_init_actions (Page* self, + gint selected_count, + gint count); +static void event_page_real_update_actions (Page* base, + gint selected_count, + gint count); +void page_set_action_sensitive (Page* self, + const gchar* name, + gboolean sensitive); +void page_update_actions (Page* self, + gint selected_count, + gint count); +static void event_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); -void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by); -static void event_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by); -void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by); -void page_set_page_name (Page* self, const gchar* page_name); +void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, + gboolean* sort_order, + gint* sort_by); +static void event_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by); +void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, + gboolean sort_order, + gint sort_by); +void page_set_page_name (Page* self, + const gchar* page_name); static void event_page_real_on_edit_comment (MediaPage* base); gpointer multi_text_entry_dialog_mediator_ref (gpointer instance); void multi_text_entry_dialog_mediator_unref (gpointer instance); -GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object); -void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object); +GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_multi_text_entry_dialog_mediator (GValue* value, + gpointer v_object); +void value_take_multi_text_entry_dialog_mediator (GValue* value, + gpointer v_object); gpointer value_get_multi_text_entry_dialog_mediator (const GValue* value); GType multi_text_entry_dialog_mediator_get_type (void) G_GNUC_CONST; GType edit_comment_dialog_get_type (void) G_GNUC_CONST; gchar* event_source_get_comment (EventSource* self); -EditCommentDialog* edit_comment_dialog_new (const gchar* comment, gboolean is_event); -EditCommentDialog* edit_comment_dialog_construct (GType object_type, const gchar* comment, gboolean is_event); +EditCommentDialog* edit_comment_dialog_new (const gchar* comment, + gboolean is_event); +EditCommentDialog* edit_comment_dialog_construct (GType object_type, + const gchar* comment, + gboolean is_event); gchar* edit_comment_dialog_execute (EditCommentDialog* self); GType command_get_type (void) G_GNUC_CONST; GType page_command_get_type (void) G_GNUC_CONST; GType simple_proxyable_command_get_type (void) G_GNUC_CONST; GType edit_event_comment_command_get_type (void) G_GNUC_CONST; -EditEventCommentCommand* edit_event_comment_command_new (Event* event, const gchar* new_comment); -EditEventCommentCommand* edit_event_comment_command_construct (GType object_type, Event* event, const gchar* new_comment); +EditEventCommentCommand* edit_event_comment_command_new (Event* event, + const gchar* new_comment); +EditEventCommentCommand* edit_event_comment_command_construct (GType object_type, + Event* event, + const gchar* new_comment); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* page_get_command_manager (Page* self); -void command_manager_execute (CommandManager* self, Command* command); +void command_manager_execute (CommandManager* self, + Command* command); GType media_source_get_type (void) G_GNUC_CONST; -gboolean event_set_primary_source (Event* self, MediaSource* source); -DataView* view_collection_get_selected_at (ViewCollection* self, gint index); +gboolean event_set_primary_source (Event* self, + MediaSource* source); +DataView* view_collection_get_selected_at (ViewCollection* self, + gint index); DataSource* data_view_get_source (DataView* self); GType app_window_get_type (void) G_GNUC_CONST; GType library_window_get_type (void) G_GNUC_CONST; LibraryWindow* library_window_get_app (void); -void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event); +void library_window_rename_event_in_sidebar (LibraryWindow* self, + Event* event); static void event_page_finalize (GObject * obj); GType no_event_page_get_type (void) G_GNUC_CONST; -enum { - NO_EVENT_PAGE_DUMMY_PROPERTY -}; -Alteration* alteration_new (const gchar* subject, const gchar* detail); -Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail); +Alteration* alteration_new (const gchar* subject, + const gchar* detail); +Alteration* alteration_construct (GType object_type, + const gchar* subject, + const gchar* detail); #define NO_EVENT_PAGE_NAME _ ("No Event") NoEventPage* no_event_page_new (void); NoEventPage* no_event_page_construct (GType object_type); gpointer view_manager_ref (gpointer instance); void view_manager_unref (gpointer instance); -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_manager (GValue* value, gpointer v_object); -void value_take_view_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_manager (GValue* value, + gpointer v_object); +void value_take_view_manager (GValue* value, + gpointer v_object); gpointer value_get_view_manager (const GValue* value); GType view_manager_get_type (void) G_GNUC_CONST; static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_new (NoEventPage* page); -static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_construct (GType object_type, NoEventPage* page); +static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_construct (GType object_type, + NoEventPage* page); GType collection_view_manager_get_type (void) G_GNUC_CONST; static GType no_event_page_no_event_view_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; gpointer view_collection_monitor_ref (gpointer instance); void view_collection_monitor_unref (gpointer instance); -GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void view_collection_value_set_monitor (GValue* value, gpointer v_object); -void view_collection_value_take_monitor (GValue* value, gpointer v_object); +GParamSpec* view_collection_param_spec_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void view_collection_value_set_monitor (GValue* value, + gpointer v_object); +void view_collection_value_take_monitor (GValue* value, + gpointer v_object); gpointer view_collection_value_get_monitor (const GValue* value); GType view_collection_monitor_get_type (void) G_GNUC_CONST; -ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target); +ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq, + GeeCollection* initial, + ProgressMonitor progress_monitor, + void* progress_monitor_target); GType media_source_collection_get_type (void) G_GNUC_CONST; GType library_photo_source_collection_get_type (void) G_GNUC_CONST; GType video_source_collection_get_type (void) G_GNUC_CONST; -static void no_event_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by); -static void no_event_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by); -enum { - NO_EVENT_PAGE_NO_EVENT_VIEW_MANAGER_DUMMY_PROPERTY -}; +static void no_event_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by); +static void no_event_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by); CollectionViewManager* collection_view_manager_new (CollectionPage* page); -CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page); -static gboolean no_event_page_no_event_view_manager_real_include_in_view (ViewManager* base, DataSource* source); +CollectionViewManager* collection_view_manager_construct (GType object_type, + CollectionPage* page); +static gboolean no_event_page_no_event_view_manager_real_include_in_view (ViewManager* base, + DataSource* source); GType event_id_get_type (void) G_GNUC_CONST; EventID* event_id_dup (const EventID* self); void event_id_free (EventID* self); -void media_source_get_event_id (MediaSource* self, EventID* result); +void media_source_get_event_id (MediaSource* self, + EventID* result); #define EVENT_ID_INVALID ((gint64) -1) -gboolean view_manager_include_in_view (ViewManager* self, DataSource* source); +gboolean view_manager_include_in_view (ViewManager* self, + DataSource* source); static void no_event_page_finalize (GObject * obj); static const GActionEntry EVENT_PAGE_entries[3] = {{"MakePrimary", _event_page_on_make_primary_gsimple_action_activate_callback}, {"Rename", _event_page_on_rename_gsimple_action_activate_callback}, {"EditEventComment", _media_page_on_edit_comment_gsimple_action_activate_callback}}; -static void _event_page_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_event_page_on_events_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 40 "/home/jens/Source/shotwell/src/events/EventPage.vala" event_page_on_events_altered ((EventPage*) self, items); -#line 940 "EventPage.c" +#line 1072 "EventPage.c" } -static void _event_page_on_make_primary_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_event_page_on_make_primary_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 50 "/home/jens/Source/shotwell/src/events/EventPage.vala" event_page_on_make_primary ((EventPage*) self); -#line 947 "EventPage.c" +#line 1083 "EventPage.c" } -static void _event_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_event_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 50 "/home/jens/Source/shotwell/src/events/EventPage.vala" event_page_on_rename ((EventPage*) self); -#line 954 "EventPage.c" +#line 1094 "EventPage.c" } -static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 50 "/home/jens/Source/shotwell/src/events/EventPage.vala" media_page_on_edit_comment ((MediaPage*) self); -#line 961 "EventPage.c" +#line 1105 "EventPage.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 13 "/home/jens/Source/shotwell/src/events/EventPage.vala" return self ? g_object_ref (self) : NULL; -#line 968 "EventPage.c" +#line 1114 "EventPage.c" } -static DataView* _media_page_create_thumbnail_create_view (DataSource* source, gpointer self) { +static DataView* +_media_page_create_thumbnail_create_view (DataSource* source, + gpointer self) +{ DataView* result; result = media_page_create_thumbnail ((MediaPage*) self, source); #line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala" return result; -#line 977 "EventPage.c" +#line 1126 "EventPage.c" } -EventPage* event_page_construct (GType object_type, Event* page_event) { +EventPage* +event_page_construct (GType object_type, + Event* page_event) +{ EventPage * self = NULL; - Event* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - Event* _tmp3_; - Event* _tmp4_; - Event* _tmp5_; - ViewCollection* _tmp6_; - ViewCollection* _tmp7_; - EventSourceCollection* _tmp8_; + Event* _tmp2_; + ViewCollection* _tmp3_; + ViewCollection* _tmp4_; + EventSourceCollection* _tmp5_; #line 10 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_val_if_fail (IS_EVENT (page_event), NULL); #line 11 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = page_event; -#line 11 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (page_event, TYPE_DATA_OBJECT, DataObject)); #line 11 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 11 "/home/jens/Source/shotwell/src/events/EventPage.vala" - self = (EventPage*) collection_page_construct (object_type, _tmp2_); + self = (EventPage*) collection_page_construct (object_type, _tmp1_); #line 11 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _g_free0 (_tmp2_); -#line 13 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp3_ = page_event; + _g_free0 (_tmp1_); #line 13 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp2_ = _g_object_ref0 (page_event); #line 13 "/home/jens/Source/shotwell/src/events/EventPage.vala" _g_object_unref0 (self->priv->page_event); #line 13 "/home/jens/Source/shotwell/src/events/EventPage.vala" - self->priv->page_event = _tmp4_; + self->priv->page_event = _tmp2_; #line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp5_ = page_event; + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala" - event_mirror_photos (_tmp5_, _tmp7_, _media_page_create_thumbnail_create_view, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage)); + event_mirror_photos (page_event, _tmp4_, _media_page_create_thumbnail_create_view, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage)); #line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _data_collection_unref0 (_tmp7_); + _data_collection_unref0 (_tmp4_); #line 16 "/home/jens/Source/shotwell/src/events/EventPage.vala" checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "EventContextMenu"); #line 18 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp8_ = event_global; + _tmp5_ = event_global; #line 18 "/home/jens/Source/shotwell/src/events/EventPage.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _event_page_on_events_altered_data_collection_items_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _event_page_on_events_altered_data_collection_items_altered, self, 0); #line 10 "/home/jens/Source/shotwell/src/events/EventPage.vala" return self; -#line 1030 "EventPage.c" +#line 1173 "EventPage.c" } -EventPage* event_page_new (Event* page_event) { +EventPage* +event_page_new (Event* page_event) +{ #line 10 "/home/jens/Source/shotwell/src/events/EventPage.vala" return event_page_construct (TYPE_EVENT_PAGE, page_event); -#line 1037 "EventPage.c" +#line 1182 "EventPage.c" } -Event* event_page_get_event (EventPage* self) { +Event* +event_page_get_event (EventPage* self) +{ Event* result = NULL; Event* _tmp0_; Event* _tmp1_; @@ -1051,118 +1198,103 @@ Event* event_page_get_event (EventPage* self) { result = _tmp1_; #line 22 "/home/jens/Source/shotwell/src/events/EventPage.vala" return result; -#line 1055 "EventPage.c" +#line 1202 "EventPage.c" } -static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* event) { +static gboolean +event_page_real_on_app_key_pressed (Page* base, + GdkEventKey* event) +{ EventPage * self; gboolean result = FALSE; - GdkEventKey* _tmp0_; - guint _tmp1_; - const gchar* _tmp2_; - GdkEventKey* _tmp7_; - gboolean _tmp8_; + guint _tmp0_; + const gchar* _tmp1_; #line 25 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage); #line 25 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_val_if_fail (event != NULL, FALSE); #line 30 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = event; -#line 30 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp1_ = _tmp0_->keyval; + _tmp0_ = event->keyval; #line 30 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp2_ = gdk_keyval_name (_tmp1_); + _tmp1_ = gdk_keyval_name (_tmp0_); #line 30 "/home/jens/Source/shotwell/src/events/EventPage.vala" - if (g_strcmp0 (_tmp2_, "F2") == 0) { -#line 1079 "EventPage.c" + if (g_strcmp0 (_tmp1_, "F2") == 0) { +#line 1224 "EventPage.c" + ViewCollection* _tmp2_; ViewCollection* _tmp3_; - ViewCollection* _tmp4_; - gint _tmp5_; - gboolean _tmp6_; + gboolean _tmp4_; #line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp5_ = view_collection_get_selected_count (_tmp4_); + _tmp4_ = view_collection_get_selected_count (_tmp3_) != 1; #line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp6_ = _tmp5_ != 1; + _data_collection_unref0 (_tmp3_); #line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _data_collection_unref0 (_tmp4_); -#line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala" - if (_tmp6_) { + if (_tmp4_) { #line 32 "/home/jens/Source/shotwell/src/events/EventPage.vala" result = TRUE; #line 32 "/home/jens/Source/shotwell/src/events/EventPage.vala" return result; -#line 1100 "EventPage.c" +#line 1242 "EventPage.c" } } #line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp7_ = event; -#line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp8_ = PAGE_CLASS (event_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp7_); -#line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala" - result = _tmp8_; + result = PAGE_CLASS (event_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), event); #line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala" return result; -#line 1111 "EventPage.c" +#line 1249 "EventPage.c" } -static void event_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { +static void +event_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames) +{ EventPage * self; - GeeList* _tmp0_; - GeeList* _tmp1_; #line 44 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage); #line 44 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 45 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = ui_filenames; -#line 45 "/home/jens/Source/shotwell/src/events/EventPage.vala" - PAGE_CLASS (event_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_); -#line 47 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp1_ = ui_filenames; + PAGE_CLASS (event_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), ui_filenames); #line 47 "/home/jens/Source/shotwell/src/events/EventPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "event.ui"); -#line 1131 "EventPage.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "event.ui"); +#line 1266 "EventPage.c" } -static void event_page_real_add_actions (Page* base, GActionMap* map) { +static void +event_page_real_add_actions (Page* base, + GActionMap* map) +{ EventPage * self; - GActionMap* _tmp0_; - GActionMap* _tmp1_; #line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage); #line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 57 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = map; -#line 57 "/home/jens/Source/shotwell/src/events/EventPage.vala" - PAGE_CLASS (event_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_); + PAGE_CLASS (event_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), map); #line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp1_ = map; -#line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala" - g_action_map_add_action_entries (_tmp1_, EVENT_PAGE_entries, G_N_ELEMENTS (EVENT_PAGE_entries), self); -#line 1151 "EventPage.c" + g_action_map_add_action_entries (map, EVENT_PAGE_entries, G_N_ELEMENTS (EVENT_PAGE_entries), self); +#line 1283 "EventPage.c" } -static void event_page_real_remove_actions (Page* base, GActionMap* map) { +static void +event_page_real_remove_actions (Page* base, + GActionMap* map) +{ EventPage * self; - GActionMap* _tmp0_; #line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage); #line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = map; -#line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala" - PAGE_CLASS (event_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_); -#line 1166 "EventPage.c" + PAGE_CLASS (event_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), map); +#line 1298 "EventPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -1174,72 +1306,66 @@ static void event_page_real_remove_actions (Page* base, GActionMap* map) { entry_collection_length1 = G_N_ELEMENTS (EVENT_PAGE_entries); #line 64 "/home/jens/Source/shotwell/src/events/EventPage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (EVENT_PAGE_entries); entry_it = entry_it + 1) { -#line 1178 "EventPage.c" +#line 1310 "EventPage.c" GActionEntry entry = {0}; #line 64 "/home/jens/Source/shotwell/src/events/EventPage.vala" entry = entry_collection[entry_it]; -#line 1182 "EventPage.c" +#line 1314 "EventPage.c" { - GActionMap* _tmp1_; - GActionEntry _tmp2_; - const gchar* _tmp3_; -#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp1_ = map; + GActionEntry _tmp0_; + const gchar* _tmp1_; #line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp2_ = entry; + _tmp0_ = entry; #line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp3_ = _tmp2_.name; + _tmp1_ = _tmp0_.name; #line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala" - g_action_map_remove_action (_tmp1_, _tmp3_); -#line 1195 "EventPage.c" + g_action_map_remove_action (map, _tmp1_); +#line 1324 "EventPage.c" } } } } -static void event_page_real_init_actions (Page* base, gint selected_count, gint count) { +static void +event_page_real_init_actions (Page* base, + gint selected_count, + gint count) +{ EventPage * self; - gint _tmp0_; - gint _tmp1_; #line 69 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage); #line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = selected_count; -#line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp1_ = count; -#line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala" - PAGE_CLASS (event_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_, _tmp1_); -#line 1214 "EventPage.c" + PAGE_CLASS (event_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), selected_count, count); +#line 1341 "EventPage.c" } -static void event_page_real_update_actions (Page* base, gint selected_count, gint count) { +static void +event_page_real_update_actions (Page* base, + gint selected_count, + gint count) +{ EventPage * self; - gint _tmp0_; - gint _tmp1_; - gint _tmp2_; #line 73 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage); #line 74 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = selected_count; -#line 74 "/home/jens/Source/shotwell/src/events/EventPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MakePrimary", _tmp0_ == 1); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MakePrimary", selected_count == 1); #line 77 "/home/jens/Source/shotwell/src/events/EventPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToEvent", FALSE); #line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp1_ = selected_count; -#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp2_ = count; -#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala" - PAGE_CLASS (event_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp1_, _tmp2_); + PAGE_CLASS (event_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), selected_count, count); #line 83 "/home/jens/Source/shotwell/src/events/EventPage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditEventComment", TRUE); -#line 1239 "EventPage.c" +#line 1361 "EventPage.c" } -static void event_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) { +static void +event_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by) +{ EventPage * self; gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; @@ -1265,23 +1391,25 @@ static void event_page_real_get_config_photos_sort (MediaPage* base, gboolean* s if (sort_order) { #line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala" *sort_order = _vala_sort_order; -#line 1269 "EventPage.c" +#line 1395 "EventPage.c" } #line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala" if (sort_by) { #line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala" *sort_by = _vala_sort_by; -#line 1275 "EventPage.c" +#line 1401 "EventPage.c" } } -static void event_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { +static void +event_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by) +{ EventPage * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - gboolean _tmp2_; - gint _tmp3_; #line 90 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage); #line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala" @@ -1289,58 +1417,52 @@ static void event_page_real_set_config_photos_sort (MediaPage* base, gboolean so #line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala" _tmp1_ = _tmp0_; #line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp2_ = sort_order; -#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp3_ = sort_by; -#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala" - configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); + configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), sort_order, sort_by); #line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala" _g_object_unref0 (_tmp1_); -#line 1300 "EventPage.c" +#line 1424 "EventPage.c" } -static void event_page_on_events_altered (EventPage* self, GeeMap* map) { - GeeMap* _tmp0_; - Event* _tmp1_; - gboolean _tmp2_; +static void +event_page_on_events_altered (EventPage* self, + GeeMap* map) +{ + Event* _tmp0_; #line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_if_fail (IS_EVENT_PAGE (self)); #line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_if_fail (GEE_IS_MAP (map)); #line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = map; -#line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp1_ = self->priv->page_event; -#line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp2_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); + _tmp0_ = self->priv->page_event; #line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala" - if (_tmp2_) { -#line 1320 "EventPage.c" - Event* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; + if (gee_map_has_key (map, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject))) { +#line 1441 "EventPage.c" + Event* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp3_ = self->priv->page_event; + _tmp1_ = self->priv->page_event; #line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); + _tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); #line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala" - page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp5_); + page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp3_); #line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _g_free0 (_tmp5_); -#line 1334 "EventPage.c" + _g_free0 (_tmp3_); +#line 1455 "EventPage.c" } } -static void event_page_real_on_edit_comment (MediaPage* base) { +static void +event_page_real_on_edit_comment (MediaPage* base) +{ EventPage * self; ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; #line 99 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage); #line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala" @@ -1348,81 +1470,79 @@ static void event_page_real_on_edit_comment (MediaPage* base) { #line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala" _tmp1_ = _tmp0_; #line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp3_ = _tmp2_ == 0; + _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0; #line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala" _data_collection_unref0 (_tmp1_); #line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala" - if (_tmp3_) { -#line 1359 "EventPage.c" + if (_tmp2_) { +#line 1479 "EventPage.c" EditCommentDialog* edit_comment_dialog = NULL; - Event* _tmp4_; + Event* _tmp3_; + gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; + EditCommentDialog* _tmp6_; EditCommentDialog* _tmp7_; - EditCommentDialog* _tmp8_; gchar* new_comment = NULL; - EditCommentDialog* _tmp9_; - gchar* _tmp10_; - const gchar* _tmp11_; + EditCommentDialog* _tmp8_; + gchar* _tmp9_; + const gchar* _tmp10_; EditEventCommentCommand* command = NULL; - Event* _tmp12_; - const gchar* _tmp13_; - EditEventCommentCommand* _tmp14_; + Event* _tmp11_; + const gchar* _tmp12_; + EditEventCommentCommand* _tmp13_; + CommandManager* _tmp14_; CommandManager* _tmp15_; - CommandManager* _tmp16_; - EditEventCommentCommand* _tmp17_; + EditEventCommentCommand* _tmp16_; #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp4_ = self->priv->page_event; + _tmp3_ = self->priv->page_event; #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp5_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_EVENT_SOURCE, EventSource)); + _tmp4_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_EVENT_SOURCE, EventSource)); #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp7_ = edit_comment_dialog_new (_tmp6_, TRUE); + _tmp6_ = edit_comment_dialog_new (_tmp5_, TRUE); #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala" - edit_comment_dialog = _tmp8_; + edit_comment_dialog = _tmp7_; #line 103 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp9_ = edit_comment_dialog; + _tmp8_ = edit_comment_dialog; #line 103 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp10_ = edit_comment_dialog_execute (_tmp9_); + _tmp9_ = edit_comment_dialog_execute (_tmp8_); #line 103 "/home/jens/Source/shotwell/src/events/EventPage.vala" - new_comment = _tmp10_; + new_comment = _tmp9_; #line 104 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp11_ = new_comment; + _tmp10_ = new_comment; #line 104 "/home/jens/Source/shotwell/src/events/EventPage.vala" - if (_tmp11_ == NULL) { + if (_tmp10_ == NULL) { #line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala" _g_free0 (new_comment); #line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala" _multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog); #line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala" return; -#line 1407 "EventPage.c" +#line 1527 "EventPage.c" } #line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp12_ = self->priv->page_event; + _tmp11_ = self->priv->page_event; #line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp13_ = new_comment; + _tmp12_ = new_comment; #line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp14_ = edit_event_comment_command_new (_tmp12_, _tmp13_); + _tmp13_ = edit_event_comment_command_new (_tmp11_, _tmp12_); #line 107 "/home/jens/Source/shotwell/src/events/EventPage.vala" - command = _tmp14_; + command = _tmp13_; #line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp15_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp14_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp17_ = command; + _tmp16_ = command; #line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala" - command_manager_execute (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command)); #line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _command_manager_unref0 (_tmp16_); + _command_manager_unref0 (_tmp15_); #line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala" _g_object_unref0 (command); #line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala" @@ -1431,26 +1551,27 @@ static void event_page_real_on_edit_comment (MediaPage* base) { _multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog); #line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala" return; -#line 1435 "EventPage.c" +#line 1555 "EventPage.c" } #line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala" MEDIA_PAGE_CLASS (event_page_parent_class)->on_edit_comment (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_MEDIA_PAGE, MediaPage)); -#line 1439 "EventPage.c" +#line 1559 "EventPage.c" } -static void event_page_on_make_primary (EventPage* self) { +static void +event_page_on_make_primary (EventPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; - Event* _tmp4_; + gboolean _tmp2_; + Event* _tmp3_; + ViewCollection* _tmp4_; ViewCollection* _tmp5_; - ViewCollection* _tmp6_; + DataView* _tmp6_; DataView* _tmp7_; - DataView* _tmp8_; - DataSource* _tmp9_; - MediaSource* _tmp10_; + DataSource* _tmp8_; + MediaSource* _tmp9_; #line 115 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_if_fail (IS_EVENT_PAGE (self)); #line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala" @@ -1458,44 +1579,44 @@ static void event_page_on_make_primary (EventPage* self) { #line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala" _tmp1_ = _tmp0_; #line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp3_ = _tmp2_ != 1; + _tmp2_ = view_collection_get_selected_count (_tmp1_) != 1; #line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala" _data_collection_unref0 (_tmp1_); #line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 117 "/home/jens/Source/shotwell/src/events/EventPage.vala" return; -#line 1471 "EventPage.c" +#line 1590 "EventPage.c" } #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp4_ = self->priv->page_event; + _tmp3_ = self->priv->page_event; #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp7_ = view_collection_get_selected_at (_tmp6_, 0); + _tmp6_ = view_collection_get_selected_at (_tmp5_, 0); #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp9_ = data_view_get_source (_tmp8_); + _tmp8_ = data_view_get_source (_tmp7_); #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource); + _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource); #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - event_set_primary_source (_tmp4_, _tmp10_); + event_set_primary_source (_tmp3_, _tmp9_); #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp9_); #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 119 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _data_collection_unref0 (_tmp6_); -#line 1495 "EventPage.c" + _data_collection_unref0 (_tmp5_); +#line 1614 "EventPage.c" } -static void event_page_on_rename (EventPage* self) { +static void +event_page_on_rename (EventPage* self) +{ LibraryWindow* _tmp0_; LibraryWindow* _tmp1_; Event* _tmp2_; @@ -1511,11 +1632,13 @@ static void event_page_on_rename (EventPage* self) { library_window_rename_event_in_sidebar (_tmp1_, _tmp2_); #line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala" _g_object_unref0 (_tmp1_); -#line 1515 "EventPage.c" +#line 1636 "EventPage.c" } -static void event_page_class_init (EventPageClass * klass) { +static void +event_page_class_init (EventPageClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala" event_page_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala" @@ -1540,18 +1663,22 @@ static void event_page_class_init (EventPageClass * klass) { ((MediaPageClass *) klass)->on_edit_comment = (void (*) (MediaPage *)) event_page_real_on_edit_comment; #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala" G_OBJECT_CLASS (klass)->finalize = event_page_finalize; -#line 1544 "EventPage.c" +#line 1667 "EventPage.c" } -static void event_page_instance_init (EventPage * self) { +static void +event_page_instance_init (EventPage * self) +{ #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala" self->priv = EVENT_PAGE_GET_PRIVATE (self); -#line 1551 "EventPage.c" +#line 1676 "EventPage.c" } -static void event_page_finalize (GObject * obj) { +static void +event_page_finalize (GObject * obj) +{ EventPage * self; EventSourceCollection* _tmp0_; guint _tmp1_; @@ -1577,11 +1704,13 @@ static void event_page_finalize (GObject * obj) { _g_object_unref0 (self->priv->page_event); #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala" G_OBJECT_CLASS (event_page_parent_class)->finalize (obj); -#line 1581 "EventPage.c" +#line 1708 "EventPage.c" } -GType event_page_get_type (void) { +GType +event_page_get_type (void) +{ static volatile gsize event_page_type_id__volatile = 0; if (g_once_init_enter (&event_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) event_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventPage), 0, (GInstanceInitFunc) event_page_instance_init, NULL }; @@ -1593,7 +1722,9 @@ GType event_page_get_type (void) { } -NoEventPage* no_event_page_construct (GType object_type) { +NoEventPage* +no_event_page_construct (GType object_type) +{ NoEventPage * self = NULL; ViewManager* filter = NULL; NoEventPageNoEventViewManager* _tmp0_; @@ -1651,18 +1782,24 @@ NoEventPage* no_event_page_construct (GType object_type) { _view_manager_unref0 (filter); #line 145 "/home/jens/Source/shotwell/src/events/EventPage.vala" return self; -#line 1655 "EventPage.c" +#line 1786 "EventPage.c" } -NoEventPage* no_event_page_new (void) { +NoEventPage* +no_event_page_new (void) +{ #line 145 "/home/jens/Source/shotwell/src/events/EventPage.vala" return no_event_page_construct (TYPE_NO_EVENT_PAGE); -#line 1662 "EventPage.c" +#line 1795 "EventPage.c" } -static void no_event_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) { +static void +no_event_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by) +{ NoEventPage * self; gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; @@ -1688,23 +1825,25 @@ static void no_event_page_real_get_config_photos_sort (MediaPage* base, gboolean if (sort_order) { #line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala" *sort_order = _vala_sort_order; -#line 1692 "EventPage.c" +#line 1829 "EventPage.c" } #line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala" if (sort_by) { #line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala" *sort_by = _vala_sort_by; -#line 1698 "EventPage.c" +#line 1835 "EventPage.c" } } -static void no_event_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { +static void +no_event_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by) +{ NoEventPage * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - gboolean _tmp2_; - gint _tmp3_; #line 157 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NO_EVENT_PAGE, NoEventPage); #line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala" @@ -1712,94 +1851,92 @@ static void no_event_page_real_set_config_photos_sort (MediaPage* base, gboolean #line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala" _tmp1_ = _tmp0_; #line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp2_ = sort_order; -#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp3_ = sort_by; -#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala" - configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); + configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), sort_order, sort_by); #line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala" _g_object_unref0 (_tmp1_); -#line 1723 "EventPage.c" +#line 1858 "EventPage.c" } -static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_construct (GType object_type, NoEventPage* page) { +static NoEventPageNoEventViewManager* +no_event_page_no_event_view_manager_construct (GType object_type, + NoEventPage* page) +{ NoEventPageNoEventViewManager* self = NULL; - NoEventPage* _tmp0_; #line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_val_if_fail (IS_NO_EVENT_PAGE (page), NULL); #line 133 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = page; -#line 133 "/home/jens/Source/shotwell/src/events/EventPage.vala" - self = (NoEventPageNoEventViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage)); + self = (NoEventPageNoEventViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_COLLECTION_PAGE, CollectionPage)); #line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala" return self; -#line 1738 "EventPage.c" +#line 1873 "EventPage.c" } -static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_new (NoEventPage* page) { +static NoEventPageNoEventViewManager* +no_event_page_no_event_view_manager_new (NoEventPage* page) +{ #line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala" return no_event_page_no_event_view_manager_construct (NO_EVENT_PAGE_TYPE_NO_EVENT_VIEW_MANAGER, page); -#line 1745 "EventPage.c" +#line 1882 "EventPage.c" } -static gboolean no_event_page_no_event_view_manager_real_include_in_view (ViewManager* base, DataSource* source) { +static gboolean +no_event_page_no_event_view_manager_real_include_in_view (ViewManager* base, + DataSource* source) +{ NoEventPageNoEventViewManager * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; - DataSource* _tmp1_; - EventID _tmp2_ = {0}; - gint64 _tmp3_; + EventID _tmp1_ = {0}; + gint64 _tmp2_; #line 137 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, NO_EVENT_PAGE_TYPE_NO_EVENT_VIEW_MANAGER, NoEventPageNoEventViewManager); #line 137 "/home/jens/Source/shotwell/src/events/EventPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp1_ = source; -#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala" - media_source_get_event_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp2_); + media_source_get_event_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource), &_tmp1_); #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp3_ = _tmp2_.id; + _tmp2_ = _tmp1_.id; #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala" - if (_tmp3_ != EVENT_ID_INVALID) { + if (_tmp2_ != EVENT_ID_INVALID) { #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala" _tmp0_ = FALSE; -#line 1770 "EventPage.c" +#line 1907 "EventPage.c" } else { - DataSource* _tmp4_; - gboolean _tmp5_; #line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp4_ = source; -#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp5_ = VIEW_MANAGER_CLASS (no_event_page_no_event_view_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManager), TYPE_VIEW_MANAGER, ViewManager), _tmp4_); -#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala" - _tmp0_ = _tmp5_; -#line 1780 "EventPage.c" + _tmp0_ = VIEW_MANAGER_CLASS (no_event_page_no_event_view_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManager), TYPE_VIEW_MANAGER, ViewManager), source); +#line 1911 "EventPage.c" } #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala" result = _tmp0_; #line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala" return result; -#line 1786 "EventPage.c" +#line 1917 "EventPage.c" } -static void no_event_page_no_event_view_manager_class_init (NoEventPageNoEventViewManagerClass * klass) { +static void +no_event_page_no_event_view_manager_class_init (NoEventPageNoEventViewManagerClass * klass) +{ #line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala" no_event_page_no_event_view_manager_parent_class = g_type_class_peek_parent (klass); #line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala" ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) no_event_page_no_event_view_manager_real_include_in_view; -#line 1795 "EventPage.c" +#line 1928 "EventPage.c" } -static void no_event_page_no_event_view_manager_instance_init (NoEventPageNoEventViewManager * self) { +static void +no_event_page_no_event_view_manager_instance_init (NoEventPageNoEventViewManager * self) +{ } -static GType no_event_page_no_event_view_manager_get_type (void) { +static GType +no_event_page_no_event_view_manager_get_type (void) +{ static volatile gsize no_event_page_no_event_view_manager_type_id__volatile = 0; if (g_once_init_enter (&no_event_page_no_event_view_manager_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (NoEventPageNoEventViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) no_event_page_no_event_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NoEventPageNoEventViewManager), 0, (GInstanceInitFunc) no_event_page_no_event_view_manager_instance_init, NULL }; @@ -1811,7 +1948,9 @@ static GType no_event_page_no_event_view_manager_get_type (void) { } -static void no_event_page_class_init (NoEventPageClass * klass) { +static void +no_event_page_class_init (NoEventPageClass * klass) +{ Alteration* _tmp0_; #line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala" no_event_page_parent_class = g_type_class_peek_parent (klass); @@ -1825,25 +1964,31 @@ static void no_event_page_class_init (NoEventPageClass * klass) { _tmp0_ = alteration_new ("metadata", "event"); #line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala" no_event_page_no_event_page_alteration = _tmp0_; -#line 1829 "EventPage.c" +#line 1968 "EventPage.c" } -static void no_event_page_instance_init (NoEventPage * self) { +static void +no_event_page_instance_init (NoEventPage * self) +{ } -static void no_event_page_finalize (GObject * obj) { +static void +no_event_page_finalize (GObject * obj) +{ NoEventPage * self; #line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NO_EVENT_PAGE, NoEventPage); #line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala" G_OBJECT_CLASS (no_event_page_parent_class)->finalize (obj); -#line 1843 "EventPage.c" +#line 1986 "EventPage.c" } -GType no_event_page_get_type (void) { +GType +no_event_page_get_type (void) +{ static volatile gsize no_event_page_type_id__volatile = 0; if (g_once_init_enter (&no_event_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (NoEventPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) no_event_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NoEventPage), 0, (GInstanceInitFunc) no_event_page_instance_init, NULL }; diff --git a/src/events/Events.c b/src/events/Events.c index 270b9ad..055b112 100644 --- a/src/events/Events.c +++ b/src/events/Events.c @@ -1,4 +1,4 @@ -/* Events.c generated by valac 0.36.6, the Vala compiler +/* Events.c generated by valac 0.40.4, the Vala compiler * generated from Events.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include @@ -19,17 +20,21 @@ void events_terminate (void); void events_branch_terminate (void); -void events_init (GError** error) { +void +events_init (GError** error) +{ #line 10 "/home/jens/Source/shotwell/src/events/Events.vala" events_branch_init (); -#line 26 "Events.c" +#line 29 "Events.c" } -void events_terminate (void) { +void +events_terminate (void) +{ #line 14 "/home/jens/Source/shotwell/src/events/Events.vala" events_branch_terminate (); -#line 33 "Events.c" +#line 38 "Events.c" } diff --git a/src/events/EventsBranch.c b/src/events/EventsBranch.c index 17ff6eb..e50da5b 100644 --- a/src/events/EventsBranch.c +++ b/src/events/EventsBranch.c @@ -1,4 +1,4 @@ -/* EventsBranch.c generated by valac 0.36.6, the Vala compiler +/* EventsBranch.c generated by valac 0.40.4, the Vala compiler * generated from EventsBranch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -149,6 +150,11 @@ typedef struct _EventsNoEventEntryClass EventsNoEventEntryClass; typedef struct _EventsMasterDirectoryEntry EventsMasterDirectoryEntry; typedef struct _EventsMasterDirectoryEntryClass EventsMasterDirectoryEntryClass; +enum { + EVENTS_BRANCH_0_PROPERTY, + EVENTS_BRANCH_NUM_PROPERTIES +}; +static GParamSpec* events_branch_properties[EVENTS_BRANCH_NUM_PROPERTIES]; #define TYPE_DATA_COLLECTION (data_collection_get_type ()) #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection)) @@ -349,7 +355,17 @@ typedef struct _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate; typedef struct _SidebarExpandableEntry SidebarExpandableEntry; typedef struct _SidebarExpandableEntryIface SidebarExpandableEntryIface; typedef struct _EventsDirectoryEntryPrivate EventsDirectoryEntryPrivate; +enum { + EVENTS_DIRECTORY_ENTRY_0_PROPERTY, + EVENTS_DIRECTORY_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* events_directory_entry_properties[EVENTS_DIRECTORY_ENTRY_NUM_PROPERTIES]; typedef struct _EventsMasterDirectoryEntryPrivate EventsMasterDirectoryEntryPrivate; +enum { + EVENTS_MASTER_DIRECTORY_ENTRY_0_PROPERTY, + EVENTS_MASTER_DIRECTORY_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* events_master_directory_entry_properties[EVENTS_MASTER_DIRECTORY_ENTRY_NUM_PROPERTIES]; #define TYPE_CHECKERBOARD_PAGE (checkerboard_page_get_type ()) #define CHECKERBOARD_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHECKERBOARD_PAGE, CheckerboardPage)) @@ -381,6 +397,11 @@ typedef struct _EventsDirectoryPageClass EventsDirectoryPageClass; typedef struct _MasterEventsDirectoryPage MasterEventsDirectoryPage; typedef struct _MasterEventsDirectoryPageClass MasterEventsDirectoryPageClass; typedef struct _EventsYearDirectoryEntryPrivate EventsYearDirectoryEntryPrivate; +enum { + EVENTS_YEAR_DIRECTORY_ENTRY_0_PROPERTY, + EVENTS_YEAR_DIRECTORY_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* events_year_directory_entry_properties[EVENTS_YEAR_DIRECTORY_ENTRY_NUM_PROPERTIES]; #define SUB_EVENTS_DIRECTORY_PAGE_TYPE_DIRECTORY_TYPE (sub_events_directory_page_directory_type_get_type ()) @@ -394,7 +415,17 @@ typedef struct _EventsYearDirectoryEntryPrivate EventsYearDirectoryEntryPrivate; typedef struct _SubEventsDirectoryPage SubEventsDirectoryPage; typedef struct _SubEventsDirectoryPageClass SubEventsDirectoryPageClass; typedef struct _EventsMonthDirectoryEntryPrivate EventsMonthDirectoryEntryPrivate; +enum { + EVENTS_MONTH_DIRECTORY_ENTRY_0_PROPERTY, + EVENTS_MONTH_DIRECTORY_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* events_month_directory_entry_properties[EVENTS_MONTH_DIRECTORY_ENTRY_NUM_PROPERTIES]; typedef struct _EventsUndatedDirectoryEntryPrivate EventsUndatedDirectoryEntryPrivate; +enum { + EVENTS_UNDATED_DIRECTORY_ENTRY_0_PROPERTY, + EVENTS_UNDATED_DIRECTORY_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* events_undated_directory_entry_properties[EVENTS_UNDATED_DIRECTORY_ENTRY_NUM_PROPERTIES]; #define SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY (sidebar_internal_drop_target_entry_get_type ()) #define SIDEBAR_INTERNAL_DROP_TARGET_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY, SidebarInternalDropTargetEntry)) @@ -414,6 +445,11 @@ typedef struct _SidebarInternalDropTargetEntryIface SidebarInternalDropTargetEnt typedef struct _MediaSource MediaSource; typedef struct _MediaSourceClass MediaSourceClass; typedef struct _EventsEventEntryPrivate EventsEventEntryPrivate; +enum { + EVENTS_EVENT_ENTRY_0_PROPERTY, + EVENTS_EVENT_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* events_event_entry_properties[EVENTS_EVENT_ENTRY_NUM_PROPERTIES]; #define TYPE_MEDIA_PAGE (media_page_get_type ()) #define MEDIA_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_PAGE, MediaPage)) @@ -526,6 +562,11 @@ typedef struct _MovePhotosCommandClass MovePhotosCommandClass; typedef struct _SetEventCommand SetEventCommand; typedef struct _SetEventCommandClass SetEventCommandClass; typedef struct _EventsNoEventEntryPrivate EventsNoEventEntryPrivate; +enum { + EVENTS_NO_EVENT_ENTRY_0_PROPERTY, + EVENTS_NO_EVENT_ENTRY_NUM_PROPERTIES +}; +static GParamSpec* events_no_event_entry_properties[EVENTS_NO_EVENT_ENTRY_NUM_PROPERTIES]; #define TYPE_NO_EVENT_PAGE (no_event_page_get_type ()) #define NO_EVENT_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NO_EVENT_PAGE, NoEventPage)) @@ -768,38 +809,57 @@ GType events_undated_directory_entry_get_type (void) G_GNUC_CONST; GType events_no_event_entry_get_type (void) G_GNUC_CONST; GType events_master_directory_entry_get_type (void) G_GNUC_CONST; #define EVENTS_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EVENTS_TYPE_BRANCH, EventsBranchPrivate)) -enum { - EVENTS_BRANCH_DUMMY_PROPERTY -}; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType event_source_collection_get_type (void) G_GNUC_CONST; -static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterable* added, GeeIterable* removed); -static void _events_branch_on_events_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self); +static void events_branch_on_events_added_removed (EventsBranch* self, + GeeIterable* added, + GeeIterable* removed); +static void _events_branch_on_events_added_removed_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; -static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered); -static void _events_branch_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void events_branch_on_events_altered (EventsBranch* self, + GeeMap* altered); +static void _events_branch_on_events_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self); static void events_branch_on_no_event_collection_altered (EventsBranch* self); -static void _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered (EventSourceCollection* _sender, gpointer self); +static void _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered (EventSourceCollection* _sender, + gpointer self); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); static void events_branch_on_config_changed (EventsBranch* self); -static void _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed (ConfigurationFacade* _sender, gpointer self); +static void _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed (ConfigurationFacade* _sender, + gpointer self); #define RESOURCES_ICON_FOLDER "folder" #define RESOURCES_ICON_EVENTS "multiple-events" #define RESOURCES_ICON_ONE_EVENT "one-event" @@ -812,22 +872,41 @@ EventsMasterDirectoryEntry* events_master_directory_entry_new (void); EventsMasterDirectoryEntry* events_master_directory_entry_construct (GType object_type); EventsBranch* events_branch_new (void); EventsBranch* events_branch_construct (GType object_type); -SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized); -SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized); +SidebarHeader* sidebar_header_new (const gchar* name, + const gchar* tooltip, + gboolean emphasized); +SidebarHeader* sidebar_header_construct (GType object_type, + const gchar* name, + const gchar* tooltip, + gboolean emphasized); GType sidebar_grouping_get_type (void) G_GNUC_CONST; GType sidebar_header_get_type (void) G_GNUC_CONST; GType sidebar_tree_get_type (void) G_GNUC_CONST; GType sidebar_entry_get_type (void) G_GNUC_CONST; GType sidebar_branch_options_get_type (void) G_GNUC_CONST; -static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry* b); -static gint _events_branch_event_year_comparator_gcompare_func (gconstpointer a, gconstpointer b); -SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); -SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator); -void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator); +static gint events_branch_event_year_comparator (SidebarEntry* a, + SidebarEntry* b); +static gint _events_branch_event_year_comparator_gcompare_func (gconstpointer a, + gconstpointer b); +SidebarBranch* sidebar_branch_new (SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); +SidebarBranch* sidebar_branch_construct (GType object_type, + SidebarEntry* root, + SidebarBranchOptions options, + GCompareFunc default_comparator, + GCompareFunc root_comparator); +void sidebar_branch_graft (SidebarBranch* self, + SidebarEntry* parent, + SidebarEntry* entry, + GCompareFunc comparator); SidebarEntry* sidebar_branch_get_root (SidebarBranch* self); GeeCollection* data_collection_get_all (DataCollection* self); -static void events_branch_add_event (EventsBranch* self, Event* event); -static void events_branch_show_no_events (EventsBranch* self, gboolean show); +static void events_branch_add_event (EventsBranch* self, + Event* event); +static void events_branch_show_no_events (EventsBranch* self, + gboolean show); GeeCollection* event_source_collection_get_no_event_objects (EventSourceCollection* self); void events_branch_init (void); gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* self); @@ -836,72 +915,110 @@ gboolean events_branch_is_user_renameable (EventsBranch* self); EventsMasterDirectoryEntry* events_branch_get_master_entry (EventsBranch* self); GType events_year_directory_entry_get_type (void) G_GNUC_CONST; gint events_year_directory_entry_get_year (EventsYearDirectoryEntry* self); -static gint events_branch_event_month_comparator (SidebarEntry* a, SidebarEntry* b); +static gint events_branch_event_month_comparator (SidebarEntry* a, + SidebarEntry* b); GType events_month_directory_entry_get_type (void) G_GNUC_CONST; gint events_month_directory_entry_get_month (EventsMonthDirectoryEntry* self); -static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b); +static gint events_branch_event_comparator (SidebarEntry* a, + SidebarEntry* b); Event* events_event_entry_get_event (EventsEventEntry* self); time_t event_source_get_start_time (EventSource* self); GType event_id_get_type (void) G_GNUC_CONST; EventID* event_id_dup (const EventID* self); void event_id_free (EventID* self); -void event_get_event_id (Event* self, EventID* result); -static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntry* b); +void event_get_event_id (Event* self, + EventID* result); +static gint events_branch_undated_event_comparator (SidebarEntry* a, + SidebarEntry* b); gchar* data_object_get_name (DataObject* self); gint64 data_source_get_instance_id (DataSource* self); -EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, Event* event); +EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, + Event* event); void sidebar_branch_reorder_all (SidebarBranch* self); -static void events_branch_remove_event (EventsBranch* self, Event* event); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); -static void events_branch_move_event (EventsBranch* self, Event* event); +static void events_branch_remove_event (EventsBranch* self, + Event* event); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); +static void events_branch_move_event (EventsBranch* self, + Event* event); GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST; -static void events_branch_add_undated_event (EventsBranch* self, Event* event); -static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* event, struct tm* event_tm, SidebarEntry* * found_year); -static void events_branch_graft_event (EventsBranch* self, SidebarEntry* parent, Event* event, GCompareFunc comparator); -static gint _events_branch_event_comparator_gcompare_func (gconstpointer a, gconstpointer b); +static void events_branch_add_undated_event (EventsBranch* self, + Event* event); +static SidebarEntry* events_branch_find_event_month (EventsBranch* self, + Event* event, + struct tm* event_tm, + SidebarEntry* * found_year); +static void events_branch_graft_event (EventsBranch* self, + SidebarEntry* parent, + Event* event, + GCompareFunc comparator); +static gint _events_branch_event_comparator_gcompare_func (gconstpointer a, + gconstpointer b); #define SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT _ ("%Y") -EventsYearDirectoryEntry* events_year_directory_entry_new (const gchar* name, struct tm* tm); -EventsYearDirectoryEntry* events_year_directory_entry_construct (GType object_type, const gchar* name, struct tm* tm); -static gint _events_branch_event_month_comparator_gcompare_func (gconstpointer a, gconstpointer b); +EventsYearDirectoryEntry* events_year_directory_entry_new (const gchar* name, + struct tm* tm); +EventsYearDirectoryEntry* events_year_directory_entry_construct (GType object_type, + const gchar* name, + struct tm* tm); +static gint _events_branch_event_month_comparator_gcompare_func (gconstpointer a, + gconstpointer b); #define SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT _ ("%B") -EventsMonthDirectoryEntry* events_month_directory_entry_new (const gchar* name, struct tm* tm); -EventsMonthDirectoryEntry* events_month_directory_entry_construct (GType object_type, const gchar* name, struct tm* tm); -static void events_branch_move_to_undated_event (EventsBranch* self, Event* event); -static void events_branch_reparent_event (EventsBranch* self, Event* event, SidebarEntry* new_parent); -SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry); -void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry); -gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent); +EventsMonthDirectoryEntry* events_month_directory_entry_new (const gchar* name, + struct tm* tm); +EventsMonthDirectoryEntry* events_month_directory_entry_construct (GType object_type, + const gchar* name, + struct tm* tm); +static void events_branch_move_to_undated_event (EventsBranch* self, + Event* event); +static void events_branch_reparent_event (EventsBranch* self, + Event* event, + SidebarEntry* new_parent); +SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, + SidebarEntry* entry); +void sidebar_branch_prune (SidebarBranch* self, + SidebarEntry* entry); +gint sidebar_branch_get_child_count (SidebarBranch* self, + SidebarEntry* parent); static Block8Data* block8_data_ref (Block8Data* _data8_); static void block8_data_unref (void * _userdata_); -static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* event, struct tm* event_tm); -SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry* parent, Locator locator, void* locator_target); -static gboolean __lambda21_ (Block8Data* _data8_, SidebarEntry* entry); -static gboolean ___lambda21__locator (gconstpointer item, gpointer self); +static SidebarEntry* events_branch_find_event_year (EventsBranch* self, + Event* event, + struct tm* event_tm); +SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, + SidebarEntry* parent, + Locator locator, + void* locator_target); +static gboolean __lambda21_ (Block8Data* _data8_, + SidebarEntry* entry); +static gboolean ___lambda21__locator (gconstpointer item, + gpointer self); static Block9Data* block9_data_ref (Block9Data* _data9_); static void block9_data_unref (void * _userdata_); -static gboolean __lambda20_ (Block9Data* _data9_, SidebarEntry* entry); -static gboolean ___lambda20__locator (gconstpointer item, gpointer self); -gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry); -static gint _events_branch_undated_event_comparator_gcompare_func (gconstpointer a, gconstpointer b); +static gboolean __lambda20_ (Block9Data* _data9_, + SidebarEntry* entry); +static gboolean ___lambda20__locator (gconstpointer item, + gpointer self); +gboolean sidebar_branch_has_entry (SidebarBranch* self, + SidebarEntry* entry); +static gint _events_branch_undated_event_comparator_gcompare_func (gconstpointer a, + gconstpointer b); EventsEventEntry* events_event_entry_new (Event* event); -EventsEventEntry* events_event_entry_construct (GType object_type, Event* event); -void sidebar_branch_reparent (SidebarBranch* self, SidebarEntry* new_parent, SidebarEntry* entry); +EventsEventEntry* events_event_entry_construct (GType object_type, + Event* event); +void sidebar_branch_reparent (SidebarBranch* self, + SidebarEntry* new_parent, + SidebarEntry* entry); static void events_branch_finalize (GObject * obj); GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST; GType page_get_type (void) G_GNUC_CONST; GType sidebar_page_representative_get_type (void) G_GNUC_CONST; GType sidebar_contextable_get_type (void) G_GNUC_CONST; GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST; -enum { - EVENTS_DIRECTORY_ENTRY_DUMMY_PROPERTY -}; EventsDirectoryEntry* events_directory_entry_construct (GType object_type); SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type); static gchar* events_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base); static gboolean events_directory_entry_real_expand_on_select (SidebarExpandableEntry* base); -enum { - EVENTS_MASTER_DIRECTORY_ENTRY_DUMMY_PROPERTY -}; static gchar* events_master_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); #define MASTER_EVENTS_DIRECTORY_PAGE_NAME _ ("All Events") static gchar* events_master_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base); @@ -912,75 +1029,81 @@ GType checkerboard_page_get_type (void) G_GNUC_CONST; GType events_directory_page_get_type (void) G_GNUC_CONST; GType master_events_directory_page_get_type (void) G_GNUC_CONST; #define EVENTS_YEAR_DIRECTORY_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntryPrivate)) -enum { - EVENTS_YEAR_DIRECTORY_ENTRY_DUMMY_PROPERTY -}; static gchar* events_year_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); static Page* events_year_directory_entry_real_create_page (SidebarSimplePageEntry* base); GType sub_events_directory_page_directory_type_get_type (void) G_GNUC_CONST; -SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, struct tm* time); -SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time); +SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, + struct tm* time); +SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type, + SubEventsDirectoryPageDirectoryType type, + struct tm* time); GType sub_events_directory_page_get_type (void) G_GNUC_CONST; static void events_year_directory_entry_finalize (GObject * obj); #define EVENTS_MONTH_DIRECTORY_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntryPrivate)) -enum { - EVENTS_MONTH_DIRECTORY_ENTRY_DUMMY_PROPERTY -}; static gchar* events_month_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); gint events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self); static Page* events_month_directory_entry_real_create_page (SidebarSimplePageEntry* base); static void events_month_directory_entry_finalize (GObject * obj); -enum { - EVENTS_UNDATED_DIRECTORY_ENTRY_DUMMY_PROPERTY -}; static gchar* events_undated_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); #define SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME _ ("Undated") static Page* events_undated_directory_entry_real_create_page (SidebarSimplePageEntry* base); GType media_source_get_type (void) G_GNUC_CONST; GType sidebar_internal_drop_target_entry_get_type (void) G_GNUC_CONST; #define EVENTS_EVENT_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EVENTS_TYPE_EVENT_ENTRY, EventsEventEntryPrivate)) -enum { - EVENTS_EVENT_ENTRY_DUMMY_PROPERTY -}; static gchar* events_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); static gchar* events_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base); static Page* events_event_entry_real_create_page (SidebarSimplePageEntry* base); EventPage* event_page_new (Event* page_event); -EventPage* event_page_construct (GType object_type, Event* page_event); +EventPage* event_page_construct (GType object_type, + Event* page_event); GType media_page_get_type (void) G_GNUC_CONST; GType collection_page_get_type (void) G_GNUC_CONST; GType event_page_get_type (void) G_GNUC_CONST; static gboolean events_event_entry_real_is_user_renameable (SidebarRenameableEntry* base); -static void events_event_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name); +static void events_event_entry_real_rename (SidebarRenameableEntry* base, + const gchar* new_name); gchar* event_prep_event_name (const gchar* name); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* app_window_get_command_manager (void); GType command_get_type (void) G_GNUC_CONST; -void command_manager_execute (CommandManager* self, Command* command); -RenameEventCommand* rename_event_command_new (Event* event, const gchar* new_name); -RenameEventCommand* rename_event_command_construct (GType object_type, Event* event, const gchar* new_name); +void command_manager_execute (CommandManager* self, + Command* command); +RenameEventCommand* rename_event_command_new (Event* event, + const gchar* new_name); +RenameEventCommand* rename_event_command_construct (GType object_type, + Event* event, + const gchar* new_name); GType page_command_get_type (void) G_GNUC_CONST; GType simple_proxyable_command_get_type (void) G_GNUC_CONST; GType rename_event_command_get_type (void) G_GNUC_CONST; -static gboolean events_event_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media); +static gboolean events_event_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, + GeeList* media); GType data_view_get_type (void) G_GNUC_CONST; DataView* data_view_new (DataSource* source); -DataView* data_view_construct (GType object_type, DataSource* source); -SetEventCommand* set_event_command_new (GeeIterable* iter, Event* new_event); -SetEventCommand* set_event_command_construct (GType object_type, GeeIterable* iter, Event* new_event); +DataView* data_view_construct (GType object_type, + DataSource* source); +SetEventCommand* set_event_command_new (GeeIterable* iter, + Event* new_event); +SetEventCommand* set_event_command_construct (GType object_type, + GeeIterable* iter, + Event* new_event); GType move_photos_command_get_type (void) G_GNUC_CONST; GType set_event_command_get_type (void) G_GNUC_CONST; -static gboolean events_event_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data); +static gboolean events_event_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, + GtkSelectionData* data); static void events_event_entry_finalize (GObject * obj); -enum { - EVENTS_NO_EVENT_ENTRY_DUMMY_PROPERTY -}; static gchar* events_no_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base); #define NO_EVENT_PAGE_NAME _ ("No Event") static gchar* events_no_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base); @@ -990,60 +1113,80 @@ NoEventPage* no_event_page_construct (GType object_type); GType no_event_page_get_type (void) G_GNUC_CONST; -static void _events_branch_on_events_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { +static void +_events_branch_on_events_added_removed_data_collection_contents_altered (DataCollection* _sender, + GeeIterable* added, + GeeIterable* removed, + gpointer self) +{ #line 47 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_branch_on_events_added_removed ((EventsBranch*) self, added, removed); -#line 997 "EventsBranch.c" +#line 1125 "EventsBranch.c" } -static void _events_branch_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { +static void +_events_branch_on_events_altered_data_collection_items_altered (DataCollection* _sender, + GeeMap* items, + gpointer self) +{ #line 48 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_branch_on_events_altered ((EventsBranch*) self, items); -#line 1004 "EventsBranch.c" +#line 1136 "EventsBranch.c" } -static void _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered (EventSourceCollection* _sender, gpointer self) { +static void +_events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered (EventSourceCollection* _sender, + gpointer self) +{ #line 49 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_branch_on_no_event_collection_altered ((EventsBranch*) self); -#line 1011 "EventsBranch.c" +#line 1146 "EventsBranch.c" } -static void _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed (ConfigurationFacade* _sender, gpointer self) { +static void +_events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed (ConfigurationFacade* _sender, + gpointer self) +{ #line 51 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_branch_on_config_changed ((EventsBranch*) self); -#line 1018 "EventsBranch.c" +#line 1156 "EventsBranch.c" } -static gint _events_branch_event_year_comparator_gcompare_func (gconstpointer a, gconstpointer b) { +static gint +_events_branch_event_year_comparator_gcompare_func (gconstpointer a, + gconstpointer b) +{ gint result; result = events_branch_event_year_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 25 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1027 "EventsBranch.c" +#line 1168 "EventsBranch.c" } -EventsBranch* events_branch_construct (GType object_type) { +EventsBranch* +events_branch_construct (GType object_type) +{ EventsBranch * self = NULL; SidebarHeader* _tmp0_; SidebarHeader* _tmp1_; SidebarEntry* _tmp2_; SidebarEntry* _tmp3_; EventsMasterDirectoryEntry* _tmp4_; - EventSourceCollection* _tmp15_; + EventSourceCollection* _tmp14_; + GeeCollection* _tmp15_; GeeCollection* _tmp16_; - GeeCollection* _tmp17_; + gint _tmp17_; gint _tmp18_; - gint _tmp19_; + EventSourceCollection* _tmp19_; EventSourceCollection* _tmp20_; EventSourceCollection* _tmp21_; - EventSourceCollection* _tmp22_; + ConfigFacade* _tmp22_; ConfigFacade* _tmp23_; - ConfigFacade* _tmp24_; #line 25 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp0_ = sidebar_header_new (_ ("Events"), _ ("Browse through your events"), TRUE); #line 25 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -1062,7 +1205,7 @@ EventsBranch* events_branch_construct (GType object_type) { sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); #line 29 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_tmp3_); -#line 1066 "EventsBranch.c" +#line 1209 "EventsBranch.c" { GeeIterator* _object_it = NULL; EventSourceCollection* _tmp5_; @@ -1086,111 +1229,113 @@ EventsBranch* events_branch_construct (GType object_type) { _object_it = _tmp9_; #line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" while (TRUE) { -#line 1090 "EventsBranch.c" +#line 1233 "EventsBranch.c" GeeIterator* _tmp10_; - gboolean _tmp11_; DataObject* object = NULL; - GeeIterator* _tmp12_; - gpointer _tmp13_; - DataObject* _tmp14_; + GeeIterator* _tmp11_; + gpointer _tmp12_; + DataObject* _tmp13_; #line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp10_ = _object_it; #line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = gee_iterator_next (_tmp10_); -#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp11_) { + if (!gee_iterator_next (_tmp10_)) { #line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" break; -#line 1105 "EventsBranch.c" +#line 1245 "EventsBranch.c" } #line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = _object_it; + _tmp11_ = _object_it; #line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = gee_iterator_get (_tmp12_); + _tmp12_ = gee_iterator_get (_tmp11_); #line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - object = (DataObject*) _tmp13_; + object = (DataObject*) _tmp12_; #line 33 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = object; + _tmp13_ = object; #line 33 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_EVENT, Event)); + events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_EVENT, Event)); #line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (object); -#line 1119 "EventsBranch.c" +#line 1259 "EventsBranch.c" } #line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_object_it); -#line 1123 "EventsBranch.c" +#line 1263 "EventsBranch.c" } #line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = event_global; + _tmp14_ = event_global; #line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = event_source_collection_get_no_event_objects (_tmp15_); + _tmp15_ = event_source_collection_get_no_event_objects (_tmp14_); #line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = gee_collection_get_size (_tmp17_); + _tmp17_ = gee_collection_get_size (_tmp16_); #line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_show_no_events (self, _tmp19_ > 0); + events_branch_show_no_events (self, _tmp18_ > 0); #line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp17_); + _g_object_unref0 (_tmp16_); #line 38 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp20_ = event_global; + _tmp19_ = event_global; #line 38 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _events_branch_on_events_added_removed_data_collection_contents_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _events_branch_on_events_added_removed_data_collection_contents_altered, self, 0); #line 39 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp21_ = event_global; + _tmp20_ = event_global; #line 39 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _events_branch_on_events_altered_data_collection_items_altered, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _events_branch_on_events_altered_data_collection_items_altered, self, 0); #line 40 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp22_ = event_global; + _tmp21_ = event_global; #line 40 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - g_signal_connect_object (_tmp22_, "no-event-collection-altered", (GCallback) _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered, self, 0); + g_signal_connect_object (_tmp21_, "no-event-collection-altered", (GCallback) _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered, self, 0); #line 43 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp23_ = config_facade_get_instance (); + _tmp22_ = config_facade_get_instance (); #line 43 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 43 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "events-sort-ascending-changed", (GCallback) _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "events-sort-ascending-changed", (GCallback) _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed, self, 0); #line 43 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp23_); #line 24 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return self; -#line 1161 "EventsBranch.c" +#line 1301 "EventsBranch.c" } -EventsBranch* events_branch_new (void) { +EventsBranch* +events_branch_new (void) +{ #line 24 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return events_branch_construct (EVENTS_TYPE_BRANCH); -#line 1168 "EventsBranch.c" +#line 1310 "EventsBranch.c" } -void events_branch_init (void) { +void +events_branch_init (void) +{ ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - gboolean _tmp2_; #line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp0_ = config_facade_get_instance (); #line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp1_ = _tmp0_; #line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_sort_ascending = _tmp2_; + events_branch_sort_ascending = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_tmp1_); -#line 1186 "EventsBranch.c" +#line 1327 "EventsBranch.c" } -void events_branch_terminate (void) { +void +events_branch_terminate (void) +{ } -gboolean events_branch_is_user_renameable (EventsBranch* self) { +gboolean +events_branch_is_user_renameable (EventsBranch* self) +{ gboolean result = FALSE; #line 61 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (EVENTS_IS_BRANCH (self), FALSE); @@ -1198,18 +1343,22 @@ gboolean events_branch_is_user_renameable (EventsBranch* self) { result = TRUE; #line 62 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1202 "EventsBranch.c" +#line 1347 "EventsBranch.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 66 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return self ? g_object_ref (self) : NULL; -#line 1209 "EventsBranch.c" +#line 1356 "EventsBranch.c" } -EventsMasterDirectoryEntry* events_branch_get_master_entry (EventsBranch* self) { +EventsMasterDirectoryEntry* +events_branch_get_master_entry (EventsBranch* self) +{ EventsMasterDirectoryEntry* result = NULL; EventsMasterDirectoryEntry* _tmp0_; EventsMasterDirectoryEntry* _tmp1_; @@ -1223,558 +1372,435 @@ EventsMasterDirectoryEntry* events_branch_get_master_entry (EventsBranch* self) result = _tmp1_; #line 66 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1227 "EventsBranch.c" +#line 1376 "EventsBranch.c" } -static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry* b) { +static gint +events_branch_event_year_comparator (SidebarEntry* a, + SidebarEntry* b) +{ gint result = 0; - SidebarEntry* _tmp0_; - SidebarEntry* _tmp1_; - SidebarEntry* _tmp2_; - SidebarEntry* _tmp6_; - SidebarEntry* _tmp8_; - gboolean _tmp10_; + gboolean _tmp0_; gint _result_ = 0; - SidebarEntry* _tmp15_; - gint _tmp16_; - SidebarEntry* _tmp17_; - gint _tmp18_; - gint _tmp19_; + gint _tmp3_; #line 69 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 69 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0); #line 70 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = a; -#line 70 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = b; -#line 70 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp0_ == _tmp1_) { + if (a == b) { #line 71 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = 0; #line 71 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1259 "EventsBranch.c" +#line 1398 "EventsBranch.c" } #line 75 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = a; -#line 75 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) { -#line 1265 "EventsBranch.c" - SidebarEntry* _tmp3_; -#line 76 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = b; + if (G_TYPE_CHECK_INSTANCE_TYPE (a, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) { #line 76 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, EVENTS_TYPE_NO_EVENT_ENTRY)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (b, EVENTS_TYPE_NO_EVENT_ENTRY)) { #line 77 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = -1; #line 77 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1275 "EventsBranch.c" +#line 1408 "EventsBranch.c" } #line 78 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = 1; #line 78 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1281 "EventsBranch.c" +#line 1414 "EventsBranch.c" } else { - SidebarEntry* _tmp4_; -#line 79 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = b; #line 79 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) { -#line 1288 "EventsBranch.c" - SidebarEntry* _tmp5_; + if (G_TYPE_CHECK_INSTANCE_TYPE (b, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) { #line 80 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = a; -#line 80 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, EVENTS_TYPE_NO_EVENT_ENTRY)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (a, EVENTS_TYPE_NO_EVENT_ENTRY)) { #line 81 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = 1; #line 81 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1298 "EventsBranch.c" +#line 1424 "EventsBranch.c" } #line 82 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = -1; #line 82 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1304 "EventsBranch.c" +#line 1430 "EventsBranch.c" } } #line 85 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = a; -#line 85 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, EVENTS_TYPE_NO_EVENT_ENTRY)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (a, EVENTS_TYPE_NO_EVENT_ENTRY)) { #line 86 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = 1; #line 86 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1315 "EventsBranch.c" +#line 1439 "EventsBranch.c" } else { - SidebarEntry* _tmp7_; #line 87 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = b; -#line 87 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, EVENTS_TYPE_NO_EVENT_ENTRY)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (b, EVENTS_TYPE_NO_EVENT_ENTRY)) { #line 88 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = -1; #line 88 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1326 "EventsBranch.c" +#line 1447 "EventsBranch.c" } } #line 91 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = a; -#line 91 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (a, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY)) { #line 92 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = -1; #line 92 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1337 "EventsBranch.c" +#line 1456 "EventsBranch.c" } else { - SidebarEntry* _tmp9_; #line 93 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = b; -#line 93 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (b, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY)) { #line 94 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = 1; #line 94 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1348 "EventsBranch.c" +#line 1464 "EventsBranch.c" } } #line 96 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = events_branch_sort_ascending; + _tmp0_ = events_branch_sort_ascending; #line 96 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp10_) { -#line 1355 "EventsBranch.c" + if (!_tmp0_) { +#line 1471 "EventsBranch.c" SidebarEntry* swap = NULL; - SidebarEntry* _tmp11_; - SidebarEntry* _tmp12_; - SidebarEntry* _tmp13_; - SidebarEntry* _tmp14_; -#line 97 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = a; + SidebarEntry* _tmp1_; + SidebarEntry* _tmp2_; #line 97 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = _g_object_ref0 (_tmp11_); + _tmp1_ = _g_object_ref0 (a); #line 97 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - swap = _tmp12_; -#line 98 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = b; + swap = _tmp1_; #line 98 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - a = _tmp13_; + a = b; #line 99 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = swap; + _tmp2_ = swap; #line 99 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - b = _tmp14_; + b = _tmp2_; #line 96 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (swap); -#line 1377 "EventsBranch.c" +#line 1487 "EventsBranch.c" } #line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = a; -#line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry)); -#line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = b; -#line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry)); -#line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _result_ = _tmp16_ - _tmp18_; + _result_ = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (a, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry)) - events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (b, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry)); #line 104 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = _result_; + _tmp3_ = _result_; #line 104 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp19_ != 0, "result != 0"); + _vala_assert (_tmp3_ != 0, "result != 0"); #line 106 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = _result_; #line 106 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1397 "EventsBranch.c" +#line 1499 "EventsBranch.c" } -static gint events_branch_event_month_comparator (SidebarEntry* a, SidebarEntry* b) { +static gint +events_branch_event_month_comparator (SidebarEntry* a, + SidebarEntry* b) +{ gint result = 0; - SidebarEntry* _tmp0_; - SidebarEntry* _tmp1_; - gboolean _tmp2_; + gboolean _tmp0_; gint _result_ = 0; - SidebarEntry* _tmp7_; - gint _tmp8_; - SidebarEntry* _tmp9_; - gint _tmp10_; - gint _tmp11_; + gint _tmp3_; #line 109 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 109 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0); #line 110 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = a; -#line 110 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = b; -#line 110 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp0_ == _tmp1_) { + if (a == b) { #line 111 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = 0; #line 111 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1426 "EventsBranch.c" +#line 1521 "EventsBranch.c" } #line 113 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = events_branch_sort_ascending; + _tmp0_ = events_branch_sort_ascending; #line 113 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp2_) { -#line 1432 "EventsBranch.c" + if (!_tmp0_) { +#line 1527 "EventsBranch.c" SidebarEntry* swap = NULL; - SidebarEntry* _tmp3_; - SidebarEntry* _tmp4_; - SidebarEntry* _tmp5_; - SidebarEntry* _tmp6_; -#line 114 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = a; + SidebarEntry* _tmp1_; + SidebarEntry* _tmp2_; #line 114 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp1_ = _g_object_ref0 (a); #line 114 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - swap = _tmp4_; -#line 115 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = b; + swap = _tmp1_; #line 115 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - a = _tmp5_; + a = b; #line 116 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = swap; + _tmp2_ = swap; #line 116 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - b = _tmp6_; + b = _tmp2_; #line 113 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (swap); -#line 1454 "EventsBranch.c" +#line 1543 "EventsBranch.c" } #line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = a; -#line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry)); -#line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = b; -#line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry)); -#line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _result_ = _tmp8_ - _tmp10_; + _result_ = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (a, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry)) - events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (b, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry)); #line 121 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = _result_; + _tmp3_ = _result_; #line 121 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp11_ != 0, "result != 0"); + _vala_assert (_tmp3_ != 0, "result != 0"); #line 123 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = _result_; #line 123 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1474 "EventsBranch.c" +#line 1555 "EventsBranch.c" } -static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) { +static gint +events_branch_event_comparator (SidebarEntry* a, + SidebarEntry* b) +{ gint result = 0; - SidebarEntry* _tmp0_; - SidebarEntry* _tmp1_; - gboolean _tmp2_; + gboolean _tmp0_; gint64 _result_ = 0LL; - SidebarEntry* _tmp7_; - Event* _tmp8_; - Event* _tmp9_; - time_t _tmp10_; - SidebarEntry* _tmp11_; - Event* _tmp12_; - Event* _tmp13_; - time_t _tmp14_; - gint64 _tmp15_; - gint64 _tmp16_; - gint64 _tmp27_; - gint _tmp28_ = 0; - gint64 _tmp29_; + Event* _tmp3_; + Event* _tmp4_; + Event* _tmp5_; + Event* _tmp6_; + gint64 _tmp7_; + gint64 _tmp8_; + gint64 _tmp17_; + gint _tmp18_ = 0; + gint64 _tmp19_; #line 126 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 126 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0); #line 127 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = a; -#line 127 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = b; -#line 127 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp0_ == _tmp1_) { + if (a == b) { #line 128 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = 0; #line 128 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1511 "EventsBranch.c" +#line 1585 "EventsBranch.c" } #line 130 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = events_branch_sort_ascending; + _tmp0_ = events_branch_sort_ascending; #line 130 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp2_) { -#line 1517 "EventsBranch.c" + if (!_tmp0_) { +#line 1591 "EventsBranch.c" SidebarEntry* swap = NULL; - SidebarEntry* _tmp3_; - SidebarEntry* _tmp4_; - SidebarEntry* _tmp5_; - SidebarEntry* _tmp6_; -#line 131 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = a; + SidebarEntry* _tmp1_; + SidebarEntry* _tmp2_; #line 131 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp1_ = _g_object_ref0 (a); #line 131 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - swap = _tmp4_; + swap = _tmp1_; #line 132 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = b; -#line 132 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - a = _tmp5_; + a = b; #line 133 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = swap; + _tmp2_ = swap; #line 133 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - b = _tmp6_; + b = _tmp2_; #line 130 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (swap); -#line 1539 "EventsBranch.c" +#line 1607 "EventsBranch.c" } #line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = a; -#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); -#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = _tmp8_; + _tmp3_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (a, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); #line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_EVENT_SOURCE, EventSource)); -#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = b; -#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); + _tmp4_ = _tmp3_; #line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = _tmp12_; + _tmp5_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (b, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); #line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_EVENT_SOURCE, EventSource)); + _tmp6_ = _tmp5_; #line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = (gint64) (_tmp10_ - _tmp14_); + _tmp7_ = (gint64) (event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_EVENT_SOURCE, EventSource)) - event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT_SOURCE, EventSource))); #line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp6_); #line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp4_); #line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _result_ = _tmp15_; + _result_ = _tmp7_; #line 140 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = _result_; + _tmp8_ = _result_; #line 140 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp16_ == ((gint64) 0)) { -#line 1569 "EventsBranch.c" - SidebarEntry* _tmp17_; - Event* _tmp18_; - Event* _tmp19_; - EventID _tmp20_ = {0}; - gint64 _tmp21_; - SidebarEntry* _tmp22_; - Event* _tmp23_; - Event* _tmp24_; - EventID _tmp25_ = {0}; - gint64 _tmp26_; -#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = a; -#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); + if (_tmp8_ == ((gint64) 0)) { +#line 1629 "EventsBranch.c" + Event* _tmp9_; + Event* _tmp10_; + EventID _tmp11_ = {0}; + gint64 _tmp12_; + Event* _tmp13_; + Event* _tmp14_; + EventID _tmp15_ = {0}; + gint64 _tmp16_; #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = _tmp18_; + _tmp9_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (a, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - event_get_event_id (_tmp19_, &_tmp20_); + _tmp10_ = _tmp9_; #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp21_ = _tmp20_.id; + event_get_event_id (_tmp10_, &_tmp11_); #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp22_ = b; + _tmp12_ = _tmp11_.id; #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp23_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); + _tmp13_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (b, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp24_ = _tmp23_; + _tmp14_ = _tmp13_; #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - event_get_event_id (_tmp24_, &_tmp25_); + event_get_event_id (_tmp14_, &_tmp15_); #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp26_ = _tmp25_.id; + _tmp16_ = _tmp15_.id; #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _result_ = _tmp21_ - _tmp26_; + _result_ = _tmp12_ - _tmp16_; #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp24_); + _g_object_unref0 (_tmp14_); #line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp19_); -#line 1606 "EventsBranch.c" + _g_object_unref0 (_tmp10_); +#line 1660 "EventsBranch.c" } #line 145 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp27_ = _result_; + _tmp17_ = _result_; #line 145 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp27_ != ((gint64) 0), "result != 0"); + _vala_assert (_tmp17_ != ((gint64) 0), "result != 0"); #line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp29_ = _result_; + _tmp19_ = _result_; #line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp29_ < ((gint64) 0)) { + if (_tmp19_ < ((gint64) 0)) { #line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp28_ = -1; -#line 1618 "EventsBranch.c" + _tmp18_ = -1; +#line 1672 "EventsBranch.c" } else { #line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp28_ = 1; -#line 1622 "EventsBranch.c" + _tmp18_ = 1; +#line 1676 "EventsBranch.c" } #line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - result = _tmp28_; + result = _tmp18_; #line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1628 "EventsBranch.c" +#line 1682 "EventsBranch.c" } -static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntry* b) { +static gint +events_branch_undated_event_comparator (SidebarEntry* a, + SidebarEntry* b) +{ gint result = 0; - SidebarEntry* _tmp0_; - SidebarEntry* _tmp1_; - gboolean _tmp2_; + gboolean _tmp0_; gint ret = 0; - SidebarEntry* _tmp7_; + Event* _tmp3_; + Event* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + Event* _tmp7_; Event* _tmp8_; - Event* _tmp9_; + gchar* _tmp9_; gchar* _tmp10_; - gchar* _tmp11_; - SidebarEntry* _tmp12_; - Event* _tmp13_; - Event* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - gint _tmp17_; - gint _tmp18_; - gint _tmp19_; + gint _tmp11_; + gint _tmp12_; #line 150 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 150 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0); #line 151 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = a; -#line 151 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = b; -#line 151 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp0_ == _tmp1_) { + if (a == b) { #line 152 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = 0; #line 152 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1665 "EventsBranch.c" +#line 1713 "EventsBranch.c" } #line 154 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = events_branch_sort_ascending; + _tmp0_ = events_branch_sort_ascending; #line 154 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp2_) { -#line 1671 "EventsBranch.c" + if (!_tmp0_) { +#line 1719 "EventsBranch.c" SidebarEntry* swap = NULL; - SidebarEntry* _tmp3_; - SidebarEntry* _tmp4_; - SidebarEntry* _tmp5_; - SidebarEntry* _tmp6_; -#line 155 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = a; + SidebarEntry* _tmp1_; + SidebarEntry* _tmp2_; #line 155 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp1_ = _g_object_ref0 (a); #line 155 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - swap = _tmp4_; -#line 156 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = b; + swap = _tmp1_; #line 156 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - a = _tmp5_; + a = b; #line 157 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = swap; + _tmp2_ = swap; #line 157 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - b = _tmp6_; + b = _tmp2_; #line 154 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (swap); -#line 1693 "EventsBranch.c" +#line 1735 "EventsBranch.c" } #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = a; + _tmp3_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (a, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); -#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = _tmp8_; -#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); -#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = _tmp10_; + _tmp4_ = _tmp3_; #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = b; + _tmp5_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject)); #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); + _tmp6_ = _tmp5_; #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = _tmp13_; + _tmp7_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (b, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); + _tmp8_ = _tmp7_; #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = _tmp15_; + _tmp9_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = g_utf8_collate (_tmp11_, _tmp16_); + _tmp10_ = _tmp9_; #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = _tmp17_; + _tmp11_ = g_utf8_collate (_tmp6_, _tmp10_); #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp10_); #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp8_); #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp6_); #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp9_); + _g_object_unref0 (_tmp4_); #line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - ret = _tmp18_; + ret = _tmp11_; #line 163 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = ret; + _tmp12_ = ret; #line 163 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp19_ == 0) { -#line 1733 "EventsBranch.c" - SidebarEntry* _tmp20_; - Event* _tmp21_; - Event* _tmp22_; - gint64 _tmp23_; - SidebarEntry* _tmp24_; - Event* _tmp25_; - Event* _tmp26_; - gint64 _tmp27_; -#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp20_ = b; -#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp21_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); + if (_tmp12_ == 0) { +#line 1769 "EventsBranch.c" + Event* _tmp13_; + Event* _tmp14_; + Event* _tmp15_; + Event* _tmp16_; #line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp22_ = _tmp21_; + _tmp13_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (b, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); #line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp23_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_SOURCE, DataSource)); + _tmp14_ = _tmp13_; #line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp24_ = a; + _tmp15_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (a, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); #line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp25_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry)); -#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp26_ = _tmp25_; -#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp27_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource)); + _tmp16_ = _tmp15_; #line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - ret = (gint) (_tmp23_ - _tmp27_); + ret = (gint) (data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_SOURCE, DataSource)) - data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource))); #line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp26_); + _g_object_unref0 (_tmp16_); #line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp22_); -#line 1764 "EventsBranch.c" + _g_object_unref0 (_tmp14_); +#line 1788 "EventsBranch.c" } #line 167 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = ret; #line 167 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1770 "EventsBranch.c" +#line 1794 "EventsBranch.c" } -EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, Event* event) { +EventsEventEntry* +events_branch_get_entry_for_event (EventsBranch* self, + Event* event) +{ EventsEventEntry* result = NULL; GeeHashMap* _tmp0_; - Event* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 170 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL); #line 170 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -1782,23 +1808,22 @@ EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, Event* #line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp0_ = self->priv->entry_map; #line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = event; -#line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), event); #line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - result = (EventsEventEntry*) _tmp2_; + result = (EventsEventEntry*) _tmp1_; #line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 1793 "EventsBranch.c" +#line 1817 "EventsBranch.c" } -static void events_branch_on_config_changed (EventsBranch* self) { +static void +events_branch_on_config_changed (EventsBranch* self) +{ gboolean value = FALSE; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; #line 174 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -1807,23 +1832,23 @@ static void events_branch_on_config_changed (EventsBranch* self) { _tmp1_ = _tmp0_; #line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp2_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = _tmp2_; #line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_tmp1_); #line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - value = _tmp3_; + value = _tmp2_; #line 177 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_branch_sort_ascending = value; #line 178 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" sidebar_branch_reorder_all (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); -#line 1821 "EventsBranch.c" +#line 1844 "EventsBranch.c" } -static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterable* added, GeeIterable* removed) { - GeeIterable* _tmp0_; - GeeIterable* _tmp8_; +static void +events_branch_on_events_added_removed (EventsBranch* self, + GeeIterable* added, + GeeIterable* removed) +{ #line 181 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 181 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -1831,266 +1856,238 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab #line 181 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed)); #line 183 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = added; -#line 183 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp0_ != NULL) { -#line 1838 "EventsBranch.c" + if (added != NULL) { +#line 1861 "EventsBranch.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_; - GeeIterator* _tmp2_; -#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = added; + GeeIterator* _tmp0_; #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = gee_iterable_iterator (_tmp1_); + _tmp0_ = gee_iterable_iterator (added); #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _object_it = _tmp2_; + _object_it = _tmp0_; #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" while (TRUE) { -#line 1851 "EventsBranch.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 1871 "EventsBranch.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; - DataObject* _tmp7_; -#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = _object_it; + GeeIterator* _tmp2_; + gpointer _tmp3_; + DataObject* _tmp4_; #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp1_ = _object_it; #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp1_)) { #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" break; -#line 1866 "EventsBranch.c" +#line 1883 "EventsBranch.c" } #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = _object_it; + _tmp2_ = _object_it; #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - object = (DataObject*) _tmp6_; + object = (DataObject*) _tmp3_; #line 185 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = object; + _tmp4_ = object; #line 185 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_EVENT, Event)); + events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_EVENT, Event)); #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (object); -#line 1880 "EventsBranch.c" +#line 1897 "EventsBranch.c" } #line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_object_it); -#line 1884 "EventsBranch.c" +#line 1901 "EventsBranch.c" } } #line 188 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = removed; -#line 188 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp8_ != NULL) { -#line 1891 "EventsBranch.c" + if (removed != NULL) { +#line 1906 "EventsBranch.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp9_; - GeeIterator* _tmp10_; -#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = removed; + GeeIterator* _tmp5_; #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = gee_iterable_iterator (_tmp9_); + _tmp5_ = gee_iterable_iterator (removed); #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _object_it = _tmp10_; + _object_it = _tmp5_; #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" while (TRUE) { -#line 1904 "EventsBranch.c" - GeeIterator* _tmp11_; - gboolean _tmp12_; +#line 1916 "EventsBranch.c" + GeeIterator* _tmp6_; DataObject* object = NULL; - GeeIterator* _tmp13_; - gpointer _tmp14_; - DataObject* _tmp15_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + DataObject* _tmp9_; #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = _object_it; + _tmp6_ = _object_it; #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = gee_iterator_next (_tmp11_); -#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp12_) { + if (!gee_iterator_next (_tmp6_)) { #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" break; -#line 1919 "EventsBranch.c" +#line 1928 "EventsBranch.c" } #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = _object_it; + _tmp7_ = _object_it; #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = gee_iterator_get (_tmp13_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - object = (DataObject*) _tmp14_; + object = (DataObject*) _tmp8_; #line 190 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = object; + _tmp9_ = object; #line 190 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_remove_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_EVENT, Event)); + events_branch_remove_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_EVENT, Event)); #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (object); -#line 1933 "EventsBranch.c" +#line 1942 "EventsBranch.c" } #line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_object_it); -#line 1937 "EventsBranch.c" +#line 1946 "EventsBranch.c" } } } -static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered) { +static void +events_branch_on_events_altered (EventsBranch* self, + GeeMap* altered) +{ #line 194 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 194 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (GEE_IS_MAP (altered)); -#line 1948 "EventsBranch.c" +#line 1960 "EventsBranch.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_; + GeeSet* _tmp0_; GeeSet* _tmp1_; GeeSet* _tmp2_; - GeeSet* _tmp3_; + GeeIterator* _tmp3_; GeeIterator* _tmp4_; - GeeIterator* _tmp5_; #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = altered; + _tmp0_ = gee_map_get_keys (altered); #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = gee_map_get_keys (_tmp0_); + _tmp1_ = _tmp0_; #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp2_ = _tmp1_; #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = _tmp2_; -#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable)); #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _object_it = _tmp5_; + _object_it = _tmp4_; #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" while (TRUE) { -#line 1975 "EventsBranch.c" - GeeIterator* _tmp6_; - gboolean _tmp7_; +#line 1984 "EventsBranch.c" + GeeIterator* _tmp5_; DataObject* object = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; + GeeIterator* _tmp6_; + gpointer _tmp7_; Event* event = NULL; - DataObject* _tmp10_; - Event* _tmp11_; + DataObject* _tmp8_; + Event* _tmp9_; Alteration* alteration = NULL; - GeeMap* _tmp12_; - DataObject* _tmp13_; - gpointer _tmp14_; - Alteration* _tmp15_; - gboolean _tmp16_; -#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = _object_it; + DataObject* _tmp10_; + gpointer _tmp11_; + Alteration* _tmp12_; #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = gee_iterator_next (_tmp6_); + _tmp5_ = _object_it; #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp5_)) { #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" break; -#line 1998 "EventsBranch.c" +#line 2002 "EventsBranch.c" } #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = _object_it; + _tmp6_ = _object_it; #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - object = (DataObject*) _tmp9_; + object = (DataObject*) _tmp7_; #line 196 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = object; + _tmp8_ = object; #line 196 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_EVENT, Event)); + _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_EVENT, Event)); #line 196 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - event = _tmp11_; + event = _tmp9_; #line 197 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = altered; -#line 197 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = object; + _tmp10_ = object; #line 197 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = gee_map_get (_tmp12_, _tmp13_); + _tmp11_ = gee_map_get (altered, _tmp10_); #line 197 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - alteration = (Alteration*) _tmp14_; + alteration = (Alteration*) _tmp11_; #line 199 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = alteration; + _tmp12_ = alteration; #line 199 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = alteration_has_detail (_tmp15_, "metadata", "time"); -#line 199 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp16_) { + if (alteration_has_detail (_tmp12_, "metadata", "time")) { #line 2026 "EventsBranch.c" - Event* _tmp17_; + Event* _tmp13_; #line 202 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = event; + _tmp13_ = event; #line 202 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_move_event (self, _tmp17_); + events_branch_move_event (self, _tmp13_); #line 2032 "EventsBranch.c" } else { - Alteration* _tmp18_; - gboolean _tmp19_; -#line 203 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = alteration; + Alteration* _tmp14_; #line 203 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = alteration_has_detail (_tmp18_, "metadata", "name"); + _tmp14_ = alteration; #line 203 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp19_) { -#line 2042 "EventsBranch.c" + if (alteration_has_detail (_tmp14_, "metadata", "name")) { +#line 2039 "EventsBranch.c" EventsEventEntry* entry = NULL; - GeeHashMap* _tmp20_; - Event* _tmp21_; - gpointer _tmp22_; + GeeHashMap* _tmp15_; + Event* _tmp16_; + gpointer _tmp17_; + EventsEventEntry* _tmp18_; + EventsEventEntry* _tmp19_; + Event* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; EventsEventEntry* _tmp23_; - EventsEventEntry* _tmp24_; - Event* _tmp25_; + Event* _tmp24_; + gchar* _tmp25_; gchar* _tmp26_; - gchar* _tmp27_; - EventsEventEntry* _tmp28_; - Event* _tmp29_; - gchar* _tmp30_; - gchar* _tmp31_; #line 204 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp20_ = self->priv->entry_map; + _tmp15_ = self->priv->entry_map; #line 204 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp21_ = event; + _tmp16_ = event; #line 204 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp22_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp21_); + _tmp17_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_); #line 204 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - entry = (EventsEventEntry*) _tmp22_; + entry = (EventsEventEntry*) _tmp17_; #line 205 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp23_ = entry; + _tmp18_ = entry; #line 205 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp23_ != NULL, "entry != null"); + _vala_assert (_tmp18_ != NULL, "entry != null"); #line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp24_ = entry; + _tmp19_ = entry; #line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp25_ = event; + _tmp20_ = event; #line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp26_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject)); + _tmp21_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_OBJECT, DataObject)); #line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp27_ = _tmp26_; + _tmp22_ = _tmp21_; #line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry), "sidebar-name-changed", _tmp27_); + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry), "sidebar-name-changed", _tmp22_); #line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_free0 (_tmp27_); + _g_free0 (_tmp22_); #line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp28_ = entry; + _tmp23_ = entry; #line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp29_ = event; + _tmp24_ = event; #line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp30_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject)); + _tmp25_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject)); #line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp31_ = _tmp30_; + _tmp26_ = _tmp25_; #line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-tooltip-changed", _tmp31_); + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-tooltip-changed", _tmp26_); #line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_free0 (_tmp31_); + _g_free0 (_tmp26_); #line 203 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (entry); -#line 2094 "EventsBranch.c" +#line 2091 "EventsBranch.c" } } #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -2099,16 +2096,18 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered _g_object_unref0 (event); #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (object); -#line 2103 "EventsBranch.c" +#line 2100 "EventsBranch.c" } #line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_object_it); -#line 2107 "EventsBranch.c" +#line 2104 "EventsBranch.c" } } -static void events_branch_on_no_event_collection_altered (EventsBranch* self) { +static void +events_branch_on_no_event_collection_altered (EventsBranch* self) +{ EventSourceCollection* _tmp0_; GeeCollection* _tmp1_; GeeCollection* _tmp2_; @@ -2130,35 +2129,44 @@ static void events_branch_on_no_event_collection_altered (EventsBranch* self) { events_branch_show_no_events (self, _tmp4_ > 0); #line 214 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_tmp2_); -#line 2134 "EventsBranch.c" +#line 2133 "EventsBranch.c" } -static void g_time_local (time_t time, struct tm* result) { +static void +g_time_local (time_t time, + struct tm* result) +{ struct tm _result_ = {0}; struct tm _tmp0_ = {0}; -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" localtime_r (&time, &_tmp0_); -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" *result = _result_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return; -#line 2149 "EventsBranch.c" +#line 2151 "EventsBranch.c" } -static gint _events_branch_event_comparator_gcompare_func (gconstpointer a, gconstpointer b) { +static gint +_events_branch_event_comparator_gcompare_func (gconstpointer a, + gconstpointer b) +{ gint result; result = events_branch_event_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 230 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2158 "EventsBranch.c" +#line 2163 "EventsBranch.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_; @@ -2166,370 +2174,343 @@ 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 2204 "EventsBranch.c" +#line 2209 "EventsBranch.c" } -static gint _events_branch_event_month_comparator_gcompare_func (gconstpointer a, gconstpointer b) { +static gint +_events_branch_event_month_comparator_gcompare_func (gconstpointer a, + gconstpointer b) +{ gint result; result = events_branch_event_month_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2213 "EventsBranch.c" +#line 2221 "EventsBranch.c" } -static void events_branch_add_event (EventsBranch* self, Event* event) { +static void +events_branch_add_event (EventsBranch* self, + Event* event) +{ time_t event_time = 0; - Event* _tmp0_; - time_t _tmp1_; - time_t _tmp2_; + time_t _tmp0_; struct tm event_tm = {0}; - time_t _tmp4_; - struct tm _tmp5_ = {0}; + time_t _tmp1_; + struct tm _tmp2_ = {0}; SidebarEntry* year = NULL; SidebarEntry* month = NULL; - Event* _tmp6_; - struct tm _tmp7_; - SidebarEntry* _tmp8_ = NULL; - SidebarEntry* _tmp9_; - SidebarEntry* _tmp10_; - SidebarEntry* _tmp13_; - gchar* _tmp21_; - gchar* _tmp22_; - struct tm _tmp23_; - EventsMonthDirectoryEntry* _tmp24_; - SidebarEntry* _tmp25_; - SidebarEntry* _tmp26_; - SidebarEntry* _tmp27_; - Event* _tmp28_; + struct tm _tmp3_; + SidebarEntry* _tmp4_ = NULL; + SidebarEntry* _tmp5_; + SidebarEntry* _tmp6_; + SidebarEntry* _tmp8_; + gchar* _tmp16_; + gchar* _tmp17_; + struct tm _tmp18_; + EventsMonthDirectoryEntry* _tmp19_; + SidebarEntry* _tmp20_; + SidebarEntry* _tmp21_; + SidebarEntry* _tmp22_; #line 217 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 217 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (IS_EVENT (event)); #line 218 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = event; -#line 218 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource)); -#line 218 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - event_time = _tmp1_; + event_time = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_EVENT_SOURCE, EventSource)); #line 219 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = event_time; + _tmp0_ = event_time; #line 219 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp2_ == ((time_t) 0)) { -#line 2255 "EventsBranch.c" - Event* _tmp3_; + if (_tmp0_ == ((time_t) 0)) { #line 220 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = event; -#line 220 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_add_undated_event (self, _tmp3_); + events_branch_add_undated_event (self, event); #line 222 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return; -#line 2263 "EventsBranch.c" +#line 2262 "EventsBranch.c" } #line 225 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = event_time; + _tmp1_ = event_time; #line 225 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - g_time_local (_tmp4_, &_tmp5_); + g_time_local (_tmp1_, &_tmp2_); #line 225 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - event_tm = _tmp5_; -#line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = event; + event_tm = _tmp2_; #line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = event_tm; + _tmp3_ = event_tm; #line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = events_branch_find_event_month (self, _tmp6_, &_tmp7_, &_tmp8_); + _tmp5_ = events_branch_find_event_month (self, event, &_tmp3_, &_tmp4_); #line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (year); #line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - year = _tmp8_; + year = _tmp4_; #line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - month = _tmp9_; + month = _tmp5_; #line 229 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = month; + _tmp6_ = month; #line 229 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp10_ != NULL) { -#line 2287 "EventsBranch.c" - SidebarEntry* _tmp11_; - Event* _tmp12_; -#line 230 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = month; + if (_tmp6_ != NULL) { +#line 2284 "EventsBranch.c" + SidebarEntry* _tmp7_; #line 230 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = event; + _tmp7_ = month; #line 230 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_graft_event (self, _tmp11_, _tmp12_, _events_branch_event_comparator_gcompare_func); + events_branch_graft_event (self, _tmp7_, event, _events_branch_event_comparator_gcompare_func); #line 232 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (month); #line 232 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (year); #line 232 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return; -#line 2302 "EventsBranch.c" +#line 2296 "EventsBranch.c" } #line 235 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = year; + _tmp8_ = year; #line 235 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp13_ == NULL) { -#line 2308 "EventsBranch.c" - gchar* _tmp14_; - gchar* _tmp15_; - struct tm _tmp16_; - EventsYearDirectoryEntry* _tmp17_; - SidebarEntry* _tmp18_; - SidebarEntry* _tmp19_; - SidebarEntry* _tmp20_; + if (_tmp8_ == NULL) { +#line 2302 "EventsBranch.c" + gchar* _tmp9_; + gchar* _tmp10_; + struct tm _tmp11_; + EventsYearDirectoryEntry* _tmp12_; + SidebarEntry* _tmp13_; + SidebarEntry* _tmp14_; + SidebarEntry* _tmp15_; #line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT); + _tmp9_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT); #line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = _tmp14_; + _tmp10_ = _tmp9_; #line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = event_tm; + _tmp11_ = event_tm; #line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = events_year_directory_entry_new (_tmp15_, &_tmp16_); + _tmp12_ = events_year_directory_entry_new (_tmp10_, &_tmp11_); #line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (year); #line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - year = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SIDEBAR_TYPE_ENTRY, SidebarEntry); + year = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SIDEBAR_TYPE_ENTRY, SidebarEntry); #line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_free0 (_tmp15_); + _g_free0 (_tmp10_); #line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp13_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = _tmp18_; + _tmp14_ = _tmp13_; #line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp20_ = year; + _tmp15_ = year; #line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp19_, _tmp20_, _events_branch_event_month_comparator_gcompare_func); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp14_, _tmp15_, _events_branch_event_month_comparator_gcompare_func); #line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp19_); -#line 2340 "EventsBranch.c" + _g_object_unref0 (_tmp14_); +#line 2334 "EventsBranch.c" } #line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp21_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT); + _tmp16_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT); #line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp22_ = _tmp21_; + _tmp17_ = _tmp16_; #line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp23_ = event_tm; + _tmp18_ = event_tm; #line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp24_ = events_month_directory_entry_new (_tmp22_, &_tmp23_); + _tmp19_ = events_month_directory_entry_new (_tmp17_, &_tmp18_); #line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (month); #line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - month = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SIDEBAR_TYPE_ENTRY, SidebarEntry); + month = G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SIDEBAR_TYPE_ENTRY, SidebarEntry); #line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_free0 (_tmp22_); + _g_free0 (_tmp17_); #line 243 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp25_ = year; + _tmp20_ = year; #line 243 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp26_ = month; + _tmp21_ = month; #line 243 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp25_, _tmp26_, _events_branch_event_comparator_gcompare_func); -#line 245 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp27_ = month; + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp20_, _tmp21_, _events_branch_event_comparator_gcompare_func); #line 245 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp28_ = event; + _tmp22_ = month; #line 245 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_graft_event (self, _tmp27_, _tmp28_, _events_branch_event_comparator_gcompare_func); + events_branch_graft_event (self, _tmp22_, event, _events_branch_event_comparator_gcompare_func); #line 217 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (month); #line 217 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (year); -#line 2372 "EventsBranch.c" +#line 2364 "EventsBranch.c" } -static void events_branch_move_event (EventsBranch* self, Event* event) { +static void +events_branch_move_event (EventsBranch* self, + Event* event) +{ time_t event_time = 0; - Event* _tmp0_; - time_t _tmp1_; - time_t _tmp2_; + time_t _tmp0_; struct tm event_tm = {0}; - time_t _tmp4_; - struct tm _tmp5_ = {0}; + time_t _tmp1_; + struct tm _tmp2_ = {0}; SidebarEntry* year = NULL; SidebarEntry* month = NULL; - Event* _tmp6_; - struct tm _tmp7_; - SidebarEntry* _tmp8_ = NULL; - SidebarEntry* _tmp9_; - SidebarEntry* _tmp10_; - SidebarEntry* _tmp18_; - Event* _tmp25_; - SidebarEntry* _tmp26_; + struct tm _tmp3_; + SidebarEntry* _tmp4_ = NULL; + SidebarEntry* _tmp5_; + SidebarEntry* _tmp6_; + SidebarEntry* _tmp14_; + SidebarEntry* _tmp21_; #line 248 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 248 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (IS_EVENT (event)); #line 249 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = event; -#line 249 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource)); -#line 249 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - event_time = _tmp1_; + event_time = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_EVENT_SOURCE, EventSource)); #line 250 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = event_time; + _tmp0_ = event_time; #line 250 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp2_ == ((time_t) 0)) { -#line 2408 "EventsBranch.c" - Event* _tmp3_; -#line 251 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = event; + if (_tmp0_ == ((time_t) 0)) { #line 251 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_move_to_undated_event (self, _tmp3_); + events_branch_move_to_undated_event (self, event); #line 253 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return; -#line 2416 "EventsBranch.c" +#line 2399 "EventsBranch.c" } #line 256 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = event_time; + _tmp1_ = event_time; #line 256 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - g_time_local (_tmp4_, &_tmp5_); + g_time_local (_tmp1_, &_tmp2_); #line 256 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - event_tm = _tmp5_; + event_tm = _tmp2_; #line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = event; + _tmp3_ = event_tm; #line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = event_tm; -#line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = events_branch_find_event_month (self, _tmp6_, &_tmp7_, &_tmp8_); + _tmp5_ = events_branch_find_event_month (self, event, &_tmp3_, &_tmp4_); #line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (year); #line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - year = _tmp8_; + year = _tmp4_; #line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - month = _tmp9_; + month = _tmp5_; #line 261 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = year; + _tmp6_ = year; #line 261 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp10_ == NULL) { -#line 2440 "EventsBranch.c" - gchar* _tmp11_; - gchar* _tmp12_; - struct tm _tmp13_; - EventsYearDirectoryEntry* _tmp14_; - SidebarEntry* _tmp15_; - SidebarEntry* _tmp16_; - SidebarEntry* _tmp17_; + if (_tmp6_ == NULL) { +#line 2421 "EventsBranch.c" + gchar* _tmp7_; + gchar* _tmp8_; + struct tm _tmp9_; + EventsYearDirectoryEntry* _tmp10_; + SidebarEntry* _tmp11_; + SidebarEntry* _tmp12_; + SidebarEntry* _tmp13_; #line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT); + _tmp7_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT); #line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = _tmp11_; + _tmp8_ = _tmp7_; #line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = event_tm; + _tmp9_ = event_tm; #line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = events_year_directory_entry_new (_tmp12_, &_tmp13_); + _tmp10_ = events_year_directory_entry_new (_tmp8_, &_tmp9_); #line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (year); #line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - year = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_ENTRY, SidebarEntry); + year = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SIDEBAR_TYPE_ENTRY, SidebarEntry); #line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_free0 (_tmp12_); + _g_free0 (_tmp8_); #line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp11_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = _tmp15_; + _tmp12_ = _tmp11_; #line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = year; + _tmp13_ = year; #line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp16_, _tmp17_, _events_branch_event_month_comparator_gcompare_func); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp12_, _tmp13_, _events_branch_event_month_comparator_gcompare_func); #line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp16_); -#line 2472 "EventsBranch.c" + _g_object_unref0 (_tmp12_); +#line 2453 "EventsBranch.c" } #line 267 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = month; + _tmp14_ = month; #line 267 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp18_ == NULL) { -#line 2478 "EventsBranch.c" - gchar* _tmp19_; - gchar* _tmp20_; - struct tm _tmp21_; - EventsMonthDirectoryEntry* _tmp22_; - SidebarEntry* _tmp23_; - SidebarEntry* _tmp24_; + if (_tmp14_ == NULL) { +#line 2459 "EventsBranch.c" + gchar* _tmp15_; + gchar* _tmp16_; + struct tm _tmp17_; + EventsMonthDirectoryEntry* _tmp18_; + SidebarEntry* _tmp19_; + SidebarEntry* _tmp20_; #line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT); + _tmp15_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT); #line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp20_ = _tmp19_; + _tmp16_ = _tmp15_; #line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp21_ = event_tm; + _tmp17_ = event_tm; #line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp22_ = events_month_directory_entry_new (_tmp20_, &_tmp21_); + _tmp18_ = events_month_directory_entry_new (_tmp16_, &_tmp17_); #line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (month); #line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - month = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SIDEBAR_TYPE_ENTRY, SidebarEntry); + month = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SIDEBAR_TYPE_ENTRY, SidebarEntry); #line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_free0 (_tmp20_); + _g_free0 (_tmp16_); #line 270 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp23_ = year; + _tmp19_ = year; #line 270 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp24_ = month; + _tmp20_ = month; #line 270 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp23_, _tmp24_, _events_branch_event_comparator_gcompare_func); -#line 2505 "EventsBranch.c" + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp19_, _tmp20_, _events_branch_event_comparator_gcompare_func); +#line 2486 "EventsBranch.c" } #line 273 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp25_ = event; -#line 273 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp26_ = month; + _tmp21_ = month; #line 273 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_reparent_event (self, _tmp25_, _tmp26_); + events_branch_reparent_event (self, event, _tmp21_); #line 248 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (month); #line 248 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (year); -#line 2517 "EventsBranch.c" +#line 2496 "EventsBranch.c" } -static void events_branch_remove_event (EventsBranch* self, Event* event) { +static void +events_branch_remove_event (EventsBranch* self, + Event* event) +{ SidebarEntry* entry = NULL; gboolean removed = FALSE; GeeHashMap* _tmp0_; - Event* _tmp1_; - gpointer _tmp2_ = NULL; + gpointer _tmp1_ = NULL; + gboolean _tmp2_; gboolean _tmp3_; - gboolean _tmp4_; SidebarEntry* parent = NULL; + SidebarEntry* _tmp4_; SidebarEntry* _tmp5_; SidebarEntry* _tmp6_; SidebarEntry* _tmp7_; - SidebarEntry* _tmp8_; #line 276 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 276 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -2537,127 +2518,126 @@ static void events_branch_remove_event (EventsBranch* self, Event* event) { #line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp0_ = self->priv->entry_map; #line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = event; -#line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, &_tmp2_); + _tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), event, &_tmp1_); #line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (entry); #line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - entry = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_ENTRY, SidebarEntry); + entry = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry); #line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - removed = _tmp3_; + removed = _tmp2_; #line 281 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = removed; + _tmp3_ = removed; #line 281 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp4_, "removed"); + _vala_assert (_tmp3_, "removed"); #line 283 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = entry; + _tmp4_ = entry; #line 283 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp5_); + _tmp5_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp4_); #line 283 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - parent = _tmp6_; + parent = _tmp5_; #line 284 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = parent; + _tmp6_ = parent; #line 284 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp7_ != NULL, "parent != null"); + _vala_assert (_tmp6_ != NULL, "parent != null"); #line 286 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = entry; + _tmp7_ = entry; #line 286 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp8_); + sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp7_); #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" while (TRUE) { -#line 2570 "EventsBranch.c" - gboolean _tmp9_ = FALSE; - SidebarEntry* _tmp10_; - gint _tmp11_; +#line 2549 "EventsBranch.c" + gboolean _tmp8_ = FALSE; + SidebarEntry* _tmp9_; SidebarEntry* grandparent = NULL; + SidebarEntry* _tmp13_; + SidebarEntry* _tmp14_; SidebarEntry* _tmp15_; SidebarEntry* _tmp16_; SidebarEntry* _tmp17_; SidebarEntry* _tmp18_; - SidebarEntry* _tmp19_; - SidebarEntry* _tmp20_; -#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = parent; #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp10_); + _tmp9_ = parent; #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp11_ == 0) { -#line 2587 "EventsBranch.c" + if (sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp9_) == 0) { +#line 2563 "EventsBranch.c" + SidebarEntry* _tmp10_; + SidebarEntry* _tmp11_; SidebarEntry* _tmp12_; - SidebarEntry* _tmp13_; - SidebarEntry* _tmp14_; #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = parent; + _tmp10_ = parent; #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp11_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = _tmp12_ != _tmp14_; + _tmp8_ = _tmp10_ != _tmp12_; #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp14_); -#line 2601 "EventsBranch.c" + _g_object_unref0 (_tmp12_); +#line 2577 "EventsBranch.c" } else { #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = FALSE; -#line 2605 "EventsBranch.c" + _tmp8_ = FALSE; +#line 2581 "EventsBranch.c" } #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp9_) { + if (!_tmp8_) { #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" break; -#line 2611 "EventsBranch.c" +#line 2587 "EventsBranch.c" } #line 290 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = parent; + _tmp13_ = parent; #line 290 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp15_); + _tmp14_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp13_); #line 290 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - grandparent = _tmp16_; + grandparent = _tmp14_; #line 291 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = grandparent; + _tmp15_ = grandparent; #line 291 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp17_ != NULL, "grandparent != null"); + _vala_assert (_tmp15_ != NULL, "grandparent != null"); #line 293 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = parent; + _tmp16_ = parent; #line 293 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp18_); + sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp16_); #line 295 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = grandparent; + _tmp17_ = grandparent; #line 295 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp20_ = _g_object_ref0 (_tmp19_); + _tmp18_ = _g_object_ref0 (_tmp17_); #line 295 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (parent); #line 295 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - parent = _tmp20_; + parent = _tmp18_; #line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (grandparent); -#line 2637 "EventsBranch.c" +#line 2613 "EventsBranch.c" } #line 276 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (parent); #line 276 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (entry); -#line 2643 "EventsBranch.c" +#line 2619 "EventsBranch.c" } -static Block8Data* block8_data_ref (Block8Data* _data8_) { +static Block8Data* +block8_data_ref (Block8Data* _data8_) +{ #line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_atomic_int_inc (&_data8_->_ref_count_); #line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return _data8_; -#line 2652 "EventsBranch.c" +#line 2630 "EventsBranch.c" } -static void block8_data_unref (void * _userdata_) { +static void +block8_data_unref (void * _userdata_) +{ Block8Data* _data8_; _data8_ = (Block8Data*) _userdata_; #line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" if (g_atomic_int_dec_and_test (&_data8_->_ref_count_)) { -#line 2661 "EventsBranch.c" +#line 2641 "EventsBranch.c" EventsBranch* self; #line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = _data8_->self; @@ -2665,56 +2645,60 @@ static void block8_data_unref (void * _userdata_) { _g_object_unref0 (self); #line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_slice_free (Block8Data, _data8_); -#line 2669 "EventsBranch.c" +#line 2649 "EventsBranch.c" } } -static gboolean __lambda21_ (Block8Data* _data8_, SidebarEntry* entry) { +static gboolean +__lambda21_ (Block8Data* _data8_, + SidebarEntry* entry) +{ EventsBranch* self; gboolean result = FALSE; - SidebarEntry* _tmp0_; - gint _tmp1_; - gint _tmp2_; + gint _tmp0_; #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = _data8_->self; #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE); #line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = entry; + _tmp0_ = _data8_->event_month; #line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry)); -#line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = _data8_->event_month; -#line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - result = _tmp1_ == _tmp2_; + result = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (entry, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry)) == _tmp0_; #line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2694 "EventsBranch.c" +#line 2671 "EventsBranch.c" } -static gboolean ___lambda21__locator (gconstpointer item, gpointer self) { +static gboolean +___lambda21__locator (gconstpointer item, + gpointer self) +{ gboolean result; result = __lambda21_ (self, (SidebarEntry*) item); #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2703 "EventsBranch.c" +#line 2683 "EventsBranch.c" } -static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* event, struct tm* event_tm, SidebarEntry* * found_year) { +static SidebarEntry* +events_branch_find_event_month (EventsBranch* self, + Event* event, + struct tm* event_tm, + SidebarEntry* * found_year) +{ SidebarEntry* _vala_found_year = NULL; SidebarEntry* result = NULL; Block8Data* _data8_; - Event* _tmp0_; - struct tm _tmp1_; + struct tm _tmp0_; + SidebarEntry* _tmp1_; SidebarEntry* _tmp2_; - SidebarEntry* _tmp3_; - struct tm _tmp4_; - gint _tmp5_; + struct tm _tmp3_; + gint _tmp4_; + SidebarEntry* _tmp5_; SidebarEntry* _tmp6_; - SidebarEntry* _tmp7_; #line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL); #line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -2728,19 +2712,17 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* #line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _data8_->self = g_object_ref (self); #line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = event; -#line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = *event_tm; + _tmp0_ = *event_tm; #line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = events_branch_find_event_year (self, _tmp0_, &_tmp1_); + _tmp1_ = events_branch_find_event_year (self, event, &_tmp0_); #line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_vala_found_year); #line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_found_year = _tmp2_; + _vala_found_year = _tmp1_; #line 302 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = _vala_found_year; + _tmp2_ = _vala_found_year; #line 302 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = NULL; #line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -2751,28 +2733,28 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* if (found_year) { #line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" *found_year = _vala_found_year; -#line 2755 "EventsBranch.c" +#line 2737 "EventsBranch.c" } else { #line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_vala_found_year); -#line 2759 "EventsBranch.c" +#line 2741 "EventsBranch.c" } #line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2763 "EventsBranch.c" +#line 2745 "EventsBranch.c" } #line 305 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = *event_tm; + _tmp3_ = *event_tm; #line 305 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = _tmp4_.tm_mon; + _tmp4_ = _tmp3_.tm_mon; #line 305 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _data8_->event_month = _tmp5_ + 1; + _data8_->event_month = _tmp4_ + 1; #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = _vala_found_year; + _tmp5_ = _vala_found_year; #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp6_, ___lambda21__locator, _data8_); + _tmp6_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp5_, ___lambda21__locator, _data8_); #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - result = _tmp7_; + result = _tmp6_; #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" block8_data_unref (_data8_); #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -2781,33 +2763,37 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* if (found_year) { #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" *found_year = _vala_found_year; -#line 2785 "EventsBranch.c" +#line 2767 "EventsBranch.c" } else { #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_vala_found_year); -#line 2789 "EventsBranch.c" +#line 2771 "EventsBranch.c" } #line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2793 "EventsBranch.c" +#line 2775 "EventsBranch.c" } -static Block9Data* block9_data_ref (Block9Data* _data9_) { +static Block9Data* +block9_data_ref (Block9Data* _data9_) +{ #line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_atomic_int_inc (&_data9_->_ref_count_); #line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return _data9_; -#line 2802 "EventsBranch.c" +#line 2786 "EventsBranch.c" } -static void block9_data_unref (void * _userdata_) { +static void +block9_data_unref (void * _userdata_) +{ Block9Data* _data9_; _data9_ = (Block9Data*) _userdata_; #line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) { -#line 2811 "EventsBranch.c" +#line 2797 "EventsBranch.c" EventsBranch* self; #line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = _data9_->self; @@ -2815,48 +2801,42 @@ static void block9_data_unref (void * _userdata_) { _g_object_unref0 (self); #line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_slice_free (Block9Data, _data9_); -#line 2819 "EventsBranch.c" +#line 2805 "EventsBranch.c" } } -static gboolean __lambda20_ (Block9Data* _data9_, SidebarEntry* entry) { +static gboolean +__lambda20_ (Block9Data* _data9_, + SidebarEntry* entry) +{ EventsBranch* self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - SidebarEntry* _tmp2_; #line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = _data9_->self; #line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE); #line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = entry; -#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) { + if (G_TYPE_CHECK_INSTANCE_TYPE (entry, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) { #line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp1_ = TRUE; -#line 2840 "EventsBranch.c" +#line 2826 "EventsBranch.c" } else { - SidebarEntry* _tmp3_; -#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = entry; #line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, EVENTS_TYPE_NO_EVENT_ENTRY); -#line 2847 "EventsBranch.c" + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (entry, EVENTS_TYPE_NO_EVENT_ENTRY); +#line 2830 "EventsBranch.c" } #line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" if (_tmp1_) { #line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp0_ = TRUE; -#line 2853 "EventsBranch.c" +#line 2836 "EventsBranch.c" } else { - SidebarEntry* _tmp4_; #line 318 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = entry; -#line 318 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY); -#line 2860 "EventsBranch.c" + _tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (entry, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY); +#line 2840 "EventsBranch.c" } #line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" if (_tmp0_) { @@ -2864,33 +2844,34 @@ static gboolean __lambda20_ (Block9Data* _data9_, SidebarEntry* entry) { result = FALSE; #line 319 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2868 "EventsBranch.c" +#line 2848 "EventsBranch.c" } else { - SidebarEntry* _tmp5_; - gint _tmp6_; -#line 321 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = entry; #line 321 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry)); -#line 321 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - result = _tmp6_ == _data9_->event_year; + result = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (entry, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry)) == _data9_->event_year; #line 321 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2880 "EventsBranch.c" +#line 2854 "EventsBranch.c" } } -static gboolean ___lambda20__locator (gconstpointer item, gpointer self) { +static gboolean +___lambda20__locator (gconstpointer item, + gpointer self) +{ gboolean result; result = __lambda20_ (self, (SidebarEntry*) item); #line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2890 "EventsBranch.c" +#line 2867 "EventsBranch.c" } -static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* event, struct tm* event_tm) { +static SidebarEntry* +events_branch_find_event_year (EventsBranch* self, + Event* event, + struct tm* event_tm) +{ SidebarEntry* result = NULL; Block9Data* _data9_; struct tm _tmp0_; @@ -2935,24 +2916,28 @@ static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* e _data9_ = NULL; #line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2939 "EventsBranch.c" +#line 2920 "EventsBranch.c" } -static gint _events_branch_undated_event_comparator_gcompare_func (gconstpointer a, gconstpointer b) { +static gint +_events_branch_undated_event_comparator_gcompare_func (gconstpointer a, + gconstpointer b) +{ gint result; result = events_branch_undated_event_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 2948 "EventsBranch.c" +#line 2932 "EventsBranch.c" } -static void events_branch_add_undated_event (EventsBranch* self, Event* event) { +static void +events_branch_add_undated_event (EventsBranch* self, + Event* event) +{ EventsUndatedDirectoryEntry* _tmp0_; - gboolean _tmp1_; - EventsUndatedDirectoryEntry* _tmp5_; - Event* _tmp6_; + EventsUndatedDirectoryEntry* _tmp4_; #line 325 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 325 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -2960,40 +2945,37 @@ static void events_branch_add_undated_event (EventsBranch* self, Event* event) { #line 326 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp0_ = self->priv->undated_entry; #line 326 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 326 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp1_) { -#line 2967 "EventsBranch.c" + if (!sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry))) { +#line 2950 "EventsBranch.c" + SidebarEntry* _tmp1_; SidebarEntry* _tmp2_; - SidebarEntry* _tmp3_; - EventsUndatedDirectoryEntry* _tmp4_; + EventsUndatedDirectoryEntry* _tmp3_; #line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp1_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = self->priv->undated_entry; + _tmp3_ = self->priv->undated_entry; #line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _events_branch_undated_event_comparator_gcompare_func); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _events_branch_undated_event_comparator_gcompare_func); #line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp3_); -#line 2981 "EventsBranch.c" + _g_object_unref0 (_tmp2_); +#line 2964 "EventsBranch.c" } #line 329 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = self->priv->undated_entry; -#line 329 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = event; + _tmp4_ = self->priv->undated_entry; #line 329 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_graft_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp6_, NULL); -#line 2989 "EventsBranch.c" + events_branch_graft_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), event, NULL); +#line 2970 "EventsBranch.c" } -static void events_branch_move_to_undated_event (EventsBranch* self, Event* event) { +static void +events_branch_move_to_undated_event (EventsBranch* self, + Event* event) +{ EventsUndatedDirectoryEntry* _tmp0_; - gboolean _tmp1_; - Event* _tmp5_; - EventsUndatedDirectoryEntry* _tmp6_; + EventsUndatedDirectoryEntry* _tmp4_; #line 332 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 332 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -3001,43 +2983,40 @@ static void events_branch_move_to_undated_event (EventsBranch* self, Event* even #line 333 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp0_ = self->priv->undated_entry; #line 333 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 333 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp1_) { -#line 3008 "EventsBranch.c" + if (!sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry))) { +#line 2988 "EventsBranch.c" + SidebarEntry* _tmp1_; SidebarEntry* _tmp2_; - SidebarEntry* _tmp3_; - EventsUndatedDirectoryEntry* _tmp4_; + EventsUndatedDirectoryEntry* _tmp3_; #line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp1_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = self->priv->undated_entry; + _tmp3_ = self->priv->undated_entry; #line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); #line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp3_); -#line 3022 "EventsBranch.c" + _g_object_unref0 (_tmp2_); +#line 3002 "EventsBranch.c" } #line 336 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = event; + _tmp4_ = self->priv->undated_entry; #line 336 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = self->priv->undated_entry; -#line 336 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - events_branch_reparent_event (self, _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 3030 "EventsBranch.c" + events_branch_reparent_event (self, event, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); +#line 3008 "EventsBranch.c" } -static void events_branch_graft_event (EventsBranch* self, SidebarEntry* parent, Event* event, GCompareFunc comparator) { +static void +events_branch_graft_event (EventsBranch* self, + SidebarEntry* parent, + Event* event, + GCompareFunc comparator) +{ EventsEventEntry* entry = NULL; - Event* _tmp0_; - EventsEventEntry* _tmp1_; - GeeHashMap* _tmp2_; - Event* _tmp3_; - SidebarEntry* _tmp4_; - GCompareFunc _tmp5_; + EventsEventEntry* _tmp0_; + GeeHashMap* _tmp1_; #line 339 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 339 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -3045,41 +3024,35 @@ static void events_branch_graft_event (EventsBranch* self, SidebarEntry* parent, #line 339 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (IS_EVENT (event)); #line 341 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = event; -#line 341 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = events_event_entry_new (_tmp0_); + _tmp0_ = events_event_entry_new (event); #line 341 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - entry = _tmp1_; -#line 342 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = self->priv->entry_map; + entry = _tmp0_; #line 342 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = event; + _tmp1_ = self->priv->entry_map; #line 342 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, entry); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), event, entry); #line 344 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = parent; -#line 344 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = comparator; -#line 344 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp5_); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), parent, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), comparator); #line 339 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (entry); -#line 3068 "EventsBranch.c" +#line 3039 "EventsBranch.c" } -static void events_branch_reparent_event (EventsBranch* self, Event* event, SidebarEntry* new_parent) { +static void +events_branch_reparent_event (EventsBranch* self, + Event* event, + SidebarEntry* new_parent) +{ EventsEventEntry* entry = NULL; GeeHashMap* _tmp0_; - Event* _tmp1_; - gpointer _tmp2_; - EventsEventEntry* _tmp3_; + gpointer _tmp1_; + EventsEventEntry* _tmp2_; SidebarEntry* old_parent = NULL; - EventsEventEntry* _tmp4_; + EventsEventEntry* _tmp3_; + SidebarEntry* _tmp4_; SidebarEntry* _tmp5_; - SidebarEntry* _tmp6_; - SidebarEntry* _tmp7_; - EventsEventEntry* _tmp8_; + EventsEventEntry* _tmp6_; #line 347 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 347 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -3089,188 +3062,174 @@ static void events_branch_reparent_event (EventsBranch* self, Event* event, Side #line 348 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp0_ = self->priv->entry_map; #line 348 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = event; -#line 348 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), event); #line 348 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - entry = (EventsEventEntry*) _tmp2_; + entry = (EventsEventEntry*) _tmp1_; #line 349 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = entry; + _tmp2_ = entry; #line 349 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp3_ != NULL, "entry != null"); + _vala_assert (_tmp2_ != NULL, "entry != null"); #line 351 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = entry; + _tmp3_ = entry; #line 351 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); + _tmp4_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); #line 351 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - old_parent = _tmp5_; + old_parent = _tmp4_; #line 352 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = old_parent; + _tmp5_ = old_parent; #line 352 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp6_ != NULL, "old_parent != null"); -#line 354 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = new_parent; + _vala_assert (_tmp5_ != NULL, "old_parent != null"); #line 354 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = entry; + _tmp6_ = entry; #line 354 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_reparent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); + sidebar_branch_reparent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), new_parent, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" while (TRUE) { -#line 3120 "EventsBranch.c" - gboolean _tmp9_ = FALSE; - SidebarEntry* _tmp10_; - gint _tmp11_; +#line 3089 "EventsBranch.c" + gboolean _tmp7_ = FALSE; + SidebarEntry* _tmp8_; SidebarEntry* grandparent = NULL; + SidebarEntry* _tmp12_; + SidebarEntry* _tmp13_; + SidebarEntry* _tmp14_; SidebarEntry* _tmp15_; SidebarEntry* _tmp16_; SidebarEntry* _tmp17_; - SidebarEntry* _tmp18_; - SidebarEntry* _tmp19_; - SidebarEntry* _tmp20_; #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = old_parent; + _tmp8_ = old_parent; #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp10_); + if (sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp8_) == 0) { +#line 3103 "EventsBranch.c" + SidebarEntry* _tmp9_; + SidebarEntry* _tmp10_; + SidebarEntry* _tmp11_; #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp11_ == 0) { -#line 3137 "EventsBranch.c" - SidebarEntry* _tmp12_; - SidebarEntry* _tmp13_; - SidebarEntry* _tmp14_; -#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = old_parent; + _tmp9_ = old_parent; #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp10_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = _tmp13_; + _tmp11_ = _tmp10_; #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = _tmp12_ != _tmp14_; + _tmp7_ = _tmp9_ != _tmp11_; #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp14_); -#line 3151 "EventsBranch.c" + _g_object_unref0 (_tmp11_); +#line 3117 "EventsBranch.c" } else { #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = FALSE; -#line 3155 "EventsBranch.c" + _tmp7_ = FALSE; +#line 3121 "EventsBranch.c" } #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp9_) { + if (!_tmp7_) { #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" break; -#line 3161 "EventsBranch.c" +#line 3127 "EventsBranch.c" } #line 357 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = old_parent; + _tmp12_ = old_parent; #line 357 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp15_); + _tmp13_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp12_); #line 357 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - grandparent = _tmp16_; + grandparent = _tmp13_; #line 358 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = grandparent; + _tmp14_ = grandparent; #line 358 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _vala_assert (_tmp17_ != NULL, "grandparent != null"); + _vala_assert (_tmp14_ != NULL, "grandparent != null"); #line 360 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = old_parent; + _tmp15_ = old_parent; #line 360 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp18_); + sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp15_); #line 362 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = grandparent; + _tmp16_ = grandparent; #line 362 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp20_ = _g_object_ref0 (_tmp19_); + _tmp17_ = _g_object_ref0 (_tmp16_); #line 362 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (old_parent); #line 362 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - old_parent = _tmp20_; + old_parent = _tmp17_; #line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (grandparent); -#line 3187 "EventsBranch.c" +#line 3153 "EventsBranch.c" } #line 347 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (old_parent); #line 347 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (entry); -#line 3193 "EventsBranch.c" +#line 3159 "EventsBranch.c" } -static void events_branch_show_no_events (EventsBranch* self, gboolean show) { +static void +events_branch_show_no_events (EventsBranch* self, + gboolean show) +{ gboolean _tmp0_ = FALSE; - gboolean _tmp1_; #line 366 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = show; -#line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp1_) { -#line 3206 "EventsBranch.c" - EventsNoEventEntry* _tmp2_; - gboolean _tmp3_; -#line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = self->priv->no_event_entry; + if (show) { +#line 3172 "EventsBranch.c" + EventsNoEventEntry* _tmp1_; #line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); + _tmp1_ = self->priv->no_event_entry; #line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = !_tmp3_; -#line 3215 "EventsBranch.c" + _tmp0_ = !sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); +#line 3178 "EventsBranch.c" } else { #line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _tmp0_ = FALSE; -#line 3219 "EventsBranch.c" +#line 3182 "EventsBranch.c" } #line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" if (_tmp0_) { -#line 3223 "EventsBranch.c" - SidebarEntry* _tmp4_; - SidebarEntry* _tmp5_; - EventsNoEventEntry* _tmp6_; +#line 3186 "EventsBranch.c" + SidebarEntry* _tmp2_; + SidebarEntry* _tmp3_; + EventsNoEventEntry* _tmp4_; #line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); + _tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = self->priv->no_event_entry; + _tmp4_ = self->priv->no_event_entry; #line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); + sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL); #line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp5_); -#line 3237 "EventsBranch.c" + _g_object_unref0 (_tmp3_); +#line 3200 "EventsBranch.c" } else { - gboolean _tmp7_ = FALSE; - gboolean _tmp8_; + gboolean _tmp5_ = FALSE; #line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = show; + if (!show) { +#line 3205 "EventsBranch.c" + EventsNoEventEntry* _tmp6_; #line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!_tmp8_) { -#line 3245 "EventsBranch.c" - EventsNoEventEntry* _tmp9_; - gboolean _tmp10_; + _tmp6_ = self->priv->no_event_entry; #line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = self->priv->no_event_entry; -#line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = _tmp10_; -#line 3254 "EventsBranch.c" + _tmp5_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); +#line 3211 "EventsBranch.c" } else { #line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = FALSE; -#line 3258 "EventsBranch.c" + _tmp5_ = FALSE; +#line 3215 "EventsBranch.c" } #line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp7_) { -#line 3262 "EventsBranch.c" - EventsNoEventEntry* _tmp11_; + if (_tmp5_) { +#line 3219 "EventsBranch.c" + EventsNoEventEntry* _tmp7_; #line 370 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = self->priv->no_event_entry; + _tmp7_ = self->priv->no_event_entry; #line 370 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 3268 "EventsBranch.c" + sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); +#line 3225 "EventsBranch.c" } } } -static void events_branch_class_init (EventsBranchClass * klass) { +static void +events_branch_class_init (EventsBranchClass * klass) +{ gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; @@ -3297,11 +3256,13 @@ static void events_branch_class_init (EventsBranchClass * klass) { _tmp3_ = g_strdup (RESOURCES_ICON_NO_EVENT); #line 11 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_branch_no_event_icon = _tmp3_; -#line 3301 "EventsBranch.c" +#line 3260 "EventsBranch.c" } -static void events_branch_instance_init (EventsBranch * self) { +static void +events_branch_instance_init (EventsBranch * self) +{ GeeHashMap* _tmp0_; EventsUndatedDirectoryEntry* _tmp1_; EventsNoEventEntry* _tmp2_; @@ -3324,11 +3285,13 @@ static void events_branch_instance_init (EventsBranch * self) { _tmp3_ = events_master_directory_entry_new (); #line 22 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self->priv->all_events_entry = _tmp3_; -#line 3328 "EventsBranch.c" +#line 3289 "EventsBranch.c" } -static void events_branch_finalize (GObject * obj) { +static void +events_branch_finalize (GObject * obj) +{ EventsBranch * self; EventSourceCollection* _tmp0_; guint _tmp1_; @@ -3379,11 +3342,13 @@ static void events_branch_finalize (GObject * obj) { _g_object_unref0 (self->priv->all_events_entry); #line 7 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" G_OBJECT_CLASS (events_branch_parent_class)->finalize (obj); -#line 3383 "EventsBranch.c" +#line 3346 "EventsBranch.c" } -GType events_branch_get_type (void) { +GType +events_branch_get_type (void) +{ static volatile gsize events_branch_type_id__volatile = 0; if (g_once_init_enter (&events_branch_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsBranch), 0, (GInstanceInitFunc) events_branch_instance_init, NULL }; @@ -3395,17 +3360,21 @@ GType events_branch_get_type (void) { } -EventsDirectoryEntry* events_directory_entry_construct (GType object_type) { +EventsDirectoryEntry* +events_directory_entry_construct (GType object_type) +{ EventsDirectoryEntry * self = NULL; #line 375 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = (EventsDirectoryEntry*) sidebar_simple_page_entry_construct (object_type); #line 375 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return self; -#line 3405 "EventsBranch.c" +#line 3372 "EventsBranch.c" } -static gchar* events_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +events_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ EventsDirectoryEntry * self; gchar* result = NULL; const gchar* _tmp0_; @@ -3420,11 +3389,13 @@ static gchar* events_directory_entry_real_get_sidebar_icon (SidebarSimplePageEnt result = _tmp1_; #line 379 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3424 "EventsBranch.c" +#line 3393 "EventsBranch.c" } -static gboolean events_directory_entry_real_expand_on_select (SidebarExpandableEntry* base) { +static gboolean +events_directory_entry_real_expand_on_select (SidebarExpandableEntry* base) +{ EventsDirectoryEntry * self; gboolean result = FALSE; #line 382 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -3433,33 +3404,41 @@ static gboolean events_directory_entry_real_expand_on_select (SidebarExpandableE result = TRUE; #line 383 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3437 "EventsBranch.c" +#line 3408 "EventsBranch.c" } -static void events_directory_entry_class_init (EventsDirectoryEntryClass * klass) { +static void +events_directory_entry_class_init (EventsDirectoryEntryClass * klass) +{ #line 374 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_directory_entry_parent_class = g_type_class_peek_parent (klass); #line 374 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_directory_entry_real_get_sidebar_icon; -#line 3446 "EventsBranch.c" +#line 3419 "EventsBranch.c" } -static void events_directory_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) { +static void +events_directory_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) +{ #line 374 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_directory_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 374 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) events_directory_entry_real_expand_on_select; -#line 3455 "EventsBranch.c" +#line 3430 "EventsBranch.c" } -static void events_directory_entry_instance_init (EventsDirectoryEntry * self) { +static void +events_directory_entry_instance_init (EventsDirectoryEntry * self) +{ } -GType events_directory_entry_get_type (void) { +GType +events_directory_entry_get_type (void) +{ static volatile gsize events_directory_entry_type_id__volatile = 0; if (g_once_init_enter (&events_directory_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsDirectoryEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_directory_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsDirectoryEntry), 0, (GInstanceInitFunc) events_directory_entry_instance_init, NULL }; @@ -3473,24 +3452,30 @@ GType events_directory_entry_get_type (void) { } -EventsMasterDirectoryEntry* events_master_directory_entry_construct (GType object_type) { +EventsMasterDirectoryEntry* +events_master_directory_entry_construct (GType object_type) +{ EventsMasterDirectoryEntry * self = NULL; #line 388 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = (EventsMasterDirectoryEntry*) events_directory_entry_construct (object_type); #line 388 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return self; -#line 3483 "EventsBranch.c" +#line 3464 "EventsBranch.c" } -EventsMasterDirectoryEntry* events_master_directory_entry_new (void) { +EventsMasterDirectoryEntry* +events_master_directory_entry_new (void) +{ #line 388 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return events_master_directory_entry_construct (EVENTS_TYPE_MASTER_DIRECTORY_ENTRY); -#line 3490 "EventsBranch.c" +#line 3473 "EventsBranch.c" } -static gchar* events_master_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +events_master_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ EventsMasterDirectoryEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -3502,11 +3487,13 @@ static gchar* events_master_directory_entry_real_get_sidebar_name (SidebarSimple result = _tmp0_; #line 392 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3506 "EventsBranch.c" +#line 3491 "EventsBranch.c" } -static gchar* events_master_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +events_master_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ EventsMasterDirectoryEntry * self; gchar* result = NULL; const gchar* _tmp0_; @@ -3521,11 +3508,13 @@ static gchar* events_master_directory_entry_real_get_sidebar_icon (SidebarSimple result = _tmp1_; #line 396 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3525 "EventsBranch.c" +#line 3512 "EventsBranch.c" } -static Page* events_master_directory_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +events_master_directory_entry_real_create_page (SidebarSimplePageEntry* base) +{ EventsMasterDirectoryEntry * self; Page* result = NULL; MasterEventsDirectoryPage* _tmp0_; @@ -3539,11 +3528,13 @@ static Page* events_master_directory_entry_real_create_page (SidebarSimplePageEn result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page); #line 400 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3543 "EventsBranch.c" +#line 3532 "EventsBranch.c" } -static void events_master_directory_entry_class_init (EventsMasterDirectoryEntryClass * klass) { +static void +events_master_directory_entry_class_init (EventsMasterDirectoryEntryClass * klass) +{ #line 387 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_master_directory_entry_parent_class = g_type_class_peek_parent (klass); #line 387 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -3552,15 +3543,19 @@ static void events_master_directory_entry_class_init (EventsMasterDirectoryEntry ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_master_directory_entry_real_get_sidebar_icon; #line 387 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_master_directory_entry_real_create_page; -#line 3556 "EventsBranch.c" +#line 3547 "EventsBranch.c" } -static void events_master_directory_entry_instance_init (EventsMasterDirectoryEntry * self) { +static void +events_master_directory_entry_instance_init (EventsMasterDirectoryEntry * self) +{ } -GType events_master_directory_entry_get_type (void) { +GType +events_master_directory_entry_get_type (void) +{ static volatile gsize events_master_directory_entry_type_id__volatile = 0; if (g_once_init_enter (&events_master_directory_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsMasterDirectoryEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_master_directory_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsMasterDirectoryEntry), 0, (GInstanceInitFunc) events_master_directory_entry_instance_init, NULL }; @@ -3572,11 +3567,14 @@ GType events_master_directory_entry_get_type (void) { } -EventsYearDirectoryEntry* events_year_directory_entry_construct (GType object_type, const gchar* name, struct tm* tm) { +EventsYearDirectoryEntry* +events_year_directory_entry_construct (GType object_type, + const gchar* name, + struct tm* tm) +{ EventsYearDirectoryEntry * self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - struct tm _tmp2_; + gchar* _tmp0_; + struct tm _tmp1_; #line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (name != NULL, NULL); #line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -3584,31 +3582,34 @@ EventsYearDirectoryEntry* events_year_directory_entry_construct (GType object_ty #line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = (EventsYearDirectoryEntry*) events_directory_entry_construct (object_type); #line 409 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = name; -#line 409 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 409 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_free0 (self->priv->name); #line 409 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - self->priv->name = _tmp1_; + self->priv->name = _tmp0_; #line 410 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = *tm; + _tmp1_ = *tm; #line 410 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - self->priv->tm = _tmp2_; + self->priv->tm = _tmp1_; #line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return self; -#line 3601 "EventsBranch.c" +#line 3597 "EventsBranch.c" } -EventsYearDirectoryEntry* events_year_directory_entry_new (const gchar* name, struct tm* tm) { +EventsYearDirectoryEntry* +events_year_directory_entry_new (const gchar* name, + struct tm* tm) +{ #line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return events_year_directory_entry_construct (EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, name, tm); -#line 3608 "EventsBranch.c" +#line 3607 "EventsBranch.c" } -static gchar* events_year_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +events_year_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ EventsYearDirectoryEntry * self; gchar* result = NULL; const gchar* _tmp0_; @@ -3623,11 +3624,13 @@ static gchar* events_year_directory_entry_real_get_sidebar_name (SidebarSimplePa result = _tmp1_; #line 414 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3627 "EventsBranch.c" +#line 3628 "EventsBranch.c" } -gint events_year_directory_entry_get_year (EventsYearDirectoryEntry* self) { +gint +events_year_directory_entry_get_year (EventsYearDirectoryEntry* self) +{ gint result = 0; struct tm _tmp0_; gint _tmp1_; @@ -3641,11 +3644,13 @@ gint events_year_directory_entry_get_year (EventsYearDirectoryEntry* self) { result = _tmp1_ + 1900; #line 418 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3645 "EventsBranch.c" +#line 3648 "EventsBranch.c" } -static Page* events_year_directory_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +events_year_directory_entry_real_create_page (SidebarSimplePageEntry* base) +{ EventsYearDirectoryEntry * self; Page* result = NULL; struct tm _tmp0_; @@ -3662,11 +3667,13 @@ static Page* events_year_directory_entry_real_create_page (SidebarSimplePageEntr result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 422 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3666 "EventsBranch.c" +#line 3671 "EventsBranch.c" } -static void events_year_directory_entry_class_init (EventsYearDirectoryEntryClass * klass) { +static void +events_year_directory_entry_class_init (EventsYearDirectoryEntryClass * klass) +{ #line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_year_directory_entry_parent_class = g_type_class_peek_parent (klass); #line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -3677,18 +3684,22 @@ static void events_year_directory_entry_class_init (EventsYearDirectoryEntryClas ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_year_directory_entry_real_create_page; #line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" G_OBJECT_CLASS (klass)->finalize = events_year_directory_entry_finalize; -#line 3681 "EventsBranch.c" +#line 3688 "EventsBranch.c" } -static void events_year_directory_entry_instance_init (EventsYearDirectoryEntry * self) { +static void +events_year_directory_entry_instance_init (EventsYearDirectoryEntry * self) +{ #line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self->priv = EVENTS_YEAR_DIRECTORY_ENTRY_GET_PRIVATE (self); -#line 3688 "EventsBranch.c" +#line 3697 "EventsBranch.c" } -static void events_year_directory_entry_finalize (GObject * obj) { +static void +events_year_directory_entry_finalize (GObject * obj) +{ EventsYearDirectoryEntry * self; #line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry); @@ -3696,11 +3707,13 @@ static void events_year_directory_entry_finalize (GObject * obj) { _g_free0 (self->priv->name); #line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" G_OBJECT_CLASS (events_year_directory_entry_parent_class)->finalize (obj); -#line 3700 "EventsBranch.c" +#line 3711 "EventsBranch.c" } -GType events_year_directory_entry_get_type (void) { +GType +events_year_directory_entry_get_type (void) +{ static volatile gsize events_year_directory_entry_type_id__volatile = 0; if (g_once_init_enter (&events_year_directory_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsYearDirectoryEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_year_directory_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsYearDirectoryEntry), 0, (GInstanceInitFunc) events_year_directory_entry_instance_init, NULL }; @@ -3712,11 +3725,14 @@ GType events_year_directory_entry_get_type (void) { } -EventsMonthDirectoryEntry* events_month_directory_entry_construct (GType object_type, const gchar* name, struct tm* tm) { +EventsMonthDirectoryEntry* +events_month_directory_entry_construct (GType object_type, + const gchar* name, + struct tm* tm) +{ EventsMonthDirectoryEntry * self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - struct tm _tmp2_; + gchar* _tmp0_; + struct tm _tmp1_; #line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (name != NULL, NULL); #line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -3724,31 +3740,34 @@ EventsMonthDirectoryEntry* events_month_directory_entry_construct (GType object_ #line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = (EventsMonthDirectoryEntry*) events_directory_entry_construct (object_type); #line 431 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = name; -#line 431 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 431 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_free0 (self->priv->name); #line 431 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - self->priv->name = _tmp1_; + self->priv->name = _tmp0_; #line 432 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = *tm; + _tmp1_ = *tm; #line 432 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - self->priv->tm = _tmp2_; + self->priv->tm = _tmp1_; #line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return self; -#line 3741 "EventsBranch.c" +#line 3755 "EventsBranch.c" } -EventsMonthDirectoryEntry* events_month_directory_entry_new (const gchar* name, struct tm* tm) { +EventsMonthDirectoryEntry* +events_month_directory_entry_new (const gchar* name, + struct tm* tm) +{ #line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return events_month_directory_entry_construct (EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, name, tm); -#line 3748 "EventsBranch.c" +#line 3765 "EventsBranch.c" } -static gchar* events_month_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +events_month_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ EventsMonthDirectoryEntry * self; gchar* result = NULL; const gchar* _tmp0_; @@ -3763,11 +3782,13 @@ static gchar* events_month_directory_entry_real_get_sidebar_name (SidebarSimpleP result = _tmp1_; #line 436 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3767 "EventsBranch.c" +#line 3786 "EventsBranch.c" } -gint events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self) { +gint +events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self) +{ gint result = 0; struct tm _tmp0_; gint _tmp1_; @@ -3781,11 +3802,13 @@ gint events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self) { result = _tmp1_ + 1900; #line 440 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3785 "EventsBranch.c" +#line 3806 "EventsBranch.c" } -gint events_month_directory_entry_get_month (EventsMonthDirectoryEntry* self) { +gint +events_month_directory_entry_get_month (EventsMonthDirectoryEntry* self) +{ gint result = 0; struct tm _tmp0_; gint _tmp1_; @@ -3799,11 +3822,13 @@ gint events_month_directory_entry_get_month (EventsMonthDirectoryEntry* self) { result = _tmp1_ + 1; #line 444 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3803 "EventsBranch.c" +#line 3826 "EventsBranch.c" } -static Page* events_month_directory_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +events_month_directory_entry_real_create_page (SidebarSimplePageEntry* base) +{ EventsMonthDirectoryEntry * self; Page* result = NULL; struct tm _tmp0_; @@ -3820,11 +3845,13 @@ static Page* events_month_directory_entry_real_create_page (SidebarSimplePageEnt result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 448 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3824 "EventsBranch.c" +#line 3849 "EventsBranch.c" } -static void events_month_directory_entry_class_init (EventsMonthDirectoryEntryClass * klass) { +static void +events_month_directory_entry_class_init (EventsMonthDirectoryEntryClass * klass) +{ #line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_month_directory_entry_parent_class = g_type_class_peek_parent (klass); #line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -3835,18 +3862,22 @@ static void events_month_directory_entry_class_init (EventsMonthDirectoryEntryCl ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_month_directory_entry_real_create_page; #line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" G_OBJECT_CLASS (klass)->finalize = events_month_directory_entry_finalize; -#line 3839 "EventsBranch.c" +#line 3866 "EventsBranch.c" } -static void events_month_directory_entry_instance_init (EventsMonthDirectoryEntry * self) { +static void +events_month_directory_entry_instance_init (EventsMonthDirectoryEntry * self) +{ #line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self->priv = EVENTS_MONTH_DIRECTORY_ENTRY_GET_PRIVATE (self); -#line 3846 "EventsBranch.c" +#line 3875 "EventsBranch.c" } -static void events_month_directory_entry_finalize (GObject * obj) { +static void +events_month_directory_entry_finalize (GObject * obj) +{ EventsMonthDirectoryEntry * self; #line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry); @@ -3854,11 +3885,13 @@ static void events_month_directory_entry_finalize (GObject * obj) { _g_free0 (self->priv->name); #line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" G_OBJECT_CLASS (events_month_directory_entry_parent_class)->finalize (obj); -#line 3858 "EventsBranch.c" +#line 3889 "EventsBranch.c" } -GType events_month_directory_entry_get_type (void) { +GType +events_month_directory_entry_get_type (void) +{ static volatile gsize events_month_directory_entry_type_id__volatile = 0; if (g_once_init_enter (&events_month_directory_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsMonthDirectoryEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_month_directory_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsMonthDirectoryEntry), 0, (GInstanceInitFunc) events_month_directory_entry_instance_init, NULL }; @@ -3870,24 +3903,30 @@ GType events_month_directory_entry_get_type (void) { } -EventsUndatedDirectoryEntry* events_undated_directory_entry_construct (GType object_type) { +EventsUndatedDirectoryEntry* +events_undated_directory_entry_construct (GType object_type) +{ EventsUndatedDirectoryEntry * self = NULL; #line 453 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = (EventsUndatedDirectoryEntry*) events_directory_entry_construct (object_type); #line 453 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return self; -#line 3880 "EventsBranch.c" +#line 3915 "EventsBranch.c" } -EventsUndatedDirectoryEntry* events_undated_directory_entry_new (void) { +EventsUndatedDirectoryEntry* +events_undated_directory_entry_new (void) +{ #line 453 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return events_undated_directory_entry_construct (EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY); -#line 3887 "EventsBranch.c" +#line 3924 "EventsBranch.c" } -static gchar* events_undated_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +events_undated_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ EventsUndatedDirectoryEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -3899,11 +3938,13 @@ static gchar* events_undated_directory_entry_real_get_sidebar_name (SidebarSimpl result = _tmp0_; #line 457 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3903 "EventsBranch.c" +#line 3942 "EventsBranch.c" } -static Page* events_undated_directory_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +events_undated_directory_entry_real_create_page (SidebarSimplePageEntry* base) +{ EventsUndatedDirectoryEntry * self; Page* result = NULL; struct tm _tmp0_ = {0}; @@ -3920,26 +3961,32 @@ static Page* events_undated_directory_entry_real_create_page (SidebarSimplePageE result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 461 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3924 "EventsBranch.c" +#line 3965 "EventsBranch.c" } -static void events_undated_directory_entry_class_init (EventsUndatedDirectoryEntryClass * klass) { +static void +events_undated_directory_entry_class_init (EventsUndatedDirectoryEntryClass * klass) +{ #line 452 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_undated_directory_entry_parent_class = g_type_class_peek_parent (klass); #line 452 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_undated_directory_entry_real_get_sidebar_name; #line 452 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_undated_directory_entry_real_create_page; -#line 3935 "EventsBranch.c" +#line 3978 "EventsBranch.c" } -static void events_undated_directory_entry_instance_init (EventsUndatedDirectoryEntry * self) { +static void +events_undated_directory_entry_instance_init (EventsUndatedDirectoryEntry * self) +{ } -GType events_undated_directory_entry_get_type (void) { +GType +events_undated_directory_entry_get_type (void) +{ static volatile gsize events_undated_directory_entry_type_id__volatile = 0; if (g_once_init_enter (&events_undated_directory_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsUndatedDirectoryEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_undated_directory_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsUndatedDirectoryEntry), 0, (GInstanceInitFunc) events_undated_directory_entry_instance_init, NULL }; @@ -3951,36 +3998,40 @@ GType events_undated_directory_entry_get_type (void) { } -EventsEventEntry* events_event_entry_construct (GType object_type, Event* event) { +EventsEventEntry* +events_event_entry_construct (GType object_type, + Event* event) +{ EventsEventEntry * self = NULL; Event* _tmp0_; - Event* _tmp1_; #line 470 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_val_if_fail (IS_EVENT (event), NULL); #line 470 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = (EventsEventEntry*) sidebar_simple_page_entry_construct (object_type); #line 471 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = event; -#line 471 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (event); #line 471 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (self->priv->event); #line 471 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - self->priv->event = _tmp1_; + self->priv->event = _tmp0_; #line 470 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return self; -#line 3973 "EventsBranch.c" +#line 4020 "EventsBranch.c" } -EventsEventEntry* events_event_entry_new (Event* event) { +EventsEventEntry* +events_event_entry_new (Event* event) +{ #line 470 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return events_event_entry_construct (EVENTS_TYPE_EVENT_ENTRY, event); -#line 3980 "EventsBranch.c" +#line 4029 "EventsBranch.c" } -Event* events_event_entry_get_event (EventsEventEntry* self) { +Event* +events_event_entry_get_event (EventsEventEntry* self) +{ Event* result = NULL; Event* _tmp0_; Event* _tmp1_; @@ -3994,11 +4045,13 @@ Event* events_event_entry_get_event (EventsEventEntry* self) { result = _tmp1_; #line 475 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 3998 "EventsBranch.c" +#line 4049 "EventsBranch.c" } -static gchar* events_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +events_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ EventsEventEntry * self; gchar* result = NULL; Event* _tmp0_; @@ -4013,11 +4066,13 @@ static gchar* events_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* result = _tmp1_; #line 479 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 4017 "EventsBranch.c" +#line 4070 "EventsBranch.c" } -static gchar* events_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +events_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ EventsEventEntry * self; gchar* result = NULL; const gchar* _tmp0_; @@ -4032,11 +4087,13 @@ static gchar* events_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* result = _tmp1_; #line 483 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 4036 "EventsBranch.c" +#line 4091 "EventsBranch.c" } -static Page* events_event_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +events_event_entry_real_create_page (SidebarSimplePageEntry* base) +{ EventsEventEntry * self; Page* result = NULL; Event* _tmp0_; @@ -4053,11 +4110,13 @@ static Page* events_event_entry_real_create_page (SidebarSimplePageEntry* base) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 487 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 4057 "EventsBranch.c" +#line 4114 "EventsBranch.c" } -static gboolean events_event_entry_real_is_user_renameable (SidebarRenameableEntry* base) { +static gboolean +events_event_entry_real_is_user_renameable (SidebarRenameableEntry* base) +{ EventsEventEntry * self; gboolean result = FALSE; #line 490 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -4066,74 +4125,77 @@ static gboolean events_event_entry_real_is_user_renameable (SidebarRenameableEnt result = TRUE; #line 491 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 4070 "EventsBranch.c" +#line 4129 "EventsBranch.c" } -static void events_event_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name) { +static void +events_event_entry_real_rename (SidebarRenameableEntry* base, + const gchar* new_name) +{ EventsEventEntry * self; gchar* prepped = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp0_; + const gchar* _tmp1_; #line 494 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry); #line 494 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" g_return_if_fail (new_name != NULL); #line 495 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp0_ = new_name; -#line 495 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = event_prep_event_name (_tmp0_); + _tmp0_ = event_prep_event_name (new_name); #line 495 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - prepped = _tmp1_; + prepped = _tmp0_; #line 496 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = prepped; + _tmp1_ = prepped; #line 496 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (_tmp2_ != NULL) { -#line 4094 "EventsBranch.c" + if (_tmp1_ != NULL) { +#line 4153 "EventsBranch.c" + CommandManager* _tmp2_; CommandManager* _tmp3_; - CommandManager* _tmp4_; - Event* _tmp5_; - const gchar* _tmp6_; + Event* _tmp4_; + const gchar* _tmp5_; + RenameEventCommand* _tmp6_; RenameEventCommand* _tmp7_; - RenameEventCommand* _tmp8_; #line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = app_window_get_command_manager (); + _tmp2_ = app_window_get_command_manager (); #line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = self->priv->event; + _tmp4_ = self->priv->event; #line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = prepped; + _tmp5_ = prepped; #line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = rename_event_command_new (_tmp5_, _tmp6_); + _tmp6_ = rename_event_command_new (_tmp4_, _tmp5_); #line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - command_manager_execute (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command)); #line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _command_manager_unref0 (_tmp4_); -#line 4119 "EventsBranch.c" + _command_manager_unref0 (_tmp3_); +#line 4178 "EventsBranch.c" } #line 494 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_free0 (prepped); -#line 4123 "EventsBranch.c" +#line 4182 "EventsBranch.c" } -static gboolean events_event_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) { +static gboolean +events_event_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, + GeeList* media) +{ EventsEventEntry * self; gboolean result = FALSE; GeeArrayList* views = NULL; GeeArrayList* _tmp0_; + CommandManager* _tmp15_; CommandManager* _tmp16_; - CommandManager* _tmp17_; - GeeArrayList* _tmp18_; - Event* _tmp19_; + GeeArrayList* _tmp17_; + Event* _tmp18_; + SetEventCommand* _tmp19_; SetEventCommand* _tmp20_; - SetEventCommand* _tmp21_; #line 500 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry); #line 500 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -4142,117 +4204,117 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD _tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL); #line 503 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" views = _tmp0_; -#line 4146 "EventsBranch.c" +#line 4208 "EventsBranch.c" { GeeList* _media_source_list = NULL; GeeList* _tmp1_; - GeeList* _tmp2_; gint _media_source_size = 0; - GeeList* _tmp3_; + GeeList* _tmp2_; + gint _tmp3_; gint _tmp4_; - gint _tmp5_; gint _media_source_index = 0; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp1_ = media; -#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); + _tmp1_ = _g_object_ref0 (media); #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _media_source_list = _tmp2_; + _media_source_list = _tmp1_; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp3_ = _media_source_list; + _tmp2_ = _media_source_list; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection)); + _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _media_source_size = _tmp5_; + _media_source_size = _tmp4_; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _media_source_index = -1; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" while (TRUE) { -#line 4174 "EventsBranch.c" +#line 4233 "EventsBranch.c" + gint _tmp5_; gint _tmp6_; gint _tmp7_; - gint _tmp8_; MediaSource* media_source = NULL; - GeeList* _tmp9_; - gint _tmp10_; - gpointer _tmp11_; - GeeArrayList* _tmp12_; - MediaSource* _tmp13_; + GeeList* _tmp8_; + gint _tmp9_; + gpointer _tmp10_; + GeeArrayList* _tmp11_; + MediaSource* _tmp12_; + DataView* _tmp13_; DataView* _tmp14_; - DataView* _tmp15_; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp6_ = _media_source_index; + _tmp5_ = _media_source_index; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _media_source_index = _tmp6_ + 1; + _media_source_index = _tmp5_ + 1; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp7_ = _media_source_index; + _tmp6_ = _media_source_index; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp8_ = _media_source_size; + _tmp7_ = _media_source_size; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - if (!(_tmp7_ < _tmp8_)) { + if (!(_tmp6_ < _tmp7_)) { #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" break; -#line 4198 "EventsBranch.c" +#line 4257 "EventsBranch.c" } #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp9_ = _media_source_list; + _tmp8_ = _media_source_list; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp10_ = _media_source_index; + _tmp9_ = _media_source_index; #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp11_ = gee_list_get (_tmp9_, _tmp10_); + _tmp10_ = gee_list_get (_tmp8_, _tmp9_); #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - media_source = (MediaSource*) _tmp11_; + media_source = (MediaSource*) _tmp10_; #line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp12_ = views; + _tmp11_ = views; #line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp13_ = media_source; + _tmp12_ = media_source; #line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp14_ = data_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_SOURCE, DataSource)); + _tmp13_ = data_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_SOURCE, DataSource)); #line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_); #line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp15_); + _g_object_unref0 (_tmp14_); #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (media_source); -#line 4222 "EventsBranch.c" +#line 4281 "EventsBranch.c" } #line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (_media_source_list); -#line 4226 "EventsBranch.c" +#line 4285 "EventsBranch.c" } #line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp16_ = app_window_get_command_manager (); + _tmp15_ = app_window_get_command_manager (); #line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp17_ = _tmp16_; + _tmp16_ = _tmp15_; #line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp18_ = views; + _tmp17_ = views; #line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp19_ = self->priv->event; + _tmp18_ = self->priv->event; #line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp20_ = set_event_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable), _tmp19_); + _tmp19_ = set_event_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable), _tmp18_); #line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _tmp21_ = _tmp20_; + _tmp20_ = _tmp19_; #line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - command_manager_execute (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_COMMAND, Command)); #line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _g_object_unref0 (_tmp21_); + _g_object_unref0 (_tmp20_); #line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" - _command_manager_unref0 (_tmp17_); + _command_manager_unref0 (_tmp16_); #line 509 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" result = TRUE; #line 509 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" _g_object_unref0 (views); #line 509 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 4252 "EventsBranch.c" +#line 4311 "EventsBranch.c" } -static gboolean events_event_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data) { +static gboolean +events_event_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, + GtkSelectionData* data) +{ EventsEventEntry * self; gboolean result = FALSE; #line 512 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -4263,11 +4325,13 @@ static gboolean events_event_entry_real_internal_drop_received_arbitrary (Sideba result = FALSE; #line 513 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 4267 "EventsBranch.c" +#line 4329 "EventsBranch.c" } -static void events_event_entry_class_init (EventsEventEntryClass * klass) { +static void +events_event_entry_class_init (EventsEventEntryClass * klass) +{ #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_event_entry_parent_class = g_type_class_peek_parent (klass); #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -4280,40 +4344,48 @@ static void events_event_entry_class_init (EventsEventEntryClass * klass) { ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_event_entry_real_create_page; #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" G_OBJECT_CLASS (klass)->finalize = events_event_entry_finalize; -#line 4284 "EventsBranch.c" +#line 4348 "EventsBranch.c" } -static void events_event_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) { +static void +events_event_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) +{ #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_event_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) events_event_entry_real_is_user_renameable; #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) events_event_entry_real_rename; -#line 4295 "EventsBranch.c" +#line 4361 "EventsBranch.c" } -static void events_event_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) { +static void +events_event_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) +{ #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_event_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface); #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) events_event_entry_real_internal_drop_received; #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) events_event_entry_real_internal_drop_received_arbitrary; -#line 4306 "EventsBranch.c" +#line 4374 "EventsBranch.c" } -static void events_event_entry_instance_init (EventsEventEntry * self) { +static void +events_event_entry_instance_init (EventsEventEntry * self) +{ #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self->priv = EVENTS_EVENT_ENTRY_GET_PRIVATE (self); -#line 4313 "EventsBranch.c" +#line 4383 "EventsBranch.c" } -static void events_event_entry_finalize (GObject * obj) { +static void +events_event_entry_finalize (GObject * obj) +{ EventsEventEntry * self; #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry); @@ -4321,11 +4393,13 @@ static void events_event_entry_finalize (GObject * obj) { _g_object_unref0 (self->priv->event); #line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" G_OBJECT_CLASS (events_event_entry_parent_class)->finalize (obj); -#line 4325 "EventsBranch.c" +#line 4397 "EventsBranch.c" } -GType events_event_entry_get_type (void) { +GType +events_event_entry_get_type (void) +{ static volatile gsize events_event_entry_type_id__volatile = 0; if (g_once_init_enter (&events_event_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsEventEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_event_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsEventEntry), 0, (GInstanceInitFunc) events_event_entry_instance_init, NULL }; @@ -4341,24 +4415,30 @@ GType events_event_entry_get_type (void) { } -EventsNoEventEntry* events_no_event_entry_construct (GType object_type) { +EventsNoEventEntry* +events_no_event_entry_construct (GType object_type) +{ EventsNoEventEntry * self = NULL; #line 519 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" self = (EventsNoEventEntry*) sidebar_simple_page_entry_construct (object_type); #line 519 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return self; -#line 4351 "EventsBranch.c" +#line 4427 "EventsBranch.c" } -EventsNoEventEntry* events_no_event_entry_new (void) { +EventsNoEventEntry* +events_no_event_entry_new (void) +{ #line 519 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return events_no_event_entry_construct (EVENTS_TYPE_NO_EVENT_ENTRY); -#line 4358 "EventsBranch.c" +#line 4436 "EventsBranch.c" } -static gchar* events_no_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { +static gchar* +events_no_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) +{ EventsNoEventEntry * self; gchar* result = NULL; gchar* _tmp0_; @@ -4370,11 +4450,13 @@ static gchar* events_no_event_entry_real_get_sidebar_name (SidebarSimplePageEntr result = _tmp0_; #line 523 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 4374 "EventsBranch.c" +#line 4454 "EventsBranch.c" } -static gchar* events_no_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { +static gchar* +events_no_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) +{ EventsNoEventEntry * self; gchar* result = NULL; const gchar* _tmp0_; @@ -4389,11 +4471,13 @@ static gchar* events_no_event_entry_real_get_sidebar_icon (SidebarSimplePageEntr result = _tmp1_; #line 527 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 4393 "EventsBranch.c" +#line 4475 "EventsBranch.c" } -static Page* events_no_event_entry_real_create_page (SidebarSimplePageEntry* base) { +static Page* +events_no_event_entry_real_create_page (SidebarSimplePageEntry* base) +{ EventsNoEventEntry * self; Page* result = NULL; NoEventPage* _tmp0_; @@ -4407,11 +4491,13 @@ static Page* events_no_event_entry_real_create_page (SidebarSimplePageEntry* bas result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page); #line 531 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" return result; -#line 4411 "EventsBranch.c" +#line 4495 "EventsBranch.c" } -static void events_no_event_entry_class_init (EventsNoEventEntryClass * klass) { +static void +events_no_event_entry_class_init (EventsNoEventEntryClass * klass) +{ #line 518 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" events_no_event_entry_parent_class = g_type_class_peek_parent (klass); #line 518 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" @@ -4420,15 +4506,19 @@ static void events_no_event_entry_class_init (EventsNoEventEntryClass * klass) { ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_no_event_entry_real_get_sidebar_icon; #line 518 "/home/jens/Source/shotwell/src/events/EventsBranch.vala" ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_no_event_entry_real_create_page; -#line 4424 "EventsBranch.c" +#line 4510 "EventsBranch.c" } -static void events_no_event_entry_instance_init (EventsNoEventEntry * self) { +static void +events_no_event_entry_instance_init (EventsNoEventEntry * self) +{ } -GType events_no_event_entry_get_type (void) { +GType +events_no_event_entry_get_type (void) +{ static volatile gsize events_no_event_entry_type_id__volatile = 0; if (g_once_init_enter (&events_no_event_entry_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsNoEventEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_no_event_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsNoEventEntry), 0, (GInstanceInitFunc) events_no_event_entry_instance_init, NULL }; diff --git a/src/events/EventsDirectoryPage.c b/src/events/EventsDirectoryPage.c index 44368cb..0eb6a88 100644 --- a/src/events/EventsDirectoryPage.c +++ b/src/events/EventsDirectoryPage.c @@ -1,4 +1,4 @@ -/* EventsDirectoryPage.c generated by valac 0.36.6, the Vala compiler +/* EventsDirectoryPage.c generated by valac 0.40.4, the Vala compiler * generated from EventsDirectoryPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -190,6 +191,11 @@ typedef struct _ViewManagerClass ViewManagerClass; typedef struct _EventsDirectoryPageEventsDirectorySearchViewFilter EventsDirectoryPageEventsDirectorySearchViewFilter; typedef struct _EventsDirectoryPageEventsDirectorySearchViewFilterClass EventsDirectoryPageEventsDirectorySearchViewFilterClass; +enum { + EVENTS_DIRECTORY_PAGE_0_PROPERTY, + EVENTS_DIRECTORY_PAGE_NUM_PROPERTIES +}; +static GParamSpec* events_directory_page_properties[EVENTS_DIRECTORY_PAGE_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _view_manager_unref0(var) ((var == NULL) ? NULL : (var = (view_manager_unref (var), NULL))) #define _view_filter_unref0(var) ((var == NULL) ? NULL : (var = (view_filter_unref (var), NULL))) @@ -534,6 +540,11 @@ typedef struct _IndexableIface IndexableIface; typedef struct _MasterEventsDirectoryPage MasterEventsDirectoryPage; typedef struct _MasterEventsDirectoryPageClass MasterEventsDirectoryPageClass; typedef struct _MasterEventsDirectoryPagePrivate MasterEventsDirectoryPagePrivate; +enum { + MASTER_EVENTS_DIRECTORY_PAGE_0_PROPERTY, + MASTER_EVENTS_DIRECTORY_PAGE_NUM_PROPERTIES +}; +static GParamSpec* master_events_directory_page_properties[MASTER_EVENTS_DIRECTORY_PAGE_NUM_PROPERTIES]; #define TYPE_SUB_EVENTS_DIRECTORY_PAGE (sub_events_directory_page_get_type ()) #define SUB_EVENTS_DIRECTORY_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SUB_EVENTS_DIRECTORY_PAGE, SubEventsDirectoryPage)) @@ -545,6 +556,11 @@ typedef struct _MasterEventsDirectoryPagePrivate MasterEventsDirectoryPagePrivat typedef struct _SubEventsDirectoryPage SubEventsDirectoryPage; typedef struct _SubEventsDirectoryPageClass SubEventsDirectoryPageClass; typedef struct _SubEventsDirectoryPagePrivate SubEventsDirectoryPagePrivate; +enum { + SUB_EVENTS_DIRECTORY_PAGE_0_PROPERTY, + SUB_EVENTS_DIRECTORY_PAGE_NUM_PROPERTIES +}; +static GParamSpec* sub_events_directory_page_properties[SUB_EVENTS_DIRECTORY_PAGE_NUM_PROPERTIES]; #define SUB_EVENTS_DIRECTORY_PAGE_TYPE_DIRECTORY_TYPE (sub_events_directory_page_directory_type_get_type ()) @@ -877,9 +893,15 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType checkerboard_page_get_type (void) G_GNUC_CONST; @@ -893,224 +915,359 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType search_view_filter_get_type (void) G_GNUC_CONST; gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; GType events_directory_page_get_type (void) G_GNUC_CONST; gpointer view_manager_ref (gpointer instance); void view_manager_unref (gpointer instance); -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_manager (GValue* value, gpointer v_object); -void value_take_view_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_manager (GValue* value, + gpointer v_object); +void value_take_view_manager (GValue* value, + gpointer v_object); gpointer value_get_view_manager (const GValue* value); GType view_manager_get_type (void) G_GNUC_CONST; static GType events_directory_page_events_directory_search_view_filter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define EVENTS_DIRECTORY_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPagePrivate)) -enum { - EVENTS_DIRECTORY_PAGE_DUMMY_PROPERTY -}; -GAction* page_get_action (Page* self, const gchar* name); -static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value); -static void _events_directory_page_on_sort_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self); +GAction* page_get_action (Page* self, + const gchar* name); +static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, + GSimpleAction* action, + GVariant* value); +static void _events_directory_page_on_sort_changed_g_simple_action_change_state (GSimpleAction* _sender, + GVariant* value, + gpointer self); static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_new (void); static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_construct (GType object_type); #define EVENTS_DIRECTORY_PAGE_MIN_PHOTOS_FOR_PROGRESS_WINDOW 50 static void events_directory_page_on_rename (EventsDirectoryPage* self); -static void _events_directory_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _events_directory_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void events_directory_page_on_merge (EventsDirectoryPage* self); -static void _events_directory_page_on_merge_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _events_directory_page_on_merge_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void events_directory_page_on_edit_comment (EventsDirectoryPage* self); -static void _events_directory_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -void page_on_action_toggle (Page* self, GAction* action, GVariant* value); -static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void events_directory_page_on_display_comments (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value); -static void _events_directory_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); +static void _events_directory_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +void page_on_action_toggle (Page* self, + GAction* action, + GVariant* value); +static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void events_directory_page_on_display_comments (EventsDirectoryPage* self, + GSimpleAction* action, + GVariant* value); +static void _events_directory_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType event_source_get_type (void) G_GNUC_CONST; GType event_get_type (void) G_GNUC_CONST; -EventsDirectoryPage* events_directory_page_construct (GType object_type, const gchar* page_name, ViewManager* view_manager, GeeCollection* initial_events); -CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name); +EventsDirectoryPage* events_directory_page_construct (GType object_type, + const gchar* page_name, + ViewManager* view_manager, + GeeCollection* initial_events); +CheckerboardPage* checkerboard_page_construct (GType object_type, + const gchar* page_name); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; ViewCollection* page_get_view (Page* self); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; -void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target); -static Comparator events_directory_page_get_event_comparator (gboolean ascending, void** result_target, GDestroyNotify* result_target_destroy_notify); +void data_collection_set_comparator (DataCollection* self, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target); +static Comparator events_directory_page_get_event_comparator (gboolean ascending, + void** result_target, + GDestroyNotify* result_target_destroy_notify); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* self); -gboolean events_directory_page_event_comparator_predicate (DataObject* object, Alteration* alteration); -static gboolean _events_directory_page_event_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self); +gboolean events_directory_page_event_comparator_predicate (DataObject* object, + Alteration* alteration); +static gboolean _events_directory_page_event_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self); GType source_collection_get_type (void) G_GNUC_CONST; gpointer view_collection_monitor_ref (gpointer instance); void view_collection_monitor_unref (gpointer instance); -GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void view_collection_value_set_monitor (GValue* value, gpointer v_object); -void view_collection_value_take_monitor (GValue* value, gpointer v_object); +GParamSpec* view_collection_param_spec_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void view_collection_value_set_monitor (GValue* value, + gpointer v_object); +void view_collection_value_take_monitor (GValue* value, + gpointer v_object); gpointer view_collection_value_get_monitor (const GValue* value); GType view_collection_monitor_get_type (void) G_GNUC_CONST; -ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target); +ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq, + GeeCollection* initial, + ProgressMonitor progress_monitor, + void* progress_monitor_target); GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType event_source_collection_get_type (void) G_GNUC_CONST; -void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target); +void data_collection_set_property (DataCollection* self, + const gchar* name, + GValue* val, + ValueEqualFunc value_equals, + void* value_equals_target); #define EVENT_PROP_SHOW_COMMENTS "show-comments" gboolean configuration_facade_get_display_event_comments (ConfigurationFacade* self); -void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path); +void checkerboard_page_init_item_context_menu (CheckerboardPage* self, + const gchar* path); GtkToolbar* page_get_toolbar (Page* self); #define RESOURCES_MERGE_LABEL _ ("Merge") #define RESOURCES_MERGE_TOOLTIP _ ("Combine events into a single event") -static void events_directory_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); -static gint64 events_directory_page_event_ascending_comparator (void* a, void* b); +static void events_directory_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames); +void page_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); +static gint64 events_directory_page_event_ascending_comparator (void* a, + void* b); GType event_directory_item_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); time_t event_source_get_start_time (EventSource* self); -static gint64 events_directory_page_event_descending_comparator (void* a, void* b); -static gint64 _events_directory_page_event_ascending_comparator_comparator (void* a, void* b, gpointer self); -static gint64 _events_directory_page_event_descending_comparator_comparator (void* a, void* b, gpointer self); -static void events_directory_page_real_add_actions (Page* base, GActionMap* map); -void page_add_actions (Page* self, GActionMap* map); +static gint64 events_directory_page_event_descending_comparator (void* a, + void* b); +static gint64 _events_directory_page_event_ascending_comparator_comparator (void* a, + void* b, + gpointer self); +static gint64 _events_directory_page_event_descending_comparator_comparator (void* a, + void* b, + gpointer self); +static void events_directory_page_real_add_actions (Page* base, + GActionMap* map); +void page_add_actions (Page* self, + GActionMap* map); static GVariant* _variant_new14 (gboolean value); -static void events_directory_page_real_remove_actions (Page* base, GActionMap* map); -void page_remove_actions (Page* self, GActionMap* map); -static void events_directory_page_real_init_actions (Page* base, gint selected_count, gint count); -void page_init_actions (Page* self, gint selected_count, gint count); -static void events_directory_page_real_update_actions (Page* base, gint selected_count, gint count); -void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); -void page_update_actions (Page* self, gint selected_count, gint count); +static void events_directory_page_real_remove_actions (Page* base, + GActionMap* map); +void page_remove_actions (Page* self, + GActionMap* map); +static void events_directory_page_real_init_actions (Page* base, + gint selected_count, + gint count); +void page_init_actions (Page* self, + gint selected_count, + gint count); +static void events_directory_page_real_update_actions (Page* base, + gint selected_count, + gint count); +void page_set_action_sensitive (Page* self, + const gchar* name, + gboolean sensitive); +void page_update_actions (Page* self, + gint selected_count, + gint count); static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPage* base); static gchar* events_directory_page_real_get_filter_no_match_message (CheckerboardPage* base); -static void events_directory_page_real_on_item_activated (CheckerboardPage* base, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers); +static void events_directory_page_real_on_item_activated (CheckerboardPage* base, + CheckerboardItem* item, + CheckerboardPageActivator activator, + CheckerboardPageKeyboardModifiers* modifiers); GType app_window_get_type (void) G_GNUC_CONST; GType library_window_get_type (void) G_GNUC_CONST; LibraryWindow* library_window_get_app (void); -void library_window_switch_to_event (LibraryWindow* self, Event* event); +void library_window_switch_to_event (LibraryWindow* self, + Event* event); #define LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING "ascending" gint view_collection_get_selected_count (ViewCollection* self); -DataView* view_collection_get_selected_at (ViewCollection* self, gint index); +DataView* view_collection_get_selected_at (ViewCollection* self, + gint index); gpointer text_entry_dialog_mediator_ref (gpointer instance); void text_entry_dialog_mediator_unref (gpointer instance); -GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_text_entry_dialog_mediator (GValue* value, gpointer v_object); -void value_take_text_entry_dialog_mediator (GValue* value, gpointer v_object); +GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_text_entry_dialog_mediator (GValue* value, + gpointer v_object); +void value_take_text_entry_dialog_mediator (GValue* value, + gpointer v_object); gpointer value_get_text_entry_dialog_mediator (const GValue* value); GType text_entry_dialog_mediator_get_type (void) G_GNUC_CONST; GType event_rename_dialog_get_type (void) G_GNUC_CONST; gchar* event_get_raw_name (Event* self); EventRenameDialog* event_rename_dialog_new (const gchar* event_name); -EventRenameDialog* event_rename_dialog_construct (GType object_type, const gchar* event_name); +EventRenameDialog* event_rename_dialog_construct (GType object_type, + const gchar* event_name); gchar* event_rename_dialog_execute (EventRenameDialog* self); GType command_get_type (void) G_GNUC_CONST; GType page_command_get_type (void) G_GNUC_CONST; GType simple_proxyable_command_get_type (void) G_GNUC_CONST; GType rename_event_command_get_type (void) G_GNUC_CONST; -RenameEventCommand* rename_event_command_new (Event* event, const gchar* new_name); -RenameEventCommand* rename_event_command_construct (GType object_type, Event* event, const gchar* new_name); +RenameEventCommand* rename_event_command_new (Event* event, + const gchar* new_name); +RenameEventCommand* rename_event_command_construct (GType object_type, + Event* event, + const gchar* new_name); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* page_get_command_manager (Page* self); -void command_manager_execute (CommandManager* self, Command* command); +void command_manager_execute (CommandManager* self, + Command* command); gpointer multi_text_entry_dialog_mediator_ref (gpointer instance); void multi_text_entry_dialog_mediator_unref (gpointer instance); -GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object); -void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object); +GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_multi_text_entry_dialog_mediator (GValue* value, + gpointer v_object); +void value_take_multi_text_entry_dialog_mediator (GValue* value, + gpointer v_object); gpointer value_get_multi_text_entry_dialog_mediator (const GValue* value); GType multi_text_entry_dialog_mediator_get_type (void) G_GNUC_CONST; GType edit_comment_dialog_get_type (void) G_GNUC_CONST; gchar* event_source_get_comment (EventSource* self); -EditCommentDialog* edit_comment_dialog_new (const gchar* comment, gboolean is_event); -EditCommentDialog* edit_comment_dialog_construct (GType object_type, const gchar* comment, gboolean is_event); +EditCommentDialog* edit_comment_dialog_new (const gchar* comment, + gboolean is_event); +EditCommentDialog* edit_comment_dialog_construct (GType object_type, + const gchar* comment, + gboolean is_event); gchar* edit_comment_dialog_execute (EditCommentDialog* self); GType edit_event_comment_command_get_type (void) G_GNUC_CONST; -EditEventCommentCommand* edit_event_comment_command_new (Event* event, const gchar* new_comment); -EditEventCommentCommand* edit_event_comment_command_construct (GType object_type, Event* event, const gchar* new_comment); +EditEventCommentCommand* edit_event_comment_command_new (Event* event, + const gchar* new_comment); +EditEventCommentCommand* edit_event_comment_command_construct (GType object_type, + Event* event, + const gchar* new_comment); GType move_photos_command_get_type (void) G_GNUC_CONST; GType merge_events_command_get_type (void) G_GNUC_CONST; GeeList* view_collection_get_selected (ViewCollection* self); MergeEventsCommand* merge_events_command_new (GeeIterable* iter); -MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterable* iter); -void checkerboard_page_set_display_comments (CheckerboardPage* self, gboolean display); -void configuration_facade_set_display_event_comments (ConfigurationFacade* self, gboolean display); +MergeEventsCommand* merge_events_command_construct (GType object_type, + GeeIterable* iter); +void checkerboard_page_set_display_comments (CheckerboardPage* self, + gboolean display); +void configuration_facade_set_display_event_comments (ConfigurationFacade* self, + gboolean display); static SearchViewFilter* events_directory_page_real_get_search_view_filter (CheckerboardPage* base); GType events_directory_page_event_directory_manager_get_type (void) G_GNUC_CONST; -enum { - EVENTS_DIRECTORY_PAGE_EVENT_DIRECTORY_MANAGER_DUMMY_PROPERTY -}; -static DataView* events_directory_page_event_directory_manager_real_create_view (ViewManager* base, DataSource* source); +static DataView* events_directory_page_event_directory_manager_real_create_view (ViewManager* base, + DataSource* source); EventDirectoryItem* event_directory_item_new (Event* event); -EventDirectoryItem* event_directory_item_construct (GType object_type, Event* event); +EventDirectoryItem* event_directory_item_construct (GType object_type, + Event* event); EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_manager_new (void); EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_manager_construct (GType object_type); ViewManager* view_manager_construct (GType object_type); -enum { - EVENTS_DIRECTORY_PAGE_EVENTS_DIRECTORY_SEARCH_VIEW_FILTER_DUMMY_PROPERTY -}; static guint events_directory_page_events_directory_search_view_filter_real_get_criteria (SearchViewFilter* base); GType search_filter_criteria_get_type (void) G_GNUC_CONST; -static gboolean events_directory_page_events_directory_search_view_filter_real_predicate (ViewFilter* base, DataView* view); +static gboolean events_directory_page_events_directory_search_view_filter_real_predicate (ViewFilter* base, + DataView* view); DataSource* data_view_get_source (DataView* self); gboolean is_string_empty (const gchar* s); const gchar* search_view_filter_get_search_filter (SearchViewFilter* self); GType indexable_get_type (void) G_GNUC_CONST; const gchar* indexable_get_indexable_keywords (Indexable* self); -gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, int* result_length1); +gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, + int* result_length1); SearchViewFilter* search_view_filter_construct (GType object_type); static void events_directory_page_finalize (GObject * obj); GType master_events_directory_page_get_type (void) G_GNUC_CONST; -enum { - MASTER_EVENTS_DIRECTORY_PAGE_DUMMY_PROPERTY -}; #define MASTER_EVENTS_DIRECTORY_PAGE_NAME _ ("All Events") MasterEventsDirectoryPage* master_events_directory_page_new (void); MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_type); GeeCollection* data_collection_get_all (DataCollection* self); GType sub_events_directory_page_get_type (void) G_GNUC_CONST; -enum { - SUB_EVENTS_DIRECTORY_PAGE_DUMMY_PROPERTY -}; GType sub_events_directory_page_directory_type_get_type (void) G_GNUC_CONST; #define SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME _ ("Undated") #define SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT _ ("%Y") #define SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT _ ("%B") -SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, struct tm* time); -SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time); -static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, struct tm* time); -static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time); +SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, + struct tm* time); +SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type, + SubEventsDirectoryPageDirectoryType type, + struct tm* time); +static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, + struct tm* time); +static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_construct (GType object_type, + SubEventsDirectoryPageDirectoryType type, + struct tm* time); static GType sub_events_directory_page_sub_event_directory_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; gint sub_events_directory_page_get_month (SubEventsDirectoryPage* self); static gint sub_events_directory_page_sub_event_directory_manager_get_month (SubEventsDirectoryPageSubEventDirectoryManager* self); @@ -1119,106 +1276,134 @@ static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubE SubEventsDirectoryPageDirectoryType sub_events_directory_page_get_event_directory_type (SubEventsDirectoryPage* self); static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (SubEventsDirectoryPageSubEventDirectoryManager* self); #define SUB_EVENTS_DIRECTORY_PAGE_SUB_EVENT_DIRECTORY_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManagerPrivate)) -enum { - SUB_EVENTS_DIRECTORY_PAGE_SUB_EVENT_DIRECTORY_MANAGER_DUMMY_PROPERTY -}; -static gboolean sub_events_directory_page_sub_event_directory_manager_real_include_in_view (ViewManager* base, DataSource* source); -gboolean view_manager_include_in_view (ViewManager* self, DataSource* source); +static gboolean sub_events_directory_page_sub_event_directory_manager_real_include_in_view (ViewManager* base, + DataSource* source); +gboolean view_manager_include_in_view (ViewManager* self, + DataSource* source); static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager * obj); static const GActionEntry EVENTS_DIRECTORY_PAGE_entries[4] = {{"Rename", _events_directory_page_on_rename_gsimple_action_activate_callback}, {"Merge", _events_directory_page_on_merge_gsimple_action_activate_callback}, {"EditComment", _events_directory_page_on_edit_comment_gsimple_action_activate_callback}, {"ViewComment", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _events_directory_page_on_display_comments_gsimple_action_change_state_callback}}; -static void _events_directory_page_on_sort_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self) { +static void +_events_directory_page_on_sort_changed_g_simple_action_change_state (GSimpleAction* _sender, + GVariant* value, + gpointer self) +{ #line 77 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_on_sort_changed ((EventsDirectoryPage*) self, _sender, value); -#line 1135 "EventsDirectoryPage.c" +#line 1295 "EventsDirectoryPage.c" } -static void _events_directory_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_events_directory_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_on_rename ((EventsDirectoryPage*) self); -#line 1142 "EventsDirectoryPage.c" +#line 1306 "EventsDirectoryPage.c" } -static void _events_directory_page_on_merge_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_events_directory_page_on_merge_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_on_merge ((EventsDirectoryPage*) self); -#line 1149 "EventsDirectoryPage.c" +#line 1317 "EventsDirectoryPage.c" } -static void _events_directory_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_events_directory_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_on_edit_comment ((EventsDirectoryPage*) self); -#line 1156 "EventsDirectoryPage.c" +#line 1328 "EventsDirectoryPage.c" } -static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" page_on_action_toggle ((Page*) self, action, parameter); -#line 1163 "EventsDirectoryPage.c" +#line 1339 "EventsDirectoryPage.c" } -static void _events_directory_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_events_directory_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_on_display_comments ((EventsDirectoryPage*) self, action, value); -#line 1170 "EventsDirectoryPage.c" +#line 1350 "EventsDirectoryPage.c" } -static gboolean _events_directory_page_event_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) { +static gboolean +_events_directory_page_event_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self) +{ gboolean result; result = events_directory_page_event_comparator_predicate (object, alteration); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1179 "EventsDirectoryPage.c" +#line 1363 "EventsDirectoryPage.c" } -static gpointer _view_manager_ref0 (gpointer self) { +static gpointer +_view_manager_ref0 (gpointer self) +{ #line 59 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self ? view_manager_ref (self) : NULL; -#line 1186 "EventsDirectoryPage.c" +#line 1372 "EventsDirectoryPage.c" } -EventsDirectoryPage* events_directory_page_construct (GType object_type, const gchar* page_name, ViewManager* view_manager, GeeCollection* initial_events) { +EventsDirectoryPage* +events_directory_page_construct (GType object_type, + const gchar* page_name, + ViewManager* view_manager, + GeeCollection* initial_events) +{ EventsDirectoryPage * self = NULL; - const gchar* _tmp0_; + ViewCollection* _tmp0_; ViewCollection* _tmp1_; - ViewCollection* _tmp2_; + ConfigFacade* _tmp2_; ConfigFacade* _tmp3_; - ConfigFacade* _tmp4_; - gboolean _tmp5_; - void* _tmp6_; - GDestroyNotify _tmp7_; - Comparator _tmp8_; - Comparator _tmp9_; - void* _tmp9__target; - GDestroyNotify _tmp9__target_destroy_notify; - ViewCollection* _tmp10_; - ViewCollection* _tmp11_; - EventSourceCollection* _tmp12_; - ViewManager* _tmp13_; - GeeCollection* _tmp14_; - ViewCollectionMonitor* _tmp15_; - ViewCollectionMonitor* _tmp16_; - ViewCollection* _tmp17_; - ViewCollection* _tmp18_; - ConfigFacade* _tmp19_; - ConfigFacade* _tmp20_; - gboolean _tmp21_; - GValue _tmp22_ = {0}; - ViewManager* _tmp23_; - ViewManager* _tmp24_; + void* _tmp4_; + GDestroyNotify _tmp5_; + Comparator _tmp6_; + Comparator _tmp7_; + void* _tmp7__target; + GDestroyNotify _tmp7__target_destroy_notify; + ViewCollection* _tmp8_; + ViewCollection* _tmp9_; + EventSourceCollection* _tmp10_; + ViewCollectionMonitor* _tmp11_; + ViewCollectionMonitor* _tmp12_; + ViewCollection* _tmp13_; + ViewCollection* _tmp14_; + ConfigFacade* _tmp15_; + ConfigFacade* _tmp16_; + GValue _tmp17_ = {0}; + ViewManager* _tmp18_; GtkToolbar* toolbar = NULL; - GtkToolbar* _tmp25_; + GtkToolbar* _tmp19_; GtkToolButton* merge_button = NULL; - GtkToolButton* _tmp26_; + GtkToolButton* _tmp20_; #line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (page_name != NULL, NULL); #line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1226,103 +1411,91 @@ EventsDirectoryPage* events_directory_page_construct (GType object_type, const g #line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail ((initial_events == NULL) || GEE_IS_COLLECTION (initial_events), NULL); #line 47 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = page_name; -#line 47 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - self = (EventsDirectoryPage*) checkerboard_page_construct (object_type, _tmp0_); -#line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + self = (EventsDirectoryPage*) checkerboard_page_construct (object_type, page_name); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = _tmp1_; + _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = config_facade_get_instance (); + _tmp1_ = _tmp0_; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = _tmp3_; + _tmp2_ = config_facade_get_instance (); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp3_ = _tmp2_; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = events_directory_page_get_event_comparator (_tmp5_, &_tmp6_, &_tmp7_); + _tmp6_ = events_directory_page_get_event_comparator (configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)), &_tmp4_, &_tmp5_); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9__target = _tmp6_; + _tmp7__target = _tmp4_; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9__target_destroy_notify = _tmp7_; + _tmp7__target_destroy_notify = _tmp5_; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), _tmp9_, _tmp6_, _events_directory_page_event_comparator_predicate_comparator_predicate, NULL); + data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), _tmp7_, _tmp4_, _events_directory_page_event_comparator_predicate_comparator_predicate, NULL); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - (_tmp9__target_destroy_notify == NULL) ? NULL : (_tmp9__target_destroy_notify (_tmp9__target), NULL); + (_tmp7__target_destroy_notify == NULL) ? NULL : (_tmp7__target_destroy_notify (_tmp7__target), NULL); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = NULL; + _tmp7_ = NULL; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9__target = NULL; + _tmp7__target = NULL; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9__target_destroy_notify = NULL; + _tmp7__target_destroy_notify = NULL; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _data_collection_unref0 (_tmp2_); -#line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp11_ = _tmp10_; + _data_collection_unref0 (_tmp1_); #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp12_ = event_global; + _tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp13_ = view_manager; + _tmp9_ = _tmp8_; #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp14_ = initial_events; + _tmp10_ = event_global; #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp15_ = view_collection_monitor_source_collection (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp13_, NULL, _tmp14_, NULL, NULL); + _tmp11_ = view_collection_monitor_source_collection (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_SOURCE_COLLECTION, SourceCollection), view_manager, NULL, initial_events, NULL, NULL); #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp16_ = _tmp15_; + _tmp12_ = _tmp11_; #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _view_collection_monitor_unref0 (_tmp16_); + _view_collection_monitor_unref0 (_tmp12_); #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _data_collection_unref0 (_tmp11_); -#line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _data_collection_unref0 (_tmp9_); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp18_ = _tmp17_; + _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp19_ = config_facade_get_instance (); + _tmp14_ = _tmp13_; #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp20_ = _tmp19_; + _tmp15_ = config_facade_get_instance (); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp21_ = configuration_facade_get_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp16_ = _tmp15_; #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_value_init (&_tmp22_, G_TYPE_BOOLEAN); + g_value_init (&_tmp17_, G_TYPE_BOOLEAN); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_value_set_boolean (&_tmp22_, _tmp21_); + g_value_set_boolean (&_tmp17_, configuration_facade_get_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_COLLECTION, DataCollection), EVENT_PROP_SHOW_COMMENTS, &_tmp22_, NULL, NULL); + data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), EVENT_PROP_SHOW_COMMENTS, &_tmp17_, NULL, NULL); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - G_IS_VALUE (&_tmp22_) ? (g_value_unset (&_tmp22_), NULL) : NULL; + G_IS_VALUE (&_tmp17_) ? (g_value_unset (&_tmp17_), NULL) : NULL; #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp16_); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _data_collection_unref0 (_tmp18_); + _data_collection_unref0 (_tmp14_); #line 57 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "EventsDirectoryContextMenu"); #line 59 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp23_ = view_manager; -#line 59 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp24_ = _view_manager_ref0 (_tmp23_); + _tmp18_ = _view_manager_ref0 (view_manager); #line 59 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _view_manager_unref0 (self->view_manager); #line 59 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - self->view_manager = _tmp24_; + self->view_manager = _tmp18_; #line 62 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp25_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp19_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 62 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - toolbar = _tmp25_; + toolbar = _tmp19_; #line 65 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp26_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_MERGE_LABEL); + _tmp20_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_MERGE_LABEL); #line 65 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_object_ref_sink (_tmp26_); + g_object_ref_sink (_tmp20_); #line 65 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - merge_button = _tmp26_; + merge_button = _tmp20_; #line 66 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (merge_button, GTK_TYPE_ACTIONABLE, GtkActionable), "win.Merge"); + gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (merge_button, gtk_actionable_get_type (), GtkActionable), "win.Merge"); #line 67 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (merge_button, gtk_tool_item_get_type (), GtkToolItem), TRUE); #line 68 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1337,241 +1510,225 @@ EventsDirectoryPage* events_directory_page_construct (GType object_type, const g _g_object_unref0 (toolbar); #line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self; -#line 1341 "EventsDirectoryPage.c" +#line 1514 "EventsDirectoryPage.c" } -static void events_directory_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { +static void +events_directory_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames) +{ EventsDirectoryPage * self; - GeeList* _tmp0_; - GeeList* _tmp1_; #line 80 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage); #line 80 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 81 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = ui_filenames; -#line 81 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "events_directory.ui"); -#line 83 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = ui_filenames; + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "events_directory.ui"); #line 83 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - PAGE_CLASS (events_directory_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp1_); -#line 1361 "EventsDirectoryPage.c" + PAGE_CLASS (events_directory_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), ui_filenames); +#line 1531 "EventsDirectoryPage.c" } -gboolean events_directory_page_event_comparator_predicate (DataObject* object, Alteration* alteration) { +gboolean +events_directory_page_event_comparator_predicate (DataObject* object, + Alteration* alteration) +{ gboolean result = FALSE; - Alteration* _tmp0_; - gboolean _tmp1_; #line 86 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE); #line 86 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 87 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = alteration; -#line 87 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "time"); -#line 87 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp1_; + result = alteration_has_detail (alteration, "metadata", "time"); #line 87 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1381 "EventsDirectoryPage.c" +#line 1548 "EventsDirectoryPage.c" } -static gint64 events_directory_page_event_ascending_comparator (void* a, void* b) { +static gint64 +events_directory_page_event_ascending_comparator (void* a, + void* b) +{ gint64 result = 0LL; time_t start_a = 0; - void* _tmp0_; - Event* _tmp1_; - time_t _tmp2_; + Event* _tmp0_; time_t start_b = 0; - void* _tmp3_; - Event* _tmp4_; - time_t _tmp5_; -#line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = a; -#line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((EventDirectoryItem*) _tmp0_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)->event; + Event* _tmp1_; #line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_EVENT_SOURCE, EventSource)); + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST ((EventDirectoryItem*) a, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)->event; #line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - start_a = _tmp2_; + start_a = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource)); #line 92 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = b; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((EventDirectoryItem*) b, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)->event; #line 92 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST ((EventDirectoryItem*) _tmp3_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)->event; -#line 92 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_EVENT_SOURCE, EventSource)); -#line 92 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - start_b = _tmp5_; + start_b = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_EVENT_SOURCE, EventSource)); #line 94 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = (gint64) (start_a - start_b); #line 94 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1415 "EventsDirectoryPage.c" +#line 1573 "EventsDirectoryPage.c" } -static gint64 events_directory_page_event_descending_comparator (void* a, void* b) { +static gint64 +events_directory_page_event_descending_comparator (void* a, + void* b) +{ gint64 result = 0LL; - void* _tmp0_; - void* _tmp1_; - gint64 _tmp2_; -#line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = b; -#line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = a; #line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = events_directory_page_event_ascending_comparator (_tmp0_, _tmp1_); -#line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp2_; + result = events_directory_page_event_ascending_comparator (b, a); #line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1434 "EventsDirectoryPage.c" +#line 1586 "EventsDirectoryPage.c" } -static gint64 _events_directory_page_event_ascending_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_events_directory_page_event_ascending_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = events_directory_page_event_ascending_comparator (a, b); #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1443 "EventsDirectoryPage.c" +#line 1599 "EventsDirectoryPage.c" } -static gint64 _events_directory_page_event_descending_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_events_directory_page_event_descending_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = events_directory_page_event_descending_comparator (a, b); #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1452 "EventsDirectoryPage.c" +#line 1612 "EventsDirectoryPage.c" } -static Comparator events_directory_page_get_event_comparator (gboolean ascending, void** result_target, GDestroyNotify* result_target_destroy_notify) { +static Comparator +events_directory_page_get_event_comparator (gboolean ascending, + void** result_target, + GDestroyNotify* result_target_destroy_notify) +{ Comparator result = NULL; - gboolean _tmp0_; -#line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = ascending; #line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp0_) { -#line 1463 "EventsDirectoryPage.c" - Comparator _tmp1_; - void* _tmp1__target; - GDestroyNotify _tmp1__target_destroy_notify; + if (ascending) { +#line 1624 "EventsDirectoryPage.c" + Comparator _tmp0_; + void* _tmp0__target; + GDestroyNotify _tmp0__target_destroy_notify; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = _events_directory_page_event_ascending_comparator_comparator; + _tmp0_ = _events_directory_page_event_ascending_comparator_comparator; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1__target = NULL; + _tmp0__target = NULL; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1__target_destroy_notify = NULL; + _tmp0__target_destroy_notify = NULL; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - *result_target = _tmp1__target; + *result_target = _tmp0__target; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - *result_target_destroy_notify = _tmp1__target_destroy_notify; + *result_target_destroy_notify = _tmp0__target_destroy_notify; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp1_; + result = _tmp0_; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1481 "EventsDirectoryPage.c" +#line 1642 "EventsDirectoryPage.c" } else { - Comparator _tmp2_; - void* _tmp2__target; - GDestroyNotify _tmp2__target_destroy_notify; + Comparator _tmp1_; + void* _tmp1__target; + GDestroyNotify _tmp1__target_destroy_notify; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = _events_directory_page_event_descending_comparator_comparator; + _tmp1_ = _events_directory_page_event_descending_comparator_comparator; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2__target = NULL; + _tmp1__target = NULL; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2__target_destroy_notify = NULL; + _tmp1__target_destroy_notify = NULL; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - *result_target = _tmp2__target; + *result_target = _tmp1__target; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - *result_target_destroy_notify = _tmp2__target_destroy_notify; + *result_target_destroy_notify = _tmp1__target_destroy_notify; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp2_; + result = _tmp1_; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1500 "EventsDirectoryPage.c" +#line 1661 "EventsDirectoryPage.c" } } -static GVariant* _variant_new14 (gboolean value) { +static GVariant* +_variant_new14 (gboolean value) +{ #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 1508 "EventsDirectoryPage.c" +#line 1671 "EventsDirectoryPage.c" } -static void events_directory_page_real_add_actions (Page* base, GActionMap* map) { +static void +events_directory_page_real_add_actions (Page* base, + GActionMap* map) +{ EventsDirectoryPage * self; - GActionMap* _tmp0_; - GActionMap* _tmp1_; gboolean display_comments = FALSE; - ConfigFacade* _tmp2_; - ConfigFacade* _tmp3_; - gboolean _tmp4_; - gboolean _tmp5_; - GAction* _tmp6_; - GAction* _tmp7_; - GVariant* _tmp8_; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + gboolean _tmp2_; + GAction* _tmp3_; + GAction* _tmp4_; + GVariant* _tmp5_; #line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage); #line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 118 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = map; -#line 118 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - PAGE_CLASS (events_directory_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); -#line 119 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = map; + PAGE_CLASS (events_directory_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map); #line 119 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_action_map_add_action_entries (_tmp1_, EVENTS_DIRECTORY_PAGE_entries, G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries), self); -#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = config_facade_get_instance (); + g_action_map_add_action_entries (map, EVENTS_DIRECTORY_PAGE_entries, G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries), self); #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_; + _tmp0_ = config_facade_get_instance (); #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = configuration_facade_get_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp1_ = _tmp0_; #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = _tmp4_; + _tmp2_ = configuration_facade_get_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - display_comments = _tmp5_; + display_comments = _tmp2_; #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment"); + _tmp3_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment"); #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = _variant_new14 (display_comments); + _tmp5_ = _variant_new14 (display_comments); #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_action_change_state (_tmp7_, _tmp8_); + g_action_change_state (_tmp4_, _tmp5_); #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_variant_unref0 (_tmp8_); + _g_variant_unref0 (_tmp5_); #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp7_); -#line 1560 "EventsDirectoryPage.c" + _g_object_unref0 (_tmp4_); +#line 1717 "EventsDirectoryPage.c" } -static void events_directory_page_real_remove_actions (Page* base, GActionMap* map) { +static void +events_directory_page_real_remove_actions (Page* base, + GActionMap* map) +{ EventsDirectoryPage * self; - GActionMap* _tmp0_; #line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage); #line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 126 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = map; -#line 126 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - PAGE_CLASS (events_directory_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); -#line 1575 "EventsDirectoryPage.c" + PAGE_CLASS (events_directory_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map); +#line 1732 "EventsDirectoryPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -1583,99 +1740,85 @@ static void events_directory_page_real_remove_actions (Page* base, GActionMap* m entry_collection_length1 = G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries); #line 127 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries); entry_it = entry_it + 1) { -#line 1587 "EventsDirectoryPage.c" +#line 1744 "EventsDirectoryPage.c" GActionEntry entry = {0}; #line 127 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" entry = entry_collection[entry_it]; -#line 1591 "EventsDirectoryPage.c" +#line 1748 "EventsDirectoryPage.c" { - GActionMap* _tmp1_; - GActionEntry _tmp2_; - const gchar* _tmp3_; -#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = map; + GActionEntry _tmp0_; + const gchar* _tmp1_; #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = entry; + _tmp0_ = entry; #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_.name; + _tmp1_ = _tmp0_.name; #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_action_map_remove_action (_tmp1_, _tmp3_); -#line 1604 "EventsDirectoryPage.c" + g_action_map_remove_action (map, _tmp1_); +#line 1758 "EventsDirectoryPage.c" } } } } -static void events_directory_page_real_init_actions (Page* base, gint selected_count, gint count) { +static void +events_directory_page_real_init_actions (Page* base, + gint selected_count, + gint count) +{ EventsDirectoryPage * self; - gint _tmp0_; - gint _tmp1_; GSimpleAction* action = NULL; - GAction* _tmp2_; - GSimpleAction* _tmp3_; + GAction* _tmp0_; + GSimpleAction* _tmp1_; #line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage); #line 133 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = selected_count; -#line 133 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = count; -#line 133 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - PAGE_CLASS (events_directory_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_, _tmp1_); + PAGE_CLASS (events_directory_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), selected_count, count); #line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSortEvents"); + _tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSortEvents"); #line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL; + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL; #line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp3_ == NULL) { + if (_tmp1_ == NULL) { #line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp2_); -#line 1634 "EventsDirectoryPage.c" + _g_object_unref0 (_tmp0_); +#line 1786 "EventsDirectoryPage.c" } #line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - action = _tmp3_; + action = _tmp1_; #line 136 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _vala_assert (action != NULL, "action != null"); #line 137 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_signal_connect_object (action, "change-state", (GCallback) _events_directory_page_on_sort_changed_g_simple_action_change_state, self, 0); #line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (action); -#line 1644 "EventsDirectoryPage.c" +#line 1796 "EventsDirectoryPage.c" } -static void events_directory_page_real_update_actions (Page* base, gint selected_count, gint count) { +static void +events_directory_page_real_update_actions (Page* base, + gint selected_count, + gint count) +{ EventsDirectoryPage * self; - gint _tmp0_; - gint _tmp1_; - gint _tmp2_; - gint _tmp3_; - gint _tmp4_; #line 140 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage); #line 141 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = selected_count; -#line 141 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Merge", _tmp0_ > 1); -#line 142 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = selected_count; + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Merge", selected_count > 1); #line 142 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rename", _tmp1_ == 1); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rename", selected_count == 1); #line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = selected_count; -#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditComment", _tmp2_ == 1); -#line 145 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = selected_count; + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditComment", selected_count == 1); #line 145 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = count; -#line 145 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - PAGE_CLASS (events_directory_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp3_, _tmp4_); -#line 1675 "EventsDirectoryPage.c" + PAGE_CLASS (events_directory_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), selected_count, count); +#line 1816 "EventsDirectoryPage.c" } -static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPage* base) { +static gchar* +events_directory_page_real_get_view_empty_message (CheckerboardPage* base) +{ EventsDirectoryPage * self; gchar* result = NULL; gchar* _tmp0_; @@ -1687,11 +1830,13 @@ static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPag result = _tmp0_; #line 149 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1691 "EventsDirectoryPage.c" +#line 1834 "EventsDirectoryPage.c" } -static gchar* events_directory_page_real_get_filter_no_match_message (CheckerboardPage* base) { +static gchar* +events_directory_page_real_get_filter_no_match_message (CheckerboardPage* base) +{ EventsDirectoryPage * self; gchar* result = NULL; gchar* _tmp0_; @@ -1703,25 +1848,31 @@ static gchar* events_directory_page_real_get_filter_no_match_message (Checkerboa result = _tmp0_; #line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1707 "EventsDirectoryPage.c" +#line 1852 "EventsDirectoryPage.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 158 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self ? g_object_ref (self) : NULL; -#line 1714 "EventsDirectoryPage.c" +#line 1861 "EventsDirectoryPage.c" } -static void events_directory_page_real_on_item_activated (CheckerboardPage* base, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) { +static void +events_directory_page_real_on_item_activated (CheckerboardPage* base, + CheckerboardItem* item, + CheckerboardPageActivator activator, + CheckerboardPageKeyboardModifiers* modifiers) +{ EventsDirectoryPage * self; EventDirectoryItem* event = NULL; - CheckerboardItem* _tmp0_; - EventDirectoryItem* _tmp1_; + EventDirectoryItem* _tmp0_; + LibraryWindow* _tmp1_; LibraryWindow* _tmp2_; - LibraryWindow* _tmp3_; - Event* _tmp4_; + Event* _tmp3_; #line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage); #line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1729,40 +1880,39 @@ static void events_directory_page_real_on_item_activated (CheckerboardPage* base #line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (modifiers != NULL); #line 158 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = item; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (item, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)); #line 158 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)); -#line 158 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - event = _tmp1_; + event = _tmp0_; #line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = library_window_get_app (); + _tmp1_ = library_window_get_app (); #line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = event->event; + _tmp3_ = event->event; #line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - library_window_switch_to_event (_tmp3_, _tmp4_); + library_window_switch_to_event (_tmp2_, _tmp3_); #line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (event); -#line 1750 "EventsDirectoryPage.c" +#line 1899 "EventsDirectoryPage.c" } -static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value) { +static void +events_directory_page_on_sort_changed (EventsDirectoryPage* self, + GSimpleAction* action, + GVariant* value) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - GVariant* _tmp2_; - const gchar* _tmp3_; - void* _tmp4_; - GDestroyNotify _tmp5_; + const gchar* _tmp2_; + void* _tmp3_; + GDestroyNotify _tmp4_; + Comparator _tmp5_; Comparator _tmp6_; - Comparator _tmp7_; - void* _tmp7__target; - GDestroyNotify _tmp7__target_destroy_notify; - GSimpleAction* _tmp8_; - GVariant* _tmp9_; + void* _tmp6__target; + GDestroyNotify _tmp6__target_destroy_notify; #line 162 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self)); #line 162 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1772,68 +1922,63 @@ static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GS #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp1_ = _tmp0_; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = value; + _tmp2_ = g_variant_get_string (value, NULL); #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = g_variant_get_string (_tmp2_, NULL); + _tmp5_ = events_directory_page_get_event_comparator (g_strcmp0 (_tmp2_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0, &_tmp3_, &_tmp4_); #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = events_directory_page_get_event_comparator (g_strcmp0 (_tmp3_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0, &_tmp4_, &_tmp5_); + _tmp6_ = _tmp5_; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = _tmp6_; + _tmp6__target = _tmp3_; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7__target = _tmp4_; + _tmp6__target_destroy_notify = _tmp4_; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7__target_destroy_notify = _tmp5_; + data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), _tmp6_, _tmp3_, _events_directory_page_event_comparator_predicate_comparator_predicate, NULL); #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), _tmp7_, _tmp4_, _events_directory_page_event_comparator_predicate_comparator_predicate, NULL); + (_tmp6__target_destroy_notify == NULL) ? NULL : (_tmp6__target_destroy_notify (_tmp6__target), NULL); #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - (_tmp7__target_destroy_notify == NULL) ? NULL : (_tmp7__target_destroy_notify (_tmp7__target), NULL); + _tmp6_ = NULL; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = NULL; + _tmp6__target = NULL; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7__target = NULL; -#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7__target_destroy_notify = NULL; + _tmp6__target_destroy_notify = NULL; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _data_collection_unref0 (_tmp1_); #line 167 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = action; -#line 167 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = value; -#line 167 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_simple_action_set_state (_tmp8_, _tmp9_); -#line 1805 "EventsDirectoryPage.c" + g_simple_action_set_state (action, value); +#line 1949 "EventsDirectoryPage.c" } -static void events_directory_page_on_rename (EventsDirectoryPage* self) { +static void +events_directory_page_on_rename (EventsDirectoryPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; EventDirectoryItem* item = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; - DataView* _tmp6_; - EventDirectoryItem* _tmp7_; + DataView* _tmp5_; + EventDirectoryItem* _tmp6_; EventRenameDialog* rename_dialog = NULL; - EventDirectoryItem* _tmp8_; - Event* _tmp9_; + EventDirectoryItem* _tmp7_; + Event* _tmp8_; + gchar* _tmp9_; gchar* _tmp10_; - gchar* _tmp11_; + EventRenameDialog* _tmp11_; EventRenameDialog* _tmp12_; - EventRenameDialog* _tmp13_; gchar* new_name = NULL; - EventRenameDialog* _tmp14_; - gchar* _tmp15_; - const gchar* _tmp16_; + EventRenameDialog* _tmp13_; + gchar* _tmp14_; + const gchar* _tmp15_; RenameEventCommand* command = NULL; - EventDirectoryItem* _tmp17_; - Event* _tmp18_; - const gchar* _tmp19_; - RenameEventCommand* _tmp20_; + EventDirectoryItem* _tmp16_; + Event* _tmp17_; + const gchar* _tmp18_; + RenameEventCommand* _tmp19_; + CommandManager* _tmp20_; CommandManager* _tmp21_; - CommandManager* _tmp22_; - RenameEventCommand* _tmp23_; + RenameEventCommand* _tmp22_; #line 170 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self)); #line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1841,55 +1986,53 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) { #line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp1_ = _tmp0_; #line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_ != 1; + _tmp2_ = view_collection_get_selected_count (_tmp1_) != 1; #line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _data_collection_unref0 (_tmp1_); #line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return; -#line 1854 "EventsDirectoryPage.c" +#line 1997 "EventsDirectoryPage.c" } #line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = view_collection_get_selected_at (_tmp5_, 0); + _tmp5_ = view_collection_get_selected_at (_tmp4_, 0); #line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); #line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - item = _tmp7_; + item = _tmp6_; #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = item; + _tmp7_ = item; #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = _tmp8_->event; + _tmp8_ = _tmp7_->event; #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp10_ = event_get_raw_name (_tmp9_); + _tmp9_ = event_get_raw_name (_tmp8_); #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp12_ = event_rename_dialog_new (_tmp11_); + _tmp11_ = event_rename_dialog_new (_tmp10_); #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp10_); #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - rename_dialog = _tmp13_; + rename_dialog = _tmp12_; #line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp14_ = rename_dialog; + _tmp13_ = rename_dialog; #line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp15_ = event_rename_dialog_execute (_tmp14_); + _tmp14_ = event_rename_dialog_execute (_tmp13_); #line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - new_name = _tmp15_; + new_name = _tmp14_; #line 179 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp16_ = new_name; + _tmp15_ = new_name; #line 179 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp16_ == NULL) { + if (_tmp15_ == NULL) { #line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_free0 (new_name); #line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1898,28 +2041,28 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) { _g_object_unref0 (item); #line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return; -#line 1902 "EventsDirectoryPage.c" +#line 2045 "EventsDirectoryPage.c" } #line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp17_ = item; + _tmp16_ = item; #line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp18_ = _tmp17_->event; + _tmp17_ = _tmp16_->event; #line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp19_ = new_name; + _tmp18_ = new_name; #line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp20_ = rename_event_command_new (_tmp18_, _tmp19_); + _tmp19_ = rename_event_command_new (_tmp17_, _tmp18_); #line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - command = _tmp20_; + command = _tmp19_; #line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp23_ = command; + _tmp22_ = command; #line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command)); #line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _command_manager_unref0 (_tmp22_); + _command_manager_unref0 (_tmp21_); #line 170 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (command); #line 170 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1928,39 +2071,40 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) { _text_entry_dialog_mediator_unref0 (rename_dialog); #line 170 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (item); -#line 1932 "EventsDirectoryPage.c" +#line 2075 "EventsDirectoryPage.c" } -void events_directory_page_on_edit_comment (EventsDirectoryPage* self) { +void +events_directory_page_on_edit_comment (EventsDirectoryPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; EventDirectoryItem* item = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; - DataView* _tmp6_; - EventDirectoryItem* _tmp7_; + DataView* _tmp5_; + EventDirectoryItem* _tmp6_; EditCommentDialog* edit_comment_dialog = NULL; - EventDirectoryItem* _tmp8_; - Event* _tmp9_; + EventDirectoryItem* _tmp7_; + Event* _tmp8_; + gchar* _tmp9_; gchar* _tmp10_; - gchar* _tmp11_; + EditCommentDialog* _tmp11_; EditCommentDialog* _tmp12_; - EditCommentDialog* _tmp13_; gchar* new_comment = NULL; - EditCommentDialog* _tmp14_; - gchar* _tmp15_; - const gchar* _tmp16_; + EditCommentDialog* _tmp13_; + gchar* _tmp14_; + const gchar* _tmp15_; EditEventCommentCommand* command = NULL; - EventDirectoryItem* _tmp17_; - Event* _tmp18_; - const gchar* _tmp19_; - EditEventCommentCommand* _tmp20_; + EventDirectoryItem* _tmp16_; + Event* _tmp17_; + const gchar* _tmp18_; + EditEventCommentCommand* _tmp19_; + CommandManager* _tmp20_; CommandManager* _tmp21_; - CommandManager* _tmp22_; - EditEventCommentCommand* _tmp23_; + EditEventCommentCommand* _tmp22_; #line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self)); #line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1968,55 +2112,53 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) { #line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp1_ = _tmp0_; #line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_ != 1; + _tmp2_ = view_collection_get_selected_count (_tmp1_) != 1; #line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _data_collection_unref0 (_tmp1_); #line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return; -#line 1981 "EventsDirectoryPage.c" +#line 2123 "EventsDirectoryPage.c" } #line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = view_collection_get_selected_at (_tmp5_, 0); + _tmp5_ = view_collection_get_selected_at (_tmp4_, 0); #line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); #line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - item = _tmp7_; + item = _tmp6_; #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = item; + _tmp7_ = item; #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = _tmp8_->event; + _tmp8_ = _tmp7_->event; #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp10_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_EVENT_SOURCE, EventSource)); + _tmp9_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_EVENT_SOURCE, EventSource)); #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp12_ = edit_comment_dialog_new (_tmp11_, FALSE); + _tmp11_ = edit_comment_dialog_new (_tmp10_, FALSE); #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp10_); #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - edit_comment_dialog = _tmp13_; + edit_comment_dialog = _tmp12_; #line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp14_ = edit_comment_dialog; + _tmp13_ = edit_comment_dialog; #line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp15_ = edit_comment_dialog_execute (_tmp14_); + _tmp14_ = edit_comment_dialog_execute (_tmp13_); #line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - new_comment = _tmp15_; + new_comment = _tmp14_; #line 195 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp16_ = new_comment; + _tmp15_ = new_comment; #line 195 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp16_ == NULL) { + if (_tmp15_ == NULL) { #line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_free0 (new_comment); #line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2025,28 +2167,28 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) { _g_object_unref0 (item); #line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return; -#line 2029 "EventsDirectoryPage.c" +#line 2171 "EventsDirectoryPage.c" } #line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp17_ = item; + _tmp16_ = item; #line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp18_ = _tmp17_->event; + _tmp17_ = _tmp16_->event; #line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp19_ = new_comment; + _tmp18_ = new_comment; #line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp20_ = edit_event_comment_command_new (_tmp18_, _tmp19_); + _tmp19_ = edit_event_comment_command_new (_tmp17_, _tmp18_); #line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - command = _tmp20_; + command = _tmp19_; #line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp23_ = command; + _tmp22_ = command; #line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command)); #line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _command_manager_unref0 (_tmp22_); + _command_manager_unref0 (_tmp21_); #line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (command); #line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2055,25 +2197,26 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) { _multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog); #line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (item); -#line 2059 "EventsDirectoryPage.c" +#line 2201 "EventsDirectoryPage.c" } -static void events_directory_page_on_merge (EventsDirectoryPage* self) { +static void +events_directory_page_on_merge (EventsDirectoryPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; MergeEventsCommand* command = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + GeeList* _tmp5_; GeeList* _tmp6_; - GeeList* _tmp7_; + MergeEventsCommand* _tmp7_; MergeEventsCommand* _tmp8_; - MergeEventsCommand* _tmp9_; + CommandManager* _tmp9_; CommandManager* _tmp10_; - CommandManager* _tmp11_; - MergeEventsCommand* _tmp12_; + MergeEventsCommand* _tmp11_; #line 202 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self)); #line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2081,97 +2224,91 @@ static void events_directory_page_on_merge (EventsDirectoryPage* self) { #line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp1_ = _tmp0_; #line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_ <= 1; + _tmp2_ = view_collection_get_selected_count (_tmp1_) <= 1; #line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _data_collection_unref0 (_tmp1_); #line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return; -#line 2094 "EventsDirectoryPage.c" +#line 2235 "EventsDirectoryPage.c" } #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = view_collection_get_selected (_tmp5_); + _tmp5_ = view_collection_get_selected (_tmp4_); #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = merge_events_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = merge_events_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - command = _tmp9_; + command = _tmp8_; #line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp12_ = command; + _tmp11_ = command; #line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); #line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _command_manager_unref0 (_tmp11_); + _command_manager_unref0 (_tmp10_); #line 202 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (command); -#line 2126 "EventsDirectoryPage.c" +#line 2267 "EventsDirectoryPage.c" } -static void events_directory_page_on_display_comments (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value) { +static void +events_directory_page_on_display_comments (EventsDirectoryPage* self, + GSimpleAction* action, + GVariant* value) +{ gboolean display = FALSE; - GVariant* _tmp0_; - gboolean _tmp1_; - ConfigFacade* _tmp2_; - ConfigFacade* _tmp3_; - GSimpleAction* _tmp4_; - GVariant* _tmp5_; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; #line 210 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self)); #line 210 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); #line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = value; -#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - display = _tmp1_; + display = g_variant_get_boolean (value); #line 213 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" checkerboard_page_set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display); #line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = config_facade_get_instance (); + _tmp0_ = config_facade_get_instance (); #line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - configuration_facade_set_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); + configuration_facade_set_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); #line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp3_); -#line 217 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = action; + _g_object_unref0 (_tmp1_); #line 217 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = value; -#line 217 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_simple_action_set_state (_tmp4_, _tmp5_); -#line 2164 "EventsDirectoryPage.c" + g_simple_action_set_state (action, value); +#line 2297 "EventsDirectoryPage.c" } -static gpointer _view_filter_ref0 (gpointer self) { +static gpointer +_view_filter_ref0 (gpointer self) +{ #line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self ? view_filter_ref (self) : NULL; -#line 2171 "EventsDirectoryPage.c" +#line 2306 "EventsDirectoryPage.c" } -static SearchViewFilter* events_directory_page_real_get_search_view_filter (CheckerboardPage* base) { +static SearchViewFilter* +events_directory_page_real_get_search_view_filter (CheckerboardPage* base) +{ EventsDirectoryPage * self; SearchViewFilter* result = NULL; EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_; @@ -2186,62 +2323,72 @@ static SearchViewFilter* events_directory_page_real_get_search_view_filter (Chec result = _tmp1_; #line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2190 "EventsDirectoryPage.c" +#line 2327 "EventsDirectoryPage.c" } -static DataView* events_directory_page_event_directory_manager_real_create_view (ViewManager* base, DataSource* source) { +static DataView* +events_directory_page_event_directory_manager_real_create_view (ViewManager* base, + DataSource* source) +{ EventsDirectoryPageEventDirectoryManager * self; DataView* result = NULL; - DataSource* _tmp0_; - EventDirectoryItem* _tmp1_; + EventDirectoryItem* _tmp0_; #line 9 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER, EventsDirectoryPageEventDirectoryManager); #line 9 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 10 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = source; + _tmp0_ = event_directory_item_new (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_EVENT, Event)); #line 10 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = event_directory_item_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event)); -#line 10 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView); #line 10 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2211 "EventsDirectoryPage.c" +#line 2348 "EventsDirectoryPage.c" } -EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_manager_construct (GType object_type) { +EventsDirectoryPageEventDirectoryManager* +events_directory_page_event_directory_manager_construct (GType object_type) +{ EventsDirectoryPageEventDirectoryManager* self = NULL; #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = (EventsDirectoryPageEventDirectoryManager*) view_manager_construct (object_type); #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self; -#line 2221 "EventsDirectoryPage.c" +#line 2360 "EventsDirectoryPage.c" } -EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_manager_new (void) { +EventsDirectoryPageEventDirectoryManager* +events_directory_page_event_directory_manager_new (void) +{ #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return events_directory_page_event_directory_manager_construct (EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER); -#line 2228 "EventsDirectoryPage.c" +#line 2369 "EventsDirectoryPage.c" } -static void events_directory_page_event_directory_manager_class_init (EventsDirectoryPageEventDirectoryManagerClass * klass) { +static void +events_directory_page_event_directory_manager_class_init (EventsDirectoryPageEventDirectoryManagerClass * klass) +{ #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_event_directory_manager_parent_class = g_type_class_peek_parent (klass); #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" ((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) events_directory_page_event_directory_manager_real_create_view; -#line 2237 "EventsDirectoryPage.c" +#line 2380 "EventsDirectoryPage.c" } -static void events_directory_page_event_directory_manager_instance_init (EventsDirectoryPageEventDirectoryManager * self) { +static void +events_directory_page_event_directory_manager_instance_init (EventsDirectoryPageEventDirectoryManager * self) +{ } -GType events_directory_page_event_directory_manager_get_type (void) { +GType +events_directory_page_event_directory_manager_get_type (void) +{ static volatile gsize events_directory_page_event_directory_manager_type_id__volatile = 0; if (g_once_init_enter (&events_directory_page_event_directory_manager_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsDirectoryPageEventDirectoryManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_directory_page_event_directory_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsDirectoryPageEventDirectoryManager), 0, (GInstanceInitFunc) events_directory_page_event_directory_manager_instance_init, NULL }; @@ -2253,7 +2400,9 @@ GType events_directory_page_event_directory_manager_get_type (void) { } -static guint events_directory_page_events_directory_search_view_filter_real_get_criteria (SearchViewFilter* base) { +static guint +events_directory_page_events_directory_search_view_filter_real_get_criteria (SearchViewFilter* base) +{ EventsDirectoryPageEventsDirectorySearchViewFilter * self; guint result = 0U; #line 15 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2262,138 +2411,126 @@ static guint events_directory_page_events_directory_search_view_filter_real_get_ result = (guint) SEARCH_FILTER_CRITERIA_TEXT; #line 16 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2266 "EventsDirectoryPage.c" +#line 2415 "EventsDirectoryPage.c" } -static gboolean string_contains (const gchar* self, const gchar* needle) { +static gboolean +string_contains (const gchar* self, + const gchar* needle) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = needle; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_ != NULL; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = strstr ((gchar*) self, (gchar*) needle); +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_ != NULL; +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2286 "EventsDirectoryPage.c" +#line 2435 "EventsDirectoryPage.c" } -static gboolean events_directory_page_events_directory_search_view_filter_real_predicate (ViewFilter* base, DataView* view) { +static gboolean +events_directory_page_events_directory_search_view_filter_real_predicate (ViewFilter* base, + DataView* view) +{ EventsDirectoryPageEventsDirectorySearchViewFilter * self; gboolean result = FALSE; - DataView* _tmp0_; + DataSource* _tmp0_; DataSource* _tmp1_; - DataSource* _tmp2_; - const gchar* _tmp3_; - gboolean _tmp4_; + const gchar* _tmp2_; Event* source = NULL; - DataView* _tmp5_; - DataSource* _tmp6_; + DataSource* _tmp3_; const gchar* event_keywords = NULL; - Event* _tmp7_; - const gchar* _tmp8_; - const gchar* _tmp9_; - gboolean _tmp10_; - gint _tmp11_; - gchar** _tmp12_; + Event* _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; + gint _tmp7_; + gchar** _tmp8_; #line 19 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_DIRECTORY_PAGE_TYPE_EVENTS_DIRECTORY_SEARCH_VIEW_FILTER, EventsDirectoryPageEventsDirectorySearchViewFilter); #line 19 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_DATA_VIEW (view), FALSE); #line 20 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = view; + _tmp0_ = data_view_get_source (view); #line 20 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = data_view_get_source (_tmp0_); -#line 20 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 20 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_EVENT), "view.get_source() is Event"); + _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENT), "view.get_source() is Event"); #line 20 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp2_); -#line 21 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = search_view_filter_get_search_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); + _g_object_unref0 (_tmp1_); #line 21 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = is_string_empty (_tmp3_); + _tmp2_ = search_view_filter_get_search_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 21 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp4_) { + if (is_string_empty (_tmp2_)) { #line 22 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = TRUE; #line 22 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2332 "EventsDirectoryPage.c" +#line 2476 "EventsDirectoryPage.c" } #line 24 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = view; + _tmp3_ = data_view_get_source (view); #line 24 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = data_view_get_source (_tmp5_); -#line 24 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - source = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT, Event); + source = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_EVENT, Event); #line 25 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = source; + _tmp4_ = source; #line 25 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_INDEXABLE, Indexable)); + _tmp5_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_INDEXABLE, Indexable)); #line 25 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - event_keywords = _tmp8_; -#line 26 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = event_keywords; + event_keywords = _tmp5_; #line 26 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp10_ = is_string_empty (_tmp9_); + _tmp6_ = event_keywords; #line 26 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp10_) { + if (is_string_empty (_tmp6_)) { #line 27 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = FALSE; #line 27 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (source); #line 27 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2358 "EventsDirectoryPage.c" +#line 2498 "EventsDirectoryPage.c" } #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp12_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp11_); -#line 2362 "EventsDirectoryPage.c" + _tmp8_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp7_); +#line 2502 "EventsDirectoryPage.c" { gchar** word_collection = NULL; gint word_collection_length1 = 0; gint _word_collection_size_ = 0; gint word_it = 0; #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - word_collection = _tmp12_; + word_collection = _tmp8_; #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - word_collection_length1 = _tmp11_; + word_collection_length1 = _tmp7_; #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - for (word_it = 0; word_it < _tmp11_; word_it = word_it + 1) { -#line 2374 "EventsDirectoryPage.c" + for (word_it = 0; word_it < _tmp7_; word_it = word_it + 1) { +#line 2514 "EventsDirectoryPage.c" const gchar* word = NULL; #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" word = word_collection[word_it]; -#line 2378 "EventsDirectoryPage.c" +#line 2518 "EventsDirectoryPage.c" { - const gchar* _tmp13_; - const gchar* _tmp14_; - gboolean _tmp15_; + const gchar* _tmp9_; + const gchar* _tmp10_; #line 31 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp13_ = event_keywords; + _tmp9_ = event_keywords; #line 31 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp14_ = word; + _tmp10_ = word; #line 31 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp15_ = string_contains (_tmp13_, _tmp14_); -#line 31 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (!_tmp15_) { + if (!string_contains (_tmp9_, _tmp10_)) { #line 32 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = FALSE; #line 32 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (source); #line 32 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2397 "EventsDirectoryPage.c" +#line 2534 "EventsDirectoryPage.c" } } } @@ -2404,43 +2541,53 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p _g_object_unref0 (source); #line 35 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2408 "EventsDirectoryPage.c" +#line 2545 "EventsDirectoryPage.c" } -static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_construct (GType object_type) { +static EventsDirectoryPageEventsDirectorySearchViewFilter* +events_directory_page_events_directory_search_view_filter_construct (GType object_type) +{ EventsDirectoryPageEventsDirectorySearchViewFilter* self = NULL; #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = (EventsDirectoryPageEventsDirectorySearchViewFilter*) search_view_filter_construct (object_type); #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self; -#line 2418 "EventsDirectoryPage.c" +#line 2557 "EventsDirectoryPage.c" } -static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_new (void) { +static EventsDirectoryPageEventsDirectorySearchViewFilter* +events_directory_page_events_directory_search_view_filter_new (void) +{ #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return events_directory_page_events_directory_search_view_filter_construct (EVENTS_DIRECTORY_PAGE_TYPE_EVENTS_DIRECTORY_SEARCH_VIEW_FILTER); -#line 2425 "EventsDirectoryPage.c" +#line 2566 "EventsDirectoryPage.c" } -static void events_directory_page_events_directory_search_view_filter_class_init (EventsDirectoryPageEventsDirectorySearchViewFilterClass * klass) { +static void +events_directory_page_events_directory_search_view_filter_class_init (EventsDirectoryPageEventsDirectorySearchViewFilterClass * klass) +{ #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_events_directory_search_view_filter_parent_class = g_type_class_peek_parent (klass); #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" ((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) events_directory_page_events_directory_search_view_filter_real_get_criteria; #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" ((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) events_directory_page_events_directory_search_view_filter_real_predicate; -#line 2436 "EventsDirectoryPage.c" +#line 2579 "EventsDirectoryPage.c" } -static void events_directory_page_events_directory_search_view_filter_instance_init (EventsDirectoryPageEventsDirectorySearchViewFilter * self) { +static void +events_directory_page_events_directory_search_view_filter_instance_init (EventsDirectoryPageEventsDirectorySearchViewFilter * self) +{ } -static GType events_directory_page_events_directory_search_view_filter_get_type (void) { +static GType +events_directory_page_events_directory_search_view_filter_get_type (void) +{ static volatile gsize events_directory_page_events_directory_search_view_filter_type_id__volatile = 0; if (g_once_init_enter (&events_directory_page_events_directory_search_view_filter_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsDirectoryPageEventsDirectorySearchViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_directory_page_events_directory_search_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsDirectoryPageEventsDirectorySearchViewFilter), 0, (GInstanceInitFunc) events_directory_page_events_directory_search_view_filter_instance_init, NULL }; @@ -2452,7 +2599,9 @@ static GType events_directory_page_events_directory_search_view_filter_get_type } -static void events_directory_page_class_init (EventsDirectoryPageClass * klass) { +static void +events_directory_page_class_init (EventsDirectoryPageClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2477,11 +2626,13 @@ static void events_directory_page_class_init (EventsDirectoryPageClass * klass) ((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) events_directory_page_real_get_search_view_filter; #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" G_OBJECT_CLASS (klass)->finalize = events_directory_page_finalize; -#line 2481 "EventsDirectoryPage.c" +#line 2630 "EventsDirectoryPage.c" } -static void events_directory_page_instance_init (EventsDirectoryPage * self) { +static void +events_directory_page_instance_init (EventsDirectoryPage * self) +{ EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self->priv = EVENTS_DIRECTORY_PAGE_GET_PRIVATE (self); @@ -2489,11 +2640,13 @@ static void events_directory_page_instance_init (EventsDirectoryPage * self) { _tmp0_ = events_directory_page_events_directory_search_view_filter_new (); #line 43 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self->priv->search_filter = _tmp0_; -#line 2493 "EventsDirectoryPage.c" +#line 2644 "EventsDirectoryPage.c" } -static void events_directory_page_finalize (GObject * obj) { +static void +events_directory_page_finalize (GObject * obj) +{ EventsDirectoryPage * self; GSimpleAction* action = NULL; GAction* _tmp0_; @@ -2511,7 +2664,7 @@ static void events_directory_page_finalize (GObject * obj) { if (_tmp1_ == NULL) { #line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (_tmp0_); -#line 2515 "EventsDirectoryPage.c" +#line 2668 "EventsDirectoryPage.c" } #line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" action = _tmp1_; @@ -2533,11 +2686,13 @@ static void events_directory_page_finalize (GObject * obj) { _view_filter_unref0 (self->priv->search_filter); #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" G_OBJECT_CLASS (events_directory_page_parent_class)->finalize (obj); -#line 2537 "EventsDirectoryPage.c" +#line 2690 "EventsDirectoryPage.c" } -GType events_directory_page_get_type (void) { +GType +events_directory_page_get_type (void) +{ static volatile gsize events_directory_page_type_id__volatile = 0; if (g_once_init_enter (&events_directory_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsDirectoryPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_directory_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsDirectoryPage), 0, (GInstanceInitFunc) events_directory_page_instance_init, NULL }; @@ -2549,7 +2704,9 @@ GType events_directory_page_get_type (void) { } -MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_type) { +MasterEventsDirectoryPage* +master_events_directory_page_construct (GType object_type) +{ MasterEventsDirectoryPage * self = NULL; EventsDirectoryPageEventDirectoryManager* _tmp0_; EventsDirectoryPageEventDirectoryManager* _tmp1_; @@ -2574,29 +2731,37 @@ MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_ _view_manager_unref0 (_tmp1_); #line 228 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self; -#line 2578 "EventsDirectoryPage.c" +#line 2735 "EventsDirectoryPage.c" } -MasterEventsDirectoryPage* master_events_directory_page_new (void) { +MasterEventsDirectoryPage* +master_events_directory_page_new (void) +{ #line 228 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return master_events_directory_page_construct (TYPE_MASTER_EVENTS_DIRECTORY_PAGE); -#line 2585 "EventsDirectoryPage.c" +#line 2744 "EventsDirectoryPage.c" } -static void master_events_directory_page_class_init (MasterEventsDirectoryPageClass * klass) { +static void +master_events_directory_page_class_init (MasterEventsDirectoryPageClass * klass) +{ #line 225 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" master_events_directory_page_parent_class = g_type_class_peek_parent (klass); -#line 2592 "EventsDirectoryPage.c" +#line 2753 "EventsDirectoryPage.c" } -static void master_events_directory_page_instance_init (MasterEventsDirectoryPage * self) { +static void +master_events_directory_page_instance_init (MasterEventsDirectoryPage * self) +{ } -GType master_events_directory_page_get_type (void) { +GType +master_events_directory_page_get_type (void) +{ static volatile gsize master_events_directory_page_type_id__volatile = 0; if (g_once_init_enter (&master_events_directory_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MasterEventsDirectoryPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) master_events_directory_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MasterEventsDirectoryPage), 0, (GInstanceInitFunc) master_events_directory_page_instance_init, NULL }; @@ -2608,7 +2773,9 @@ GType master_events_directory_page_get_type (void) { } -GType sub_events_directory_page_directory_type_get_type (void) { +GType +sub_events_directory_page_directory_type_get_type (void) +{ static volatile gsize sub_events_directory_page_directory_type_type_id__volatile = 0; if (g_once_init_enter (&sub_events_directory_page_directory_type_type_id__volatile)) { static const GEnumValue values[] = {{SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR, "SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR", "year"}, {SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH, "SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH", "month"}, {SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED, "SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED", "undated"}, {0, NULL, NULL}}; @@ -2620,7 +2787,10 @@ GType sub_events_directory_page_directory_type_get_type (void) { } -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_; @@ -2628,314 +2798,301 @@ 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 2666 "EventsDirectoryPage.c" +#line 2833 "EventsDirectoryPage.c" } -SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time) { +SubEventsDirectoryPage* +sub_events_directory_page_construct (GType object_type, + SubEventsDirectoryPageDirectoryType type, + struct tm* time) +{ SubEventsDirectoryPage * self = NULL; gchar* page_name = NULL; - SubEventsDirectoryPageDirectoryType _tmp0_; - const gchar* _tmp5_; - SubEventsDirectoryPageDirectoryType _tmp6_; - struct tm _tmp7_; - SubEventsDirectoryPageSubEventDirectoryManager* _tmp8_; - SubEventsDirectoryPageSubEventDirectoryManager* _tmp9_; + const gchar* _tmp3_; + struct tm _tmp4_; + SubEventsDirectoryPageSubEventDirectoryManager* _tmp5_; + SubEventsDirectoryPageSubEventDirectoryManager* _tmp6_; #line 286 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (time != NULL, NULL); #line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = type; -#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED) { -#line 2685 "EventsDirectoryPage.c" - gchar* _tmp1_; + if (type == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED) { +#line 2852 "EventsDirectoryPage.c" + gchar* _tmp0_; #line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = g_strdup (SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME); + _tmp0_ = g_strdup (SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME); #line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_free0 (page_name); #line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - page_name = _tmp1_; -#line 2693 "EventsDirectoryPage.c" + page_name = _tmp0_; +#line 2860 "EventsDirectoryPage.c" } else { - const gchar* _tmp2_ = NULL; - SubEventsDirectoryPageDirectoryType _tmp3_; - gchar* _tmp4_; -#line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = type; + const gchar* _tmp1_ = NULL; + gchar* _tmp2_; #line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp3_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR) { + if (type == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR) { #line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT; -#line 2704 "EventsDirectoryPage.c" + _tmp1_ = SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT; +#line 2868 "EventsDirectoryPage.c" } else { #line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT; -#line 2708 "EventsDirectoryPage.c" + _tmp1_ = SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT; +#line 2872 "EventsDirectoryPage.c" } #line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = g_time_format (time, _tmp2_); + _tmp2_ = g_time_format (time, _tmp1_); #line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_free0 (page_name); #line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - page_name = _tmp4_; -#line 2716 "EventsDirectoryPage.c" + page_name = _tmp2_; +#line 2880 "EventsDirectoryPage.c" } #line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = page_name; + _tmp3_ = page_name; #line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = type; -#line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = *time; + _tmp4_ = *time; #line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = sub_events_directory_page_sub_event_directory_manager_new (_tmp6_, &_tmp7_); + _tmp5_ = sub_events_directory_page_sub_event_directory_manager_new (type, &_tmp4_); #line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - self = (SubEventsDirectoryPage*) events_directory_page_construct (object_type, _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_MANAGER, ViewManager), NULL); + self = (SubEventsDirectoryPage*) events_directory_page_construct (object_type, _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_VIEW_MANAGER, ViewManager), NULL); #line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _view_manager_unref0 (_tmp9_); + _view_manager_unref0 (_tmp6_); #line 286 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_free0 (page_name); #line 286 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self; -#line 2736 "EventsDirectoryPage.c" +#line 2898 "EventsDirectoryPage.c" } -SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) { +SubEventsDirectoryPage* +sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, + struct tm* time) +{ #line 286 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return sub_events_directory_page_construct (TYPE_SUB_EVENTS_DIRECTORY_PAGE, type, time); -#line 2743 "EventsDirectoryPage.c" +#line 2908 "EventsDirectoryPage.c" } -gint sub_events_directory_page_get_month (SubEventsDirectoryPage* self) { +gint +sub_events_directory_page_get_month (SubEventsDirectoryPage* self) +{ gint result = 0; ViewManager* _tmp0_; - gint _tmp1_; #line 297 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0); #line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager; #line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = sub_events_directory_page_sub_event_directory_manager_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager)); -#line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp1_; + result = sub_events_directory_page_sub_event_directory_manager_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager)); #line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2761 "EventsDirectoryPage.c" +#line 2925 "EventsDirectoryPage.c" } -gint sub_events_directory_page_get_year (SubEventsDirectoryPage* self) { +gint +sub_events_directory_page_get_year (SubEventsDirectoryPage* self) +{ gint result = 0; ViewManager* _tmp0_; - gint _tmp1_; #line 301 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0); #line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager; #line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = sub_events_directory_page_sub_event_directory_manager_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager)); -#line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp1_; + result = sub_events_directory_page_sub_event_directory_manager_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager)); #line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2779 "EventsDirectoryPage.c" +#line 2942 "EventsDirectoryPage.c" } -SubEventsDirectoryPageDirectoryType sub_events_directory_page_get_event_directory_type (SubEventsDirectoryPage* self) { +SubEventsDirectoryPageDirectoryType +sub_events_directory_page_get_event_directory_type (SubEventsDirectoryPage* self) +{ SubEventsDirectoryPageDirectoryType result = 0; ViewManager* _tmp0_; - SubEventsDirectoryPageDirectoryType _tmp1_; #line 305 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0); #line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager; #line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager)); -#line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp1_; + result = sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager)); #line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2797 "EventsDirectoryPage.c" +#line 2959 "EventsDirectoryPage.c" } -static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time) { +static SubEventsDirectoryPageSubEventDirectoryManager* +sub_events_directory_page_sub_event_directory_manager_construct (GType object_type, + SubEventsDirectoryPageDirectoryType type, + struct tm* time) +{ SubEventsDirectoryPageSubEventDirectoryManager* self = NULL; - SubEventsDirectoryPageDirectoryType _tmp0_; - SubEventsDirectoryPageDirectoryType _tmp3_; - struct tm _tmp4_; - gint _tmp5_; + struct tm _tmp2_; + gint _tmp3_; #line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (time != NULL, NULL); #line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = (SubEventsDirectoryPageSubEventDirectoryManager*) events_directory_page_event_directory_manager_construct (object_type); #line 252 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = type; -#line 252 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) { -#line 2815 "EventsDirectoryPage.c" - struct tm _tmp1_; - gint _tmp2_; + if (type == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) { +#line 2977 "EventsDirectoryPage.c" + struct tm _tmp0_; + gint _tmp1_; #line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = *time; + _tmp0_ = *time; #line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = _tmp1_.tm_mon; + _tmp1_ = _tmp0_.tm_mon; #line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - self->priv->month = _tmp2_; -#line 2824 "EventsDirectoryPage.c" + self->priv->month = _tmp1_; +#line 2986 "EventsDirectoryPage.c" } #line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = type; -#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - self->priv->type = _tmp3_; + self->priv->type = type; #line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = *time; + _tmp2_ = *time; #line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = _tmp4_.tm_year; + _tmp3_ = _tmp2_.tm_year; #line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - self->priv->year = _tmp5_; + self->priv->year = _tmp3_; #line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self; -#line 2838 "EventsDirectoryPage.c" +#line 2998 "EventsDirectoryPage.c" } -static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) { +static SubEventsDirectoryPageSubEventDirectoryManager* +sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, + struct tm* time) +{ #line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return sub_events_directory_page_sub_event_directory_manager_construct (SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, type, time); -#line 2845 "EventsDirectoryPage.c" +#line 3008 "EventsDirectoryPage.c" } -static void g_time_local (time_t time, struct tm* result) { +static void +g_time_local (time_t time, + struct tm* result) +{ struct tm _result_ = {0}; struct tm _tmp0_ = {0}; -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" localtime_r (&time, &_tmp0_); -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" *result = _result_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return; -#line 2860 "EventsDirectoryPage.c" +#line 3026 "EventsDirectoryPage.c" } -static gboolean sub_events_directory_page_sub_event_directory_manager_real_include_in_view (ViewManager* base, DataSource* source) { +static gboolean +sub_events_directory_page_sub_event_directory_manager_real_include_in_view (ViewManager* base, + DataSource* source) +{ SubEventsDirectoryPageSubEventDirectoryManager * self; gboolean result = FALSE; - DataSource* _tmp0_; - gboolean _tmp1_; EventSource* event = NULL; - DataSource* _tmp2_; - EventSource* _tmp3_; + EventSource* _tmp0_; struct tm event_time = {0}; - EventSource* _tmp4_; - time_t _tmp5_; - struct tm _tmp6_ = {0}; - struct tm _tmp7_; - gint _tmp8_; - gint _tmp9_; + EventSource* _tmp1_; + struct tm _tmp2_ = {0}; + struct tm _tmp3_; + gint _tmp4_; + gint _tmp5_; #line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager); #line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = source; -#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER, EventsDirectoryPageEventDirectoryManager), TYPE_VIEW_MANAGER, ViewManager), _tmp0_); -#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (!_tmp1_) { + if (!VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER, EventsDirectoryPageEventDirectoryManager), TYPE_VIEW_MANAGER, ViewManager), source)) { #line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = FALSE; #line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2893 "EventsDirectoryPage.c" +#line 3054 "EventsDirectoryPage.c" } #line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = source; -#line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EVENT_SOURCE, EventSource)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_EVENT_SOURCE, EventSource)); #line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - event = _tmp3_; -#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = event; + event = _tmp0_; #line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = event_source_get_start_time (_tmp4_); + _tmp1_ = event; #line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_time_local (_tmp5_, &_tmp6_); + g_time_local (event_source_get_start_time (_tmp1_), &_tmp2_); #line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - event_time = _tmp6_; + event_time = _tmp2_; #line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = event_time; + _tmp3_ = event_time; #line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = _tmp7_.tm_year; + _tmp4_ = _tmp3_.tm_year; #line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = self->priv->year; + _tmp5_ = self->priv->year; #line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp8_ == _tmp9_) { -#line 2917 "EventsDirectoryPage.c" - SubEventsDirectoryPageDirectoryType _tmp10_; + if (_tmp4_ == _tmp5_) { +#line 3074 "EventsDirectoryPage.c" + SubEventsDirectoryPageDirectoryType _tmp6_; #line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp10_ = self->priv->type; + _tmp6_ = self->priv->type; #line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp10_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) { -#line 2923 "EventsDirectoryPage.c" - struct tm _tmp11_; - gint _tmp12_; - gint _tmp13_; + if (_tmp6_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) { +#line 3080 "EventsDirectoryPage.c" + struct tm _tmp7_; + gint _tmp8_; + gint _tmp9_; #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp11_ = event_time; + _tmp7_ = event_time; #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp12_ = _tmp11_.tm_mon; + _tmp8_ = _tmp7_.tm_mon; #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp13_ = self->priv->month; + _tmp9_ = self->priv->month; #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp12_ == _tmp13_; + result = _tmp8_ == _tmp9_; #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (event); #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2939 "EventsDirectoryPage.c" +#line 3096 "EventsDirectoryPage.c" } #line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = TRUE; @@ -2943,7 +3100,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu _g_object_unref0 (event); #line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2947 "EventsDirectoryPage.c" +#line 3104 "EventsDirectoryPage.c" } #line 270 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = FALSE; @@ -2951,11 +3108,13 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu _g_object_unref0 (event); #line 270 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2955 "EventsDirectoryPage.c" +#line 3112 "EventsDirectoryPage.c" } -static gint sub_events_directory_page_sub_event_directory_manager_get_month (SubEventsDirectoryPageSubEventDirectoryManager* self) { +static gint +sub_events_directory_page_sub_event_directory_manager_get_month (SubEventsDirectoryPageSubEventDirectoryManager* self) +{ gint result = 0; gint _tmp0_; #line 273 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2966,11 +3125,13 @@ static gint sub_events_directory_page_sub_event_directory_manager_get_month (Sub result = _tmp0_; #line 274 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2970 "EventsDirectoryPage.c" +#line 3129 "EventsDirectoryPage.c" } -static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubEventsDirectoryPageSubEventDirectoryManager* self) { +static gint +sub_events_directory_page_sub_event_directory_manager_get_year (SubEventsDirectoryPageSubEventDirectoryManager* self) +{ gint result = 0; gint _tmp0_; #line 277 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2981,11 +3142,13 @@ static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubE result = _tmp0_; #line 278 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2985 "EventsDirectoryPage.c" +#line 3146 "EventsDirectoryPage.c" } -static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (SubEventsDirectoryPageSubEventDirectoryManager* self) { +static SubEventsDirectoryPageDirectoryType +sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (SubEventsDirectoryPageSubEventDirectoryManager* self) +{ SubEventsDirectoryPageDirectoryType result = 0; SubEventsDirectoryPageDirectoryType _tmp0_; #line 281 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2996,11 +3159,13 @@ static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_d result = _tmp0_; #line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 3000 "EventsDirectoryPage.c" +#line 3163 "EventsDirectoryPage.c" } -static void sub_events_directory_page_sub_event_directory_manager_class_init (SubEventsDirectoryPageSubEventDirectoryManagerClass * klass) { +static void +sub_events_directory_page_sub_event_directory_manager_class_init (SubEventsDirectoryPageSubEventDirectoryManagerClass * klass) +{ #line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" sub_events_directory_page_sub_event_directory_manager_parent_class = g_type_class_peek_parent (klass); #line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -3009,32 +3174,38 @@ static void sub_events_directory_page_sub_event_directory_manager_class_init (Su g_type_class_add_private (klass, sizeof (SubEventsDirectoryPageSubEventDirectoryManagerPrivate)); #line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) sub_events_directory_page_sub_event_directory_manager_real_include_in_view; -#line 3013 "EventsDirectoryPage.c" +#line 3178 "EventsDirectoryPage.c" } -static void sub_events_directory_page_sub_event_directory_manager_instance_init (SubEventsDirectoryPageSubEventDirectoryManager * self) { +static void +sub_events_directory_page_sub_event_directory_manager_instance_init (SubEventsDirectoryPageSubEventDirectoryManager * self) +{ #line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self->priv = SUB_EVENTS_DIRECTORY_PAGE_SUB_EVENT_DIRECTORY_MANAGER_GET_PRIVATE (self); #line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self->priv->month = 0; #line 246 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self->priv->year = 0; -#line 3024 "EventsDirectoryPage.c" +#line 3191 "EventsDirectoryPage.c" } -static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager * obj) { +static void +sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager * obj) +{ SubEventsDirectoryPageSubEventDirectoryManager * self; #line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager); #line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->finalize (obj); -#line 3034 "EventsDirectoryPage.c" +#line 3203 "EventsDirectoryPage.c" } -static GType sub_events_directory_page_sub_event_directory_manager_get_type (void) { +static GType +sub_events_directory_page_sub_event_directory_manager_get_type (void) +{ static volatile gsize sub_events_directory_page_sub_event_directory_manager_type_id__volatile = 0; if (g_once_init_enter (&sub_events_directory_page_sub_event_directory_manager_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SubEventsDirectoryPageSubEventDirectoryManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sub_events_directory_page_sub_event_directory_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SubEventsDirectoryPageSubEventDirectoryManager), 0, (GInstanceInitFunc) sub_events_directory_page_sub_event_directory_manager_instance_init, NULL }; @@ -3046,18 +3217,24 @@ static GType sub_events_directory_page_sub_event_directory_manager_get_type (voi } -static void sub_events_directory_page_class_init (SubEventsDirectoryPageClass * klass) { +static void +sub_events_directory_page_class_init (SubEventsDirectoryPageClass * klass) +{ #line 233 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" sub_events_directory_page_parent_class = g_type_class_peek_parent (klass); -#line 3053 "EventsDirectoryPage.c" +#line 3226 "EventsDirectoryPage.c" } -static void sub_events_directory_page_instance_init (SubEventsDirectoryPage * self) { +static void +sub_events_directory_page_instance_init (SubEventsDirectoryPage * self) +{ } -GType sub_events_directory_page_get_type (void) { +GType +sub_events_directory_page_get_type (void) +{ static volatile gsize sub_events_directory_page_type_id__volatile = 0; if (g_once_init_enter (&sub_events_directory_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SubEventsDirectoryPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sub_events_directory_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SubEventsDirectoryPage), 0, (GInstanceInitFunc) sub_events_directory_page_instance_init, NULL }; -- cgit v1.2.3