summaryrefslogtreecommitdiff
path: root/src/events/EventsBranch.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/events/EventsBranch.c
parent55778740c211992cc86ea87588ab62c6750f36d1 (diff)
parente8f4d7a9cdd37c5a9fb3b6991a4e9173829808da (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/events/EventsBranch.c')
-rw-r--r--src/events/EventsBranch.c2818
1 files changed, 1454 insertions, 1364 deletions
diff --git a/src/events/EventsBranch.c b/src/events/EventsBranch.c
index 17ff6eb..e50da5b 100644
--- a/src/events/EventsBranch.c
+++ b/src/events/EventsBranch.c
@@ -1,4 +1,4 @@
-/* EventsBranch.c generated by valac 0.36.6, the Vala compiler
+/* EventsBranch.c generated by valac 0.40.4, the Vala compiler
* generated from EventsBranch.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <gee.h>
@@ -149,6 +150,11 @@ typedef struct _EventsNoEventEntryClass EventsNoEventEntryClass;
typedef struct _EventsMasterDirectoryEntry EventsMasterDirectoryEntry;
typedef struct _EventsMasterDirectoryEntryClass EventsMasterDirectoryEntryClass;
+enum {
+ EVENTS_BRANCH_0_PROPERTY,
+ EVENTS_BRANCH_NUM_PROPERTIES
+};
+static GParamSpec* events_branch_properties[EVENTS_BRANCH_NUM_PROPERTIES];
#define TYPE_DATA_COLLECTION (data_collection_get_type ())
#define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection))
@@ -349,7 +355,17 @@ typedef struct _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate;
typedef struct _SidebarExpandableEntry SidebarExpandableEntry;
typedef struct _SidebarExpandableEntryIface SidebarExpandableEntryIface;
typedef struct _EventsDirectoryEntryPrivate EventsDirectoryEntryPrivate;
+enum {
+ EVENTS_DIRECTORY_ENTRY_0_PROPERTY,
+ EVENTS_DIRECTORY_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* events_directory_entry_properties[EVENTS_DIRECTORY_ENTRY_NUM_PROPERTIES];
typedef struct _EventsMasterDirectoryEntryPrivate EventsMasterDirectoryEntryPrivate;
+enum {
+ EVENTS_MASTER_DIRECTORY_ENTRY_0_PROPERTY,
+ EVENTS_MASTER_DIRECTORY_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* events_master_directory_entry_properties[EVENTS_MASTER_DIRECTORY_ENTRY_NUM_PROPERTIES];
#define TYPE_CHECKERBOARD_PAGE (checkerboard_page_get_type ())
#define CHECKERBOARD_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHECKERBOARD_PAGE, CheckerboardPage))
@@ -381,6 +397,11 @@ typedef struct _EventsDirectoryPageClass EventsDirectoryPageClass;
typedef struct _MasterEventsDirectoryPage MasterEventsDirectoryPage;
typedef struct _MasterEventsDirectoryPageClass MasterEventsDirectoryPageClass;
typedef struct _EventsYearDirectoryEntryPrivate EventsYearDirectoryEntryPrivate;
+enum {
+ EVENTS_YEAR_DIRECTORY_ENTRY_0_PROPERTY,
+ EVENTS_YEAR_DIRECTORY_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* events_year_directory_entry_properties[EVENTS_YEAR_DIRECTORY_ENTRY_NUM_PROPERTIES];
#define SUB_EVENTS_DIRECTORY_PAGE_TYPE_DIRECTORY_TYPE (sub_events_directory_page_directory_type_get_type ())
@@ -394,7 +415,17 @@ typedef struct _EventsYearDirectoryEntryPrivate EventsYearDirectoryEntryPrivate;
typedef struct _SubEventsDirectoryPage SubEventsDirectoryPage;
typedef struct _SubEventsDirectoryPageClass SubEventsDirectoryPageClass;
typedef struct _EventsMonthDirectoryEntryPrivate EventsMonthDirectoryEntryPrivate;
+enum {
+ EVENTS_MONTH_DIRECTORY_ENTRY_0_PROPERTY,
+ EVENTS_MONTH_DIRECTORY_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* events_month_directory_entry_properties[EVENTS_MONTH_DIRECTORY_ENTRY_NUM_PROPERTIES];
typedef struct _EventsUndatedDirectoryEntryPrivate EventsUndatedDirectoryEntryPrivate;
+enum {
+ EVENTS_UNDATED_DIRECTORY_ENTRY_0_PROPERTY,
+ EVENTS_UNDATED_DIRECTORY_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* events_undated_directory_entry_properties[EVENTS_UNDATED_DIRECTORY_ENTRY_NUM_PROPERTIES];
#define SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY (sidebar_internal_drop_target_entry_get_type ())
#define SIDEBAR_INTERNAL_DROP_TARGET_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY, SidebarInternalDropTargetEntry))
@@ -414,6 +445,11 @@ typedef struct _SidebarInternalDropTargetEntryIface SidebarInternalDropTargetEnt
typedef struct _MediaSource MediaSource;
typedef struct _MediaSourceClass MediaSourceClass;
typedef struct _EventsEventEntryPrivate EventsEventEntryPrivate;
+enum {
+ EVENTS_EVENT_ENTRY_0_PROPERTY,
+ EVENTS_EVENT_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* events_event_entry_properties[EVENTS_EVENT_ENTRY_NUM_PROPERTIES];
#define TYPE_MEDIA_PAGE (media_page_get_type ())
#define MEDIA_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_PAGE, MediaPage))
@@ -526,6 +562,11 @@ typedef struct _MovePhotosCommandClass MovePhotosCommandClass;
typedef struct _SetEventCommand SetEventCommand;
typedef struct _SetEventCommandClass SetEventCommandClass;
typedef struct _EventsNoEventEntryPrivate EventsNoEventEntryPrivate;
+enum {
+ EVENTS_NO_EVENT_ENTRY_0_PROPERTY,
+ EVENTS_NO_EVENT_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* events_no_event_entry_properties[EVENTS_NO_EVENT_ENTRY_NUM_PROPERTIES];
#define TYPE_NO_EVENT_PAGE (no_event_page_get_type ())
#define NO_EVENT_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NO_EVENT_PAGE, NoEventPage))
@@ -768,38 +809,57 @@ GType events_undated_directory_entry_get_type (void) G_GNUC_CONST;
GType events_no_event_entry_get_type (void) G_GNUC_CONST;
GType events_master_directory_entry_get_type (void) G_GNUC_CONST;
#define EVENTS_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EVENTS_TYPE_BRANCH, EventsBranchPrivate))
-enum {
- EVENTS_BRANCH_DUMMY_PROPERTY
-};
gpointer data_collection_ref (gpointer instance);
void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_data_collection (GValue* value,
+ gpointer v_object);
+void value_take_data_collection (GValue* value,
+ gpointer v_object);
gpointer value_get_data_collection (const GValue* value);
GType data_collection_get_type (void) G_GNUC_CONST;
GType source_collection_get_type (void) G_GNUC_CONST;
GType database_source_collection_get_type (void) G_GNUC_CONST;
GType container_source_collection_get_type (void) G_GNUC_CONST;
GType event_source_collection_get_type (void) G_GNUC_CONST;
-static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterable* added, GeeIterable* removed);
-static void _events_branch_on_events_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self);
+static void events_branch_on_events_added_removed (EventsBranch* self,
+ GeeIterable* added,
+ GeeIterable* removed);
+static void _events_branch_on_events_added_removed_data_collection_contents_altered (DataCollection* _sender,
+ GeeIterable* added,
+ GeeIterable* removed,
+ gpointer self);
gpointer alteration_ref (gpointer instance);
void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_alteration (GValue* value,
+ gpointer v_object);
+void value_take_alteration (GValue* value,
+ gpointer v_object);
gpointer value_get_alteration (const GValue* value);
GType alteration_get_type (void) G_GNUC_CONST;
-static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered);
-static void _events_branch_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
+static void events_branch_on_events_altered (EventsBranch* self,
+ GeeMap* altered);
+static void _events_branch_on_events_altered_data_collection_items_altered (DataCollection* _sender,
+ GeeMap* items,
+ gpointer self);
static void events_branch_on_no_event_collection_altered (EventsBranch* self);
-static void _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered (EventSourceCollection* _sender, gpointer self);
+static void _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered (EventSourceCollection* _sender,
+ gpointer self);
GType configuration_facade_get_type (void) G_GNUC_CONST;
GType config_facade_get_type (void) G_GNUC_CONST;
ConfigFacade* config_facade_get_instance (void);
static void events_branch_on_config_changed (EventsBranch* self);
-static void _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed (ConfigurationFacade* _sender, gpointer self);
+static void _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed (ConfigurationFacade* _sender,
+ gpointer self);
#define RESOURCES_ICON_FOLDER "folder"
#define RESOURCES_ICON_EVENTS "multiple-events"
#define RESOURCES_ICON_ONE_EVENT "one-event"
@@ -812,22 +872,41 @@ EventsMasterDirectoryEntry* events_master_directory_entry_new (void);
EventsMasterDirectoryEntry* events_master_directory_entry_construct (GType object_type);
EventsBranch* events_branch_new (void);
EventsBranch* events_branch_construct (GType object_type);
-SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized);
-SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized);
+SidebarHeader* sidebar_header_new (const gchar* name,
+ const gchar* tooltip,
+ gboolean emphasized);
+SidebarHeader* sidebar_header_construct (GType object_type,
+ const gchar* name,
+ const gchar* tooltip,
+ gboolean emphasized);
GType sidebar_grouping_get_type (void) G_GNUC_CONST;
GType sidebar_header_get_type (void) G_GNUC_CONST;
GType sidebar_tree_get_type (void) G_GNUC_CONST;
GType sidebar_entry_get_type (void) G_GNUC_CONST;
GType sidebar_branch_options_get_type (void) G_GNUC_CONST;
-static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry* b);
-static gint _events_branch_event_year_comparator_gcompare_func (gconstpointer a, gconstpointer b);
-SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
-SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
-void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator);
+static gint events_branch_event_year_comparator (SidebarEntry* a,
+ SidebarEntry* b);
+static gint _events_branch_event_year_comparator_gcompare_func (gconstpointer a,
+ gconstpointer b);
+SidebarBranch* sidebar_branch_new (SidebarEntry* root,
+ SidebarBranchOptions options,
+ GCompareFunc default_comparator,
+ GCompareFunc root_comparator);
+SidebarBranch* sidebar_branch_construct (GType object_type,
+ SidebarEntry* root,
+ SidebarBranchOptions options,
+ GCompareFunc default_comparator,
+ GCompareFunc root_comparator);
+void sidebar_branch_graft (SidebarBranch* self,
+ SidebarEntry* parent,
+ SidebarEntry* entry,
+ GCompareFunc comparator);
SidebarEntry* sidebar_branch_get_root (SidebarBranch* self);
GeeCollection* data_collection_get_all (DataCollection* self);
-static void events_branch_add_event (EventsBranch* self, Event* event);
-static void events_branch_show_no_events (EventsBranch* self, gboolean show);
+static void events_branch_add_event (EventsBranch* self,
+ Event* event);
+static void events_branch_show_no_events (EventsBranch* self,
+ gboolean show);
GeeCollection* event_source_collection_get_no_event_objects (EventSourceCollection* self);
void events_branch_init (void);
gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* self);
@@ -836,72 +915,110 @@ gboolean events_branch_is_user_renameable (EventsBranch* self);
EventsMasterDirectoryEntry* events_branch_get_master_entry (EventsBranch* self);
GType events_year_directory_entry_get_type (void) G_GNUC_CONST;
gint events_year_directory_entry_get_year (EventsYearDirectoryEntry* self);
-static gint events_branch_event_month_comparator (SidebarEntry* a, SidebarEntry* b);
+static gint events_branch_event_month_comparator (SidebarEntry* a,
+ SidebarEntry* b);
GType events_month_directory_entry_get_type (void) G_GNUC_CONST;
gint events_month_directory_entry_get_month (EventsMonthDirectoryEntry* self);
-static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b);
+static gint events_branch_event_comparator (SidebarEntry* a,
+ SidebarEntry* b);
Event* events_event_entry_get_event (EventsEventEntry* self);
time_t event_source_get_start_time (EventSource* self);
GType event_id_get_type (void) G_GNUC_CONST;
EventID* event_id_dup (const EventID* self);
void event_id_free (EventID* self);
-void event_get_event_id (Event* self, EventID* result);
-static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntry* b);
+void event_get_event_id (Event* self,
+ EventID* result);
+static gint events_branch_undated_event_comparator (SidebarEntry* a,
+ SidebarEntry* b);
gchar* data_object_get_name (DataObject* self);
gint64 data_source_get_instance_id (DataSource* self);
-EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, Event* event);
+EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self,
+ Event* event);
void sidebar_branch_reorder_all (SidebarBranch* self);
-static void events_branch_remove_event (EventsBranch* self, Event* event);
-gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail);
-static void events_branch_move_event (EventsBranch* self, Event* event);
+static void events_branch_remove_event (EventsBranch* self,
+ Event* event);
+gboolean alteration_has_detail (Alteration* self,
+ const gchar* subject,
+ const gchar* detail);
+static void events_branch_move_event (EventsBranch* self,
+ Event* event);
GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST;
-static void events_branch_add_undated_event (EventsBranch* self, Event* event);
-static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* event, struct tm* event_tm, SidebarEntry* * found_year);
-static void events_branch_graft_event (EventsBranch* self, SidebarEntry* parent, Event* event, GCompareFunc comparator);
-static gint _events_branch_event_comparator_gcompare_func (gconstpointer a, gconstpointer b);
+static void events_branch_add_undated_event (EventsBranch* self,
+ Event* event);
+static SidebarEntry* events_branch_find_event_month (EventsBranch* self,
+ Event* event,
+ struct tm* event_tm,
+ SidebarEntry* * found_year);
+static void events_branch_graft_event (EventsBranch* self,
+ SidebarEntry* parent,
+ Event* event,
+ GCompareFunc comparator);
+static gint _events_branch_event_comparator_gcompare_func (gconstpointer a,
+ gconstpointer b);
#define SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT _ ("%Y")
-EventsYearDirectoryEntry* events_year_directory_entry_new (const gchar* name, struct tm* tm);
-EventsYearDirectoryEntry* events_year_directory_entry_construct (GType object_type, const gchar* name, struct tm* tm);
-static gint _events_branch_event_month_comparator_gcompare_func (gconstpointer a, gconstpointer b);
+EventsYearDirectoryEntry* events_year_directory_entry_new (const gchar* name,
+ struct tm* tm);
+EventsYearDirectoryEntry* events_year_directory_entry_construct (GType object_type,
+ const gchar* name,
+ struct tm* tm);
+static gint _events_branch_event_month_comparator_gcompare_func (gconstpointer a,
+ gconstpointer b);
#define SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT _ ("%B")
-EventsMonthDirectoryEntry* events_month_directory_entry_new (const gchar* name, struct tm* tm);
-EventsMonthDirectoryEntry* events_month_directory_entry_construct (GType object_type, const gchar* name, struct tm* tm);
-static void events_branch_move_to_undated_event (EventsBranch* self, Event* event);
-static void events_branch_reparent_event (EventsBranch* self, Event* event, SidebarEntry* new_parent);
-SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry);
-void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
-gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent);
+EventsMonthDirectoryEntry* events_month_directory_entry_new (const gchar* name,
+ struct tm* tm);
+EventsMonthDirectoryEntry* events_month_directory_entry_construct (GType object_type,
+ const gchar* name,
+ struct tm* tm);
+static void events_branch_move_to_undated_event (EventsBranch* self,
+ Event* event);
+static void events_branch_reparent_event (EventsBranch* self,
+ Event* event,
+ SidebarEntry* new_parent);
+SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self,
+ SidebarEntry* entry);
+void sidebar_branch_prune (SidebarBranch* self,
+ SidebarEntry* entry);
+gint sidebar_branch_get_child_count (SidebarBranch* self,
+ SidebarEntry* parent);
static Block8Data* block8_data_ref (Block8Data* _data8_);
static void block8_data_unref (void * _userdata_);
-static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* event, struct tm* event_tm);
-SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry* parent, Locator locator, void* locator_target);
-static gboolean __lambda21_ (Block8Data* _data8_, SidebarEntry* entry);
-static gboolean ___lambda21__locator (gconstpointer item, gpointer self);
+static SidebarEntry* events_branch_find_event_year (EventsBranch* self,
+ Event* event,
+ struct tm* event_tm);
+SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self,
+ SidebarEntry* parent,
+ Locator locator,
+ void* locator_target);
+static gboolean __lambda21_ (Block8Data* _data8_,
+ SidebarEntry* entry);
+static gboolean ___lambda21__locator (gconstpointer item,
+ gpointer self);
static Block9Data* block9_data_ref (Block9Data* _data9_);
static void block9_data_unref (void * _userdata_);
-static gboolean __lambda20_ (Block9Data* _data9_, SidebarEntry* entry);
-static gboolean ___lambda20__locator (gconstpointer item, gpointer self);
-gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry);
-static gint _events_branch_undated_event_comparator_gcompare_func (gconstpointer a, gconstpointer b);
+static gboolean __lambda20_ (Block9Data* _data9_,
+ SidebarEntry* entry);
+static gboolean ___lambda20__locator (gconstpointer item,
+ gpointer self);
+gboolean sidebar_branch_has_entry (SidebarBranch* self,
+ SidebarEntry* entry);
+static gint _events_branch_undated_event_comparator_gcompare_func (gconstpointer a,
+ gconstpointer b);
EventsEventEntry* events_event_entry_new (Event* event);
-EventsEventEntry* events_event_entry_construct (GType object_type, Event* event);
-void sidebar_branch_reparent (SidebarBranch* self, SidebarEntry* new_parent, SidebarEntry* entry);
+EventsEventEntry* events_event_entry_construct (GType object_type,
+ Event* event);
+void sidebar_branch_reparent (SidebarBranch* self,
+ SidebarEntry* new_parent,
+ SidebarEntry* entry);
static void events_branch_finalize (GObject * obj);
GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
GType page_get_type (void) G_GNUC_CONST;
GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
GType sidebar_contextable_get_type (void) G_GNUC_CONST;
GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST;
-enum {
- EVENTS_DIRECTORY_ENTRY_DUMMY_PROPERTY
-};
EventsDirectoryEntry* events_directory_entry_construct (GType object_type);
SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type);
static gchar* events_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
static gboolean events_directory_entry_real_expand_on_select (SidebarExpandableEntry* base);
-enum {
- EVENTS_MASTER_DIRECTORY_ENTRY_DUMMY_PROPERTY
-};
static gchar* events_master_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
#define MASTER_EVENTS_DIRECTORY_PAGE_NAME _ ("All Events")
static gchar* events_master_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
@@ -912,75 +1029,81 @@ GType checkerboard_page_get_type (void) G_GNUC_CONST;
GType events_directory_page_get_type (void) G_GNUC_CONST;
GType master_events_directory_page_get_type (void) G_GNUC_CONST;
#define EVENTS_YEAR_DIRECTORY_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntryPrivate))
-enum {
- EVENTS_YEAR_DIRECTORY_ENTRY_DUMMY_PROPERTY
-};
static gchar* events_year_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
static Page* events_year_directory_entry_real_create_page (SidebarSimplePageEntry* base);
GType sub_events_directory_page_directory_type_get_type (void) G_GNUC_CONST;
-SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, struct tm* time);
-SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time);
+SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type,
+ struct tm* time);
+SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
+ SubEventsDirectoryPageDirectoryType type,
+ struct tm* time);
GType sub_events_directory_page_get_type (void) G_GNUC_CONST;
static void events_year_directory_entry_finalize (GObject * obj);
#define EVENTS_MONTH_DIRECTORY_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntryPrivate))
-enum {
- EVENTS_MONTH_DIRECTORY_ENTRY_DUMMY_PROPERTY
-};
static gchar* events_month_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
gint events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self);
static Page* events_month_directory_entry_real_create_page (SidebarSimplePageEntry* base);
static void events_month_directory_entry_finalize (GObject * obj);
-enum {
- EVENTS_UNDATED_DIRECTORY_ENTRY_DUMMY_PROPERTY
-};
static gchar* events_undated_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
#define SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME _ ("Undated")
static Page* events_undated_directory_entry_real_create_page (SidebarSimplePageEntry* base);
GType media_source_get_type (void) G_GNUC_CONST;
GType sidebar_internal_drop_target_entry_get_type (void) G_GNUC_CONST;
#define EVENTS_EVENT_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EVENTS_TYPE_EVENT_ENTRY, EventsEventEntryPrivate))
-enum {
- EVENTS_EVENT_ENTRY_DUMMY_PROPERTY
-};
static gchar* events_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
static gchar* events_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
static Page* events_event_entry_real_create_page (SidebarSimplePageEntry* base);
EventPage* event_page_new (Event* page_event);
-EventPage* event_page_construct (GType object_type, Event* page_event);
+EventPage* event_page_construct (GType object_type,
+ Event* page_event);
GType media_page_get_type (void) G_GNUC_CONST;
GType collection_page_get_type (void) G_GNUC_CONST;
GType event_page_get_type (void) G_GNUC_CONST;
static gboolean events_event_entry_real_is_user_renameable (SidebarRenameableEntry* base);
-static void events_event_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name);
+static void events_event_entry_real_rename (SidebarRenameableEntry* base,
+ const gchar* new_name);
gchar* event_prep_event_name (const gchar* name);
gpointer command_manager_ref (gpointer instance);
void command_manager_unref (gpointer instance);
-GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_command_manager (GValue* value, gpointer v_object);
-void value_take_command_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_command_manager (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_command_manager (GValue* value,
+ gpointer v_object);
+void value_take_command_manager (GValue* value,
+ gpointer v_object);
gpointer value_get_command_manager (const GValue* value);
GType command_manager_get_type (void) G_GNUC_CONST;
CommandManager* app_window_get_command_manager (void);
GType command_get_type (void) G_GNUC_CONST;
-void command_manager_execute (CommandManager* self, Command* command);
-RenameEventCommand* rename_event_command_new (Event* event, const gchar* new_name);
-RenameEventCommand* rename_event_command_construct (GType object_type, Event* event, const gchar* new_name);
+void command_manager_execute (CommandManager* self,
+ Command* command);
+RenameEventCommand* rename_event_command_new (Event* event,
+ const gchar* new_name);
+RenameEventCommand* rename_event_command_construct (GType object_type,
+ Event* event,
+ const gchar* new_name);
GType page_command_get_type (void) G_GNUC_CONST;
GType simple_proxyable_command_get_type (void) G_GNUC_CONST;
GType rename_event_command_get_type (void) G_GNUC_CONST;
-static gboolean events_event_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media);
+static gboolean events_event_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base,
+ GeeList* media);
GType data_view_get_type (void) G_GNUC_CONST;
DataView* data_view_new (DataSource* source);
-DataView* data_view_construct (GType object_type, DataSource* source);
-SetEventCommand* set_event_command_new (GeeIterable* iter, Event* new_event);
-SetEventCommand* set_event_command_construct (GType object_type, GeeIterable* iter, Event* new_event);
+DataView* data_view_construct (GType object_type,
+ DataSource* source);
+SetEventCommand* set_event_command_new (GeeIterable* iter,
+ Event* new_event);
+SetEventCommand* set_event_command_construct (GType object_type,
+ GeeIterable* iter,
+ Event* new_event);
GType move_photos_command_get_type (void) G_GNUC_CONST;
GType set_event_command_get_type (void) G_GNUC_CONST;
-static gboolean events_event_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data);
+static gboolean events_event_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base,
+ GtkSelectionData* data);
static void events_event_entry_finalize (GObject * obj);
-enum {
- EVENTS_NO_EVENT_ENTRY_DUMMY_PROPERTY
-};
static gchar* events_no_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
#define NO_EVENT_PAGE_NAME _ ("No Event")
static gchar* events_no_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
@@ -990,60 +1113,80 @@ NoEventPage* no_event_page_construct (GType object_type);
GType no_event_page_get_type (void) G_GNUC_CONST;
-static void _events_branch_on_events_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
+static void
+_events_branch_on_events_added_removed_data_collection_contents_altered (DataCollection* _sender,
+ GeeIterable* added,
+ GeeIterable* removed,
+ gpointer self)
+{
#line 47 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
events_branch_on_events_added_removed ((EventsBranch*) self, added, removed);
-#line 997 "EventsBranch.c"
+#line 1125 "EventsBranch.c"
}
-static void _events_branch_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
+static void
+_events_branch_on_events_altered_data_collection_items_altered (DataCollection* _sender,
+ GeeMap* items,
+ gpointer self)
+{
#line 48 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
events_branch_on_events_altered ((EventsBranch*) self, items);
-#line 1004 "EventsBranch.c"
+#line 1136 "EventsBranch.c"
}
-static void _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered (EventSourceCollection* _sender, gpointer self) {
+static void
+_events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered (EventSourceCollection* _sender,
+ gpointer self)
+{
#line 49 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
events_branch_on_no_event_collection_altered ((EventsBranch*) self);
-#line 1011 "EventsBranch.c"
+#line 1146 "EventsBranch.c"
}
-static void _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed (ConfigurationFacade* _sender, gpointer self) {
+static void
+_events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed (ConfigurationFacade* _sender,
+ gpointer self)
+{
#line 51 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
events_branch_on_config_changed ((EventsBranch*) self);
-#line 1018 "EventsBranch.c"
+#line 1156 "EventsBranch.c"
}
-static gint _events_branch_event_year_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
+static gint
+_events_branch_event_year_comparator_gcompare_func (gconstpointer a,
+ gconstpointer b)
+{
gint result;
result = events_branch_event_year_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
#line 25 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1027 "EventsBranch.c"
+#line 1168 "EventsBranch.c"
}
-EventsBranch* events_branch_construct (GType object_type) {
+EventsBranch*
+events_branch_construct (GType object_type)
+{
EventsBranch * self = NULL;
SidebarHeader* _tmp0_;
SidebarHeader* _tmp1_;
SidebarEntry* _tmp2_;
SidebarEntry* _tmp3_;
EventsMasterDirectoryEntry* _tmp4_;
- EventSourceCollection* _tmp15_;
+ EventSourceCollection* _tmp14_;
+ GeeCollection* _tmp15_;
GeeCollection* _tmp16_;
- GeeCollection* _tmp17_;
+ gint _tmp17_;
gint _tmp18_;
- gint _tmp19_;
+ EventSourceCollection* _tmp19_;
EventSourceCollection* _tmp20_;
EventSourceCollection* _tmp21_;
- EventSourceCollection* _tmp22_;
+ ConfigFacade* _tmp22_;
ConfigFacade* _tmp23_;
- ConfigFacade* _tmp24_;
#line 25 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_tmp0_ = sidebar_header_new (_ ("Events"), _ ("Browse through your events"), TRUE);
#line 25 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -1062,7 +1205,7 @@ EventsBranch* events_branch_construct (GType object_type) {
sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
#line 29 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (_tmp3_);
-#line 1066 "EventsBranch.c"
+#line 1209 "EventsBranch.c"
{
GeeIterator* _object_it = NULL;
EventSourceCollection* _tmp5_;
@@ -1086,111 +1229,113 @@ EventsBranch* events_branch_construct (GType object_type) {
_object_it = _tmp9_;
#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
while (TRUE) {
-#line 1090 "EventsBranch.c"
+#line 1233 "EventsBranch.c"
GeeIterator* _tmp10_;
- gboolean _tmp11_;
DataObject* object = NULL;
- GeeIterator* _tmp12_;
- gpointer _tmp13_;
- DataObject* _tmp14_;
+ GeeIterator* _tmp11_;
+ gpointer _tmp12_;
+ DataObject* _tmp13_;
#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_tmp10_ = _object_it;
#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp11_ = gee_iterator_next (_tmp10_);
-#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (!_tmp11_) {
+ if (!gee_iterator_next (_tmp10_)) {
#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
break;
-#line 1105 "EventsBranch.c"
+#line 1245 "EventsBranch.c"
}
#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp12_ = _object_it;
+ _tmp11_ = _object_it;
#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp13_ = gee_iterator_get (_tmp12_);
+ _tmp12_ = gee_iterator_get (_tmp11_);
#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- object = (DataObject*) _tmp13_;
+ object = (DataObject*) _tmp12_;
#line 33 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp14_ = object;
+ _tmp13_ = object;
#line 33 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_EVENT, Event));
+ events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_EVENT, Event));
#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (object);
-#line 1119 "EventsBranch.c"
+#line 1259 "EventsBranch.c"
}
#line 32 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (_object_it);
-#line 1123 "EventsBranch.c"
+#line 1263 "EventsBranch.c"
}
#line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp15_ = event_global;
+ _tmp14_ = event_global;
#line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp16_ = event_source_collection_get_no_event_objects (_tmp15_);
+ _tmp15_ = event_source_collection_get_no_event_objects (_tmp14_);
#line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp17_ = _tmp16_;
+ _tmp16_ = _tmp15_;
#line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp18_ = gee_collection_get_size (_tmp17_);
+ _tmp17_ = gee_collection_get_size (_tmp16_);
#line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp19_ = _tmp18_;
+ _tmp18_ = _tmp17_;
#line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- events_branch_show_no_events (self, _tmp19_ > 0);
+ events_branch_show_no_events (self, _tmp18_ > 0);
#line 35 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp17_);
+ _g_object_unref0 (_tmp16_);
#line 38 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp20_ = event_global;
+ _tmp19_ = event_global;
#line 38 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _events_branch_on_events_added_removed_data_collection_contents_altered, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _events_branch_on_events_added_removed_data_collection_contents_altered, self, 0);
#line 39 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp21_ = event_global;
+ _tmp20_ = event_global;
#line 39 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _events_branch_on_events_altered_data_collection_items_altered, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _events_branch_on_events_altered_data_collection_items_altered, self, 0);
#line 40 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp22_ = event_global;
+ _tmp21_ = event_global;
#line 40 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- g_signal_connect_object (_tmp22_, "no-event-collection-altered", (GCallback) _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered, self, 0);
+ g_signal_connect_object (_tmp21_, "no-event-collection-altered", (GCallback) _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered, self, 0);
#line 43 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp23_ = config_facade_get_instance ();
+ _tmp22_ = config_facade_get_instance ();
#line 43 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp24_ = _tmp23_;
+ _tmp23_ = _tmp22_;
#line 43 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "events-sort-ascending-changed", (GCallback) _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "events-sort-ascending-changed", (GCallback) _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed, self, 0);
#line 43 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp24_);
+ _g_object_unref0 (_tmp23_);
#line 24 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return self;
-#line 1161 "EventsBranch.c"
+#line 1301 "EventsBranch.c"
}
-EventsBranch* events_branch_new (void) {
+EventsBranch*
+events_branch_new (void)
+{
#line 24 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return events_branch_construct (EVENTS_TYPE_BRANCH);
-#line 1168 "EventsBranch.c"
+#line 1310 "EventsBranch.c"
}
-void events_branch_init (void) {
+void
+events_branch_init (void)
+{
ConfigFacade* _tmp0_;
ConfigFacade* _tmp1_;
- gboolean _tmp2_;
#line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_tmp0_ = config_facade_get_instance ();
#line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_tmp1_ = _tmp0_;
#line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- events_branch_sort_ascending = _tmp2_;
+ events_branch_sort_ascending = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 55 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (_tmp1_);
-#line 1186 "EventsBranch.c"
+#line 1327 "EventsBranch.c"
}
-void events_branch_terminate (void) {
+void
+events_branch_terminate (void)
+{
}
-gboolean events_branch_is_user_renameable (EventsBranch* self) {
+gboolean
+events_branch_is_user_renameable (EventsBranch* self)
+{
gboolean result = FALSE;
#line 61 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_val_if_fail (EVENTS_IS_BRANCH (self), FALSE);
@@ -1198,18 +1343,22 @@ gboolean events_branch_is_user_renameable (EventsBranch* self) {
result = TRUE;
#line 62 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1202 "EventsBranch.c"
+#line 1347 "EventsBranch.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 66 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return self ? g_object_ref (self) : NULL;
-#line 1209 "EventsBranch.c"
+#line 1356 "EventsBranch.c"
}
-EventsMasterDirectoryEntry* events_branch_get_master_entry (EventsBranch* self) {
+EventsMasterDirectoryEntry*
+events_branch_get_master_entry (EventsBranch* self)
+{
EventsMasterDirectoryEntry* result = NULL;
EventsMasterDirectoryEntry* _tmp0_;
EventsMasterDirectoryEntry* _tmp1_;
@@ -1223,558 +1372,435 @@ EventsMasterDirectoryEntry* events_branch_get_master_entry (EventsBranch* self)
result = _tmp1_;
#line 66 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1227 "EventsBranch.c"
+#line 1376 "EventsBranch.c"
}
-static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry* b) {
+static gint
+events_branch_event_year_comparator (SidebarEntry* a,
+ SidebarEntry* b)
+{
gint result = 0;
- SidebarEntry* _tmp0_;
- SidebarEntry* _tmp1_;
- SidebarEntry* _tmp2_;
- SidebarEntry* _tmp6_;
- SidebarEntry* _tmp8_;
- gboolean _tmp10_;
+ gboolean _tmp0_;
gint _result_ = 0;
- SidebarEntry* _tmp15_;
- gint _tmp16_;
- SidebarEntry* _tmp17_;
- gint _tmp18_;
- gint _tmp19_;
+ gint _tmp3_;
#line 69 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
#line 69 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
#line 70 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp0_ = a;
-#line 70 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = b;
-#line 70 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp0_ == _tmp1_) {
+ if (a == b) {
#line 71 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
result = 0;
#line 71 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1259 "EventsBranch.c"
+#line 1398 "EventsBranch.c"
}
#line 75 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = a;
-#line 75 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) {
-#line 1265 "EventsBranch.c"
- SidebarEntry* _tmp3_;
-#line 76 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp3_ = b;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (a, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) {
#line 76 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, EVENTS_TYPE_NO_EVENT_ENTRY)) {
+ if (G_TYPE_CHECK_INSTANCE_TYPE (b, EVENTS_TYPE_NO_EVENT_ENTRY)) {
#line 77 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
result = -1;
#line 77 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1275 "EventsBranch.c"
+#line 1408 "EventsBranch.c"
}
#line 78 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
result = 1;
#line 78 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1281 "EventsBranch.c"
+#line 1414 "EventsBranch.c"
} else {
- SidebarEntry* _tmp4_;
-#line 79 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp4_ = b;
#line 79 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) {
-#line 1288 "EventsBranch.c"
- SidebarEntry* _tmp5_;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (b, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) {
#line 80 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp5_ = a;
-#line 80 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, EVENTS_TYPE_NO_EVENT_ENTRY)) {
+ if (G_TYPE_CHECK_INSTANCE_TYPE (a, EVENTS_TYPE_NO_EVENT_ENTRY)) {
#line 81 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
result = 1;
#line 81 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1298 "EventsBranch.c"
+#line 1424 "EventsBranch.c"
}
#line 82 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
result = -1;
#line 82 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1304 "EventsBranch.c"
+#line 1430 "EventsBranch.c"
}
}
#line 85 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp6_ = a;
-#line 85 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, EVENTS_TYPE_NO_EVENT_ENTRY)) {
+ if (G_TYPE_CHECK_INSTANCE_TYPE (a, EVENTS_TYPE_NO_EVENT_ENTRY)) {
#line 86 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
result = 1;
#line 86 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1315 "EventsBranch.c"
+#line 1439 "EventsBranch.c"
} else {
- SidebarEntry* _tmp7_;
#line 87 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp7_ = b;
-#line 87 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, EVENTS_TYPE_NO_EVENT_ENTRY)) {
+ if (G_TYPE_CHECK_INSTANCE_TYPE (b, EVENTS_TYPE_NO_EVENT_ENTRY)) {
#line 88 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
result = -1;
#line 88 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1326 "EventsBranch.c"
+#line 1447 "EventsBranch.c"
}
}
#line 91 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp8_ = a;
-#line 91 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY)) {
+ if (G_TYPE_CHECK_INSTANCE_TYPE (a, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY)) {
#line 92 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
result = -1;
#line 92 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1337 "EventsBranch.c"
+#line 1456 "EventsBranch.c"
} else {
- SidebarEntry* _tmp9_;
#line 93 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp9_ = b;
-#line 93 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY)) {
+ if (G_TYPE_CHECK_INSTANCE_TYPE (b, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY)) {
#line 94 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
result = 1;
#line 94 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1348 "EventsBranch.c"
+#line 1464 "EventsBranch.c"
}
}
#line 96 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp10_ = events_branch_sort_ascending;
+ _tmp0_ = events_branch_sort_ascending;
#line 96 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (!_tmp10_) {
-#line 1355 "EventsBranch.c"
+ if (!_tmp0_) {
+#line 1471 "EventsBranch.c"
SidebarEntry* swap = NULL;
- SidebarEntry* _tmp11_;
- SidebarEntry* _tmp12_;
- SidebarEntry* _tmp13_;
- SidebarEntry* _tmp14_;
-#line 97 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp11_ = a;
+ SidebarEntry* _tmp1_;
+ SidebarEntry* _tmp2_;
#line 97 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp12_ = _g_object_ref0 (_tmp11_);
+ _tmp1_ = _g_object_ref0 (a);
#line 97 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- swap = _tmp12_;
-#line 98 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp13_ = b;
+ swap = _tmp1_;
#line 98 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- a = _tmp13_;
+ a = b;
#line 99 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp14_ = swap;
+ _tmp2_ = swap;
#line 99 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- b = _tmp14_;
+ b = _tmp2_;
#line 96 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (swap);
-#line 1377 "EventsBranch.c"
+#line 1487 "EventsBranch.c"
}
#line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp15_ = a;
-#line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp16_ = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry));
-#line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp17_ = b;
-#line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp18_ = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry));
-#line 102 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _result_ = _tmp16_ - _tmp18_;
+ _result_ = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (a, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry)) - events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (b, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry));
#line 104 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp19_ = _result_;
+ _tmp3_ = _result_;
#line 104 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _vala_assert (_tmp19_ != 0, "result != 0");
+ _vala_assert (_tmp3_ != 0, "result != 0");
#line 106 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
result = _result_;
#line 106 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1397 "EventsBranch.c"
+#line 1499 "EventsBranch.c"
}
-static gint events_branch_event_month_comparator (SidebarEntry* a, SidebarEntry* b) {
+static gint
+events_branch_event_month_comparator (SidebarEntry* a,
+ SidebarEntry* b)
+{
gint result = 0;
- SidebarEntry* _tmp0_;
- SidebarEntry* _tmp1_;
- gboolean _tmp2_;
+ gboolean _tmp0_;
gint _result_ = 0;
- SidebarEntry* _tmp7_;
- gint _tmp8_;
- SidebarEntry* _tmp9_;
- gint _tmp10_;
- gint _tmp11_;
+ gint _tmp3_;
#line 109 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
#line 109 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
#line 110 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp0_ = a;
-#line 110 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = b;
-#line 110 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp0_ == _tmp1_) {
+ if (a == b) {
#line 111 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
result = 0;
#line 111 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1426 "EventsBranch.c"
+#line 1521 "EventsBranch.c"
}
#line 113 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = events_branch_sort_ascending;
+ _tmp0_ = events_branch_sort_ascending;
#line 113 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (!_tmp2_) {
-#line 1432 "EventsBranch.c"
+ if (!_tmp0_) {
+#line 1527 "EventsBranch.c"
SidebarEntry* swap = NULL;
- SidebarEntry* _tmp3_;
- SidebarEntry* _tmp4_;
- SidebarEntry* _tmp5_;
- SidebarEntry* _tmp6_;
-#line 114 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp3_ = a;
+ SidebarEntry* _tmp1_;
+ SidebarEntry* _tmp2_;
#line 114 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp4_ = _g_object_ref0 (_tmp3_);
+ _tmp1_ = _g_object_ref0 (a);
#line 114 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- swap = _tmp4_;
-#line 115 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp5_ = b;
+ swap = _tmp1_;
#line 115 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- a = _tmp5_;
+ a = b;
#line 116 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp6_ = swap;
+ _tmp2_ = swap;
#line 116 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- b = _tmp6_;
+ b = _tmp2_;
#line 113 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (swap);
-#line 1454 "EventsBranch.c"
+#line 1543 "EventsBranch.c"
}
#line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp7_ = a;
-#line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp8_ = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry));
-#line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp9_ = b;
-#line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp10_ = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry));
-#line 119 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _result_ = _tmp8_ - _tmp10_;
+ _result_ = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (a, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry)) - events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (b, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry));
#line 121 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp11_ = _result_;
+ _tmp3_ = _result_;
#line 121 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _vala_assert (_tmp11_ != 0, "result != 0");
+ _vala_assert (_tmp3_ != 0, "result != 0");
#line 123 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
result = _result_;
#line 123 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1474 "EventsBranch.c"
+#line 1555 "EventsBranch.c"
}
-static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) {
+static gint
+events_branch_event_comparator (SidebarEntry* a,
+ SidebarEntry* b)
+{
gint result = 0;
- SidebarEntry* _tmp0_;
- SidebarEntry* _tmp1_;
- gboolean _tmp2_;
+ gboolean _tmp0_;
gint64 _result_ = 0LL;
- SidebarEntry* _tmp7_;
- Event* _tmp8_;
- Event* _tmp9_;
- time_t _tmp10_;
- SidebarEntry* _tmp11_;
- Event* _tmp12_;
- Event* _tmp13_;
- time_t _tmp14_;
- gint64 _tmp15_;
- gint64 _tmp16_;
- gint64 _tmp27_;
- gint _tmp28_ = 0;
- gint64 _tmp29_;
+ Event* _tmp3_;
+ Event* _tmp4_;
+ Event* _tmp5_;
+ Event* _tmp6_;
+ gint64 _tmp7_;
+ gint64 _tmp8_;
+ gint64 _tmp17_;
+ gint _tmp18_ = 0;
+ gint64 _tmp19_;
#line 126 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
#line 126 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
#line 127 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp0_ = a;
-#line 127 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = b;
-#line 127 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp0_ == _tmp1_) {
+ if (a == b) {
#line 128 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
result = 0;
#line 128 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1511 "EventsBranch.c"
+#line 1585 "EventsBranch.c"
}
#line 130 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = events_branch_sort_ascending;
+ _tmp0_ = events_branch_sort_ascending;
#line 130 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (!_tmp2_) {
-#line 1517 "EventsBranch.c"
+ if (!_tmp0_) {
+#line 1591 "EventsBranch.c"
SidebarEntry* swap = NULL;
- SidebarEntry* _tmp3_;
- SidebarEntry* _tmp4_;
- SidebarEntry* _tmp5_;
- SidebarEntry* _tmp6_;
-#line 131 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp3_ = a;
+ SidebarEntry* _tmp1_;
+ SidebarEntry* _tmp2_;
#line 131 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp4_ = _g_object_ref0 (_tmp3_);
+ _tmp1_ = _g_object_ref0 (a);
#line 131 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- swap = _tmp4_;
+ swap = _tmp1_;
#line 132 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp5_ = b;
-#line 132 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- a = _tmp5_;
+ a = b;
#line 133 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp6_ = swap;
+ _tmp2_ = swap;
#line 133 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- b = _tmp6_;
+ b = _tmp2_;
#line 130 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (swap);
-#line 1539 "EventsBranch.c"
+#line 1607 "EventsBranch.c"
}
#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp7_ = a;
-#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp8_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
-#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp9_ = _tmp8_;
+ _tmp3_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (a, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp10_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_EVENT_SOURCE, EventSource));
-#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp11_ = b;
-#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp12_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
+ _tmp4_ = _tmp3_;
#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp13_ = _tmp12_;
+ _tmp5_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (b, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp14_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_EVENT_SOURCE, EventSource));
+ _tmp6_ = _tmp5_;
#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp15_ = (gint64) (_tmp10_ - _tmp14_);
+ _tmp7_ = (gint64) (event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_EVENT_SOURCE, EventSource)) - event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT_SOURCE, EventSource)));
#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp13_);
+ _g_object_unref0 (_tmp6_);
#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp9_);
+ _g_object_unref0 (_tmp4_);
#line 136 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _result_ = _tmp15_;
+ _result_ = _tmp7_;
#line 140 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp16_ = _result_;
+ _tmp8_ = _result_;
#line 140 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp16_ == ((gint64) 0)) {
-#line 1569 "EventsBranch.c"
- SidebarEntry* _tmp17_;
- Event* _tmp18_;
- Event* _tmp19_;
- EventID _tmp20_ = {0};
- gint64 _tmp21_;
- SidebarEntry* _tmp22_;
- Event* _tmp23_;
- Event* _tmp24_;
- EventID _tmp25_ = {0};
- gint64 _tmp26_;
-#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp17_ = a;
-#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp18_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
+ if (_tmp8_ == ((gint64) 0)) {
+#line 1629 "EventsBranch.c"
+ Event* _tmp9_;
+ Event* _tmp10_;
+ EventID _tmp11_ = {0};
+ gint64 _tmp12_;
+ Event* _tmp13_;
+ Event* _tmp14_;
+ EventID _tmp15_ = {0};
+ gint64 _tmp16_;
#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp19_ = _tmp18_;
+ _tmp9_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (a, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- event_get_event_id (_tmp19_, &_tmp20_);
+ _tmp10_ = _tmp9_;
#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp21_ = _tmp20_.id;
+ event_get_event_id (_tmp10_, &_tmp11_);
#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp22_ = b;
+ _tmp12_ = _tmp11_.id;
#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp23_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
+ _tmp13_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (b, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp24_ = _tmp23_;
+ _tmp14_ = _tmp13_;
#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- event_get_event_id (_tmp24_, &_tmp25_);
+ event_get_event_id (_tmp14_, &_tmp15_);
#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp26_ = _tmp25_.id;
+ _tmp16_ = _tmp15_.id;
#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _result_ = _tmp21_ - _tmp26_;
+ _result_ = _tmp12_ - _tmp16_;
#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp24_);
+ _g_object_unref0 (_tmp14_);
#line 141 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp19_);
-#line 1606 "EventsBranch.c"
+ _g_object_unref0 (_tmp10_);
+#line 1660 "EventsBranch.c"
}
#line 145 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp27_ = _result_;
+ _tmp17_ = _result_;
#line 145 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _vala_assert (_tmp27_ != ((gint64) 0), "result != 0");
+ _vala_assert (_tmp17_ != ((gint64) 0), "result != 0");
#line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp29_ = _result_;
+ _tmp19_ = _result_;
#line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp29_ < ((gint64) 0)) {
+ if (_tmp19_ < ((gint64) 0)) {
#line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp28_ = -1;
-#line 1618 "EventsBranch.c"
+ _tmp18_ = -1;
+#line 1672 "EventsBranch.c"
} else {
#line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp28_ = 1;
-#line 1622 "EventsBranch.c"
+ _tmp18_ = 1;
+#line 1676 "EventsBranch.c"
}
#line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- result = _tmp28_;
+ result = _tmp18_;
#line 147 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1628 "EventsBranch.c"
+#line 1682 "EventsBranch.c"
}
-static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntry* b) {
+static gint
+events_branch_undated_event_comparator (SidebarEntry* a,
+ SidebarEntry* b)
+{
gint result = 0;
- SidebarEntry* _tmp0_;
- SidebarEntry* _tmp1_;
- gboolean _tmp2_;
+ gboolean _tmp0_;
gint ret = 0;
- SidebarEntry* _tmp7_;
+ Event* _tmp3_;
+ Event* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ Event* _tmp7_;
Event* _tmp8_;
- Event* _tmp9_;
+ gchar* _tmp9_;
gchar* _tmp10_;
- gchar* _tmp11_;
- SidebarEntry* _tmp12_;
- Event* _tmp13_;
- Event* _tmp14_;
- gchar* _tmp15_;
- gchar* _tmp16_;
- gint _tmp17_;
- gint _tmp18_;
- gint _tmp19_;
+ gint _tmp11_;
+ gint _tmp12_;
#line 150 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
#line 150 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
#line 151 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp0_ = a;
-#line 151 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = b;
-#line 151 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp0_ == _tmp1_) {
+ if (a == b) {
#line 152 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
result = 0;
#line 152 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1665 "EventsBranch.c"
+#line 1713 "EventsBranch.c"
}
#line 154 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = events_branch_sort_ascending;
+ _tmp0_ = events_branch_sort_ascending;
#line 154 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (!_tmp2_) {
-#line 1671 "EventsBranch.c"
+ if (!_tmp0_) {
+#line 1719 "EventsBranch.c"
SidebarEntry* swap = NULL;
- SidebarEntry* _tmp3_;
- SidebarEntry* _tmp4_;
- SidebarEntry* _tmp5_;
- SidebarEntry* _tmp6_;
-#line 155 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp3_ = a;
+ SidebarEntry* _tmp1_;
+ SidebarEntry* _tmp2_;
#line 155 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp4_ = _g_object_ref0 (_tmp3_);
+ _tmp1_ = _g_object_ref0 (a);
#line 155 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- swap = _tmp4_;
-#line 156 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp5_ = b;
+ swap = _tmp1_;
#line 156 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- a = _tmp5_;
+ a = b;
#line 157 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp6_ = swap;
+ _tmp2_ = swap;
#line 157 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- b = _tmp6_;
+ b = _tmp2_;
#line 154 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (swap);
-#line 1693 "EventsBranch.c"
+#line 1735 "EventsBranch.c"
}
#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp7_ = a;
+ _tmp3_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (a, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp8_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
-#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp9_ = _tmp8_;
-#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp10_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject));
-#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp11_ = _tmp10_;
+ _tmp4_ = _tmp3_;
#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp12_ = b;
+ _tmp5_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject));
#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp13_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
+ _tmp6_ = _tmp5_;
#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp14_ = _tmp13_;
+ _tmp7_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (b, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp15_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject));
+ _tmp8_ = _tmp7_;
#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp16_ = _tmp15_;
+ _tmp9_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject));
#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp17_ = g_utf8_collate (_tmp11_, _tmp16_);
+ _tmp10_ = _tmp9_;
#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp18_ = _tmp17_;
+ _tmp11_ = g_utf8_collate (_tmp6_, _tmp10_);
#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_free0 (_tmp16_);
+ _g_free0 (_tmp10_);
#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp14_);
+ _g_object_unref0 (_tmp8_);
#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_free0 (_tmp11_);
+ _g_free0 (_tmp6_);
#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp9_);
+ _g_object_unref0 (_tmp4_);
#line 160 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- ret = _tmp18_;
+ ret = _tmp11_;
#line 163 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp19_ = ret;
+ _tmp12_ = ret;
#line 163 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp19_ == 0) {
-#line 1733 "EventsBranch.c"
- SidebarEntry* _tmp20_;
- Event* _tmp21_;
- Event* _tmp22_;
- gint64 _tmp23_;
- SidebarEntry* _tmp24_;
- Event* _tmp25_;
- Event* _tmp26_;
- gint64 _tmp27_;
-#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp20_ = b;
-#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp21_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
+ if (_tmp12_ == 0) {
+#line 1769 "EventsBranch.c"
+ Event* _tmp13_;
+ Event* _tmp14_;
+ Event* _tmp15_;
+ Event* _tmp16_;
#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp22_ = _tmp21_;
+ _tmp13_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (b, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp23_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_SOURCE, DataSource));
+ _tmp14_ = _tmp13_;
#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp24_ = a;
+ _tmp15_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (a, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp25_ = events_event_entry_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry));
-#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp26_ = _tmp25_;
-#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp27_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource));
+ _tmp16_ = _tmp15_;
#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- ret = (gint) (_tmp23_ - _tmp27_);
+ ret = (gint) (data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_SOURCE, DataSource)) - data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource)));
#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp26_);
+ _g_object_unref0 (_tmp16_);
#line 164 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp22_);
-#line 1764 "EventsBranch.c"
+ _g_object_unref0 (_tmp14_);
+#line 1788 "EventsBranch.c"
}
#line 167 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
result = ret;
#line 167 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1770 "EventsBranch.c"
+#line 1794 "EventsBranch.c"
}
-EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, Event* event) {
+EventsEventEntry*
+events_branch_get_entry_for_event (EventsBranch* self,
+ Event* event)
+{
EventsEventEntry* result = NULL;
GeeHashMap* _tmp0_;
- Event* _tmp1_;
- gpointer _tmp2_;
+ gpointer _tmp1_;
#line 170 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL);
#line 170 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -1782,23 +1808,22 @@ EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, Event*
#line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_tmp0_ = self->priv->entry_map;
#line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = event;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
+ _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), event);
#line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- result = (EventsEventEntry*) _tmp2_;
+ result = (EventsEventEntry*) _tmp1_;
#line 171 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 1793 "EventsBranch.c"
+#line 1817 "EventsBranch.c"
}
-static void events_branch_on_config_changed (EventsBranch* self) {
+static void
+events_branch_on_config_changed (EventsBranch* self)
+{
gboolean value = FALSE;
ConfigFacade* _tmp0_;
ConfigFacade* _tmp1_;
gboolean _tmp2_;
- gboolean _tmp3_;
#line 174 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -1808,22 +1833,22 @@ static void events_branch_on_config_changed (EventsBranch* self) {
#line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_tmp2_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp3_ = _tmp2_;
-#line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (_tmp1_);
#line 175 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- value = _tmp3_;
+ value = _tmp2_;
#line 177 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
events_branch_sort_ascending = value;
#line 178 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
sidebar_branch_reorder_all (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 1821 "EventsBranch.c"
+#line 1844 "EventsBranch.c"
}
-static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterable* added, GeeIterable* removed) {
- GeeIterable* _tmp0_;
- GeeIterable* _tmp8_;
+static void
+events_branch_on_events_added_removed (EventsBranch* self,
+ GeeIterable* added,
+ GeeIterable* removed)
+{
#line 181 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 181 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -1831,266 +1856,238 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab
#line 181 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
#line 183 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp0_ = added;
-#line 183 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp0_ != NULL) {
-#line 1838 "EventsBranch.c"
+ if (added != NULL) {
+#line 1861 "EventsBranch.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp1_;
- GeeIterator* _tmp2_;
-#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = added;
+ GeeIterator* _tmp0_;
#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = gee_iterable_iterator (_tmp1_);
+ _tmp0_ = gee_iterable_iterator (added);
#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _object_it = _tmp2_;
+ _object_it = _tmp0_;
#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
while (TRUE) {
-#line 1851 "EventsBranch.c"
- GeeIterator* _tmp3_;
- gboolean _tmp4_;
+#line 1871 "EventsBranch.c"
+ GeeIterator* _tmp1_;
DataObject* object = NULL;
- GeeIterator* _tmp5_;
- gpointer _tmp6_;
- DataObject* _tmp7_;
-#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp3_ = _object_it;
+ GeeIterator* _tmp2_;
+ gpointer _tmp3_;
+ DataObject* _tmp4_;
#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp4_ = gee_iterator_next (_tmp3_);
+ _tmp1_ = _object_it;
#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (!_tmp4_) {
+ if (!gee_iterator_next (_tmp1_)) {
#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
break;
-#line 1866 "EventsBranch.c"
+#line 1883 "EventsBranch.c"
}
#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp5_ = _object_it;
+ _tmp2_ = _object_it;
#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp6_ = gee_iterator_get (_tmp5_);
+ _tmp3_ = gee_iterator_get (_tmp2_);
#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- object = (DataObject*) _tmp6_;
+ object = (DataObject*) _tmp3_;
#line 185 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp7_ = object;
+ _tmp4_ = object;
#line 185 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_EVENT, Event));
+ events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_EVENT, Event));
#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (object);
-#line 1880 "EventsBranch.c"
+#line 1897 "EventsBranch.c"
}
#line 184 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (_object_it);
-#line 1884 "EventsBranch.c"
+#line 1901 "EventsBranch.c"
}
}
#line 188 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp8_ = removed;
-#line 188 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp8_ != NULL) {
-#line 1891 "EventsBranch.c"
+ if (removed != NULL) {
+#line 1906 "EventsBranch.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp9_;
- GeeIterator* _tmp10_;
-#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp9_ = removed;
+ GeeIterator* _tmp5_;
#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp10_ = gee_iterable_iterator (_tmp9_);
+ _tmp5_ = gee_iterable_iterator (removed);
#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _object_it = _tmp10_;
+ _object_it = _tmp5_;
#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
while (TRUE) {
-#line 1904 "EventsBranch.c"
- GeeIterator* _tmp11_;
- gboolean _tmp12_;
+#line 1916 "EventsBranch.c"
+ GeeIterator* _tmp6_;
DataObject* object = NULL;
- GeeIterator* _tmp13_;
- gpointer _tmp14_;
- DataObject* _tmp15_;
+ GeeIterator* _tmp7_;
+ gpointer _tmp8_;
+ DataObject* _tmp9_;
#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp11_ = _object_it;
+ _tmp6_ = _object_it;
#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp12_ = gee_iterator_next (_tmp11_);
-#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (!_tmp12_) {
+ if (!gee_iterator_next (_tmp6_)) {
#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
break;
-#line 1919 "EventsBranch.c"
+#line 1928 "EventsBranch.c"
}
#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp13_ = _object_it;
+ _tmp7_ = _object_it;
#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp14_ = gee_iterator_get (_tmp13_);
+ _tmp8_ = gee_iterator_get (_tmp7_);
#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- object = (DataObject*) _tmp14_;
+ object = (DataObject*) _tmp8_;
#line 190 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp15_ = object;
+ _tmp9_ = object;
#line 190 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- events_branch_remove_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_EVENT, Event));
+ events_branch_remove_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_EVENT, Event));
#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (object);
-#line 1933 "EventsBranch.c"
+#line 1942 "EventsBranch.c"
}
#line 189 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (_object_it);
-#line 1937 "EventsBranch.c"
+#line 1946 "EventsBranch.c"
}
}
}
-static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered) {
+static void
+events_branch_on_events_altered (EventsBranch* self,
+ GeeMap* altered)
+{
#line 194 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 194 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_if_fail (GEE_IS_MAP (altered));
-#line 1948 "EventsBranch.c"
+#line 1960 "EventsBranch.c"
{
GeeIterator* _object_it = NULL;
- GeeMap* _tmp0_;
+ GeeSet* _tmp0_;
GeeSet* _tmp1_;
GeeSet* _tmp2_;
- GeeSet* _tmp3_;
+ GeeIterator* _tmp3_;
GeeIterator* _tmp4_;
- GeeIterator* _tmp5_;
#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp0_ = altered;
+ _tmp0_ = gee_map_get_keys (altered);
#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = gee_map_get_keys (_tmp0_);
+ _tmp1_ = _tmp0_;
#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_tmp2_ = _tmp1_;
#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp3_ = _tmp2_;
-#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable));
#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp3_);
+ _g_object_unref0 (_tmp2_);
#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _object_it = _tmp5_;
+ _object_it = _tmp4_;
#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
while (TRUE) {
-#line 1975 "EventsBranch.c"
- GeeIterator* _tmp6_;
- gboolean _tmp7_;
+#line 1984 "EventsBranch.c"
+ GeeIterator* _tmp5_;
DataObject* object = NULL;
- GeeIterator* _tmp8_;
- gpointer _tmp9_;
+ GeeIterator* _tmp6_;
+ gpointer _tmp7_;
Event* event = NULL;
- DataObject* _tmp10_;
- Event* _tmp11_;
+ DataObject* _tmp8_;
+ Event* _tmp9_;
Alteration* alteration = NULL;
- GeeMap* _tmp12_;
- DataObject* _tmp13_;
- gpointer _tmp14_;
- Alteration* _tmp15_;
- gboolean _tmp16_;
-#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp6_ = _object_it;
+ DataObject* _tmp10_;
+ gpointer _tmp11_;
+ Alteration* _tmp12_;
#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp7_ = gee_iterator_next (_tmp6_);
+ _tmp5_ = _object_it;
#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (!_tmp7_) {
+ if (!gee_iterator_next (_tmp5_)) {
#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
break;
-#line 1998 "EventsBranch.c"
+#line 2002 "EventsBranch.c"
}
#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp8_ = _object_it;
+ _tmp6_ = _object_it;
#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp9_ = gee_iterator_get (_tmp8_);
+ _tmp7_ = gee_iterator_get (_tmp6_);
#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- object = (DataObject*) _tmp9_;
+ object = (DataObject*) _tmp7_;
#line 196 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp10_ = object;
+ _tmp8_ = object;
#line 196 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_EVENT, Event));
+ _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_EVENT, Event));
#line 196 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- event = _tmp11_;
+ event = _tmp9_;
#line 197 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp12_ = altered;
-#line 197 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp13_ = object;
+ _tmp10_ = object;
#line 197 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp14_ = gee_map_get (_tmp12_, _tmp13_);
+ _tmp11_ = gee_map_get (altered, _tmp10_);
#line 197 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- alteration = (Alteration*) _tmp14_;
+ alteration = (Alteration*) _tmp11_;
#line 199 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp15_ = alteration;
+ _tmp12_ = alteration;
#line 199 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp16_ = alteration_has_detail (_tmp15_, "metadata", "time");
-#line 199 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp16_) {
+ if (alteration_has_detail (_tmp12_, "metadata", "time")) {
#line 2026 "EventsBranch.c"
- Event* _tmp17_;
+ Event* _tmp13_;
#line 202 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp17_ = event;
+ _tmp13_ = event;
#line 202 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- events_branch_move_event (self, _tmp17_);
+ events_branch_move_event (self, _tmp13_);
#line 2032 "EventsBranch.c"
} else {
- Alteration* _tmp18_;
- gboolean _tmp19_;
-#line 203 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp18_ = alteration;
+ Alteration* _tmp14_;
#line 203 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp19_ = alteration_has_detail (_tmp18_, "metadata", "name");
+ _tmp14_ = alteration;
#line 203 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp19_) {
-#line 2042 "EventsBranch.c"
+ if (alteration_has_detail (_tmp14_, "metadata", "name")) {
+#line 2039 "EventsBranch.c"
EventsEventEntry* entry = NULL;
- GeeHashMap* _tmp20_;
- Event* _tmp21_;
- gpointer _tmp22_;
+ GeeHashMap* _tmp15_;
+ Event* _tmp16_;
+ gpointer _tmp17_;
+ EventsEventEntry* _tmp18_;
+ EventsEventEntry* _tmp19_;
+ Event* _tmp20_;
+ gchar* _tmp21_;
+ gchar* _tmp22_;
EventsEventEntry* _tmp23_;
- EventsEventEntry* _tmp24_;
- Event* _tmp25_;
+ Event* _tmp24_;
+ gchar* _tmp25_;
gchar* _tmp26_;
- gchar* _tmp27_;
- EventsEventEntry* _tmp28_;
- Event* _tmp29_;
- gchar* _tmp30_;
- gchar* _tmp31_;
#line 204 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp20_ = self->priv->entry_map;
+ _tmp15_ = self->priv->entry_map;
#line 204 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp21_ = event;
+ _tmp16_ = event;
#line 204 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp22_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp21_);
+ _tmp17_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_);
#line 204 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- entry = (EventsEventEntry*) _tmp22_;
+ entry = (EventsEventEntry*) _tmp17_;
#line 205 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp23_ = entry;
+ _tmp18_ = entry;
#line 205 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _vala_assert (_tmp23_ != NULL, "entry != null");
+ _vala_assert (_tmp18_ != NULL, "entry != null");
#line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp24_ = entry;
+ _tmp19_ = entry;
#line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp25_ = event;
+ _tmp20_ = event;
#line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp26_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject));
+ _tmp21_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_OBJECT, DataObject));
#line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp27_ = _tmp26_;
+ _tmp22_ = _tmp21_;
#line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry), "sidebar-name-changed", _tmp27_);
+ g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry), "sidebar-name-changed", _tmp22_);
#line 207 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_free0 (_tmp27_);
+ _g_free0 (_tmp22_);
#line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp28_ = entry;
+ _tmp23_ = entry;
#line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp29_ = event;
+ _tmp24_ = event;
#line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp30_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject));
+ _tmp25_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject));
#line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp31_ = _tmp30_;
+ _tmp26_ = _tmp25_;
#line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-tooltip-changed", _tmp31_);
+ g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-tooltip-changed", _tmp26_);
#line 208 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_free0 (_tmp31_);
+ _g_free0 (_tmp26_);
#line 203 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (entry);
-#line 2094 "EventsBranch.c"
+#line 2091 "EventsBranch.c"
}
}
#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -2099,16 +2096,18 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered
_g_object_unref0 (event);
#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (object);
-#line 2103 "EventsBranch.c"
+#line 2100 "EventsBranch.c"
}
#line 195 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (_object_it);
-#line 2107 "EventsBranch.c"
+#line 2104 "EventsBranch.c"
}
}
-static void events_branch_on_no_event_collection_altered (EventsBranch* self) {
+static void
+events_branch_on_no_event_collection_altered (EventsBranch* self)
+{
EventSourceCollection* _tmp0_;
GeeCollection* _tmp1_;
GeeCollection* _tmp2_;
@@ -2130,35 +2129,44 @@ static void events_branch_on_no_event_collection_altered (EventsBranch* self) {
events_branch_show_no_events (self, _tmp4_ > 0);
#line 214 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (_tmp2_);
-#line 2134 "EventsBranch.c"
+#line 2133 "EventsBranch.c"
}
-static void g_time_local (time_t time, struct tm* result) {
+static void
+g_time_local (time_t time,
+ struct tm* result)
+{
struct tm _result_ = {0};
struct tm _tmp0_ = {0};
-#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
localtime_r (&time, &_tmp0_);
-#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
*result = _result_;
-#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return;
-#line 2149 "EventsBranch.c"
+#line 2151 "EventsBranch.c"
}
-static gint _events_branch_event_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
+static gint
+_events_branch_event_comparator_gcompare_func (gconstpointer a,
+ gconstpointer b)
+{
gint result;
result = events_branch_event_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
#line 230 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 2158 "EventsBranch.c"
+#line 2163 "EventsBranch.c"
}
-static gchar* g_time_format (struct tm *self, const gchar* format) {
+static gchar*
+g_time_format (struct tm *self,
+ const gchar* format)
+{
gchar* result = NULL;
gchar* buffer = NULL;
gchar* _tmp0_;
@@ -2166,370 +2174,343 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
gint _buffer_size_;
gchar* _tmp1_;
gint _tmp1__length1;
- const gchar* _tmp2_;
+ gchar* _tmp2_;
+ gint _tmp2__length1;
gchar* _tmp3_;
- gint _tmp3__length1;
- gchar* _tmp4_;
-#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2874 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (format != NULL, NULL);
-#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, 64);
-#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
buffer = _tmp0_;
-#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
buffer_length1 = 64;
-#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_buffer_size_ = buffer_length1;
-#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = buffer;
-#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1__length1 = buffer_length1;
-#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = format;
-#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = buffer;
-#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3__length1 = buffer_length1;
-#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp4_;
-#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ strftime (_tmp1_, _tmp1__length1, format, &(*self));
+#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = buffer;
+#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2__length1 = buffer_length1;
+#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = g_strdup ((const gchar*) _tmp2_);
+#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp3_;
+#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
buffer = (g_free (buffer), NULL);
-#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 2204 "EventsBranch.c"
+#line 2209 "EventsBranch.c"
}
-static gint _events_branch_event_month_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
+static gint
+_events_branch_event_month_comparator_gcompare_func (gconstpointer a,
+ gconstpointer b)
+{
gint result;
result = events_branch_event_month_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
#line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 2213 "EventsBranch.c"
+#line 2221 "EventsBranch.c"
}
-static void events_branch_add_event (EventsBranch* self, Event* event) {
+static void
+events_branch_add_event (EventsBranch* self,
+ Event* event)
+{
time_t event_time = 0;
- Event* _tmp0_;
- time_t _tmp1_;
- time_t _tmp2_;
+ time_t _tmp0_;
struct tm event_tm = {0};
- time_t _tmp4_;
- struct tm _tmp5_ = {0};
+ time_t _tmp1_;
+ struct tm _tmp2_ = {0};
SidebarEntry* year = NULL;
SidebarEntry* month = NULL;
- Event* _tmp6_;
- struct tm _tmp7_;
- SidebarEntry* _tmp8_ = NULL;
- SidebarEntry* _tmp9_;
- SidebarEntry* _tmp10_;
- SidebarEntry* _tmp13_;
- gchar* _tmp21_;
- gchar* _tmp22_;
- struct tm _tmp23_;
- EventsMonthDirectoryEntry* _tmp24_;
- SidebarEntry* _tmp25_;
- SidebarEntry* _tmp26_;
- SidebarEntry* _tmp27_;
- Event* _tmp28_;
+ struct tm _tmp3_;
+ SidebarEntry* _tmp4_ = NULL;
+ SidebarEntry* _tmp5_;
+ SidebarEntry* _tmp6_;
+ SidebarEntry* _tmp8_;
+ gchar* _tmp16_;
+ gchar* _tmp17_;
+ struct tm _tmp18_;
+ EventsMonthDirectoryEntry* _tmp19_;
+ SidebarEntry* _tmp20_;
+ SidebarEntry* _tmp21_;
+ SidebarEntry* _tmp22_;
#line 217 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 217 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_if_fail (IS_EVENT (event));
#line 218 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp0_ = event;
-#line 218 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource));
-#line 218 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- event_time = _tmp1_;
+ event_time = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_EVENT_SOURCE, EventSource));
#line 219 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = event_time;
+ _tmp0_ = event_time;
#line 219 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp2_ == ((time_t) 0)) {
-#line 2255 "EventsBranch.c"
- Event* _tmp3_;
+ if (_tmp0_ == ((time_t) 0)) {
#line 220 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp3_ = event;
-#line 220 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- events_branch_add_undated_event (self, _tmp3_);
+ events_branch_add_undated_event (self, event);
#line 222 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return;
-#line 2263 "EventsBranch.c"
+#line 2262 "EventsBranch.c"
}
#line 225 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp4_ = event_time;
+ _tmp1_ = event_time;
#line 225 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- g_time_local (_tmp4_, &_tmp5_);
+ g_time_local (_tmp1_, &_tmp2_);
#line 225 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- event_tm = _tmp5_;
-#line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp6_ = event;
+ event_tm = _tmp2_;
#line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp7_ = event_tm;
+ _tmp3_ = event_tm;
#line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp9_ = events_branch_find_event_month (self, _tmp6_, &_tmp7_, &_tmp8_);
+ _tmp5_ = events_branch_find_event_month (self, event, &_tmp3_, &_tmp4_);
#line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (year);
#line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- year = _tmp8_;
+ year = _tmp4_;
#line 228 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- month = _tmp9_;
+ month = _tmp5_;
#line 229 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp10_ = month;
+ _tmp6_ = month;
#line 229 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp10_ != NULL) {
-#line 2287 "EventsBranch.c"
- SidebarEntry* _tmp11_;
- Event* _tmp12_;
-#line 230 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp11_ = month;
+ if (_tmp6_ != NULL) {
+#line 2284 "EventsBranch.c"
+ SidebarEntry* _tmp7_;
#line 230 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp12_ = event;
+ _tmp7_ = month;
#line 230 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- events_branch_graft_event (self, _tmp11_, _tmp12_, _events_branch_event_comparator_gcompare_func);
+ events_branch_graft_event (self, _tmp7_, event, _events_branch_event_comparator_gcompare_func);
#line 232 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (month);
#line 232 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (year);
#line 232 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return;
-#line 2302 "EventsBranch.c"
+#line 2296 "EventsBranch.c"
}
#line 235 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp13_ = year;
+ _tmp8_ = year;
#line 235 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp13_ == NULL) {
-#line 2308 "EventsBranch.c"
- gchar* _tmp14_;
- gchar* _tmp15_;
- struct tm _tmp16_;
- EventsYearDirectoryEntry* _tmp17_;
- SidebarEntry* _tmp18_;
- SidebarEntry* _tmp19_;
- SidebarEntry* _tmp20_;
+ if (_tmp8_ == NULL) {
+#line 2302 "EventsBranch.c"
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+ struct tm _tmp11_;
+ EventsYearDirectoryEntry* _tmp12_;
+ SidebarEntry* _tmp13_;
+ SidebarEntry* _tmp14_;
+ SidebarEntry* _tmp15_;
#line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp14_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT);
+ _tmp9_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT);
#line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp15_ = _tmp14_;
+ _tmp10_ = _tmp9_;
#line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp16_ = event_tm;
+ _tmp11_ = event_tm;
#line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp17_ = events_year_directory_entry_new (_tmp15_, &_tmp16_);
+ _tmp12_ = events_year_directory_entry_new (_tmp10_, &_tmp11_);
#line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (year);
#line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- year = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SIDEBAR_TYPE_ENTRY, SidebarEntry);
+ year = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SIDEBAR_TYPE_ENTRY, SidebarEntry);
#line 236 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_free0 (_tmp15_);
+ _g_free0 (_tmp10_);
#line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp18_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+ _tmp13_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
#line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp19_ = _tmp18_;
+ _tmp14_ = _tmp13_;
#line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp20_ = year;
+ _tmp15_ = year;
#line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp19_, _tmp20_, _events_branch_event_month_comparator_gcompare_func);
+ sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp14_, _tmp15_, _events_branch_event_month_comparator_gcompare_func);
#line 238 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp19_);
-#line 2340 "EventsBranch.c"
+ _g_object_unref0 (_tmp14_);
+#line 2334 "EventsBranch.c"
}
#line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp21_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT);
+ _tmp16_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT);
#line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp22_ = _tmp21_;
+ _tmp17_ = _tmp16_;
#line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp23_ = event_tm;
+ _tmp18_ = event_tm;
#line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp24_ = events_month_directory_entry_new (_tmp22_, &_tmp23_);
+ _tmp19_ = events_month_directory_entry_new (_tmp17_, &_tmp18_);
#line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (month);
#line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- month = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SIDEBAR_TYPE_ENTRY, SidebarEntry);
+ month = G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SIDEBAR_TYPE_ENTRY, SidebarEntry);
#line 241 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_free0 (_tmp22_);
+ _g_free0 (_tmp17_);
#line 243 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp25_ = year;
+ _tmp20_ = year;
#line 243 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp26_ = month;
+ _tmp21_ = month;
#line 243 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp25_, _tmp26_, _events_branch_event_comparator_gcompare_func);
-#line 245 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp27_ = month;
+ sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp20_, _tmp21_, _events_branch_event_comparator_gcompare_func);
#line 245 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp28_ = event;
+ _tmp22_ = month;
#line 245 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- events_branch_graft_event (self, _tmp27_, _tmp28_, _events_branch_event_comparator_gcompare_func);
+ events_branch_graft_event (self, _tmp22_, event, _events_branch_event_comparator_gcompare_func);
#line 217 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (month);
#line 217 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (year);
-#line 2372 "EventsBranch.c"
+#line 2364 "EventsBranch.c"
}
-static void events_branch_move_event (EventsBranch* self, Event* event) {
+static void
+events_branch_move_event (EventsBranch* self,
+ Event* event)
+{
time_t event_time = 0;
- Event* _tmp0_;
- time_t _tmp1_;
- time_t _tmp2_;
+ time_t _tmp0_;
struct tm event_tm = {0};
- time_t _tmp4_;
- struct tm _tmp5_ = {0};
+ time_t _tmp1_;
+ struct tm _tmp2_ = {0};
SidebarEntry* year = NULL;
SidebarEntry* month = NULL;
- Event* _tmp6_;
- struct tm _tmp7_;
- SidebarEntry* _tmp8_ = NULL;
- SidebarEntry* _tmp9_;
- SidebarEntry* _tmp10_;
- SidebarEntry* _tmp18_;
- Event* _tmp25_;
- SidebarEntry* _tmp26_;
+ struct tm _tmp3_;
+ SidebarEntry* _tmp4_ = NULL;
+ SidebarEntry* _tmp5_;
+ SidebarEntry* _tmp6_;
+ SidebarEntry* _tmp14_;
+ SidebarEntry* _tmp21_;
#line 248 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 248 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_if_fail (IS_EVENT (event));
#line 249 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp0_ = event;
-#line 249 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource));
-#line 249 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- event_time = _tmp1_;
+ event_time = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (event, TYPE_EVENT_SOURCE, EventSource));
#line 250 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = event_time;
+ _tmp0_ = event_time;
#line 250 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp2_ == ((time_t) 0)) {
-#line 2408 "EventsBranch.c"
- Event* _tmp3_;
-#line 251 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp3_ = event;
+ if (_tmp0_ == ((time_t) 0)) {
#line 251 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- events_branch_move_to_undated_event (self, _tmp3_);
+ events_branch_move_to_undated_event (self, event);
#line 253 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return;
-#line 2416 "EventsBranch.c"
+#line 2399 "EventsBranch.c"
}
#line 256 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp4_ = event_time;
+ _tmp1_ = event_time;
#line 256 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- g_time_local (_tmp4_, &_tmp5_);
+ g_time_local (_tmp1_, &_tmp2_);
#line 256 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- event_tm = _tmp5_;
+ event_tm = _tmp2_;
#line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp6_ = event;
+ _tmp3_ = event_tm;
#line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp7_ = event_tm;
-#line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp9_ = events_branch_find_event_month (self, _tmp6_, &_tmp7_, &_tmp8_);
+ _tmp5_ = events_branch_find_event_month (self, event, &_tmp3_, &_tmp4_);
#line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (year);
#line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- year = _tmp8_;
+ year = _tmp4_;
#line 259 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- month = _tmp9_;
+ month = _tmp5_;
#line 261 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp10_ = year;
+ _tmp6_ = year;
#line 261 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp10_ == NULL) {
-#line 2440 "EventsBranch.c"
- gchar* _tmp11_;
- gchar* _tmp12_;
- struct tm _tmp13_;
- EventsYearDirectoryEntry* _tmp14_;
- SidebarEntry* _tmp15_;
- SidebarEntry* _tmp16_;
- SidebarEntry* _tmp17_;
+ if (_tmp6_ == NULL) {
+#line 2421 "EventsBranch.c"
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+ struct tm _tmp9_;
+ EventsYearDirectoryEntry* _tmp10_;
+ SidebarEntry* _tmp11_;
+ SidebarEntry* _tmp12_;
+ SidebarEntry* _tmp13_;
#line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp11_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT);
+ _tmp7_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT);
#line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp12_ = _tmp11_;
+ _tmp8_ = _tmp7_;
#line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp13_ = event_tm;
+ _tmp9_ = event_tm;
#line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp14_ = events_year_directory_entry_new (_tmp12_, &_tmp13_);
+ _tmp10_ = events_year_directory_entry_new (_tmp8_, &_tmp9_);
#line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (year);
#line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- year = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_ENTRY, SidebarEntry);
+ year = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SIDEBAR_TYPE_ENTRY, SidebarEntry);
#line 262 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_free0 (_tmp12_);
+ _g_free0 (_tmp8_);
#line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp15_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+ _tmp11_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
#line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp16_ = _tmp15_;
+ _tmp12_ = _tmp11_;
#line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp17_ = year;
+ _tmp13_ = year;
#line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp16_, _tmp17_, _events_branch_event_month_comparator_gcompare_func);
+ sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp12_, _tmp13_, _events_branch_event_month_comparator_gcompare_func);
#line 264 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp16_);
-#line 2472 "EventsBranch.c"
+ _g_object_unref0 (_tmp12_);
+#line 2453 "EventsBranch.c"
}
#line 267 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp18_ = month;
+ _tmp14_ = month;
#line 267 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp18_ == NULL) {
-#line 2478 "EventsBranch.c"
- gchar* _tmp19_;
- gchar* _tmp20_;
- struct tm _tmp21_;
- EventsMonthDirectoryEntry* _tmp22_;
- SidebarEntry* _tmp23_;
- SidebarEntry* _tmp24_;
+ if (_tmp14_ == NULL) {
+#line 2459 "EventsBranch.c"
+ gchar* _tmp15_;
+ gchar* _tmp16_;
+ struct tm _tmp17_;
+ EventsMonthDirectoryEntry* _tmp18_;
+ SidebarEntry* _tmp19_;
+ SidebarEntry* _tmp20_;
#line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp19_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT);
+ _tmp15_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT);
#line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp20_ = _tmp19_;
+ _tmp16_ = _tmp15_;
#line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp21_ = event_tm;
+ _tmp17_ = event_tm;
#line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp22_ = events_month_directory_entry_new (_tmp20_, &_tmp21_);
+ _tmp18_ = events_month_directory_entry_new (_tmp16_, &_tmp17_);
#line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (month);
#line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- month = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SIDEBAR_TYPE_ENTRY, SidebarEntry);
+ month = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SIDEBAR_TYPE_ENTRY, SidebarEntry);
#line 268 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_free0 (_tmp20_);
+ _g_free0 (_tmp16_);
#line 270 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp23_ = year;
+ _tmp19_ = year;
#line 270 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp24_ = month;
+ _tmp20_ = month;
#line 270 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp23_, _tmp24_, _events_branch_event_comparator_gcompare_func);
-#line 2505 "EventsBranch.c"
+ sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp19_, _tmp20_, _events_branch_event_comparator_gcompare_func);
+#line 2486 "EventsBranch.c"
}
#line 273 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp25_ = event;
-#line 273 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp26_ = month;
+ _tmp21_ = month;
#line 273 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- events_branch_reparent_event (self, _tmp25_, _tmp26_);
+ events_branch_reparent_event (self, event, _tmp21_);
#line 248 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (month);
#line 248 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (year);
-#line 2517 "EventsBranch.c"
+#line 2496 "EventsBranch.c"
}
-static void events_branch_remove_event (EventsBranch* self, Event* event) {
+static void
+events_branch_remove_event (EventsBranch* self,
+ Event* event)
+{
SidebarEntry* entry = NULL;
gboolean removed = FALSE;
GeeHashMap* _tmp0_;
- Event* _tmp1_;
- gpointer _tmp2_ = NULL;
+ gpointer _tmp1_ = NULL;
+ gboolean _tmp2_;
gboolean _tmp3_;
- gboolean _tmp4_;
SidebarEntry* parent = NULL;
+ SidebarEntry* _tmp4_;
SidebarEntry* _tmp5_;
SidebarEntry* _tmp6_;
SidebarEntry* _tmp7_;
- SidebarEntry* _tmp8_;
#line 276 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 276 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -2537,127 +2518,126 @@ static void events_branch_remove_event (EventsBranch* self, Event* event) {
#line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_tmp0_ = self->priv->entry_map;
#line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = event;
-#line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp3_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, &_tmp2_);
+ _tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), event, &_tmp1_);
#line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (entry);
#line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- entry = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_ENTRY, SidebarEntry);
+ entry = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry);
#line 280 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- removed = _tmp3_;
+ removed = _tmp2_;
#line 281 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp4_ = removed;
+ _tmp3_ = removed;
#line 281 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _vala_assert (_tmp4_, "removed");
+ _vala_assert (_tmp3_, "removed");
#line 283 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp5_ = entry;
+ _tmp4_ = entry;
#line 283 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp6_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp5_);
+ _tmp5_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp4_);
#line 283 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- parent = _tmp6_;
+ parent = _tmp5_;
#line 284 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp7_ = parent;
+ _tmp6_ = parent;
#line 284 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _vala_assert (_tmp7_ != NULL, "parent != null");
+ _vala_assert (_tmp6_ != NULL, "parent != null");
#line 286 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp8_ = entry;
+ _tmp7_ = entry;
#line 286 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp8_);
+ sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp7_);
#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
while (TRUE) {
-#line 2570 "EventsBranch.c"
- gboolean _tmp9_ = FALSE;
- SidebarEntry* _tmp10_;
- gint _tmp11_;
+#line 2549 "EventsBranch.c"
+ gboolean _tmp8_ = FALSE;
+ SidebarEntry* _tmp9_;
SidebarEntry* grandparent = NULL;
+ SidebarEntry* _tmp13_;
+ SidebarEntry* _tmp14_;
SidebarEntry* _tmp15_;
SidebarEntry* _tmp16_;
SidebarEntry* _tmp17_;
SidebarEntry* _tmp18_;
- SidebarEntry* _tmp19_;
- SidebarEntry* _tmp20_;
-#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp10_ = parent;
#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp11_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp10_);
+ _tmp9_ = parent;
#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp11_ == 0) {
-#line 2587 "EventsBranch.c"
+ if (sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp9_) == 0) {
+#line 2563 "EventsBranch.c"
+ SidebarEntry* _tmp10_;
+ SidebarEntry* _tmp11_;
SidebarEntry* _tmp12_;
- SidebarEntry* _tmp13_;
- SidebarEntry* _tmp14_;
#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp12_ = parent;
+ _tmp10_ = parent;
#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp13_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+ _tmp11_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp14_ = _tmp13_;
+ _tmp12_ = _tmp11_;
#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp9_ = _tmp12_ != _tmp14_;
+ _tmp8_ = _tmp10_ != _tmp12_;
#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp14_);
-#line 2601 "EventsBranch.c"
+ _g_object_unref0 (_tmp12_);
+#line 2577 "EventsBranch.c"
} else {
#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp9_ = FALSE;
-#line 2605 "EventsBranch.c"
+ _tmp8_ = FALSE;
+#line 2581 "EventsBranch.c"
}
#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (!_tmp9_) {
+ if (!_tmp8_) {
#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
break;
-#line 2611 "EventsBranch.c"
+#line 2587 "EventsBranch.c"
}
#line 290 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp15_ = parent;
+ _tmp13_ = parent;
#line 290 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp16_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp15_);
+ _tmp14_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp13_);
#line 290 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- grandparent = _tmp16_;
+ grandparent = _tmp14_;
#line 291 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp17_ = grandparent;
+ _tmp15_ = grandparent;
#line 291 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _vala_assert (_tmp17_ != NULL, "grandparent != null");
+ _vala_assert (_tmp15_ != NULL, "grandparent != null");
#line 293 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp18_ = parent;
+ _tmp16_ = parent;
#line 293 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp18_);
+ sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp16_);
#line 295 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp19_ = grandparent;
+ _tmp17_ = grandparent;
#line 295 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp20_ = _g_object_ref0 (_tmp19_);
+ _tmp18_ = _g_object_ref0 (_tmp17_);
#line 295 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (parent);
#line 295 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- parent = _tmp20_;
+ parent = _tmp18_;
#line 289 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (grandparent);
-#line 2637 "EventsBranch.c"
+#line 2613 "EventsBranch.c"
}
#line 276 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (parent);
#line 276 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (entry);
-#line 2643 "EventsBranch.c"
+#line 2619 "EventsBranch.c"
}
-static Block8Data* block8_data_ref (Block8Data* _data8_) {
+static Block8Data*
+block8_data_ref (Block8Data* _data8_)
+{
#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_atomic_int_inc (&_data8_->_ref_count_);
#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return _data8_;
-#line 2652 "EventsBranch.c"
+#line 2630 "EventsBranch.c"
}
-static void block8_data_unref (void * _userdata_) {
+static void
+block8_data_unref (void * _userdata_)
+{
Block8Data* _data8_;
_data8_ = (Block8Data*) _userdata_;
#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
if (g_atomic_int_dec_and_test (&_data8_->_ref_count_)) {
-#line 2661 "EventsBranch.c"
+#line 2641 "EventsBranch.c"
EventsBranch* self;
#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self = _data8_->self;
@@ -2665,56 +2645,60 @@ static void block8_data_unref (void * _userdata_) {
_g_object_unref0 (self);
#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_slice_free (Block8Data, _data8_);
-#line 2669 "EventsBranch.c"
+#line 2649 "EventsBranch.c"
}
}
-static gboolean __lambda21_ (Block8Data* _data8_, SidebarEntry* entry) {
+static gboolean
+__lambda21_ (Block8Data* _data8_,
+ SidebarEntry* entry)
+{
EventsBranch* self;
gboolean result = FALSE;
- SidebarEntry* _tmp0_;
- gint _tmp1_;
- gint _tmp2_;
+ gint _tmp0_;
#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self = _data8_->self;
#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
#line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp0_ = entry;
+ _tmp0_ = _data8_->event_month;
#line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry));
-#line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = _data8_->event_month;
-#line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- result = _tmp1_ == _tmp2_;
+ result = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (entry, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry)) == _tmp0_;
#line 309 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 2694 "EventsBranch.c"
+#line 2671 "EventsBranch.c"
}
-static gboolean ___lambda21__locator (gconstpointer item, gpointer self) {
+static gboolean
+___lambda21__locator (gconstpointer item,
+ gpointer self)
+{
gboolean result;
result = __lambda21_ (self, (SidebarEntry*) item);
#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 2703 "EventsBranch.c"
+#line 2683 "EventsBranch.c"
}
-static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* event, struct tm* event_tm, SidebarEntry* * found_year) {
+static SidebarEntry*
+events_branch_find_event_month (EventsBranch* self,
+ Event* event,
+ struct tm* event_tm,
+ SidebarEntry* * found_year)
+{
SidebarEntry* _vala_found_year = NULL;
SidebarEntry* result = NULL;
Block8Data* _data8_;
- Event* _tmp0_;
- struct tm _tmp1_;
+ struct tm _tmp0_;
+ SidebarEntry* _tmp1_;
SidebarEntry* _tmp2_;
- SidebarEntry* _tmp3_;
- struct tm _tmp4_;
- gint _tmp5_;
+ struct tm _tmp3_;
+ gint _tmp4_;
+ SidebarEntry* _tmp5_;
SidebarEntry* _tmp6_;
- SidebarEntry* _tmp7_;
#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL);
#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -2728,19 +2712,17 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event*
#line 299 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_data8_->self = g_object_ref (self);
#line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp0_ = event;
-#line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = *event_tm;
+ _tmp0_ = *event_tm;
#line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = events_branch_find_event_year (self, _tmp0_, &_tmp1_);
+ _tmp1_ = events_branch_find_event_year (self, event, &_tmp0_);
#line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (_vala_found_year);
#line 301 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _vala_found_year = _tmp2_;
+ _vala_found_year = _tmp1_;
#line 302 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp3_ = _vala_found_year;
+ _tmp2_ = _vala_found_year;
#line 302 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp3_ == NULL) {
+ if (_tmp2_ == NULL) {
#line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
result = NULL;
#line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -2751,28 +2733,28 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event*
if (found_year) {
#line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
*found_year = _vala_found_year;
-#line 2755 "EventsBranch.c"
+#line 2737 "EventsBranch.c"
} else {
#line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (_vala_found_year);
-#line 2759 "EventsBranch.c"
+#line 2741 "EventsBranch.c"
}
#line 303 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 2763 "EventsBranch.c"
+#line 2745 "EventsBranch.c"
}
#line 305 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp4_ = *event_tm;
+ _tmp3_ = *event_tm;
#line 305 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp5_ = _tmp4_.tm_mon;
+ _tmp4_ = _tmp3_.tm_mon;
#line 305 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _data8_->event_month = _tmp5_ + 1;
+ _data8_->event_month = _tmp4_ + 1;
#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp6_ = _vala_found_year;
+ _tmp5_ = _vala_found_year;
#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp7_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp6_, ___lambda21__locator, _data8_);
+ _tmp6_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp5_, ___lambda21__locator, _data8_);
#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- result = _tmp7_;
+ result = _tmp6_;
#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
block8_data_unref (_data8_);
#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -2781,33 +2763,37 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event*
if (found_year) {
#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
*found_year = _vala_found_year;
-#line 2785 "EventsBranch.c"
+#line 2767 "EventsBranch.c"
} else {
#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (_vala_found_year);
-#line 2789 "EventsBranch.c"
+#line 2771 "EventsBranch.c"
}
#line 308 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 2793 "EventsBranch.c"
+#line 2775 "EventsBranch.c"
}
-static Block9Data* block9_data_ref (Block9Data* _data9_) {
+static Block9Data*
+block9_data_ref (Block9Data* _data9_)
+{
#line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_atomic_int_inc (&_data9_->_ref_count_);
#line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return _data9_;
-#line 2802 "EventsBranch.c"
+#line 2786 "EventsBranch.c"
}
-static void block9_data_unref (void * _userdata_) {
+static void
+block9_data_unref (void * _userdata_)
+{
Block9Data* _data9_;
_data9_ = (Block9Data*) _userdata_;
#line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) {
-#line 2811 "EventsBranch.c"
+#line 2797 "EventsBranch.c"
EventsBranch* self;
#line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self = _data9_->self;
@@ -2815,48 +2801,42 @@ static void block9_data_unref (void * _userdata_) {
_g_object_unref0 (self);
#line 313 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_slice_free (Block9Data, _data9_);
-#line 2819 "EventsBranch.c"
+#line 2805 "EventsBranch.c"
}
}
-static gboolean __lambda20_ (Block9Data* _data9_, SidebarEntry* entry) {
+static gboolean
+__lambda20_ (Block9Data* _data9_,
+ SidebarEntry* entry)
+{
EventsBranch* self;
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
- SidebarEntry* _tmp2_;
#line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self = _data9_->self;
#line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = entry;
-#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) {
+ if (G_TYPE_CHECK_INSTANCE_TYPE (entry, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) {
#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_tmp1_ = TRUE;
-#line 2840 "EventsBranch.c"
+#line 2826 "EventsBranch.c"
} else {
- SidebarEntry* _tmp3_;
-#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp3_ = entry;
#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, EVENTS_TYPE_NO_EVENT_ENTRY);
-#line 2847 "EventsBranch.c"
+ _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (entry, EVENTS_TYPE_NO_EVENT_ENTRY);
+#line 2830 "EventsBranch.c"
}
#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
if (_tmp1_) {
#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_tmp0_ = TRUE;
-#line 2853 "EventsBranch.c"
+#line 2836 "EventsBranch.c"
} else {
- SidebarEntry* _tmp4_;
#line 318 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp4_ = entry;
-#line 318 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY);
-#line 2860 "EventsBranch.c"
+ _tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (entry, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY);
+#line 2840 "EventsBranch.c"
}
#line 317 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
if (_tmp0_) {
@@ -2864,33 +2844,34 @@ static gboolean __lambda20_ (Block9Data* _data9_, SidebarEntry* entry) {
result = FALSE;
#line 319 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 2868 "EventsBranch.c"
+#line 2848 "EventsBranch.c"
} else {
- SidebarEntry* _tmp5_;
- gint _tmp6_;
-#line 321 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp5_ = entry;
#line 321 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp6_ = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry));
-#line 321 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- result = _tmp6_ == _data9_->event_year;
+ result = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (entry, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry)) == _data9_->event_year;
#line 321 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 2880 "EventsBranch.c"
+#line 2854 "EventsBranch.c"
}
}
-static gboolean ___lambda20__locator (gconstpointer item, gpointer self) {
+static gboolean
+___lambda20__locator (gconstpointer item,
+ gpointer self)
+{
gboolean result;
result = __lambda20_ (self, (SidebarEntry*) item);
#line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 2890 "EventsBranch.c"
+#line 2867 "EventsBranch.c"
}
-static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* event, struct tm* event_tm) {
+static SidebarEntry*
+events_branch_find_event_year (EventsBranch* self,
+ Event* event,
+ struct tm* event_tm)
+{
SidebarEntry* result = NULL;
Block9Data* _data9_;
struct tm _tmp0_;
@@ -2935,24 +2916,28 @@ static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* e
_data9_ = NULL;
#line 316 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 2939 "EventsBranch.c"
+#line 2920 "EventsBranch.c"
}
-static gint _events_branch_undated_event_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
+static gint
+_events_branch_undated_event_comparator_gcompare_func (gconstpointer a,
+ gconstpointer b)
+{
gint result;
result = events_branch_undated_event_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
#line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 2948 "EventsBranch.c"
+#line 2932 "EventsBranch.c"
}
-static void events_branch_add_undated_event (EventsBranch* self, Event* event) {
+static void
+events_branch_add_undated_event (EventsBranch* self,
+ Event* event)
+{
EventsUndatedDirectoryEntry* _tmp0_;
- gboolean _tmp1_;
- EventsUndatedDirectoryEntry* _tmp5_;
- Event* _tmp6_;
+ EventsUndatedDirectoryEntry* _tmp4_;
#line 325 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 325 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -2960,40 +2945,37 @@ static void events_branch_add_undated_event (EventsBranch* self, Event* event) {
#line 326 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_tmp0_ = self->priv->undated_entry;
#line 326 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 326 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (!_tmp1_) {
-#line 2967 "EventsBranch.c"
+ if (!sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry))) {
+#line 2950 "EventsBranch.c"
+ SidebarEntry* _tmp1_;
SidebarEntry* _tmp2_;
- SidebarEntry* _tmp3_;
- EventsUndatedDirectoryEntry* _tmp4_;
+ EventsUndatedDirectoryEntry* _tmp3_;
#line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+ _tmp1_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
#line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp4_ = self->priv->undated_entry;
+ _tmp3_ = self->priv->undated_entry;
#line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _events_branch_undated_event_comparator_gcompare_func);
+ sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _events_branch_undated_event_comparator_gcompare_func);
#line 327 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp3_);
-#line 2981 "EventsBranch.c"
+ _g_object_unref0 (_tmp2_);
+#line 2964 "EventsBranch.c"
}
#line 329 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp5_ = self->priv->undated_entry;
-#line 329 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp6_ = event;
+ _tmp4_ = self->priv->undated_entry;
#line 329 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- events_branch_graft_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp6_, NULL);
-#line 2989 "EventsBranch.c"
+ events_branch_graft_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), event, NULL);
+#line 2970 "EventsBranch.c"
}
-static void events_branch_move_to_undated_event (EventsBranch* self, Event* event) {
+static void
+events_branch_move_to_undated_event (EventsBranch* self,
+ Event* event)
+{
EventsUndatedDirectoryEntry* _tmp0_;
- gboolean _tmp1_;
- Event* _tmp5_;
- EventsUndatedDirectoryEntry* _tmp6_;
+ EventsUndatedDirectoryEntry* _tmp4_;
#line 332 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 332 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -3001,43 +2983,40 @@ static void events_branch_move_to_undated_event (EventsBranch* self, Event* even
#line 333 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_tmp0_ = self->priv->undated_entry;
#line 333 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 333 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (!_tmp1_) {
-#line 3008 "EventsBranch.c"
+ if (!sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry))) {
+#line 2988 "EventsBranch.c"
+ SidebarEntry* _tmp1_;
SidebarEntry* _tmp2_;
- SidebarEntry* _tmp3_;
- EventsUndatedDirectoryEntry* _tmp4_;
+ EventsUndatedDirectoryEntry* _tmp3_;
#line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+ _tmp1_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
#line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp4_ = self->priv->undated_entry;
+ _tmp3_ = self->priv->undated_entry;
#line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
+ sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
#line 334 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp3_);
-#line 3022 "EventsBranch.c"
+ _g_object_unref0 (_tmp2_);
+#line 3002 "EventsBranch.c"
}
#line 336 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp5_ = event;
+ _tmp4_ = self->priv->undated_entry;
#line 336 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp6_ = self->priv->undated_entry;
-#line 336 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- events_branch_reparent_event (self, _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 3030 "EventsBranch.c"
+ events_branch_reparent_event (self, event, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+#line 3008 "EventsBranch.c"
}
-static void events_branch_graft_event (EventsBranch* self, SidebarEntry* parent, Event* event, GCompareFunc comparator) {
+static void
+events_branch_graft_event (EventsBranch* self,
+ SidebarEntry* parent,
+ Event* event,
+ GCompareFunc comparator)
+{
EventsEventEntry* entry = NULL;
- Event* _tmp0_;
- EventsEventEntry* _tmp1_;
- GeeHashMap* _tmp2_;
- Event* _tmp3_;
- SidebarEntry* _tmp4_;
- GCompareFunc _tmp5_;
+ EventsEventEntry* _tmp0_;
+ GeeHashMap* _tmp1_;
#line 339 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 339 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -3045,41 +3024,35 @@ static void events_branch_graft_event (EventsBranch* self, SidebarEntry* parent,
#line 339 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_if_fail (IS_EVENT (event));
#line 341 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp0_ = event;
-#line 341 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = events_event_entry_new (_tmp0_);
+ _tmp0_ = events_event_entry_new (event);
#line 341 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- entry = _tmp1_;
-#line 342 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = self->priv->entry_map;
+ entry = _tmp0_;
#line 342 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp3_ = event;
+ _tmp1_ = self->priv->entry_map;
#line 342 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, entry);
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), event, entry);
#line 344 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp4_ = parent;
-#line 344 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp5_ = comparator;
-#line 344 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp5_);
+ sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), parent, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), comparator);
#line 339 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (entry);
-#line 3068 "EventsBranch.c"
+#line 3039 "EventsBranch.c"
}
-static void events_branch_reparent_event (EventsBranch* self, Event* event, SidebarEntry* new_parent) {
+static void
+events_branch_reparent_event (EventsBranch* self,
+ Event* event,
+ SidebarEntry* new_parent)
+{
EventsEventEntry* entry = NULL;
GeeHashMap* _tmp0_;
- Event* _tmp1_;
- gpointer _tmp2_;
- EventsEventEntry* _tmp3_;
+ gpointer _tmp1_;
+ EventsEventEntry* _tmp2_;
SidebarEntry* old_parent = NULL;
- EventsEventEntry* _tmp4_;
+ EventsEventEntry* _tmp3_;
+ SidebarEntry* _tmp4_;
SidebarEntry* _tmp5_;
- SidebarEntry* _tmp6_;
- SidebarEntry* _tmp7_;
- EventsEventEntry* _tmp8_;
+ EventsEventEntry* _tmp6_;
#line 347 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 347 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -3089,188 +3062,174 @@ static void events_branch_reparent_event (EventsBranch* self, Event* event, Side
#line 348 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_tmp0_ = self->priv->entry_map;
#line 348 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = event;
-#line 348 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
+ _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), event);
#line 348 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- entry = (EventsEventEntry*) _tmp2_;
+ entry = (EventsEventEntry*) _tmp1_;
#line 349 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp3_ = entry;
+ _tmp2_ = entry;
#line 349 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _vala_assert (_tmp3_ != NULL, "entry != null");
+ _vala_assert (_tmp2_ != NULL, "entry != null");
#line 351 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp4_ = entry;
+ _tmp3_ = entry;
#line 351 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp5_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+ _tmp4_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
#line 351 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- old_parent = _tmp5_;
+ old_parent = _tmp4_;
#line 352 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp6_ = old_parent;
+ _tmp5_ = old_parent;
#line 352 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _vala_assert (_tmp6_ != NULL, "old_parent != null");
-#line 354 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp7_ = new_parent;
+ _vala_assert (_tmp5_ != NULL, "old_parent != null");
#line 354 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp8_ = entry;
+ _tmp6_ = entry;
#line 354 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- sidebar_branch_reparent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+ sidebar_branch_reparent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), new_parent, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
while (TRUE) {
-#line 3120 "EventsBranch.c"
- gboolean _tmp9_ = FALSE;
- SidebarEntry* _tmp10_;
- gint _tmp11_;
+#line 3089 "EventsBranch.c"
+ gboolean _tmp7_ = FALSE;
+ SidebarEntry* _tmp8_;
SidebarEntry* grandparent = NULL;
+ SidebarEntry* _tmp12_;
+ SidebarEntry* _tmp13_;
+ SidebarEntry* _tmp14_;
SidebarEntry* _tmp15_;
SidebarEntry* _tmp16_;
SidebarEntry* _tmp17_;
- SidebarEntry* _tmp18_;
- SidebarEntry* _tmp19_;
- SidebarEntry* _tmp20_;
#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp10_ = old_parent;
+ _tmp8_ = old_parent;
#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp11_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp10_);
+ if (sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp8_) == 0) {
+#line 3103 "EventsBranch.c"
+ SidebarEntry* _tmp9_;
+ SidebarEntry* _tmp10_;
+ SidebarEntry* _tmp11_;
#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp11_ == 0) {
-#line 3137 "EventsBranch.c"
- SidebarEntry* _tmp12_;
- SidebarEntry* _tmp13_;
- SidebarEntry* _tmp14_;
-#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp12_ = old_parent;
+ _tmp9_ = old_parent;
#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp13_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+ _tmp10_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp14_ = _tmp13_;
+ _tmp11_ = _tmp10_;
#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp9_ = _tmp12_ != _tmp14_;
+ _tmp7_ = _tmp9_ != _tmp11_;
#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp14_);
-#line 3151 "EventsBranch.c"
+ _g_object_unref0 (_tmp11_);
+#line 3117 "EventsBranch.c"
} else {
#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp9_ = FALSE;
-#line 3155 "EventsBranch.c"
+ _tmp7_ = FALSE;
+#line 3121 "EventsBranch.c"
}
#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (!_tmp9_) {
+ if (!_tmp7_) {
#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
break;
-#line 3161 "EventsBranch.c"
+#line 3127 "EventsBranch.c"
}
#line 357 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp15_ = old_parent;
+ _tmp12_ = old_parent;
#line 357 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp16_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp15_);
+ _tmp13_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp12_);
#line 357 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- grandparent = _tmp16_;
+ grandparent = _tmp13_;
#line 358 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp17_ = grandparent;
+ _tmp14_ = grandparent;
#line 358 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _vala_assert (_tmp17_ != NULL, "grandparent != null");
+ _vala_assert (_tmp14_ != NULL, "grandparent != null");
#line 360 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp18_ = old_parent;
+ _tmp15_ = old_parent;
#line 360 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp18_);
+ sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp15_);
#line 362 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp19_ = grandparent;
+ _tmp16_ = grandparent;
#line 362 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp20_ = _g_object_ref0 (_tmp19_);
+ _tmp17_ = _g_object_ref0 (_tmp16_);
#line 362 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (old_parent);
#line 362 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- old_parent = _tmp20_;
+ old_parent = _tmp17_;
#line 356 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (grandparent);
-#line 3187 "EventsBranch.c"
+#line 3153 "EventsBranch.c"
}
#line 347 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (old_parent);
#line 347 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (entry);
-#line 3193 "EventsBranch.c"
+#line 3159 "EventsBranch.c"
}
-static void events_branch_show_no_events (EventsBranch* self, gboolean show) {
+static void
+events_branch_show_no_events (EventsBranch* self,
+ gboolean show)
+{
gboolean _tmp0_ = FALSE;
- gboolean _tmp1_;
#line 366 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = show;
-#line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp1_) {
-#line 3206 "EventsBranch.c"
- EventsNoEventEntry* _tmp2_;
- gboolean _tmp3_;
-#line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = self->priv->no_event_entry;
+ if (show) {
+#line 3172 "EventsBranch.c"
+ EventsNoEventEntry* _tmp1_;
#line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp3_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+ _tmp1_ = self->priv->no_event_entry;
#line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp0_ = !_tmp3_;
-#line 3215 "EventsBranch.c"
+ _tmp0_ = !sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+#line 3178 "EventsBranch.c"
} else {
#line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_tmp0_ = FALSE;
-#line 3219 "EventsBranch.c"
+#line 3182 "EventsBranch.c"
}
#line 367 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
if (_tmp0_) {
-#line 3223 "EventsBranch.c"
- SidebarEntry* _tmp4_;
- SidebarEntry* _tmp5_;
- EventsNoEventEntry* _tmp6_;
+#line 3186 "EventsBranch.c"
+ SidebarEntry* _tmp2_;
+ SidebarEntry* _tmp3_;
+ EventsNoEventEntry* _tmp4_;
#line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp4_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+ _tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
#line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp5_ = _tmp4_;
+ _tmp3_ = _tmp2_;
#line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp6_ = self->priv->no_event_entry;
+ _tmp4_ = self->priv->no_event_entry;
#line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
+ sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
#line 368 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp5_);
-#line 3237 "EventsBranch.c"
+ _g_object_unref0 (_tmp3_);
+#line 3200 "EventsBranch.c"
} else {
- gboolean _tmp7_ = FALSE;
- gboolean _tmp8_;
+ gboolean _tmp5_ = FALSE;
#line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp8_ = show;
+ if (!show) {
+#line 3205 "EventsBranch.c"
+ EventsNoEventEntry* _tmp6_;
#line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (!_tmp8_) {
-#line 3245 "EventsBranch.c"
- EventsNoEventEntry* _tmp9_;
- gboolean _tmp10_;
+ _tmp6_ = self->priv->no_event_entry;
#line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp9_ = self->priv->no_event_entry;
-#line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp10_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp7_ = _tmp10_;
-#line 3254 "EventsBranch.c"
+ _tmp5_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+#line 3211 "EventsBranch.c"
} else {
#line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp7_ = FALSE;
-#line 3258 "EventsBranch.c"
+ _tmp5_ = FALSE;
+#line 3215 "EventsBranch.c"
}
#line 369 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp7_) {
-#line 3262 "EventsBranch.c"
- EventsNoEventEntry* _tmp11_;
+ if (_tmp5_) {
+#line 3219 "EventsBranch.c"
+ EventsNoEventEntry* _tmp7_;
#line 370 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp11_ = self->priv->no_event_entry;
+ _tmp7_ = self->priv->no_event_entry;
#line 370 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 3268 "EventsBranch.c"
+ sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+#line 3225 "EventsBranch.c"
}
}
}
-static void events_branch_class_init (EventsBranchClass * klass) {
+static void
+events_branch_class_init (EventsBranchClass * klass)
+{
gchar* _tmp0_;
gchar* _tmp1_;
gchar* _tmp2_;
@@ -3297,11 +3256,13 @@ static void events_branch_class_init (EventsBranchClass * klass) {
_tmp3_ = g_strdup (RESOURCES_ICON_NO_EVENT);
#line 11 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
events_branch_no_event_icon = _tmp3_;
-#line 3301 "EventsBranch.c"
+#line 3260 "EventsBranch.c"
}
-static void events_branch_instance_init (EventsBranch * self) {
+static void
+events_branch_instance_init (EventsBranch * self)
+{
GeeHashMap* _tmp0_;
EventsUndatedDirectoryEntry* _tmp1_;
EventsNoEventEntry* _tmp2_;
@@ -3324,11 +3285,13 @@ static void events_branch_instance_init (EventsBranch * self) {
_tmp3_ = events_master_directory_entry_new ();
#line 22 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self->priv->all_events_entry = _tmp3_;
-#line 3328 "EventsBranch.c"
+#line 3289 "EventsBranch.c"
}
-static void events_branch_finalize (GObject * obj) {
+static void
+events_branch_finalize (GObject * obj)
+{
EventsBranch * self;
EventSourceCollection* _tmp0_;
guint _tmp1_;
@@ -3379,11 +3342,13 @@ static void events_branch_finalize (GObject * obj) {
_g_object_unref0 (self->priv->all_events_entry);
#line 7 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
G_OBJECT_CLASS (events_branch_parent_class)->finalize (obj);
-#line 3383 "EventsBranch.c"
+#line 3346 "EventsBranch.c"
}
-GType events_branch_get_type (void) {
+GType
+events_branch_get_type (void)
+{
static volatile gsize events_branch_type_id__volatile = 0;
if (g_once_init_enter (&events_branch_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (EventsBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsBranch), 0, (GInstanceInitFunc) events_branch_instance_init, NULL };
@@ -3395,17 +3360,21 @@ GType events_branch_get_type (void) {
}
-EventsDirectoryEntry* events_directory_entry_construct (GType object_type) {
+EventsDirectoryEntry*
+events_directory_entry_construct (GType object_type)
+{
EventsDirectoryEntry * self = NULL;
#line 375 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self = (EventsDirectoryEntry*) sidebar_simple_page_entry_construct (object_type);
#line 375 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return self;
-#line 3405 "EventsBranch.c"
+#line 3372 "EventsBranch.c"
}
-static gchar* events_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
+static gchar*
+events_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base)
+{
EventsDirectoryEntry * self;
gchar* result = NULL;
const gchar* _tmp0_;
@@ -3420,11 +3389,13 @@ static gchar* events_directory_entry_real_get_sidebar_icon (SidebarSimplePageEnt
result = _tmp1_;
#line 379 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 3424 "EventsBranch.c"
+#line 3393 "EventsBranch.c"
}
-static gboolean events_directory_entry_real_expand_on_select (SidebarExpandableEntry* base) {
+static gboolean
+events_directory_entry_real_expand_on_select (SidebarExpandableEntry* base)
+{
EventsDirectoryEntry * self;
gboolean result = FALSE;
#line 382 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -3433,33 +3404,41 @@ static gboolean events_directory_entry_real_expand_on_select (SidebarExpandableE
result = TRUE;
#line 383 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 3437 "EventsBranch.c"
+#line 3408 "EventsBranch.c"
}
-static void events_directory_entry_class_init (EventsDirectoryEntryClass * klass) {
+static void
+events_directory_entry_class_init (EventsDirectoryEntryClass * klass)
+{
#line 374 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
events_directory_entry_parent_class = g_type_class_peek_parent (klass);
#line 374 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_directory_entry_real_get_sidebar_icon;
-#line 3446 "EventsBranch.c"
+#line 3419 "EventsBranch.c"
}
-static void events_directory_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) {
+static void
+events_directory_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface)
+{
#line 374 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
events_directory_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface);
#line 374 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) events_directory_entry_real_expand_on_select;
-#line 3455 "EventsBranch.c"
+#line 3430 "EventsBranch.c"
}
-static void events_directory_entry_instance_init (EventsDirectoryEntry * self) {
+static void
+events_directory_entry_instance_init (EventsDirectoryEntry * self)
+{
}
-GType events_directory_entry_get_type (void) {
+GType
+events_directory_entry_get_type (void)
+{
static volatile gsize events_directory_entry_type_id__volatile = 0;
if (g_once_init_enter (&events_directory_entry_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (EventsDirectoryEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_directory_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsDirectoryEntry), 0, (GInstanceInitFunc) events_directory_entry_instance_init, NULL };
@@ -3473,24 +3452,30 @@ GType events_directory_entry_get_type (void) {
}
-EventsMasterDirectoryEntry* events_master_directory_entry_construct (GType object_type) {
+EventsMasterDirectoryEntry*
+events_master_directory_entry_construct (GType object_type)
+{
EventsMasterDirectoryEntry * self = NULL;
#line 388 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self = (EventsMasterDirectoryEntry*) events_directory_entry_construct (object_type);
#line 388 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return self;
-#line 3483 "EventsBranch.c"
+#line 3464 "EventsBranch.c"
}
-EventsMasterDirectoryEntry* events_master_directory_entry_new (void) {
+EventsMasterDirectoryEntry*
+events_master_directory_entry_new (void)
+{
#line 388 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return events_master_directory_entry_construct (EVENTS_TYPE_MASTER_DIRECTORY_ENTRY);
-#line 3490 "EventsBranch.c"
+#line 3473 "EventsBranch.c"
}
-static gchar* events_master_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+static gchar*
+events_master_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base)
+{
EventsMasterDirectoryEntry * self;
gchar* result = NULL;
gchar* _tmp0_;
@@ -3502,11 +3487,13 @@ static gchar* events_master_directory_entry_real_get_sidebar_name (SidebarSimple
result = _tmp0_;
#line 392 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 3506 "EventsBranch.c"
+#line 3491 "EventsBranch.c"
}
-static gchar* events_master_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
+static gchar*
+events_master_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base)
+{
EventsMasterDirectoryEntry * self;
gchar* result = NULL;
const gchar* _tmp0_;
@@ -3521,11 +3508,13 @@ static gchar* events_master_directory_entry_real_get_sidebar_icon (SidebarSimple
result = _tmp1_;
#line 396 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 3525 "EventsBranch.c"
+#line 3512 "EventsBranch.c"
}
-static Page* events_master_directory_entry_real_create_page (SidebarSimplePageEntry* base) {
+static Page*
+events_master_directory_entry_real_create_page (SidebarSimplePageEntry* base)
+{
EventsMasterDirectoryEntry * self;
Page* result = NULL;
MasterEventsDirectoryPage* _tmp0_;
@@ -3539,11 +3528,13 @@ static Page* events_master_directory_entry_real_create_page (SidebarSimplePageEn
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
#line 400 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 3543 "EventsBranch.c"
+#line 3532 "EventsBranch.c"
}
-static void events_master_directory_entry_class_init (EventsMasterDirectoryEntryClass * klass) {
+static void
+events_master_directory_entry_class_init (EventsMasterDirectoryEntryClass * klass)
+{
#line 387 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
events_master_directory_entry_parent_class = g_type_class_peek_parent (klass);
#line 387 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -3552,15 +3543,19 @@ static void events_master_directory_entry_class_init (EventsMasterDirectoryEntry
((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_master_directory_entry_real_get_sidebar_icon;
#line 387 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_master_directory_entry_real_create_page;
-#line 3556 "EventsBranch.c"
+#line 3547 "EventsBranch.c"
}
-static void events_master_directory_entry_instance_init (EventsMasterDirectoryEntry * self) {
+static void
+events_master_directory_entry_instance_init (EventsMasterDirectoryEntry * self)
+{
}
-GType events_master_directory_entry_get_type (void) {
+GType
+events_master_directory_entry_get_type (void)
+{
static volatile gsize events_master_directory_entry_type_id__volatile = 0;
if (g_once_init_enter (&events_master_directory_entry_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (EventsMasterDirectoryEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_master_directory_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsMasterDirectoryEntry), 0, (GInstanceInitFunc) events_master_directory_entry_instance_init, NULL };
@@ -3572,11 +3567,14 @@ GType events_master_directory_entry_get_type (void) {
}
-EventsYearDirectoryEntry* events_year_directory_entry_construct (GType object_type, const gchar* name, struct tm* tm) {
+EventsYearDirectoryEntry*
+events_year_directory_entry_construct (GType object_type,
+ const gchar* name,
+ struct tm* tm)
+{
EventsYearDirectoryEntry * self = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
- struct tm _tmp2_;
+ gchar* _tmp0_;
+ struct tm _tmp1_;
#line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -3584,31 +3582,34 @@ EventsYearDirectoryEntry* events_year_directory_entry_construct (GType object_ty
#line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self = (EventsYearDirectoryEntry*) events_directory_entry_construct (object_type);
#line 409 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp0_ = name;
-#line 409 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (name);
#line 409 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_free0 (self->priv->name);
#line 409 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- self->priv->name = _tmp1_;
+ self->priv->name = _tmp0_;
#line 410 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = *tm;
+ _tmp1_ = *tm;
#line 410 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- self->priv->tm = _tmp2_;
+ self->priv->tm = _tmp1_;
#line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return self;
-#line 3601 "EventsBranch.c"
+#line 3597 "EventsBranch.c"
}
-EventsYearDirectoryEntry* events_year_directory_entry_new (const gchar* name, struct tm* tm) {
+EventsYearDirectoryEntry*
+events_year_directory_entry_new (const gchar* name,
+ struct tm* tm)
+{
#line 408 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return events_year_directory_entry_construct (EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, name, tm);
-#line 3608 "EventsBranch.c"
+#line 3607 "EventsBranch.c"
}
-static gchar* events_year_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+static gchar*
+events_year_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base)
+{
EventsYearDirectoryEntry * self;
gchar* result = NULL;
const gchar* _tmp0_;
@@ -3623,11 +3624,13 @@ static gchar* events_year_directory_entry_real_get_sidebar_name (SidebarSimplePa
result = _tmp1_;
#line 414 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 3627 "EventsBranch.c"
+#line 3628 "EventsBranch.c"
}
-gint events_year_directory_entry_get_year (EventsYearDirectoryEntry* self) {
+gint
+events_year_directory_entry_get_year (EventsYearDirectoryEntry* self)
+{
gint result = 0;
struct tm _tmp0_;
gint _tmp1_;
@@ -3641,11 +3644,13 @@ gint events_year_directory_entry_get_year (EventsYearDirectoryEntry* self) {
result = _tmp1_ + 1900;
#line 418 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 3645 "EventsBranch.c"
+#line 3648 "EventsBranch.c"
}
-static Page* events_year_directory_entry_real_create_page (SidebarSimplePageEntry* base) {
+static Page*
+events_year_directory_entry_real_create_page (SidebarSimplePageEntry* base)
+{
EventsYearDirectoryEntry * self;
Page* result = NULL;
struct tm _tmp0_;
@@ -3662,11 +3667,13 @@ static Page* events_year_directory_entry_real_create_page (SidebarSimplePageEntr
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
#line 422 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 3666 "EventsBranch.c"
+#line 3671 "EventsBranch.c"
}
-static void events_year_directory_entry_class_init (EventsYearDirectoryEntryClass * klass) {
+static void
+events_year_directory_entry_class_init (EventsYearDirectoryEntryClass * klass)
+{
#line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
events_year_directory_entry_parent_class = g_type_class_peek_parent (klass);
#line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -3677,18 +3684,22 @@ static void events_year_directory_entry_class_init (EventsYearDirectoryEntryClas
((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_year_directory_entry_real_create_page;
#line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
G_OBJECT_CLASS (klass)->finalize = events_year_directory_entry_finalize;
-#line 3681 "EventsBranch.c"
+#line 3688 "EventsBranch.c"
}
-static void events_year_directory_entry_instance_init (EventsYearDirectoryEntry * self) {
+static void
+events_year_directory_entry_instance_init (EventsYearDirectoryEntry * self)
+{
#line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self->priv = EVENTS_YEAR_DIRECTORY_ENTRY_GET_PRIVATE (self);
-#line 3688 "EventsBranch.c"
+#line 3697 "EventsBranch.c"
}
-static void events_year_directory_entry_finalize (GObject * obj) {
+static void
+events_year_directory_entry_finalize (GObject * obj)
+{
EventsYearDirectoryEntry * self;
#line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry);
@@ -3696,11 +3707,13 @@ static void events_year_directory_entry_finalize (GObject * obj) {
_g_free0 (self->priv->name);
#line 404 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
G_OBJECT_CLASS (events_year_directory_entry_parent_class)->finalize (obj);
-#line 3700 "EventsBranch.c"
+#line 3711 "EventsBranch.c"
}
-GType events_year_directory_entry_get_type (void) {
+GType
+events_year_directory_entry_get_type (void)
+{
static volatile gsize events_year_directory_entry_type_id__volatile = 0;
if (g_once_init_enter (&events_year_directory_entry_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (EventsYearDirectoryEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_year_directory_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsYearDirectoryEntry), 0, (GInstanceInitFunc) events_year_directory_entry_instance_init, NULL };
@@ -3712,11 +3725,14 @@ GType events_year_directory_entry_get_type (void) {
}
-EventsMonthDirectoryEntry* events_month_directory_entry_construct (GType object_type, const gchar* name, struct tm* tm) {
+EventsMonthDirectoryEntry*
+events_month_directory_entry_construct (GType object_type,
+ const gchar* name,
+ struct tm* tm)
+{
EventsMonthDirectoryEntry * self = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
- struct tm _tmp2_;
+ gchar* _tmp0_;
+ struct tm _tmp1_;
#line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -3724,31 +3740,34 @@ EventsMonthDirectoryEntry* events_month_directory_entry_construct (GType object_
#line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self = (EventsMonthDirectoryEntry*) events_directory_entry_construct (object_type);
#line 431 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp0_ = name;
-#line 431 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (name);
#line 431 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_free0 (self->priv->name);
#line 431 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- self->priv->name = _tmp1_;
+ self->priv->name = _tmp0_;
#line 432 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = *tm;
+ _tmp1_ = *tm;
#line 432 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- self->priv->tm = _tmp2_;
+ self->priv->tm = _tmp1_;
#line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return self;
-#line 3741 "EventsBranch.c"
+#line 3755 "EventsBranch.c"
}
-EventsMonthDirectoryEntry* events_month_directory_entry_new (const gchar* name, struct tm* tm) {
+EventsMonthDirectoryEntry*
+events_month_directory_entry_new (const gchar* name,
+ struct tm* tm)
+{
#line 430 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return events_month_directory_entry_construct (EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, name, tm);
-#line 3748 "EventsBranch.c"
+#line 3765 "EventsBranch.c"
}
-static gchar* events_month_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+static gchar*
+events_month_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base)
+{
EventsMonthDirectoryEntry * self;
gchar* result = NULL;
const gchar* _tmp0_;
@@ -3763,11 +3782,13 @@ static gchar* events_month_directory_entry_real_get_sidebar_name (SidebarSimpleP
result = _tmp1_;
#line 436 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 3767 "EventsBranch.c"
+#line 3786 "EventsBranch.c"
}
-gint events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self) {
+gint
+events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self)
+{
gint result = 0;
struct tm _tmp0_;
gint _tmp1_;
@@ -3781,11 +3802,13 @@ gint events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self) {
result = _tmp1_ + 1900;
#line 440 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 3785 "EventsBranch.c"
+#line 3806 "EventsBranch.c"
}
-gint events_month_directory_entry_get_month (EventsMonthDirectoryEntry* self) {
+gint
+events_month_directory_entry_get_month (EventsMonthDirectoryEntry* self)
+{
gint result = 0;
struct tm _tmp0_;
gint _tmp1_;
@@ -3799,11 +3822,13 @@ gint events_month_directory_entry_get_month (EventsMonthDirectoryEntry* self) {
result = _tmp1_ + 1;
#line 444 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 3803 "EventsBranch.c"
+#line 3826 "EventsBranch.c"
}
-static Page* events_month_directory_entry_real_create_page (SidebarSimplePageEntry* base) {
+static Page*
+events_month_directory_entry_real_create_page (SidebarSimplePageEntry* base)
+{
EventsMonthDirectoryEntry * self;
Page* result = NULL;
struct tm _tmp0_;
@@ -3820,11 +3845,13 @@ static Page* events_month_directory_entry_real_create_page (SidebarSimplePageEnt
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
#line 448 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 3824 "EventsBranch.c"
+#line 3849 "EventsBranch.c"
}
-static void events_month_directory_entry_class_init (EventsMonthDirectoryEntryClass * klass) {
+static void
+events_month_directory_entry_class_init (EventsMonthDirectoryEntryClass * klass)
+{
#line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
events_month_directory_entry_parent_class = g_type_class_peek_parent (klass);
#line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -3835,18 +3862,22 @@ static void events_month_directory_entry_class_init (EventsMonthDirectoryEntryCl
((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_month_directory_entry_real_create_page;
#line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
G_OBJECT_CLASS (klass)->finalize = events_month_directory_entry_finalize;
-#line 3839 "EventsBranch.c"
+#line 3866 "EventsBranch.c"
}
-static void events_month_directory_entry_instance_init (EventsMonthDirectoryEntry * self) {
+static void
+events_month_directory_entry_instance_init (EventsMonthDirectoryEntry * self)
+{
#line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self->priv = EVENTS_MONTH_DIRECTORY_ENTRY_GET_PRIVATE (self);
-#line 3846 "EventsBranch.c"
+#line 3875 "EventsBranch.c"
}
-static void events_month_directory_entry_finalize (GObject * obj) {
+static void
+events_month_directory_entry_finalize (GObject * obj)
+{
EventsMonthDirectoryEntry * self;
#line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry);
@@ -3854,11 +3885,13 @@ static void events_month_directory_entry_finalize (GObject * obj) {
_g_free0 (self->priv->name);
#line 426 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
G_OBJECT_CLASS (events_month_directory_entry_parent_class)->finalize (obj);
-#line 3858 "EventsBranch.c"
+#line 3889 "EventsBranch.c"
}
-GType events_month_directory_entry_get_type (void) {
+GType
+events_month_directory_entry_get_type (void)
+{
static volatile gsize events_month_directory_entry_type_id__volatile = 0;
if (g_once_init_enter (&events_month_directory_entry_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (EventsMonthDirectoryEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_month_directory_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsMonthDirectoryEntry), 0, (GInstanceInitFunc) events_month_directory_entry_instance_init, NULL };
@@ -3870,24 +3903,30 @@ GType events_month_directory_entry_get_type (void) {
}
-EventsUndatedDirectoryEntry* events_undated_directory_entry_construct (GType object_type) {
+EventsUndatedDirectoryEntry*
+events_undated_directory_entry_construct (GType object_type)
+{
EventsUndatedDirectoryEntry * self = NULL;
#line 453 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self = (EventsUndatedDirectoryEntry*) events_directory_entry_construct (object_type);
#line 453 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return self;
-#line 3880 "EventsBranch.c"
+#line 3915 "EventsBranch.c"
}
-EventsUndatedDirectoryEntry* events_undated_directory_entry_new (void) {
+EventsUndatedDirectoryEntry*
+events_undated_directory_entry_new (void)
+{
#line 453 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return events_undated_directory_entry_construct (EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY);
-#line 3887 "EventsBranch.c"
+#line 3924 "EventsBranch.c"
}
-static gchar* events_undated_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+static gchar*
+events_undated_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base)
+{
EventsUndatedDirectoryEntry * self;
gchar* result = NULL;
gchar* _tmp0_;
@@ -3899,11 +3938,13 @@ static gchar* events_undated_directory_entry_real_get_sidebar_name (SidebarSimpl
result = _tmp0_;
#line 457 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 3903 "EventsBranch.c"
+#line 3942 "EventsBranch.c"
}
-static Page* events_undated_directory_entry_real_create_page (SidebarSimplePageEntry* base) {
+static Page*
+events_undated_directory_entry_real_create_page (SidebarSimplePageEntry* base)
+{
EventsUndatedDirectoryEntry * self;
Page* result = NULL;
struct tm _tmp0_ = {0};
@@ -3920,26 +3961,32 @@ static Page* events_undated_directory_entry_real_create_page (SidebarSimplePageE
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
#line 461 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 3924 "EventsBranch.c"
+#line 3965 "EventsBranch.c"
}
-static void events_undated_directory_entry_class_init (EventsUndatedDirectoryEntryClass * klass) {
+static void
+events_undated_directory_entry_class_init (EventsUndatedDirectoryEntryClass * klass)
+{
#line 452 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
events_undated_directory_entry_parent_class = g_type_class_peek_parent (klass);
#line 452 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_undated_directory_entry_real_get_sidebar_name;
#line 452 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_undated_directory_entry_real_create_page;
-#line 3935 "EventsBranch.c"
+#line 3978 "EventsBranch.c"
}
-static void events_undated_directory_entry_instance_init (EventsUndatedDirectoryEntry * self) {
+static void
+events_undated_directory_entry_instance_init (EventsUndatedDirectoryEntry * self)
+{
}
-GType events_undated_directory_entry_get_type (void) {
+GType
+events_undated_directory_entry_get_type (void)
+{
static volatile gsize events_undated_directory_entry_type_id__volatile = 0;
if (g_once_init_enter (&events_undated_directory_entry_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (EventsUndatedDirectoryEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_undated_directory_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsUndatedDirectoryEntry), 0, (GInstanceInitFunc) events_undated_directory_entry_instance_init, NULL };
@@ -3951,36 +3998,40 @@ GType events_undated_directory_entry_get_type (void) {
}
-EventsEventEntry* events_event_entry_construct (GType object_type, Event* event) {
+EventsEventEntry*
+events_event_entry_construct (GType object_type,
+ Event* event)
+{
EventsEventEntry * self = NULL;
Event* _tmp0_;
- Event* _tmp1_;
#line 470 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_val_if_fail (IS_EVENT (event), NULL);
#line 470 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self = (EventsEventEntry*) sidebar_simple_page_entry_construct (object_type);
#line 471 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp0_ = event;
-#line 471 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (event);
#line 471 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (self->priv->event);
#line 471 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- self->priv->event = _tmp1_;
+ self->priv->event = _tmp0_;
#line 470 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return self;
-#line 3973 "EventsBranch.c"
+#line 4020 "EventsBranch.c"
}
-EventsEventEntry* events_event_entry_new (Event* event) {
+EventsEventEntry*
+events_event_entry_new (Event* event)
+{
#line 470 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return events_event_entry_construct (EVENTS_TYPE_EVENT_ENTRY, event);
-#line 3980 "EventsBranch.c"
+#line 4029 "EventsBranch.c"
}
-Event* events_event_entry_get_event (EventsEventEntry* self) {
+Event*
+events_event_entry_get_event (EventsEventEntry* self)
+{
Event* result = NULL;
Event* _tmp0_;
Event* _tmp1_;
@@ -3994,11 +4045,13 @@ Event* events_event_entry_get_event (EventsEventEntry* self) {
result = _tmp1_;
#line 475 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 3998 "EventsBranch.c"
+#line 4049 "EventsBranch.c"
}
-static gchar* events_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+static gchar*
+events_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base)
+{
EventsEventEntry * self;
gchar* result = NULL;
Event* _tmp0_;
@@ -4013,11 +4066,13 @@ static gchar* events_event_entry_real_get_sidebar_name (SidebarSimplePageEntry*
result = _tmp1_;
#line 479 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 4017 "EventsBranch.c"
+#line 4070 "EventsBranch.c"
}
-static gchar* events_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
+static gchar*
+events_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base)
+{
EventsEventEntry * self;
gchar* result = NULL;
const gchar* _tmp0_;
@@ -4032,11 +4087,13 @@ static gchar* events_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry*
result = _tmp1_;
#line 483 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 4036 "EventsBranch.c"
+#line 4091 "EventsBranch.c"
}
-static Page* events_event_entry_real_create_page (SidebarSimplePageEntry* base) {
+static Page*
+events_event_entry_real_create_page (SidebarSimplePageEntry* base)
+{
EventsEventEntry * self;
Page* result = NULL;
Event* _tmp0_;
@@ -4053,11 +4110,13 @@ static Page* events_event_entry_real_create_page (SidebarSimplePageEntry* base)
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
#line 487 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 4057 "EventsBranch.c"
+#line 4114 "EventsBranch.c"
}
-static gboolean events_event_entry_real_is_user_renameable (SidebarRenameableEntry* base) {
+static gboolean
+events_event_entry_real_is_user_renameable (SidebarRenameableEntry* base)
+{
EventsEventEntry * self;
gboolean result = FALSE;
#line 490 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -4066,74 +4125,77 @@ static gboolean events_event_entry_real_is_user_renameable (SidebarRenameableEnt
result = TRUE;
#line 491 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 4070 "EventsBranch.c"
+#line 4129 "EventsBranch.c"
}
-static void events_event_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name) {
+static void
+events_event_entry_real_rename (SidebarRenameableEntry* base,
+ const gchar* new_name)
+{
EventsEventEntry * self;
gchar* prepped = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
- const gchar* _tmp2_;
+ gchar* _tmp0_;
+ const gchar* _tmp1_;
#line 494 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
#line 494 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
g_return_if_fail (new_name != NULL);
#line 495 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp0_ = new_name;
-#line 495 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = event_prep_event_name (_tmp0_);
+ _tmp0_ = event_prep_event_name (new_name);
#line 495 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- prepped = _tmp1_;
+ prepped = _tmp0_;
#line 496 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = prepped;
+ _tmp1_ = prepped;
#line 496 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (_tmp2_ != NULL) {
-#line 4094 "EventsBranch.c"
+ if (_tmp1_ != NULL) {
+#line 4153 "EventsBranch.c"
+ CommandManager* _tmp2_;
CommandManager* _tmp3_;
- CommandManager* _tmp4_;
- Event* _tmp5_;
- const gchar* _tmp6_;
+ Event* _tmp4_;
+ const gchar* _tmp5_;
+ RenameEventCommand* _tmp6_;
RenameEventCommand* _tmp7_;
- RenameEventCommand* _tmp8_;
#line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp3_ = app_window_get_command_manager ();
+ _tmp2_ = app_window_get_command_manager ();
#line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp5_ = self->priv->event;
+ _tmp4_ = self->priv->event;
#line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp6_ = prepped;
+ _tmp5_ = prepped;
#line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp7_ = rename_event_command_new (_tmp5_, _tmp6_);
+ _tmp6_ = rename_event_command_new (_tmp4_, _tmp5_);
#line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp8_ = _tmp7_;
+ _tmp7_ = _tmp6_;
#line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- command_manager_execute (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_COMMAND, Command));
+ command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command));
#line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp8_);
+ _g_object_unref0 (_tmp7_);
#line 497 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _command_manager_unref0 (_tmp4_);
-#line 4119 "EventsBranch.c"
+ _command_manager_unref0 (_tmp3_);
+#line 4178 "EventsBranch.c"
}
#line 494 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_free0 (prepped);
-#line 4123 "EventsBranch.c"
+#line 4182 "EventsBranch.c"
}
-static gboolean events_event_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) {
+static gboolean
+events_event_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base,
+ GeeList* media)
+{
EventsEventEntry * self;
gboolean result = FALSE;
GeeArrayList* views = NULL;
GeeArrayList* _tmp0_;
+ CommandManager* _tmp15_;
CommandManager* _tmp16_;
- CommandManager* _tmp17_;
- GeeArrayList* _tmp18_;
- Event* _tmp19_;
+ GeeArrayList* _tmp17_;
+ Event* _tmp18_;
+ SetEventCommand* _tmp19_;
SetEventCommand* _tmp20_;
- SetEventCommand* _tmp21_;
#line 500 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
#line 500 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -4142,117 +4204,117 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD
_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 503 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
views = _tmp0_;
-#line 4146 "EventsBranch.c"
+#line 4208 "EventsBranch.c"
{
GeeList* _media_source_list = NULL;
GeeList* _tmp1_;
- GeeList* _tmp2_;
gint _media_source_size = 0;
- GeeList* _tmp3_;
+ GeeList* _tmp2_;
+ gint _tmp3_;
gint _tmp4_;
- gint _tmp5_;
gint _media_source_index = 0;
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp1_ = media;
-#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp2_ = _g_object_ref0 (_tmp1_);
+ _tmp1_ = _g_object_ref0 (media);
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _media_source_list = _tmp2_;
+ _media_source_list = _tmp1_;
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp3_ = _media_source_list;
+ _tmp2_ = _media_source_list;
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _media_source_size = _tmp5_;
+ _media_source_size = _tmp4_;
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_media_source_index = -1;
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
while (TRUE) {
-#line 4174 "EventsBranch.c"
+#line 4233 "EventsBranch.c"
+ gint _tmp5_;
gint _tmp6_;
gint _tmp7_;
- gint _tmp8_;
MediaSource* media_source = NULL;
- GeeList* _tmp9_;
- gint _tmp10_;
- gpointer _tmp11_;
- GeeArrayList* _tmp12_;
- MediaSource* _tmp13_;
+ GeeList* _tmp8_;
+ gint _tmp9_;
+ gpointer _tmp10_;
+ GeeArrayList* _tmp11_;
+ MediaSource* _tmp12_;
+ DataView* _tmp13_;
DataView* _tmp14_;
- DataView* _tmp15_;
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp6_ = _media_source_index;
+ _tmp5_ = _media_source_index;
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _media_source_index = _tmp6_ + 1;
+ _media_source_index = _tmp5_ + 1;
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp7_ = _media_source_index;
+ _tmp6_ = _media_source_index;
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp8_ = _media_source_size;
+ _tmp7_ = _media_source_size;
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- if (!(_tmp7_ < _tmp8_)) {
+ if (!(_tmp6_ < _tmp7_)) {
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
break;
-#line 4198 "EventsBranch.c"
+#line 4257 "EventsBranch.c"
}
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp9_ = _media_source_list;
+ _tmp8_ = _media_source_list;
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp10_ = _media_source_index;
+ _tmp9_ = _media_source_index;
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp11_ = gee_list_get (_tmp9_, _tmp10_);
+ _tmp10_ = gee_list_get (_tmp8_, _tmp9_);
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- media_source = (MediaSource*) _tmp11_;
+ media_source = (MediaSource*) _tmp10_;
#line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp12_ = views;
+ _tmp11_ = views;
#line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp13_ = media_source;
+ _tmp12_ = media_source;
#line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp14_ = data_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_SOURCE, DataSource));
+ _tmp13_ = data_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_SOURCE, DataSource));
#line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp15_ = _tmp14_;
+ _tmp14_ = _tmp13_;
#line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_);
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_);
#line 505 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp15_);
+ _g_object_unref0 (_tmp14_);
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (media_source);
-#line 4222 "EventsBranch.c"
+#line 4281 "EventsBranch.c"
}
#line 504 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (_media_source_list);
-#line 4226 "EventsBranch.c"
+#line 4285 "EventsBranch.c"
}
#line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp16_ = app_window_get_command_manager ();
+ _tmp15_ = app_window_get_command_manager ();
#line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp17_ = _tmp16_;
+ _tmp16_ = _tmp15_;
#line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp18_ = views;
+ _tmp17_ = views;
#line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp19_ = self->priv->event;
+ _tmp18_ = self->priv->event;
#line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp20_ = set_event_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable), _tmp19_);
+ _tmp19_ = set_event_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable), _tmp18_);
#line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _tmp21_ = _tmp20_;
+ _tmp20_ = _tmp19_;
#line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- command_manager_execute (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_COMMAND, Command));
+ command_manager_execute (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_COMMAND, Command));
#line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _g_object_unref0 (_tmp21_);
+ _g_object_unref0 (_tmp20_);
#line 507 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
- _command_manager_unref0 (_tmp17_);
+ _command_manager_unref0 (_tmp16_);
#line 509 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
result = TRUE;
#line 509 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
_g_object_unref0 (views);
#line 509 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 4252 "EventsBranch.c"
+#line 4311 "EventsBranch.c"
}
-static gboolean events_event_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data) {
+static gboolean
+events_event_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base,
+ GtkSelectionData* data)
+{
EventsEventEntry * self;
gboolean result = FALSE;
#line 512 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -4263,11 +4325,13 @@ static gboolean events_event_entry_real_internal_drop_received_arbitrary (Sideba
result = FALSE;
#line 513 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 4267 "EventsBranch.c"
+#line 4329 "EventsBranch.c"
}
-static void events_event_entry_class_init (EventsEventEntryClass * klass) {
+static void
+events_event_entry_class_init (EventsEventEntryClass * klass)
+{
#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
events_event_entry_parent_class = g_type_class_peek_parent (klass);
#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -4280,40 +4344,48 @@ static void events_event_entry_class_init (EventsEventEntryClass * klass) {
((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_event_entry_real_create_page;
#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
G_OBJECT_CLASS (klass)->finalize = events_event_entry_finalize;
-#line 4284 "EventsBranch.c"
+#line 4348 "EventsBranch.c"
}
-static void events_event_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) {
+static void
+events_event_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface)
+{
#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
events_event_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) events_event_entry_real_is_user_renameable;
#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) events_event_entry_real_rename;
-#line 4295 "EventsBranch.c"
+#line 4361 "EventsBranch.c"
}
-static void events_event_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) {
+static void
+events_event_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface)
+{
#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
events_event_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface);
#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) events_event_entry_real_internal_drop_received;
#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) events_event_entry_real_internal_drop_received_arbitrary;
-#line 4306 "EventsBranch.c"
+#line 4374 "EventsBranch.c"
}
-static void events_event_entry_instance_init (EventsEventEntry * self) {
+static void
+events_event_entry_instance_init (EventsEventEntry * self)
+{
#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self->priv = EVENTS_EVENT_ENTRY_GET_PRIVATE (self);
-#line 4313 "EventsBranch.c"
+#line 4383 "EventsBranch.c"
}
-static void events_event_entry_finalize (GObject * obj) {
+static void
+events_event_entry_finalize (GObject * obj)
+{
EventsEventEntry * self;
#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
@@ -4321,11 +4393,13 @@ static void events_event_entry_finalize (GObject * obj) {
_g_object_unref0 (self->priv->event);
#line 466 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
G_OBJECT_CLASS (events_event_entry_parent_class)->finalize (obj);
-#line 4325 "EventsBranch.c"
+#line 4397 "EventsBranch.c"
}
-GType events_event_entry_get_type (void) {
+GType
+events_event_entry_get_type (void)
+{
static volatile gsize events_event_entry_type_id__volatile = 0;
if (g_once_init_enter (&events_event_entry_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (EventsEventEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_event_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsEventEntry), 0, (GInstanceInitFunc) events_event_entry_instance_init, NULL };
@@ -4341,24 +4415,30 @@ GType events_event_entry_get_type (void) {
}
-EventsNoEventEntry* events_no_event_entry_construct (GType object_type) {
+EventsNoEventEntry*
+events_no_event_entry_construct (GType object_type)
+{
EventsNoEventEntry * self = NULL;
#line 519 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
self = (EventsNoEventEntry*) sidebar_simple_page_entry_construct (object_type);
#line 519 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return self;
-#line 4351 "EventsBranch.c"
+#line 4427 "EventsBranch.c"
}
-EventsNoEventEntry* events_no_event_entry_new (void) {
+EventsNoEventEntry*
+events_no_event_entry_new (void)
+{
#line 519 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return events_no_event_entry_construct (EVENTS_TYPE_NO_EVENT_ENTRY);
-#line 4358 "EventsBranch.c"
+#line 4436 "EventsBranch.c"
}
-static gchar* events_no_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+static gchar*
+events_no_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base)
+{
EventsNoEventEntry * self;
gchar* result = NULL;
gchar* _tmp0_;
@@ -4370,11 +4450,13 @@ static gchar* events_no_event_entry_real_get_sidebar_name (SidebarSimplePageEntr
result = _tmp0_;
#line 523 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 4374 "EventsBranch.c"
+#line 4454 "EventsBranch.c"
}
-static gchar* events_no_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
+static gchar*
+events_no_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base)
+{
EventsNoEventEntry * self;
gchar* result = NULL;
const gchar* _tmp0_;
@@ -4389,11 +4471,13 @@ static gchar* events_no_event_entry_real_get_sidebar_icon (SidebarSimplePageEntr
result = _tmp1_;
#line 527 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 4393 "EventsBranch.c"
+#line 4475 "EventsBranch.c"
}
-static Page* events_no_event_entry_real_create_page (SidebarSimplePageEntry* base) {
+static Page*
+events_no_event_entry_real_create_page (SidebarSimplePageEntry* base)
+{
EventsNoEventEntry * self;
Page* result = NULL;
NoEventPage* _tmp0_;
@@ -4407,11 +4491,13 @@ static Page* events_no_event_entry_real_create_page (SidebarSimplePageEntry* bas
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
#line 531 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
return result;
-#line 4411 "EventsBranch.c"
+#line 4495 "EventsBranch.c"
}
-static void events_no_event_entry_class_init (EventsNoEventEntryClass * klass) {
+static void
+events_no_event_entry_class_init (EventsNoEventEntryClass * klass)
+{
#line 518 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
events_no_event_entry_parent_class = g_type_class_peek_parent (klass);
#line 518 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
@@ -4420,15 +4506,19 @@ static void events_no_event_entry_class_init (EventsNoEventEntryClass * klass) {
((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_no_event_entry_real_get_sidebar_icon;
#line 518 "/home/jens/Source/shotwell/src/events/EventsBranch.vala"
((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_no_event_entry_real_create_page;
-#line 4424 "EventsBranch.c"
+#line 4510 "EventsBranch.c"
}
-static void events_no_event_entry_instance_init (EventsNoEventEntry * self) {
+static void
+events_no_event_entry_instance_init (EventsNoEventEntry * self)
+{
}
-GType events_no_event_entry_get_type (void) {
+GType
+events_no_event_entry_get_type (void)
+{
static volatile gsize events_no_event_entry_type_id__volatile = 0;
if (g_once_init_enter (&events_no_event_entry_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (EventsNoEventEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_no_event_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsNoEventEntry), 0, (GInstanceInitFunc) events_no_event_entry_instance_init, NULL };