summaryrefslogtreecommitdiff
path: root/src/folders/FoldersBranch.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-06-25 21:12:13 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-06-25 21:12:13 +0200
commit059a62ee3c820a42fbce980c3256049adecc9100 (patch)
treee51eab94fd7d65459640ca227fb2257bb41d2acb /src/folders/FoldersBranch.c
parent55778740c211992cc86ea87588ab62c6750f36d1 (diff)
parente8f4d7a9cdd37c5a9fb3b6991a4e9173829808da (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/folders/FoldersBranch.c')
-rw-r--r--src/folders/FoldersBranch.c1377
1 files changed, 736 insertions, 641 deletions
diff --git a/src/folders/FoldersBranch.c b/src/folders/FoldersBranch.c
index ff8f49a..9b2f84f 100644
--- a/src/folders/FoldersBranch.c
+++ b/src/folders/FoldersBranch.c
@@ -1,4 +1,4 @@
-/* FoldersBranch.c generated by valac 0.36.6, the Vala compiler
+/* FoldersBranch.c generated by valac 0.40.4, the Vala compiler
* generated from FoldersBranch.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <gee.h>
@@ -59,6 +60,11 @@ typedef struct _SidebarSimplePageEntryClass SidebarSimplePageEntryClass;
typedef struct _FoldersSidebarEntry FoldersSidebarEntry;
typedef struct _FoldersSidebarEntryClass FoldersSidebarEntryClass;
+enum {
+ FOLDERS_BRANCH_0_PROPERTY,
+ FOLDERS_BRANCH_NUM_PROPERTIES
+};
+static GParamSpec* folders_branch_properties[FOLDERS_BRANCH_NUM_PROPERTIES];
#define TYPE_DATA_COLLECTION (data_collection_get_type ())
#define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection))
@@ -230,6 +236,11 @@ typedef struct _SidebarEmphasizableEntry SidebarEmphasizableEntry;
typedef struct _SidebarEmphasizableEntryIface SidebarEmphasizableEntryIface;
typedef struct _SidebarHeaderPrivate SidebarHeaderPrivate;
typedef struct _FoldersRootPrivate FoldersRootPrivate;
+enum {
+ FOLDERS_ROOT_0_PROPERTY,
+ FOLDERS_ROOT_NUM_PROPERTIES
+};
+static GParamSpec* folders_root_properties[FOLDERS_ROOT_NUM_PROPERTIES];
#define SIDEBAR_TYPE_SELECTABLE_ENTRY (sidebar_selectable_entry_get_type ())
#define SIDEBAR_SELECTABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY, SidebarSelectableEntry))
@@ -266,6 +277,14 @@ typedef struct _SidebarContextable SidebarContextable;
typedef struct _SidebarContextableIface SidebarContextableIface;
typedef struct _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate;
typedef struct _FoldersSidebarEntryPrivate FoldersSidebarEntryPrivate;
+enum {
+ FOLDERS_SIDEBAR_ENTRY_0_PROPERTY,
+ FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY,
+ FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY,
+ FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY,
+ FOLDERS_SIDEBAR_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* folders_sidebar_entry_properties[FOLDERS_SIDEBAR_ENTRY_NUM_PROPERTIES];
#define TYPE_CHECKERBOARD_PAGE (checkerboard_page_get_type ())
#define CHECKERBOARD_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHECKERBOARD_PAGE, CheckerboardPage))
@@ -452,14 +471,17 @@ GType folders_branch_get_type (void) G_GNUC_CONST;
GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST;
GType folders_sidebar_entry_get_type (void) G_GNUC_CONST;
#define FOLDERS_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), FOLDERS_TYPE_BRANCH, FoldersBranchPrivate))
-enum {
- FOLDERS_BRANCH_DUMMY_PROPERTY
-};
gpointer data_collection_ref (gpointer instance);
void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_data_collection (GValue* value,
+ gpointer v_object);
+void value_take_data_collection (GValue* value,
+ gpointer v_object);
gpointer value_get_data_collection (const GValue* value);
GType data_collection_get_type (void) G_GNUC_CONST;
GType source_collection_get_type (void) G_GNUC_CONST;
@@ -467,20 +489,35 @@ GType database_source_collection_get_type (void) G_GNUC_CONST;
GType media_source_collection_get_type (void) G_GNUC_CONST;
gpointer media_collection_registry_ref (gpointer instance);
void media_collection_registry_unref (gpointer instance);
-GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_media_collection_registry (GValue* value, gpointer v_object);
-void value_take_media_collection_registry (GValue* value, gpointer v_object);
+GParamSpec* param_spec_media_collection_registry (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_media_collection_registry (GValue* value,
+ gpointer v_object);
+void value_take_media_collection_registry (GValue* value,
+ gpointer v_object);
gpointer value_get_media_collection_registry (const GValue* value);
GType media_collection_registry_get_type (void) G_GNUC_CONST;
MediaCollectionRegistry* media_collection_registry_get_instance (void);
GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self);
GType data_object_get_type (void) G_GNUC_CONST;
-static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIterable* added, GeeIterable* removed);
-static void _folders_branch_on_media_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self);
+static void folders_branch_on_media_contents_altered (FoldersBranch* self,
+ GeeIterable* added,
+ GeeIterable* removed);
+static void _folders_branch_on_media_contents_altered_data_collection_contents_altered (DataCollection* _sender,
+ GeeIterable* added,
+ GeeIterable* removed,
+ gpointer self);
guint file_hash (GFile* file);
-static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self);
-gboolean file_equal (GFile* a, GFile* b);
-static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self);
+static guint _file_hash_gee_hash_data_func (gconstpointer v,
+ gpointer self);
+gboolean file_equal (GFile* a,
+ GFile* b);
+static gboolean _file_equal_gee_equal_data_func (gconstpointer a,
+ gconstpointer b,
+ gpointer self);
FoldersBranch* folders_branch_new (void);
FoldersBranch* folders_branch_construct (GType object_type);
FoldersRoot* folders_root_new (void);
@@ -491,106 +528,153 @@ GType folders_root_get_type (void) G_GNUC_CONST;
GType sidebar_tree_get_type (void) G_GNUC_CONST;
GType sidebar_entry_get_type (void) G_GNUC_CONST;
GType sidebar_branch_options_get_type (void) G_GNUC_CONST;
-static gint folders_branch_comparator (SidebarEntry* a, SidebarEntry* b);
-static gint _folders_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b);
-SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
-SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
+static gint folders_branch_comparator (SidebarEntry* a,
+ SidebarEntry* b);
+static gint _folders_branch_comparator_gcompare_func (gconstpointer a,
+ gconstpointer b);
+SidebarBranch* sidebar_branch_new (SidebarEntry* root,
+ SidebarBranchOptions options,
+ GCompareFunc default_comparator,
+ GCompareFunc root_comparator);
+SidebarBranch* sidebar_branch_construct (GType object_type,
+ SidebarEntry* root,
+ SidebarBranchOptions options,
+ GCompareFunc default_comparator,
+ GCompareFunc root_comparator);
GeeCollection* data_collection_get_all (DataCollection* self);
const gchar* folders_sidebar_entry_get_collation (FoldersSidebarEntry* self);
gchar* sidebar_simple_page_entry_get_sidebar_name (SidebarSimplePageEntry* self);
GType data_source_get_type (void) G_GNUC_CONST;
GType thumbnail_source_get_type (void) G_GNUC_CONST;
GType media_source_get_type (void) G_GNUC_CONST;
-static void folders_branch_on_master_source_replaced (FoldersBranch* self, MediaSource* media_source, GFile* old_file, GFile* new_file);
-static void folders_branch_remove_entry (FoldersBranch* self, GFile* file);
-static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media);
-static void _folders_branch_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self);
+static void folders_branch_on_master_source_replaced (FoldersBranch* self,
+ MediaSource* media_source,
+ GFile* old_file,
+ GFile* new_file);
+static void folders_branch_remove_entry (FoldersBranch* self,
+ GFile* file);
+static void folders_branch_add_entry (FoldersBranch* self,
+ MediaSource* media);
+static void _folders_branch_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender,
+ GFile* old_file,
+ GFile* new_file,
+ gpointer self);
GFile* media_source_get_file (MediaSource* self);
FoldersSidebarEntry* folders_sidebar_entry_new (GFile* dir);
-FoldersSidebarEntry* folders_sidebar_entry_construct (GType object_type, GFile* dir);
+FoldersSidebarEntry* folders_sidebar_entry_construct (GType object_type,
+ GFile* dir);
SidebarEntry* sidebar_branch_get_root (SidebarBranch* self);
-void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator);
+void sidebar_branch_graft (SidebarBranch* self,
+ SidebarEntry* parent,
+ SidebarEntry* entry,
+ GCompareFunc comparator);
gint folders_sidebar_entry_get_count (FoldersSidebarEntry* self);
-void folders_sidebar_entry_set_count (FoldersSidebarEntry* self, gint value);
-gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent);
+void folders_sidebar_entry_set_count (FoldersSidebarEntry* self,
+ gint value);
+gint sidebar_branch_get_child_count (SidebarBranch* self,
+ SidebarEntry* parent);
GFile* folders_sidebar_entry_get_dir (FoldersSidebarEntry* self);
-SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry);
-void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
+SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self,
+ SidebarEntry* entry);
+void sidebar_branch_prune (SidebarBranch* self,
+ SidebarEntry* entry);
static void folders_branch_finalize (GObject * obj);
GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST;
GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST;
GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST;
-enum {
- FOLDERS_ROOT_DUMMY_PROPERTY
-};
-SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized);
-SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized);
+SidebarHeader* sidebar_header_new (const gchar* name,
+ const gchar* tooltip,
+ gboolean emphasized);
+SidebarHeader* sidebar_header_construct (GType object_type,
+ const gchar* name,
+ const gchar* tooltip,
+ gboolean emphasized);
GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
GType page_get_type (void) G_GNUC_CONST;
GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
GType sidebar_contextable_get_type (void) G_GNUC_CONST;
#define FOLDERS_SIDEBAR_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntryPrivate))
-enum {
- FOLDERS_SIDEBAR_ENTRY_DUMMY_PROPERTY,
- FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY,
- FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY,
- FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY
-};
SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type);
-static void folders_sidebar_entry_set_dir (FoldersSidebarEntry* self, GFile* value);
-static void folders_sidebar_entry_set_collation (FoldersSidebarEntry* self, const gchar* value);
+static void folders_sidebar_entry_set_dir (FoldersSidebarEntry* self,
+ GFile* value);
+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);
static gchar* folders_sidebar_entry_real_to_string (SidebarSimplePageEntry* base);
static gboolean folders_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base);
static Page* folders_sidebar_entry_real_create_page (SidebarSimplePageEntry* base);
FoldersPage* folders_page_new (GFile* dir);
-FoldersPage* folders_page_construct (GType object_type, GFile* dir);
+FoldersPage* folders_page_construct (GType object_type,
+ GFile* dir);
GType checkerboard_page_get_type (void) G_GNUC_CONST;
GType media_page_get_type (void) G_GNUC_CONST;
GType collection_page_get_type (void) G_GNUC_CONST;
GType folders_page_get_type (void) G_GNUC_CONST;
gchar* sidebar_simple_page_entry_get_sidebar_icon (SidebarSimplePageEntry* self);
static void folders_sidebar_entry_finalize (GObject * obj);
-static void _vala_folders_sidebar_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_folders_sidebar_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
-
-
-static void _folders_branch_on_media_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
+static void _vala_folders_sidebar_entry_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec);
+static void _vala_folders_sidebar_entry_set_property (GObject * object,
+ guint property_id,
+ const GValue * value,
+ GParamSpec * pspec);
+
+
+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/FoldersBranch.vala"
folders_branch_on_media_contents_altered ((FoldersBranch*) self, added, removed);
-#line 563 "FoldersBranch.c"
+#line 635 "FoldersBranch.c"
}
-static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
+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/FoldersBranch.vala"
return result;
-#line 572 "FoldersBranch.c"
+#line 647 "FoldersBranch.c"
}
-static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+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/FoldersBranch.vala"
return result;
-#line 581 "FoldersBranch.c"
+#line 660 "FoldersBranch.c"
}
-static gint _folders_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
+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/FoldersBranch.vala"
return result;
-#line 590 "FoldersBranch.c"
+#line 672 "FoldersBranch.c"
}
-FoldersBranch* folders_branch_construct (GType object_type) {
+FoldersBranch*
+folders_branch_construct (GType object_type)
+{
FoldersBranch * self = NULL;
FoldersRoot* _tmp0_;
FoldersRoot* _tmp1_;
@@ -612,7 +696,7 @@ FoldersBranch* folders_branch_construct (GType object_type) {
_g_object_unref0 (self->priv->home_dir);
#line 18 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self->priv->home_dir = _tmp3_;
-#line 616 "FoldersBranch.c"
+#line 700 "FoldersBranch.c"
{
GeeIterator* _sources_it = NULL;
MediaCollectionRegistry* _tmp4_;
@@ -641,168 +725,149 @@ FoldersBranch* folders_branch_construct (GType object_type) {
_sources_it = _tmp9_;
#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
while (TRUE) {
-#line 645 "FoldersBranch.c"
+#line 729 "FoldersBranch.c"
GeeIterator* _tmp10_;
- gboolean _tmp11_;
MediaSourceCollection* sources = NULL;
- GeeIterator* _tmp12_;
- gpointer _tmp13_;
- MediaSourceCollection* _tmp14_;
+ GeeIterator* _tmp11_;
+ gpointer _tmp12_;
+ MediaSourceCollection* _tmp13_;
+ GeeCollection* _tmp14_;
GeeCollection* _tmp15_;
- GeeCollection* _tmp16_;
- MediaSourceCollection* _tmp17_;
+ MediaSourceCollection* _tmp16_;
#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp10_ = _sources_it;
#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp11_ = gee_iterator_next (_tmp10_);
-#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (!_tmp11_) {
+ if (!gee_iterator_next (_tmp10_)) {
#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 663 "FoldersBranch.c"
+#line 744 "FoldersBranch.c"
}
#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp12_ = _sources_it;
+ _tmp11_ = _sources_it;
#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp13_ = gee_iterator_get (_tmp12_);
+ _tmp12_ = gee_iterator_get (_tmp11_);
#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- sources = (MediaSourceCollection*) _tmp13_;
+ sources = (MediaSourceCollection*) _tmp12_;
#line 22 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp14_ = sources;
+ _tmp13_ = sources;
#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));
+ _tmp14_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection));
#line 22 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp16_ = _tmp15_;
+ _tmp15_ = _tmp14_;
#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);
+ folders_branch_on_media_contents_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable), NULL);
#line 22 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _g_object_unref0 (_tmp16_);
+ _g_object_unref0 (_tmp15_);
#line 25 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp17_ = sources;
+ _tmp16_ = sources;
#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);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, 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/FoldersBranch.vala"
_data_collection_unref0 (sources);
-#line 687 "FoldersBranch.c"
+#line 768 "FoldersBranch.c"
}
#line 20 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (_sources_it);
-#line 691 "FoldersBranch.c"
+#line 772 "FoldersBranch.c"
}
#line 12 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return self;
-#line 695 "FoldersBranch.c"
+#line 776 "FoldersBranch.c"
}
-FoldersBranch* folders_branch_new (void) {
+FoldersBranch*
+folders_branch_new (void)
+{
#line 12 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return folders_branch_construct (FOLDERS_TYPE_BRANCH);
-#line 702 "FoldersBranch.c"
+#line 785 "FoldersBranch.c"
}
-static gint folders_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
+static gint
+folders_branch_comparator (SidebarEntry* a,
+ SidebarEntry* b)
+{
gint result = 0;
- SidebarEntry* _tmp0_;
- SidebarEntry* _tmp1_;
gint coll_key_equality = 0;
- GCompareFunc _tmp2_;
- SidebarEntry* _tmp3_;
+ GCompareFunc _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
const gchar* _tmp4_;
- const gchar* _tmp5_;
- SidebarEntry* _tmp6_;
- const gchar* _tmp7_;
- const gchar* _tmp8_;
- gint _tmp9_;
- gint _tmp10_;
+ gint _tmp5_;
#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/FoldersBranch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
#line 35 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp0_ = a;
-#line 35 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp1_ = b;
-#line 35 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (_tmp0_ == _tmp1_) {
+ if (a == b) {
#line 36 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
result = 0;
#line 36 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 734 "FoldersBranch.c"
+#line 811 "FoldersBranch.c"
}
#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp2_ = g_strcmp0;
-#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp3_ = a;
+ _tmp0_ = g_strcmp0;
#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));
+ _tmp1_ = folders_sidebar_entry_get_collation (G_TYPE_CHECK_INSTANCE_CAST (a, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry));
#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp5_ = _tmp4_;
-#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp6_ = b;
-#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));
+ _tmp2_ = _tmp1_;
#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp8_ = _tmp7_;
+ _tmp3_ = folders_sidebar_entry_get_collation (G_TYPE_CHECK_INSTANCE_CAST (b, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry));
#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp9_ = _tmp2_ (_tmp5_, _tmp8_);
+ _tmp4_ = _tmp3_;
#line 38 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- coll_key_equality = _tmp9_;
+ coll_key_equality = _tmp0_ (_tmp2_, _tmp4_);
#line 41 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp10_ = coll_key_equality;
+ _tmp5_ = coll_key_equality;
#line 41 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (_tmp10_ == 0) {
-#line 758 "FoldersBranch.c"
- GCompareFunc _tmp11_;
- SidebarEntry* _tmp12_;
- gchar* _tmp13_;
- gchar* _tmp14_;
- SidebarEntry* _tmp15_;
- gchar* _tmp16_;
- gchar* _tmp17_;
- gint _tmp18_;
- gint _tmp19_;
-#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp11_ = g_strcmp0;
-#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp12_ = a;
-#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));
+ if (_tmp5_ == 0) {
+#line 829 "FoldersBranch.c"
+ GCompareFunc _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+ gint _tmp11_;
#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp14_ = _tmp13_;
+ _tmp6_ = g_strcmp0;
#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp15_ = b;
+ _tmp7_ = sidebar_simple_page_entry_get_sidebar_name (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (a, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry));
#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));
+ _tmp8_ = _tmp7_;
#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp17_ = _tmp16_;
+ _tmp9_ = sidebar_simple_page_entry_get_sidebar_name (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (b, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry));
#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp18_ = _tmp11_ (_tmp14_, _tmp17_);
+ _tmp10_ = _tmp9_;
#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp19_ = _tmp18_;
+ _tmp11_ = _tmp6_ (_tmp8_, _tmp10_);
#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _g_free0 (_tmp17_);
+ _g_free0 (_tmp10_);
#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _g_free0 (_tmp14_);
+ _g_free0 (_tmp8_);
#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- result = _tmp19_;
+ result = _tmp11_;
#line 44 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 794 "FoldersBranch.c"
+#line 856 "FoldersBranch.c"
}
#line 48 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
result = coll_key_equality;
#line 48 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 800 "FoldersBranch.c"
+#line 862 "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_;
+static void
+folders_branch_on_master_source_replaced (FoldersBranch* self,
+ MediaSource* media_source,
+ GFile* old_file,
+ GFile* new_file)
+{
#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/FoldersBranch.vala"
@@ -812,27 +877,30 @@ static void folders_branch_on_master_source_replaced (FoldersBranch* self, Media
#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/FoldersBranch.vala"
- _tmp0_ = old_file;
-#line 52 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- folders_branch_remove_entry (self, _tmp0_);
+ folders_branch_remove_entry (self, old_file);
#line 53 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp1_ = media_source;
-#line 53 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- folders_branch_add_entry (self, _tmp1_);
-#line 823 "FoldersBranch.c"
+ folders_branch_add_entry (self, media_source);
+#line 884 "FoldersBranch.c"
}
-static void _folders_branch_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self) {
+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/FoldersBranch.vala"
folders_branch_on_master_source_replaced ((FoldersBranch*) self, _sender, old_file, new_file);
-#line 830 "FoldersBranch.c"
+#line 896 "FoldersBranch.c"
}
-static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIterable* added, GeeIterable* removed) {
- GeeIterable* _tmp0_;
- GeeIterable* _tmp9_;
+static void
+folders_branch_on_media_contents_altered (FoldersBranch* self,
+ GeeIterable* added,
+ GeeIterable* removed)
+{
#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/FoldersBranch.vala"
@@ -840,420 +908,403 @@ static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIt
#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/FoldersBranch.vala"
- _tmp0_ = added;
-#line 57 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (_tmp0_ != NULL) {
-#line 847 "FoldersBranch.c"
+ if (added != NULL) {
+#line 913 "FoldersBranch.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp1_;
- GeeIterator* _tmp2_;
-#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp1_ = added;
+ GeeIterator* _tmp0_;
#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp2_ = gee_iterable_iterator (_tmp1_);
+ _tmp0_ = gee_iterable_iterator (added);
#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _object_it = _tmp2_;
+ _object_it = _tmp0_;
#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
while (TRUE) {
-#line 860 "FoldersBranch.c"
- GeeIterator* _tmp3_;
- gboolean _tmp4_;
+#line 923 "FoldersBranch.c"
+ GeeIterator* _tmp1_;
DataObject* object = NULL;
- GeeIterator* _tmp5_;
- gpointer _tmp6_;
- DataObject* _tmp7_;
- DataObject* _tmp8_;
+ GeeIterator* _tmp2_;
+ gpointer _tmp3_;
+ DataObject* _tmp4_;
+ DataObject* _tmp5_;
#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp3_ = _object_it;
+ _tmp1_ = _object_it;
#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp4_ = gee_iterator_next (_tmp3_);
-#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (!_tmp4_) {
+ if (!gee_iterator_next (_tmp1_)) {
#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 876 "FoldersBranch.c"
+#line 936 "FoldersBranch.c"
}
#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp5_ = _object_it;
+ _tmp2_ = _object_it;
#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp6_ = gee_iterator_get (_tmp5_);
+ _tmp3_ = gee_iterator_get (_tmp2_);
#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- object = (DataObject*) _tmp6_;
+ object = (DataObject*) _tmp3_;
#line 59 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp7_ = object;
+ _tmp4_ = object;
#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));
+ folders_branch_add_entry (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
#line 60 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp8_ = object;
+ _tmp5_ = object;
#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);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, 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/FoldersBranch.vala"
_g_object_unref0 (object);
-#line 894 "FoldersBranch.c"
+#line 954 "FoldersBranch.c"
}
#line 58 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (_object_it);
-#line 898 "FoldersBranch.c"
+#line 958 "FoldersBranch.c"
}
}
#line 64 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp9_ = removed;
-#line 64 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (_tmp9_ != NULL) {
-#line 905 "FoldersBranch.c"
+ if (removed != NULL) {
+#line 963 "FoldersBranch.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp10_;
- GeeIterator* _tmp11_;
-#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp10_ = removed;
+ GeeIterator* _tmp6_;
#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp11_ = gee_iterable_iterator (_tmp10_);
+ _tmp6_ = gee_iterable_iterator (removed);
#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _object_it = _tmp11_;
+ _object_it = _tmp6_;
#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
while (TRUE) {
-#line 918 "FoldersBranch.c"
- GeeIterator* _tmp12_;
- gboolean _tmp13_;
+#line 973 "FoldersBranch.c"
+ GeeIterator* _tmp7_;
DataObject* object = NULL;
- GeeIterator* _tmp14_;
- gpointer _tmp15_;
- DataObject* _tmp16_;
- GFile* _tmp17_;
- GFile* _tmp18_;
- DataObject* _tmp19_;
- guint _tmp20_;
-#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp12_ = _object_it;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
+ DataObject* _tmp10_;
+ GFile* _tmp11_;
+ GFile* _tmp12_;
+ DataObject* _tmp13_;
+ guint _tmp14_;
#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp13_ = gee_iterator_next (_tmp12_);
+ _tmp7_ = _object_it;
#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (!_tmp13_) {
+ if (!gee_iterator_next (_tmp7_)) {
#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 937 "FoldersBranch.c"
+#line 989 "FoldersBranch.c"
}
#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp14_ = _object_it;
+ _tmp8_ = _object_it;
#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp15_ = gee_iterator_get (_tmp14_);
+ _tmp9_ = gee_iterator_get (_tmp8_);
#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- object = (DataObject*) _tmp15_;
+ object = (DataObject*) _tmp9_;
#line 66 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp16_ = object;
+ _tmp10_ = object;
#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));
+ _tmp11_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
#line 66 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp18_ = _tmp17_;
+ _tmp12_ = _tmp11_;
#line 66 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- folders_branch_remove_entry (self, _tmp18_);
+ folders_branch_remove_entry (self, _tmp12_);
#line 66 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _g_object_unref0 (_tmp18_);
+ _g_object_unref0 (_tmp12_);
#line 67 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp19_ = object;
+ _tmp13_ = object;
#line 67 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- g_signal_parse_name ("master-replaced", TYPE_MEDIA_SOURCE, &_tmp20_, NULL, FALSE);
+ g_signal_parse_name ("master-replaced", TYPE_MEDIA_SOURCE, &_tmp14_, NULL, FALSE);
#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);
+ g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _folders_branch_on_master_source_replaced_media_source_master_replaced, self);
#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (object);
-#line 963 "FoldersBranch.c"
+#line 1015 "FoldersBranch.c"
}
#line 65 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (_object_it);
-#line 967 "FoldersBranch.c"
+#line 1019 "FoldersBranch.c"
}
}
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 96 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return self ? g_object_ref (self) : NULL;
-#line 976 "FoldersBranch.c"
+#line 1030 "FoldersBranch.c"
}
-static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
+static void
+folders_branch_add_entry (FoldersBranch* self,
+ MediaSource* media)
+{
GFile* file = NULL;
- MediaSource* _tmp0_;
- GFile* _tmp1_;
+ GFile* _tmp0_;
GeeArrayList* elements = NULL;
- GeeArrayList* _tmp2_;
+ GeeArrayList* _tmp1_;
GFile* parent = NULL;
+ GFile* _tmp2_;
GFile* _tmp3_;
- GFile* _tmp4_;
FoldersSidebarEntry* parent_entry = NULL;
#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/FoldersBranch.vala"
g_return_if_fail (IS_MEDIA_SOURCE (media));
#line 73 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp0_ = media;
+ _tmp0_ = media_source_get_file (media);
#line 73 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp1_ = media_source_get_file (_tmp0_);
-#line 73 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- file = _tmp1_;
+ file = _tmp0_;
#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);
+ _tmp1_ = 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/FoldersBranch.vala"
- elements = _tmp2_;
+ elements = _tmp1_;
#line 78 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp3_ = file;
+ _tmp2_ = file;
#line 78 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp4_ = g_file_get_parent (_tmp3_);
+ _tmp3_ = g_file_get_parent (_tmp2_);
#line 78 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- parent = _tmp4_;
+ parent = _tmp3_;
#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
while (TRUE) {
-#line 1012 "FoldersBranch.c"
- gboolean _tmp5_ = FALSE;
- GFile* _tmp6_;
+#line 1066 "FoldersBranch.c"
+ gboolean _tmp4_ = FALSE;
+ GFile* _tmp5_;
+ GFile* _tmp9_;
GFile* _tmp10_;
GFile* _tmp11_;
GFile* _tmp12_;
- GFile* _tmp13_;
- gboolean _tmp14_;
- gboolean _tmp15_;
- GeeArrayList* _tmp16_;
+ gboolean _tmp13_;
+ GeeArrayList* _tmp14_;
+ GFile* _tmp15_;
+ GFile* _tmp16_;
GFile* _tmp17_;
- GFile* _tmp18_;
- GFile* _tmp19_;
#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp6_ = parent;
+ _tmp5_ = parent;
#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (_tmp6_ != NULL) {
-#line 1029 "FoldersBranch.c"
- GFile* _tmp7_;
+ if (_tmp5_ != NULL) {
+#line 1082 "FoldersBranch.c"
+ GFile* _tmp6_;
+ gchar* _tmp7_;
gchar* _tmp8_;
- gchar* _tmp9_;
#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp7_ = parent;
+ _tmp6_ = parent;
#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp8_ = g_file_get_path (_tmp7_);
+ _tmp7_ = g_file_get_path (_tmp6_);
#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp5_ = _tmp9_ != NULL;
+ _tmp4_ = _tmp8_ != NULL;
#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _g_free0 (_tmp9_);
-#line 1043 "FoldersBranch.c"
+ _g_free0 (_tmp8_);
+#line 1096 "FoldersBranch.c"
} else {
#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp5_ = FALSE;
-#line 1047 "FoldersBranch.c"
+ _tmp4_ = FALSE;
+#line 1100 "FoldersBranch.c"
}
#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (!_tmp5_) {
+ if (!_tmp4_) {
#line 79 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 1053 "FoldersBranch.c"
+#line 1106 "FoldersBranch.c"
}
#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp10_ = parent;
+ _tmp9_ = parent;
#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp11_ = self->priv->home_dir;
+ _tmp10_ = self->priv->home_dir;
#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp12_ = g_file_get_parent (_tmp11_);
+ _tmp11_ = g_file_get_parent (_tmp10_);
#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp13_ = _tmp12_;
+ _tmp12_ = _tmp11_;
#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp14_ = g_file_equal (_tmp10_, _tmp13_);
+ _tmp13_ = g_file_equal (_tmp9_, _tmp12_);
#line 81 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp15_ = _tmp14_;
+ _g_object_unref0 (_tmp12_);
#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_) {
+ if (_tmp13_) {
#line 82 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 1073 "FoldersBranch.c"
+#line 1124 "FoldersBranch.c"
}
#line 84 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp16_ = elements;
+ _tmp14_ = elements;
#line 84 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp17_ = parent;
+ _tmp15_ = 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_);
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_);
#line 86 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp18_ = parent;
+ _tmp16_ = parent;
#line 86 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp19_ = g_file_get_parent (_tmp18_);
+ _tmp17_ = g_file_get_parent (_tmp16_);
#line 86 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (parent);
#line 86 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- parent = _tmp19_;
-#line 1089 "FoldersBranch.c"
+ parent = _tmp17_;
+#line 1140 "FoldersBranch.c"
}
#line 91 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
parent_entry = NULL;
-#line 1093 "FoldersBranch.c"
+#line 1144 "FoldersBranch.c"
{
gint ctr = 0;
- GeeArrayList* _tmp20_;
- gint _tmp21_;
- gint _tmp22_;
+ GeeArrayList* _tmp18_;
+ gint _tmp19_;
+ gint _tmp20_;
#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp20_ = elements;
+ _tmp18_ = 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));
+ _tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp22_ = _tmp21_;
+ _tmp20_ = _tmp19_;
#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- ctr = _tmp22_ - 1;
-#line 1107 "FoldersBranch.c"
+ ctr = _tmp20_ - 1;
+#line 1158 "FoldersBranch.c"
{
- gboolean _tmp23_ = FALSE;
+ gboolean _tmp21_ = FALSE;
#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp23_ = TRUE;
+ _tmp21_ = TRUE;
#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
while (TRUE) {
-#line 1114 "FoldersBranch.c"
- gint _tmp25_;
+#line 1165 "FoldersBranch.c"
+ gint _tmp23_;
GFile* parent_dir = NULL;
- GeeArrayList* _tmp26_;
- gint _tmp27_;
- gpointer _tmp28_;
+ GeeArrayList* _tmp24_;
+ gint _tmp25_;
+ gpointer _tmp26_;
FoldersSidebarEntry* old_parent_entry = NULL;
- FoldersSidebarEntry* _tmp29_;
- FoldersSidebarEntry* _tmp30_;
- GeeHashMap* _tmp31_;
- GFile* _tmp32_;
- gpointer _tmp33_;
- FoldersSidebarEntry* _tmp34_;
- gint _tmp46_;
+ FoldersSidebarEntry* _tmp27_;
+ FoldersSidebarEntry* _tmp28_;
+ GeeHashMap* _tmp29_;
+ GFile* _tmp30_;
+ gpointer _tmp31_;
+ FoldersSidebarEntry* _tmp32_;
+ gint _tmp44_;
#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (!_tmp23_) {
-#line 1130 "FoldersBranch.c"
- gint _tmp24_;
+ if (!_tmp21_) {
+#line 1181 "FoldersBranch.c"
+ gint _tmp22_;
#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp24_ = ctr;
+ _tmp22_ = ctr;
#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- ctr = _tmp24_ - 1;
-#line 1136 "FoldersBranch.c"
+ ctr = _tmp22_ - 1;
+#line 1187 "FoldersBranch.c"
}
#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp23_ = FALSE;
+ _tmp21_ = FALSE;
#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp25_ = ctr;
+ _tmp23_ = ctr;
#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (!(_tmp25_ >= 0)) {
+ if (!(_tmp23_ >= 0)) {
#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 1146 "FoldersBranch.c"
+#line 1197 "FoldersBranch.c"
}
#line 93 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp26_ = elements;
+ _tmp24_ = elements;
#line 93 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp27_ = ctr;
+ _tmp25_ = 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_);
+ _tmp26_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp25_);
#line 93 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- parent_dir = (GFile*) _tmp28_;
+ parent_dir = (GFile*) _tmp26_;
#line 96 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp29_ = parent_entry;
+ _tmp27_ = parent_entry;
#line 96 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp30_ = _g_object_ref0 (_tmp29_);
+ _tmp28_ = _g_object_ref0 (_tmp27_);
#line 96 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- old_parent_entry = _tmp30_;
+ old_parent_entry = _tmp28_;
#line 98 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp31_ = self->priv->entries;
+ _tmp29_ = self->priv->entries;
#line 98 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp32_ = parent_dir;
+ _tmp30_ = 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_);
+ _tmp31_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp30_);
#line 98 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (parent_entry);
#line 98 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- parent_entry = (FoldersSidebarEntry*) _tmp33_;
+ parent_entry = (FoldersSidebarEntry*) _tmp31_;
#line 99 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp34_ = parent_entry;
+ _tmp32_ = 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_;
+ if (_tmp32_ == NULL) {
+#line 1227 "FoldersBranch.c"
+ GFile* _tmp33_;
+ FoldersSidebarEntry* _tmp34_;
+ GeeHashMap* _tmp35_;
+ GFile* _tmp36_;
+ FoldersSidebarEntry* _tmp37_;
+ SidebarEntry* _tmp38_ = NULL;
FoldersSidebarEntry* _tmp39_;
- SidebarEntry* _tmp40_ = NULL;
- FoldersSidebarEntry* _tmp41_;
- FoldersSidebarEntry* _tmp45_;
+ FoldersSidebarEntry* _tmp43_;
#line 100 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp35_ = parent_dir;
+ _tmp33_ = parent_dir;
#line 100 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp36_ = folders_sidebar_entry_new (_tmp35_);
+ _tmp34_ = folders_sidebar_entry_new (_tmp33_);
#line 100 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (parent_entry);
#line 100 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- parent_entry = _tmp36_;
+ parent_entry = _tmp34_;
#line 101 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp37_ = self->priv->entries;
+ _tmp35_ = self->priv->entries;
#line 101 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp38_ = parent_dir;
+ _tmp36_ = parent_dir;
#line 101 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp39_ = parent_entry;
+ _tmp37_ = 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_);
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp36_, _tmp37_);
#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp41_ = old_parent_entry;
+ _tmp39_ = old_parent_entry;
#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (_tmp41_ == NULL) {
-#line 1205 "FoldersBranch.c"
- SidebarEntry* _tmp42_;
+ if (_tmp39_ == NULL) {
+#line 1256 "FoldersBranch.c"
+ SidebarEntry* _tmp40_;
#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));
+ _tmp40_ = 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_);
+ _g_object_unref0 (_tmp38_);
#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp40_ = _tmp42_;
-#line 1213 "FoldersBranch.c"
+ _tmp38_ = _tmp40_;
+#line 1264 "FoldersBranch.c"
} else {
- FoldersSidebarEntry* _tmp43_;
- SidebarEntry* _tmp44_;
+ FoldersSidebarEntry* _tmp41_;
+ SidebarEntry* _tmp42_;
#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp43_ = old_parent_entry;
+ _tmp41_ = 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));
+ _tmp42_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _g_object_unref0 (_tmp40_);
+ _g_object_unref0 (_tmp38_);
#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp40_ = _tmp44_;
-#line 1225 "FoldersBranch.c"
+ _tmp38_ = _tmp42_;
+#line 1276 "FoldersBranch.c"
}
#line 103 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp45_ = parent_entry;
+ _tmp43_ = 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);
+ sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
#line 99 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _g_object_unref0 (_tmp40_);
-#line 1233 "FoldersBranch.c"
+ _g_object_unref0 (_tmp38_);
+#line 1284 "FoldersBranch.c"
}
#line 107 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp46_ = ctr;
+ _tmp44_ = ctr;
#line 107 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (_tmp46_ == 0) {
-#line 1239 "FoldersBranch.c"
- FoldersSidebarEntry* _tmp47_;
- gint _tmp48_;
- gint _tmp49_;
+ if (_tmp44_ == 0) {
+#line 1290 "FoldersBranch.c"
+ FoldersSidebarEntry* _tmp45_;
+ gint _tmp46_;
+ gint _tmp47_;
#line 108 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp47_ = parent_entry;
+ _tmp45_ = parent_entry;
#line 108 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp48_ = folders_sidebar_entry_get_count (_tmp47_);
+ _tmp46_ = folders_sidebar_entry_get_count (_tmp45_);
#line 108 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp49_ = _tmp48_;
+ _tmp47_ = _tmp46_;
#line 108 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- folders_sidebar_entry_set_count (_tmp47_, _tmp49_ + 1);
-#line 1251 "FoldersBranch.c"
+ folders_sidebar_entry_set_count (_tmp45_, _tmp47_ + 1);
+#line 1302 "FoldersBranch.c"
}
#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (old_parent_entry);
#line 92 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (parent_dir);
-#line 1257 "FoldersBranch.c"
+#line 1308 "FoldersBranch.c"
}
}
}
@@ -1265,32 +1316,34 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
_g_object_unref0 (elements);
#line 72 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (file);
-#line 1269 "FoldersBranch.c"
+#line 1320 "FoldersBranch.c"
}
-static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) {
+static void
+folders_branch_remove_entry (FoldersBranch* self,
+ GFile* file)
+{
FoldersSidebarEntry* folder_entry = NULL;
GeeHashMap* _tmp0_;
GFile* _tmp1_;
GFile* _tmp2_;
- GFile* _tmp3_;
- gpointer _tmp4_;
+ gpointer _tmp3_;
+ FoldersSidebarEntry* _tmp4_;
FoldersSidebarEntry* _tmp5_;
FoldersSidebarEntry* _tmp6_;
- FoldersSidebarEntry* _tmp7_;
+ gint _tmp7_;
gint _tmp8_;
- gint _tmp9_;
- gboolean _tmp10_ = FALSE;
+ gboolean _tmp9_ = FALSE;
+ FoldersSidebarEntry* _tmp10_;
FoldersSidebarEntry* _tmp11_;
- FoldersSidebarEntry* _tmp12_;
+ gint _tmp12_;
gint _tmp13_;
- gint _tmp14_;
FoldersSidebarEntry* prune_point = NULL;
+ FoldersSidebarEntry* _tmp15_;
+ FoldersSidebarEntry* _tmp16_;
FoldersSidebarEntry* _tmp17_;
- FoldersSidebarEntry* _tmp18_;
- FoldersSidebarEntry* _tmp19_;
- FoldersSidebarEntry* _tmp40_;
+ FoldersSidebarEntry* _tmp37_;
#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/FoldersBranch.vala"
@@ -1298,223 +1351,219 @@ static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) {
#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = self->priv->entries;
#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp1_ = file;
+ _tmp1_ = g_file_get_parent (file);
#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp2_ = g_file_get_parent (_tmp1_);
-#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#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_);
+ _tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_);
#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp5_ = (FoldersSidebarEntry*) _tmp4_;
+ _tmp4_ = (FoldersSidebarEntry*) _tmp3_;
#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _g_object_unref0 (_tmp3_);
+ _g_object_unref0 (_tmp2_);
#line 113 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- folder_entry = _tmp5_;
+ folder_entry = _tmp4_;
#line 114 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp6_ = folder_entry;
+ _tmp5_ = folder_entry;
#line 114 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (_tmp6_ == NULL) {
+ if (_tmp5_ == NULL) {
#line 115 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (folder_entry);
#line 115 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return;
-#line 1323 "FoldersBranch.c"
+#line 1374 "FoldersBranch.c"
}
#line 117 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp7_ = folder_entry;
+ _tmp6_ = folder_entry;
#line 117 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp8_ = folders_sidebar_entry_get_count (_tmp7_);
+ _tmp7_ = folders_sidebar_entry_get_count (_tmp6_);
#line 117 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 117 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _vala_assert (_tmp9_ > 0, "folder_entry.count > 0");
+ _vala_assert (_tmp8_ > 0, "folder_entry.count > 0");
#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp11_ = folder_entry;
+ _tmp10_ = folder_entry;
#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp12_ = folder_entry;
+ _tmp11_ = folder_entry;
#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp13_ = folders_sidebar_entry_get_count (_tmp12_);
+ _tmp12_ = folders_sidebar_entry_get_count (_tmp11_);
#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp14_ = _tmp13_;
+ _tmp13_ = _tmp12_;
#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- folders_sidebar_entry_set_count (_tmp12_, _tmp14_ - 1);
+ folders_sidebar_entry_set_count (_tmp11_, _tmp13_ - 1);
#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if ((_tmp14_ - 1) > 0) {
+ if ((_tmp13_ - 1) > 0) {
#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp10_ = TRUE;
-#line 1347 "FoldersBranch.c"
+ _tmp9_ = TRUE;
+#line 1398 "FoldersBranch.c"
} else {
- FoldersSidebarEntry* _tmp15_;
- gint _tmp16_;
-#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp15_ = folder_entry;
+ FoldersSidebarEntry* _tmp14_;
#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));
+ _tmp14_ = folder_entry;
#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp10_ = _tmp16_ > 0;
-#line 1357 "FoldersBranch.c"
+ _tmp9_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_ENTRY, SidebarEntry)) > 0;
+#line 1405 "FoldersBranch.c"
}
#line 120 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (_tmp10_) {
+ if (_tmp9_) {
#line 121 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (folder_entry);
#line 121 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return;
-#line 1365 "FoldersBranch.c"
+#line 1413 "FoldersBranch.c"
}
#line 124 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp17_ = folder_entry;
+ _tmp15_ = folder_entry;
#line 124 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp18_ = _g_object_ref0 (_tmp17_);
+ _tmp16_ = _g_object_ref0 (_tmp15_);
#line 124 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- prune_point = _tmp18_;
+ prune_point = _tmp16_;
#line 125 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp19_ = prune_point;
+ _tmp17_ = prune_point;
#line 125 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _vala_assert (_tmp19_ != NULL, "prune_point != null");
-#line 1377 "FoldersBranch.c"
+ _vala_assert (_tmp17_ != NULL, "prune_point != null");
+#line 1425 "FoldersBranch.c"
{
- gboolean _tmp20_ = FALSE;
+ gboolean _tmp18_ = FALSE;
#line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp20_ = TRUE;
+ _tmp18_ = TRUE;
#line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
while (TRUE) {
-#line 1384 "FoldersBranch.c"
+#line 1432 "FoldersBranch.c"
gboolean removed = FALSE;
- GeeHashMap* _tmp21_;
- FoldersSidebarEntry* _tmp22_;
- GFile* _tmp23_;
- GFile* _tmp24_;
- gboolean _tmp25_;
- gboolean _tmp26_;
+ GeeHashMap* _tmp19_;
+ FoldersSidebarEntry* _tmp20_;
+ GFile* _tmp21_;
+ GFile* _tmp22_;
+ gboolean _tmp23_;
+ gboolean _tmp24_;
FoldersSidebarEntry* parent = NULL;
+ FoldersSidebarEntry* _tmp25_;
+ SidebarEntry* _tmp26_;
FoldersSidebarEntry* _tmp27_;
- SidebarEntry* _tmp28_;
- FoldersSidebarEntry* _tmp29_;
- gboolean _tmp30_ = FALSE;
- gboolean _tmp31_ = FALSE;
- FoldersSidebarEntry* _tmp32_;
- FoldersSidebarEntry* _tmp38_;
- FoldersSidebarEntry* _tmp39_;
+ gboolean _tmp28_ = FALSE;
+ gboolean _tmp29_ = FALSE;
+ FoldersSidebarEntry* _tmp30_;
+ FoldersSidebarEntry* _tmp35_;
+ FoldersSidebarEntry* _tmp36_;
#line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (!_tmp20_) {
-#line 1403 "FoldersBranch.c"
+ if (!_tmp18_) {
+#line 1451 "FoldersBranch.c"
}
#line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp20_ = FALSE;
+ _tmp18_ = FALSE;
#line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp21_ = self->priv->entries;
+ _tmp19_ = self->priv->entries;
#line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp22_ = prune_point;
+ _tmp20_ = prune_point;
#line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp23_ = folders_sidebar_entry_get_dir (_tmp22_);
+ _tmp21_ = folders_sidebar_entry_get_dir (_tmp20_);
#line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp24_ = _tmp23_;
+ _tmp22_ = _tmp21_;
#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);
+ _tmp23_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, NULL);
#line 128 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- removed = _tmp25_;
+ removed = _tmp23_;
#line 129 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp26_ = removed;
+ _tmp24_ = removed;
#line 129 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _vala_assert (_tmp26_, "removed");
+ _vala_assert (_tmp24_, "removed");
#line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp27_ = prune_point;
+ _tmp25_ = prune_point;
#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));
+ _tmp26_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
#line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp29_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, FOLDERS_TYPE_SIDEBAR_ENTRY) ? ((FoldersSidebarEntry*) _tmp28_) : NULL;
+ _tmp27_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, FOLDERS_TYPE_SIDEBAR_ENTRY) ? ((FoldersSidebarEntry*) _tmp26_) : NULL;
#line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (_tmp29_ == NULL) {
+ if (_tmp27_ == NULL) {
#line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _g_object_unref0 (_tmp28_);
-#line 1433 "FoldersBranch.c"
+ _g_object_unref0 (_tmp26_);
+#line 1481 "FoldersBranch.c"
}
#line 131 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- parent = _tmp29_;
+ parent = _tmp27_;
#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp32_ = parent;
+ _tmp30_ = parent;
#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (_tmp32_ == NULL) {
+ if (_tmp30_ == NULL) {
#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp31_ = TRUE;
-#line 1443 "FoldersBranch.c"
+ _tmp29_ = TRUE;
+#line 1491 "FoldersBranch.c"
} else {
- FoldersSidebarEntry* _tmp33_;
- gint _tmp34_;
- gint _tmp35_;
+ FoldersSidebarEntry* _tmp31_;
+ gint _tmp32_;
+ gint _tmp33_;
#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp33_ = parent;
+ _tmp31_ = parent;
#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp34_ = folders_sidebar_entry_get_count (_tmp33_);
+ _tmp32_ = folders_sidebar_entry_get_count (_tmp31_);
#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp35_ = _tmp34_;
+ _tmp33_ = _tmp32_;
#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp31_ = _tmp35_ != 0;
-#line 1456 "FoldersBranch.c"
+ _tmp29_ = _tmp33_ != 0;
+#line 1504 "FoldersBranch.c"
}
#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (_tmp31_) {
+ if (_tmp29_) {
#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp30_ = TRUE;
-#line 1462 "FoldersBranch.c"
+ _tmp28_ = TRUE;
+#line 1510 "FoldersBranch.c"
} else {
- FoldersSidebarEntry* _tmp36_;
- gint _tmp37_;
-#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp36_ = parent;
+ FoldersSidebarEntry* _tmp34_;
#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));
+ _tmp34_ = parent;
#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp30_ = _tmp37_ > 1;
-#line 1472 "FoldersBranch.c"
+ _tmp28_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, SIDEBAR_TYPE_ENTRY, SidebarEntry)) > 1;
+#line 1517 "FoldersBranch.c"
}
#line 132 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (_tmp30_) {
+ if (_tmp28_) {
#line 133 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (parent);
#line 133 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 1480 "FoldersBranch.c"
+#line 1525 "FoldersBranch.c"
}
#line 135 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp38_ = parent;
+ _tmp35_ = parent;
#line 135 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp39_ = _g_object_ref0 (_tmp38_);
+ _tmp36_ = _g_object_ref0 (_tmp35_);
#line 135 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (prune_point);
#line 135 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- prune_point = _tmp39_;
+ prune_point = _tmp36_;
#line 127 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (parent);
-#line 1492 "FoldersBranch.c"
+#line 1537 "FoldersBranch.c"
}
}
#line 138 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp40_ = prune_point;
+ _tmp37_ = prune_point;
#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));
+ sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
#line 112 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (prune_point);
#line 112 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (folder_entry);
-#line 1503 "FoldersBranch.c"
+#line 1548 "FoldersBranch.c"
}
-static void folders_branch_class_init (FoldersBranchClass * klass) {
+static void
+folders_branch_class_init (FoldersBranchClass * klass)
+{
#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/FoldersBranch.vala"
g_type_class_add_private (klass, sizeof (FoldersBranchPrivate));
#line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
G_OBJECT_CLASS (klass)->finalize = folders_branch_finalize;
-#line 1514 "FoldersBranch.c"
+#line 1561 "FoldersBranch.c"
}
-static void folders_branch_instance_init (FoldersBranch * self) {
+static void
+folders_branch_instance_init (FoldersBranch * self)
+{
GeeHashMap* _tmp0_;
#line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self->priv = FOLDERS_BRANCH_GET_PRIVATE (self);
@@ -1522,15 +1571,17 @@ static void folders_branch_instance_init (FoldersBranch * self) {
_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/FoldersBranch.vala"
self->priv->entries = _tmp0_;
-#line 1526 "FoldersBranch.c"
+#line 1575 "FoldersBranch.c"
}
-static void folders_branch_finalize (GObject * obj) {
+static void
+folders_branch_finalize (GObject * obj)
+{
FoldersBranch * self;
#line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_BRANCH, FoldersBranch);
-#line 1534 "FoldersBranch.c"
+#line 1585 "FoldersBranch.c"
{
GeeIterator* _sources_it = NULL;
MediaCollectionRegistry* _tmp0_;
@@ -1559,43 +1610,40 @@ static void folders_branch_finalize (GObject * obj) {
_sources_it = _tmp5_;
#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
while (TRUE) {
-#line 1563 "FoldersBranch.c"
+#line 1614 "FoldersBranch.c"
GeeIterator* _tmp6_;
- gboolean _tmp7_;
MediaSourceCollection* sources = NULL;
- GeeIterator* _tmp8_;
- gpointer _tmp9_;
- MediaSourceCollection* _tmp10_;
- guint _tmp11_;
+ GeeIterator* _tmp7_;
+ gpointer _tmp8_;
+ MediaSourceCollection* _tmp9_;
+ guint _tmp10_;
#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp6_ = _sources_it;
#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp7_ = gee_iterator_next (_tmp6_);
-#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (!_tmp7_) {
+ if (!gee_iterator_next (_tmp6_)) {
#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 1579 "FoldersBranch.c"
+#line 1627 "FoldersBranch.c"
}
#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp8_ = _sources_it;
+ _tmp7_ = _sources_it;
#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp9_ = gee_iterator_get (_tmp8_);
+ _tmp8_ = gee_iterator_get (_tmp7_);
#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- sources = (MediaSourceCollection*) _tmp9_;
+ sources = (MediaSourceCollection*) _tmp8_;
#line 31 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp10_ = sources;
+ _tmp9_ = sources;
#line 31 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp11_, NULL, FALSE);
+ g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp10_, NULL, FALSE);
#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);
+ g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _folders_branch_on_media_contents_altered_data_collection_contents_altered, self);
#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_data_collection_unref0 (sources);
-#line 1595 "FoldersBranch.c"
+#line 1643 "FoldersBranch.c"
}
#line 30 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (_sources_it);
-#line 1599 "FoldersBranch.c"
+#line 1647 "FoldersBranch.c"
}
#line 8 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (self->priv->entries);
@@ -1603,11 +1651,13 @@ static void folders_branch_finalize (GObject * obj) {
_g_object_unref0 (self->priv->home_dir);
#line 7 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
G_OBJECT_CLASS (folders_branch_parent_class)->finalize (obj);
-#line 1607 "FoldersBranch.c"
+#line 1655 "FoldersBranch.c"
}
-GType folders_branch_get_type (void) {
+GType
+folders_branch_get_type (void)
+{
static volatile gsize folders_branch_type_id__volatile = 0;
if (g_once_init_enter (&folders_branch_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (FoldersBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) folders_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FoldersBranch), 0, (GInstanceInitFunc) folders_branch_instance_init, NULL };
@@ -1619,35 +1669,45 @@ GType folders_branch_get_type (void) {
}
-FoldersRoot* folders_root_construct (GType object_type) {
+FoldersRoot*
+folders_root_construct (GType object_type)
+{
FoldersRoot * self = NULL;
#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 1629 "FoldersBranch.c"
+#line 1681 "FoldersBranch.c"
}
-FoldersRoot* folders_root_new (void) {
+FoldersRoot*
+folders_root_new (void)
+{
#line 143 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return folders_root_construct (FOLDERS_TYPE_ROOT);
-#line 1636 "FoldersBranch.c"
+#line 1690 "FoldersBranch.c"
}
-static void folders_root_class_init (FoldersRootClass * klass) {
+static void
+folders_root_class_init (FoldersRootClass * klass)
+{
#line 142 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
folders_root_parent_class = g_type_class_peek_parent (klass);
-#line 1643 "FoldersBranch.c"
+#line 1699 "FoldersBranch.c"
}
-static void folders_root_instance_init (FoldersRoot * self) {
+static void
+folders_root_instance_init (FoldersRoot * self)
+{
}
-GType folders_root_get_type (void) {
+GType
+folders_root_get_type (void)
+{
static volatile gsize folders_root_type_id__volatile = 0;
if (g_once_init_enter (&folders_root_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (FoldersRootClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) folders_root_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FoldersRoot), 0, (GInstanceInitFunc) folders_root_instance_init, NULL };
@@ -1659,52 +1719,53 @@ GType folders_root_get_type (void) {
}
-FoldersSidebarEntry* folders_sidebar_entry_construct (GType object_type, GFile* dir) {
+FoldersSidebarEntry*
+folders_sidebar_entry_construct (GType object_type,
+ GFile* dir)
+{
FoldersSidebarEntry * self = NULL;
- GFile* _tmp0_;
- GFile* _tmp1_;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
gchar* _tmp2_;
gchar* _tmp3_;
- gchar* _tmp4_;
- gchar* _tmp5_;
#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/FoldersBranch.vala"
self = (FoldersSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
#line 170 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp0_ = dir;
-#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/FoldersBranch.vala"
- _tmp1_ = dir;
-#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp2_ = g_file_get_path (_tmp1_);
+ folders_sidebar_entry_set_dir (self, dir);
#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp3_ = _tmp2_;
+ _tmp0_ = g_file_get_path (dir);
#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp4_ = g_utf8_collate_key_for_filename (_tmp3_, (gssize) -1);
+ _tmp1_ = _tmp0_;
#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp5_ = _tmp4_;
+ _tmp2_ = g_utf8_collate_key_for_filename (_tmp1_, (gssize) -1);
#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- folders_sidebar_entry_set_collation (self, _tmp5_);
+ _tmp3_ = _tmp2_;
#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _g_free0 (_tmp5_);
+ folders_sidebar_entry_set_collation (self, _tmp3_);
#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_free0 (_tmp3_);
+#line 171 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
+ _g_free0 (_tmp1_);
#line 169 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return self;
-#line 1697 "FoldersBranch.c"
+#line 1754 "FoldersBranch.c"
}
-FoldersSidebarEntry* folders_sidebar_entry_new (GFile* dir) {
+FoldersSidebarEntry*
+folders_sidebar_entry_new (GFile* dir)
+{
#line 169 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return folders_sidebar_entry_construct (FOLDERS_TYPE_SIDEBAR_ENTRY, dir);
-#line 1704 "FoldersBranch.c"
+#line 1763 "FoldersBranch.c"
}
-static gchar* folders_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+static gchar*
+folders_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base)
+{
FoldersSidebarEntry * self;
gchar* result = NULL;
GFile* _tmp0_;
@@ -1719,11 +1780,13 @@ static gchar* folders_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntr
result = _tmp1_;
#line 175 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 1723 "FoldersBranch.c"
+#line 1784 "FoldersBranch.c"
}
-static gchar* folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
+static gchar*
+folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base)
+{
FoldersSidebarEntry * self;
gchar* result = NULL;
const gchar* _tmp0_ = NULL;
@@ -1738,20 +1801,20 @@ static gchar* folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntr
_tmp2_ = _tmp1_;
#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
if (_tmp2_ == 0) {
-#line 1742 "FoldersBranch.c"
+#line 1805 "FoldersBranch.c"
const gchar* _tmp3_;
#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp3_ = folders_icon;
#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = _tmp3_;
-#line 1748 "FoldersBranch.c"
+#line 1811 "FoldersBranch.c"
} else {
const gchar* _tmp4_;
#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp4_ = folders_have_photos_icon;
#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp0_ = _tmp4_;
-#line 1755 "FoldersBranch.c"
+#line 1818 "FoldersBranch.c"
}
#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_tmp5_ = g_strdup (_tmp0_);
@@ -1759,11 +1822,13 @@ static gchar* folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntr
result = _tmp5_;
#line 179 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 1763 "FoldersBranch.c"
+#line 1826 "FoldersBranch.c"
}
-static gchar* folders_sidebar_entry_real_to_string (SidebarSimplePageEntry* base) {
+static gchar*
+folders_sidebar_entry_real_to_string (SidebarSimplePageEntry* base)
+{
FoldersSidebarEntry * self;
gchar* result = NULL;
GFile* _tmp0_;
@@ -1778,11 +1843,13 @@ static gchar* folders_sidebar_entry_real_to_string (SidebarSimplePageEntry* base
result = _tmp1_;
#line 183 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 1782 "FoldersBranch.c"
+#line 1847 "FoldersBranch.c"
}
-static gboolean folders_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base) {
+static gboolean
+folders_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base)
+{
FoldersSidebarEntry * self;
gboolean result = FALSE;
#line 186 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
@@ -1791,11 +1858,13 @@ static gboolean folders_sidebar_entry_real_expand_on_select (SidebarExpandableEn
result = TRUE;
#line 187 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 1795 "FoldersBranch.c"
+#line 1862 "FoldersBranch.c"
}
-static Page* folders_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
+static Page*
+folders_sidebar_entry_real_create_page (SidebarSimplePageEntry* base)
+{
FoldersSidebarEntry * self;
Page* result = NULL;
GFile* _tmp0_;
@@ -1812,11 +1881,13 @@ static Page* folders_sidebar_entry_real_create_page (SidebarSimplePageEntry* bas
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
#line 191 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 1816 "FoldersBranch.c"
+#line 1885 "FoldersBranch.c"
}
-GFile* folders_sidebar_entry_get_dir (FoldersSidebarEntry* self) {
+GFile*
+folders_sidebar_entry_get_dir (FoldersSidebarEntry* self)
+{
GFile* result;
GFile* _tmp0_;
#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
@@ -1827,34 +1898,36 @@ GFile* folders_sidebar_entry_get_dir (FoldersSidebarEntry* self) {
result = _tmp0_;
#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 1831 "FoldersBranch.c"
+#line 1902 "FoldersBranch.c"
}
-static void folders_sidebar_entry_set_dir (FoldersSidebarEntry* self, GFile* value) {
+static void
+folders_sidebar_entry_set_dir (FoldersSidebarEntry* self,
+ GFile* value)
+{
#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/FoldersBranch.vala"
if (folders_sidebar_entry_get_dir (self) != value) {
-#line 1840 "FoldersBranch.c"
+#line 1914 "FoldersBranch.c"
GFile* _tmp0_;
- GFile* _tmp1_;
-#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp0_ = value;
#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (value);
#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_object_unref0 (self->priv->_dir);
#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- self->priv->_dir = _tmp1_;
+ self->priv->_dir = _tmp0_;
#line 149 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- g_object_notify ((GObject *) self, "dir");
-#line 1853 "FoldersBranch.c"
+ g_object_notify_by_pspec ((GObject *) self, folders_sidebar_entry_properties[FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY]);
+#line 1924 "FoldersBranch.c"
}
}
-const gchar* folders_sidebar_entry_get_collation (FoldersSidebarEntry* self) {
+const gchar*
+folders_sidebar_entry_get_collation (FoldersSidebarEntry* self)
+{
const gchar* result;
const gchar* _tmp0_;
#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
@@ -1865,34 +1938,36 @@ const gchar* folders_sidebar_entry_get_collation (FoldersSidebarEntry* self) {
result = _tmp0_;
#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 1869 "FoldersBranch.c"
+#line 1942 "FoldersBranch.c"
}
-static void folders_sidebar_entry_set_collation (FoldersSidebarEntry* self, const gchar* value) {
+static void
+folders_sidebar_entry_set_collation (FoldersSidebarEntry* self,
+ const gchar* value)
+{
#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/FoldersBranch.vala"
if (g_strcmp0 (value, folders_sidebar_entry_get_collation (self)) != 0) {
-#line 1878 "FoldersBranch.c"
- const gchar* _tmp0_;
- gchar* _tmp1_;
-#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp0_ = value;
+#line 1954 "FoldersBranch.c"
+ gchar* _tmp0_;
#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (value);
#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
_g_free0 (self->priv->_collation);
#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- self->priv->_collation = _tmp1_;
+ self->priv->_collation = _tmp0_;
#line 150 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- g_object_notify ((GObject *) self, "collation");
-#line 1891 "FoldersBranch.c"
+ g_object_notify_by_pspec ((GObject *) self, folders_sidebar_entry_properties[FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY]);
+#line 1964 "FoldersBranch.c"
}
}
-gint folders_sidebar_entry_get_count (FoldersSidebarEntry* self) {
+gint
+folders_sidebar_entry_get_count (FoldersSidebarEntry* self)
+{
gint result;
gint _tmp0_;
#line 154 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
@@ -1903,17 +1978,19 @@ gint folders_sidebar_entry_get_count (FoldersSidebarEntry* self) {
result = _tmp0_;
#line 155 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
return result;
-#line 1907 "FoldersBranch.c"
+#line 1982 "FoldersBranch.c"
}
-void folders_sidebar_entry_set_count (FoldersSidebarEntry* self, gint value) {
+void
+folders_sidebar_entry_set_count (FoldersSidebarEntry* self,
+ gint value)
+{
gint prev_count = 0;
gint _tmp0_;
- gint _tmp1_;
+ gboolean _tmp1_ = FALSE;
gboolean _tmp2_ = FALSE;
- gboolean _tmp3_ = FALSE;
- gint _tmp4_;
+ gint _tmp3_;
#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/FoldersBranch.vala"
@@ -1921,75 +1998,75 @@ void folders_sidebar_entry_set_count (FoldersSidebarEntry* self, gint value) {
#line 159 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
prev_count = _tmp0_;
#line 160 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp1_ = value;
-#line 160 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- self->priv->_count = _tmp1_;
+ self->priv->_count = value;
#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp4_ = prev_count;
+ _tmp3_ = prev_count;
#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (_tmp4_ == 0) {
-#line 1932 "FoldersBranch.c"
- gint _tmp5_;
+ if (_tmp3_ == 0) {
+#line 2007 "FoldersBranch.c"
+ gint _tmp4_;
#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp5_ = self->priv->_count;
+ _tmp4_ = self->priv->_count;
#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp3_ = _tmp5_ == 1;
-#line 1938 "FoldersBranch.c"
+ _tmp2_ = _tmp4_ == 1;
+#line 2013 "FoldersBranch.c"
} else {
#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp3_ = FALSE;
-#line 1942 "FoldersBranch.c"
+ _tmp2_ = FALSE;
+#line 2017 "FoldersBranch.c"
}
#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (_tmp3_) {
+ if (_tmp2_) {
#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp2_ = TRUE;
-#line 1948 "FoldersBranch.c"
+ _tmp1_ = TRUE;
+#line 2023 "FoldersBranch.c"
} else {
- gboolean _tmp6_ = FALSE;
- gint _tmp7_;
+ gboolean _tmp5_ = FALSE;
+ gint _tmp6_;
#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp7_ = prev_count;
+ _tmp6_ = prev_count;
#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (_tmp7_ == 1) {
-#line 1956 "FoldersBranch.c"
- gint _tmp8_;
+ if (_tmp6_ == 1) {
+#line 2031 "FoldersBranch.c"
+ gint _tmp7_;
#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp8_ = self->priv->_count;
+ _tmp7_ = self->priv->_count;
#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp6_ = _tmp8_ == 0;
-#line 1962 "FoldersBranch.c"
+ _tmp5_ = _tmp7_ == 0;
+#line 2037 "FoldersBranch.c"
} else {
#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp6_ = FALSE;
-#line 1966 "FoldersBranch.c"
+ _tmp5_ = FALSE;
+#line 2041 "FoldersBranch.c"
}
#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _tmp2_ = _tmp6_;
-#line 1970 "FoldersBranch.c"
+ _tmp1_ = _tmp5_;
+#line 2045 "FoldersBranch.c"
}
#line 163 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- if (_tmp2_) {
-#line 1974 "FoldersBranch.c"
+ if (_tmp1_) {
+#line 2049 "FoldersBranch.c"
+ gchar* _tmp8_;
gchar* _tmp9_;
- gchar* _tmp10_;
#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));
+ _tmp8_ = 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/FoldersBranch.vala"
- _tmp10_ = _tmp9_;
+ _tmp9_ = _tmp8_;
#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_);
+ g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-icon-changed", _tmp9_);
#line 164 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- _g_free0 (_tmp10_);
-#line 1985 "FoldersBranch.c"
+ _g_free0 (_tmp9_);
+#line 2060 "FoldersBranch.c"
}
#line 158 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
- g_object_notify ((GObject *) self, "count");
-#line 1989 "FoldersBranch.c"
+ g_object_notify_by_pspec ((GObject *) self, folders_sidebar_entry_properties[FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY]);
+#line 2064 "FoldersBranch.c"
}
-static void folders_sidebar_entry_class_init (FoldersSidebarEntryClass * klass) {
+static void
+folders_sidebar_entry_class_init (FoldersSidebarEntryClass * klass)
+{
#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/FoldersBranch.vala"
@@ -2009,34 +2086,40 @@ static void folders_sidebar_entry_class_init (FoldersSidebarEntryClass * klass)
#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/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));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY, folders_sidebar_entry_properties[FOLDERS_SIDEBAR_ENTRY_DIR_PROPERTY] = g_param_spec_object ("dir", "dir", "dir", g_file_get_type (), G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
#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));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY, folders_sidebar_entry_properties[FOLDERS_SIDEBAR_ENTRY_COLLATION_PROPERTY] = g_param_spec_string ("collation", "collation", "collation", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
#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 2018 "FoldersBranch.c"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY, folders_sidebar_entry_properties[FOLDERS_SIDEBAR_ENTRY_COUNT_PROPERTY] = g_param_spec_int ("count", "count", "count", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE));
+#line 2095 "FoldersBranch.c"
}
-static void folders_sidebar_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) {
+static void
+folders_sidebar_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface)
+{
#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/FoldersBranch.vala"
iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) folders_sidebar_entry_real_expand_on_select;
-#line 2027 "FoldersBranch.c"
+#line 2106 "FoldersBranch.c"
}
-static void folders_sidebar_entry_instance_init (FoldersSidebarEntry * self) {
+static void
+folders_sidebar_entry_instance_init (FoldersSidebarEntry * self)
+{
#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/FoldersBranch.vala"
self->priv->_count = 0;
-#line 2036 "FoldersBranch.c"
+#line 2117 "FoldersBranch.c"
}
-static void folders_sidebar_entry_finalize (GObject * obj) {
+static void
+folders_sidebar_entry_finalize (GObject * obj)
+{
FoldersSidebarEntry * self;
#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
@@ -2046,11 +2129,13 @@ static void folders_sidebar_entry_finalize (GObject * obj) {
_g_free0 (self->priv->_collation);
#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
G_OBJECT_CLASS (folders_sidebar_entry_parent_class)->finalize (obj);
-#line 2050 "FoldersBranch.c"
+#line 2133 "FoldersBranch.c"
}
-GType folders_sidebar_entry_get_type (void) {
+GType
+folders_sidebar_entry_get_type (void)
+{
static volatile gsize folders_sidebar_entry_type_id__volatile = 0;
if (g_once_init_enter (&folders_sidebar_entry_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (FoldersSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) folders_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FoldersSidebarEntry), 0, (GInstanceInitFunc) folders_sidebar_entry_instance_init, NULL };
@@ -2064,7 +2149,12 @@ GType folders_sidebar_entry_get_type (void) {
}
-static void _vala_folders_sidebar_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+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/FoldersBranch.vala"
@@ -2087,18 +2177,23 @@ static void _vala_folders_sidebar_entry_get_property (GObject * object, guint pr
g_value_set_int (value, folders_sidebar_entry_get_count (self));
#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 2091 "FoldersBranch.c"
+#line 2181 "FoldersBranch.c"
default:
#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/FoldersBranch.vala"
break;
-#line 2097 "FoldersBranch.c"
+#line 2187 "FoldersBranch.c"
}
}
-static void _vala_folders_sidebar_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+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/FoldersBranch.vala"
@@ -2121,13 +2216,13 @@ static void _vala_folders_sidebar_entry_set_property (GObject * object, guint pr
folders_sidebar_entry_set_count (self, g_value_get_int (value));
#line 148 "/home/jens/Source/shotwell/src/folders/FoldersBranch.vala"
break;
-#line 2125 "FoldersBranch.c"
+#line 2220 "FoldersBranch.c"
default:
#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/FoldersBranch.vala"
break;
-#line 2131 "FoldersBranch.c"
+#line 2226 "FoldersBranch.c"
}
}