diff options
Diffstat (limited to 'src/folders')
| -rw-r--r-- | src/folders/Branch.c | 525 | ||||
| -rw-r--r-- | src/folders/Folders.c | 6 | ||||
| -rw-r--r-- | src/folders/Page.c | 88 |
3 files changed, 312 insertions, 307 deletions
diff --git a/src/folders/Branch.c b/src/folders/Branch.c index 5f20e23..95fb127 100644 --- a/src/folders/Branch.c +++ b/src/folders/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. @@ -445,7 +445,7 @@ static gpointer folders_root_parent_class = NULL; static gpointer folders_sidebar_entry_parent_class = NULL; extern gchar* folders_icon; extern gchar* folders_have_photos_icon; -static SidebarExpandableEntryIface* folders_sidebar_entry_sidebar_expandable_entry_parent_iface = NULL; +static SidebarExpandableEntryIface * folders_sidebar_entry_sidebar_expandable_entry_parent_iface = NULL; GType sidebar_branch_get_type (void) G_GNUC_CONST; GType folders_branch_get_type (void) G_GNUC_CONST; @@ -516,7 +516,7 @@ gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent); GFile* folders_sidebar_entry_get_dir (FoldersSidebarEntry* self); SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry); void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry); -static void folders_branch_finalize (GObject* obj); +static void folders_branch_finalize (GObject * obj); GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST; GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST; GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST; @@ -532,9 +532,9 @@ GType sidebar_contextable_get_type (void) G_GNUC_CONST; #define FOLDERS_SIDEBAR_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntryPrivate)) enum { FOLDERS_SIDEBAR_ENTRY_DUMMY_PROPERTY, - FOLDERS_SIDEBAR_ENTRY_DIR, - FOLDERS_SIDEBAR_ENTRY_COLLATION, - FOLDERS_SIDEBAR_ENTRY_COUNT + FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY, + FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY, + FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY }; SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type); static void folders_sidebar_entry_set_dir (FoldersSidebarEntry* self, GFile* value); @@ -552,7 +552,7 @@ GType media_page_get_type (void) G_GNUC_CONST; GType collection_page_get_type (void) G_GNUC_CONST; GType folders_page_get_type (void) G_GNUC_CONST; gchar* sidebar_simple_page_entry_get_sidebar_icon (SidebarSimplePageEntry* self); -static void folders_sidebar_entry_finalize (GObject* obj); +static void folders_sidebar_entry_finalize (GObject * obj); static void _vala_folders_sidebar_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_folders_sidebar_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -593,10 +593,10 @@ static gint _folders_branch_comparator_gcompare_func (gconstpointer a, gconstpoi FoldersBranch* folders_branch_construct (GType object_type) { FoldersBranch * self = NULL; - FoldersRoot* _tmp0_ = NULL; - FoldersRoot* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; + FoldersRoot* _tmp0_; + FoldersRoot* _tmp1_; + const gchar* _tmp2_; + GFile* _tmp3_; #line 13 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp0_ = folders_root_new (); #line 13 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -616,12 +616,12 @@ FoldersBranch* folders_branch_construct (GType object_type) { #line 617 "Branch.c" { GeeIterator* _sources_it = NULL; - MediaCollectionRegistry* _tmp4_ = NULL; - MediaCollectionRegistry* _tmp5_ = NULL; - GeeCollection* _tmp6_ = NULL; - GeeCollection* _tmp7_ = NULL; - GeeIterator* _tmp8_ = NULL; - GeeIterator* _tmp9_ = NULL; + MediaCollectionRegistry* _tmp4_; + MediaCollectionRegistry* _tmp5_; + GeeCollection* _tmp6_; + GeeCollection* _tmp7_; + GeeIterator* _tmp8_; + GeeIterator* _tmp9_; #line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp4_ = media_collection_registry_get_instance (); #line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -643,15 +643,15 @@ FoldersBranch* folders_branch_construct (GType object_type) { #line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala" while (TRUE) { #line 646 "Branch.c" - GeeIterator* _tmp10_ = NULL; - gboolean _tmp11_ = FALSE; + GeeIterator* _tmp10_; + gboolean _tmp11_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp12_ = NULL; - gpointer _tmp13_ = NULL; - MediaSourceCollection* _tmp14_ = NULL; - GeeCollection* _tmp15_ = NULL; - GeeCollection* _tmp16_ = NULL; - MediaSourceCollection* _tmp17_ = NULL; + GeeIterator* _tmp12_; + gpointer _tmp13_; + MediaSourceCollection* _tmp14_; + GeeCollection* _tmp15_; + GeeCollection* _tmp16_; + MediaSourceCollection* _tmp17_; #line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp10_ = _sources_it; #line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -705,18 +705,18 @@ FoldersBranch* folders_branch_new (void) { static gint folders_branch_comparator (SidebarEntry* a, SidebarEntry* b) { gint result = 0; - SidebarEntry* _tmp0_ = NULL; - SidebarEntry* _tmp1_ = NULL; + SidebarEntry* _tmp0_; + SidebarEntry* _tmp1_; gint coll_key_equality = 0; - GCompareFunc _tmp2_ = NULL; - SidebarEntry* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - SidebarEntry* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - gint _tmp9_ = 0; - gint _tmp10_ = 0; + GCompareFunc _tmp2_; + SidebarEntry* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; + SidebarEntry* _tmp6_; + const gchar* _tmp7_; + const gchar* _tmp8_; + gint _tmp9_; + gint _tmp10_; #line 34 "/home/jens/Source/shotwell/src/folders/Branch.vala" g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0); #line 34 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -756,15 +756,15 @@ static gint folders_branch_comparator (SidebarEntry* a, SidebarEntry* b) { #line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala" if (_tmp10_ == 0) { #line 759 "Branch.c" - GCompareFunc _tmp11_ = NULL; - SidebarEntry* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - SidebarEntry* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gint _tmp18_ = 0; - gint _tmp19_ = 0; + GCompareFunc _tmp11_; + SidebarEntry* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + SidebarEntry* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gint _tmp18_; + gint _tmp19_; #line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp11_ = g_strcmp0; #line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -802,8 +802,8 @@ static gint folders_branch_comparator (SidebarEntry* a, SidebarEntry* b) { static void folders_branch_on_master_source_replaced (FoldersBranch* self, MediaSource* media_source, GFile* old_file, GFile* new_file) { - GFile* _tmp0_ = NULL; - MediaSource* _tmp1_ = NULL; + GFile* _tmp0_; + MediaSource* _tmp1_; #line 51 "/home/jens/Source/shotwell/src/folders/Branch.vala" g_return_if_fail (FOLDERS_IS_BRANCH (self)); #line 51 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -832,8 +832,8 @@ static void _folders_branch_on_master_source_replaced_media_source_master_replac static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIterable* added, GeeIterable* removed) { - GeeIterable* _tmp0_ = NULL; - GeeIterable* _tmp9_ = NULL; + GeeIterable* _tmp0_; + GeeIterable* _tmp9_; #line 56 "/home/jens/Source/shotwell/src/folders/Branch.vala" g_return_if_fail (FOLDERS_IS_BRANCH (self)); #line 56 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -847,8 +847,8 @@ static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIt #line 848 "Branch.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeIterable* _tmp1_; + GeeIterator* _tmp2_; #line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp1_ = added; #line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -858,13 +858,13 @@ static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIt #line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala" while (TRUE) { #line 861 "Branch.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GeeIterator* _tmp3_; + gboolean _tmp4_; DataObject* object = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; - DataObject* _tmp7_ = NULL; - DataObject* _tmp8_ = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; + DataObject* _tmp7_; + DataObject* _tmp8_; #line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp3_ = _object_it; #line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -905,8 +905,8 @@ static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIt #line 906 "Branch.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp10_ = NULL; - GeeIterator* _tmp11_ = NULL; + GeeIterable* _tmp10_; + GeeIterator* _tmp11_; #line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp10_ = removed; #line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -916,16 +916,16 @@ static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIt #line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala" while (TRUE) { #line 919 "Branch.c" - GeeIterator* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; + GeeIterator* _tmp12_; + gboolean _tmp13_; DataObject* object = NULL; - GeeIterator* _tmp14_ = NULL; - gpointer _tmp15_ = NULL; - DataObject* _tmp16_ = NULL; - GFile* _tmp17_ = NULL; - GFile* _tmp18_ = NULL; - DataObject* _tmp19_ = NULL; - guint _tmp20_ = 0U; + GeeIterator* _tmp14_; + gpointer _tmp15_; + DataObject* _tmp16_; + GFile* _tmp17_; + GFile* _tmp18_; + DataObject* _tmp19_; + guint _tmp20_; #line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp12_ = _object_it; #line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -979,13 +979,13 @@ static gpointer _g_object_ref0 (gpointer self) { static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) { GFile* file = NULL; - MediaSource* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; + MediaSource* _tmp0_; + GFile* _tmp1_; GeeArrayList* elements = NULL; - GeeArrayList* _tmp2_ = NULL; + GeeArrayList* _tmp2_; GFile* parent = NULL; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; + GFile* _tmp3_; + GFile* _tmp4_; FoldersSidebarEntry* parent_entry = NULL; #line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala" g_return_if_fail (FOLDERS_IS_BRANCH (self)); @@ -1010,17 +1010,17 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) { #line 79 "/home/jens/Source/shotwell/src/folders/Branch.vala" while (TRUE) { #line 1013 "Branch.c" - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; - gboolean _tmp11_ = FALSE; - GeeArrayList* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; - GFile* _tmp15_ = NULL; + GFile* _tmp5_; + GFile* _tmp6_; + GFile* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; + gboolean _tmp10_; + gboolean _tmp11_; + GeeArrayList* _tmp12_; + GFile* _tmp13_; + GFile* _tmp14_; + GFile* _tmp15_; #line 79 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp5_ = parent; #line 79 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1070,9 +1070,9 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) { #line 1071 "Branch.c" { gint ctr = 0; - GeeArrayList* _tmp16_ = NULL; - gint _tmp17_ = 0; - gint _tmp18_ = 0; + GeeArrayList* _tmp16_; + gint _tmp17_; + gint _tmp18_; #line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp16_ = elements; #line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1089,23 +1089,23 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) { #line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala" while (TRUE) { #line 1092 "Branch.c" - gint _tmp21_ = 0; + gint _tmp21_; GFile* parent_dir = NULL; - GeeArrayList* _tmp22_ = NULL; - gint _tmp23_ = 0; - gpointer _tmp24_ = NULL; + GeeArrayList* _tmp22_; + gint _tmp23_; + gpointer _tmp24_; FoldersSidebarEntry* old_parent_entry = NULL; - FoldersSidebarEntry* _tmp25_ = NULL; - FoldersSidebarEntry* _tmp26_ = NULL; - GeeHashMap* _tmp27_ = NULL; - GFile* _tmp28_ = NULL; - gpointer _tmp29_ = NULL; - FoldersSidebarEntry* _tmp30_ = NULL; - gint _tmp42_ = 0; + FoldersSidebarEntry* _tmp25_; + FoldersSidebarEntry* _tmp26_; + GeeHashMap* _tmp27_; + GFile* _tmp28_; + gpointer _tmp29_; + FoldersSidebarEntry* _tmp30_; + gint _tmp42_; #line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala" if (!_tmp19_) { #line 1108 "Branch.c" - gint _tmp20_ = 0; + gint _tmp20_; #line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp20_ = ctr; #line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1151,14 +1151,14 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) { #line 99 "/home/jens/Source/shotwell/src/folders/Branch.vala" if (_tmp30_ == NULL) { #line 1154 "Branch.c" - GFile* _tmp31_ = NULL; - FoldersSidebarEntry* _tmp32_ = NULL; - GeeHashMap* _tmp33_ = NULL; - GFile* _tmp34_ = NULL; - FoldersSidebarEntry* _tmp35_ = NULL; + GFile* _tmp31_; + FoldersSidebarEntry* _tmp32_; + GeeHashMap* _tmp33_; + GFile* _tmp34_; + FoldersSidebarEntry* _tmp35_; SidebarEntry* _tmp36_ = NULL; - FoldersSidebarEntry* _tmp37_ = NULL; - FoldersSidebarEntry* _tmp41_ = NULL; + FoldersSidebarEntry* _tmp37_; + FoldersSidebarEntry* _tmp41_; #line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp31_ = parent_dir; #line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1180,7 +1180,7 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) { #line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala" if (_tmp37_ == NULL) { #line 1183 "Branch.c" - SidebarEntry* _tmp38_ = NULL; + SidebarEntry* _tmp38_; #line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp38_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch)); #line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1189,8 +1189,8 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) { _tmp36_ = _tmp38_; #line 1191 "Branch.c" } else { - FoldersSidebarEntry* _tmp39_ = NULL; - SidebarEntry* _tmp40_ = NULL; + FoldersSidebarEntry* _tmp39_; + SidebarEntry* _tmp40_; #line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp39_ = old_parent_entry; #line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1214,9 +1214,9 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) { #line 107 "/home/jens/Source/shotwell/src/folders/Branch.vala" if (_tmp42_ == 0) { #line 1217 "Branch.c" - FoldersSidebarEntry* _tmp43_ = NULL; - gint _tmp44_ = 0; - gint _tmp45_ = 0; + FoldersSidebarEntry* _tmp43_; + gint _tmp44_; + gint _tmp45_; #line 108 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp43_ = parent_entry; #line 108 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1249,26 +1249,26 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) { static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) { FoldersSidebarEntry* folder_entry = NULL; - GeeHashMap* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - gpointer _tmp4_ = NULL; - FoldersSidebarEntry* _tmp5_ = NULL; - FoldersSidebarEntry* _tmp6_ = NULL; - FoldersSidebarEntry* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; + GeeHashMap* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; + gpointer _tmp4_; + FoldersSidebarEntry* _tmp5_; + FoldersSidebarEntry* _tmp6_; + FoldersSidebarEntry* _tmp7_; + gint _tmp8_; + gint _tmp9_; gboolean _tmp10_ = FALSE; - FoldersSidebarEntry* _tmp11_ = NULL; - FoldersSidebarEntry* _tmp12_ = NULL; - gint _tmp13_ = 0; - gint _tmp14_ = 0; + FoldersSidebarEntry* _tmp11_; + FoldersSidebarEntry* _tmp12_; + gint _tmp13_; + gint _tmp14_; FoldersSidebarEntry* prune_point = NULL; - FoldersSidebarEntry* _tmp17_ = NULL; - FoldersSidebarEntry* _tmp18_ = NULL; - FoldersSidebarEntry* _tmp19_ = NULL; - FoldersSidebarEntry* _tmp40_ = NULL; + FoldersSidebarEntry* _tmp17_; + FoldersSidebarEntry* _tmp18_; + FoldersSidebarEntry* _tmp19_; + FoldersSidebarEntry* _tmp40_; #line 112 "/home/jens/Source/shotwell/src/folders/Branch.vala" g_return_if_fail (FOLDERS_IS_BRANCH (self)); #line 112 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1323,8 +1323,8 @@ static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) { _tmp10_ = TRUE; #line 1325 "Branch.c" } else { - FoldersSidebarEntry* _tmp15_ = NULL; - gint _tmp16_ = 0; + FoldersSidebarEntry* _tmp15_; + gint _tmp16_; #line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp15_ = folder_entry; #line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1360,21 +1360,21 @@ static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) { while (TRUE) { #line 1362 "Branch.c" gboolean removed = FALSE; - GeeHashMap* _tmp21_ = NULL; - FoldersSidebarEntry* _tmp22_ = NULL; - GFile* _tmp23_ = NULL; - GFile* _tmp24_ = NULL; - gboolean _tmp25_ = FALSE; - gboolean _tmp26_ = FALSE; + GeeHashMap* _tmp21_; + FoldersSidebarEntry* _tmp22_; + GFile* _tmp23_; + GFile* _tmp24_; + gboolean _tmp25_; + gboolean _tmp26_; FoldersSidebarEntry* parent = NULL; - FoldersSidebarEntry* _tmp27_ = NULL; - SidebarEntry* _tmp28_ = NULL; - FoldersSidebarEntry* _tmp29_ = NULL; + FoldersSidebarEntry* _tmp27_; + SidebarEntry* _tmp28_; + FoldersSidebarEntry* _tmp29_; gboolean _tmp30_ = FALSE; gboolean _tmp31_ = FALSE; - FoldersSidebarEntry* _tmp32_ = NULL; - FoldersSidebarEntry* _tmp38_ = NULL; - FoldersSidebarEntry* _tmp39_ = NULL; + FoldersSidebarEntry* _tmp32_; + FoldersSidebarEntry* _tmp38_; + FoldersSidebarEntry* _tmp39_; #line 127 "/home/jens/Source/shotwell/src/folders/Branch.vala" if (!_tmp20_) { #line 1381 "Branch.c" @@ -1419,9 +1419,9 @@ static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) { _tmp31_ = TRUE; #line 1421 "Branch.c" } else { - FoldersSidebarEntry* _tmp33_ = NULL; - gint _tmp34_ = 0; - gint _tmp35_ = 0; + FoldersSidebarEntry* _tmp33_; + gint _tmp34_; + gint _tmp35_; #line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp33_ = parent; #line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1438,8 +1438,8 @@ static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) { _tmp30_ = TRUE; #line 1440 "Branch.c" } else { - FoldersSidebarEntry* _tmp36_ = NULL; - gint _tmp37_ = 0; + FoldersSidebarEntry* _tmp36_; + gint _tmp37_; #line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp36_ = parent; #line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1493,7 +1493,7 @@ static void folders_branch_class_init (FoldersBranchClass * klass) { static void folders_branch_instance_init (FoldersBranch * self) { - GeeHashMap* _tmp0_ = NULL; + GeeHashMap* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/folders/Branch.vala" self->priv = FOLDERS_BRANCH_GET_PRIVATE (self); #line 8 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1504,19 +1504,19 @@ static void folders_branch_instance_init (FoldersBranch * self) { } -static void folders_branch_finalize (GObject* obj) { +static void folders_branch_finalize (GObject * obj) { FoldersBranch * self; #line 7 "/home/jens/Source/shotwell/src/folders/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_BRANCH, FoldersBranch); #line 1512 "Branch.c" { GeeIterator* _sources_it = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp0_ = media_collection_registry_get_instance (); #line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1538,13 +1538,13 @@ static void folders_branch_finalize (GObject* obj) { #line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala" while (TRUE) { #line 1541 "Branch.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - MediaSourceCollection* _tmp10_ = NULL; - guint _tmp11_ = 0U; + GeeIterator* _tmp8_; + gpointer _tmp9_; + MediaSourceCollection* _tmp10_; + guint _tmp11_; #line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp6_ = _sources_it; #line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1599,28 +1599,25 @@ GType folders_branch_get_type (void) { FoldersRoot* folders_root_construct (GType object_type) { FoldersRoot * self = NULL; - const gchar* _tmp0_ = NULL; -#line 144 "/home/jens/Source/shotwell/src/folders/Branch.vala" - _tmp0_ = _ ("Folders"); #line 144 "/home/jens/Source/shotwell/src/folders/Branch.vala" - self = (FoldersRoot*) sidebar_header_construct (object_type, _tmp0_, TRUE); + self = (FoldersRoot*) sidebar_header_construct (object_type, _ ("Folders"), TRUE); #line 143 "/home/jens/Source/shotwell/src/folders/Branch.vala" return self; -#line 1610 "Branch.c" +#line 1607 "Branch.c" } FoldersRoot* folders_root_new (void) { #line 143 "/home/jens/Source/shotwell/src/folders/Branch.vala" return folders_root_construct (FOLDERS_TYPE_ROOT); -#line 1617 "Branch.c" +#line 1614 "Branch.c" } static void folders_root_class_init (FoldersRootClass * klass) { #line 142 "/home/jens/Source/shotwell/src/folders/Branch.vala" folders_root_parent_class = g_type_class_peek_parent (klass); -#line 1624 "Branch.c" +#line 1621 "Branch.c" } @@ -1642,12 +1639,12 @@ GType folders_root_get_type (void) { FoldersSidebarEntry* folders_sidebar_entry_construct (GType object_type, GFile* dir) { FoldersSidebarEntry * self = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + GFile* _tmp0_; + GFile* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; #line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala" g_return_val_if_fail (G_IS_FILE (dir), NULL); #line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1674,22 +1671,22 @@ FoldersSidebarEntry* folders_sidebar_entry_construct (GType object_type, GFile* _g_free0 (_tmp3_); #line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala" return self; -#line 1678 "Branch.c" +#line 1675 "Branch.c" } FoldersSidebarEntry* folders_sidebar_entry_new (GFile* dir) { #line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala" return folders_sidebar_entry_construct (FOLDERS_TYPE_SIDEBAR_ENTRY, dir); -#line 1685 "Branch.c" +#line 1682 "Branch.c" } static gchar* folders_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) { FoldersSidebarEntry * self; gchar* result = NULL; - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; #line 174 "/home/jens/Source/shotwell/src/folders/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry); #line 175 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1700,7 +1697,7 @@ static gchar* folders_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntr result = _tmp1_; #line 175 "/home/jens/Source/shotwell/src/folders/Branch.vala" return result; -#line 1704 "Branch.c" +#line 1701 "Branch.c" } @@ -1708,9 +1705,9 @@ static gchar* folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntr FoldersSidebarEntry * self; gchar* result = NULL; const gchar* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - gchar* _tmp5_ = NULL; + gint _tmp1_; + gint _tmp2_; + gchar* _tmp5_; #line 178 "/home/jens/Source/shotwell/src/folders/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry); #line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1719,20 +1716,20 @@ static gchar* folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntr _tmp2_ = _tmp1_; #line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala" if (_tmp2_ == 0) { -#line 1723 "Branch.c" - const gchar* _tmp3_ = NULL; +#line 1720 "Branch.c" + const gchar* _tmp3_; #line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp3_ = folders_icon; #line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp0_ = _tmp3_; -#line 1729 "Branch.c" +#line 1726 "Branch.c" } else { - const gchar* _tmp4_ = NULL; + const gchar* _tmp4_; #line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp4_ = folders_have_photos_icon; #line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp0_ = _tmp4_; -#line 1736 "Branch.c" +#line 1733 "Branch.c" } #line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp5_ = g_strdup (_tmp0_); @@ -1740,15 +1737,15 @@ static gchar* folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntr result = _tmp5_; #line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala" return result; -#line 1744 "Branch.c" +#line 1741 "Branch.c" } static gchar* folders_sidebar_entry_real_to_string (SidebarSimplePageEntry* base) { FoldersSidebarEntry * self; gchar* result = NULL; - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; #line 182 "/home/jens/Source/shotwell/src/folders/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry); #line 183 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1759,7 +1756,7 @@ static gchar* folders_sidebar_entry_real_to_string (SidebarSimplePageEntry* base result = _tmp1_; #line 183 "/home/jens/Source/shotwell/src/folders/Branch.vala" return result; -#line 1763 "Branch.c" +#line 1760 "Branch.c" } @@ -1772,15 +1769,15 @@ static gboolean folders_sidebar_entry_real_expand_on_select (SidebarExpandableEn result = TRUE; #line 187 "/home/jens/Source/shotwell/src/folders/Branch.vala" return result; -#line 1776 "Branch.c" +#line 1773 "Branch.c" } static Page* folders_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) { FoldersSidebarEntry * self; Page* result = NULL; - GFile* _tmp0_ = NULL; - FoldersPage* _tmp1_ = NULL; + GFile* _tmp0_; + FoldersPage* _tmp1_; #line 190 "/home/jens/Source/shotwell/src/folders/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry); #line 191 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1793,13 +1790,13 @@ static Page* folders_sidebar_entry_real_create_page (SidebarSimplePageEntry* bas result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page); #line 191 "/home/jens/Source/shotwell/src/folders/Branch.vala" return result; -#line 1797 "Branch.c" +#line 1794 "Branch.c" } GFile* folders_sidebar_entry_get_dir (FoldersSidebarEntry* self) { GFile* result; - GFile* _tmp0_ = NULL; + GFile* _tmp0_; #line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala" g_return_val_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self), NULL); #line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1808,32 +1805,36 @@ GFile* folders_sidebar_entry_get_dir (FoldersSidebarEntry* self) { result = _tmp0_; #line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala" return result; -#line 1812 "Branch.c" +#line 1809 "Branch.c" } static void folders_sidebar_entry_set_dir (FoldersSidebarEntry* self, GFile* value) { - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; #line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala" g_return_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self)); #line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala" - _tmp0_ = value; + if (folders_sidebar_entry_get_dir (self) != value) { +#line 1818 "Branch.c" + GFile* _tmp0_; + GFile* _tmp1_; #line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = value; #line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala" - _g_object_unref0 (self->priv->_dir); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala" - self->priv->_dir = _tmp1_; + _g_object_unref0 (self->priv->_dir); #line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala" - g_object_notify ((GObject *) self, "dir"); + self->priv->_dir = _tmp1_; +#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala" + g_object_notify ((GObject *) self, "dir"); #line 1831 "Branch.c" + } } const gchar* folders_sidebar_entry_get_collation (FoldersSidebarEntry* self) { const gchar* result; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala" g_return_val_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self), NULL); #line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1842,32 +1843,36 @@ const gchar* folders_sidebar_entry_get_collation (FoldersSidebarEntry* self) { result = _tmp0_; #line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala" return result; -#line 1846 "Branch.c" +#line 1847 "Branch.c" } static void folders_sidebar_entry_set_collation (FoldersSidebarEntry* self, const gchar* value) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; #line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala" g_return_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self)); #line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala" - _tmp0_ = value; + if (g_strcmp0 (value, folders_sidebar_entry_get_collation (self)) != 0) { +#line 1856 "Branch.c" + const gchar* _tmp0_; + gchar* _tmp1_; #line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = value; #line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala" - _g_free0 (self->priv->_collation); + _tmp1_ = g_strdup (_tmp0_); #line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala" - self->priv->_collation = _tmp1_; + _g_free0 (self->priv->_collation); #line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala" - g_object_notify ((GObject *) self, "collation"); -#line 1865 "Branch.c" + self->priv->_collation = _tmp1_; +#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala" + g_object_notify ((GObject *) self, "collation"); +#line 1869 "Branch.c" + } } gint folders_sidebar_entry_get_count (FoldersSidebarEntry* self) { gint result; - gint _tmp0_ = 0; + gint _tmp0_; #line 154 "/home/jens/Source/shotwell/src/folders/Branch.vala" g_return_val_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self), 0); #line 155 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1876,17 +1881,17 @@ gint folders_sidebar_entry_get_count (FoldersSidebarEntry* self) { result = _tmp0_; #line 155 "/home/jens/Source/shotwell/src/folders/Branch.vala" return result; -#line 1880 "Branch.c" +#line 1885 "Branch.c" } void folders_sidebar_entry_set_count (FoldersSidebarEntry* self, gint value) { gint prev_count = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; + gint _tmp0_; + gint _tmp1_; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; - gint _tmp4_ = 0; + gint _tmp4_; #line 158 "/home/jens/Source/shotwell/src/folders/Branch.vala" g_return_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self)); #line 159 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1901,51 +1906,51 @@ void folders_sidebar_entry_set_count (FoldersSidebarEntry* self, gint value) { _tmp4_ = prev_count; #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala" if (_tmp4_ == 0) { -#line 1905 "Branch.c" - gint _tmp5_ = 0; +#line 1910 "Branch.c" + gint _tmp5_; #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp5_ = self->priv->_count; #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp3_ = _tmp5_ == 1; -#line 1911 "Branch.c" +#line 1916 "Branch.c" } else { #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp3_ = FALSE; -#line 1915 "Branch.c" +#line 1920 "Branch.c" } #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala" if (_tmp3_) { #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp2_ = TRUE; -#line 1921 "Branch.c" +#line 1926 "Branch.c" } else { gboolean _tmp6_ = FALSE; - gint _tmp7_ = 0; + gint _tmp7_; #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp7_ = prev_count; #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala" if (_tmp7_ == 1) { -#line 1929 "Branch.c" - gint _tmp8_ = 0; +#line 1934 "Branch.c" + gint _tmp8_; #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp8_ = self->priv->_count; #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp6_ = _tmp8_ == 0; -#line 1935 "Branch.c" +#line 1940 "Branch.c" } else { #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp6_ = FALSE; -#line 1939 "Branch.c" +#line 1944 "Branch.c" } #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp2_ = _tmp6_; -#line 1943 "Branch.c" +#line 1948 "Branch.c" } #line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala" if (_tmp2_) { -#line 1947 "Branch.c" - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; +#line 1952 "Branch.c" + gchar* _tmp9_; + gchar* _tmp10_; #line 164 "/home/jens/Source/shotwell/src/folders/Branch.vala" _tmp9_ = sidebar_simple_page_entry_get_sidebar_icon (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry)); #line 164 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1954,11 +1959,11 @@ void folders_sidebar_entry_set_count (FoldersSidebarEntry* self, gint value) { g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-icon-changed", _tmp10_); #line 164 "/home/jens/Source/shotwell/src/folders/Branch.vala" _g_free0 (_tmp10_); -#line 1958 "Branch.c" +#line 1963 "Branch.c" } #line 158 "/home/jens/Source/shotwell/src/folders/Branch.vala" g_object_notify ((GObject *) self, "count"); -#line 1962 "Branch.c" +#line 1967 "Branch.c" } @@ -1968,13 +1973,13 @@ static void folders_sidebar_entry_class_init (FoldersSidebarEntryClass * klass) #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" g_type_class_add_private (klass, sizeof (FoldersSidebarEntryPrivate)); #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) folders_sidebar_entry_real_get_sidebar_name; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) folders_sidebar_entry_real_get_sidebar_name; #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) folders_sidebar_entry_real_get_sidebar_icon; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) folders_sidebar_entry_real_get_sidebar_icon; #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->to_string = (gchar* (*)(SidebarSimplePageEntry*)) folders_sidebar_entry_real_to_string; + ((SidebarSimplePageEntryClass *) klass)->to_string = (gchar* (*) (SidebarSimplePageEntry *)) folders_sidebar_entry_real_to_string; #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) folders_sidebar_entry_real_create_page; + ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) folders_sidebar_entry_real_create_page; #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" G_OBJECT_CLASS (klass)->get_property = _vala_folders_sidebar_entry_get_property; #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1982,12 +1987,12 @@ static void folders_sidebar_entry_class_init (FoldersSidebarEntryClass * klass) #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" G_OBJECT_CLASS (klass)->finalize = folders_sidebar_entry_finalize; #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_DIR, g_param_spec_object ("dir", "dir", "dir", g_file_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY, g_param_spec_object ("dir", "dir", "dir", g_file_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COLLATION, g_param_spec_string ("collation", "collation", "collation", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY, g_param_spec_string ("collation", "collation", "collation", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COUNT, g_param_spec_int ("count", "count", "count", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); -#line 1991 "Branch.c" + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY, g_param_spec_int ("count", "count", "count", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); +#line 1996 "Branch.c" } @@ -1995,8 +2000,8 @@ static void folders_sidebar_entry_sidebar_expandable_entry_interface_init (Sideb #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" folders_sidebar_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface); #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" - iface->expand_on_select = (gboolean (*)(SidebarExpandableEntry*)) folders_sidebar_entry_real_expand_on_select; -#line 2000 "Branch.c" + iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) folders_sidebar_entry_real_expand_on_select; +#line 2005 "Branch.c" } @@ -2005,11 +2010,11 @@ static void folders_sidebar_entry_instance_init (FoldersSidebarEntry * self) { self->priv = FOLDERS_SIDEBAR_ENTRY_GET_PRIVATE (self); #line 152 "/home/jens/Source/shotwell/src/folders/Branch.vala" self->priv->_count = 0; -#line 2009 "Branch.c" +#line 2014 "Branch.c" } -static void folders_sidebar_entry_finalize (GObject* obj) { +static void folders_sidebar_entry_finalize (GObject * obj) { FoldersSidebarEntry * self; #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry); @@ -2019,7 +2024,7 @@ static void folders_sidebar_entry_finalize (GObject* obj) { _g_free0 (self->priv->_collation); #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" G_OBJECT_CLASS (folders_sidebar_entry_parent_class)->finalize (obj); -#line 2023 "Branch.c" +#line 2028 "Branch.c" } @@ -2043,30 +2048,30 @@ static void _vala_folders_sidebar_entry_get_property (GObject * object, guint pr #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" switch (property_id) { #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" - case FOLDERS_SIDEBAR_ENTRY_DIR: + case FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY: #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" g_value_set_object (value, folders_sidebar_entry_get_dir (self)); #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" break; #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" - case FOLDERS_SIDEBAR_ENTRY_COLLATION: + case FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY: #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" g_value_set_string (value, folders_sidebar_entry_get_collation (self)); #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" break; #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" - case FOLDERS_SIDEBAR_ENTRY_COUNT: + case FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY: #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" g_value_set_int (value, folders_sidebar_entry_get_count (self)); #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" break; -#line 2064 "Branch.c" +#line 2069 "Branch.c" default: #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" break; -#line 2070 "Branch.c" +#line 2075 "Branch.c" } } @@ -2077,30 +2082,30 @@ static void _vala_folders_sidebar_entry_set_property (GObject * object, guint pr #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" switch (property_id) { #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" - case FOLDERS_SIDEBAR_ENTRY_DIR: + case FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY: #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" folders_sidebar_entry_set_dir (self, g_value_get_object (value)); #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" break; #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" - case FOLDERS_SIDEBAR_ENTRY_COLLATION: + case FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY: #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" folders_sidebar_entry_set_collation (self, g_value_get_string (value)); #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" break; #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" - case FOLDERS_SIDEBAR_ENTRY_COUNT: + case FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY: #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" folders_sidebar_entry_set_count (self, g_value_get_int (value)); #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" break; -#line 2098 "Branch.c" +#line 2103 "Branch.c" default: #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" break; -#line 2104 "Branch.c" +#line 2109 "Branch.c" } } diff --git a/src/folders/Folders.c b/src/folders/Folders.c index cae90dc..eede6db 100644 --- a/src/folders/Folders.c +++ b/src/folders/Folders.c @@ -1,4 +1,4 @@ -/* Folders.c generated by valac 0.34.7, the Vala compiler +/* Folders.c generated by valac 0.36.6, the Vala compiler * generated from Folders.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -35,8 +35,8 @@ void folders_terminate (void); void folders_init (GError** error) { - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; #line 22 "/home/jens/Source/shotwell/src/folders/Folders.vala" _tmp0_ = g_strdup (RESOURCES_ICON_FOLDER); #line 22 "/home/jens/Source/shotwell/src/folders/Folders.vala" diff --git a/src/folders/Page.c b/src/folders/Page.c index 3c05b3e..49bb21a 100644 --- a/src/folders/Page.c +++ b/src/folders/Page.c @@ -1,4 +1,4 @@ -/* Page.c generated by valac 0.34.7, the Vala compiler +/* Page.c generated by valac 0.36.6, the Vala compiler * generated from Page.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -675,17 +675,17 @@ static gboolean folders_page_folder_view_manager_real_include_in_view (ViewManag GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; GFile* media_source_get_file (MediaSource* self); -static void folders_page_folder_view_manager_finalize (ViewManager* obj); -static void folders_page_finalize (GObject* obj); +static void folders_page_folder_view_manager_finalize (ViewManager * obj); +static void folders_page_finalize (GObject * obj); FoldersPage* folders_page_construct (GType object_type, GFile* dir) { FoldersPage * self = NULL; - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - FoldersPageFolderViewManager* _tmp4_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + GFile* _tmp3_; + FoldersPageFolderViewManager* _tmp4_; #line 24 "/home/jens/Source/shotwell/src/folders/Page.vala" g_return_val_if_fail (G_IS_FILE (dir), NULL); #line 25 "/home/jens/Source/shotwell/src/folders/Page.vala" @@ -709,12 +709,12 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) { #line 710 "Page.c" { GeeIterator* _sources_it = NULL; - MediaCollectionRegistry* _tmp5_ = NULL; - MediaCollectionRegistry* _tmp6_ = NULL; - GeeCollection* _tmp7_ = NULL; - GeeCollection* _tmp8_ = NULL; - GeeIterator* _tmp9_ = NULL; - GeeIterator* _tmp10_ = NULL; + MediaCollectionRegistry* _tmp5_; + MediaCollectionRegistry* _tmp6_; + GeeCollection* _tmp7_; + GeeCollection* _tmp8_; + GeeIterator* _tmp9_; + GeeIterator* _tmp10_; #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala" _tmp5_ = media_collection_registry_get_instance (); #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala" @@ -736,17 +736,17 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) { #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala" while (TRUE) { #line 739 "Page.c" - GeeIterator* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; + GeeIterator* _tmp11_; + gboolean _tmp12_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp13_ = NULL; - gpointer _tmp14_ = NULL; - ViewCollection* _tmp15_ = NULL; - ViewCollection* _tmp16_ = NULL; - MediaSourceCollection* _tmp17_ = NULL; - FoldersPageFolderViewManager* _tmp18_ = NULL; - ViewCollectionMonitor* _tmp19_ = NULL; - ViewCollectionMonitor* _tmp20_ = NULL; + GeeIterator* _tmp13_; + gpointer _tmp14_; + ViewCollection* _tmp15_; + ViewCollection* _tmp16_; + MediaSourceCollection* _tmp17_; + FoldersPageFolderViewManager* _tmp18_; + ViewCollectionMonitor* _tmp19_; + ViewCollectionMonitor* _tmp20_; #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala" _tmp11_ = _sources_it; #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala" @@ -804,8 +804,8 @@ static void folders_page_real_get_config_photos_sort (MediaPage* base, gboolean* FoldersPage * self; gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; gboolean _tmp2_ = FALSE; gint _tmp3_ = 0; #line 33 "/home/jens/Source/shotwell/src/folders/Page.vala" @@ -839,10 +839,10 @@ static void folders_page_real_get_config_photos_sort (MediaPage* base, gboolean* static void folders_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { FoldersPage * self; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gint _tmp3_ = 0; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + gboolean _tmp2_; + gint _tmp3_; #line 37 "/home/jens/Source/shotwell/src/folders/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_PAGE, FoldersPage); #line 38 "/home/jens/Source/shotwell/src/folders/Page.vala" @@ -870,9 +870,9 @@ static gpointer _g_object_ref0 (gpointer self) { static FoldersPageFolderViewManager* folders_page_folder_view_manager_construct (GType object_type, FoldersPage* owner, GFile* dir) { FoldersPageFolderViewManager* self = NULL; - FoldersPage* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; + FoldersPage* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; #line 11 "/home/jens/Source/shotwell/src/folders/Page.vala" g_return_val_if_fail (FOLDERS_IS_PAGE (owner), NULL); #line 11 "/home/jens/Source/shotwell/src/folders/Page.vala" @@ -905,12 +905,12 @@ static FoldersPageFolderViewManager* folders_page_folder_view_manager_new (Folde static gboolean folders_page_folder_view_manager_real_include_in_view (ViewManager* base, DataSource* source) { FoldersPageFolderViewManager * self; gboolean result = FALSE; - DataSource* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; + DataSource* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; #line 17 "/home/jens/Source/shotwell/src/folders/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_PAGE_TYPE_FOLDER_VIEW_MANAGER, FoldersPageFolderViewManager); #line 17 "/home/jens/Source/shotwell/src/folders/Page.vala" @@ -943,7 +943,7 @@ static void folders_page_folder_view_manager_class_init (FoldersPageFolderViewMa #line 8 "/home/jens/Source/shotwell/src/folders/Page.vala" ((ViewManagerClass *) klass)->finalize = folders_page_folder_view_manager_finalize; #line 8 "/home/jens/Source/shotwell/src/folders/Page.vala" - ((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) folders_page_folder_view_manager_real_include_in_view; + ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) folders_page_folder_view_manager_real_include_in_view; #line 948 "Page.c" } @@ -952,7 +952,7 @@ static void folders_page_folder_view_manager_instance_init (FoldersPageFolderVie } -static void folders_page_folder_view_manager_finalize (ViewManager* obj) { +static void folders_page_folder_view_manager_finalize (ViewManager * obj) { FoldersPageFolderViewManager * self; #line 8 "/home/jens/Source/shotwell/src/folders/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_PAGE_TYPE_FOLDER_VIEW_MANAGER, FoldersPageFolderViewManager); @@ -982,9 +982,9 @@ static void folders_page_class_init (FoldersPageClass * klass) { #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala" g_type_class_add_private (klass, sizeof (FoldersPagePrivate)); #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala" - ((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) folders_page_real_get_config_photos_sort; + ((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) folders_page_real_get_config_photos_sort; #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala" - ((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) folders_page_real_set_config_photos_sort; + ((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) folders_page_real_set_config_photos_sort; #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala" G_OBJECT_CLASS (klass)->finalize = folders_page_finalize; #line 991 "Page.c" @@ -998,7 +998,7 @@ static void folders_page_instance_init (FoldersPage * self) { } -static void folders_page_finalize (GObject* obj) { +static void folders_page_finalize (GObject * obj) { FoldersPage * self; #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_PAGE, FoldersPage); |