diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:38:57 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:38:57 +0100 |
| commit | f1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch) | |
| tree | a1f2ab30332a6383b0677bfcc2aec687b98851d6 /src/events/Branch.c | |
| parent | f8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff) | |
| parent | ede50c561ec9811704821a9ea0f04c3d6c20b5af (diff) | |
Merge branch 'release/0.26.4-1'0.26.4-1
Diffstat (limited to 'src/events/Branch.c')
| -rw-r--r-- | src/events/Branch.c | 1547 |
1 files changed, 772 insertions, 775 deletions
diff --git a/src/events/Branch.c b/src/events/Branch.c index 2320a00..32d331d 100644 --- a/src/events/Branch.c +++ b/src/events/Branch.c @@ -1,4 +1,4 @@ -/* Branch.c generated by valac 0.34.7, the Vala compiler +/* Branch.c generated by valac 0.36.6, the Vala compiler * generated from Branch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -303,8 +303,8 @@ typedef struct _EventID EventID; typedef struct _SidebarRenameableEntry SidebarRenameableEntry; typedef struct _SidebarRenameableEntryIface SidebarRenameableEntryIface; #define _alteration_unref0(var) ((var == NULL) ? NULL : (var = (alteration_unref (var), NULL))) -typedef struct _Block7Data Block7Data; typedef struct _Block8Data Block8Data; +typedef struct _Block9Data Block9Data; #define SIDEBAR_TYPE_SELECTABLE_ENTRY (sidebar_selectable_entry_get_type ()) #define SIDEBAR_SELECTABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY, SidebarSelectableEntry)) @@ -594,14 +594,14 @@ struct _SidebarRenameableEntryIface { gboolean (*is_user_renameable) (SidebarRenameableEntry* self); }; -struct _Block7Data { +struct _Block8Data { int _ref_count_; EventsBranch* self; gint event_month; }; typedef gboolean (*Locator) (gconstpointer item, void* user_data); -struct _Block8Data { +struct _Block9Data { int _ref_count_; EventsBranch* self; gint event_year; @@ -744,14 +744,14 @@ gchar* events_branch_no_event_icon = NULL; static gboolean events_branch_sort_ascending; static gboolean events_branch_sort_ascending = FALSE; static gpointer events_directory_entry_parent_class = NULL; -static SidebarExpandableEntryIface* events_directory_entry_sidebar_expandable_entry_parent_iface = NULL; +static SidebarExpandableEntryIface * events_directory_entry_sidebar_expandable_entry_parent_iface = NULL; static gpointer events_master_directory_entry_parent_class = NULL; static gpointer events_year_directory_entry_parent_class = NULL; static gpointer events_month_directory_entry_parent_class = NULL; static gpointer events_undated_directory_entry_parent_class = NULL; static gpointer events_event_entry_parent_class = NULL; -static SidebarRenameableEntryIface* events_event_entry_sidebar_renameable_entry_parent_iface = NULL; -static SidebarInternalDropTargetEntryIface* events_event_entry_sidebar_internal_drop_target_entry_parent_iface = NULL; +static SidebarRenameableEntryIface * events_event_entry_sidebar_renameable_entry_parent_iface = NULL; +static SidebarInternalDropTargetEntryIface * events_event_entry_sidebar_internal_drop_target_entry_parent_iface = NULL; static gpointer events_no_event_entry_parent_class = NULL; GType sidebar_branch_get_type (void) G_GNUC_CONST; @@ -856,7 +856,7 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc 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 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") @@ -871,22 +871,22 @@ static void events_branch_reparent_event (EventsBranch* self, Event* event, Side SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry); void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry); gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent); -static Block7Data* block7_data_ref (Block7Data* _data7_); -static void block7_data_unref (void * _userdata_); -static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* event, struct tm* event_tm); -SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry* parent, Locator locator, void* locator_target); -static gboolean __lambda17_ (Block7Data* _data7_, SidebarEntry* entry); -static gboolean ___lambda17__locator (gconstpointer item, gpointer self); static Block8Data* block8_data_ref (Block8Data* _data8_); static void block8_data_unref (void * _userdata_); -static gboolean __lambda16_ (Block8Data* _data8_, SidebarEntry* entry); -static gboolean ___lambda16__locator (gconstpointer item, gpointer self); +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 __lambda19_ (Block8Data* _data8_, SidebarEntry* entry); +static gboolean ___lambda19__locator (gconstpointer item, gpointer self); +static Block9Data* block9_data_ref (Block9Data* _data9_); +static void block9_data_unref (void * _userdata_); +static gboolean __lambda18_ (Block9Data* _data9_, SidebarEntry* entry); +static gboolean ___lambda18__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); -static void events_branch_finalize (GObject* obj); +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; @@ -921,7 +921,7 @@ 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); GType sub_events_directory_page_get_type (void) G_GNUC_CONST; -static void events_year_directory_entry_finalize (GObject* obj); +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 @@ -929,7 +929,7 @@ enum { 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); +static void events_month_directory_entry_finalize (GObject * obj); enum { EVENTS_UNDATED_DIRECTORY_ENTRY_DUMMY_PROPERTY }; @@ -977,7 +977,7 @@ SetEventCommand* set_event_command_construct (GType object_type, GeeIterable* it 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 void events_event_entry_finalize (GObject* obj); +static void events_event_entry_finalize (GObject * obj); enum { EVENTS_NO_EVENT_ENTRY_DUMMY_PROPERTY }; @@ -1029,152 +1029,149 @@ static gint _events_branch_event_year_comparator_gcompare_func (gconstpointer a, EventsBranch* events_branch_construct (GType object_type) { EventsBranch * self = NULL; - const gchar* _tmp0_ = NULL; - SidebarHeader* _tmp1_ = NULL; - SidebarHeader* _tmp2_ = NULL; - SidebarEntry* _tmp3_ = NULL; - SidebarEntry* _tmp4_ = NULL; - EventsMasterDirectoryEntry* _tmp5_ = NULL; - EventSourceCollection* _tmp16_ = NULL; - GeeCollection* _tmp17_ = NULL; - GeeCollection* _tmp18_ = NULL; - gint _tmp19_ = 0; - gint _tmp20_ = 0; - EventSourceCollection* _tmp21_ = NULL; - EventSourceCollection* _tmp22_ = NULL; - EventSourceCollection* _tmp23_ = NULL; - ConfigFacade* _tmp24_ = NULL; - ConfigFacade* _tmp25_ = NULL; -#line 25 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp0_ = _ ("Events"); + SidebarHeader* _tmp0_; + SidebarHeader* _tmp1_; + SidebarEntry* _tmp2_; + SidebarEntry* _tmp3_; + EventsMasterDirectoryEntry* _tmp4_; + EventSourceCollection* _tmp15_; + GeeCollection* _tmp16_; + GeeCollection* _tmp17_; + gint _tmp18_; + gint _tmp19_; + EventSourceCollection* _tmp20_; + EventSourceCollection* _tmp21_; + EventSourceCollection* _tmp22_; + ConfigFacade* _tmp23_; + ConfigFacade* _tmp24_; #line 25 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp1_ = sidebar_header_new (_tmp0_, TRUE); + _tmp0_ = sidebar_header_new (_ ("Events"), TRUE); #line 25 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 25 "/home/jens/Source/shotwell/src/events/Branch.vala" - self = (EventsBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD, _events_branch_event_year_comparator_gcompare_func, NULL); + self = (EventsBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD, _events_branch_event_year_comparator_gcompare_func, NULL); #line 25 "/home/jens/Source/shotwell/src/events/Branch.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 28 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp3_ = 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 28 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 28 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp5_ = self->priv->all_events_entry; + _tmp4_ = self->priv->all_events_entry; #line 28 "/home/jens/Source/shotwell/src/events/Branch.vala" - sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, 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 28 "/home/jens/Source/shotwell/src/events/Branch.vala" - _g_object_unref0 (_tmp4_); -#line 1069 "Branch.c" + _g_object_unref0 (_tmp3_); +#line 1066 "Branch.c" { GeeIterator* _object_it = NULL; - EventSourceCollection* _tmp6_ = NULL; - GeeCollection* _tmp7_ = NULL; - GeeCollection* _tmp8_ = NULL; - GeeIterator* _tmp9_ = NULL; - GeeIterator* _tmp10_ = NULL; + EventSourceCollection* _tmp5_; + GeeCollection* _tmp6_; + GeeCollection* _tmp7_; + GeeIterator* _tmp8_; + GeeIterator* _tmp9_; #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp6_ = event_global; + _tmp5_ = event_global; #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp7_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection)); + _tmp6_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection)); #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala" - _g_object_unref0 (_tmp8_); + _g_object_unref0 (_tmp7_); #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala" - _object_it = _tmp10_; + _object_it = _tmp9_; #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala" while (TRUE) { -#line 1093 "Branch.c" - GeeIterator* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; +#line 1090 "Branch.c" + GeeIterator* _tmp10_; + gboolean _tmp11_; DataObject* object = NULL; - GeeIterator* _tmp13_ = NULL; - gpointer _tmp14_ = NULL; - DataObject* _tmp15_ = NULL; + GeeIterator* _tmp12_; + gpointer _tmp13_; + DataObject* _tmp14_; #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp11_ = _object_it; + _tmp10_ = _object_it; #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp12_ = gee_iterator_next (_tmp11_); + _tmp11_ = gee_iterator_next (_tmp10_); #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala" - if (!_tmp12_) { + if (!_tmp11_) { #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala" break; -#line 1108 "Branch.c" +#line 1105 "Branch.c" } #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp13_ = _object_it; + _tmp12_ = _object_it; #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp14_ = gee_iterator_get (_tmp13_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala" - object = (DataObject*) _tmp14_; + object = (DataObject*) _tmp13_; #line 32 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp15_ = object; + _tmp14_ = object; #line 32 "/home/jens/Source/shotwell/src/events/Branch.vala" - events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_EVENT, Event)); + events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_EVENT, Event)); #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (object); -#line 1122 "Branch.c" +#line 1119 "Branch.c" } #line 31 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (_object_it); -#line 1126 "Branch.c" +#line 1123 "Branch.c" } #line 34 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp16_ = event_global; + _tmp15_ = event_global; #line 34 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp17_ = event_source_collection_get_no_event_objects (_tmp16_); + _tmp16_ = event_source_collection_get_no_event_objects (_tmp15_); #line 34 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 34 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp19_ = gee_collection_get_size (_tmp18_); + _tmp18_ = gee_collection_get_size (_tmp17_); #line 34 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 34 "/home/jens/Source/shotwell/src/events/Branch.vala" - events_branch_show_no_events (self, _tmp20_ > 0); + events_branch_show_no_events (self, _tmp19_ > 0); #line 34 "/home/jens/Source/shotwell/src/events/Branch.vala" - _g_object_unref0 (_tmp18_); + _g_object_unref0 (_tmp17_); #line 37 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp21_ = event_global; + _tmp20_ = event_global; #line 37 "/home/jens/Source/shotwell/src/events/Branch.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, 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 (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _events_branch_on_events_added_removed_data_collection_contents_altered, self, 0); #line 38 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp22_ = event_global; + _tmp21_ = event_global; #line 38 "/home/jens/Source/shotwell/src/events/Branch.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, 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 (_tmp21_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _events_branch_on_events_altered_data_collection_items_altered, self, 0); #line 39 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp23_ = event_global; + _tmp22_ = event_global; #line 39 "/home/jens/Source/shotwell/src/events/Branch.vala" - g_signal_connect_object (_tmp23_, "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 (_tmp22_, "no-event-collection-altered", (GCallback) _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered, self, 0); #line 42 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp24_ = config_facade_get_instance (); + _tmp23_ = config_facade_get_instance (); #line 42 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp25_ = _tmp24_; + _tmp24_ = _tmp23_; #line 42 "/home/jens/Source/shotwell/src/events/Branch.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, 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 (_tmp24_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "events-sort-ascending-changed", (GCallback) _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed, self, 0); #line 42 "/home/jens/Source/shotwell/src/events/Branch.vala" - _g_object_unref0 (_tmp25_); + _g_object_unref0 (_tmp24_); #line 24 "/home/jens/Source/shotwell/src/events/Branch.vala" return self; -#line 1164 "Branch.c" +#line 1161 "Branch.c" } EventsBranch* events_branch_new (void) { #line 24 "/home/jens/Source/shotwell/src/events/Branch.vala" return events_branch_construct (EVENTS_TYPE_BRANCH); -#line 1171 "Branch.c" +#line 1168 "Branch.c" } void events_branch_init (void) { - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + gboolean _tmp2_; #line 54 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp0_ = config_facade_get_instance (); #line 54 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1185,7 +1182,7 @@ void events_branch_init (void) { events_branch_sort_ascending = _tmp2_; #line 54 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (_tmp1_); -#line 1189 "Branch.c" +#line 1186 "Branch.c" } @@ -1201,21 +1198,21 @@ gboolean events_branch_is_user_renameable (EventsBranch* self) { result = TRUE; #line 61 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 1205 "Branch.c" +#line 1202 "Branch.c" } static gpointer _g_object_ref0 (gpointer self) { #line 65 "/home/jens/Source/shotwell/src/events/Branch.vala" return self ? g_object_ref (self) : NULL; -#line 1212 "Branch.c" +#line 1209 "Branch.c" } EventsMasterDirectoryEntry* events_branch_get_master_entry (EventsBranch* self) { EventsMasterDirectoryEntry* result = NULL; - EventsMasterDirectoryEntry* _tmp0_ = NULL; - EventsMasterDirectoryEntry* _tmp1_ = NULL; + EventsMasterDirectoryEntry* _tmp0_; + EventsMasterDirectoryEntry* _tmp1_; #line 64 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL); #line 65 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1226,24 +1223,24 @@ EventsMasterDirectoryEntry* events_branch_get_master_entry (EventsBranch* self) result = _tmp1_; #line 65 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 1230 "Branch.c" +#line 1227 "Branch.c" } static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry* b) { gint result = 0; - SidebarEntry* _tmp0_ = NULL; - SidebarEntry* _tmp1_ = NULL; - SidebarEntry* _tmp2_ = NULL; - SidebarEntry* _tmp6_ = NULL; - SidebarEntry* _tmp8_ = NULL; - gboolean _tmp10_ = FALSE; + SidebarEntry* _tmp0_; + SidebarEntry* _tmp1_; + SidebarEntry* _tmp2_; + SidebarEntry* _tmp6_; + SidebarEntry* _tmp8_; + gboolean _tmp10_; gint _result_ = 0; - SidebarEntry* _tmp15_ = NULL; - gint _tmp16_ = 0; - SidebarEntry* _tmp17_ = NULL; - gint _tmp18_ = 0; - gint _tmp19_ = 0; + SidebarEntry* _tmp15_; + gint _tmp16_; + SidebarEntry* _tmp17_; + gint _tmp18_; + gint _tmp19_; #line 68 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 68 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1258,14 +1255,14 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry* result = 0; #line 70 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 1262 "Branch.c" +#line 1259 "Branch.c" } #line 74 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp2_ = a; #line 74 "/home/jens/Source/shotwell/src/events/Branch.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) { -#line 1268 "Branch.c" - SidebarEntry* _tmp3_ = NULL; +#line 1265 "Branch.c" + SidebarEntry* _tmp3_; #line 75 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp3_ = b; #line 75 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1274,21 +1271,21 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry* result = -1; #line 76 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 1278 "Branch.c" +#line 1275 "Branch.c" } #line 77 "/home/jens/Source/shotwell/src/events/Branch.vala" result = 1; #line 77 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 1284 "Branch.c" +#line 1281 "Branch.c" } else { - SidebarEntry* _tmp4_ = NULL; + SidebarEntry* _tmp4_; #line 78 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp4_ = b; #line 78 "/home/jens/Source/shotwell/src/events/Branch.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) { -#line 1291 "Branch.c" - SidebarEntry* _tmp5_ = NULL; +#line 1288 "Branch.c" + SidebarEntry* _tmp5_; #line 79 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp5_ = a; #line 79 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1297,13 +1294,13 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry* result = 1; #line 80 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 1301 "Branch.c" +#line 1298 "Branch.c" } #line 81 "/home/jens/Source/shotwell/src/events/Branch.vala" result = -1; #line 81 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 1307 "Branch.c" +#line 1304 "Branch.c" } } #line 84 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1314,9 +1311,9 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry* result = 1; #line 85 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 1318 "Branch.c" +#line 1315 "Branch.c" } else { - SidebarEntry* _tmp7_ = NULL; + SidebarEntry* _tmp7_; #line 86 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp7_ = b; #line 86 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1325,7 +1322,7 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry* result = -1; #line 87 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 1329 "Branch.c" +#line 1326 "Branch.c" } } #line 90 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1336,9 +1333,9 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry* result = -1; #line 91 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 1340 "Branch.c" +#line 1337 "Branch.c" } else { - SidebarEntry* _tmp9_ = NULL; + SidebarEntry* _tmp9_; #line 92 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp9_ = b; #line 92 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1347,19 +1344,19 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry* result = 1; #line 93 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 1351 "Branch.c" +#line 1348 "Branch.c" } } #line 95 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp10_ = events_branch_sort_ascending; #line 95 "/home/jens/Source/shotwell/src/events/Branch.vala" if (!_tmp10_) { -#line 1358 "Branch.c" +#line 1355 "Branch.c" SidebarEntry* swap = NULL; - SidebarEntry* _tmp11_ = NULL; - SidebarEntry* _tmp12_ = NULL; - SidebarEntry* _tmp13_ = NULL; - SidebarEntry* _tmp14_ = NULL; + SidebarEntry* _tmp11_; + SidebarEntry* _tmp12_; + SidebarEntry* _tmp13_; + SidebarEntry* _tmp14_; #line 96 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp11_ = a; #line 96 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1376,7 +1373,7 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry* b = _tmp14_; #line 95 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (swap); -#line 1380 "Branch.c" +#line 1377 "Branch.c" } #line 101 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp15_ = a; @@ -1396,21 +1393,21 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry* result = _result_; #line 105 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 1400 "Branch.c" +#line 1397 "Branch.c" } static gint events_branch_event_month_comparator (SidebarEntry* a, SidebarEntry* b) { gint result = 0; - SidebarEntry* _tmp0_ = NULL; - SidebarEntry* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + SidebarEntry* _tmp0_; + SidebarEntry* _tmp1_; + gboolean _tmp2_; gint _result_ = 0; - SidebarEntry* _tmp7_ = NULL; - gint _tmp8_ = 0; - SidebarEntry* _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; + SidebarEntry* _tmp7_; + gint _tmp8_; + SidebarEntry* _tmp9_; + gint _tmp10_; + gint _tmp11_; #line 108 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 108 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1425,18 +1422,18 @@ static gint events_branch_event_month_comparator (SidebarEntry* a, SidebarEntry* result = 0; #line 110 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 1429 "Branch.c" +#line 1426 "Branch.c" } #line 112 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp2_ = events_branch_sort_ascending; #line 112 "/home/jens/Source/shotwell/src/events/Branch.vala" if (!_tmp2_) { -#line 1435 "Branch.c" +#line 1432 "Branch.c" SidebarEntry* swap = NULL; - SidebarEntry* _tmp3_ = NULL; - SidebarEntry* _tmp4_ = NULL; - SidebarEntry* _tmp5_ = NULL; - SidebarEntry* _tmp6_ = NULL; + SidebarEntry* _tmp3_; + SidebarEntry* _tmp4_; + SidebarEntry* _tmp5_; + SidebarEntry* _tmp6_; #line 113 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp3_ = a; #line 113 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1453,7 +1450,7 @@ static gint events_branch_event_month_comparator (SidebarEntry* a, SidebarEntry* b = _tmp6_; #line 112 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (swap); -#line 1457 "Branch.c" +#line 1454 "Branch.c" } #line 118 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp7_ = a; @@ -1473,29 +1470,29 @@ static gint events_branch_event_month_comparator (SidebarEntry* a, SidebarEntry* result = _result_; #line 122 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 1477 "Branch.c" +#line 1474 "Branch.c" } static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) { gint result = 0; - SidebarEntry* _tmp0_ = NULL; - SidebarEntry* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + SidebarEntry* _tmp0_; + SidebarEntry* _tmp1_; + gboolean _tmp2_; gint64 _result_ = 0LL; - SidebarEntry* _tmp7_ = NULL; - Event* _tmp8_ = NULL; - Event* _tmp9_ = NULL; - time_t _tmp10_ = 0; - SidebarEntry* _tmp11_ = NULL; - Event* _tmp12_ = NULL; - Event* _tmp13_ = NULL; - time_t _tmp14_ = 0; - gint64 _tmp15_ = 0LL; - gint64 _tmp16_ = 0LL; - gint64 _tmp27_ = 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_ = 0LL; + gint64 _tmp29_; #line 125 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 125 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1510,18 +1507,18 @@ static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) { result = 0; #line 127 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 1514 "Branch.c" +#line 1511 "Branch.c" } #line 129 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp2_ = events_branch_sort_ascending; #line 129 "/home/jens/Source/shotwell/src/events/Branch.vala" if (!_tmp2_) { -#line 1520 "Branch.c" +#line 1517 "Branch.c" SidebarEntry* swap = NULL; - SidebarEntry* _tmp3_ = NULL; - SidebarEntry* _tmp4_ = NULL; - SidebarEntry* _tmp5_ = NULL; - SidebarEntry* _tmp6_ = NULL; + SidebarEntry* _tmp3_; + SidebarEntry* _tmp4_; + SidebarEntry* _tmp5_; + SidebarEntry* _tmp6_; #line 130 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp3_ = a; #line 130 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1538,7 +1535,7 @@ static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) { b = _tmp6_; #line 129 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (swap); -#line 1542 "Branch.c" +#line 1539 "Branch.c" } #line 135 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp7_ = a; @@ -1568,17 +1565,17 @@ static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) { _tmp16_ = _result_; #line 139 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp16_ == ((gint64) 0)) { -#line 1572 "Branch.c" - SidebarEntry* _tmp17_ = NULL; - Event* _tmp18_ = NULL; - Event* _tmp19_ = NULL; +#line 1569 "Branch.c" + SidebarEntry* _tmp17_; + Event* _tmp18_; + Event* _tmp19_; EventID _tmp20_ = {0}; - gint64 _tmp21_ = 0LL; - SidebarEntry* _tmp22_ = NULL; - Event* _tmp23_ = NULL; - Event* _tmp24_ = NULL; + gint64 _tmp21_; + SidebarEntry* _tmp22_; + Event* _tmp23_; + Event* _tmp24_; EventID _tmp25_ = {0}; - gint64 _tmp26_ = 0LL; + gint64 _tmp26_; #line 140 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp17_ = a; #line 140 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1605,7 +1602,7 @@ static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) { _g_object_unref0 (_tmp24_); #line 140 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (_tmp19_); -#line 1609 "Branch.c" +#line 1606 "Branch.c" } #line 144 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp27_ = _result_; @@ -1617,39 +1614,39 @@ static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) { if (_tmp29_ < ((gint64) 0)) { #line 146 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp28_ = -1; -#line 1621 "Branch.c" +#line 1618 "Branch.c" } else { #line 146 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp28_ = 1; -#line 1625 "Branch.c" +#line 1622 "Branch.c" } #line 146 "/home/jens/Source/shotwell/src/events/Branch.vala" result = _tmp28_; #line 146 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 1631 "Branch.c" +#line 1628 "Branch.c" } static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntry* b) { gint result = 0; - SidebarEntry* _tmp0_ = NULL; - SidebarEntry* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + SidebarEntry* _tmp0_; + SidebarEntry* _tmp1_; + gboolean _tmp2_; gint ret = 0; - SidebarEntry* _tmp7_ = NULL; - Event* _tmp8_ = NULL; - Event* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - SidebarEntry* _tmp12_ = NULL; - Event* _tmp13_ = NULL; - Event* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gint _tmp17_ = 0; - gint _tmp18_ = 0; - gint _tmp19_ = 0; + SidebarEntry* _tmp7_; + Event* _tmp8_; + Event* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + SidebarEntry* _tmp12_; + Event* _tmp13_; + Event* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + gint _tmp17_; + gint _tmp18_; + gint _tmp19_; #line 149 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 149 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1664,18 +1661,18 @@ static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntr result = 0; #line 151 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 1668 "Branch.c" +#line 1665 "Branch.c" } #line 153 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp2_ = events_branch_sort_ascending; #line 153 "/home/jens/Source/shotwell/src/events/Branch.vala" if (!_tmp2_) { -#line 1674 "Branch.c" +#line 1671 "Branch.c" SidebarEntry* swap = NULL; - SidebarEntry* _tmp3_ = NULL; - SidebarEntry* _tmp4_ = NULL; - SidebarEntry* _tmp5_ = NULL; - SidebarEntry* _tmp6_ = NULL; + SidebarEntry* _tmp3_; + SidebarEntry* _tmp4_; + SidebarEntry* _tmp5_; + SidebarEntry* _tmp6_; #line 154 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp3_ = a; #line 154 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1692,7 +1689,7 @@ static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntr b = _tmp6_; #line 153 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (swap); -#line 1696 "Branch.c" +#line 1693 "Branch.c" } #line 159 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp7_ = a; @@ -1732,15 +1729,15 @@ static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntr _tmp19_ = ret; #line 162 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp19_ == 0) { -#line 1736 "Branch.c" - SidebarEntry* _tmp20_ = NULL; - Event* _tmp21_ = NULL; - Event* _tmp22_ = NULL; - gint64 _tmp23_ = 0LL; - SidebarEntry* _tmp24_ = NULL; - Event* _tmp25_ = NULL; - Event* _tmp26_ = NULL; - gint64 _tmp27_ = 0LL; +#line 1733 "Branch.c" + SidebarEntry* _tmp20_; + Event* _tmp21_; + Event* _tmp22_; + gint64 _tmp23_; + SidebarEntry* _tmp24_; + Event* _tmp25_; + Event* _tmp26_; + gint64 _tmp27_; #line 163 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp20_ = b; #line 163 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1763,21 +1760,21 @@ static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntr _g_object_unref0 (_tmp26_); #line 163 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (_tmp22_); -#line 1767 "Branch.c" +#line 1764 "Branch.c" } #line 166 "/home/jens/Source/shotwell/src/events/Branch.vala" result = ret; #line 166 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 1773 "Branch.c" +#line 1770 "Branch.c" } EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, Event* event) { EventsEventEntry* result = NULL; - GeeHashMap* _tmp0_ = NULL; - Event* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; + GeeHashMap* _tmp0_; + Event* _tmp1_; + gpointer _tmp2_; #line 169 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL); #line 169 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1792,16 +1789,16 @@ EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, Event* result = (EventsEventEntry*) _tmp2_; #line 170 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 1796 "Branch.c" +#line 1793 "Branch.c" } static void events_branch_on_config_changed (EventsBranch* self) { gboolean value = FALSE; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; #line 173 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 174 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1820,13 +1817,13 @@ static void events_branch_on_config_changed (EventsBranch* self) { events_branch_sort_ascending = value; #line 177 "/home/jens/Source/shotwell/src/events/Branch.vala" sidebar_branch_reorder_all (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); -#line 1824 "Branch.c" +#line 1821 "Branch.c" } static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterable* added, GeeIterable* removed) { - GeeIterable* _tmp0_ = NULL; - GeeIterable* _tmp8_ = NULL; + GeeIterable* _tmp0_; + GeeIterable* _tmp8_; #line 180 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 180 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1837,11 +1834,11 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab _tmp0_ = added; #line 182 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp0_ != NULL) { -#line 1841 "Branch.c" +#line 1838 "Branch.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeIterable* _tmp1_; + GeeIterator* _tmp2_; #line 183 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp1_ = added; #line 183 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1850,13 +1847,13 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab _object_it = _tmp2_; #line 183 "/home/jens/Source/shotwell/src/events/Branch.vala" while (TRUE) { -#line 1854 "Branch.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; +#line 1851 "Branch.c" + GeeIterator* _tmp3_; + gboolean _tmp4_; DataObject* object = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; - DataObject* _tmp7_ = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; + DataObject* _tmp7_; #line 183 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp3_ = _object_it; #line 183 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1865,7 +1862,7 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab if (!_tmp4_) { #line 183 "/home/jens/Source/shotwell/src/events/Branch.vala" break; -#line 1869 "Branch.c" +#line 1866 "Branch.c" } #line 183 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp5_ = _object_it; @@ -1879,22 +1876,22 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_EVENT, Event)); #line 183 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (object); -#line 1883 "Branch.c" +#line 1880 "Branch.c" } #line 183 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (_object_it); -#line 1887 "Branch.c" +#line 1884 "Branch.c" } } #line 187 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp8_ = removed; #line 187 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp8_ != NULL) { -#line 1894 "Branch.c" +#line 1891 "Branch.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp9_ = NULL; - GeeIterator* _tmp10_ = NULL; + GeeIterable* _tmp9_; + GeeIterator* _tmp10_; #line 188 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp9_ = removed; #line 188 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1903,13 +1900,13 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab _object_it = _tmp10_; #line 188 "/home/jens/Source/shotwell/src/events/Branch.vala" while (TRUE) { -#line 1907 "Branch.c" - GeeIterator* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; +#line 1904 "Branch.c" + GeeIterator* _tmp11_; + gboolean _tmp12_; DataObject* object = NULL; - GeeIterator* _tmp13_ = NULL; - gpointer _tmp14_ = NULL; - DataObject* _tmp15_ = NULL; + GeeIterator* _tmp13_; + gpointer _tmp14_; + DataObject* _tmp15_; #line 188 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp11_ = _object_it; #line 188 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1918,7 +1915,7 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab if (!_tmp12_) { #line 188 "/home/jens/Source/shotwell/src/events/Branch.vala" break; -#line 1922 "Branch.c" +#line 1919 "Branch.c" } #line 188 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp13_ = _object_it; @@ -1932,11 +1929,11 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab events_branch_remove_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_EVENT, Event)); #line 188 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (object); -#line 1936 "Branch.c" +#line 1933 "Branch.c" } #line 188 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (_object_it); -#line 1940 "Branch.c" +#line 1937 "Branch.c" } } } @@ -1947,15 +1944,15 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 193 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_if_fail (GEE_IS_MAP (altered)); -#line 1951 "Branch.c" +#line 1948 "Branch.c" { GeeIterator* _object_it = NULL; - GeeMap* _tmp0_ = NULL; - GeeSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; - GeeSet* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + GeeMap* _tmp0_; + GeeSet* _tmp1_; + GeeSet* _tmp2_; + GeeSet* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp0_ = altered; #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1974,21 +1971,21 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered _object_it = _tmp5_; #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala" while (TRUE) { -#line 1978 "Branch.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; +#line 1975 "Branch.c" + GeeIterator* _tmp6_; + gboolean _tmp7_; DataObject* object = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; Event* event = NULL; - DataObject* _tmp10_ = NULL; - Event* _tmp11_ = NULL; + DataObject* _tmp10_; + Event* _tmp11_; Alteration* alteration = NULL; - GeeMap* _tmp12_ = NULL; - DataObject* _tmp13_ = NULL; - gpointer _tmp14_ = NULL; - Alteration* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; + GeeMap* _tmp12_; + DataObject* _tmp13_; + gpointer _tmp14_; + Alteration* _tmp15_; + gboolean _tmp16_; #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp6_ = _object_it; #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -1997,7 +1994,7 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered if (!_tmp7_) { #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala" break; -#line 2001 "Branch.c" +#line 1998 "Branch.c" } #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp8_ = _object_it; @@ -2025,36 +2022,36 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered _tmp16_ = alteration_has_detail (_tmp15_, "metadata", "time"); #line 198 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp16_) { -#line 2029 "Branch.c" - Event* _tmp17_ = NULL; +#line 2026 "Branch.c" + Event* _tmp17_; #line 201 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp17_ = event; #line 201 "/home/jens/Source/shotwell/src/events/Branch.vala" events_branch_move_event (self, _tmp17_); -#line 2035 "Branch.c" +#line 2032 "Branch.c" } else { - Alteration* _tmp18_ = NULL; - gboolean _tmp19_ = FALSE; + Alteration* _tmp18_; + gboolean _tmp19_; #line 202 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp18_ = alteration; #line 202 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp19_ = alteration_has_detail (_tmp18_, "metadata", "name"); #line 202 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp19_) { -#line 2045 "Branch.c" +#line 2042 "Branch.c" EventsEventEntry* entry = NULL; - GeeHashMap* _tmp20_ = NULL; - Event* _tmp21_ = NULL; - gpointer _tmp22_ = NULL; - EventsEventEntry* _tmp23_ = NULL; - EventsEventEntry* _tmp24_ = NULL; - Event* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - EventsEventEntry* _tmp28_ = NULL; - Event* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; + GeeHashMap* _tmp20_; + Event* _tmp21_; + gpointer _tmp22_; + EventsEventEntry* _tmp23_; + EventsEventEntry* _tmp24_; + Event* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + EventsEventEntry* _tmp28_; + Event* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; #line 203 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp20_ = self->priv->entry_map; #line 203 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2093,7 +2090,7 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered _g_free0 (_tmp31_); #line 202 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (entry); -#line 2097 "Branch.c" +#line 2094 "Branch.c" } } #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2102,21 +2099,21 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered _g_object_unref0 (event); #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (object); -#line 2106 "Branch.c" +#line 2103 "Branch.c" } #line 194 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (_object_it); -#line 2110 "Branch.c" +#line 2107 "Branch.c" } } static void events_branch_on_no_event_collection_altered (EventsBranch* self) { - EventSourceCollection* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + EventSourceCollection* _tmp0_; + GeeCollection* _tmp1_; + GeeCollection* _tmp2_; + gint _tmp3_; + gint _tmp4_; #line 212 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 213 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2133,22 +2130,22 @@ static void events_branch_on_no_event_collection_altered (EventsBranch* self) { events_branch_show_no_events (self, _tmp4_ > 0); #line 213 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (_tmp2_); -#line 2137 "Branch.c" +#line 2134 "Branch.c" } static void g_time_local (time_t time, struct tm* result) { struct tm _result_ = {0}; struct tm _tmp0_ = {0}; -#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" localtime_r (&time, &_tmp0_); -#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" *result = _result_; -#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return; -#line 2152 "Branch.c" +#line 2149 "Branch.c" } @@ -2157,53 +2154,53 @@ static gint _events_branch_event_comparator_gcompare_func (gconstpointer a, gcon result = events_branch_event_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 229 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 2161 "Branch.c" +#line 2158 "Branch.c" } static gchar* g_time_format (struct tm *self, const gchar* format) { gchar* result = NULL; gchar* buffer = NULL; - gchar* _tmp0_ = NULL; - gint buffer_length1 = 0; - gint _buffer_size_ = 0; - gchar* _tmp1_ = NULL; - gint _tmp1__length1 = 0; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - gchar* _tmp4_ = NULL; -#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + gint buffer_length1; + gint _buffer_size_; + gchar* _tmp1_; + gint _tmp1__length1; + const gchar* _tmp2_; + gchar* _tmp3_; + gint _tmp3__length1; + gchar* _tmp4_; +#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (format != NULL, NULL); -#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_new0 (gchar, 64); -#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" buffer = _tmp0_; -#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" buffer_length1 = 64; -#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _buffer_size_ = buffer_length1; -#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = buffer; -#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1__length1 = buffer_length1; -#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = format; -#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self)); -#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = buffer; -#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3__length1 = buffer_length1; -#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = g_strdup ((const gchar*) _tmp3_); -#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" buffer = (g_free (buffer), NULL); -#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2207 "Branch.c" +#line 2204 "Branch.c" } @@ -2212,34 +2209,34 @@ static gint _events_branch_event_month_comparator_gcompare_func (gconstpointer a result = events_branch_event_month_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 237 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 2216 "Branch.c" +#line 2213 "Branch.c" } static void events_branch_add_event (EventsBranch* self, Event* event) { time_t event_time = 0; - Event* _tmp0_ = NULL; - time_t _tmp1_ = 0; - time_t _tmp2_ = 0; + Event* _tmp0_; + time_t _tmp1_; + time_t _tmp2_; struct tm event_tm = {0}; - time_t _tmp4_ = 0; + time_t _tmp4_; struct tm _tmp5_ = {0}; SidebarEntry* year = NULL; SidebarEntry* month = NULL; - Event* _tmp6_ = NULL; - struct tm _tmp7_ = {0}; + Event* _tmp6_; + struct tm _tmp7_; SidebarEntry* _tmp8_ = NULL; - SidebarEntry* _tmp9_ = NULL; - SidebarEntry* _tmp10_ = NULL; - SidebarEntry* _tmp13_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - struct tm _tmp23_ = {0}; - EventsMonthDirectoryEntry* _tmp24_ = NULL; - SidebarEntry* _tmp25_ = NULL; - SidebarEntry* _tmp26_ = NULL; - SidebarEntry* _tmp27_ = NULL; - Event* _tmp28_ = NULL; + SidebarEntry* _tmp9_; + SidebarEntry* _tmp10_; + SidebarEntry* _tmp13_; + gchar* _tmp21_; + gchar* _tmp22_; + struct tm _tmp23_; + EventsMonthDirectoryEntry* _tmp24_; + SidebarEntry* _tmp25_; + SidebarEntry* _tmp26_; + SidebarEntry* _tmp27_; + Event* _tmp28_; #line 216 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 216 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2254,15 +2251,15 @@ static void events_branch_add_event (EventsBranch* self, Event* event) { _tmp2_ = event_time; #line 218 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp2_ == ((time_t) 0)) { -#line 2258 "Branch.c" - Event* _tmp3_ = NULL; +#line 2255 "Branch.c" + Event* _tmp3_; #line 219 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp3_ = event; #line 219 "/home/jens/Source/shotwell/src/events/Branch.vala" events_branch_add_undated_event (self, _tmp3_); #line 221 "/home/jens/Source/shotwell/src/events/Branch.vala" return; -#line 2266 "Branch.c" +#line 2263 "Branch.c" } #line 224 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp4_ = event_time; @@ -2286,9 +2283,9 @@ static void events_branch_add_event (EventsBranch* self, Event* event) { _tmp10_ = month; #line 228 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp10_ != NULL) { -#line 2290 "Branch.c" - SidebarEntry* _tmp11_ = NULL; - Event* _tmp12_ = NULL; +#line 2287 "Branch.c" + SidebarEntry* _tmp11_; + Event* _tmp12_; #line 229 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp11_ = month; #line 229 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2301,20 +2298,20 @@ static void events_branch_add_event (EventsBranch* self, Event* event) { _g_object_unref0 (year); #line 231 "/home/jens/Source/shotwell/src/events/Branch.vala" return; -#line 2305 "Branch.c" +#line 2302 "Branch.c" } #line 234 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp13_ = year; #line 234 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp13_ == NULL) { -#line 2311 "Branch.c" - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - struct tm _tmp16_ = {0}; - EventsYearDirectoryEntry* _tmp17_ = NULL; - SidebarEntry* _tmp18_ = NULL; - SidebarEntry* _tmp19_ = NULL; - SidebarEntry* _tmp20_ = NULL; +#line 2308 "Branch.c" + gchar* _tmp14_; + gchar* _tmp15_; + struct tm _tmp16_; + EventsYearDirectoryEntry* _tmp17_; + SidebarEntry* _tmp18_; + SidebarEntry* _tmp19_; + SidebarEntry* _tmp20_; #line 235 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp14_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT); #line 235 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2339,7 +2336,7 @@ static void events_branch_add_event (EventsBranch* self, Event* event) { sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp19_, _tmp20_, _events_branch_event_month_comparator_gcompare_func); #line 237 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (_tmp19_); -#line 2343 "Branch.c" +#line 2340 "Branch.c" } #line 240 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp21_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT); @@ -2371,28 +2368,28 @@ static void events_branch_add_event (EventsBranch* self, Event* event) { _g_object_unref0 (month); #line 216 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (year); -#line 2375 "Branch.c" +#line 2372 "Branch.c" } static void events_branch_move_event (EventsBranch* self, Event* event) { time_t event_time = 0; - Event* _tmp0_ = NULL; - time_t _tmp1_ = 0; - time_t _tmp2_ = 0; + Event* _tmp0_; + time_t _tmp1_; + time_t _tmp2_; struct tm event_tm = {0}; - time_t _tmp4_ = 0; + time_t _tmp4_; struct tm _tmp5_ = {0}; SidebarEntry* year = NULL; SidebarEntry* month = NULL; - Event* _tmp6_ = NULL; - struct tm _tmp7_ = {0}; + Event* _tmp6_; + struct tm _tmp7_; SidebarEntry* _tmp8_ = NULL; - SidebarEntry* _tmp9_ = NULL; - SidebarEntry* _tmp10_ = NULL; - SidebarEntry* _tmp18_ = NULL; - Event* _tmp25_ = NULL; - SidebarEntry* _tmp26_ = NULL; + SidebarEntry* _tmp9_; + SidebarEntry* _tmp10_; + SidebarEntry* _tmp18_; + Event* _tmp25_; + SidebarEntry* _tmp26_; #line 247 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 247 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2407,15 +2404,15 @@ static void events_branch_move_event (EventsBranch* self, Event* event) { _tmp2_ = event_time; #line 249 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp2_ == ((time_t) 0)) { -#line 2411 "Branch.c" - Event* _tmp3_ = NULL; +#line 2408 "Branch.c" + Event* _tmp3_; #line 250 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp3_ = event; #line 250 "/home/jens/Source/shotwell/src/events/Branch.vala" events_branch_move_to_undated_event (self, _tmp3_); #line 252 "/home/jens/Source/shotwell/src/events/Branch.vala" return; -#line 2419 "Branch.c" +#line 2416 "Branch.c" } #line 255 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp4_ = event_time; @@ -2439,14 +2436,14 @@ static void events_branch_move_event (EventsBranch* self, Event* event) { _tmp10_ = year; #line 260 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp10_ == NULL) { -#line 2443 "Branch.c" - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - struct tm _tmp13_ = {0}; - EventsYearDirectoryEntry* _tmp14_ = NULL; - SidebarEntry* _tmp15_ = NULL; - SidebarEntry* _tmp16_ = NULL; - SidebarEntry* _tmp17_ = NULL; +#line 2440 "Branch.c" + gchar* _tmp11_; + gchar* _tmp12_; + struct tm _tmp13_; + EventsYearDirectoryEntry* _tmp14_; + SidebarEntry* _tmp15_; + SidebarEntry* _tmp16_; + SidebarEntry* _tmp17_; #line 261 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp11_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT); #line 261 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2471,19 +2468,19 @@ static void events_branch_move_event (EventsBranch* self, Event* event) { sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp16_, _tmp17_, _events_branch_event_month_comparator_gcompare_func); #line 263 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (_tmp16_); -#line 2475 "Branch.c" +#line 2472 "Branch.c" } #line 266 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp18_ = month; #line 266 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp18_ == NULL) { -#line 2481 "Branch.c" - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - struct tm _tmp21_ = {0}; - EventsMonthDirectoryEntry* _tmp22_ = NULL; - SidebarEntry* _tmp23_ = NULL; - SidebarEntry* _tmp24_ = NULL; +#line 2478 "Branch.c" + gchar* _tmp19_; + gchar* _tmp20_; + struct tm _tmp21_; + EventsMonthDirectoryEntry* _tmp22_; + SidebarEntry* _tmp23_; + SidebarEntry* _tmp24_; #line 267 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp19_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT); #line 267 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2504,7 +2501,7 @@ static void events_branch_move_event (EventsBranch* self, Event* event) { _tmp24_ = month; #line 269 "/home/jens/Source/shotwell/src/events/Branch.vala" sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp23_, _tmp24_, _events_branch_event_comparator_gcompare_func); -#line 2508 "Branch.c" +#line 2505 "Branch.c" } #line 272 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp25_ = event; @@ -2516,23 +2513,23 @@ static void events_branch_move_event (EventsBranch* self, Event* event) { _g_object_unref0 (month); #line 247 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (year); -#line 2520 "Branch.c" +#line 2517 "Branch.c" } static void events_branch_remove_event (EventsBranch* self, Event* event) { SidebarEntry* entry = NULL; gboolean removed = FALSE; - GeeHashMap* _tmp0_ = NULL; - Event* _tmp1_ = NULL; + GeeHashMap* _tmp0_; + Event* _tmp1_; gpointer _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; + gboolean _tmp3_; + gboolean _tmp4_; SidebarEntry* parent = NULL; - SidebarEntry* _tmp5_ = NULL; - SidebarEntry* _tmp6_ = NULL; - SidebarEntry* _tmp7_ = NULL; - SidebarEntry* _tmp8_ = NULL; + SidebarEntry* _tmp5_; + SidebarEntry* _tmp6_; + SidebarEntry* _tmp7_; + SidebarEntry* _tmp8_; #line 275 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 275 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2569,27 +2566,27 @@ static void events_branch_remove_event (EventsBranch* self, Event* event) { sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp8_); #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala" while (TRUE) { -#line 2573 "Branch.c" +#line 2570 "Branch.c" gboolean _tmp9_ = FALSE; - SidebarEntry* _tmp10_ = NULL; - gint _tmp11_ = 0; + SidebarEntry* _tmp10_; + gint _tmp11_; SidebarEntry* grandparent = NULL; - SidebarEntry* _tmp15_ = NULL; - SidebarEntry* _tmp16_ = NULL; - SidebarEntry* _tmp17_ = NULL; - SidebarEntry* _tmp18_ = NULL; - SidebarEntry* _tmp19_ = NULL; - SidebarEntry* _tmp20_ = NULL; + SidebarEntry* _tmp15_; + SidebarEntry* _tmp16_; + SidebarEntry* _tmp17_; + SidebarEntry* _tmp18_; + SidebarEntry* _tmp19_; + SidebarEntry* _tmp20_; #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp10_ = parent; #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp11_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp10_); #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp11_ == 0) { -#line 2590 "Branch.c" - SidebarEntry* _tmp12_ = NULL; - SidebarEntry* _tmp13_ = NULL; - SidebarEntry* _tmp14_ = NULL; +#line 2587 "Branch.c" + SidebarEntry* _tmp12_; + SidebarEntry* _tmp13_; + SidebarEntry* _tmp14_; #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp12_ = parent; #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2600,17 +2597,17 @@ static void events_branch_remove_event (EventsBranch* self, Event* event) { _tmp9_ = _tmp12_ != _tmp14_; #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (_tmp14_); -#line 2604 "Branch.c" +#line 2601 "Branch.c" } else { #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp9_ = FALSE; -#line 2608 "Branch.c" +#line 2605 "Branch.c" } #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala" if (!_tmp9_) { #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala" break; -#line 2614 "Branch.c" +#line 2611 "Branch.c" } #line 289 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp15_ = parent; @@ -2636,51 +2633,51 @@ static void events_branch_remove_event (EventsBranch* self, Event* event) { parent = _tmp20_; #line 288 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (grandparent); -#line 2640 "Branch.c" +#line 2637 "Branch.c" } #line 275 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (parent); #line 275 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (entry); -#line 2646 "Branch.c" +#line 2643 "Branch.c" } -static Block7Data* block7_data_ref (Block7Data* _data7_) { +static Block8Data* block8_data_ref (Block8Data* _data8_) { #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" - g_atomic_int_inc (&_data7_->_ref_count_); + g_atomic_int_inc (&_data8_->_ref_count_); #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" - return _data7_; -#line 2655 "Branch.c" + return _data8_; +#line 2652 "Branch.c" } -static void block7_data_unref (void * _userdata_) { - Block7Data* _data7_; - _data7_ = (Block7Data*) _userdata_; +static void block8_data_unref (void * _userdata_) { + Block8Data* _data8_; + _data8_ = (Block8Data*) _userdata_; #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" - if (g_atomic_int_dec_and_test (&_data7_->_ref_count_)) { -#line 2664 "Branch.c" + if (g_atomic_int_dec_and_test (&_data8_->_ref_count_)) { +#line 2661 "Branch.c" EventsBranch* self; #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" - self = _data7_->self; + self = _data8_->self; #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (self); #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" - g_slice_free (Block7Data, _data7_); -#line 2672 "Branch.c" + g_slice_free (Block8Data, _data8_); +#line 2669 "Branch.c" } } -static gboolean __lambda17_ (Block7Data* _data7_, SidebarEntry* entry) { +static gboolean __lambda19_ (Block8Data* _data8_, SidebarEntry* entry) { EventsBranch* self; gboolean result = FALSE; - SidebarEntry* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + SidebarEntry* _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" - self = _data7_->self; + self = _data8_->self; #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE); #line 308 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2688,36 +2685,36 @@ static gboolean __lambda17_ (Block7Data* _data7_, SidebarEntry* entry) { #line 308 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp1_ = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry)); #line 308 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp2_ = _data7_->event_month; + _tmp2_ = _data8_->event_month; #line 308 "/home/jens/Source/shotwell/src/events/Branch.vala" result = _tmp1_ == _tmp2_; #line 308 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 2697 "Branch.c" +#line 2694 "Branch.c" } -static gboolean ___lambda17__locator (gconstpointer item, gpointer self) { +static gboolean ___lambda19__locator (gconstpointer item, gpointer self) { gboolean result; - result = __lambda17_ (self, (SidebarEntry*) item); + result = __lambda19_ (self, (SidebarEntry*) item); #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 2706 "Branch.c" +#line 2703 "Branch.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; - Block7Data* _data7_; - Event* _tmp0_ = NULL; - struct tm _tmp1_ = {0}; - SidebarEntry* _tmp2_ = NULL; - SidebarEntry* _tmp3_ = NULL; - struct tm _tmp4_ = {0}; - gint _tmp5_ = 0; - SidebarEntry* _tmp6_ = NULL; - SidebarEntry* _tmp7_ = NULL; + Block8Data* _data8_; + Event* _tmp0_; + struct tm _tmp1_; + SidebarEntry* _tmp2_; + SidebarEntry* _tmp3_; + struct tm _tmp4_; + gint _tmp5_; + SidebarEntry* _tmp6_; + SidebarEntry* _tmp7_; #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL); #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2725,11 +2722,11 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (event_tm != NULL, NULL); #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data7_ = g_slice_new0 (Block7Data); + _data8_ = g_slice_new0 (Block8Data); #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data7_->_ref_count_ = 1; + _data8_->_ref_count_ = 1; #line 298 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data7_->self = g_object_ref (self); + _data8_->self = g_object_ref (self); #line 300 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp0_ = event; #line 300 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2747,90 +2744,90 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* #line 302 "/home/jens/Source/shotwell/src/events/Branch.vala" result = NULL; #line 302 "/home/jens/Source/shotwell/src/events/Branch.vala" - block7_data_unref (_data7_); + block8_data_unref (_data8_); #line 302 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data7_ = NULL; + _data8_ = NULL; #line 302 "/home/jens/Source/shotwell/src/events/Branch.vala" if (found_year) { #line 302 "/home/jens/Source/shotwell/src/events/Branch.vala" *found_year = _vala_found_year; -#line 2758 "Branch.c" +#line 2755 "Branch.c" } else { #line 302 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (_vala_found_year); -#line 2762 "Branch.c" +#line 2759 "Branch.c" } #line 302 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 2766 "Branch.c" +#line 2763 "Branch.c" } #line 304 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp4_ = *event_tm; #line 304 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp5_ = _tmp4_.tm_mon; #line 304 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data7_->event_month = _tmp5_ + 1; + _data8_->event_month = _tmp5_ + 1; #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp6_ = _vala_found_year; #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp7_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp6_, ___lambda17__locator, _data7_); + _tmp7_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp6_, ___lambda19__locator, _data8_); #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" result = _tmp7_; #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" - block7_data_unref (_data7_); + block8_data_unref (_data8_); #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data7_ = NULL; + _data8_ = NULL; #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" if (found_year) { #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" *found_year = _vala_found_year; -#line 2788 "Branch.c" +#line 2785 "Branch.c" } else { #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (_vala_found_year); -#line 2792 "Branch.c" +#line 2789 "Branch.c" } #line 307 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 2796 "Branch.c" +#line 2793 "Branch.c" } -static Block8Data* block8_data_ref (Block8Data* _data8_) { +static Block9Data* block9_data_ref (Block9Data* _data9_) { #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" - g_atomic_int_inc (&_data8_->_ref_count_); + g_atomic_int_inc (&_data9_->_ref_count_); #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" - return _data8_; -#line 2805 "Branch.c" + return _data9_; +#line 2802 "Branch.c" } -static void block8_data_unref (void * _userdata_) { - Block8Data* _data8_; - _data8_ = (Block8Data*) _userdata_; +static void block9_data_unref (void * _userdata_) { + Block9Data* _data9_; + _data9_ = (Block9Data*) _userdata_; #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" - if (g_atomic_int_dec_and_test (&_data8_->_ref_count_)) { -#line 2814 "Branch.c" + if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) { +#line 2811 "Branch.c" EventsBranch* self; #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" - self = _data8_->self; + self = _data9_->self; #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (self); #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" - g_slice_free (Block8Data, _data8_); -#line 2822 "Branch.c" + g_slice_free (Block9Data, _data9_); +#line 2819 "Branch.c" } } -static gboolean __lambda16_ (Block8Data* _data8_, SidebarEntry* entry) { +static gboolean __lambda18_ (Block9Data* _data9_, SidebarEntry* entry) { EventsBranch* self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - SidebarEntry* _tmp2_ = NULL; + SidebarEntry* _tmp2_; #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" - self = _data8_->self; + self = _data9_->self; #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE); #line 316 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2839,27 +2836,27 @@ static gboolean __lambda16_ (Block8Data* _data8_, SidebarEntry* entry) { if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) { #line 316 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp1_ = TRUE; -#line 2843 "Branch.c" +#line 2840 "Branch.c" } else { - SidebarEntry* _tmp3_ = NULL; + SidebarEntry* _tmp3_; #line 316 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp3_ = entry; #line 316 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, EVENTS_TYPE_NO_EVENT_ENTRY); -#line 2850 "Branch.c" +#line 2847 "Branch.c" } #line 316 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp1_) { #line 316 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp0_ = TRUE; -#line 2856 "Branch.c" +#line 2853 "Branch.c" } else { - SidebarEntry* _tmp4_ = NULL; + SidebarEntry* _tmp4_; #line 317 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp4_ = entry; #line 317 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY); -#line 2863 "Branch.c" +#line 2860 "Branch.c" } #line 316 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp0_) { @@ -2867,41 +2864,41 @@ static gboolean __lambda16_ (Block8Data* _data8_, SidebarEntry* entry) { result = FALSE; #line 318 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 2871 "Branch.c" +#line 2868 "Branch.c" } else { - SidebarEntry* _tmp5_ = NULL; - gint _tmp6_ = 0; + SidebarEntry* _tmp5_; + gint _tmp6_; #line 320 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp5_ = entry; #line 320 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp6_ = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry)); #line 320 "/home/jens/Source/shotwell/src/events/Branch.vala" - result = _tmp6_ == _data8_->event_year; + result = _tmp6_ == _data9_->event_year; #line 320 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 2883 "Branch.c" +#line 2880 "Branch.c" } } -static gboolean ___lambda16__locator (gconstpointer item, gpointer self) { +static gboolean ___lambda18__locator (gconstpointer item, gpointer self) { gboolean result; - result = __lambda16_ (self, (SidebarEntry*) item); + result = __lambda18_ (self, (SidebarEntry*) item); #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 2893 "Branch.c" +#line 2890 "Branch.c" } static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* event, struct tm* event_tm) { SidebarEntry* result = NULL; - Block8Data* _data8_; - struct tm _tmp0_ = {0}; - gint _tmp1_ = 0; - SidebarEntry* _tmp2_ = NULL; - SidebarEntry* _tmp3_ = NULL; - SidebarEntry* _tmp4_ = NULL; - SidebarEntry* _tmp5_ = NULL; + Block9Data* _data9_; + struct tm _tmp0_; + gint _tmp1_; + SidebarEntry* _tmp2_; + SidebarEntry* _tmp3_; + SidebarEntry* _tmp4_; + SidebarEntry* _tmp5_; #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL); #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2909,23 +2906,23 @@ static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* e #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (event_tm != NULL, NULL); #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data8_ = g_slice_new0 (Block8Data); + _data9_ = g_slice_new0 (Block9Data); #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data8_->_ref_count_ = 1; + _data9_->_ref_count_ = 1; #line 312 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data8_->self = g_object_ref (self); + _data9_->self = g_object_ref (self); #line 313 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp0_ = *event_tm; #line 313 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp1_ = _tmp0_.tm_year; #line 313 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data8_->event_year = _tmp1_ + 1900; + _data9_->event_year = _tmp1_ + 1900; #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp3_ = _tmp2_; #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" - _tmp4_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, ___lambda16__locator, _data8_); + _tmp4_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, ___lambda18__locator, _data9_); #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp5_ = _tmp4_; #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2933,12 +2930,12 @@ static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* e #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" result = _tmp5_; #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" - block8_data_unref (_data8_); + block9_data_unref (_data9_); #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" - _data8_ = NULL; + _data9_ = NULL; #line 315 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 2942 "Branch.c" +#line 2939 "Branch.c" } @@ -2947,15 +2944,15 @@ static gint _events_branch_undated_event_comparator_gcompare_func (gconstpointer result = events_branch_undated_event_comparator ((SidebarEntry*) a, (SidebarEntry*) b); #line 326 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 2951 "Branch.c" +#line 2948 "Branch.c" } static void events_branch_add_undated_event (EventsBranch* self, Event* event) { - EventsUndatedDirectoryEntry* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - EventsUndatedDirectoryEntry* _tmp5_ = NULL; - Event* _tmp6_ = NULL; + EventsUndatedDirectoryEntry* _tmp0_; + gboolean _tmp1_; + EventsUndatedDirectoryEntry* _tmp5_; + Event* _tmp6_; #line 324 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 324 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2966,10 +2963,10 @@ static void events_branch_add_undated_event (EventsBranch* self, Event* event) { _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 325 "/home/jens/Source/shotwell/src/events/Branch.vala" if (!_tmp1_) { -#line 2970 "Branch.c" - SidebarEntry* _tmp2_ = NULL; - SidebarEntry* _tmp3_ = NULL; - EventsUndatedDirectoryEntry* _tmp4_ = NULL; +#line 2967 "Branch.c" + SidebarEntry* _tmp2_; + SidebarEntry* _tmp3_; + EventsUndatedDirectoryEntry* _tmp4_; #line 326 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 326 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -2980,7 +2977,7 @@ static void events_branch_add_undated_event (EventsBranch* self, Event* event) { 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); #line 326 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (_tmp3_); -#line 2984 "Branch.c" +#line 2981 "Branch.c" } #line 328 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp5_ = self->priv->undated_entry; @@ -2988,15 +2985,15 @@ static void events_branch_add_undated_event (EventsBranch* self, Event* event) { _tmp6_ = event; #line 328 "/home/jens/Source/shotwell/src/events/Branch.vala" events_branch_graft_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp6_, NULL); -#line 2992 "Branch.c" +#line 2989 "Branch.c" } static void events_branch_move_to_undated_event (EventsBranch* self, Event* event) { - EventsUndatedDirectoryEntry* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - Event* _tmp5_ = NULL; - EventsUndatedDirectoryEntry* _tmp6_ = NULL; + EventsUndatedDirectoryEntry* _tmp0_; + gboolean _tmp1_; + Event* _tmp5_; + EventsUndatedDirectoryEntry* _tmp6_; #line 331 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 331 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3007,10 +3004,10 @@ static void events_branch_move_to_undated_event (EventsBranch* self, Event* even _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 332 "/home/jens/Source/shotwell/src/events/Branch.vala" if (!_tmp1_) { -#line 3011 "Branch.c" - SidebarEntry* _tmp2_ = NULL; - SidebarEntry* _tmp3_ = NULL; - EventsUndatedDirectoryEntry* _tmp4_ = NULL; +#line 3008 "Branch.c" + SidebarEntry* _tmp2_; + SidebarEntry* _tmp3_; + EventsUndatedDirectoryEntry* _tmp4_; #line 333 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 333 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3021,7 +3018,7 @@ static void events_branch_move_to_undated_event (EventsBranch* self, Event* even 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 333 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (_tmp3_); -#line 3025 "Branch.c" +#line 3022 "Branch.c" } #line 335 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp5_ = event; @@ -3029,18 +3026,18 @@ static void events_branch_move_to_undated_event (EventsBranch* self, Event* even _tmp6_ = self->priv->undated_entry; #line 335 "/home/jens/Source/shotwell/src/events/Branch.vala" events_branch_reparent_event (self, _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 3033 "Branch.c" +#line 3030 "Branch.c" } static void events_branch_graft_event (EventsBranch* self, SidebarEntry* parent, Event* event, GCompareFunc comparator) { EventsEventEntry* entry = NULL; - Event* _tmp0_ = NULL; - EventsEventEntry* _tmp1_ = NULL; - GeeHashMap* _tmp2_ = NULL; - Event* _tmp3_ = NULL; - SidebarEntry* _tmp4_ = NULL; - GCompareFunc _tmp5_ = NULL; + Event* _tmp0_; + EventsEventEntry* _tmp1_; + GeeHashMap* _tmp2_; + Event* _tmp3_; + SidebarEntry* _tmp4_; + GCompareFunc _tmp5_; #line 338 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 338 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3067,22 +3064,22 @@ static void events_branch_graft_event (EventsBranch* self, SidebarEntry* parent, 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_); #line 338 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (entry); -#line 3071 "Branch.c" +#line 3068 "Branch.c" } static void events_branch_reparent_event (EventsBranch* self, Event* event, SidebarEntry* new_parent) { EventsEventEntry* entry = NULL; - GeeHashMap* _tmp0_ = NULL; - Event* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; - EventsEventEntry* _tmp3_ = NULL; + GeeHashMap* _tmp0_; + Event* _tmp1_; + gpointer _tmp2_; + EventsEventEntry* _tmp3_; SidebarEntry* old_parent = NULL; - EventsEventEntry* _tmp4_ = NULL; - SidebarEntry* _tmp5_ = NULL; - SidebarEntry* _tmp6_ = NULL; - SidebarEntry* _tmp7_ = NULL; - EventsEventEntry* _tmp8_ = NULL; + EventsEventEntry* _tmp4_; + SidebarEntry* _tmp5_; + SidebarEntry* _tmp6_; + SidebarEntry* _tmp7_; + EventsEventEntry* _tmp8_; #line 346 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 346 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3119,27 +3116,27 @@ static void events_branch_reparent_event (EventsBranch* self, Event* event, Side sidebar_branch_reparent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala" while (TRUE) { -#line 3123 "Branch.c" +#line 3120 "Branch.c" gboolean _tmp9_ = FALSE; - SidebarEntry* _tmp10_ = NULL; - gint _tmp11_ = 0; + SidebarEntry* _tmp10_; + gint _tmp11_; SidebarEntry* grandparent = NULL; - SidebarEntry* _tmp15_ = NULL; - SidebarEntry* _tmp16_ = NULL; - SidebarEntry* _tmp17_ = NULL; - SidebarEntry* _tmp18_ = NULL; - SidebarEntry* _tmp19_ = NULL; - SidebarEntry* _tmp20_ = NULL; + SidebarEntry* _tmp15_; + SidebarEntry* _tmp16_; + SidebarEntry* _tmp17_; + SidebarEntry* _tmp18_; + SidebarEntry* _tmp19_; + SidebarEntry* _tmp20_; #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp10_ = old_parent; #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp11_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp10_); #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp11_ == 0) { -#line 3140 "Branch.c" - SidebarEntry* _tmp12_ = NULL; - SidebarEntry* _tmp13_ = NULL; - SidebarEntry* _tmp14_ = NULL; +#line 3137 "Branch.c" + SidebarEntry* _tmp12_; + SidebarEntry* _tmp13_; + SidebarEntry* _tmp14_; #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp12_ = old_parent; #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3150,17 +3147,17 @@ static void events_branch_reparent_event (EventsBranch* self, Event* event, Side _tmp9_ = _tmp12_ != _tmp14_; #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (_tmp14_); -#line 3154 "Branch.c" +#line 3151 "Branch.c" } else { #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp9_ = FALSE; -#line 3158 "Branch.c" +#line 3155 "Branch.c" } #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala" if (!_tmp9_) { #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala" break; -#line 3164 "Branch.c" +#line 3161 "Branch.c" } #line 356 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp15_ = old_parent; @@ -3186,46 +3183,46 @@ static void events_branch_reparent_event (EventsBranch* self, Event* event, Side old_parent = _tmp20_; #line 355 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (grandparent); -#line 3190 "Branch.c" +#line 3187 "Branch.c" } #line 346 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (old_parent); #line 346 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (entry); -#line 3196 "Branch.c" +#line 3193 "Branch.c" } static void events_branch_show_no_events (EventsBranch* self, gboolean show) { gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; + gboolean _tmp1_; #line 365 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_if_fail (EVENTS_IS_BRANCH (self)); #line 366 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp1_ = show; #line 366 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp1_) { -#line 3209 "Branch.c" - EventsNoEventEntry* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; +#line 3206 "Branch.c" + EventsNoEventEntry* _tmp2_; + gboolean _tmp3_; #line 366 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp2_ = self->priv->no_event_entry; #line 366 "/home/jens/Source/shotwell/src/events/Branch.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)); #line 366 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp0_ = !_tmp3_; -#line 3218 "Branch.c" +#line 3215 "Branch.c" } else { #line 366 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp0_ = FALSE; -#line 3222 "Branch.c" +#line 3219 "Branch.c" } #line 366 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp0_) { -#line 3226 "Branch.c" - SidebarEntry* _tmp4_ = NULL; - SidebarEntry* _tmp5_ = NULL; - EventsNoEventEntry* _tmp6_ = NULL; +#line 3223 "Branch.c" + SidebarEntry* _tmp4_; + SidebarEntry* _tmp5_; + EventsNoEventEntry* _tmp6_; #line 367 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp4_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 367 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3236,48 +3233,48 @@ static void events_branch_show_no_events (EventsBranch* self, gboolean show) { 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); #line 367 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (_tmp5_); -#line 3240 "Branch.c" +#line 3237 "Branch.c" } else { gboolean _tmp7_ = FALSE; - gboolean _tmp8_ = FALSE; + gboolean _tmp8_; #line 368 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp8_ = show; #line 368 "/home/jens/Source/shotwell/src/events/Branch.vala" if (!_tmp8_) { -#line 3248 "Branch.c" - EventsNoEventEntry* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; +#line 3245 "Branch.c" + EventsNoEventEntry* _tmp9_; + gboolean _tmp10_; #line 368 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp9_ = self->priv->no_event_entry; #line 368 "/home/jens/Source/shotwell/src/events/Branch.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 368 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp7_ = _tmp10_; -#line 3257 "Branch.c" +#line 3254 "Branch.c" } else { #line 368 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp7_ = FALSE; -#line 3261 "Branch.c" +#line 3258 "Branch.c" } #line 368 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp7_) { -#line 3265 "Branch.c" - EventsNoEventEntry* _tmp11_ = NULL; +#line 3262 "Branch.c" + EventsNoEventEntry* _tmp11_; #line 369 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp11_ = self->priv->no_event_entry; #line 369 "/home/jens/Source/shotwell/src/events/Branch.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 3271 "Branch.c" +#line 3268 "Branch.c" } } } static void events_branch_class_init (EventsBranchClass * klass) { - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 7 "/home/jens/Source/shotwell/src/events/Branch.vala" events_branch_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3300,15 +3297,15 @@ static void events_branch_class_init (EventsBranchClass * klass) { _tmp3_ = g_strdup (RESOURCES_ICON_NO_EVENT); #line 11 "/home/jens/Source/shotwell/src/events/Branch.vala" events_branch_no_event_icon = _tmp3_; -#line 3304 "Branch.c" +#line 3301 "Branch.c" } static void events_branch_instance_init (EventsBranch * self) { - GeeHashMap* _tmp0_ = NULL; - EventsUndatedDirectoryEntry* _tmp1_ = NULL; - EventsNoEventEntry* _tmp2_ = NULL; - EventsMasterDirectoryEntry* _tmp3_ = NULL; + GeeHashMap* _tmp0_; + EventsUndatedDirectoryEntry* _tmp1_; + EventsNoEventEntry* _tmp2_; + EventsMasterDirectoryEntry* _tmp3_; #line 7 "/home/jens/Source/shotwell/src/events/Branch.vala" self->priv = EVENTS_BRANCH_GET_PRIVATE (self); #line 18 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3327,21 +3324,21 @@ static void events_branch_instance_init (EventsBranch * self) { _tmp3_ = events_master_directory_entry_new (); #line 22 "/home/jens/Source/shotwell/src/events/Branch.vala" self->priv->all_events_entry = _tmp3_; -#line 3331 "Branch.c" +#line 3328 "Branch.c" } -static void events_branch_finalize (GObject* obj) { +static void events_branch_finalize (GObject * obj) { EventsBranch * self; - EventSourceCollection* _tmp0_ = NULL; - guint _tmp1_ = 0U; - EventSourceCollection* _tmp2_ = NULL; - guint _tmp3_ = 0U; - EventSourceCollection* _tmp4_ = NULL; - guint _tmp5_ = 0U; - ConfigFacade* _tmp6_ = NULL; - ConfigFacade* _tmp7_ = NULL; - guint _tmp8_ = 0U; + EventSourceCollection* _tmp0_; + guint _tmp1_; + EventSourceCollection* _tmp2_; + guint _tmp3_; + EventSourceCollection* _tmp4_; + guint _tmp5_; + ConfigFacade* _tmp6_; + ConfigFacade* _tmp7_; + guint _tmp8_; #line 7 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_BRANCH, EventsBranch); #line 46 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3382,7 +3379,7 @@ static void events_branch_finalize (GObject* obj) { _g_object_unref0 (self->priv->all_events_entry); #line 7 "/home/jens/Source/shotwell/src/events/Branch.vala" G_OBJECT_CLASS (events_branch_parent_class)->finalize (obj); -#line 3386 "Branch.c" +#line 3383 "Branch.c" } @@ -3404,15 +3401,15 @@ EventsDirectoryEntry* events_directory_entry_construct (GType object_type) { self = (EventsDirectoryEntry*) sidebar_simple_page_entry_construct (object_type); #line 374 "/home/jens/Source/shotwell/src/events/Branch.vala" return self; -#line 3408 "Branch.c" +#line 3405 "Branch.c" } static gchar* events_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { EventsDirectoryEntry * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 377 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_DIRECTORY_ENTRY, EventsDirectoryEntry); #line 378 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3423,7 +3420,7 @@ static gchar* events_directory_entry_real_get_sidebar_icon (SidebarSimplePageEnt result = _tmp1_; #line 378 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 3427 "Branch.c" +#line 3424 "Branch.c" } @@ -3436,7 +3433,7 @@ static gboolean events_directory_entry_real_expand_on_select (SidebarExpandableE result = TRUE; #line 382 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 3440 "Branch.c" +#line 3437 "Branch.c" } @@ -3444,8 +3441,8 @@ static void events_directory_entry_class_init (EventsDirectoryEntryClass * klass #line 373 "/home/jens/Source/shotwell/src/events/Branch.vala" events_directory_entry_parent_class = g_type_class_peek_parent (klass); #line 373 "/home/jens/Source/shotwell/src/events/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) events_directory_entry_real_get_sidebar_icon; -#line 3449 "Branch.c" + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_directory_entry_real_get_sidebar_icon; +#line 3446 "Branch.c" } @@ -3453,8 +3450,8 @@ static void events_directory_entry_sidebar_expandable_entry_interface_init (Side #line 373 "/home/jens/Source/shotwell/src/events/Branch.vala" events_directory_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 373 "/home/jens/Source/shotwell/src/events/Branch.vala" - iface->expand_on_select = (gboolean (*)(SidebarExpandableEntry*)) events_directory_entry_real_expand_on_select; -#line 3458 "Branch.c" + iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) events_directory_entry_real_expand_on_select; +#line 3455 "Branch.c" } @@ -3482,21 +3479,21 @@ EventsMasterDirectoryEntry* events_master_directory_entry_construct (GType objec self = (EventsMasterDirectoryEntry*) events_directory_entry_construct (object_type); #line 387 "/home/jens/Source/shotwell/src/events/Branch.vala" return self; -#line 3486 "Branch.c" +#line 3483 "Branch.c" } EventsMasterDirectoryEntry* events_master_directory_entry_new (void) { #line 387 "/home/jens/Source/shotwell/src/events/Branch.vala" return events_master_directory_entry_construct (EVENTS_TYPE_MASTER_DIRECTORY_ENTRY); -#line 3493 "Branch.c" +#line 3490 "Branch.c" } static gchar* events_master_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { EventsMasterDirectoryEntry * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 390 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY, EventsMasterDirectoryEntry); #line 391 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3505,15 +3502,15 @@ static gchar* events_master_directory_entry_real_get_sidebar_name (SidebarSimple result = _tmp0_; #line 391 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 3509 "Branch.c" +#line 3506 "Branch.c" } static gchar* events_master_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { EventsMasterDirectoryEntry * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 394 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY, EventsMasterDirectoryEntry); #line 395 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3524,14 +3521,14 @@ static gchar* events_master_directory_entry_real_get_sidebar_icon (SidebarSimple result = _tmp1_; #line 395 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 3528 "Branch.c" +#line 3525 "Branch.c" } static Page* events_master_directory_entry_real_create_page (SidebarSimplePageEntry* base) { EventsMasterDirectoryEntry * self; Page* result = NULL; - MasterEventsDirectoryPage* _tmp0_ = NULL; + MasterEventsDirectoryPage* _tmp0_; #line 398 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY, EventsMasterDirectoryEntry); #line 399 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3542,7 +3539,7 @@ static Page* events_master_directory_entry_real_create_page (SidebarSimplePageEn result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page); #line 399 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 3546 "Branch.c" +#line 3543 "Branch.c" } @@ -3550,12 +3547,12 @@ static void events_master_directory_entry_class_init (EventsMasterDirectoryEntry #line 386 "/home/jens/Source/shotwell/src/events/Branch.vala" events_master_directory_entry_parent_class = g_type_class_peek_parent (klass); #line 386 "/home/jens/Source/shotwell/src/events/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_master_directory_entry_real_get_sidebar_name; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_master_directory_entry_real_get_sidebar_name; #line 386 "/home/jens/Source/shotwell/src/events/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) events_master_directory_entry_real_get_sidebar_icon; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_master_directory_entry_real_get_sidebar_icon; #line 386 "/home/jens/Source/shotwell/src/events/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_master_directory_entry_real_create_page; -#line 3559 "Branch.c" + ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_master_directory_entry_real_create_page; +#line 3556 "Branch.c" } @@ -3577,9 +3574,9 @@ GType events_master_directory_entry_get_type (void) { EventsYearDirectoryEntry* events_year_directory_entry_construct (GType object_type, const gchar* name, struct tm* tm) { EventsYearDirectoryEntry * self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - struct tm _tmp2_ = {0}; + const gchar* _tmp0_; + gchar* _tmp1_; + struct tm _tmp2_; #line 407 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (name != NULL, NULL); #line 407 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3600,22 +3597,22 @@ EventsYearDirectoryEntry* events_year_directory_entry_construct (GType object_ty self->priv->tm = _tmp2_; #line 407 "/home/jens/Source/shotwell/src/events/Branch.vala" return self; -#line 3604 "Branch.c" +#line 3601 "Branch.c" } EventsYearDirectoryEntry* events_year_directory_entry_new (const gchar* name, struct tm* tm) { #line 407 "/home/jens/Source/shotwell/src/events/Branch.vala" return events_year_directory_entry_construct (EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, name, tm); -#line 3611 "Branch.c" +#line 3608 "Branch.c" } static gchar* events_year_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { EventsYearDirectoryEntry * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 412 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry); #line 413 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3626,14 +3623,14 @@ static gchar* events_year_directory_entry_real_get_sidebar_name (SidebarSimplePa result = _tmp1_; #line 413 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 3630 "Branch.c" +#line 3627 "Branch.c" } gint events_year_directory_entry_get_year (EventsYearDirectoryEntry* self) { gint result = 0; - struct tm _tmp0_ = {0}; - gint _tmp1_ = 0; + struct tm _tmp0_; + gint _tmp1_; #line 416 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (EVENTS_IS_YEAR_DIRECTORY_ENTRY (self), 0); #line 417 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3644,15 +3641,15 @@ gint events_year_directory_entry_get_year (EventsYearDirectoryEntry* self) { result = _tmp1_ + 1900; #line 417 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 3648 "Branch.c" +#line 3645 "Branch.c" } static Page* events_year_directory_entry_real_create_page (SidebarSimplePageEntry* base) { EventsYearDirectoryEntry * self; Page* result = NULL; - struct tm _tmp0_ = {0}; - SubEventsDirectoryPage* _tmp1_ = NULL; + struct tm _tmp0_; + SubEventsDirectoryPage* _tmp1_; #line 420 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry); #line 421 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3665,7 +3662,7 @@ static Page* events_year_directory_entry_real_create_page (SidebarSimplePageEntr result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 421 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 3669 "Branch.c" +#line 3666 "Branch.c" } @@ -3675,23 +3672,23 @@ static void events_year_directory_entry_class_init (EventsYearDirectoryEntryClas #line 403 "/home/jens/Source/shotwell/src/events/Branch.vala" g_type_class_add_private (klass, sizeof (EventsYearDirectoryEntryPrivate)); #line 403 "/home/jens/Source/shotwell/src/events/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_year_directory_entry_real_get_sidebar_name; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_year_directory_entry_real_get_sidebar_name; #line 403 "/home/jens/Source/shotwell/src/events/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_year_directory_entry_real_create_page; + ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_year_directory_entry_real_create_page; #line 403 "/home/jens/Source/shotwell/src/events/Branch.vala" G_OBJECT_CLASS (klass)->finalize = events_year_directory_entry_finalize; -#line 3684 "Branch.c" +#line 3681 "Branch.c" } static void events_year_directory_entry_instance_init (EventsYearDirectoryEntry * self) { #line 403 "/home/jens/Source/shotwell/src/events/Branch.vala" self->priv = EVENTS_YEAR_DIRECTORY_ENTRY_GET_PRIVATE (self); -#line 3691 "Branch.c" +#line 3688 "Branch.c" } -static void events_year_directory_entry_finalize (GObject* obj) { +static void events_year_directory_entry_finalize (GObject * obj) { EventsYearDirectoryEntry * self; #line 403 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry); @@ -3699,7 +3696,7 @@ static void events_year_directory_entry_finalize (GObject* obj) { _g_free0 (self->priv->name); #line 403 "/home/jens/Source/shotwell/src/events/Branch.vala" G_OBJECT_CLASS (events_year_directory_entry_parent_class)->finalize (obj); -#line 3703 "Branch.c" +#line 3700 "Branch.c" } @@ -3717,9 +3714,9 @@ GType events_year_directory_entry_get_type (void) { EventsMonthDirectoryEntry* events_month_directory_entry_construct (GType object_type, const gchar* name, struct tm* tm) { EventsMonthDirectoryEntry * self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - struct tm _tmp2_ = {0}; + const gchar* _tmp0_; + gchar* _tmp1_; + struct tm _tmp2_; #line 429 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (name != NULL, NULL); #line 429 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3740,22 +3737,22 @@ EventsMonthDirectoryEntry* events_month_directory_entry_construct (GType object_ self->priv->tm = _tmp2_; #line 429 "/home/jens/Source/shotwell/src/events/Branch.vala" return self; -#line 3744 "Branch.c" +#line 3741 "Branch.c" } EventsMonthDirectoryEntry* events_month_directory_entry_new (const gchar* name, struct tm* tm) { #line 429 "/home/jens/Source/shotwell/src/events/Branch.vala" return events_month_directory_entry_construct (EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, name, tm); -#line 3751 "Branch.c" +#line 3748 "Branch.c" } static gchar* events_month_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { EventsMonthDirectoryEntry * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 434 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry); #line 435 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3766,14 +3763,14 @@ static gchar* events_month_directory_entry_real_get_sidebar_name (SidebarSimpleP result = _tmp1_; #line 435 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 3770 "Branch.c" +#line 3767 "Branch.c" } gint events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self) { gint result = 0; - struct tm _tmp0_ = {0}; - gint _tmp1_ = 0; + struct tm _tmp0_; + gint _tmp1_; #line 438 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (EVENTS_IS_MONTH_DIRECTORY_ENTRY (self), 0); #line 439 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3784,14 +3781,14 @@ gint events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self) { result = _tmp1_ + 1900; #line 439 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 3788 "Branch.c" +#line 3785 "Branch.c" } gint events_month_directory_entry_get_month (EventsMonthDirectoryEntry* self) { gint result = 0; - struct tm _tmp0_ = {0}; - gint _tmp1_ = 0; + struct tm _tmp0_; + gint _tmp1_; #line 442 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (EVENTS_IS_MONTH_DIRECTORY_ENTRY (self), 0); #line 443 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3802,15 +3799,15 @@ gint events_month_directory_entry_get_month (EventsMonthDirectoryEntry* self) { result = _tmp1_ + 1; #line 443 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 3806 "Branch.c" +#line 3803 "Branch.c" } static Page* events_month_directory_entry_real_create_page (SidebarSimplePageEntry* base) { EventsMonthDirectoryEntry * self; Page* result = NULL; - struct tm _tmp0_ = {0}; - SubEventsDirectoryPage* _tmp1_ = NULL; + struct tm _tmp0_; + SubEventsDirectoryPage* _tmp1_; #line 446 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry); #line 447 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3823,7 +3820,7 @@ static Page* events_month_directory_entry_real_create_page (SidebarSimplePageEnt result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 447 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 3827 "Branch.c" +#line 3824 "Branch.c" } @@ -3833,23 +3830,23 @@ static void events_month_directory_entry_class_init (EventsMonthDirectoryEntryCl #line 425 "/home/jens/Source/shotwell/src/events/Branch.vala" g_type_class_add_private (klass, sizeof (EventsMonthDirectoryEntryPrivate)); #line 425 "/home/jens/Source/shotwell/src/events/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_month_directory_entry_real_get_sidebar_name; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_month_directory_entry_real_get_sidebar_name; #line 425 "/home/jens/Source/shotwell/src/events/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_month_directory_entry_real_create_page; + ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_month_directory_entry_real_create_page; #line 425 "/home/jens/Source/shotwell/src/events/Branch.vala" G_OBJECT_CLASS (klass)->finalize = events_month_directory_entry_finalize; -#line 3842 "Branch.c" +#line 3839 "Branch.c" } static void events_month_directory_entry_instance_init (EventsMonthDirectoryEntry * self) { #line 425 "/home/jens/Source/shotwell/src/events/Branch.vala" self->priv = EVENTS_MONTH_DIRECTORY_ENTRY_GET_PRIVATE (self); -#line 3849 "Branch.c" +#line 3846 "Branch.c" } -static void events_month_directory_entry_finalize (GObject* obj) { +static void events_month_directory_entry_finalize (GObject * obj) { EventsMonthDirectoryEntry * self; #line 425 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry); @@ -3857,7 +3854,7 @@ static void events_month_directory_entry_finalize (GObject* obj) { _g_free0 (self->priv->name); #line 425 "/home/jens/Source/shotwell/src/events/Branch.vala" G_OBJECT_CLASS (events_month_directory_entry_parent_class)->finalize (obj); -#line 3861 "Branch.c" +#line 3858 "Branch.c" } @@ -3879,21 +3876,21 @@ EventsUndatedDirectoryEntry* events_undated_directory_entry_construct (GType obj self = (EventsUndatedDirectoryEntry*) events_directory_entry_construct (object_type); #line 452 "/home/jens/Source/shotwell/src/events/Branch.vala" return self; -#line 3883 "Branch.c" +#line 3880 "Branch.c" } EventsUndatedDirectoryEntry* events_undated_directory_entry_new (void) { #line 452 "/home/jens/Source/shotwell/src/events/Branch.vala" return events_undated_directory_entry_construct (EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY); -#line 3890 "Branch.c" +#line 3887 "Branch.c" } static gchar* events_undated_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { EventsUndatedDirectoryEntry * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 455 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY, EventsUndatedDirectoryEntry); #line 456 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3902,7 +3899,7 @@ static gchar* events_undated_directory_entry_real_get_sidebar_name (SidebarSimpl result = _tmp0_; #line 456 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 3906 "Branch.c" +#line 3903 "Branch.c" } @@ -3910,7 +3907,7 @@ static Page* events_undated_directory_entry_real_create_page (SidebarSimplePageE EventsUndatedDirectoryEntry * self; Page* result = NULL; struct tm _tmp0_ = {0}; - SubEventsDirectoryPage* _tmp1_ = NULL; + SubEventsDirectoryPage* _tmp1_; #line 459 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY, EventsUndatedDirectoryEntry); #line 460 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3923,7 +3920,7 @@ static Page* events_undated_directory_entry_real_create_page (SidebarSimplePageE result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 460 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 3927 "Branch.c" +#line 3924 "Branch.c" } @@ -3931,10 +3928,10 @@ static void events_undated_directory_entry_class_init (EventsUndatedDirectoryEnt #line 451 "/home/jens/Source/shotwell/src/events/Branch.vala" events_undated_directory_entry_parent_class = g_type_class_peek_parent (klass); #line 451 "/home/jens/Source/shotwell/src/events/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_undated_directory_entry_real_get_sidebar_name; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_undated_directory_entry_real_get_sidebar_name; #line 451 "/home/jens/Source/shotwell/src/events/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_undated_directory_entry_real_create_page; -#line 3938 "Branch.c" + ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_undated_directory_entry_real_create_page; +#line 3935 "Branch.c" } @@ -3956,8 +3953,8 @@ GType events_undated_directory_entry_get_type (void) { EventsEventEntry* events_event_entry_construct (GType object_type, Event* event) { EventsEventEntry * self = NULL; - Event* _tmp0_ = NULL; - Event* _tmp1_ = NULL; + Event* _tmp0_; + Event* _tmp1_; #line 469 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (IS_EVENT (event), NULL); #line 469 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3972,21 +3969,21 @@ EventsEventEntry* events_event_entry_construct (GType object_type, Event* event) self->priv->event = _tmp1_; #line 469 "/home/jens/Source/shotwell/src/events/Branch.vala" return self; -#line 3976 "Branch.c" +#line 3973 "Branch.c" } EventsEventEntry* events_event_entry_new (Event* event) { #line 469 "/home/jens/Source/shotwell/src/events/Branch.vala" return events_event_entry_construct (EVENTS_TYPE_EVENT_ENTRY, event); -#line 3983 "Branch.c" +#line 3980 "Branch.c" } Event* events_event_entry_get_event (EventsEventEntry* self) { Event* result = NULL; - Event* _tmp0_ = NULL; - Event* _tmp1_ = NULL; + Event* _tmp0_; + Event* _tmp1_; #line 473 "/home/jens/Source/shotwell/src/events/Branch.vala" g_return_val_if_fail (EVENTS_IS_EVENT_ENTRY (self), NULL); #line 474 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -3997,15 +3994,15 @@ Event* events_event_entry_get_event (EventsEventEntry* self) { result = _tmp1_; #line 474 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 4001 "Branch.c" +#line 3998 "Branch.c" } static gchar* events_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { EventsEventEntry * self; gchar* result = NULL; - Event* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + Event* _tmp0_; + gchar* _tmp1_; #line 477 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry); #line 478 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -4016,15 +4013,15 @@ static gchar* events_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* result = _tmp1_; #line 478 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 4020 "Branch.c" +#line 4017 "Branch.c" } static gchar* events_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { EventsEventEntry * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 481 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry); #line 482 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -4035,15 +4032,15 @@ static gchar* events_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* result = _tmp1_; #line 482 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 4039 "Branch.c" +#line 4036 "Branch.c" } static Page* events_event_entry_real_create_page (SidebarSimplePageEntry* base) { EventsEventEntry * self; Page* result = NULL; - Event* _tmp0_ = NULL; - EventPage* _tmp1_ = NULL; + Event* _tmp0_; + EventPage* _tmp1_; #line 485 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry); #line 486 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -4056,7 +4053,7 @@ static Page* events_event_entry_real_create_page (SidebarSimplePageEntry* base) result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 486 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 4060 "Branch.c" +#line 4057 "Branch.c" } @@ -4069,16 +4066,16 @@ static gboolean events_event_entry_real_is_user_renameable (SidebarRenameableEnt result = TRUE; #line 490 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 4073 "Branch.c" +#line 4070 "Branch.c" } static void events_event_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name) { EventsEventEntry * self; gchar* prepped = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; #line 493 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry); #line 493 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -4093,13 +4090,13 @@ static void events_event_entry_real_rename (SidebarRenameableEntry* base, const _tmp2_ = prepped; #line 495 "/home/jens/Source/shotwell/src/events/Branch.vala" if (_tmp2_ != NULL) { -#line 4097 "Branch.c" - CommandManager* _tmp3_ = NULL; - CommandManager* _tmp4_ = NULL; - Event* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - RenameEventCommand* _tmp7_ = NULL; - RenameEventCommand* _tmp8_ = NULL; +#line 4094 "Branch.c" + CommandManager* _tmp3_; + CommandManager* _tmp4_; + Event* _tmp5_; + const gchar* _tmp6_; + RenameEventCommand* _tmp7_; + RenameEventCommand* _tmp8_; #line 496 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp3_ = app_window_get_command_manager (); #line 496 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -4118,11 +4115,11 @@ static void events_event_entry_real_rename (SidebarRenameableEntry* base, const _g_object_unref0 (_tmp8_); #line 496 "/home/jens/Source/shotwell/src/events/Branch.vala" _command_manager_unref0 (_tmp4_); -#line 4122 "Branch.c" +#line 4119 "Branch.c" } #line 493 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_free0 (prepped); -#line 4126 "Branch.c" +#line 4123 "Branch.c" } @@ -4130,13 +4127,13 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD EventsEventEntry * self; gboolean result = FALSE; GeeArrayList* views = NULL; - GeeArrayList* _tmp0_ = NULL; - CommandManager* _tmp16_ = NULL; - CommandManager* _tmp17_ = NULL; - GeeArrayList* _tmp18_ = NULL; - Event* _tmp19_ = NULL; - SetEventCommand* _tmp20_ = NULL; - SetEventCommand* _tmp21_ = NULL; + GeeArrayList* _tmp0_; + CommandManager* _tmp16_; + CommandManager* _tmp17_; + GeeArrayList* _tmp18_; + Event* _tmp19_; + SetEventCommand* _tmp20_; + SetEventCommand* _tmp21_; #line 499 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry); #line 499 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -4145,15 +4142,15 @@ 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 502 "/home/jens/Source/shotwell/src/events/Branch.vala" views = _tmp0_; -#line 4149 "Branch.c" +#line 4146 "Branch.c" { GeeList* _media_source_list = NULL; - GeeList* _tmp1_ = NULL; - GeeList* _tmp2_ = NULL; + GeeList* _tmp1_; + GeeList* _tmp2_; gint _media_source_size = 0; - GeeList* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; + GeeList* _tmp3_; + gint _tmp4_; + gint _tmp5_; gint _media_source_index = 0; #line 503 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp1_ = media; @@ -4173,18 +4170,18 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD _media_source_index = -1; #line 503 "/home/jens/Source/shotwell/src/events/Branch.vala" while (TRUE) { -#line 4177 "Branch.c" - gint _tmp6_ = 0; - gint _tmp7_ = 0; - gint _tmp8_ = 0; +#line 4174 "Branch.c" + gint _tmp6_; + gint _tmp7_; + gint _tmp8_; MediaSource* media_source = NULL; - GeeList* _tmp9_ = NULL; - gint _tmp10_ = 0; - gpointer _tmp11_ = NULL; - GeeArrayList* _tmp12_ = NULL; - MediaSource* _tmp13_ = NULL; - DataView* _tmp14_ = NULL; - DataView* _tmp15_ = NULL; + GeeList* _tmp9_; + gint _tmp10_; + gpointer _tmp11_; + GeeArrayList* _tmp12_; + MediaSource* _tmp13_; + DataView* _tmp14_; + DataView* _tmp15_; #line 503 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp6_ = _media_source_index; #line 503 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -4197,7 +4194,7 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD if (!(_tmp7_ < _tmp8_)) { #line 503 "/home/jens/Source/shotwell/src/events/Branch.vala" break; -#line 4201 "Branch.c" +#line 4198 "Branch.c" } #line 503 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp9_ = _media_source_list; @@ -4221,11 +4218,11 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD _g_object_unref0 (_tmp15_); #line 503 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (media_source); -#line 4225 "Branch.c" +#line 4222 "Branch.c" } #line 503 "/home/jens/Source/shotwell/src/events/Branch.vala" _g_object_unref0 (_media_source_list); -#line 4229 "Branch.c" +#line 4226 "Branch.c" } #line 506 "/home/jens/Source/shotwell/src/events/Branch.vala" _tmp16_ = app_window_get_command_manager (); @@ -4251,7 +4248,7 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD _g_object_unref0 (views); #line 508 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 4255 "Branch.c" +#line 4252 "Branch.c" } @@ -4266,7 +4263,7 @@ static gboolean events_event_entry_real_internal_drop_received_arbitrary (Sideba result = FALSE; #line 512 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 4270 "Branch.c" +#line 4267 "Branch.c" } @@ -4276,14 +4273,14 @@ static void events_event_entry_class_init (EventsEventEntryClass * klass) { #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala" g_type_class_add_private (klass, sizeof (EventsEventEntryPrivate)); #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_event_entry_real_get_sidebar_name; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_event_entry_real_get_sidebar_name; #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) events_event_entry_real_get_sidebar_icon; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_event_entry_real_get_sidebar_icon; #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_event_entry_real_create_page; + ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_event_entry_real_create_page; #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala" G_OBJECT_CLASS (klass)->finalize = events_event_entry_finalize; -#line 4287 "Branch.c" +#line 4284 "Branch.c" } @@ -4291,10 +4288,10 @@ static void events_event_entry_sidebar_renameable_entry_interface_init (SidebarR #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala" events_event_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala" - iface->is_user_renameable = (gboolean (*)(SidebarRenameableEntry*)) events_event_entry_real_is_user_renameable; + iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) events_event_entry_real_is_user_renameable; #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala" - iface->rename = (void (*)(SidebarRenameableEntry*, const gchar*)) events_event_entry_real_rename; -#line 4298 "Branch.c" + iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) events_event_entry_real_rename; +#line 4295 "Branch.c" } @@ -4302,21 +4299,21 @@ static void events_event_entry_sidebar_internal_drop_target_entry_interface_init #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala" events_event_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface); #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala" - iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) events_event_entry_real_internal_drop_received; + iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) events_event_entry_real_internal_drop_received; #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala" - iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) events_event_entry_real_internal_drop_received_arbitrary; -#line 4309 "Branch.c" + iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) events_event_entry_real_internal_drop_received_arbitrary; +#line 4306 "Branch.c" } static void events_event_entry_instance_init (EventsEventEntry * self) { #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala" self->priv = EVENTS_EVENT_ENTRY_GET_PRIVATE (self); -#line 4316 "Branch.c" +#line 4313 "Branch.c" } -static void events_event_entry_finalize (GObject* obj) { +static void events_event_entry_finalize (GObject * obj) { EventsEventEntry * self; #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry); @@ -4324,7 +4321,7 @@ static void events_event_entry_finalize (GObject* obj) { _g_object_unref0 (self->priv->event); #line 465 "/home/jens/Source/shotwell/src/events/Branch.vala" G_OBJECT_CLASS (events_event_entry_parent_class)->finalize (obj); -#line 4328 "Branch.c" +#line 4325 "Branch.c" } @@ -4350,21 +4347,21 @@ EventsNoEventEntry* events_no_event_entry_construct (GType object_type) { self = (EventsNoEventEntry*) sidebar_simple_page_entry_construct (object_type); #line 518 "/home/jens/Source/shotwell/src/events/Branch.vala" return self; -#line 4354 "Branch.c" +#line 4351 "Branch.c" } EventsNoEventEntry* events_no_event_entry_new (void) { #line 518 "/home/jens/Source/shotwell/src/events/Branch.vala" return events_no_event_entry_construct (EVENTS_TYPE_NO_EVENT_ENTRY); -#line 4361 "Branch.c" +#line 4358 "Branch.c" } static gchar* events_no_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { EventsNoEventEntry * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 521 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_NO_EVENT_ENTRY, EventsNoEventEntry); #line 522 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -4373,15 +4370,15 @@ static gchar* events_no_event_entry_real_get_sidebar_name (SidebarSimplePageEntr result = _tmp0_; #line 522 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 4377 "Branch.c" +#line 4374 "Branch.c" } static gchar* events_no_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) { EventsNoEventEntry * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 525 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_NO_EVENT_ENTRY, EventsNoEventEntry); #line 526 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -4392,14 +4389,14 @@ static gchar* events_no_event_entry_real_get_sidebar_icon (SidebarSimplePageEntr result = _tmp1_; #line 526 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 4396 "Branch.c" +#line 4393 "Branch.c" } static Page* events_no_event_entry_real_create_page (SidebarSimplePageEntry* base) { EventsNoEventEntry * self; Page* result = NULL; - NoEventPage* _tmp0_ = NULL; + NoEventPage* _tmp0_; #line 529 "/home/jens/Source/shotwell/src/events/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_NO_EVENT_ENTRY, EventsNoEventEntry); #line 530 "/home/jens/Source/shotwell/src/events/Branch.vala" @@ -4410,7 +4407,7 @@ static Page* events_no_event_entry_real_create_page (SidebarSimplePageEntry* bas result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page); #line 530 "/home/jens/Source/shotwell/src/events/Branch.vala" return result; -#line 4414 "Branch.c" +#line 4411 "Branch.c" } @@ -4418,12 +4415,12 @@ static void events_no_event_entry_class_init (EventsNoEventEntryClass * klass) { #line 517 "/home/jens/Source/shotwell/src/events/Branch.vala" events_no_event_entry_parent_class = g_type_class_peek_parent (klass); #line 517 "/home/jens/Source/shotwell/src/events/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_no_event_entry_real_get_sidebar_name; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_no_event_entry_real_get_sidebar_name; #line 517 "/home/jens/Source/shotwell/src/events/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) events_no_event_entry_real_get_sidebar_icon; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_no_event_entry_real_get_sidebar_icon; #line 517 "/home/jens/Source/shotwell/src/events/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_no_event_entry_real_create_page; -#line 4427 "Branch.c" + ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_no_event_entry_real_create_page; +#line 4424 "Branch.c" } |