summaryrefslogtreecommitdiff
path: root/src/folders
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:34:32 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:34:32 +0200
commit49120f48474fc8fdc2448c75d961bc238213cfac (patch)
tree05bcdb95d65a807cf0f1ffffd066c09074b5cf56 /src/folders
parent2492891f112caac6076ce49721d9d5d78a152c3a (diff)
New upstream version 0.28.2upstream/0.28.2
Diffstat (limited to 'src/folders')
-rw-r--r--src/folders/FoldersBranch.c (renamed from src/folders/Branch.c)1396
-rw-r--r--src/folders/FoldersBranch.vala (renamed from src/folders/Branch.vala)6
-rw-r--r--src/folders/FoldersPage.c (renamed from src/folders/Page.c)230
-rw-r--r--src/folders/FoldersPage.vala (renamed from src/folders/Page.vala)0
4 files changed, 827 insertions, 805 deletions
diff --git a/src/folders/Branch.c b/src/folders/FoldersBranch.c
index 95fb127..ff8f49a 100644
--- a/src/folders/Branch.c
+++ b/src/folders/FoldersBranch.c
@@ -1,5 +1,5 @@
-/* Branch.c generated by valac 0.36.6, the Vala compiler
- * generated from Branch.vala, do not modify */
+/* FoldersBranch.c generated by valac 0.36.6, the Vala compiler
+ * generated from FoldersBranch.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
*
@@ -523,8 +523,8 @@ GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST;
enum {
FOLDERS_ROOT_DUMMY_PROPERTY
};
-SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
-SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
+SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized);
+SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized);
GType sidebar_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;
@@ -538,7 +538,6 @@ enum {
};
SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type);
static void folders_sidebar_entry_set_dir (FoldersSidebarEntry* self, GFile* value);
-gchar* g_utf8_collate_key_for_filename (const gchar* str, gssize len);
static void folders_sidebar_entry_set_collation (FoldersSidebarEntry* self, const gchar* value);
static gchar* folders_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
static gchar* folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
@@ -558,36 +557,36 @@ static void _vala_folders_sidebar_entry_set_property (GObject * object, guint pr
static void _folders_branch_on_media_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 31 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
folders_branch_on_media_contents_altered ((FoldersBranch*) self, added, removed);
-#line 564 "Branch.c"
+#line 563 "FoldersBranch.c"
}
static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
guint result;
result = file_hash ((GFile*) v);
-#line 8 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 573 "Branch.c"
+#line 572 "FoldersBranch.c"
}
static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) {
gboolean result;
result = file_equal ((GFile*) a, (GFile*) b);
-#line 8 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 582 "Branch.c"
+#line 581 "FoldersBranch.c"
}
static gint _folders_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
gint result;
result = folders_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
-#line 13 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 591 "Branch.c"
+#line 590 "FoldersBranch.c"
}
@@ -597,23 +596,23 @@ FoldersBranch* folders_branch_construct (GType object_type) {
FoldersRoot* _tmp1_;
const gchar* _tmp2_;
GFile* _tmp3_;
-#line 13 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = folders_root_new ();
-#line 13 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp1_ = _tmp0_;
-#line 13 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self = (FoldersBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING | SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY, _folders_branch_comparator_gcompare_func, NULL);
-#line 13 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (_tmp1_);
-#line 18 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp2_ = g_get_home_dir ();
-#line 18 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp3_ = g_file_new_for_path (_tmp2_);
-#line 18 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (self->priv->home_dir);
-#line 18 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self->priv->home_dir = _tmp3_;
-#line 617 "Branch.c"
+#line 616 "FoldersBranch.c"
{
GeeIterator* _sources_it = NULL;
MediaCollectionRegistry* _tmp4_;
@@ -622,27 +621,27 @@ FoldersBranch* folders_branch_construct (GType object_type) {
GeeCollection* _tmp7_;
GeeIterator* _tmp8_;
GeeIterator* _tmp9_;
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp4_ = media_collection_registry_get_instance ();
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp5_ = _tmp4_;
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp6_ = media_collection_registry_get_all (_tmp5_);
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp7_ = _tmp6_;
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp9_ = _tmp8_;
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (_tmp7_);
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_media_collection_registry_unref0 (_tmp5_);
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_sources_it = _tmp9_;
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
while (TRUE) {
-#line 646 "Branch.c"
+#line 645 "FoldersBranch.c"
GeeIterator* _tmp10_;
gboolean _tmp11_;
MediaSourceCollection* sources = NULL;
@@ -652,54 +651,54 @@ FoldersBranch* folders_branch_construct (GType object_type) {
GeeCollection* _tmp15_;
GeeCollection* _tmp16_;
MediaSourceCollection* _tmp17_;
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp10_ = _sources_it;
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp11_ = gee_iterator_next (_tmp10_);
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (!_tmp11_) {
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 664 "Branch.c"
+#line 663 "FoldersBranch.c"
}
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp12_ = _sources_it;
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp13_ = gee_iterator_get (_tmp12_);
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
sources = (MediaSourceCollection*) _tmp13_;
-#line 22 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp14_ = sources;
-#line 22 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp15_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
-#line 22 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp16_ = _tmp15_;
-#line 22 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
folders_branch_on_media_contents_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ITERABLE, GeeIterable), NULL);
-#line 22 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (_tmp16_);
-#line 25 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 25 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp17_ = sources;
-#line 25 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 25 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _folders_branch_on_media_contents_altered_data_collection_contents_altered, self, 0);
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_data_collection_unref0 (sources);
-#line 688 "Branch.c"
+#line 687 "FoldersBranch.c"
}
-#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (_sources_it);
-#line 692 "Branch.c"
+#line 691 "FoldersBranch.c"
}
-#line 12 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return self;
-#line 696 "Branch.c"
+#line 695 "FoldersBranch.c"
}
FoldersBranch* folders_branch_new (void) {
-#line 12 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return folders_branch_construct (FOLDERS_TYPE_BRANCH);
-#line 703 "Branch.c"
+#line 702 "FoldersBranch.c"
}
@@ -717,45 +716,45 @@ static gint folders_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
const gchar* _tmp8_;
gint _tmp9_;
gint _tmp10_;
-#line 34 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 34 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
-#line 34 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 34 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
-#line 35 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = a;
-#line 35 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp1_ = b;
-#line 35 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (_tmp0_ == _tmp1_) {
-#line 36 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
result = 0;
-#line 36 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 735 "Branch.c"
+#line 734 "FoldersBranch.c"
}
-#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp2_ = g_strcmp0;
-#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp3_ = a;
-#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp4_ = folders_sidebar_entry_get_collation (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry));
-#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp5_ = _tmp4_;
-#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp6_ = b;
-#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp7_ = folders_sidebar_entry_get_collation (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry));
-#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp8_ = _tmp7_;
-#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp9_ = _tmp2_ (_tmp5_, _tmp8_);
-#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
coll_key_equality = _tmp9_;
-#line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp10_ = coll_key_equality;
-#line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (_tmp10_ == 0) {
-#line 759 "Branch.c"
+#line 758 "FoldersBranch.c"
GCompareFunc _tmp11_;
SidebarEntry* _tmp12_;
gchar* _tmp13_;
@@ -765,99 +764,99 @@ static gint folders_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
gchar* _tmp17_;
gint _tmp18_;
gint _tmp19_;
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp11_ = g_strcmp0;
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp12_ = a;
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp13_ = sidebar_simple_page_entry_get_sidebar_name (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry));
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp14_ = _tmp13_;
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp15_ = b;
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp16_ = sidebar_simple_page_entry_get_sidebar_name (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry));
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp17_ = _tmp16_;
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp18_ = _tmp11_ (_tmp14_, _tmp17_);
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp19_ = _tmp18_;
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_free0 (_tmp17_);
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_free0 (_tmp14_);
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
result = _tmp19_;
-#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 795 "Branch.c"
+#line 794 "FoldersBranch.c"
}
-#line 48 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 48 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
result = coll_key_equality;
-#line 48 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 48 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 801 "Branch.c"
+#line 800 "FoldersBranch.c"
}
static void folders_branch_on_master_source_replaced (FoldersBranch* self, MediaSource* media_source, GFile* old_file, GFile* new_file) {
GFile* _tmp0_;
MediaSource* _tmp1_;
-#line 51 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_if_fail (FOLDERS_IS_BRANCH (self));
-#line 51 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_if_fail (IS_MEDIA_SOURCE (media_source));
-#line 51 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_if_fail (G_IS_FILE (old_file));
-#line 51 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_if_fail (G_IS_FILE (new_file));
-#line 52 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 52 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = old_file;
-#line 52 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 52 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
folders_branch_remove_entry (self, _tmp0_);
-#line 53 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 53 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp1_ = media_source;
-#line 53 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 53 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
folders_branch_add_entry (self, _tmp1_);
-#line 824 "Branch.c"
+#line 823 "FoldersBranch.c"
}
static void _folders_branch_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self) {
-#line 60 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 60 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
folders_branch_on_master_source_replaced ((FoldersBranch*) self, _sender, old_file, new_file);
-#line 831 "Branch.c"
+#line 830 "FoldersBranch.c"
}
static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIterable* added, GeeIterable* removed) {
GeeIterable* _tmp0_;
GeeIterable* _tmp9_;
-#line 56 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 56 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_if_fail (FOLDERS_IS_BRANCH (self));
-#line 56 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 56 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 56 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 56 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 57 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 57 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = added;
-#line 57 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 57 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (_tmp0_ != NULL) {
-#line 848 "Branch.c"
+#line 847 "FoldersBranch.c"
{
GeeIterator* _object_it = NULL;
GeeIterable* _tmp1_;
GeeIterator* _tmp2_;
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp1_ = added;
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp2_ = gee_iterable_iterator (_tmp1_);
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_object_it = _tmp2_;
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
while (TRUE) {
-#line 861 "Branch.c"
+#line 860 "FoldersBranch.c"
GeeIterator* _tmp3_;
gboolean _tmp4_;
DataObject* object = NULL;
@@ -865,57 +864,57 @@ static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIt
gpointer _tmp6_;
DataObject* _tmp7_;
DataObject* _tmp8_;
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp3_ = _object_it;
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp4_ = gee_iterator_next (_tmp3_);
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (!_tmp4_) {
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 877 "Branch.c"
+#line 876 "FoldersBranch.c"
}
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp5_ = _object_it;
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp6_ = gee_iterator_get (_tmp5_);
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
object = (DataObject*) _tmp6_;
-#line 59 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 59 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp7_ = object;
-#line 59 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 59 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
folders_branch_add_entry (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 60 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 60 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp8_ = object;
-#line 60 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 60 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource), "master-replaced", (GCallback) _folders_branch_on_master_source_replaced_media_source_master_replaced, self, 0);
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (object);
-#line 895 "Branch.c"
+#line 894 "FoldersBranch.c"
}
-#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (_object_it);
-#line 899 "Branch.c"
+#line 898 "FoldersBranch.c"
}
}
-#line 64 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 64 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp9_ = removed;
-#line 64 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 64 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (_tmp9_ != NULL) {
-#line 906 "Branch.c"
+#line 905 "FoldersBranch.c"
{
GeeIterator* _object_it = NULL;
GeeIterable* _tmp10_;
GeeIterator* _tmp11_;
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp10_ = removed;
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp11_ = gee_iterable_iterator (_tmp10_);
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_object_it = _tmp11_;
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
while (TRUE) {
-#line 919 "Branch.c"
+#line 918 "FoldersBranch.c"
GeeIterator* _tmp12_;
gboolean _tmp13_;
DataObject* object = NULL;
@@ -926,54 +925,54 @@ static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIt
GFile* _tmp18_;
DataObject* _tmp19_;
guint _tmp20_;
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp12_ = _object_it;
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp13_ = gee_iterator_next (_tmp12_);
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (!_tmp13_) {
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 938 "Branch.c"
+#line 937 "FoldersBranch.c"
}
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp14_ = _object_it;
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp15_ = gee_iterator_get (_tmp14_);
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
object = (DataObject*) _tmp15_;
-#line 66 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp16_ = object;
-#line 66 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp17_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 66 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp18_ = _tmp17_;
-#line 66 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
folders_branch_remove_entry (self, _tmp18_);
-#line 66 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (_tmp18_);
-#line 67 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp19_ = object;
-#line 67 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_signal_parse_name ("master-replaced", TYPE_MEDIA_SOURCE, &_tmp20_, NULL, FALSE);
-#line 67 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MEDIA_SOURCE, MediaSource), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _folders_branch_on_master_source_replaced_media_source_master_replaced, self);
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (object);
-#line 964 "Branch.c"
+#line 963 "FoldersBranch.c"
}
-#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (_object_it);
-#line 968 "Branch.c"
+#line 967 "FoldersBranch.c"
}
}
}
static gpointer _g_object_ref0 (gpointer self) {
-#line 96 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return self ? g_object_ref (self) : NULL;
-#line 977 "Branch.c"
+#line 976 "FoldersBranch.c"
}
@@ -987,263 +986,286 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
GFile* _tmp3_;
GFile* _tmp4_;
FoldersSidebarEntry* parent_entry = NULL;
-#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 72 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_if_fail (FOLDERS_IS_BRANCH (self));
-#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 72 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_if_fail (IS_MEDIA_SOURCE (media));
-#line 73 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = media;
-#line 73 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp1_ = media_source_get_file (_tmp0_);
-#line 73 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
file = _tmp1_;
-#line 75 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 75 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp2_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 75 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 75 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
elements = _tmp2_;
-#line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp3_ = file;
-#line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp4_ = g_file_get_parent (_tmp3_);
-#line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
parent = _tmp4_;
-#line 79 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
while (TRUE) {
-#line 1013 "Branch.c"
- GFile* _tmp5_;
+#line 1012 "FoldersBranch.c"
+ gboolean _tmp5_ = FALSE;
GFile* _tmp6_;
- GFile* _tmp7_;
- GFile* _tmp8_;
- GFile* _tmp9_;
- gboolean _tmp10_;
- gboolean _tmp11_;
- GeeArrayList* _tmp12_;
+ GFile* _tmp10_;
+ GFile* _tmp11_;
+ GFile* _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"
- if (!(_tmp5_ != NULL)) {
-#line 79 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+ gboolean _tmp14_;
+ gboolean _tmp15_;
+ GeeArrayList* _tmp16_;
+ GFile* _tmp17_;
+ GFile* _tmp18_;
+ GFile* _tmp19_;
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp6_ = parent;
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ if (_tmp6_ != NULL) {
+#line 1029 "FoldersBranch.c"
+ GFile* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp7_ = parent;
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp8_ = g_file_get_path (_tmp7_);
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp9_ = _tmp8_;
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp5_ = _tmp9_ != NULL;
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _g_free0 (_tmp9_);
+#line 1043 "FoldersBranch.c"
+ } else {
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp5_ = FALSE;
+#line 1047 "FoldersBranch.c"
+ }
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ if (!_tmp5_) {
+#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 1031 "Branch.c"
+#line 1053 "FoldersBranch.c"
}
-#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp6_ = parent;
-#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp7_ = self->priv->home_dir;
-#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp8_ = g_file_get_parent (_tmp7_);
-#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp9_ = _tmp8_;
-#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp10_ = g_file_equal (_tmp6_, _tmp9_);
-#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp11_ = _tmp10_;
-#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _g_object_unref0 (_tmp9_);
-#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- if (_tmp11_) {
-#line 82 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp10_ = parent;
+#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp11_ = self->priv->home_dir;
+#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp12_ = g_file_get_parent (_tmp11_);
+#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp13_ = _tmp12_;
+#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp14_ = g_file_equal (_tmp10_, _tmp13_);
+#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp15_ = _tmp14_;
+#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _g_object_unref0 (_tmp13_);
+#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ if (_tmp15_) {
+#line 82 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 1051 "Branch.c"
+#line 1073 "FoldersBranch.c"
}
-#line 84 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp12_ = elements;
-#line 84 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp13_ = parent;
-#line 84 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
-#line 86 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp14_ = parent;
-#line 86 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp15_ = g_file_get_parent (_tmp14_);
-#line 86 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 84 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp16_ = elements;
+#line 84 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp17_ = parent;
+#line 84 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
+#line 86 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp18_ = parent;
+#line 86 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp19_ = g_file_get_parent (_tmp18_);
+#line 86 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (parent);
-#line 86 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- parent = _tmp15_;
-#line 1067 "Branch.c"
+#line 86 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ parent = _tmp19_;
+#line 1089 "FoldersBranch.c"
}
-#line 91 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
parent_entry = NULL;
-#line 1071 "Branch.c"
+#line 1093 "FoldersBranch.c"
{
gint ctr = 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"
- _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp18_ = _tmp17_;
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- ctr = _tmp18_ - 1;
-#line 1085 "Branch.c"
+ GeeArrayList* _tmp20_;
+ gint _tmp21_;
+ gint _tmp22_;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp20_ = elements;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp22_ = _tmp21_;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ ctr = _tmp22_ - 1;
+#line 1107 "FoldersBranch.c"
{
- gboolean _tmp19_ = FALSE;
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp19_ = TRUE;
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+ gboolean _tmp23_ = FALSE;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp23_ = TRUE;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
while (TRUE) {
-#line 1092 "Branch.c"
- gint _tmp21_;
+#line 1114 "FoldersBranch.c"
+ gint _tmp25_;
GFile* parent_dir = NULL;
- GeeArrayList* _tmp22_;
- gint _tmp23_;
- gpointer _tmp24_;
+ GeeArrayList* _tmp26_;
+ gint _tmp27_;
+ gpointer _tmp28_;
FoldersSidebarEntry* old_parent_entry = NULL;
- FoldersSidebarEntry* _tmp25_;
- FoldersSidebarEntry* _tmp26_;
- GeeHashMap* _tmp27_;
- GFile* _tmp28_;
- gpointer _tmp29_;
+ FoldersSidebarEntry* _tmp29_;
FoldersSidebarEntry* _tmp30_;
- gint _tmp42_;
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- if (!_tmp19_) {
-#line 1108 "Branch.c"
- gint _tmp20_;
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp20_ = ctr;
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- ctr = _tmp20_ - 1;
-#line 1114 "Branch.c"
+ GeeHashMap* _tmp31_;
+ GFile* _tmp32_;
+ gpointer _tmp33_;
+ FoldersSidebarEntry* _tmp34_;
+ gint _tmp46_;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ if (!_tmp23_) {
+#line 1130 "FoldersBranch.c"
+ gint _tmp24_;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp24_ = ctr;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ ctr = _tmp24_ - 1;
+#line 1136 "FoldersBranch.c"
}
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp19_ = FALSE;
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp21_ = ctr;
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- if (!(_tmp21_ >= 0)) {
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp23_ = FALSE;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp25_ = ctr;
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ if (!(_tmp25_ >= 0)) {
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 1124 "Branch.c"
+#line 1146 "FoldersBranch.c"
}
-#line 93 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp22_ = elements;
-#line 93 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp23_ = ctr;
-#line 93 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp24_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp23_);
-#line 93 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- parent_dir = (GFile*) _tmp24_;
-#line 96 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp25_ = parent_entry;
-#line 96 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp26_ = _g_object_ref0 (_tmp25_);
-#line 96 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- old_parent_entry = _tmp26_;
-#line 98 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp27_ = self->priv->entries;
-#line 98 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp28_ = parent_dir;
-#line 98 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp29_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp28_);
-#line 98 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp26_ = elements;
+#line 93 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp27_ = ctr;
+#line 93 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp28_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp27_);
+#line 93 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ parent_dir = (GFile*) _tmp28_;
+#line 96 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp29_ = parent_entry;
+#line 96 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp30_ = _g_object_ref0 (_tmp29_);
+#line 96 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ old_parent_entry = _tmp30_;
+#line 98 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp31_ = self->priv->entries;
+#line 98 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp32_ = parent_dir;
+#line 98 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp33_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp32_);
+#line 98 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (parent_entry);
-#line 98 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- parent_entry = (FoldersSidebarEntry*) _tmp29_;
-#line 99 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp30_ = parent_entry;
-#line 99 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- if (_tmp30_ == NULL) {
-#line 1154 "Branch.c"
- GFile* _tmp31_;
- FoldersSidebarEntry* _tmp32_;
- GeeHashMap* _tmp33_;
- GFile* _tmp34_;
- FoldersSidebarEntry* _tmp35_;
- SidebarEntry* _tmp36_ = NULL;
- FoldersSidebarEntry* _tmp37_;
+#line 98 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ parent_entry = (FoldersSidebarEntry*) _tmp33_;
+#line 99 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp34_ = parent_entry;
+#line 99 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ if (_tmp34_ == NULL) {
+#line 1176 "FoldersBranch.c"
+ GFile* _tmp35_;
+ FoldersSidebarEntry* _tmp36_;
+ GeeHashMap* _tmp37_;
+ GFile* _tmp38_;
+ FoldersSidebarEntry* _tmp39_;
+ SidebarEntry* _tmp40_ = NULL;
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"
- _tmp32_ = folders_sidebar_entry_new (_tmp31_);
-#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+ FoldersSidebarEntry* _tmp45_;
+#line 100 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp35_ = parent_dir;
+#line 100 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp36_ = folders_sidebar_entry_new (_tmp35_);
+#line 100 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (parent_entry);
-#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- parent_entry = _tmp32_;
-#line 101 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp33_ = self->priv->entries;
-#line 101 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp34_ = parent_dir;
-#line 101 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp35_ = parent_entry;
-#line 101 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp34_, _tmp35_);
-#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp37_ = old_parent_entry;
-#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- if (_tmp37_ == NULL) {
-#line 1183 "Branch.c"
- 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"
- _g_object_unref0 (_tmp36_);
-#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp36_ = _tmp38_;
-#line 1191 "Branch.c"
+#line 100 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ parent_entry = _tmp36_;
+#line 101 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp37_ = self->priv->entries;
+#line 101 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp38_ = parent_dir;
+#line 101 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp39_ = parent_entry;
+#line 101 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp38_, _tmp39_);
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp41_ = old_parent_entry;
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ if (_tmp41_ == NULL) {
+#line 1205 "FoldersBranch.c"
+ SidebarEntry* _tmp42_;
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp42_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _g_object_unref0 (_tmp40_);
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp40_ = _tmp42_;
+#line 1213 "FoldersBranch.c"
} else {
- 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"
- _tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _g_object_unref0 (_tmp36_);
-#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp36_ = _tmp40_;
-#line 1203 "Branch.c"
+ FoldersSidebarEntry* _tmp43_;
+ SidebarEntry* _tmp44_;
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp43_ = old_parent_entry;
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _g_object_unref0 (_tmp40_);
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp40_ = _tmp44_;
+#line 1225 "FoldersBranch.c"
}
-#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp41_ = parent_entry;
-#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
-#line 99 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _g_object_unref0 (_tmp36_);
-#line 1211 "Branch.c"
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp45_ = parent_entry;
+#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
+#line 99 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _g_object_unref0 (_tmp40_);
+#line 1233 "FoldersBranch.c"
}
-#line 107 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp42_ = ctr;
-#line 107 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- if (_tmp42_ == 0) {
-#line 1217 "Branch.c"
- 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"
- _tmp44_ = folders_sidebar_entry_get_count (_tmp43_);
-#line 108 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp45_ = _tmp44_;
-#line 108 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- folders_sidebar_entry_set_count (_tmp43_, _tmp45_ + 1);
-#line 1229 "Branch.c"
+#line 107 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp46_ = ctr;
+#line 107 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ if (_tmp46_ == 0) {
+#line 1239 "FoldersBranch.c"
+ FoldersSidebarEntry* _tmp47_;
+ gint _tmp48_;
+ gint _tmp49_;
+#line 108 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp47_ = parent_entry;
+#line 108 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp48_ = folders_sidebar_entry_get_count (_tmp47_);
+#line 108 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _tmp49_ = _tmp48_;
+#line 108 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ folders_sidebar_entry_set_count (_tmp47_, _tmp49_ + 1);
+#line 1251 "FoldersBranch.c"
}
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (old_parent_entry);
-#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (parent_dir);
-#line 1235 "Branch.c"
+#line 1257 "FoldersBranch.c"
}
}
}
-#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 72 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (parent_entry);
-#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 72 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (parent);
-#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 72 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (elements);
-#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 72 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (file);
-#line 1247 "Branch.c"
+#line 1269 "FoldersBranch.c"
}
@@ -1269,96 +1291,96 @@ static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) {
FoldersSidebarEntry* _tmp18_;
FoldersSidebarEntry* _tmp19_;
FoldersSidebarEntry* _tmp40_;
-#line 112 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 112 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_if_fail (FOLDERS_IS_BRANCH (self));
-#line 112 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 112 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = self->priv->entries;
-#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp1_ = file;
-#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp2_ = g_file_get_parent (_tmp1_);
-#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp3_ = _tmp2_;
-#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_);
-#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp5_ = (FoldersSidebarEntry*) _tmp4_;
-#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (_tmp3_);
-#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
folder_entry = _tmp5_;
-#line 114 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 114 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp6_ = folder_entry;
-#line 114 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 114 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (_tmp6_ == NULL) {
-#line 115 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (folder_entry);
-#line 115 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return;
-#line 1301 "Branch.c"
+#line 1323 "FoldersBranch.c"
}
-#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 117 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp7_ = folder_entry;
-#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 117 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp8_ = folders_sidebar_entry_get_count (_tmp7_);
-#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 117 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp9_ = _tmp8_;
-#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 117 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_vala_assert (_tmp9_ > 0, "folder_entry.count > 0");
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp11_ = folder_entry;
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp12_ = folder_entry;
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp13_ = folders_sidebar_entry_get_count (_tmp12_);
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp14_ = _tmp13_;
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
folders_sidebar_entry_set_count (_tmp12_, _tmp14_ - 1);
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if ((_tmp14_ - 1) > 0) {
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp10_ = TRUE;
-#line 1325 "Branch.c"
+#line 1347 "FoldersBranch.c"
} else {
FoldersSidebarEntry* _tmp15_;
gint _tmp16_;
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp15_ = folder_entry;
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp16_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp10_ = _tmp16_ > 0;
-#line 1335 "Branch.c"
+#line 1357 "FoldersBranch.c"
}
-#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (_tmp10_) {
-#line 121 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 121 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (folder_entry);
-#line 121 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 121 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return;
-#line 1343 "Branch.c"
+#line 1365 "FoldersBranch.c"
}
-#line 124 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 124 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp17_ = folder_entry;
-#line 124 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 124 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp18_ = _g_object_ref0 (_tmp17_);
-#line 124 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 124 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
prune_point = _tmp18_;
-#line 125 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp19_ = prune_point;
-#line 125 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_vala_assert (_tmp19_ != NULL, "prune_point != null");
-#line 1355 "Branch.c"
+#line 1377 "FoldersBranch.c"
{
gboolean _tmp20_ = FALSE;
-#line 127 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp20_ = TRUE;
-#line 127 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
while (TRUE) {
-#line 1362 "Branch.c"
+#line 1384 "FoldersBranch.c"
gboolean removed = FALSE;
GeeHashMap* _tmp21_;
FoldersSidebarEntry* _tmp22_;
@@ -1375,140 +1397,140 @@ static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) {
FoldersSidebarEntry* _tmp32_;
FoldersSidebarEntry* _tmp38_;
FoldersSidebarEntry* _tmp39_;
-#line 127 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (!_tmp20_) {
-#line 1381 "Branch.c"
+#line 1403 "FoldersBranch.c"
}
-#line 127 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp20_ = FALSE;
-#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp21_ = self->priv->entries;
-#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp22_ = prune_point;
-#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp23_ = folders_sidebar_entry_get_dir (_tmp22_);
-#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp24_ = _tmp23_;
-#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp25_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_, NULL);
-#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
removed = _tmp25_;
-#line 129 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp26_ = removed;
-#line 129 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_vala_assert (_tmp26_, "removed");
-#line 131 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp27_ = prune_point;
-#line 131 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp28_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 131 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp29_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, FOLDERS_TYPE_SIDEBAR_ENTRY) ? ((FoldersSidebarEntry*) _tmp28_) : NULL;
-#line 131 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (_tmp29_ == NULL) {
-#line 131 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (_tmp28_);
-#line 1411 "Branch.c"
+#line 1433 "FoldersBranch.c"
}
-#line 131 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
parent = _tmp29_;
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp32_ = parent;
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (_tmp32_ == NULL) {
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp31_ = TRUE;
-#line 1421 "Branch.c"
+#line 1443 "FoldersBranch.c"
} else {
FoldersSidebarEntry* _tmp33_;
gint _tmp34_;
gint _tmp35_;
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp33_ = parent;
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp34_ = folders_sidebar_entry_get_count (_tmp33_);
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp35_ = _tmp34_;
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp31_ = _tmp35_ != 0;
-#line 1434 "Branch.c"
+#line 1456 "FoldersBranch.c"
}
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (_tmp31_) {
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp30_ = TRUE;
-#line 1440 "Branch.c"
+#line 1462 "FoldersBranch.c"
} else {
FoldersSidebarEntry* _tmp36_;
gint _tmp37_;
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp36_ = parent;
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp37_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp30_ = _tmp37_ > 1;
-#line 1450 "Branch.c"
+#line 1472 "FoldersBranch.c"
}
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (_tmp30_) {
-#line 133 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 133 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (parent);
-#line 133 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 133 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 1458 "Branch.c"
+#line 1480 "FoldersBranch.c"
}
-#line 135 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp38_ = parent;
-#line 135 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp39_ = _g_object_ref0 (_tmp38_);
-#line 135 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (prune_point);
-#line 135 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
prune_point = _tmp39_;
-#line 127 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (parent);
-#line 1470 "Branch.c"
+#line 1492 "FoldersBranch.c"
}
}
-#line 138 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 138 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp40_ = prune_point;
-#line 138 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 138 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 112 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 112 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (prune_point);
-#line 112 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 112 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (folder_entry);
-#line 1481 "Branch.c"
+#line 1503 "FoldersBranch.c"
}
static void folders_branch_class_init (FoldersBranchClass * klass) {
-#line 7 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
folders_branch_parent_class = g_type_class_peek_parent (klass);
-#line 7 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_type_class_add_private (klass, sizeof (FoldersBranchPrivate));
-#line 7 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
G_OBJECT_CLASS (klass)->finalize = folders_branch_finalize;
-#line 1492 "Branch.c"
+#line 1514 "FoldersBranch.c"
}
static void folders_branch_instance_init (FoldersBranch * self) {
GeeHashMap* _tmp0_;
-#line 7 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self->priv = FOLDERS_BRANCH_GET_PRIVATE (self);
-#line 8 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, FOLDERS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
-#line 8 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self->priv->entries = _tmp0_;
-#line 1504 "Branch.c"
+#line 1526 "FoldersBranch.c"
}
static void folders_branch_finalize (GObject * obj) {
FoldersBranch * self;
-#line 7 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_BRANCH, FoldersBranch);
-#line 1512 "Branch.c"
+#line 1534 "FoldersBranch.c"
{
GeeIterator* _sources_it = NULL;
MediaCollectionRegistry* _tmp0_;
@@ -1517,27 +1539,27 @@ static void folders_branch_finalize (GObject * obj) {
GeeCollection* _tmp3_;
GeeIterator* _tmp4_;
GeeIterator* _tmp5_;
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = media_collection_registry_get_instance ();
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp1_ = _tmp0_;
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp2_ = media_collection_registry_get_all (_tmp1_);
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp3_ = _tmp2_;
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp5_ = _tmp4_;
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (_tmp3_);
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_media_collection_registry_unref0 (_tmp1_);
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_sources_it = _tmp5_;
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
while (TRUE) {
-#line 1541 "Branch.c"
+#line 1563 "FoldersBranch.c"
GeeIterator* _tmp6_;
gboolean _tmp7_;
MediaSourceCollection* sources = NULL;
@@ -1545,43 +1567,43 @@ static void folders_branch_finalize (GObject * obj) {
gpointer _tmp9_;
MediaSourceCollection* _tmp10_;
guint _tmp11_;
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp6_ = _sources_it;
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp7_ = gee_iterator_next (_tmp6_);
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (!_tmp7_) {
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 1557 "Branch.c"
+#line 1579 "FoldersBranch.c"
}
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp8_ = _sources_it;
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp9_ = gee_iterator_get (_tmp8_);
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
sources = (MediaSourceCollection*) _tmp9_;
-#line 31 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp10_ = sources;
-#line 31 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp11_, NULL, FALSE);
-#line 31 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _folders_branch_on_media_contents_altered_data_collection_contents_altered, self);
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_data_collection_unref0 (sources);
-#line 1573 "Branch.c"
+#line 1595 "FoldersBranch.c"
}
-#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (_sources_it);
-#line 1577 "Branch.c"
+#line 1599 "FoldersBranch.c"
}
-#line 8 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (self->priv->entries);
-#line 10 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (self->priv->home_dir);
-#line 7 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
G_OBJECT_CLASS (folders_branch_parent_class)->finalize (obj);
-#line 1585 "Branch.c"
+#line 1607 "FoldersBranch.c"
}
@@ -1599,25 +1621,25 @@ GType folders_branch_get_type (void) {
FoldersRoot* folders_root_construct (GType object_type) {
FoldersRoot * self = NULL;
-#line 144 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- self = (FoldersRoot*) sidebar_header_construct (object_type, _ ("Folders"), TRUE);
-#line 143 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 144 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ self = (FoldersRoot*) sidebar_header_construct (object_type, _ ("Folders"), _ ("Browse the library’s folder structure"), TRUE);
+#line 143 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return self;
-#line 1607 "Branch.c"
+#line 1629 "FoldersBranch.c"
}
FoldersRoot* folders_root_new (void) {
-#line 143 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 143 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return folders_root_construct (FOLDERS_TYPE_ROOT);
-#line 1614 "Branch.c"
+#line 1636 "FoldersBranch.c"
}
static void folders_root_class_init (FoldersRootClass * klass) {
-#line 142 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 142 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
folders_root_parent_class = g_type_class_peek_parent (klass);
-#line 1621 "Branch.c"
+#line 1643 "FoldersBranch.c"
}
@@ -1645,40 +1667,40 @@ FoldersSidebarEntry* folders_sidebar_entry_construct (GType object_type, GFile*
gchar* _tmp3_;
gchar* _tmp4_;
gchar* _tmp5_;
-#line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_val_if_fail (G_IS_FILE (dir), NULL);
-#line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self = (FoldersSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 170 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 170 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = dir;
-#line 170 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 170 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
folders_sidebar_entry_set_dir (self, _tmp0_);
-#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp1_ = dir;
-#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp2_ = g_file_get_path (_tmp1_);
-#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp3_ = _tmp2_;
-#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp4_ = g_utf8_collate_key_for_filename (_tmp3_, (gssize) -1);
-#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp5_ = _tmp4_;
-#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
folders_sidebar_entry_set_collation (self, _tmp5_);
-#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_free0 (_tmp5_);
-#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_free0 (_tmp3_);
-#line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return self;
-#line 1675 "Branch.c"
+#line 1697 "FoldersBranch.c"
}
FoldersSidebarEntry* folders_sidebar_entry_new (GFile* dir) {
-#line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return folders_sidebar_entry_construct (FOLDERS_TYPE_SIDEBAR_ENTRY, dir);
-#line 1682 "Branch.c"
+#line 1704 "FoldersBranch.c"
}
@@ -1687,17 +1709,17 @@ static gchar* folders_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntr
gchar* result = NULL;
GFile* _tmp0_;
gchar* _tmp1_;
-#line 174 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 174 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 175 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = self->priv->_dir;
-#line 175 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp1_ = g_file_get_basename (_tmp0_);
-#line 175 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
result = _tmp1_;
-#line 175 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 1701 "Branch.c"
+#line 1723 "FoldersBranch.c"
}
@@ -1708,36 +1730,36 @@ static gchar* folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntr
gint _tmp1_;
gint _tmp2_;
gchar* _tmp5_;
-#line 178 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 178 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp1_ = folders_sidebar_entry_get_count (self);
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp2_ = _tmp1_;
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (_tmp2_ == 0) {
-#line 1720 "Branch.c"
+#line 1742 "FoldersBranch.c"
const gchar* _tmp3_;
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp3_ = folders_icon;
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = _tmp3_;
-#line 1726 "Branch.c"
+#line 1748 "FoldersBranch.c"
} else {
const gchar* _tmp4_;
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp4_ = folders_have_photos_icon;
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = _tmp4_;
-#line 1733 "Branch.c"
+#line 1755 "FoldersBranch.c"
}
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp5_ = g_strdup (_tmp0_);
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
result = _tmp5_;
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 1741 "Branch.c"
+#line 1763 "FoldersBranch.c"
}
@@ -1746,30 +1768,30 @@ static gchar* folders_sidebar_entry_real_to_string (SidebarSimplePageEntry* base
gchar* result = NULL;
GFile* _tmp0_;
gchar* _tmp1_;
-#line 182 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 182 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 183 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 183 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = self->priv->_dir;
-#line 183 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 183 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp1_ = g_file_get_path (_tmp0_);
-#line 183 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 183 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
result = _tmp1_;
-#line 183 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 183 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 1760 "Branch.c"
+#line 1782 "FoldersBranch.c"
}
static gboolean folders_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base) {
FoldersSidebarEntry * self;
gboolean result = FALSE;
-#line 186 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 187 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
result = TRUE;
-#line 187 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 1773 "Branch.c"
+#line 1795 "FoldersBranch.c"
}
@@ -1778,56 +1800,56 @@ static Page* folders_sidebar_entry_real_create_page (SidebarSimplePageEntry* bas
Page* result = NULL;
GFile* _tmp0_;
FoldersPage* _tmp1_;
-#line 190 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 190 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 191 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 191 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = self->priv->_dir;
-#line 191 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 191 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp1_ = folders_page_new (_tmp0_);
-#line 191 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 191 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_object_ref_sink (_tmp1_);
-#line 191 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 191 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 191 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 191 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 1794 "Branch.c"
+#line 1816 "FoldersBranch.c"
}
GFile* folders_sidebar_entry_get_dir (FoldersSidebarEntry* self) {
GFile* result;
GFile* _tmp0_;
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_val_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self), NULL);
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = self->priv->_dir;
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
result = _tmp0_;
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 1809 "Branch.c"
+#line 1831 "FoldersBranch.c"
}
static void folders_sidebar_entry_set_dir (FoldersSidebarEntry* self, GFile* value) {
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self));
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (folders_sidebar_entry_get_dir (self) != value) {
-#line 1818 "Branch.c"
+#line 1840 "FoldersBranch.c"
GFile* _tmp0_;
GFile* _tmp1_;
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = value;
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (self->priv->_dir);
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self->priv->_dir = _tmp1_;
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_object_notify ((GObject *) self, "dir");
-#line 1831 "Branch.c"
+#line 1853 "FoldersBranch.c"
}
}
@@ -1835,37 +1857,37 @@ static void folders_sidebar_entry_set_dir (FoldersSidebarEntry* self, GFile* val
const gchar* folders_sidebar_entry_get_collation (FoldersSidebarEntry* self) {
const gchar* result;
const gchar* _tmp0_;
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_val_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self), NULL);
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = self->priv->_collation;
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
result = _tmp0_;
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 1847 "Branch.c"
+#line 1869 "FoldersBranch.c"
}
static void folders_sidebar_entry_set_collation (FoldersSidebarEntry* self, const gchar* value) {
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self));
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (g_strcmp0 (value, folders_sidebar_entry_get_collation (self)) != 0) {
-#line 1856 "Branch.c"
+#line 1878 "FoldersBranch.c"
const gchar* _tmp0_;
gchar* _tmp1_;
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = value;
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_free0 (self->priv->_collation);
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self->priv->_collation = _tmp1_;
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_object_notify ((GObject *) self, "collation");
-#line 1869 "Branch.c"
+#line 1891 "FoldersBranch.c"
}
}
@@ -1873,15 +1895,15 @@ static void folders_sidebar_entry_set_collation (FoldersSidebarEntry* self, cons
gint folders_sidebar_entry_get_count (FoldersSidebarEntry* self) {
gint result;
gint _tmp0_;
-#line 154 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_val_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self), 0);
-#line 155 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = self->priv->_count;
-#line 155 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
result = _tmp0_;
-#line 155 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 1885 "Branch.c"
+#line 1907 "FoldersBranch.c"
}
@@ -1892,139 +1914,139 @@ void folders_sidebar_entry_set_count (FoldersSidebarEntry* self, gint value) {
gboolean _tmp2_ = FALSE;
gboolean _tmp3_ = FALSE;
gint _tmp4_;
-#line 158 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 158 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_return_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self));
-#line 159 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 159 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = self->priv->_count;
-#line 159 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 159 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
prev_count = _tmp0_;
-#line 160 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp1_ = value;
-#line 160 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self->priv->_count = _tmp1_;
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp4_ = prev_count;
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (_tmp4_ == 0) {
-#line 1910 "Branch.c"
+#line 1932 "FoldersBranch.c"
gint _tmp5_;
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp5_ = self->priv->_count;
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp3_ = _tmp5_ == 1;
-#line 1916 "Branch.c"
+#line 1938 "FoldersBranch.c"
} else {
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp3_ = FALSE;
-#line 1920 "Branch.c"
+#line 1942 "FoldersBranch.c"
}
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (_tmp3_) {
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp2_ = TRUE;
-#line 1926 "Branch.c"
+#line 1948 "FoldersBranch.c"
} else {
gboolean _tmp6_ = FALSE;
gint _tmp7_;
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp7_ = prev_count;
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (_tmp7_ == 1) {
-#line 1934 "Branch.c"
+#line 1956 "FoldersBranch.c"
gint _tmp8_;
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp8_ = self->priv->_count;
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp6_ = _tmp8_ == 0;
-#line 1940 "Branch.c"
+#line 1962 "FoldersBranch.c"
} else {
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp6_ = FALSE;
-#line 1944 "Branch.c"
+#line 1966 "FoldersBranch.c"
}
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp2_ = _tmp6_;
-#line 1948 "Branch.c"
+#line 1970 "FoldersBranch.c"
}
-#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (_tmp2_) {
-#line 1952 "Branch.c"
+#line 1974 "FoldersBranch.c"
gchar* _tmp9_;
gchar* _tmp10_;
-#line 164 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/folders/FoldersBranch.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"
+#line 164 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp10_ = _tmp9_;
-#line 164 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
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"
+#line 164 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_free0 (_tmp10_);
-#line 1963 "Branch.c"
+#line 1985 "FoldersBranch.c"
}
-#line 158 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 158 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_object_notify ((GObject *) self, "count");
-#line 1967 "Branch.c"
+#line 1989 "FoldersBranch.c"
}
static void folders_sidebar_entry_class_init (FoldersSidebarEntryClass * klass) {
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
folders_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_type_class_add_private (klass, sizeof (FoldersSidebarEntryPrivate));
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) folders_sidebar_entry_real_get_sidebar_name;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) folders_sidebar_entry_real_get_sidebar_icon;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
((SidebarSimplePageEntryClass *) klass)->to_string = (gchar* (*) (SidebarSimplePageEntry *)) folders_sidebar_entry_real_to_string;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) folders_sidebar_entry_real_create_page;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
G_OBJECT_CLASS (klass)->get_property = _vala_folders_sidebar_entry_get_property;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
G_OBJECT_CLASS (klass)->set_property = _vala_folders_sidebar_entry_set_property;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
G_OBJECT_CLASS (klass)->finalize = folders_sidebar_entry_finalize;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
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"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
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"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
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"
+#line 2018 "FoldersBranch.c"
}
static void folders_sidebar_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) {
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.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"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) folders_sidebar_entry_real_expand_on_select;
-#line 2005 "Branch.c"
+#line 2027 "FoldersBranch.c"
}
static void folders_sidebar_entry_instance_init (FoldersSidebarEntry * self) {
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self->priv = FOLDERS_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 152 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self->priv->_count = 0;
-#line 2014 "Branch.c"
+#line 2036 "FoldersBranch.c"
}
static void folders_sidebar_entry_finalize (GObject * obj) {
FoldersSidebarEntry * self;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (self->priv->_dir);
-#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_free0 (self->priv->_collation);
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
G_OBJECT_CLASS (folders_sidebar_entry_parent_class)->finalize (obj);
-#line 2028 "Branch.c"
+#line 2050 "FoldersBranch.c"
}
@@ -2045,33 +2067,33 @@ GType folders_sidebar_entry_get_type (void) {
static void _vala_folders_sidebar_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
FoldersSidebarEntry * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
switch (property_id) {
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
case FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY:
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_value_set_object (value, folders_sidebar_entry_get_dir (self));
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
case FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY:
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_value_set_string (value, folders_sidebar_entry_get_collation (self));
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
case FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY:
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
g_value_set_int (value, folders_sidebar_entry_get_count (self));
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 2069 "Branch.c"
+#line 2091 "FoldersBranch.c"
default:
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 2075 "Branch.c"
+#line 2097 "FoldersBranch.c"
}
}
@@ -2079,33 +2101,33 @@ static void _vala_folders_sidebar_entry_get_property (GObject * object, guint pr
static void _vala_folders_sidebar_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
FoldersSidebarEntry * self;
self = G_TYPE_CHECK_INSTANCE_CAST (object, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
switch (property_id) {
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
case FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY:
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
folders_sidebar_entry_set_dir (self, g_value_get_object (value));
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
case FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY:
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
folders_sidebar_entry_set_collation (self, g_value_get_string (value));
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
case FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY:
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
folders_sidebar_entry_set_count (self, g_value_get_int (value));
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 2103 "Branch.c"
+#line 2125 "FoldersBranch.c"
default:
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 2109 "Branch.c"
+#line 2131 "FoldersBranch.c"
}
}
diff --git a/src/folders/Branch.vala b/src/folders/FoldersBranch.vala
index d14a148..5de7082 100644
--- a/src/folders/Branch.vala
+++ b/src/folders/FoldersBranch.vala
@@ -76,7 +76,7 @@ public class Folders.Branch : Sidebar.Branch {
// add the path elements in reverse order up to home directory
File? parent = file.get_parent();
- while (parent != null) {
+ while (parent != null && parent.get_path() != null) {
// don't process paths above the user's home directory
if (parent.equal(home_dir.get_parent()))
break;
@@ -141,7 +141,7 @@ public class Folders.Branch : Sidebar.Branch {
private class Folders.Root : Sidebar.Header {
public Root() {
- base (_("Folders"));
+ base (_("Folders"), _("Browse the library’s folder structure"));
}
}
@@ -168,7 +168,7 @@ public class Folders.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.ExpandableE
public SidebarEntry(File dir) {
this.dir = dir;
- collation = g_utf8_collate_key_for_filename(dir.get_path());
+ collation = dir.get_path().collate_key_for_filename();
}
public override string get_sidebar_name() {
diff --git a/src/folders/Page.c b/src/folders/FoldersPage.c
index 49bb21a..abc3f83 100644
--- a/src/folders/Page.c
+++ b/src/folders/FoldersPage.c
@@ -1,5 +1,5 @@
-/* Page.c generated by valac 0.36.6, the Vala compiler
- * generated from Page.vala, do not modify */
+/* FoldersPage.c generated by valac 0.36.6, the Vala compiler
+ * generated from FoldersPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
*
@@ -686,27 +686,27 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) {
gchar* _tmp2_;
GFile* _tmp3_;
FoldersPageFolderViewManager* _tmp4_;
-#line 24 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 24 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
g_return_val_if_fail (G_IS_FILE (dir), NULL);
-#line 25 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp0_ = dir;
-#line 25 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp1_ = g_file_get_path (_tmp0_);
-#line 25 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp2_ = _tmp1_;
-#line 25 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
self = (FoldersPage*) collection_page_construct (object_type, _tmp2_);
-#line 25 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_g_free0 (_tmp2_);
-#line 27 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 27 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp3_ = dir;
-#line 27 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 27 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp4_ = folders_page_folder_view_manager_new (self, _tmp3_);
-#line 27 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 27 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_view_manager_unref0 (self->priv->view_manager);
-#line 27 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 27 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
self->priv->view_manager = _tmp4_;
-#line 710 "Page.c"
+#line 710 "FoldersPage.c"
{
GeeIterator* _sources_it = NULL;
MediaCollectionRegistry* _tmp5_;
@@ -715,27 +715,27 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) {
GeeCollection* _tmp8_;
GeeIterator* _tmp9_;
GeeIterator* _tmp10_;
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp5_ = media_collection_registry_get_instance ();
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp6_ = _tmp5_;
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp7_ = media_collection_registry_get_all (_tmp6_);
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp8_ = _tmp7_;
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp10_ = _tmp9_;
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_g_object_unref0 (_tmp8_);
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_media_collection_registry_unref0 (_tmp6_);
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_sources_it = _tmp10_;
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
while (TRUE) {
-#line 739 "Page.c"
+#line 739 "FoldersPage.c"
GeeIterator* _tmp11_;
gboolean _tmp12_;
MediaSourceCollection* sources = NULL;
@@ -747,56 +747,56 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) {
FoldersPageFolderViewManager* _tmp18_;
ViewCollectionMonitor* _tmp19_;
ViewCollectionMonitor* _tmp20_;
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp11_ = _sources_it;
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp12_ = gee_iterator_next (_tmp11_);
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
if (!_tmp12_) {
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
break;
-#line 759 "Page.c"
+#line 759 "FoldersPage.c"
}
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp13_ = _sources_it;
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp14_ = gee_iterator_get (_tmp13_);
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
sources = (MediaSourceCollection*) _tmp14_;
-#line 30 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 30 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp16_ = _tmp15_;
-#line 30 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp17_ = sources;
-#line 30 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp18_ = self->priv->view_manager;
-#line 30 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp19_ = view_collection_monitor_source_collection (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL);
-#line 30 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp20_ = _tmp19_;
-#line 30 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_view_collection_monitor_unref0 (_tmp20_);
-#line 30 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_data_collection_unref0 (_tmp16_);
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_data_collection_unref0 (sources);
-#line 785 "Page.c"
+#line 785 "FoldersPage.c"
}
-#line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_g_object_unref0 (_sources_it);
-#line 789 "Page.c"
+#line 789 "FoldersPage.c"
}
-#line 24 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 24 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
return self;
-#line 793 "Page.c"
+#line 793 "FoldersPage.c"
}
FoldersPage* folders_page_new (GFile* dir) {
-#line 24 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 24 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
return folders_page_construct (FOLDERS_TYPE_PAGE, dir);
-#line 800 "Page.c"
+#line 800 "FoldersPage.c"
}
@@ -808,31 +808,31 @@ static void folders_page_real_get_config_photos_sort (MediaPage* base, gboolean*
ConfigFacade* _tmp1_;
gboolean _tmp2_ = FALSE;
gint _tmp3_ = 0;
-#line 33 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 33 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_PAGE, FoldersPage);
-#line 34 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 34 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp0_ = config_facade_get_instance ();
-#line 34 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 34 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp1_ = _tmp0_;
-#line 34 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 34 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
configuration_facade_get_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), &_tmp2_, &_tmp3_);
-#line 34 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 34 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_vala_sort_order = _tmp2_;
-#line 34 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 34 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_vala_sort_by = _tmp3_;
-#line 34 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 34 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_g_object_unref0 (_tmp1_);
-#line 33 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 33 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
if (sort_order) {
-#line 33 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 33 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
*sort_order = _vala_sort_order;
-#line 830 "Page.c"
+#line 830 "FoldersPage.c"
}
-#line 33 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 33 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
if (sort_by) {
-#line 33 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 33 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
*sort_by = _vala_sort_by;
-#line 836 "Page.c"
+#line 836 "FoldersPage.c"
}
}
@@ -843,28 +843,28 @@ static void folders_page_real_set_config_photos_sort (MediaPage* base, gboolean
ConfigFacade* _tmp1_;
gboolean _tmp2_;
gint _tmp3_;
-#line 37 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 37 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_PAGE, FoldersPage);
-#line 38 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp0_ = config_facade_get_instance ();
-#line 38 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp1_ = _tmp0_;
-#line 38 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp2_ = sort_order;
-#line 38 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp3_ = sort_by;
-#line 38 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
-#line 38 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_g_object_unref0 (_tmp1_);
-#line 861 "Page.c"
+#line 861 "FoldersPage.c"
}
static gpointer _g_object_ref0 (gpointer self) {
-#line 14 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
return self ? g_object_ref (self) : NULL;
-#line 868 "Page.c"
+#line 868 "FoldersPage.c"
}
@@ -873,32 +873,32 @@ static FoldersPageFolderViewManager* folders_page_folder_view_manager_construct
FoldersPage* _tmp0_;
GFile* _tmp1_;
GFile* _tmp2_;
-#line 11 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 11 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
g_return_val_if_fail (FOLDERS_IS_PAGE (owner), NULL);
-#line 11 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 11 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
g_return_val_if_fail (G_IS_FILE (dir), NULL);
-#line 12 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 12 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp0_ = owner;
-#line 12 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 12 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
self = (FoldersPageFolderViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage));
-#line 14 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp1_ = dir;
-#line 14 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 14 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_g_object_unref0 (self->dir);
-#line 14 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
self->dir = _tmp2_;
-#line 11 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 11 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
return self;
-#line 895 "Page.c"
+#line 895 "FoldersPage.c"
}
static FoldersPageFolderViewManager* folders_page_folder_view_manager_new (FoldersPage* owner, GFile* dir) {
-#line 11 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 11 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
return folders_page_folder_view_manager_construct (FOLDERS_PAGE_TYPE_FOLDER_VIEW_MANAGER, owner, dir);
-#line 902 "Page.c"
+#line 902 "FoldersPage.c"
}
@@ -911,40 +911,40 @@ static gboolean folders_page_folder_view_manager_real_include_in_view (ViewManag
GFile* _tmp3_;
gboolean _tmp4_;
gboolean _tmp5_;
-#line 17 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 17 "/home/jens/Source/shotwell/src/folders/FoldersPage.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"
+#line 17 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 18 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp0_ = source;
-#line 18 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp1_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 18 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp2_ = _tmp1_;
-#line 18 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp3_ = self->dir;
-#line 18 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp4_ = g_file_has_prefix (_tmp2_, _tmp3_);
-#line 18 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_tmp5_ = _tmp4_;
-#line 18 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_g_object_unref0 (_tmp2_);
-#line 18 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
result = _tmp5_;
-#line 18 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
return result;
-#line 937 "Page.c"
+#line 937 "FoldersPage.c"
}
static void folders_page_folder_view_manager_class_init (FoldersPageFolderViewManagerClass * klass) {
-#line 8 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
folders_page_folder_view_manager_parent_class = g_type_class_peek_parent (klass);
-#line 8 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
((ViewManagerClass *) klass)->finalize = folders_page_folder_view_manager_finalize;
-#line 8 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) folders_page_folder_view_manager_real_include_in_view;
-#line 948 "Page.c"
+#line 948 "FoldersPage.c"
}
@@ -954,13 +954,13 @@ static void folders_page_folder_view_manager_instance_init (FoldersPageFolderVie
static void folders_page_folder_view_manager_finalize (ViewManager * obj) {
FoldersPageFolderViewManager * self;
-#line 8 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_PAGE_TYPE_FOLDER_VIEW_MANAGER, FoldersPageFolderViewManager);
-#line 9 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 9 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_g_object_unref0 (self->dir);
-#line 8 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
VIEW_MANAGER_CLASS (folders_page_folder_view_manager_parent_class)->finalize (obj);
-#line 964 "Page.c"
+#line 964 "FoldersPage.c"
}
@@ -977,36 +977,36 @@ static GType folders_page_folder_view_manager_get_type (void) {
static void folders_page_class_init (FoldersPageClass * klass) {
-#line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
folders_page_parent_class = g_type_class_peek_parent (klass);
-#line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
g_type_class_add_private (klass, sizeof (FoldersPagePrivate));
-#line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
((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"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
((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"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
G_OBJECT_CLASS (klass)->finalize = folders_page_finalize;
-#line 991 "Page.c"
+#line 991 "FoldersPage.c"
}
static void folders_page_instance_init (FoldersPage * self) {
-#line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
self->priv = FOLDERS_PAGE_GET_PRIVATE (self);
-#line 998 "Page.c"
+#line 998 "FoldersPage.c"
}
static void folders_page_finalize (GObject * obj) {
FoldersPage * self;
-#line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_PAGE, FoldersPage);
-#line 22 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 22 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
_view_manager_unref0 (self->priv->view_manager);
-#line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
+#line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
G_OBJECT_CLASS (folders_page_parent_class)->finalize (obj);
-#line 1010 "Page.c"
+#line 1010 "FoldersPage.c"
}
diff --git a/src/folders/Page.vala b/src/folders/FoldersPage.vala
index 6145c95..6145c95 100644
--- a/src/folders/Page.vala
+++ b/src/folders/FoldersPage.vala
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 02:31:14 +0000