summaryrefslogtreecommitdiff
path: root/src/events
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-15 20:38:57 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-15 20:38:57 +0100
commitf1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch)
treea1f2ab30332a6383b0677bfcc2aec687b98851d6 /src/events
parentf8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff)
parentede50c561ec9811704821a9ea0f04c3d6c20b5af (diff)
Merge branch 'release/0.26.4-1'0.26.4-1
Diffstat (limited to 'src/events')
-rw-r--r--src/events/Branch.c1547
-rw-r--r--src/events/EventDirectoryItem.c1513
-rw-r--r--src/events/EventDirectoryItem.vala16
-rw-r--r--src/events/EventPage.c246
-rw-r--r--src/events/Events.c2
-rw-r--r--src/events/EventsDirectoryPage.c706
6 files changed, 2079 insertions, 1951 deletions
diff --git a/src/events/Branch.c b/src/events/Branch.c
index 2320a00..32d331d 100644
--- a/src/events/Branch.c
+++ b/src/events/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.7, the Vala compiler
+/* Branch.c generated by valac 0.36.6, the Vala compiler
* generated from Branch.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -303,8 +303,8 @@ typedef struct _EventID EventID;
typedef struct _SidebarRenameableEntry SidebarRenameableEntry;
typedef struct _SidebarRenameableEntryIface SidebarRenameableEntryIface;
#define _alteration_unref0(var) ((var == NULL) ? NULL : (var = (alteration_unref (var), NULL)))
-typedef struct _Block7Data Block7Data;
typedef struct _Block8Data Block8Data;
+typedef struct _Block9Data Block9Data;
#define SIDEBAR_TYPE_SELECTABLE_ENTRY (sidebar_selectable_entry_get_type ())
#define SIDEBAR_SELECTABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY, SidebarSelectableEntry))
@@ -594,14 +594,14 @@ struct _SidebarRenameableEntryIface {
gboolean (*is_user_renameable) (SidebarRenameableEntry* self);
};
-struct _Block7Data {
+struct _Block8Data {
int _ref_count_;
EventsBranch* self;
gint event_month;
};
typedef gboolean (*Locator) (gconstpointer item, void* user_data);
-struct _Block8Data {
+struct _Block9Data {
int _ref_count_;
EventsBranch* self;
gint event_year;
@@ -744,14 +744,14 @@ gchar* events_branch_no_event_icon = NULL;
static gboolean events_branch_sort_ascending;
static gboolean events_branch_sort_ascending = FALSE;
static gpointer events_directory_entry_parent_class = NULL;
-static SidebarExpandableEntryIface* events_directory_entry_sidebar_expandable_entry_parent_iface = NULL;
+static SidebarExpandableEntryIface * events_directory_entry_sidebar_expandable_entry_parent_iface = NULL;
static gpointer events_master_directory_entry_parent_class = NULL;
static gpointer events_year_directory_entry_parent_class = NULL;
static gpointer events_month_directory_entry_parent_class = NULL;
static gpointer events_undated_directory_entry_parent_class = NULL;
static gpointer events_event_entry_parent_class = NULL;
-static SidebarRenameableEntryIface* events_event_entry_sidebar_renameable_entry_parent_iface = NULL;
-static SidebarInternalDropTargetEntryIface* events_event_entry_sidebar_internal_drop_target_entry_parent_iface = NULL;
+static SidebarRenameableEntryIface * events_event_entry_sidebar_renameable_entry_parent_iface = NULL;
+static SidebarInternalDropTargetEntryIface * events_event_entry_sidebar_internal_drop_target_entry_parent_iface = NULL;
static gpointer events_no_event_entry_parent_class = NULL;
GType sidebar_branch_get_type (void) G_GNUC_CONST;
@@ -856,7 +856,7 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc
static void events_branch_move_event (EventsBranch* self, Event* event);
GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST;
static void events_branch_add_undated_event (EventsBranch* self, Event* event);
-static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* event, struct tm* event_tm, SidebarEntry** found_year);
+static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* event, struct tm* event_tm, SidebarEntry* * found_year);
static void events_branch_graft_event (EventsBranch* self, SidebarEntry* parent, Event* event, GCompareFunc comparator);
static gint _events_branch_event_comparator_gcompare_func (gconstpointer a, gconstpointer b);
#define SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT _ ("%Y")
@@ -871,22 +871,22 @@ static void events_branch_reparent_event (EventsBranch* self, Event* event, Side
SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry);
void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent);
-static Block7Data* block7_data_ref (Block7Data* _data7_);
-static void block7_data_unref (void * _userdata_);
-static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* event, struct tm* event_tm);
-SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry* parent, Locator locator, void* locator_target);
-static gboolean __lambda17_ (Block7Data* _data7_, SidebarEntry* entry);
-static gboolean ___lambda17__locator (gconstpointer item, gpointer self);
static Block8Data* block8_data_ref (Block8Data* _data8_);
static void block8_data_unref (void * _userdata_);
-static gboolean __lambda16_ (Block8Data* _data8_, SidebarEntry* entry);
-static gboolean ___lambda16__locator (gconstpointer item, gpointer self);
+static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* event, struct tm* event_tm);
+SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry* parent, Locator locator, void* locator_target);
+static gboolean __lambda19_ (Block8Data* _data8_, SidebarEntry* entry);
+static gboolean ___lambda19__locator (gconstpointer item, gpointer self);
+static Block9Data* block9_data_ref (Block9Data* _data9_);
+static void block9_data_unref (void * _userdata_);
+static gboolean __lambda18_ (Block9Data* _data9_, SidebarEntry* entry);
+static gboolean ___lambda18__locator (gconstpointer item, gpointer self);
gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry);
static gint _events_branch_undated_event_comparator_gcompare_func (gconstpointer a, gconstpointer b);
EventsEventEntry* events_event_entry_new (Event* event);
EventsEventEntry* events_event_entry_construct (GType object_type, Event* event);
void sidebar_branch_reparent (SidebarBranch* self, SidebarEntry* new_parent, SidebarEntry* entry);
-static void events_branch_finalize (GObject* obj);
+static void events_branch_finalize (GObject * obj);
GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
GType page_get_type (void) G_GNUC_CONST;
GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
@@ -921,7 +921,7 @@ GType sub_events_directory_page_directory_type_get_type (void) G_GNUC_CONST;
SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, struct tm* time);
SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time);
GType sub_events_directory_page_get_type (void) G_GNUC_CONST;
-static void events_year_directory_entry_finalize (GObject* obj);
+static void events_year_directory_entry_finalize (GObject * obj);
#define EVENTS_MONTH_DIRECTORY_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntryPrivate))
enum {
EVENTS_MONTH_DIRECTORY_ENTRY_DUMMY_PROPERTY
@@ -929,7 +929,7 @@ enum {
static gchar* events_month_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
gint events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self);
static Page* events_month_directory_entry_real_create_page (SidebarSimplePageEntry* base);
-static void events_month_directory_entry_finalize (GObject* obj);
+static void events_month_directory_entry_finalize (GObject * obj);
enum {
EVENTS_UNDATED_DIRECTORY_ENTRY_DUMMY_PROPERTY
};
@@ -977,7 +977,7 @@ SetEventCommand* set_event_command_construct (GType object_type, GeeIterable* it
GType move_photos_command_get_type (void) G_GNUC_CONST;
GType set_event_command_get_type (void) G_GNUC_CONST;
static gboolean events_event_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data);
-static void events_event_entry_finalize (GObject* obj);
+static void events_event_entry_finalize (GObject * obj);
enum {
EVENTS_NO_EVENT_ENTRY_DUMMY_PROPERTY
};
@@ -1029,152 +1029,149 @@ static gint _events_branch_event_year_comparator_gcompare_func (gconstpointer a,
EventsBranch* events_branch_construct (GType object_type) {
EventsBranch * self = NULL;
- const gchar* _tmp0_ = NULL;
- SidebarHeader* _tmp1_ = NULL;
- SidebarHeader* _tmp2_ = NULL;
- SidebarEntry* _tmp3_ = NULL;
- SidebarEntry* _tmp4_ = NULL;
- EventsMasterDirectoryEntry* _tmp5_ = NULL;
- EventSourceCollection* _tmp16_ = NULL;
- GeeCollection* _tmp17_ = NULL;
- GeeCollection* _tmp18_ = NULL;
- gint _tmp19_ = 0;
- gint _tmp20_ = 0;
- EventSourceCollection* _tmp21_ = NULL;
- EventSourceCollection* _tmp22_ = NULL;
- EventSourceCollection* _tmp23_ = NULL;
- ConfigFacade* _tmp24_ = NULL;
- ConfigFacade* _tmp25_ = NULL;
-#line 25 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp0_ = _ ("Events");
+ SidebarHeader* _tmp0_;
+ SidebarHeader* _tmp1_;
+ SidebarEntry* _tmp2_;
+ SidebarEntry* _tmp3_;
+ EventsMasterDirectoryEntry* _tmp4_;
+ EventSourceCollection* _tmp15_;
+ GeeCollection* _tmp16_;
+ GeeCollection* _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
+ EventSourceCollection* _tmp20_;
+ EventSourceCollection* _tmp21_;
+ EventSourceCollection* _tmp22_;
+ ConfigFacade* _tmp23_;
+ ConfigFacade* _tmp24_;
#line 25 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp1_ = sidebar_header_new (_tmp0_, TRUE);
+ _tmp0_ = sidebar_header_new (_ ("Events"), TRUE);
#line 25 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 25 "/home/jens/Source/shotwell/src/events/Branch.vala"
- self = (EventsBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD, _events_branch_event_year_comparator_gcompare_func, NULL);
+ self = (EventsBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD, _events_branch_event_year_comparator_gcompare_func, NULL);
#line 25 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _g_object_unref0 (_tmp2_);
+ _g_object_unref0 (_tmp1_);
#line 28 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp3_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+ _tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
#line 28 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 28 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp5_ = self->priv->all_events_entry;
+ _tmp4_ = self->priv->all_events_entry;
#line 28 "/home/jens/Source/shotwell/src/events/Branch.vala"
- sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
+ sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
#line 28 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _g_object_unref0 (_tmp4_);
-#line 1069 "Branch.c"
+ _g_object_unref0 (_tmp3_);
+#line 1066 "Branch.c"
{
GeeIterator* _object_it = NULL;
- EventSourceCollection* _tmp6_ = NULL;
- GeeCollection* _tmp7_ = NULL;
- GeeCollection* _tmp8_ = NULL;
- GeeIterator* _tmp9_ = NULL;
- GeeIterator* _tmp10_ = NULL;
+ EventSourceCollection* _tmp5_;
+ GeeCollection* _tmp6_;
+ GeeCollection* _tmp7_;
+ GeeIterator* _tmp8_;
+ GeeIterator* _tmp9_;
#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp6_ = event_global;
+ _tmp5_ = event_global;
#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp7_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
+ _tmp6_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection));
#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp8_ = _tmp7_;
+ _tmp7_ = _tmp6_;
#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp10_ = _tmp9_;
+ _tmp9_ = _tmp8_;
#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _g_object_unref0 (_tmp8_);
+ _g_object_unref0 (_tmp7_);
#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _object_it = _tmp10_;
+ _object_it = _tmp9_;
#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
while (TRUE) {
-#line 1093 "Branch.c"
- GeeIterator* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
+#line 1090 "Branch.c"
+ GeeIterator* _tmp10_;
+ gboolean _tmp11_;
DataObject* object = NULL;
- GeeIterator* _tmp13_ = NULL;
- gpointer _tmp14_ = NULL;
- DataObject* _tmp15_ = NULL;
+ GeeIterator* _tmp12_;
+ gpointer _tmp13_;
+ DataObject* _tmp14_;
#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp11_ = _object_it;
+ _tmp10_ = _object_it;
#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp12_ = gee_iterator_next (_tmp11_);
+ _tmp11_ = gee_iterator_next (_tmp10_);
#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
- if (!_tmp12_) {
+ if (!_tmp11_) {
#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
break;
-#line 1108 "Branch.c"
+#line 1105 "Branch.c"
}
#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp13_ = _object_it;
+ _tmp12_ = _object_it;
#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp14_ = gee_iterator_get (_tmp13_);
+ _tmp13_ = gee_iterator_get (_tmp12_);
#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
- object = (DataObject*) _tmp14_;
+ object = (DataObject*) _tmp13_;
#line 32 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp15_ = object;
+ _tmp14_ = object;
#line 32 "/home/jens/Source/shotwell/src/events/Branch.vala"
- events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_EVENT, Event));
+ events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_EVENT, Event));
#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (object);
-#line 1122 "Branch.c"
+#line 1119 "Branch.c"
}
#line 31 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (_object_it);
-#line 1126 "Branch.c"
+#line 1123 "Branch.c"
}
#line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp16_ = event_global;
+ _tmp15_ = event_global;
#line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp17_ = event_source_collection_get_no_event_objects (_tmp16_);
+ _tmp16_ = event_source_collection_get_no_event_objects (_tmp15_);
#line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp18_ = _tmp17_;
+ _tmp17_ = _tmp16_;
#line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp19_ = gee_collection_get_size (_tmp18_);
+ _tmp18_ = gee_collection_get_size (_tmp17_);
#line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp20_ = _tmp19_;
+ _tmp19_ = _tmp18_;
#line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
- events_branch_show_no_events (self, _tmp20_ > 0);
+ events_branch_show_no_events (self, _tmp19_ > 0);
#line 34 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _g_object_unref0 (_tmp18_);
+ _g_object_unref0 (_tmp17_);
#line 37 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp21_ = event_global;
+ _tmp20_ = event_global;
#line 37 "/home/jens/Source/shotwell/src/events/Branch.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _events_branch_on_events_added_removed_data_collection_contents_altered, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _events_branch_on_events_added_removed_data_collection_contents_altered, self, 0);
#line 38 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp22_ = event_global;
+ _tmp21_ = event_global;
#line 38 "/home/jens/Source/shotwell/src/events/Branch.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _events_branch_on_events_altered_data_collection_items_altered, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _events_branch_on_events_altered_data_collection_items_altered, self, 0);
#line 39 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp23_ = event_global;
+ _tmp22_ = event_global;
#line 39 "/home/jens/Source/shotwell/src/events/Branch.vala"
- g_signal_connect_object (_tmp23_, "no-event-collection-altered", (GCallback) _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered, self, 0);
+ g_signal_connect_object (_tmp22_, "no-event-collection-altered", (GCallback) _events_branch_on_no_event_collection_altered_event_source_collection_no_event_collection_altered, self, 0);
#line 42 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp24_ = config_facade_get_instance ();
+ _tmp23_ = config_facade_get_instance ();
#line 42 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp25_ = _tmp24_;
+ _tmp24_ = _tmp23_;
#line 42 "/home/jens/Source/shotwell/src/events/Branch.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "events-sort-ascending-changed", (GCallback) _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "events-sort-ascending-changed", (GCallback) _events_branch_on_config_changed_configuration_facade_events_sort_ascending_changed, self, 0);
#line 42 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _g_object_unref0 (_tmp25_);
+ _g_object_unref0 (_tmp24_);
#line 24 "/home/jens/Source/shotwell/src/events/Branch.vala"
return self;
-#line 1164 "Branch.c"
+#line 1161 "Branch.c"
}
EventsBranch* events_branch_new (void) {
#line 24 "/home/jens/Source/shotwell/src/events/Branch.vala"
return events_branch_construct (EVENTS_TYPE_BRANCH);
-#line 1171 "Branch.c"
+#line 1168 "Branch.c"
}
void events_branch_init (void) {
- ConfigFacade* _tmp0_ = NULL;
- ConfigFacade* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ ConfigFacade* _tmp0_;
+ ConfigFacade* _tmp1_;
+ gboolean _tmp2_;
#line 54 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp0_ = config_facade_get_instance ();
#line 54 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1185,7 +1182,7 @@ void events_branch_init (void) {
events_branch_sort_ascending = _tmp2_;
#line 54 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (_tmp1_);
-#line 1189 "Branch.c"
+#line 1186 "Branch.c"
}
@@ -1201,21 +1198,21 @@ gboolean events_branch_is_user_renameable (EventsBranch* self) {
result = TRUE;
#line 61 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 1205 "Branch.c"
+#line 1202 "Branch.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 65 "/home/jens/Source/shotwell/src/events/Branch.vala"
return self ? g_object_ref (self) : NULL;
-#line 1212 "Branch.c"
+#line 1209 "Branch.c"
}
EventsMasterDirectoryEntry* events_branch_get_master_entry (EventsBranch* self) {
EventsMasterDirectoryEntry* result = NULL;
- EventsMasterDirectoryEntry* _tmp0_ = NULL;
- EventsMasterDirectoryEntry* _tmp1_ = NULL;
+ EventsMasterDirectoryEntry* _tmp0_;
+ EventsMasterDirectoryEntry* _tmp1_;
#line 64 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL);
#line 65 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1226,24 +1223,24 @@ EventsMasterDirectoryEntry* events_branch_get_master_entry (EventsBranch* self)
result = _tmp1_;
#line 65 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 1230 "Branch.c"
+#line 1227 "Branch.c"
}
static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry* b) {
gint result = 0;
- SidebarEntry* _tmp0_ = NULL;
- SidebarEntry* _tmp1_ = NULL;
- SidebarEntry* _tmp2_ = NULL;
- SidebarEntry* _tmp6_ = NULL;
- SidebarEntry* _tmp8_ = NULL;
- gboolean _tmp10_ = FALSE;
+ SidebarEntry* _tmp0_;
+ SidebarEntry* _tmp1_;
+ SidebarEntry* _tmp2_;
+ SidebarEntry* _tmp6_;
+ SidebarEntry* _tmp8_;
+ gboolean _tmp10_;
gint _result_ = 0;
- SidebarEntry* _tmp15_ = NULL;
- gint _tmp16_ = 0;
- SidebarEntry* _tmp17_ = NULL;
- gint _tmp18_ = 0;
- gint _tmp19_ = 0;
+ SidebarEntry* _tmp15_;
+ gint _tmp16_;
+ SidebarEntry* _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
#line 68 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
#line 68 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1258,14 +1255,14 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry*
result = 0;
#line 70 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 1262 "Branch.c"
+#line 1259 "Branch.c"
}
#line 74 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp2_ = a;
#line 74 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) {
-#line 1268 "Branch.c"
- SidebarEntry* _tmp3_ = NULL;
+#line 1265 "Branch.c"
+ SidebarEntry* _tmp3_;
#line 75 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp3_ = b;
#line 75 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1274,21 +1271,21 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry*
result = -1;
#line 76 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 1278 "Branch.c"
+#line 1275 "Branch.c"
}
#line 77 "/home/jens/Source/shotwell/src/events/Branch.vala"
result = 1;
#line 77 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 1284 "Branch.c"
+#line 1281 "Branch.c"
} else {
- SidebarEntry* _tmp4_ = NULL;
+ SidebarEntry* _tmp4_;
#line 78 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp4_ = b;
#line 78 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) {
-#line 1291 "Branch.c"
- SidebarEntry* _tmp5_ = NULL;
+#line 1288 "Branch.c"
+ SidebarEntry* _tmp5_;
#line 79 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp5_ = a;
#line 79 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1297,13 +1294,13 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry*
result = 1;
#line 80 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 1301 "Branch.c"
+#line 1298 "Branch.c"
}
#line 81 "/home/jens/Source/shotwell/src/events/Branch.vala"
result = -1;
#line 81 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 1307 "Branch.c"
+#line 1304 "Branch.c"
}
}
#line 84 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1314,9 +1311,9 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry*
result = 1;
#line 85 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 1318 "Branch.c"
+#line 1315 "Branch.c"
} else {
- SidebarEntry* _tmp7_ = NULL;
+ SidebarEntry* _tmp7_;
#line 86 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp7_ = b;
#line 86 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1325,7 +1322,7 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry*
result = -1;
#line 87 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 1329 "Branch.c"
+#line 1326 "Branch.c"
}
}
#line 90 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1336,9 +1333,9 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry*
result = -1;
#line 91 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 1340 "Branch.c"
+#line 1337 "Branch.c"
} else {
- SidebarEntry* _tmp9_ = NULL;
+ SidebarEntry* _tmp9_;
#line 92 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp9_ = b;
#line 92 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1347,19 +1344,19 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry*
result = 1;
#line 93 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 1351 "Branch.c"
+#line 1348 "Branch.c"
}
}
#line 95 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp10_ = events_branch_sort_ascending;
#line 95 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (!_tmp10_) {
-#line 1358 "Branch.c"
+#line 1355 "Branch.c"
SidebarEntry* swap = NULL;
- SidebarEntry* _tmp11_ = NULL;
- SidebarEntry* _tmp12_ = NULL;
- SidebarEntry* _tmp13_ = NULL;
- SidebarEntry* _tmp14_ = NULL;
+ SidebarEntry* _tmp11_;
+ SidebarEntry* _tmp12_;
+ SidebarEntry* _tmp13_;
+ SidebarEntry* _tmp14_;
#line 96 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp11_ = a;
#line 96 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1376,7 +1373,7 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry*
b = _tmp14_;
#line 95 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (swap);
-#line 1380 "Branch.c"
+#line 1377 "Branch.c"
}
#line 101 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp15_ = a;
@@ -1396,21 +1393,21 @@ static gint events_branch_event_year_comparator (SidebarEntry* a, SidebarEntry*
result = _result_;
#line 105 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 1400 "Branch.c"
+#line 1397 "Branch.c"
}
static gint events_branch_event_month_comparator (SidebarEntry* a, SidebarEntry* b) {
gint result = 0;
- SidebarEntry* _tmp0_ = NULL;
- SidebarEntry* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ SidebarEntry* _tmp0_;
+ SidebarEntry* _tmp1_;
+ gboolean _tmp2_;
gint _result_ = 0;
- SidebarEntry* _tmp7_ = NULL;
- gint _tmp8_ = 0;
- SidebarEntry* _tmp9_ = NULL;
- gint _tmp10_ = 0;
- gint _tmp11_ = 0;
+ SidebarEntry* _tmp7_;
+ gint _tmp8_;
+ SidebarEntry* _tmp9_;
+ gint _tmp10_;
+ gint _tmp11_;
#line 108 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
#line 108 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1425,18 +1422,18 @@ static gint events_branch_event_month_comparator (SidebarEntry* a, SidebarEntry*
result = 0;
#line 110 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 1429 "Branch.c"
+#line 1426 "Branch.c"
}
#line 112 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp2_ = events_branch_sort_ascending;
#line 112 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (!_tmp2_) {
-#line 1435 "Branch.c"
+#line 1432 "Branch.c"
SidebarEntry* swap = NULL;
- SidebarEntry* _tmp3_ = NULL;
- SidebarEntry* _tmp4_ = NULL;
- SidebarEntry* _tmp5_ = NULL;
- SidebarEntry* _tmp6_ = NULL;
+ SidebarEntry* _tmp3_;
+ SidebarEntry* _tmp4_;
+ SidebarEntry* _tmp5_;
+ SidebarEntry* _tmp6_;
#line 113 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp3_ = a;
#line 113 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1453,7 +1450,7 @@ static gint events_branch_event_month_comparator (SidebarEntry* a, SidebarEntry*
b = _tmp6_;
#line 112 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (swap);
-#line 1457 "Branch.c"
+#line 1454 "Branch.c"
}
#line 118 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp7_ = a;
@@ -1473,29 +1470,29 @@ static gint events_branch_event_month_comparator (SidebarEntry* a, SidebarEntry*
result = _result_;
#line 122 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 1477 "Branch.c"
+#line 1474 "Branch.c"
}
static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) {
gint result = 0;
- SidebarEntry* _tmp0_ = NULL;
- SidebarEntry* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ SidebarEntry* _tmp0_;
+ SidebarEntry* _tmp1_;
+ gboolean _tmp2_;
gint64 _result_ = 0LL;
- SidebarEntry* _tmp7_ = NULL;
- Event* _tmp8_ = NULL;
- Event* _tmp9_ = NULL;
- time_t _tmp10_ = 0;
- SidebarEntry* _tmp11_ = NULL;
- Event* _tmp12_ = NULL;
- Event* _tmp13_ = NULL;
- time_t _tmp14_ = 0;
- gint64 _tmp15_ = 0LL;
- gint64 _tmp16_ = 0LL;
- gint64 _tmp27_ = 0LL;
+ SidebarEntry* _tmp7_;
+ Event* _tmp8_;
+ Event* _tmp9_;
+ time_t _tmp10_;
+ SidebarEntry* _tmp11_;
+ Event* _tmp12_;
+ Event* _tmp13_;
+ time_t _tmp14_;
+ gint64 _tmp15_;
+ gint64 _tmp16_;
+ gint64 _tmp27_;
gint _tmp28_ = 0;
- gint64 _tmp29_ = 0LL;
+ gint64 _tmp29_;
#line 125 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
#line 125 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1510,18 +1507,18 @@ static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) {
result = 0;
#line 127 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 1514 "Branch.c"
+#line 1511 "Branch.c"
}
#line 129 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp2_ = events_branch_sort_ascending;
#line 129 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (!_tmp2_) {
-#line 1520 "Branch.c"
+#line 1517 "Branch.c"
SidebarEntry* swap = NULL;
- SidebarEntry* _tmp3_ = NULL;
- SidebarEntry* _tmp4_ = NULL;
- SidebarEntry* _tmp5_ = NULL;
- SidebarEntry* _tmp6_ = NULL;
+ SidebarEntry* _tmp3_;
+ SidebarEntry* _tmp4_;
+ SidebarEntry* _tmp5_;
+ SidebarEntry* _tmp6_;
#line 130 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp3_ = a;
#line 130 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1538,7 +1535,7 @@ static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) {
b = _tmp6_;
#line 129 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (swap);
-#line 1542 "Branch.c"
+#line 1539 "Branch.c"
}
#line 135 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp7_ = a;
@@ -1568,17 +1565,17 @@ static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) {
_tmp16_ = _result_;
#line 139 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp16_ == ((gint64) 0)) {
-#line 1572 "Branch.c"
- SidebarEntry* _tmp17_ = NULL;
- Event* _tmp18_ = NULL;
- Event* _tmp19_ = NULL;
+#line 1569 "Branch.c"
+ SidebarEntry* _tmp17_;
+ Event* _tmp18_;
+ Event* _tmp19_;
EventID _tmp20_ = {0};
- gint64 _tmp21_ = 0LL;
- SidebarEntry* _tmp22_ = NULL;
- Event* _tmp23_ = NULL;
- Event* _tmp24_ = NULL;
+ gint64 _tmp21_;
+ SidebarEntry* _tmp22_;
+ Event* _tmp23_;
+ Event* _tmp24_;
EventID _tmp25_ = {0};
- gint64 _tmp26_ = 0LL;
+ gint64 _tmp26_;
#line 140 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp17_ = a;
#line 140 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1605,7 +1602,7 @@ static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) {
_g_object_unref0 (_tmp24_);
#line 140 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (_tmp19_);
-#line 1609 "Branch.c"
+#line 1606 "Branch.c"
}
#line 144 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp27_ = _result_;
@@ -1617,39 +1614,39 @@ static gint events_branch_event_comparator (SidebarEntry* a, SidebarEntry* b) {
if (_tmp29_ < ((gint64) 0)) {
#line 146 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp28_ = -1;
-#line 1621 "Branch.c"
+#line 1618 "Branch.c"
} else {
#line 146 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp28_ = 1;
-#line 1625 "Branch.c"
+#line 1622 "Branch.c"
}
#line 146 "/home/jens/Source/shotwell/src/events/Branch.vala"
result = _tmp28_;
#line 146 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 1631 "Branch.c"
+#line 1628 "Branch.c"
}
static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntry* b) {
gint result = 0;
- SidebarEntry* _tmp0_ = NULL;
- SidebarEntry* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ SidebarEntry* _tmp0_;
+ SidebarEntry* _tmp1_;
+ gboolean _tmp2_;
gint ret = 0;
- SidebarEntry* _tmp7_ = NULL;
- Event* _tmp8_ = NULL;
- Event* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- SidebarEntry* _tmp12_ = NULL;
- Event* _tmp13_ = NULL;
- Event* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- gint _tmp17_ = 0;
- gint _tmp18_ = 0;
- gint _tmp19_ = 0;
+ SidebarEntry* _tmp7_;
+ Event* _tmp8_;
+ Event* _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ SidebarEntry* _tmp12_;
+ Event* _tmp13_;
+ Event* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
+ gint _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
#line 149 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
#line 149 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1664,18 +1661,18 @@ static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntr
result = 0;
#line 151 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 1668 "Branch.c"
+#line 1665 "Branch.c"
}
#line 153 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp2_ = events_branch_sort_ascending;
#line 153 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (!_tmp2_) {
-#line 1674 "Branch.c"
+#line 1671 "Branch.c"
SidebarEntry* swap = NULL;
- SidebarEntry* _tmp3_ = NULL;
- SidebarEntry* _tmp4_ = NULL;
- SidebarEntry* _tmp5_ = NULL;
- SidebarEntry* _tmp6_ = NULL;
+ SidebarEntry* _tmp3_;
+ SidebarEntry* _tmp4_;
+ SidebarEntry* _tmp5_;
+ SidebarEntry* _tmp6_;
#line 154 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp3_ = a;
#line 154 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1692,7 +1689,7 @@ static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntr
b = _tmp6_;
#line 153 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (swap);
-#line 1696 "Branch.c"
+#line 1693 "Branch.c"
}
#line 159 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp7_ = a;
@@ -1732,15 +1729,15 @@ static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntr
_tmp19_ = ret;
#line 162 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp19_ == 0) {
-#line 1736 "Branch.c"
- SidebarEntry* _tmp20_ = NULL;
- Event* _tmp21_ = NULL;
- Event* _tmp22_ = NULL;
- gint64 _tmp23_ = 0LL;
- SidebarEntry* _tmp24_ = NULL;
- Event* _tmp25_ = NULL;
- Event* _tmp26_ = NULL;
- gint64 _tmp27_ = 0LL;
+#line 1733 "Branch.c"
+ SidebarEntry* _tmp20_;
+ Event* _tmp21_;
+ Event* _tmp22_;
+ gint64 _tmp23_;
+ SidebarEntry* _tmp24_;
+ Event* _tmp25_;
+ Event* _tmp26_;
+ gint64 _tmp27_;
#line 163 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp20_ = b;
#line 163 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1763,21 +1760,21 @@ static gint events_branch_undated_event_comparator (SidebarEntry* a, SidebarEntr
_g_object_unref0 (_tmp26_);
#line 163 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (_tmp22_);
-#line 1767 "Branch.c"
+#line 1764 "Branch.c"
}
#line 166 "/home/jens/Source/shotwell/src/events/Branch.vala"
result = ret;
#line 166 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 1773 "Branch.c"
+#line 1770 "Branch.c"
}
EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, Event* event) {
EventsEventEntry* result = NULL;
- GeeHashMap* _tmp0_ = NULL;
- Event* _tmp1_ = NULL;
- gpointer _tmp2_ = NULL;
+ GeeHashMap* _tmp0_;
+ Event* _tmp1_;
+ gpointer _tmp2_;
#line 169 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL);
#line 169 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1792,16 +1789,16 @@ EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, Event*
result = (EventsEventEntry*) _tmp2_;
#line 170 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 1796 "Branch.c"
+#line 1793 "Branch.c"
}
static void events_branch_on_config_changed (EventsBranch* self) {
gboolean value = FALSE;
- ConfigFacade* _tmp0_ = NULL;
- ConfigFacade* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- gboolean _tmp3_ = FALSE;
+ ConfigFacade* _tmp0_;
+ ConfigFacade* _tmp1_;
+ gboolean _tmp2_;
+ gboolean _tmp3_;
#line 173 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 174 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1820,13 +1817,13 @@ static void events_branch_on_config_changed (EventsBranch* self) {
events_branch_sort_ascending = value;
#line 177 "/home/jens/Source/shotwell/src/events/Branch.vala"
sidebar_branch_reorder_all (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 1824 "Branch.c"
+#line 1821 "Branch.c"
}
static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterable* added, GeeIterable* removed) {
- GeeIterable* _tmp0_ = NULL;
- GeeIterable* _tmp8_ = NULL;
+ GeeIterable* _tmp0_;
+ GeeIterable* _tmp8_;
#line 180 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 180 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1837,11 +1834,11 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab
_tmp0_ = added;
#line 182 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp0_ != NULL) {
-#line 1841 "Branch.c"
+#line 1838 "Branch.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp1_ = NULL;
- GeeIterator* _tmp2_ = NULL;
+ GeeIterable* _tmp1_;
+ GeeIterator* _tmp2_;
#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp1_ = added;
#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1850,13 +1847,13 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab
_object_it = _tmp2_;
#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
while (TRUE) {
-#line 1854 "Branch.c"
- GeeIterator* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+#line 1851 "Branch.c"
+ GeeIterator* _tmp3_;
+ gboolean _tmp4_;
DataObject* object = NULL;
- GeeIterator* _tmp5_ = NULL;
- gpointer _tmp6_ = NULL;
- DataObject* _tmp7_ = NULL;
+ GeeIterator* _tmp5_;
+ gpointer _tmp6_;
+ DataObject* _tmp7_;
#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp3_ = _object_it;
#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1865,7 +1862,7 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab
if (!_tmp4_) {
#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
break;
-#line 1869 "Branch.c"
+#line 1866 "Branch.c"
}
#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp5_ = _object_it;
@@ -1879,22 +1876,22 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab
events_branch_add_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_EVENT, Event));
#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (object);
-#line 1883 "Branch.c"
+#line 1880 "Branch.c"
}
#line 183 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (_object_it);
-#line 1887 "Branch.c"
+#line 1884 "Branch.c"
}
}
#line 187 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp8_ = removed;
#line 187 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp8_ != NULL) {
-#line 1894 "Branch.c"
+#line 1891 "Branch.c"
{
GeeIterator* _object_it = NULL;
- GeeIterable* _tmp9_ = NULL;
- GeeIterator* _tmp10_ = NULL;
+ GeeIterable* _tmp9_;
+ GeeIterator* _tmp10_;
#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp9_ = removed;
#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1903,13 +1900,13 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab
_object_it = _tmp10_;
#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
while (TRUE) {
-#line 1907 "Branch.c"
- GeeIterator* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
+#line 1904 "Branch.c"
+ GeeIterator* _tmp11_;
+ gboolean _tmp12_;
DataObject* object = NULL;
- GeeIterator* _tmp13_ = NULL;
- gpointer _tmp14_ = NULL;
- DataObject* _tmp15_ = NULL;
+ GeeIterator* _tmp13_;
+ gpointer _tmp14_;
+ DataObject* _tmp15_;
#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp11_ = _object_it;
#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1918,7 +1915,7 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab
if (!_tmp12_) {
#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
break;
-#line 1922 "Branch.c"
+#line 1919 "Branch.c"
}
#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp13_ = _object_it;
@@ -1932,11 +1929,11 @@ static void events_branch_on_events_added_removed (EventsBranch* self, GeeIterab
events_branch_remove_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_EVENT, Event));
#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (object);
-#line 1936 "Branch.c"
+#line 1933 "Branch.c"
}
#line 188 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (_object_it);
-#line 1940 "Branch.c"
+#line 1937 "Branch.c"
}
}
}
@@ -1947,15 +1944,15 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 193 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_if_fail (GEE_IS_MAP (altered));
-#line 1951 "Branch.c"
+#line 1948 "Branch.c"
{
GeeIterator* _object_it = NULL;
- GeeMap* _tmp0_ = NULL;
- GeeSet* _tmp1_ = NULL;
- GeeSet* _tmp2_ = NULL;
- GeeSet* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ GeeMap* _tmp0_;
+ GeeSet* _tmp1_;
+ GeeSet* _tmp2_;
+ GeeSet* _tmp3_;
+ GeeIterator* _tmp4_;
+ GeeIterator* _tmp5_;
#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp0_ = altered;
#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1974,21 +1971,21 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered
_object_it = _tmp5_;
#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
while (TRUE) {
-#line 1978 "Branch.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 1975 "Branch.c"
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
DataObject* object = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
Event* event = NULL;
- DataObject* _tmp10_ = NULL;
- Event* _tmp11_ = NULL;
+ DataObject* _tmp10_;
+ Event* _tmp11_;
Alteration* alteration = NULL;
- GeeMap* _tmp12_ = NULL;
- DataObject* _tmp13_ = NULL;
- gpointer _tmp14_ = NULL;
- Alteration* _tmp15_ = NULL;
- gboolean _tmp16_ = FALSE;
+ GeeMap* _tmp12_;
+ DataObject* _tmp13_;
+ gpointer _tmp14_;
+ Alteration* _tmp15_;
+ gboolean _tmp16_;
#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp6_ = _object_it;
#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -1997,7 +1994,7 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered
if (!_tmp7_) {
#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
break;
-#line 2001 "Branch.c"
+#line 1998 "Branch.c"
}
#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp8_ = _object_it;
@@ -2025,36 +2022,36 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered
_tmp16_ = alteration_has_detail (_tmp15_, "metadata", "time");
#line 198 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp16_) {
-#line 2029 "Branch.c"
- Event* _tmp17_ = NULL;
+#line 2026 "Branch.c"
+ Event* _tmp17_;
#line 201 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp17_ = event;
#line 201 "/home/jens/Source/shotwell/src/events/Branch.vala"
events_branch_move_event (self, _tmp17_);
-#line 2035 "Branch.c"
+#line 2032 "Branch.c"
} else {
- Alteration* _tmp18_ = NULL;
- gboolean _tmp19_ = FALSE;
+ Alteration* _tmp18_;
+ gboolean _tmp19_;
#line 202 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp18_ = alteration;
#line 202 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp19_ = alteration_has_detail (_tmp18_, "metadata", "name");
#line 202 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp19_) {
-#line 2045 "Branch.c"
+#line 2042 "Branch.c"
EventsEventEntry* entry = NULL;
- GeeHashMap* _tmp20_ = NULL;
- Event* _tmp21_ = NULL;
- gpointer _tmp22_ = NULL;
- EventsEventEntry* _tmp23_ = NULL;
- EventsEventEntry* _tmp24_ = NULL;
- Event* _tmp25_ = NULL;
- gchar* _tmp26_ = NULL;
- gchar* _tmp27_ = NULL;
- EventsEventEntry* _tmp28_ = NULL;
- Event* _tmp29_ = NULL;
- gchar* _tmp30_ = NULL;
- gchar* _tmp31_ = NULL;
+ GeeHashMap* _tmp20_;
+ Event* _tmp21_;
+ gpointer _tmp22_;
+ EventsEventEntry* _tmp23_;
+ EventsEventEntry* _tmp24_;
+ Event* _tmp25_;
+ gchar* _tmp26_;
+ gchar* _tmp27_;
+ EventsEventEntry* _tmp28_;
+ Event* _tmp29_;
+ gchar* _tmp30_;
+ gchar* _tmp31_;
#line 203 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp20_ = self->priv->entry_map;
#line 203 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2093,7 +2090,7 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered
_g_free0 (_tmp31_);
#line 202 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (entry);
-#line 2097 "Branch.c"
+#line 2094 "Branch.c"
}
}
#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2102,21 +2099,21 @@ static void events_branch_on_events_altered (EventsBranch* self, GeeMap* altered
_g_object_unref0 (event);
#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (object);
-#line 2106 "Branch.c"
+#line 2103 "Branch.c"
}
#line 194 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (_object_it);
-#line 2110 "Branch.c"
+#line 2107 "Branch.c"
}
}
static void events_branch_on_no_event_collection_altered (EventsBranch* self) {
- EventSourceCollection* _tmp0_ = NULL;
- GeeCollection* _tmp1_ = NULL;
- GeeCollection* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
+ EventSourceCollection* _tmp0_;
+ GeeCollection* _tmp1_;
+ GeeCollection* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
#line 212 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 213 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2133,22 +2130,22 @@ static void events_branch_on_no_event_collection_altered (EventsBranch* self) {
events_branch_show_no_events (self, _tmp4_ > 0);
#line 213 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (_tmp2_);
-#line 2137 "Branch.c"
+#line 2134 "Branch.c"
}
static void g_time_local (time_t time, struct tm* result) {
struct tm _result_ = {0};
struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return;
-#line 2152 "Branch.c"
+#line 2149 "Branch.c"
}
@@ -2157,53 +2154,53 @@ static gint _events_branch_event_comparator_gcompare_func (gconstpointer a, gcon
result = events_branch_event_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
#line 229 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 2161 "Branch.c"
+#line 2158 "Branch.c"
}
static gchar* g_time_format (struct tm *self, const gchar* format) {
gchar* result = NULL;
gchar* buffer = NULL;
- gchar* _tmp0_ = NULL;
- gint buffer_length1 = 0;
- gint _buffer_size_ = 0;
- gchar* _tmp1_ = NULL;
- gint _tmp1__length1 = 0;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gint _tmp3__length1 = 0;
- gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ gint buffer_length1;
+ gint _buffer_size_;
+ gchar* _tmp1_;
+ gint _tmp1__length1;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ gint _tmp3__length1;
+ gchar* _tmp4_;
+#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 2207 "Branch.c"
+#line 2204 "Branch.c"
}
@@ -2212,34 +2209,34 @@ static gint _events_branch_event_month_comparator_gcompare_func (gconstpointer a
result = events_branch_event_month_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
#line 237 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 2216 "Branch.c"
+#line 2213 "Branch.c"
}
static void events_branch_add_event (EventsBranch* self, Event* event) {
time_t event_time = 0;
- Event* _tmp0_ = NULL;
- time_t _tmp1_ = 0;
- time_t _tmp2_ = 0;
+ Event* _tmp0_;
+ time_t _tmp1_;
+ time_t _tmp2_;
struct tm event_tm = {0};
- time_t _tmp4_ = 0;
+ time_t _tmp4_;
struct tm _tmp5_ = {0};
SidebarEntry* year = NULL;
SidebarEntry* month = NULL;
- Event* _tmp6_ = NULL;
- struct tm _tmp7_ = {0};
+ Event* _tmp6_;
+ struct tm _tmp7_;
SidebarEntry* _tmp8_ = NULL;
- SidebarEntry* _tmp9_ = NULL;
- SidebarEntry* _tmp10_ = NULL;
- SidebarEntry* _tmp13_ = NULL;
- gchar* _tmp21_ = NULL;
- gchar* _tmp22_ = NULL;
- struct tm _tmp23_ = {0};
- EventsMonthDirectoryEntry* _tmp24_ = NULL;
- SidebarEntry* _tmp25_ = NULL;
- SidebarEntry* _tmp26_ = NULL;
- SidebarEntry* _tmp27_ = NULL;
- Event* _tmp28_ = NULL;
+ SidebarEntry* _tmp9_;
+ SidebarEntry* _tmp10_;
+ SidebarEntry* _tmp13_;
+ gchar* _tmp21_;
+ gchar* _tmp22_;
+ struct tm _tmp23_;
+ EventsMonthDirectoryEntry* _tmp24_;
+ SidebarEntry* _tmp25_;
+ SidebarEntry* _tmp26_;
+ SidebarEntry* _tmp27_;
+ Event* _tmp28_;
#line 216 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 216 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2254,15 +2251,15 @@ static void events_branch_add_event (EventsBranch* self, Event* event) {
_tmp2_ = event_time;
#line 218 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp2_ == ((time_t) 0)) {
-#line 2258 "Branch.c"
- Event* _tmp3_ = NULL;
+#line 2255 "Branch.c"
+ Event* _tmp3_;
#line 219 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp3_ = event;
#line 219 "/home/jens/Source/shotwell/src/events/Branch.vala"
events_branch_add_undated_event (self, _tmp3_);
#line 221 "/home/jens/Source/shotwell/src/events/Branch.vala"
return;
-#line 2266 "Branch.c"
+#line 2263 "Branch.c"
}
#line 224 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp4_ = event_time;
@@ -2286,9 +2283,9 @@ static void events_branch_add_event (EventsBranch* self, Event* event) {
_tmp10_ = month;
#line 228 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp10_ != NULL) {
-#line 2290 "Branch.c"
- SidebarEntry* _tmp11_ = NULL;
- Event* _tmp12_ = NULL;
+#line 2287 "Branch.c"
+ SidebarEntry* _tmp11_;
+ Event* _tmp12_;
#line 229 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp11_ = month;
#line 229 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2301,20 +2298,20 @@ static void events_branch_add_event (EventsBranch* self, Event* event) {
_g_object_unref0 (year);
#line 231 "/home/jens/Source/shotwell/src/events/Branch.vala"
return;
-#line 2305 "Branch.c"
+#line 2302 "Branch.c"
}
#line 234 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp13_ = year;
#line 234 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp13_ == NULL) {
-#line 2311 "Branch.c"
- gchar* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- struct tm _tmp16_ = {0};
- EventsYearDirectoryEntry* _tmp17_ = NULL;
- SidebarEntry* _tmp18_ = NULL;
- SidebarEntry* _tmp19_ = NULL;
- SidebarEntry* _tmp20_ = NULL;
+#line 2308 "Branch.c"
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+ struct tm _tmp16_;
+ EventsYearDirectoryEntry* _tmp17_;
+ SidebarEntry* _tmp18_;
+ SidebarEntry* _tmp19_;
+ SidebarEntry* _tmp20_;
#line 235 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp14_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT);
#line 235 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2339,7 +2336,7 @@ static void events_branch_add_event (EventsBranch* self, Event* event) {
sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp19_, _tmp20_, _events_branch_event_month_comparator_gcompare_func);
#line 237 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (_tmp19_);
-#line 2343 "Branch.c"
+#line 2340 "Branch.c"
}
#line 240 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp21_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT);
@@ -2371,28 +2368,28 @@ static void events_branch_add_event (EventsBranch* self, Event* event) {
_g_object_unref0 (month);
#line 216 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (year);
-#line 2375 "Branch.c"
+#line 2372 "Branch.c"
}
static void events_branch_move_event (EventsBranch* self, Event* event) {
time_t event_time = 0;
- Event* _tmp0_ = NULL;
- time_t _tmp1_ = 0;
- time_t _tmp2_ = 0;
+ Event* _tmp0_;
+ time_t _tmp1_;
+ time_t _tmp2_;
struct tm event_tm = {0};
- time_t _tmp4_ = 0;
+ time_t _tmp4_;
struct tm _tmp5_ = {0};
SidebarEntry* year = NULL;
SidebarEntry* month = NULL;
- Event* _tmp6_ = NULL;
- struct tm _tmp7_ = {0};
+ Event* _tmp6_;
+ struct tm _tmp7_;
SidebarEntry* _tmp8_ = NULL;
- SidebarEntry* _tmp9_ = NULL;
- SidebarEntry* _tmp10_ = NULL;
- SidebarEntry* _tmp18_ = NULL;
- Event* _tmp25_ = NULL;
- SidebarEntry* _tmp26_ = NULL;
+ SidebarEntry* _tmp9_;
+ SidebarEntry* _tmp10_;
+ SidebarEntry* _tmp18_;
+ Event* _tmp25_;
+ SidebarEntry* _tmp26_;
#line 247 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 247 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2407,15 +2404,15 @@ static void events_branch_move_event (EventsBranch* self, Event* event) {
_tmp2_ = event_time;
#line 249 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp2_ == ((time_t) 0)) {
-#line 2411 "Branch.c"
- Event* _tmp3_ = NULL;
+#line 2408 "Branch.c"
+ Event* _tmp3_;
#line 250 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp3_ = event;
#line 250 "/home/jens/Source/shotwell/src/events/Branch.vala"
events_branch_move_to_undated_event (self, _tmp3_);
#line 252 "/home/jens/Source/shotwell/src/events/Branch.vala"
return;
-#line 2419 "Branch.c"
+#line 2416 "Branch.c"
}
#line 255 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp4_ = event_time;
@@ -2439,14 +2436,14 @@ static void events_branch_move_event (EventsBranch* self, Event* event) {
_tmp10_ = year;
#line 260 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp10_ == NULL) {
-#line 2443 "Branch.c"
- gchar* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
- struct tm _tmp13_ = {0};
- EventsYearDirectoryEntry* _tmp14_ = NULL;
- SidebarEntry* _tmp15_ = NULL;
- SidebarEntry* _tmp16_ = NULL;
- SidebarEntry* _tmp17_ = NULL;
+#line 2440 "Branch.c"
+ gchar* _tmp11_;
+ gchar* _tmp12_;
+ struct tm _tmp13_;
+ EventsYearDirectoryEntry* _tmp14_;
+ SidebarEntry* _tmp15_;
+ SidebarEntry* _tmp16_;
+ SidebarEntry* _tmp17_;
#line 261 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp11_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT);
#line 261 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2471,19 +2468,19 @@ static void events_branch_move_event (EventsBranch* self, Event* event) {
sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp16_, _tmp17_, _events_branch_event_month_comparator_gcompare_func);
#line 263 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (_tmp16_);
-#line 2475 "Branch.c"
+#line 2472 "Branch.c"
}
#line 266 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp18_ = month;
#line 266 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp18_ == NULL) {
-#line 2481 "Branch.c"
- gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
- struct tm _tmp21_ = {0};
- EventsMonthDirectoryEntry* _tmp22_ = NULL;
- SidebarEntry* _tmp23_ = NULL;
- SidebarEntry* _tmp24_ = NULL;
+#line 2478 "Branch.c"
+ gchar* _tmp19_;
+ gchar* _tmp20_;
+ struct tm _tmp21_;
+ EventsMonthDirectoryEntry* _tmp22_;
+ SidebarEntry* _tmp23_;
+ SidebarEntry* _tmp24_;
#line 267 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp19_ = g_time_format (&event_tm, SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT);
#line 267 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2504,7 +2501,7 @@ static void events_branch_move_event (EventsBranch* self, Event* event) {
_tmp24_ = month;
#line 269 "/home/jens/Source/shotwell/src/events/Branch.vala"
sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp23_, _tmp24_, _events_branch_event_comparator_gcompare_func);
-#line 2508 "Branch.c"
+#line 2505 "Branch.c"
}
#line 272 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp25_ = event;
@@ -2516,23 +2513,23 @@ static void events_branch_move_event (EventsBranch* self, Event* event) {
_g_object_unref0 (month);
#line 247 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (year);
-#line 2520 "Branch.c"
+#line 2517 "Branch.c"
}
static void events_branch_remove_event (EventsBranch* self, Event* event) {
SidebarEntry* entry = NULL;
gboolean removed = FALSE;
- GeeHashMap* _tmp0_ = NULL;
- Event* _tmp1_ = NULL;
+ GeeHashMap* _tmp0_;
+ Event* _tmp1_;
gpointer _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- gboolean _tmp4_ = FALSE;
+ gboolean _tmp3_;
+ gboolean _tmp4_;
SidebarEntry* parent = NULL;
- SidebarEntry* _tmp5_ = NULL;
- SidebarEntry* _tmp6_ = NULL;
- SidebarEntry* _tmp7_ = NULL;
- SidebarEntry* _tmp8_ = NULL;
+ SidebarEntry* _tmp5_;
+ SidebarEntry* _tmp6_;
+ SidebarEntry* _tmp7_;
+ SidebarEntry* _tmp8_;
#line 275 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 275 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2569,27 +2566,27 @@ static void events_branch_remove_event (EventsBranch* self, Event* event) {
sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp8_);
#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
while (TRUE) {
-#line 2573 "Branch.c"
+#line 2570 "Branch.c"
gboolean _tmp9_ = FALSE;
- SidebarEntry* _tmp10_ = NULL;
- gint _tmp11_ = 0;
+ SidebarEntry* _tmp10_;
+ gint _tmp11_;
SidebarEntry* grandparent = NULL;
- SidebarEntry* _tmp15_ = NULL;
- SidebarEntry* _tmp16_ = NULL;
- SidebarEntry* _tmp17_ = NULL;
- SidebarEntry* _tmp18_ = NULL;
- SidebarEntry* _tmp19_ = NULL;
- SidebarEntry* _tmp20_ = NULL;
+ SidebarEntry* _tmp15_;
+ SidebarEntry* _tmp16_;
+ SidebarEntry* _tmp17_;
+ SidebarEntry* _tmp18_;
+ SidebarEntry* _tmp19_;
+ SidebarEntry* _tmp20_;
#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp10_ = parent;
#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp11_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp10_);
#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp11_ == 0) {
-#line 2590 "Branch.c"
- SidebarEntry* _tmp12_ = NULL;
- SidebarEntry* _tmp13_ = NULL;
- SidebarEntry* _tmp14_ = NULL;
+#line 2587 "Branch.c"
+ SidebarEntry* _tmp12_;
+ SidebarEntry* _tmp13_;
+ SidebarEntry* _tmp14_;
#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp12_ = parent;
#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2600,17 +2597,17 @@ static void events_branch_remove_event (EventsBranch* self, Event* event) {
_tmp9_ = _tmp12_ != _tmp14_;
#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (_tmp14_);
-#line 2604 "Branch.c"
+#line 2601 "Branch.c"
} else {
#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp9_ = FALSE;
-#line 2608 "Branch.c"
+#line 2605 "Branch.c"
}
#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (!_tmp9_) {
#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
break;
-#line 2614 "Branch.c"
+#line 2611 "Branch.c"
}
#line 289 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp15_ = parent;
@@ -2636,51 +2633,51 @@ static void events_branch_remove_event (EventsBranch* self, Event* event) {
parent = _tmp20_;
#line 288 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (grandparent);
-#line 2640 "Branch.c"
+#line 2637 "Branch.c"
}
#line 275 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (parent);
#line 275 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (entry);
-#line 2646 "Branch.c"
+#line 2643 "Branch.c"
}
-static Block7Data* block7_data_ref (Block7Data* _data7_) {
+static Block8Data* block8_data_ref (Block8Data* _data8_) {
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
- g_atomic_int_inc (&_data7_->_ref_count_);
+ g_atomic_int_inc (&_data8_->_ref_count_);
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
- return _data7_;
-#line 2655 "Branch.c"
+ return _data8_;
+#line 2652 "Branch.c"
}
-static void block7_data_unref (void * _userdata_) {
- Block7Data* _data7_;
- _data7_ = (Block7Data*) _userdata_;
+static void block8_data_unref (void * _userdata_) {
+ Block8Data* _data8_;
+ _data8_ = (Block8Data*) _userdata_;
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
- if (g_atomic_int_dec_and_test (&_data7_->_ref_count_)) {
-#line 2664 "Branch.c"
+ if (g_atomic_int_dec_and_test (&_data8_->_ref_count_)) {
+#line 2661 "Branch.c"
EventsBranch* self;
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
- self = _data7_->self;
+ self = _data8_->self;
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (self);
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
- g_slice_free (Block7Data, _data7_);
-#line 2672 "Branch.c"
+ g_slice_free (Block8Data, _data8_);
+#line 2669 "Branch.c"
}
}
-static gboolean __lambda17_ (Block7Data* _data7_, SidebarEntry* entry) {
+static gboolean __lambda19_ (Block8Data* _data8_, SidebarEntry* entry) {
EventsBranch* self;
gboolean result = FALSE;
- SidebarEntry* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
+ SidebarEntry* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
- self = _data7_->self;
+ self = _data8_->self;
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
#line 308 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2688,36 +2685,36 @@ static gboolean __lambda17_ (Block7Data* _data7_, SidebarEntry* entry) {
#line 308 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp1_ = events_month_directory_entry_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry));
#line 308 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp2_ = _data7_->event_month;
+ _tmp2_ = _data8_->event_month;
#line 308 "/home/jens/Source/shotwell/src/events/Branch.vala"
result = _tmp1_ == _tmp2_;
#line 308 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 2697 "Branch.c"
+#line 2694 "Branch.c"
}
-static gboolean ___lambda17__locator (gconstpointer item, gpointer self) {
+static gboolean ___lambda19__locator (gconstpointer item, gpointer self) {
gboolean result;
- result = __lambda17_ (self, (SidebarEntry*) item);
+ result = __lambda19_ (self, (SidebarEntry*) item);
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 2706 "Branch.c"
+#line 2703 "Branch.c"
}
-static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* event, struct tm* event_tm, SidebarEntry** found_year) {
+static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event* event, struct tm* event_tm, SidebarEntry* * found_year) {
SidebarEntry* _vala_found_year = NULL;
SidebarEntry* result = NULL;
- Block7Data* _data7_;
- Event* _tmp0_ = NULL;
- struct tm _tmp1_ = {0};
- SidebarEntry* _tmp2_ = NULL;
- SidebarEntry* _tmp3_ = NULL;
- struct tm _tmp4_ = {0};
- gint _tmp5_ = 0;
- SidebarEntry* _tmp6_ = NULL;
- SidebarEntry* _tmp7_ = NULL;
+ Block8Data* _data8_;
+ Event* _tmp0_;
+ struct tm _tmp1_;
+ SidebarEntry* _tmp2_;
+ SidebarEntry* _tmp3_;
+ struct tm _tmp4_;
+ gint _tmp5_;
+ SidebarEntry* _tmp6_;
+ SidebarEntry* _tmp7_;
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL);
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2725,11 +2722,11 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event*
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (event_tm != NULL, NULL);
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data7_ = g_slice_new0 (Block7Data);
+ _data8_ = g_slice_new0 (Block8Data);
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data7_->_ref_count_ = 1;
+ _data8_->_ref_count_ = 1;
#line 298 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data7_->self = g_object_ref (self);
+ _data8_->self = g_object_ref (self);
#line 300 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp0_ = event;
#line 300 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2747,90 +2744,90 @@ static SidebarEntry* events_branch_find_event_month (EventsBranch* self, Event*
#line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
result = NULL;
#line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
- block7_data_unref (_data7_);
+ block8_data_unref (_data8_);
#line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data7_ = NULL;
+ _data8_ = NULL;
#line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (found_year) {
#line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
*found_year = _vala_found_year;
-#line 2758 "Branch.c"
+#line 2755 "Branch.c"
} else {
#line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (_vala_found_year);
-#line 2762 "Branch.c"
+#line 2759 "Branch.c"
}
#line 302 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 2766 "Branch.c"
+#line 2763 "Branch.c"
}
#line 304 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp4_ = *event_tm;
#line 304 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp5_ = _tmp4_.tm_mon;
#line 304 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data7_->event_month = _tmp5_ + 1;
+ _data8_->event_month = _tmp5_ + 1;
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp6_ = _vala_found_year;
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp7_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp6_, ___lambda17__locator, _data7_);
+ _tmp7_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp6_, ___lambda19__locator, _data8_);
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
result = _tmp7_;
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
- block7_data_unref (_data7_);
+ block8_data_unref (_data8_);
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data7_ = NULL;
+ _data8_ = NULL;
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (found_year) {
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
*found_year = _vala_found_year;
-#line 2788 "Branch.c"
+#line 2785 "Branch.c"
} else {
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (_vala_found_year);
-#line 2792 "Branch.c"
+#line 2789 "Branch.c"
}
#line 307 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 2796 "Branch.c"
+#line 2793 "Branch.c"
}
-static Block8Data* block8_data_ref (Block8Data* _data8_) {
+static Block9Data* block9_data_ref (Block9Data* _data9_) {
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
- g_atomic_int_inc (&_data8_->_ref_count_);
+ g_atomic_int_inc (&_data9_->_ref_count_);
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
- return _data8_;
-#line 2805 "Branch.c"
+ return _data9_;
+#line 2802 "Branch.c"
}
-static void block8_data_unref (void * _userdata_) {
- Block8Data* _data8_;
- _data8_ = (Block8Data*) _userdata_;
+static void block9_data_unref (void * _userdata_) {
+ Block9Data* _data9_;
+ _data9_ = (Block9Data*) _userdata_;
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
- if (g_atomic_int_dec_and_test (&_data8_->_ref_count_)) {
-#line 2814 "Branch.c"
+ if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) {
+#line 2811 "Branch.c"
EventsBranch* self;
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
- self = _data8_->self;
+ self = _data9_->self;
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (self);
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
- g_slice_free (Block8Data, _data8_);
-#line 2822 "Branch.c"
+ g_slice_free (Block9Data, _data9_);
+#line 2819 "Branch.c"
}
}
-static gboolean __lambda16_ (Block8Data* _data8_, SidebarEntry* entry) {
+static gboolean __lambda18_ (Block9Data* _data9_, SidebarEntry* entry) {
EventsBranch* self;
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
- SidebarEntry* _tmp2_ = NULL;
+ SidebarEntry* _tmp2_;
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
- self = _data8_->self;
+ self = _data9_->self;
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
#line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2839,27 +2836,27 @@ static gboolean __lambda16_ (Block8Data* _data8_, SidebarEntry* entry) {
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY)) {
#line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp1_ = TRUE;
-#line 2843 "Branch.c"
+#line 2840 "Branch.c"
} else {
- SidebarEntry* _tmp3_ = NULL;
+ SidebarEntry* _tmp3_;
#line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp3_ = entry;
#line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, EVENTS_TYPE_NO_EVENT_ENTRY);
-#line 2850 "Branch.c"
+#line 2847 "Branch.c"
}
#line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp1_) {
#line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp0_ = TRUE;
-#line 2856 "Branch.c"
+#line 2853 "Branch.c"
} else {
- SidebarEntry* _tmp4_ = NULL;
+ SidebarEntry* _tmp4_;
#line 317 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp4_ = entry;
#line 317 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY);
-#line 2863 "Branch.c"
+#line 2860 "Branch.c"
}
#line 316 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp0_) {
@@ -2867,41 +2864,41 @@ static gboolean __lambda16_ (Block8Data* _data8_, SidebarEntry* entry) {
result = FALSE;
#line 318 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 2871 "Branch.c"
+#line 2868 "Branch.c"
} else {
- SidebarEntry* _tmp5_ = NULL;
- gint _tmp6_ = 0;
+ SidebarEntry* _tmp5_;
+ gint _tmp6_;
#line 320 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp5_ = entry;
#line 320 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp6_ = events_year_directory_entry_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry));
#line 320 "/home/jens/Source/shotwell/src/events/Branch.vala"
- result = _tmp6_ == _data8_->event_year;
+ result = _tmp6_ == _data9_->event_year;
#line 320 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 2883 "Branch.c"
+#line 2880 "Branch.c"
}
}
-static gboolean ___lambda16__locator (gconstpointer item, gpointer self) {
+static gboolean ___lambda18__locator (gconstpointer item, gpointer self) {
gboolean result;
- result = __lambda16_ (self, (SidebarEntry*) item);
+ result = __lambda18_ (self, (SidebarEntry*) item);
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 2893 "Branch.c"
+#line 2890 "Branch.c"
}
static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* event, struct tm* event_tm) {
SidebarEntry* result = NULL;
- Block8Data* _data8_;
- struct tm _tmp0_ = {0};
- gint _tmp1_ = 0;
- SidebarEntry* _tmp2_ = NULL;
- SidebarEntry* _tmp3_ = NULL;
- SidebarEntry* _tmp4_ = NULL;
- SidebarEntry* _tmp5_ = NULL;
+ Block9Data* _data9_;
+ struct tm _tmp0_;
+ gint _tmp1_;
+ SidebarEntry* _tmp2_;
+ SidebarEntry* _tmp3_;
+ SidebarEntry* _tmp4_;
+ SidebarEntry* _tmp5_;
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (EVENTS_IS_BRANCH (self), NULL);
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2909,23 +2906,23 @@ static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* e
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (event_tm != NULL, NULL);
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data8_ = g_slice_new0 (Block8Data);
+ _data9_ = g_slice_new0 (Block9Data);
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data8_->_ref_count_ = 1;
+ _data9_->_ref_count_ = 1;
#line 312 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data8_->self = g_object_ref (self);
+ _data9_->self = g_object_ref (self);
#line 313 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp0_ = *event_tm;
#line 313 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp1_ = _tmp0_.tm_year;
#line 313 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data8_->event_year = _tmp1_ + 1900;
+ _data9_->event_year = _tmp1_ + 1900;
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp3_ = _tmp2_;
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _tmp4_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, ___lambda16__locator, _data8_);
+ _tmp4_ = sidebar_branch_find_first_child (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, ___lambda18__locator, _data9_);
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp5_ = _tmp4_;
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2933,12 +2930,12 @@ static SidebarEntry* events_branch_find_event_year (EventsBranch* self, Event* e
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
result = _tmp5_;
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
- block8_data_unref (_data8_);
+ block9_data_unref (_data9_);
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
- _data8_ = NULL;
+ _data9_ = NULL;
#line 315 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 2942 "Branch.c"
+#line 2939 "Branch.c"
}
@@ -2947,15 +2944,15 @@ static gint _events_branch_undated_event_comparator_gcompare_func (gconstpointer
result = events_branch_undated_event_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
#line 326 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 2951 "Branch.c"
+#line 2948 "Branch.c"
}
static void events_branch_add_undated_event (EventsBranch* self, Event* event) {
- EventsUndatedDirectoryEntry* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- EventsUndatedDirectoryEntry* _tmp5_ = NULL;
- Event* _tmp6_ = NULL;
+ EventsUndatedDirectoryEntry* _tmp0_;
+ gboolean _tmp1_;
+ EventsUndatedDirectoryEntry* _tmp5_;
+ Event* _tmp6_;
#line 324 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 324 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2966,10 +2963,10 @@ static void events_branch_add_undated_event (EventsBranch* self, Event* event) {
_tmp1_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
#line 325 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (!_tmp1_) {
-#line 2970 "Branch.c"
- SidebarEntry* _tmp2_ = NULL;
- SidebarEntry* _tmp3_ = NULL;
- EventsUndatedDirectoryEntry* _tmp4_ = NULL;
+#line 2967 "Branch.c"
+ SidebarEntry* _tmp2_;
+ SidebarEntry* _tmp3_;
+ EventsUndatedDirectoryEntry* _tmp4_;
#line 326 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
#line 326 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -2980,7 +2977,7 @@ static void events_branch_add_undated_event (EventsBranch* self, Event* event) {
sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _events_branch_undated_event_comparator_gcompare_func);
#line 326 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (_tmp3_);
-#line 2984 "Branch.c"
+#line 2981 "Branch.c"
}
#line 328 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp5_ = self->priv->undated_entry;
@@ -2988,15 +2985,15 @@ static void events_branch_add_undated_event (EventsBranch* self, Event* event) {
_tmp6_ = event;
#line 328 "/home/jens/Source/shotwell/src/events/Branch.vala"
events_branch_graft_event (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp6_, NULL);
-#line 2992 "Branch.c"
+#line 2989 "Branch.c"
}
static void events_branch_move_to_undated_event (EventsBranch* self, Event* event) {
- EventsUndatedDirectoryEntry* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- Event* _tmp5_ = NULL;
- EventsUndatedDirectoryEntry* _tmp6_ = NULL;
+ EventsUndatedDirectoryEntry* _tmp0_;
+ gboolean _tmp1_;
+ Event* _tmp5_;
+ EventsUndatedDirectoryEntry* _tmp6_;
#line 331 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 331 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3007,10 +3004,10 @@ static void events_branch_move_to_undated_event (EventsBranch* self, Event* even
_tmp1_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
#line 332 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (!_tmp1_) {
-#line 3011 "Branch.c"
- SidebarEntry* _tmp2_ = NULL;
- SidebarEntry* _tmp3_ = NULL;
- EventsUndatedDirectoryEntry* _tmp4_ = NULL;
+#line 3008 "Branch.c"
+ SidebarEntry* _tmp2_;
+ SidebarEntry* _tmp3_;
+ EventsUndatedDirectoryEntry* _tmp4_;
#line 333 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
#line 333 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3021,7 +3018,7 @@ static void events_branch_move_to_undated_event (EventsBranch* self, Event* even
sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
#line 333 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (_tmp3_);
-#line 3025 "Branch.c"
+#line 3022 "Branch.c"
}
#line 335 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp5_ = event;
@@ -3029,18 +3026,18 @@ static void events_branch_move_to_undated_event (EventsBranch* self, Event* even
_tmp6_ = self->priv->undated_entry;
#line 335 "/home/jens/Source/shotwell/src/events/Branch.vala"
events_branch_reparent_event (self, _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 3033 "Branch.c"
+#line 3030 "Branch.c"
}
static void events_branch_graft_event (EventsBranch* self, SidebarEntry* parent, Event* event, GCompareFunc comparator) {
EventsEventEntry* entry = NULL;
- Event* _tmp0_ = NULL;
- EventsEventEntry* _tmp1_ = NULL;
- GeeHashMap* _tmp2_ = NULL;
- Event* _tmp3_ = NULL;
- SidebarEntry* _tmp4_ = NULL;
- GCompareFunc _tmp5_ = NULL;
+ Event* _tmp0_;
+ EventsEventEntry* _tmp1_;
+ GeeHashMap* _tmp2_;
+ Event* _tmp3_;
+ SidebarEntry* _tmp4_;
+ GCompareFunc _tmp5_;
#line 338 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 338 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3067,22 +3064,22 @@ static void events_branch_graft_event (EventsBranch* self, SidebarEntry* parent,
sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp5_);
#line 338 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (entry);
-#line 3071 "Branch.c"
+#line 3068 "Branch.c"
}
static void events_branch_reparent_event (EventsBranch* self, Event* event, SidebarEntry* new_parent) {
EventsEventEntry* entry = NULL;
- GeeHashMap* _tmp0_ = NULL;
- Event* _tmp1_ = NULL;
- gpointer _tmp2_ = NULL;
- EventsEventEntry* _tmp3_ = NULL;
+ GeeHashMap* _tmp0_;
+ Event* _tmp1_;
+ gpointer _tmp2_;
+ EventsEventEntry* _tmp3_;
SidebarEntry* old_parent = NULL;
- EventsEventEntry* _tmp4_ = NULL;
- SidebarEntry* _tmp5_ = NULL;
- SidebarEntry* _tmp6_ = NULL;
- SidebarEntry* _tmp7_ = NULL;
- EventsEventEntry* _tmp8_ = NULL;
+ EventsEventEntry* _tmp4_;
+ SidebarEntry* _tmp5_;
+ SidebarEntry* _tmp6_;
+ SidebarEntry* _tmp7_;
+ EventsEventEntry* _tmp8_;
#line 346 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 346 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3119,27 +3116,27 @@ static void events_branch_reparent_event (EventsBranch* self, Event* event, Side
sidebar_branch_reparent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
while (TRUE) {
-#line 3123 "Branch.c"
+#line 3120 "Branch.c"
gboolean _tmp9_ = FALSE;
- SidebarEntry* _tmp10_ = NULL;
- gint _tmp11_ = 0;
+ SidebarEntry* _tmp10_;
+ gint _tmp11_;
SidebarEntry* grandparent = NULL;
- SidebarEntry* _tmp15_ = NULL;
- SidebarEntry* _tmp16_ = NULL;
- SidebarEntry* _tmp17_ = NULL;
- SidebarEntry* _tmp18_ = NULL;
- SidebarEntry* _tmp19_ = NULL;
- SidebarEntry* _tmp20_ = NULL;
+ SidebarEntry* _tmp15_;
+ SidebarEntry* _tmp16_;
+ SidebarEntry* _tmp17_;
+ SidebarEntry* _tmp18_;
+ SidebarEntry* _tmp19_;
+ SidebarEntry* _tmp20_;
#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp10_ = old_parent;
#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp11_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp10_);
#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp11_ == 0) {
-#line 3140 "Branch.c"
- SidebarEntry* _tmp12_ = NULL;
- SidebarEntry* _tmp13_ = NULL;
- SidebarEntry* _tmp14_ = NULL;
+#line 3137 "Branch.c"
+ SidebarEntry* _tmp12_;
+ SidebarEntry* _tmp13_;
+ SidebarEntry* _tmp14_;
#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp12_ = old_parent;
#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3150,17 +3147,17 @@ static void events_branch_reparent_event (EventsBranch* self, Event* event, Side
_tmp9_ = _tmp12_ != _tmp14_;
#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (_tmp14_);
-#line 3154 "Branch.c"
+#line 3151 "Branch.c"
} else {
#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp9_ = FALSE;
-#line 3158 "Branch.c"
+#line 3155 "Branch.c"
}
#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (!_tmp9_) {
#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
break;
-#line 3164 "Branch.c"
+#line 3161 "Branch.c"
}
#line 356 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp15_ = old_parent;
@@ -3186,46 +3183,46 @@ static void events_branch_reparent_event (EventsBranch* self, Event* event, Side
old_parent = _tmp20_;
#line 355 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (grandparent);
-#line 3190 "Branch.c"
+#line 3187 "Branch.c"
}
#line 346 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (old_parent);
#line 346 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (entry);
-#line 3196 "Branch.c"
+#line 3193 "Branch.c"
}
static void events_branch_show_no_events (EventsBranch* self, gboolean show) {
gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
#line 365 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_if_fail (EVENTS_IS_BRANCH (self));
#line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp1_ = show;
#line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp1_) {
-#line 3209 "Branch.c"
- EventsNoEventEntry* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 3206 "Branch.c"
+ EventsNoEventEntry* _tmp2_;
+ gboolean _tmp3_;
#line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp2_ = self->priv->no_event_entry;
#line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp3_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
#line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp0_ = !_tmp3_;
-#line 3218 "Branch.c"
+#line 3215 "Branch.c"
} else {
#line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp0_ = FALSE;
-#line 3222 "Branch.c"
+#line 3219 "Branch.c"
}
#line 366 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp0_) {
-#line 3226 "Branch.c"
- SidebarEntry* _tmp4_ = NULL;
- SidebarEntry* _tmp5_ = NULL;
- EventsNoEventEntry* _tmp6_ = NULL;
+#line 3223 "Branch.c"
+ SidebarEntry* _tmp4_;
+ SidebarEntry* _tmp5_;
+ EventsNoEventEntry* _tmp6_;
#line 367 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp4_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
#line 367 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3236,48 +3233,48 @@ static void events_branch_show_no_events (EventsBranch* self, gboolean show) {
sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
#line 367 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (_tmp5_);
-#line 3240 "Branch.c"
+#line 3237 "Branch.c"
} else {
gboolean _tmp7_ = FALSE;
- gboolean _tmp8_ = FALSE;
+ gboolean _tmp8_;
#line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp8_ = show;
#line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (!_tmp8_) {
-#line 3248 "Branch.c"
- EventsNoEventEntry* _tmp9_ = NULL;
- gboolean _tmp10_ = FALSE;
+#line 3245 "Branch.c"
+ EventsNoEventEntry* _tmp9_;
+ gboolean _tmp10_;
#line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp9_ = self->priv->no_event_entry;
#line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp10_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
#line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp7_ = _tmp10_;
-#line 3257 "Branch.c"
+#line 3254 "Branch.c"
} else {
#line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp7_ = FALSE;
-#line 3261 "Branch.c"
+#line 3258 "Branch.c"
}
#line 368 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp7_) {
-#line 3265 "Branch.c"
- EventsNoEventEntry* _tmp11_ = NULL;
+#line 3262 "Branch.c"
+ EventsNoEventEntry* _tmp11_;
#line 369 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp11_ = self->priv->no_event_entry;
#line 369 "/home/jens/Source/shotwell/src/events/Branch.vala"
sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 3271 "Branch.c"
+#line 3268 "Branch.c"
}
}
}
static void events_branch_class_init (EventsBranchClass * klass) {
- gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
#line 7 "/home/jens/Source/shotwell/src/events/Branch.vala"
events_branch_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3300,15 +3297,15 @@ static void events_branch_class_init (EventsBranchClass * klass) {
_tmp3_ = g_strdup (RESOURCES_ICON_NO_EVENT);
#line 11 "/home/jens/Source/shotwell/src/events/Branch.vala"
events_branch_no_event_icon = _tmp3_;
-#line 3304 "Branch.c"
+#line 3301 "Branch.c"
}
static void events_branch_instance_init (EventsBranch * self) {
- GeeHashMap* _tmp0_ = NULL;
- EventsUndatedDirectoryEntry* _tmp1_ = NULL;
- EventsNoEventEntry* _tmp2_ = NULL;
- EventsMasterDirectoryEntry* _tmp3_ = NULL;
+ GeeHashMap* _tmp0_;
+ EventsUndatedDirectoryEntry* _tmp1_;
+ EventsNoEventEntry* _tmp2_;
+ EventsMasterDirectoryEntry* _tmp3_;
#line 7 "/home/jens/Source/shotwell/src/events/Branch.vala"
self->priv = EVENTS_BRANCH_GET_PRIVATE (self);
#line 18 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3327,21 +3324,21 @@ static void events_branch_instance_init (EventsBranch * self) {
_tmp3_ = events_master_directory_entry_new ();
#line 22 "/home/jens/Source/shotwell/src/events/Branch.vala"
self->priv->all_events_entry = _tmp3_;
-#line 3331 "Branch.c"
+#line 3328 "Branch.c"
}
-static void events_branch_finalize (GObject* obj) {
+static void events_branch_finalize (GObject * obj) {
EventsBranch * self;
- EventSourceCollection* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- EventSourceCollection* _tmp2_ = NULL;
- guint _tmp3_ = 0U;
- EventSourceCollection* _tmp4_ = NULL;
- guint _tmp5_ = 0U;
- ConfigFacade* _tmp6_ = NULL;
- ConfigFacade* _tmp7_ = NULL;
- guint _tmp8_ = 0U;
+ EventSourceCollection* _tmp0_;
+ guint _tmp1_;
+ EventSourceCollection* _tmp2_;
+ guint _tmp3_;
+ EventSourceCollection* _tmp4_;
+ guint _tmp5_;
+ ConfigFacade* _tmp6_;
+ ConfigFacade* _tmp7_;
+ guint _tmp8_;
#line 7 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_BRANCH, EventsBranch);
#line 46 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3382,7 +3379,7 @@ static void events_branch_finalize (GObject* obj) {
_g_object_unref0 (self->priv->all_events_entry);
#line 7 "/home/jens/Source/shotwell/src/events/Branch.vala"
G_OBJECT_CLASS (events_branch_parent_class)->finalize (obj);
-#line 3386 "Branch.c"
+#line 3383 "Branch.c"
}
@@ -3404,15 +3401,15 @@ EventsDirectoryEntry* events_directory_entry_construct (GType object_type) {
self = (EventsDirectoryEntry*) sidebar_simple_page_entry_construct (object_type);
#line 374 "/home/jens/Source/shotwell/src/events/Branch.vala"
return self;
-#line 3408 "Branch.c"
+#line 3405 "Branch.c"
}
static gchar* events_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
EventsDirectoryEntry * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 377 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_DIRECTORY_ENTRY, EventsDirectoryEntry);
#line 378 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3423,7 +3420,7 @@ static gchar* events_directory_entry_real_get_sidebar_icon (SidebarSimplePageEnt
result = _tmp1_;
#line 378 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 3427 "Branch.c"
+#line 3424 "Branch.c"
}
@@ -3436,7 +3433,7 @@ static gboolean events_directory_entry_real_expand_on_select (SidebarExpandableE
result = TRUE;
#line 382 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 3440 "Branch.c"
+#line 3437 "Branch.c"
}
@@ -3444,8 +3441,8 @@ static void events_directory_entry_class_init (EventsDirectoryEntryClass * klass
#line 373 "/home/jens/Source/shotwell/src/events/Branch.vala"
events_directory_entry_parent_class = g_type_class_peek_parent (klass);
#line 373 "/home/jens/Source/shotwell/src/events/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) events_directory_entry_real_get_sidebar_icon;
-#line 3449 "Branch.c"
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_directory_entry_real_get_sidebar_icon;
+#line 3446 "Branch.c"
}
@@ -3453,8 +3450,8 @@ static void events_directory_entry_sidebar_expandable_entry_interface_init (Side
#line 373 "/home/jens/Source/shotwell/src/events/Branch.vala"
events_directory_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface);
#line 373 "/home/jens/Source/shotwell/src/events/Branch.vala"
- iface->expand_on_select = (gboolean (*)(SidebarExpandableEntry*)) events_directory_entry_real_expand_on_select;
-#line 3458 "Branch.c"
+ iface->expand_on_select = (gboolean (*) (SidebarExpandableEntry *)) events_directory_entry_real_expand_on_select;
+#line 3455 "Branch.c"
}
@@ -3482,21 +3479,21 @@ EventsMasterDirectoryEntry* events_master_directory_entry_construct (GType objec
self = (EventsMasterDirectoryEntry*) events_directory_entry_construct (object_type);
#line 387 "/home/jens/Source/shotwell/src/events/Branch.vala"
return self;
-#line 3486 "Branch.c"
+#line 3483 "Branch.c"
}
EventsMasterDirectoryEntry* events_master_directory_entry_new (void) {
#line 387 "/home/jens/Source/shotwell/src/events/Branch.vala"
return events_master_directory_entry_construct (EVENTS_TYPE_MASTER_DIRECTORY_ENTRY);
-#line 3493 "Branch.c"
+#line 3490 "Branch.c"
}
static gchar* events_master_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
EventsMasterDirectoryEntry * self;
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 390 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY, EventsMasterDirectoryEntry);
#line 391 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3505,15 +3502,15 @@ static gchar* events_master_directory_entry_real_get_sidebar_name (SidebarSimple
result = _tmp0_;
#line 391 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 3509 "Branch.c"
+#line 3506 "Branch.c"
}
static gchar* events_master_directory_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
EventsMasterDirectoryEntry * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 394 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY, EventsMasterDirectoryEntry);
#line 395 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3524,14 +3521,14 @@ static gchar* events_master_directory_entry_real_get_sidebar_icon (SidebarSimple
result = _tmp1_;
#line 395 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 3528 "Branch.c"
+#line 3525 "Branch.c"
}
static Page* events_master_directory_entry_real_create_page (SidebarSimplePageEntry* base) {
EventsMasterDirectoryEntry * self;
Page* result = NULL;
- MasterEventsDirectoryPage* _tmp0_ = NULL;
+ MasterEventsDirectoryPage* _tmp0_;
#line 398 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MASTER_DIRECTORY_ENTRY, EventsMasterDirectoryEntry);
#line 399 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3542,7 +3539,7 @@ static Page* events_master_directory_entry_real_create_page (SidebarSimplePageEn
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
#line 399 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 3546 "Branch.c"
+#line 3543 "Branch.c"
}
@@ -3550,12 +3547,12 @@ static void events_master_directory_entry_class_init (EventsMasterDirectoryEntry
#line 386 "/home/jens/Source/shotwell/src/events/Branch.vala"
events_master_directory_entry_parent_class = g_type_class_peek_parent (klass);
#line 386 "/home/jens/Source/shotwell/src/events/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_master_directory_entry_real_get_sidebar_name;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_master_directory_entry_real_get_sidebar_name;
#line 386 "/home/jens/Source/shotwell/src/events/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) events_master_directory_entry_real_get_sidebar_icon;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_master_directory_entry_real_get_sidebar_icon;
#line 386 "/home/jens/Source/shotwell/src/events/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_master_directory_entry_real_create_page;
-#line 3559 "Branch.c"
+ ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_master_directory_entry_real_create_page;
+#line 3556 "Branch.c"
}
@@ -3577,9 +3574,9 @@ GType events_master_directory_entry_get_type (void) {
EventsYearDirectoryEntry* events_year_directory_entry_construct (GType object_type, const gchar* name, struct tm* tm) {
EventsYearDirectoryEntry * self = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- struct tm _tmp2_ = {0};
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ struct tm _tmp2_;
#line 407 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 407 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3600,22 +3597,22 @@ EventsYearDirectoryEntry* events_year_directory_entry_construct (GType object_ty
self->priv->tm = _tmp2_;
#line 407 "/home/jens/Source/shotwell/src/events/Branch.vala"
return self;
-#line 3604 "Branch.c"
+#line 3601 "Branch.c"
}
EventsYearDirectoryEntry* events_year_directory_entry_new (const gchar* name, struct tm* tm) {
#line 407 "/home/jens/Source/shotwell/src/events/Branch.vala"
return events_year_directory_entry_construct (EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, name, tm);
-#line 3611 "Branch.c"
+#line 3608 "Branch.c"
}
static gchar* events_year_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
EventsYearDirectoryEntry * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 412 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry);
#line 413 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3626,14 +3623,14 @@ static gchar* events_year_directory_entry_real_get_sidebar_name (SidebarSimplePa
result = _tmp1_;
#line 413 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 3630 "Branch.c"
+#line 3627 "Branch.c"
}
gint events_year_directory_entry_get_year (EventsYearDirectoryEntry* self) {
gint result = 0;
- struct tm _tmp0_ = {0};
- gint _tmp1_ = 0;
+ struct tm _tmp0_;
+ gint _tmp1_;
#line 416 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (EVENTS_IS_YEAR_DIRECTORY_ENTRY (self), 0);
#line 417 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3644,15 +3641,15 @@ gint events_year_directory_entry_get_year (EventsYearDirectoryEntry* self) {
result = _tmp1_ + 1900;
#line 417 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 3648 "Branch.c"
+#line 3645 "Branch.c"
}
static Page* events_year_directory_entry_real_create_page (SidebarSimplePageEntry* base) {
EventsYearDirectoryEntry * self;
Page* result = NULL;
- struct tm _tmp0_ = {0};
- SubEventsDirectoryPage* _tmp1_ = NULL;
+ struct tm _tmp0_;
+ SubEventsDirectoryPage* _tmp1_;
#line 420 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry);
#line 421 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3665,7 +3662,7 @@ static Page* events_year_directory_entry_real_create_page (SidebarSimplePageEntr
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
#line 421 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 3669 "Branch.c"
+#line 3666 "Branch.c"
}
@@ -3675,23 +3672,23 @@ static void events_year_directory_entry_class_init (EventsYearDirectoryEntryClas
#line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_type_class_add_private (klass, sizeof (EventsYearDirectoryEntryPrivate));
#line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_year_directory_entry_real_get_sidebar_name;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_year_directory_entry_real_get_sidebar_name;
#line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_year_directory_entry_real_create_page;
+ ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_year_directory_entry_real_create_page;
#line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
G_OBJECT_CLASS (klass)->finalize = events_year_directory_entry_finalize;
-#line 3684 "Branch.c"
+#line 3681 "Branch.c"
}
static void events_year_directory_entry_instance_init (EventsYearDirectoryEntry * self) {
#line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
self->priv = EVENTS_YEAR_DIRECTORY_ENTRY_GET_PRIVATE (self);
-#line 3691 "Branch.c"
+#line 3688 "Branch.c"
}
-static void events_year_directory_entry_finalize (GObject* obj) {
+static void events_year_directory_entry_finalize (GObject * obj) {
EventsYearDirectoryEntry * self;
#line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_YEAR_DIRECTORY_ENTRY, EventsYearDirectoryEntry);
@@ -3699,7 +3696,7 @@ static void events_year_directory_entry_finalize (GObject* obj) {
_g_free0 (self->priv->name);
#line 403 "/home/jens/Source/shotwell/src/events/Branch.vala"
G_OBJECT_CLASS (events_year_directory_entry_parent_class)->finalize (obj);
-#line 3703 "Branch.c"
+#line 3700 "Branch.c"
}
@@ -3717,9 +3714,9 @@ GType events_year_directory_entry_get_type (void) {
EventsMonthDirectoryEntry* events_month_directory_entry_construct (GType object_type, const gchar* name, struct tm* tm) {
EventsMonthDirectoryEntry * self = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- struct tm _tmp2_ = {0};
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ struct tm _tmp2_;
#line 429 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 429 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3740,22 +3737,22 @@ EventsMonthDirectoryEntry* events_month_directory_entry_construct (GType object_
self->priv->tm = _tmp2_;
#line 429 "/home/jens/Source/shotwell/src/events/Branch.vala"
return self;
-#line 3744 "Branch.c"
+#line 3741 "Branch.c"
}
EventsMonthDirectoryEntry* events_month_directory_entry_new (const gchar* name, struct tm* tm) {
#line 429 "/home/jens/Source/shotwell/src/events/Branch.vala"
return events_month_directory_entry_construct (EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, name, tm);
-#line 3751 "Branch.c"
+#line 3748 "Branch.c"
}
static gchar* events_month_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
EventsMonthDirectoryEntry * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 434 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry);
#line 435 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3766,14 +3763,14 @@ static gchar* events_month_directory_entry_real_get_sidebar_name (SidebarSimpleP
result = _tmp1_;
#line 435 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 3770 "Branch.c"
+#line 3767 "Branch.c"
}
gint events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self) {
gint result = 0;
- struct tm _tmp0_ = {0};
- gint _tmp1_ = 0;
+ struct tm _tmp0_;
+ gint _tmp1_;
#line 438 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (EVENTS_IS_MONTH_DIRECTORY_ENTRY (self), 0);
#line 439 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3784,14 +3781,14 @@ gint events_month_directory_entry_get_year (EventsMonthDirectoryEntry* self) {
result = _tmp1_ + 1900;
#line 439 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 3788 "Branch.c"
+#line 3785 "Branch.c"
}
gint events_month_directory_entry_get_month (EventsMonthDirectoryEntry* self) {
gint result = 0;
- struct tm _tmp0_ = {0};
- gint _tmp1_ = 0;
+ struct tm _tmp0_;
+ gint _tmp1_;
#line 442 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (EVENTS_IS_MONTH_DIRECTORY_ENTRY (self), 0);
#line 443 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3802,15 +3799,15 @@ gint events_month_directory_entry_get_month (EventsMonthDirectoryEntry* self) {
result = _tmp1_ + 1;
#line 443 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 3806 "Branch.c"
+#line 3803 "Branch.c"
}
static Page* events_month_directory_entry_real_create_page (SidebarSimplePageEntry* base) {
EventsMonthDirectoryEntry * self;
Page* result = NULL;
- struct tm _tmp0_ = {0};
- SubEventsDirectoryPage* _tmp1_ = NULL;
+ struct tm _tmp0_;
+ SubEventsDirectoryPage* _tmp1_;
#line 446 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry);
#line 447 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3823,7 +3820,7 @@ static Page* events_month_directory_entry_real_create_page (SidebarSimplePageEnt
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
#line 447 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 3827 "Branch.c"
+#line 3824 "Branch.c"
}
@@ -3833,23 +3830,23 @@ static void events_month_directory_entry_class_init (EventsMonthDirectoryEntryCl
#line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_type_class_add_private (klass, sizeof (EventsMonthDirectoryEntryPrivate));
#line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_month_directory_entry_real_get_sidebar_name;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_month_directory_entry_real_get_sidebar_name;
#line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_month_directory_entry_real_create_page;
+ ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_month_directory_entry_real_create_page;
#line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
G_OBJECT_CLASS (klass)->finalize = events_month_directory_entry_finalize;
-#line 3842 "Branch.c"
+#line 3839 "Branch.c"
}
static void events_month_directory_entry_instance_init (EventsMonthDirectoryEntry * self) {
#line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
self->priv = EVENTS_MONTH_DIRECTORY_ENTRY_GET_PRIVATE (self);
-#line 3849 "Branch.c"
+#line 3846 "Branch.c"
}
-static void events_month_directory_entry_finalize (GObject* obj) {
+static void events_month_directory_entry_finalize (GObject * obj) {
EventsMonthDirectoryEntry * self;
#line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_MONTH_DIRECTORY_ENTRY, EventsMonthDirectoryEntry);
@@ -3857,7 +3854,7 @@ static void events_month_directory_entry_finalize (GObject* obj) {
_g_free0 (self->priv->name);
#line 425 "/home/jens/Source/shotwell/src/events/Branch.vala"
G_OBJECT_CLASS (events_month_directory_entry_parent_class)->finalize (obj);
-#line 3861 "Branch.c"
+#line 3858 "Branch.c"
}
@@ -3879,21 +3876,21 @@ EventsUndatedDirectoryEntry* events_undated_directory_entry_construct (GType obj
self = (EventsUndatedDirectoryEntry*) events_directory_entry_construct (object_type);
#line 452 "/home/jens/Source/shotwell/src/events/Branch.vala"
return self;
-#line 3883 "Branch.c"
+#line 3880 "Branch.c"
}
EventsUndatedDirectoryEntry* events_undated_directory_entry_new (void) {
#line 452 "/home/jens/Source/shotwell/src/events/Branch.vala"
return events_undated_directory_entry_construct (EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY);
-#line 3890 "Branch.c"
+#line 3887 "Branch.c"
}
static gchar* events_undated_directory_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
EventsUndatedDirectoryEntry * self;
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 455 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY, EventsUndatedDirectoryEntry);
#line 456 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3902,7 +3899,7 @@ static gchar* events_undated_directory_entry_real_get_sidebar_name (SidebarSimpl
result = _tmp0_;
#line 456 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 3906 "Branch.c"
+#line 3903 "Branch.c"
}
@@ -3910,7 +3907,7 @@ static Page* events_undated_directory_entry_real_create_page (SidebarSimplePageE
EventsUndatedDirectoryEntry * self;
Page* result = NULL;
struct tm _tmp0_ = {0};
- SubEventsDirectoryPage* _tmp1_ = NULL;
+ SubEventsDirectoryPage* _tmp1_;
#line 459 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_UNDATED_DIRECTORY_ENTRY, EventsUndatedDirectoryEntry);
#line 460 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3923,7 +3920,7 @@ static Page* events_undated_directory_entry_real_create_page (SidebarSimplePageE
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
#line 460 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 3927 "Branch.c"
+#line 3924 "Branch.c"
}
@@ -3931,10 +3928,10 @@ static void events_undated_directory_entry_class_init (EventsUndatedDirectoryEnt
#line 451 "/home/jens/Source/shotwell/src/events/Branch.vala"
events_undated_directory_entry_parent_class = g_type_class_peek_parent (klass);
#line 451 "/home/jens/Source/shotwell/src/events/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_undated_directory_entry_real_get_sidebar_name;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_undated_directory_entry_real_get_sidebar_name;
#line 451 "/home/jens/Source/shotwell/src/events/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_undated_directory_entry_real_create_page;
-#line 3938 "Branch.c"
+ ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_undated_directory_entry_real_create_page;
+#line 3935 "Branch.c"
}
@@ -3956,8 +3953,8 @@ GType events_undated_directory_entry_get_type (void) {
EventsEventEntry* events_event_entry_construct (GType object_type, Event* event) {
EventsEventEntry * self = NULL;
- Event* _tmp0_ = NULL;
- Event* _tmp1_ = NULL;
+ Event* _tmp0_;
+ Event* _tmp1_;
#line 469 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (IS_EVENT (event), NULL);
#line 469 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3972,21 +3969,21 @@ EventsEventEntry* events_event_entry_construct (GType object_type, Event* event)
self->priv->event = _tmp1_;
#line 469 "/home/jens/Source/shotwell/src/events/Branch.vala"
return self;
-#line 3976 "Branch.c"
+#line 3973 "Branch.c"
}
EventsEventEntry* events_event_entry_new (Event* event) {
#line 469 "/home/jens/Source/shotwell/src/events/Branch.vala"
return events_event_entry_construct (EVENTS_TYPE_EVENT_ENTRY, event);
-#line 3983 "Branch.c"
+#line 3980 "Branch.c"
}
Event* events_event_entry_get_event (EventsEventEntry* self) {
Event* result = NULL;
- Event* _tmp0_ = NULL;
- Event* _tmp1_ = NULL;
+ Event* _tmp0_;
+ Event* _tmp1_;
#line 473 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_return_val_if_fail (EVENTS_IS_EVENT_ENTRY (self), NULL);
#line 474 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -3997,15 +3994,15 @@ Event* events_event_entry_get_event (EventsEventEntry* self) {
result = _tmp1_;
#line 474 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 4001 "Branch.c"
+#line 3998 "Branch.c"
}
static gchar* events_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
EventsEventEntry * self;
gchar* result = NULL;
- Event* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ Event* _tmp0_;
+ gchar* _tmp1_;
#line 477 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
#line 478 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4016,15 +4013,15 @@ static gchar* events_event_entry_real_get_sidebar_name (SidebarSimplePageEntry*
result = _tmp1_;
#line 478 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 4020 "Branch.c"
+#line 4017 "Branch.c"
}
static gchar* events_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
EventsEventEntry * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 481 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
#line 482 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4035,15 +4032,15 @@ static gchar* events_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry*
result = _tmp1_;
#line 482 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 4039 "Branch.c"
+#line 4036 "Branch.c"
}
static Page* events_event_entry_real_create_page (SidebarSimplePageEntry* base) {
EventsEventEntry * self;
Page* result = NULL;
- Event* _tmp0_ = NULL;
- EventPage* _tmp1_ = NULL;
+ Event* _tmp0_;
+ EventPage* _tmp1_;
#line 485 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
#line 486 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4056,7 +4053,7 @@ static Page* events_event_entry_real_create_page (SidebarSimplePageEntry* base)
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
#line 486 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 4060 "Branch.c"
+#line 4057 "Branch.c"
}
@@ -4069,16 +4066,16 @@ static gboolean events_event_entry_real_is_user_renameable (SidebarRenameableEnt
result = TRUE;
#line 490 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 4073 "Branch.c"
+#line 4070 "Branch.c"
}
static void events_event_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name) {
EventsEventEntry * self;
gchar* prepped = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ const gchar* _tmp2_;
#line 493 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
#line 493 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4093,13 +4090,13 @@ static void events_event_entry_real_rename (SidebarRenameableEntry* base, const
_tmp2_ = prepped;
#line 495 "/home/jens/Source/shotwell/src/events/Branch.vala"
if (_tmp2_ != NULL) {
-#line 4097 "Branch.c"
- CommandManager* _tmp3_ = NULL;
- CommandManager* _tmp4_ = NULL;
- Event* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- RenameEventCommand* _tmp7_ = NULL;
- RenameEventCommand* _tmp8_ = NULL;
+#line 4094 "Branch.c"
+ CommandManager* _tmp3_;
+ CommandManager* _tmp4_;
+ Event* _tmp5_;
+ const gchar* _tmp6_;
+ RenameEventCommand* _tmp7_;
+ RenameEventCommand* _tmp8_;
#line 496 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp3_ = app_window_get_command_manager ();
#line 496 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4118,11 +4115,11 @@ static void events_event_entry_real_rename (SidebarRenameableEntry* base, const
_g_object_unref0 (_tmp8_);
#line 496 "/home/jens/Source/shotwell/src/events/Branch.vala"
_command_manager_unref0 (_tmp4_);
-#line 4122 "Branch.c"
+#line 4119 "Branch.c"
}
#line 493 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_free0 (prepped);
-#line 4126 "Branch.c"
+#line 4123 "Branch.c"
}
@@ -4130,13 +4127,13 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD
EventsEventEntry * self;
gboolean result = FALSE;
GeeArrayList* views = NULL;
- GeeArrayList* _tmp0_ = NULL;
- CommandManager* _tmp16_ = NULL;
- CommandManager* _tmp17_ = NULL;
- GeeArrayList* _tmp18_ = NULL;
- Event* _tmp19_ = NULL;
- SetEventCommand* _tmp20_ = NULL;
- SetEventCommand* _tmp21_ = NULL;
+ GeeArrayList* _tmp0_;
+ CommandManager* _tmp16_;
+ CommandManager* _tmp17_;
+ GeeArrayList* _tmp18_;
+ Event* _tmp19_;
+ SetEventCommand* _tmp20_;
+ SetEventCommand* _tmp21_;
#line 499 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
#line 499 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4145,15 +4142,15 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD
_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 502 "/home/jens/Source/shotwell/src/events/Branch.vala"
views = _tmp0_;
-#line 4149 "Branch.c"
+#line 4146 "Branch.c"
{
GeeList* _media_source_list = NULL;
- GeeList* _tmp1_ = NULL;
- GeeList* _tmp2_ = NULL;
+ GeeList* _tmp1_;
+ GeeList* _tmp2_;
gint _media_source_size = 0;
- GeeList* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- gint _tmp5_ = 0;
+ GeeList* _tmp3_;
+ gint _tmp4_;
+ gint _tmp5_;
gint _media_source_index = 0;
#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp1_ = media;
@@ -4173,18 +4170,18 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD
_media_source_index = -1;
#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
while (TRUE) {
-#line 4177 "Branch.c"
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
- gint _tmp8_ = 0;
+#line 4174 "Branch.c"
+ gint _tmp6_;
+ gint _tmp7_;
+ gint _tmp8_;
MediaSource* media_source = NULL;
- GeeList* _tmp9_ = NULL;
- gint _tmp10_ = 0;
- gpointer _tmp11_ = NULL;
- GeeArrayList* _tmp12_ = NULL;
- MediaSource* _tmp13_ = NULL;
- DataView* _tmp14_ = NULL;
- DataView* _tmp15_ = NULL;
+ GeeList* _tmp9_;
+ gint _tmp10_;
+ gpointer _tmp11_;
+ GeeArrayList* _tmp12_;
+ MediaSource* _tmp13_;
+ DataView* _tmp14_;
+ DataView* _tmp15_;
#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp6_ = _media_source_index;
#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4197,7 +4194,7 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD
if (!(_tmp7_ < _tmp8_)) {
#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
break;
-#line 4201 "Branch.c"
+#line 4198 "Branch.c"
}
#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp9_ = _media_source_list;
@@ -4221,11 +4218,11 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD
_g_object_unref0 (_tmp15_);
#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (media_source);
-#line 4225 "Branch.c"
+#line 4222 "Branch.c"
}
#line 503 "/home/jens/Source/shotwell/src/events/Branch.vala"
_g_object_unref0 (_media_source_list);
-#line 4229 "Branch.c"
+#line 4226 "Branch.c"
}
#line 506 "/home/jens/Source/shotwell/src/events/Branch.vala"
_tmp16_ = app_window_get_command_manager ();
@@ -4251,7 +4248,7 @@ static gboolean events_event_entry_real_internal_drop_received (SidebarInternalD
_g_object_unref0 (views);
#line 508 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 4255 "Branch.c"
+#line 4252 "Branch.c"
}
@@ -4266,7 +4263,7 @@ static gboolean events_event_entry_real_internal_drop_received_arbitrary (Sideba
result = FALSE;
#line 512 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 4270 "Branch.c"
+#line 4267 "Branch.c"
}
@@ -4276,14 +4273,14 @@ static void events_event_entry_class_init (EventsEventEntryClass * klass) {
#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
g_type_class_add_private (klass, sizeof (EventsEventEntryPrivate));
#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_event_entry_real_get_sidebar_name;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_event_entry_real_get_sidebar_name;
#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) events_event_entry_real_get_sidebar_icon;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_event_entry_real_get_sidebar_icon;
#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_event_entry_real_create_page;
+ ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_event_entry_real_create_page;
#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
G_OBJECT_CLASS (klass)->finalize = events_event_entry_finalize;
-#line 4287 "Branch.c"
+#line 4284 "Branch.c"
}
@@ -4291,10 +4288,10 @@ static void events_event_entry_sidebar_renameable_entry_interface_init (SidebarR
#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
events_event_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
- iface->is_user_renameable = (gboolean (*)(SidebarRenameableEntry*)) events_event_entry_real_is_user_renameable;
+ iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) events_event_entry_real_is_user_renameable;
#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
- iface->rename = (void (*)(SidebarRenameableEntry*, const gchar*)) events_event_entry_real_rename;
-#line 4298 "Branch.c"
+ iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) events_event_entry_real_rename;
+#line 4295 "Branch.c"
}
@@ -4302,21 +4299,21 @@ static void events_event_entry_sidebar_internal_drop_target_entry_interface_init
#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
events_event_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface);
#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
- iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) events_event_entry_real_internal_drop_received;
+ iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) events_event_entry_real_internal_drop_received;
#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
- iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) events_event_entry_real_internal_drop_received_arbitrary;
-#line 4309 "Branch.c"
+ iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) events_event_entry_real_internal_drop_received_arbitrary;
+#line 4306 "Branch.c"
}
static void events_event_entry_instance_init (EventsEventEntry * self) {
#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
self->priv = EVENTS_EVENT_ENTRY_GET_PRIVATE (self);
-#line 4316 "Branch.c"
+#line 4313 "Branch.c"
}
-static void events_event_entry_finalize (GObject* obj) {
+static void events_event_entry_finalize (GObject * obj) {
EventsEventEntry * self;
#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EVENTS_TYPE_EVENT_ENTRY, EventsEventEntry);
@@ -4324,7 +4321,7 @@ static void events_event_entry_finalize (GObject* obj) {
_g_object_unref0 (self->priv->event);
#line 465 "/home/jens/Source/shotwell/src/events/Branch.vala"
G_OBJECT_CLASS (events_event_entry_parent_class)->finalize (obj);
-#line 4328 "Branch.c"
+#line 4325 "Branch.c"
}
@@ -4350,21 +4347,21 @@ EventsNoEventEntry* events_no_event_entry_construct (GType object_type) {
self = (EventsNoEventEntry*) sidebar_simple_page_entry_construct (object_type);
#line 518 "/home/jens/Source/shotwell/src/events/Branch.vala"
return self;
-#line 4354 "Branch.c"
+#line 4351 "Branch.c"
}
EventsNoEventEntry* events_no_event_entry_new (void) {
#line 518 "/home/jens/Source/shotwell/src/events/Branch.vala"
return events_no_event_entry_construct (EVENTS_TYPE_NO_EVENT_ENTRY);
-#line 4361 "Branch.c"
+#line 4358 "Branch.c"
}
static gchar* events_no_event_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
EventsNoEventEntry * self;
gchar* result = NULL;
- gchar* _tmp0_ = NULL;
+ gchar* _tmp0_;
#line 521 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_NO_EVENT_ENTRY, EventsNoEventEntry);
#line 522 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4373,15 +4370,15 @@ static gchar* events_no_event_entry_real_get_sidebar_name (SidebarSimplePageEntr
result = _tmp0_;
#line 522 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 4377 "Branch.c"
+#line 4374 "Branch.c"
}
static gchar* events_no_event_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
EventsNoEventEntry * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 525 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_NO_EVENT_ENTRY, EventsNoEventEntry);
#line 526 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4392,14 +4389,14 @@ static gchar* events_no_event_entry_real_get_sidebar_icon (SidebarSimplePageEntr
result = _tmp1_;
#line 526 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 4396 "Branch.c"
+#line 4393 "Branch.c"
}
static Page* events_no_event_entry_real_create_page (SidebarSimplePageEntry* base) {
EventsNoEventEntry * self;
Page* result = NULL;
- NoEventPage* _tmp0_ = NULL;
+ NoEventPage* _tmp0_;
#line 529 "/home/jens/Source/shotwell/src/events/Branch.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_TYPE_NO_EVENT_ENTRY, EventsNoEventEntry);
#line 530 "/home/jens/Source/shotwell/src/events/Branch.vala"
@@ -4410,7 +4407,7 @@ static Page* events_no_event_entry_real_create_page (SidebarSimplePageEntry* bas
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
#line 530 "/home/jens/Source/shotwell/src/events/Branch.vala"
return result;
-#line 4414 "Branch.c"
+#line 4411 "Branch.c"
}
@@ -4418,12 +4415,12 @@ static void events_no_event_entry_class_init (EventsNoEventEntryClass * klass) {
#line 517 "/home/jens/Source/shotwell/src/events/Branch.vala"
events_no_event_entry_parent_class = g_type_class_peek_parent (klass);
#line 517 "/home/jens/Source/shotwell/src/events/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) events_no_event_entry_real_get_sidebar_name;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) events_no_event_entry_real_get_sidebar_name;
#line 517 "/home/jens/Source/shotwell/src/events/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) events_no_event_entry_real_get_sidebar_icon;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) events_no_event_entry_real_get_sidebar_icon;
#line 517 "/home/jens/Source/shotwell/src/events/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) events_no_event_entry_real_create_page;
-#line 4427 "Branch.c"
+ ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) events_no_event_entry_real_create_page;
+#line 4424 "Branch.c"
}
diff --git a/src/events/EventDirectoryItem.c b/src/events/EventDirectoryItem.c
index b32db57..fd09328 100644
--- a/src/events/EventDirectoryItem.c
+++ b/src/events/EventDirectoryItem.c
@@ -1,4 +1,4 @@
-/* EventDirectoryItem.c generated by valac 0.34.7, the Vala compiler
+/* EventDirectoryItem.c generated by valac 0.36.6, the Vala compiler
* generated from EventDirectoryItem.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -18,6 +18,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gee.h>
#include <pango/pango.h>
+#include <gio/gio.h>
#include <glib/gi18n-lib.h>
@@ -198,6 +199,8 @@ typedef struct _MediaSourceClass MediaSourceClass;
#define PHOTO_TYPE_EXCEPTION (photo_exception_get_type ())
+#define THUMBNAIL_CACHE_TYPE_SIZE (thumbnail_cache_size_get_type ())
+
#define TYPE_PHOTO_SOURCE (photo_source_get_type ())
#define PHOTO_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_SOURCE, PhotoSource))
#define PHOTO_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO_SOURCE, PhotoSourceClass))
@@ -229,8 +232,6 @@ typedef struct _LibraryPhoto LibraryPhoto;
typedef struct _LibraryPhotoClass LibraryPhotoClass;
#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define THUMBNAIL_CACHE_TYPE_SIZE (thumbnail_cache_size_get_type ())
-
struct _DataObject {
GObject parent_instance;
DataObjectPrivate * priv;
@@ -339,6 +340,7 @@ typedef enum {
PHOTO_EXCEPTION_ALL = 0xFFFFFFFFLL
} PhotoException;
+typedef void (*ThumbnailCacheAsyncFetchCallback) (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, void* user_data);
typedef enum {
THUMBNAIL_CACHE_SIZE_LARGEST = 360,
THUMBNAIL_CACHE_SIZE_BIG = 360,
@@ -410,11 +412,16 @@ GType photo_exception_get_type (void) G_GNUC_CONST;
void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result);
static GdkPixbuf* event_directory_item_get_paul_lynde (MediaSource* media, GdkRectangle* paul_lynde, GError** error);
GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, Scaling* scaling, GError** error);
-void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result);
+void thumbnail_cache_fetch_async_scaled (ThumbnailSource* source, gint scale, Dimensions* dim, GdkInterpType interp, ThumbnailCacheAsyncFetchCallback callback, void* callback_target, GCancellable* cancellable);
+GType thumbnail_cache_size_get_type (void) G_GNUC_CONST;
+#define THUMBNAIL_CACHE_DEFAULT_INTERP GDK_INTERP_HYPER
+static void ___lambda17_ (void);
+static void ____lambda17__thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self);
GType photo_source_get_type (void) G_GNUC_CONST;
GType photo_get_type (void) G_GNUC_CONST;
GType library_photo_get_type (void) G_GNUC_CONST;
GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error);
+void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result);
void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* result);
gboolean media_source_collection_has_photo (GeeCollection* media);
GeeCollection* event_source_get_media (EventSource* self);
@@ -444,49 +451,48 @@ void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gd
gboolean is_string_empty (const gchar* s);
void checkerboard_item_clear_comment (CheckerboardItem* self);
void checkerboard_item_set_comment (CheckerboardItem* self, const gchar* text, gboolean marked_up, PangoAlignment alignment);
-GType thumbnail_cache_size_get_type (void) G_GNUC_CONST;
gint thumbnail_cache_size_get_scale (ThumbnailCacheSize self);
-static void event_directory_item_finalize (GObject* obj);
+static void event_directory_item_finalize (GObject * obj);
static void _vala_event_directory_item_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
static void _event_directory_item_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
#line 39 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
event_directory_item_on_events_altered ((EventDirectoryItem*) self, items);
-#line 457 "EventDirectoryItem.c"
+#line 463 "EventDirectoryItem.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 26 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
return self ? g_object_ref (self) : NULL;
-#line 464 "EventDirectoryItem.c"
+#line 470 "EventDirectoryItem.c"
}
EventDirectoryItem* event_directory_item_construct (GType object_type, Event* event) {
EventDirectoryItem * self = NULL;
- Event* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
+ Event* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
Dimensions _tmp5_ = {0};
- Event* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- Event* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- Event* _tmp12_ = NULL;
- Event* _tmp13_ = NULL;
- Event* _tmp14_ = NULL;
- MediaSource* _tmp15_ = NULL;
- MediaSource* _tmp16_ = NULL;
+ Event* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+ Event* _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ Event* _tmp12_;
+ Event* _tmp13_;
+ Event* _tmp14_;
+ MediaSource* _tmp15_;
+ MediaSource* _tmp16_;
GdkRectangle _tmp17_ = {0};
- GdkRectangle _tmp18_ = {0};
+ GdkRectangle _tmp18_;
Dimensions _tmp19_ = {0};
- EventSourceCollection* _tmp20_ = NULL;
+ EventSourceCollection* _tmp20_;
#line 22 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_return_val_if_fail (IS_EVENT (event), NULL);
#line 23 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
@@ -551,41 +557,41 @@ EventDirectoryItem* event_directory_item_construct (GType object_type, Event* ev
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _event_directory_item_on_events_altered_data_collection_items_altered, self, 0);
#line 22 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
return self;
-#line 555 "EventDirectoryItem.c"
+#line 561 "EventDirectoryItem.c"
}
EventDirectoryItem* event_directory_item_new (Event* event) {
#line 22 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
return event_directory_item_construct (TYPE_EVENT_DIRECTORY_ITEM, event);
-#line 562 "EventDirectoryItem.c"
+#line 568 "EventDirectoryItem.c"
}
static void event_directory_item_get_paul_lynde_rect (MediaSource* source, GdkRectangle* result) {
Dimensions scaled = {0};
- MediaSource* _tmp0_ = NULL;
+ MediaSource* _tmp0_;
Dimensions _tmp1_ = {0};
Dimensions _tmp2_ = {0};
GdkRectangle paul_lynde = {0};
- Dimensions _tmp3_ = {0};
- gint _tmp4_ = 0;
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- Dimensions _tmp7_ = {0};
- gint _tmp8_ = 0;
- gint _tmp9_ = 0;
- Dimensions _tmp10_ = {0};
- gint _tmp11_ = 0;
- gint _tmp12_ = 0;
- gint _tmp13_ = 0;
- Dimensions _tmp14_ = {0};
- gint _tmp15_ = 0;
- gint _tmp16_ = 0;
- gint _tmp17_ = 0;
- gint _tmp18_ = 0;
- gint _tmp19_ = 0;
- gint _tmp20_ = 0;
+ Dimensions _tmp3_;
+ gint _tmp4_;
+ gint _tmp5_;
+ gint _tmp6_;
+ Dimensions _tmp7_;
+ gint _tmp8_;
+ gint _tmp9_;
+ Dimensions _tmp10_;
+ gint _tmp11_;
+ gint _tmp12_;
+ gint _tmp13_;
+ Dimensions _tmp14_;
+ gint _tmp15_;
+ gint _tmp16_;
+ gint _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
+ gint _tmp20_;
#line 43 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_return_if_fail (IS_MEDIA_SOURCE (source));
#line 44 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
@@ -646,633 +652,750 @@ static void event_directory_item_get_paul_lynde_rect (MediaSource* source, GdkRe
*result = paul_lynde;
#line 52 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
return;
-#line 650 "EventDirectoryItem.c"
+#line 656 "EventDirectoryItem.c"
+}
+
+
+static void ___lambda17_ (void) {
+}
+
+
+static void ____lambda17__thumbnail_cache_async_fetch_callback (GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err, gpointer self) {
+#line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ ___lambda17_ ();
+#line 667 "EventDirectoryItem.c"
+}
+
+
+static gpointer _g_error_copy0 (gpointer self) {
+#line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ return self ? g_error_copy (self) : NULL;
+#line 674 "EventDirectoryItem.c"
}
static GdkPixbuf* event_directory_item_get_paul_lynde (MediaSource* media, GdkRectangle* paul_lynde, GError** error) {
GdkPixbuf* result = NULL;
GdkPixbuf* pixbuf = NULL;
- MediaSource* _tmp0_ = NULL;
- Scaling _tmp1_ = {0};
- GdkPixbuf* _tmp2_ = NULL;
Dimensions thumbnail_dimensions = {0};
- GdkPixbuf* _tmp3_ = NULL;
- Dimensions _tmp4_ = {0};
- gboolean _tmp5_ = FALSE;
- Dimensions _tmp6_ = {0};
- gint _tmp7_ = 0;
- GdkRectangle _tmp8_ = {0};
- gint _tmp9_ = 0;
- GdkRectangle _tmp23_ = {0};
- Dimensions _tmp24_ = {0};
- GdkRectangle _tmp25_ = {0};
- GdkPixbuf* _tmp26_ = NULL;
- GdkRectangle _tmp27_ = {0};
- gint _tmp28_ = 0;
- GdkRectangle _tmp29_ = {0};
- gint _tmp30_ = 0;
- GdkRectangle _tmp31_ = {0};
- gint _tmp32_ = 0;
- GdkRectangle _tmp33_ = {0};
- gint _tmp34_ = 0;
- GdkPixbuf* _tmp35_ = NULL;
+ GdkPixbuf* _tmp17_;
+ Dimensions _tmp18_ = {0};
+ gboolean _tmp19_ = FALSE;
+ Dimensions _tmp20_;
+ gint _tmp21_;
+ GdkRectangle _tmp22_;
+ gint _tmp23_;
+ GdkRectangle _tmp37_;
+ Dimensions _tmp38_;
+ GdkRectangle _tmp39_ = {0};
+ GdkPixbuf* _tmp40_;
+ GdkRectangle _tmp41_;
+ gint _tmp42_;
+ GdkRectangle _tmp43_;
+ gint _tmp44_;
+ GdkRectangle _tmp45_;
+ gint _tmp46_;
+ GdkRectangle _tmp47_;
+ gint _tmp48_;
+ GdkPixbuf* _tmp49_;
GError * _inner_error_ = NULL;
#line 56 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_return_val_if_fail (IS_MEDIA_SOURCE (media), NULL);
#line 56 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_return_val_if_fail (paul_lynde != NULL, NULL);
-#line 57 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp0_ = media;
-#line 57 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp1_ = event_directory_item_squared_scaling;
-#line 57 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp2_ = media_source_get_preview_pixbuf (_tmp0_, &_tmp1_, &_inner_error_);
-#line 57 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- pixbuf = _tmp2_;
-#line 57 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 57 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- g_propagate_error (error, _inner_error_);
-#line 57 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- return NULL;
-#line 700 "EventDirectoryItem.c"
- }
+#line 707 "EventDirectoryItem.c"
+ {
+ GdkPixbuf* _tmp0_ = NULL;
+ MediaSource* _tmp1_;
+ Scaling _tmp2_;
+ GdkPixbuf* _tmp3_;
+ GdkPixbuf* _tmp4_;
+#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp1_ = media;
+#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp2_ = event_directory_item_squared_scaling;
+#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp3_ = media_source_get_preview_pixbuf (_tmp1_, &_tmp2_, &_inner_error_);
+#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp0_ = _tmp3_;
+#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 724 "EventDirectoryItem.c"
+ goto __catch52_g_error;
+ }
+#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp4_ = _tmp0_;
+#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp0_ = NULL;
+#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _g_object_unref0 (pixbuf);
+#line 60 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ pixbuf = _tmp4_;
#line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp3_ = pixbuf;
+ _g_object_unref0 (_tmp0_);
+#line 737 "EventDirectoryItem.c"
+ }
+ goto __finally52;
+ __catch52_g_error:
+ {
+ GError* _error_ = NULL;
+ MediaSource* _tmp5_;
+ Dimensions _tmp6_ = {0};
+ MediaSource* _tmp7_;
#line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- dimensions_for_pixbuf (_tmp3_, &_tmp4_);
+ _error_ = _inner_error_;
#line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- thumbnail_dimensions = _tmp4_;
-#line 61 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp6_ = thumbnail_dimensions;
-#line 61 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp7_ = _tmp6_.width;
-#line 61 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp8_ = *paul_lynde;
-#line 61 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp9_ = _tmp8_.width;
-#line 61 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- if (_tmp7_ > (2 * _tmp9_)) {
-#line 61 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp5_ = TRUE;
-#line 720 "EventDirectoryItem.c"
- } else {
- Dimensions _tmp10_ = {0};
- gint _tmp11_ = 0;
- GdkRectangle _tmp12_ = {0};
- gint _tmp13_ = 0;
-#line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp10_ = thumbnail_dimensions;
-#line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp11_ = _tmp10_.height;
+ _inner_error_ = NULL;
#line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp12_ = *paul_lynde;
+ _tmp5_ = media;
#line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp13_ = _tmp12_.height;
+ dimensions_init (&_tmp6_, (gint) THUMBNAIL_CACHE_SIZE_BIG, (gint) THUMBNAIL_CACHE_SIZE_BIG);
#line 62 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp5_ = _tmp11_ > (_tmp13_ * 2);
-#line 736 "EventDirectoryItem.c"
+ thumbnail_cache_fetch_async_scaled (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), (gint) THUMBNAIL_CACHE_SIZE_BIG, &_tmp6_, THUMBNAIL_CACHE_DEFAULT_INTERP, ____lambda17__thumbnail_cache_async_fetch_callback, NULL, NULL);
+#line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp7_ = media;
+#line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO)) {
+#line 760 "EventDirectoryItem.c"
+ LibraryPhoto* photo = NULL;
+ MediaSource* _tmp8_;
+ LibraryPhoto* _tmp9_;
+ GdkPixbuf* _tmp10_ = NULL;
+ LibraryPhoto* _tmp11_;
+ Scaling _tmp12_;
+ GdkPixbuf* _tmp13_;
+ GdkPixbuf* _tmp14_;
+#line 66 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp8_ = media;
+#line 66 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
+#line 66 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ photo = _tmp9_;
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp11_ = photo;
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp12_ = event_directory_item_squared_scaling;
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp13_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp12_, &_inner_error_);
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp10_ = _tmp13_;
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _g_object_unref0 (photo);
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _g_error_free0 (_error_);
+#line 789 "EventDirectoryItem.c"
+ goto __finally52;
+ }
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp14_ = _tmp10_;
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp10_ = NULL;
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _g_object_unref0 (pixbuf);
+#line 67 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ pixbuf = _tmp14_;
+#line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _g_object_unref0 (_tmp10_);
+#line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _g_object_unref0 (photo);
+#line 804 "EventDirectoryItem.c"
+ } else {
+ GError* _tmp15_;
+ GError* _tmp16_;
+#line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp15_ = _error_;
+#line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp16_ = _g_error_copy0 (_tmp15_);
+#line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _inner_error_ = _tmp16_;
+#line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _g_error_free0 (_error_);
+#line 816 "EventDirectoryItem.c"
+ goto __finally52;
+ }
+#line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _g_error_free0 (_error_);
+#line 821 "EventDirectoryItem.c"
+ }
+ __finally52:
+#line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ g_propagate_error (error, _inner_error_);
+#line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _g_object_unref0 (pixbuf);
+#line 59 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ return NULL;
+#line 832 "EventDirectoryItem.c"
}
-#line 61 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- if (_tmp5_) {
-#line 740 "EventDirectoryItem.c"
+#line 73 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp17_ = pixbuf;
+#line 73 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ dimensions_for_pixbuf (_tmp17_, &_tmp18_);
+#line 73 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ thumbnail_dimensions = _tmp18_;
+#line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp20_ = thumbnail_dimensions;
+#line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp21_ = _tmp20_.width;
+#line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp22_ = *paul_lynde;
+#line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp23_ = _tmp22_.width;
+#line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ if (_tmp21_ > (2 * _tmp23_)) {
+#line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp19_ = TRUE;
+#line 852 "EventDirectoryItem.c"
+ } else {
+ Dimensions _tmp24_;
+ gint _tmp25_;
+ GdkRectangle _tmp26_;
+ gint _tmp27_;
+#line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp24_ = thumbnail_dimensions;
+#line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp25_ = _tmp24_.height;
+#line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp26_ = *paul_lynde;
+#line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp27_ = _tmp26_.height;
+#line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp19_ = _tmp25_ > (_tmp27_ * 2);
+#line 868 "EventDirectoryItem.c"
+ }
+#line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ if (_tmp19_) {
+#line 872 "EventDirectoryItem.c"
LibraryPhoto* photo = NULL;
- MediaSource* _tmp14_ = NULL;
- LibraryPhoto* _tmp15_ = NULL;
- GdkPixbuf* _tmp16_ = NULL;
- LibraryPhoto* _tmp17_ = NULL;
- Scaling _tmp18_ = {0};
- GdkPixbuf* _tmp19_ = NULL;
- GdkPixbuf* _tmp20_ = NULL;
- GdkPixbuf* _tmp21_ = NULL;
- Dimensions _tmp22_ = {0};
-#line 63 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp14_ = media;
-#line 63 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 63 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- photo = _tmp15_;
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp17_ = photo;
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp18_ = event_directory_item_squared_scaling;
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp19_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp18_, &_inner_error_);
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp16_ = _tmp19_;
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ MediaSource* _tmp28_;
+ LibraryPhoto* _tmp29_;
+ GdkPixbuf* _tmp30_ = NULL;
+ LibraryPhoto* _tmp31_;
+ Scaling _tmp32_;
+ GdkPixbuf* _tmp33_;
+ GdkPixbuf* _tmp34_;
+ GdkPixbuf* _tmp35_;
+ Dimensions _tmp36_ = {0};
+#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp28_ = media;
+#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
+#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ photo = _tmp29_;
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp31_ = photo;
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp32_ = event_directory_item_squared_scaling;
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp33_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp32_, &_inner_error_);
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp30_ = _tmp33_;
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_propagate_error (error, _inner_error_);
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_object_unref0 (photo);
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_object_unref0 (pixbuf);
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
return NULL;
-#line 775 "EventDirectoryItem.c"
+#line 907 "EventDirectoryItem.c"
}
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp20_ = _tmp16_;
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp16_ = NULL;
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp34_ = _tmp30_;
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp30_ = NULL;
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_object_unref0 (pixbuf);
-#line 64 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- pixbuf = _tmp20_;
-#line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp21_ = pixbuf;
-#line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- dimensions_for_pixbuf (_tmp21_, &_tmp22_);
-#line 65 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- thumbnail_dimensions = _tmp22_;
-#line 61 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _g_object_unref0 (_tmp16_);
-#line 61 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ pixbuf = _tmp34_;
+#line 79 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp35_ = pixbuf;
+#line 79 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ dimensions_for_pixbuf (_tmp35_, &_tmp36_);
+#line 79 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ thumbnail_dimensions = _tmp36_;
+#line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _g_object_unref0 (_tmp30_);
+#line 75 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_object_unref0 (photo);
-#line 795 "EventDirectoryItem.c"
+#line 927 "EventDirectoryItem.c"
}
-#line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp23_ = *paul_lynde;
-#line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp24_ = thumbnail_dimensions;
-#line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- clamp_rectangle (&_tmp23_, &_tmp24_, &_tmp25_);
-#line 69 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- *paul_lynde = _tmp25_;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp26_ = pixbuf;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp27_ = *paul_lynde;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp28_ = _tmp27_.x;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp29_ = *paul_lynde;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp30_ = _tmp29_.y;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp31_ = *paul_lynde;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp32_ = _tmp31_.width;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp33_ = *paul_lynde;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp34_ = _tmp33_.height;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp35_ = gdk_pixbuf_new_subpixbuf (_tmp26_, _tmp28_, _tmp30_, _tmp32_, _tmp34_);
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- result = _tmp35_;
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp37_ = *paul_lynde;
+#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp38_ = thumbnail_dimensions;
+#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ clamp_rectangle (&_tmp37_, &_tmp38_, &_tmp39_);
+#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ *paul_lynde = _tmp39_;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp40_ = pixbuf;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp41_ = *paul_lynde;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp42_ = _tmp41_.x;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp43_ = *paul_lynde;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp44_ = _tmp43_.y;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp45_ = *paul_lynde;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp46_ = _tmp45_.width;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp47_ = *paul_lynde;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp48_ = _tmp47_.height;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp49_ = gdk_pixbuf_new_subpixbuf (_tmp40_, _tmp42_, _tmp44_, _tmp46_, _tmp48_);
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ result = _tmp49_;
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_object_unref0 (pixbuf);
-#line 72 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
return result;
-#line 831 "EventDirectoryItem.c"
+#line 963 "EventDirectoryItem.c"
}
static gchar* event_directory_item_get_formatted_title (Event* event) {
gchar* result = NULL;
gboolean has_photos = FALSE;
- Event* _tmp0_ = NULL;
- GeeCollection* _tmp1_ = NULL;
- GeeCollection* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- gboolean _tmp4_ = FALSE;
+ Event* _tmp0_;
+ GeeCollection* _tmp1_;
+ GeeCollection* _tmp2_;
+ gboolean _tmp3_;
+ gboolean _tmp4_;
gboolean has_videos = FALSE;
- Event* _tmp5_ = NULL;
- GeeCollection* _tmp6_ = NULL;
- GeeCollection* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
- gboolean _tmp9_ = FALSE;
+ Event* _tmp5_;
+ GeeCollection* _tmp6_;
+ GeeCollection* _tmp7_;
+ gboolean _tmp8_;
+ gboolean _tmp9_;
gint count = 0;
- Event* _tmp10_ = NULL;
- gint _tmp11_ = 0;
+ Event* _tmp10_;
+ gint _tmp11_;
gchar* count_text = NULL;
- gchar* _tmp12_ = NULL;
+ gchar* _tmp12_;
gboolean _tmp13_ = FALSE;
- gboolean _tmp14_ = FALSE;
+ gboolean _tmp14_;
gchar* daterange = NULL;
- Event* _tmp29_ = NULL;
- gchar* _tmp30_ = NULL;
+ Event* _tmp26_;
+ gchar* _tmp27_;
gchar* name = NULL;
- Event* _tmp31_ = NULL;
- gchar* _tmp32_ = NULL;
- gboolean _tmp33_ = FALSE;
- const gchar* _tmp34_ = NULL;
-#line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ Event* _tmp28_;
+ gchar* _tmp29_;
+ gboolean _tmp30_ = FALSE;
+ const gchar* _tmp31_;
+#line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_return_val_if_fail (IS_EVENT (event), NULL);
-#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp0_ = event;
-#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp1_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource));
-#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp2_ = _tmp1_;
-#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp3_ = media_source_collection_has_photo (_tmp2_);
-#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp4_ = _tmp3_;
-#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_object_unref0 (_tmp2_);
-#line 77 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
has_photos = _tmp4_;
-#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp5_ = event;
-#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp6_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_EVENT_SOURCE, EventSource));
-#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp7_ = _tmp6_;
-#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp8_ = media_source_collection_has_video (_tmp7_);
-#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp9_ = _tmp8_;
-#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_object_unref0 (_tmp7_);
-#line 78 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
has_videos = _tmp9_;
-#line 80 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp10_ = event;
-#line 80 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp11_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_EVENT_SOURCE, EventSource));
-#line 80 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
count = _tmp11_;
-#line 81 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp12_ = g_strdup ("");
-#line 81 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
count_text = _tmp12_;
-#line 82 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp14_ = has_photos;
-#line 82 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
if (_tmp14_) {
-#line 908 "EventDirectoryItem.c"
- gboolean _tmp15_ = FALSE;
-#line 82 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 1040 "EventDirectoryItem.c"
+ gboolean _tmp15_;
+#line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp15_ = has_videos;
-#line 82 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp13_ = _tmp15_;
-#line 914 "EventDirectoryItem.c"
+#line 1046 "EventDirectoryItem.c"
} else {
-#line 82 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp13_ = FALSE;
-#line 918 "EventDirectoryItem.c"
+#line 1050 "EventDirectoryItem.c"
}
-#line 82 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
if (_tmp13_) {
-#line 922 "EventDirectoryItem.c"
- gint _tmp16_ = 0;
- const gchar* _tmp17_ = NULL;
- gint _tmp18_ = 0;
- gchar* _tmp19_ = NULL;
-#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 1054 "EventDirectoryItem.c"
+ gint _tmp16_;
+ gint _tmp17_;
+ gchar* _tmp18_;
+#line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp16_ = count;
-#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp17_ = ngettext ("%d Photo/Video", "%d Photos/Videos", (gulong) _tmp16_);
-#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp18_ = count;
-#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp19_ = g_strdup_printf (_tmp17_, _tmp18_);
-#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp17_ = count;
+#line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp18_ = g_strdup_printf (ngettext ("%d Photo/Video", "%d Photos/Videos", (gulong) _tmp16_), _tmp17_);
+#line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_free0 (count_text);
-#line 83 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- count_text = _tmp19_;
-#line 939 "EventDirectoryItem.c"
+#line 97 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ count_text = _tmp18_;
+#line 1068 "EventDirectoryItem.c"
} else {
- gboolean _tmp20_ = FALSE;
-#line 84 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp20_ = has_videos;
-#line 84 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- if (_tmp20_) {
-#line 946 "EventDirectoryItem.c"
- gint _tmp21_ = 0;
- const gchar* _tmp22_ = NULL;
- gint _tmp23_ = 0;
- gchar* _tmp24_ = NULL;
-#line 85 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ gboolean _tmp19_;
+#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp19_ = has_videos;
+#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ if (_tmp19_) {
+#line 1075 "EventDirectoryItem.c"
+ gint _tmp20_;
+ gint _tmp21_;
+ gchar* _tmp22_;
+#line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp20_ = count;
+#line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp21_ = count;
-#line 85 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp22_ = ngettext ("%d Video", "%d Videos", (gulong) _tmp21_);
-#line 85 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp23_ = count;
-#line 85 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp24_ = g_strdup_printf (_tmp22_, _tmp23_);
-#line 85 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp22_ = g_strdup_printf (ngettext ("%d Video", "%d Videos", (gulong) _tmp20_), _tmp21_);
+#line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_free0 (count_text);
-#line 85 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- count_text = _tmp24_;
-#line 963 "EventDirectoryItem.c"
+#line 99 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ count_text = _tmp22_;
+#line 1089 "EventDirectoryItem.c"
} else {
- gint _tmp25_ = 0;
- const gchar* _tmp26_ = NULL;
- gint _tmp27_ = 0;
- gchar* _tmp28_ = NULL;
-#line 87 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp25_ = count;
-#line 87 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp26_ = ngettext ("%d Photo", "%d Photos", (gulong) _tmp25_);
-#line 87 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp27_ = count;
-#line 87 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp28_ = g_strdup_printf (_tmp26_, _tmp27_);
-#line 87 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ gint _tmp23_;
+ gint _tmp24_;
+ gchar* _tmp25_;
+#line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp23_ = count;
+#line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp24_ = count;
+#line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp25_ = g_strdup_printf (ngettext ("%d Photo", "%d Photos", (gulong) _tmp23_), _tmp24_);
+#line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_free0 (count_text);
-#line 87 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- count_text = _tmp28_;
-#line 981 "EventDirectoryItem.c"
+#line 101 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ count_text = _tmp25_;
+#line 1104 "EventDirectoryItem.c"
}
}
-#line 89 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp29_ = event;
-#line 89 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp30_ = event_get_formatted_daterange (_tmp29_);
-#line 89 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- daterange = _tmp30_;
-#line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp31_ = event;
-#line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp32_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_OBJECT, DataObject));
-#line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- name = _tmp32_;
-#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp34_ = daterange;
-#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- if (_tmp34_ == NULL) {
-#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp33_ = TRUE;
-#line 1002 "EventDirectoryItem.c"
+#line 103 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp26_ = event;
+#line 103 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp27_ = event_get_formatted_daterange (_tmp26_);
+#line 103 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ daterange = _tmp27_;
+#line 104 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp28_ = event;
+#line 104 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp29_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject));
+#line 104 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ name = _tmp29_;
+#line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp31_ = daterange;
+#line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ if (_tmp31_ == NULL) {
+#line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp30_ = TRUE;
+#line 1125 "EventDirectoryItem.c"
} else {
- const gchar* _tmp35_ = NULL;
- const gchar* _tmp36_ = NULL;
-#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp35_ = daterange;
-#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp36_ = name;
-#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp33_ = g_strcmp0 (_tmp35_, _tmp36_) == 0;
-#line 1012 "EventDirectoryItem.c"
+ const gchar* _tmp32_;
+ const gchar* _tmp33_;
+#line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp32_ = daterange;
+#line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp33_ = name;
+#line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp30_ = g_strcmp0 (_tmp32_, _tmp33_) == 0;
+#line 1135 "EventDirectoryItem.c"
}
-#line 94 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- if (_tmp33_) {
-#line 1016 "EventDirectoryItem.c"
- const gchar* _tmp37_ = NULL;
- gchar* _tmp38_ = NULL;
- gchar* _tmp39_ = NULL;
- const gchar* _tmp40_ = NULL;
- gchar* _tmp41_ = NULL;
- gchar* _tmp42_ = NULL;
- gchar* _tmp43_ = NULL;
- gchar* _tmp44_ = NULL;
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp37_ = name;
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 108 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ if (_tmp30_) {
+#line 1139 "EventDirectoryItem.c"
+ const gchar* _tmp34_;
+ gchar* _tmp35_;
+ gchar* _tmp36_;
+ const gchar* _tmp37_;
+ gchar* _tmp38_;
+ gchar* _tmp39_;
+ gchar* _tmp40_;
+ gchar* _tmp41_;
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp34_ = name;
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp35_ = guarded_markup_escape_text (_tmp34_);
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp36_ = _tmp35_;
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp37_ = count_text;
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp38_ = guarded_markup_escape_text (_tmp37_);
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp39_ = _tmp38_;
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp40_ = count_text;
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp41_ = guarded_markup_escape_text (_tmp40_);
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp42_ = _tmp41_;
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp43_ = g_strdup_printf ("<b>%s</b>\n%s", _tmp39_, _tmp42_);
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp44_ = _tmp43_;
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _g_free0 (_tmp42_);
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp40_ = g_strdup_printf ("<b>%s</b>\n%s", _tmp36_, _tmp39_);
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp41_ = _tmp40_;
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_free0 (_tmp39_);
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- result = _tmp44_;
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _g_free0 (_tmp36_);
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ result = _tmp41_;
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_free0 (name);
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_free0 (daterange);
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_free0 (count_text);
-#line 95 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
return result;
-#line 1055 "EventDirectoryItem.c"
+#line 1178 "EventDirectoryItem.c"
} else {
- const gchar* _tmp45_ = NULL;
- gchar* _tmp46_ = NULL;
- gchar* _tmp47_ = NULL;
- const gchar* _tmp48_ = NULL;
- gchar* _tmp49_ = NULL;
- gchar* _tmp50_ = NULL;
- const gchar* _tmp51_ = NULL;
- gchar* _tmp52_ = NULL;
- gchar* _tmp53_ = NULL;
- gchar* _tmp54_ = NULL;
- gchar* _tmp55_ = NULL;
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp45_ = name;
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ const gchar* _tmp42_;
+ gchar* _tmp43_;
+ gchar* _tmp44_;
+ const gchar* _tmp45_;
+ gchar* _tmp46_;
+ gchar* _tmp47_;
+ const gchar* _tmp48_;
+ gchar* _tmp49_;
+ gchar* _tmp50_;
+ gchar* _tmp51_;
+ gchar* _tmp52_;
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp42_ = name;
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp43_ = guarded_markup_escape_text (_tmp42_);
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp44_ = _tmp43_;
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp45_ = count_text;
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp46_ = guarded_markup_escape_text (_tmp45_);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp47_ = _tmp46_;
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp48_ = count_text;
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp48_ = daterange;
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp49_ = guarded_markup_escape_text (_tmp48_);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp50_ = _tmp49_;
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp51_ = daterange;
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp52_ = guarded_markup_escape_text (_tmp51_);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp53_ = _tmp52_;
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp54_ = g_strdup_printf ("<b>%s</b>\n%s\n%s", _tmp47_, _tmp50_, _tmp53_);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _tmp55_ = _tmp54_;
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- _g_free0 (_tmp53_);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp51_ = g_strdup_printf ("<b>%s</b>\n%s\n%s", _tmp44_, _tmp47_, _tmp50_);
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _tmp52_ = _tmp51_;
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_free0 (_tmp50_);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_free0 (_tmp47_);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- result = _tmp55_;
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ _g_free0 (_tmp44_);
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ result = _tmp52_;
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_free0 (name);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_free0 (daterange);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_free0 (count_text);
-#line 98 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
return result;
-#line 1106 "EventDirectoryItem.c"
+#line 1229 "EventDirectoryItem.c"
}
-#line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_free0 (name);
-#line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_free0 (daterange);
-#line 76 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 90 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_free0 (count_text);
-#line 1114 "EventDirectoryItem.c"
+#line 1237 "EventDirectoryItem.c"
}
static void event_directory_item_real_exposed (CheckerboardItem* base) {
EventDirectoryItem * self;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
GError * _inner_error_ = NULL;
-#line 102 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 103 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 117 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp0_ = checkerboard_item_is_exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 103 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 117 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
if (_tmp0_) {
-#line 104 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 118 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
return;
-#line 1130 "EventDirectoryItem.c"
+#line 1253 "EventDirectoryItem.c"
}
{
GdkPixbuf* _tmp1_ = NULL;
- Event* _tmp2_ = NULL;
- MediaSource* _tmp3_ = NULL;
- MediaSource* _tmp4_ = NULL;
- GdkRectangle _tmp5_ = {0};
- GdkPixbuf* _tmp6_ = NULL;
- GdkPixbuf* _tmp7_ = NULL;
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ Event* _tmp2_;
+ MediaSource* _tmp3_;
+ MediaSource* _tmp4_;
+ GdkRectangle _tmp5_;
+ GdkPixbuf* _tmp6_;
+ GdkPixbuf* _tmp7_;
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp2_ = self->event;
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp3_ = event_get_primary_source (_tmp2_);
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp4_ = _tmp3_;
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp5_ = self->priv->paul_lynde;
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp6_ = event_directory_item_get_paul_lynde (_tmp4_, &_tmp5_, &_inner_error_);
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp7_ = _tmp6_;
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_object_unref0 (_tmp4_);
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp1_ = _tmp7_;
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1158 "EventDirectoryItem.c"
- goto __catch52_g_error;
+#line 1281 "EventDirectoryItem.c"
+ goto __catch53_g_error;
}
-#line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp1_);
-#line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_object_unref0 (_tmp1_);
-#line 1165 "EventDirectoryItem.c"
+#line 1288 "EventDirectoryItem.c"
}
- goto __finally52;
- __catch52_g_error:
+ goto __finally53;
+ __catch53_g_error:
{
GError* err = NULL;
- Event* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- GError* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
-#line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ Event* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+ GError* _tmp11_;
+ const gchar* _tmp12_;
+#line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
err = _inner_error_;
-#line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_inner_error_ = NULL;
-#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp8_ = self->event;
-#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject));
-#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp10_ = _tmp9_;
-#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp11_ = err;
-#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp12_ = _tmp11_->message;
-#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- g_critical ("EventDirectoryItem.vala:109: Unable to fetch preview for %s: %s", _tmp10_, _tmp12_);
-#line 109 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ g_critical ("EventDirectoryItem.vala:123: Unable to fetch preview for %s: %s", _tmp10_, _tmp12_);
+#line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_free0 (_tmp10_);
-#line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_error_free0 (err);
-#line 1196 "EventDirectoryItem.c"
+#line 1319 "EventDirectoryItem.c"
}
- __finally52:
-#line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ __finally53:
+#line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_clear_error (&_inner_error_);
-#line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 120 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
return;
-#line 1207 "EventDirectoryItem.c"
+#line 1330 "EventDirectoryItem.c"
}
-#line 112 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 126 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
event_directory_item_update_comment (self, FALSE);
-#line 114 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 128 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
CHECKERBOARD_ITEM_CLASS (event_directory_item_parent_class)->exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1213 "EventDirectoryItem.c"
+#line 1336 "EventDirectoryItem.c"
}
static void event_directory_item_real_unexposed (CheckerboardItem* base) {
EventDirectoryItem * self;
- gboolean _tmp0_ = FALSE;
- GdkRectangle _tmp1_ = {0};
+ gboolean _tmp0_;
+ GdkRectangle _tmp1_;
Dimensions _tmp2_ = {0};
-#line 117 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 131 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 118 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 132 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp0_ = checkerboard_item_is_exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 118 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 132 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
if (!_tmp0_) {
-#line 119 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 133 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
return;
-#line 1230 "EventDirectoryItem.c"
+#line 1353 "EventDirectoryItem.c"
}
-#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 135 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp1_ = self->priv->paul_lynde;
-#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 135 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
dimensions_for_rectangle (&_tmp1_, &_tmp2_);
-#line 121 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 135 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp2_);
-#line 123 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 137 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
CHECKERBOARD_ITEM_CLASS (event_directory_item_parent_class)->unexposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1240 "EventDirectoryItem.c"
+#line 1363 "EventDirectoryItem.c"
}
static void event_directory_item_on_events_altered (EventDirectoryItem* self, GeeMap* map) {
- GeeMap* _tmp0_ = NULL;
- Event* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
-#line 126 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ GeeMap* _tmp0_;
+ Event* _tmp1_;
+ gboolean _tmp2_;
+#line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_return_if_fail (IS_EVENT_DIRECTORY_ITEM (self));
-#line 126 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_return_if_fail (GEE_IS_MAP (map));
-#line 127 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
event_directory_item_update_comment (self, FALSE);
-#line 128 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp0_ = map;
-#line 128 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp1_ = self->event;
-#line 128 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp2_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
-#line 128 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
if (_tmp2_) {
-#line 1262 "EventDirectoryItem.c"
- Event* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
-#line 129 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 1385 "EventDirectoryItem.c"
+ Event* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+#line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp3_ = self->event;
-#line 129 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp4_ = event_directory_item_get_formatted_title (_tmp3_);
-#line 129 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp5_ = _tmp4_;
-#line 129 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
checkerboard_item_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_, TRUE, PANGO_ALIGN_CENTER);
-#line 129 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_free0 (_tmp5_);
-#line 1276 "EventDirectoryItem.c"
+#line 1399 "EventDirectoryItem.c"
}
}
@@ -1280,344 +1403,344 @@ static void event_directory_item_on_events_altered (EventDirectoryItem* self, Ge
static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) {
EventDirectoryItem * self;
MediaSource* media = NULL;
- Event* _tmp0_ = NULL;
- MediaSource* _tmp1_ = NULL;
- MediaSource* _tmp2_ = NULL;
+ Event* _tmp0_;
+ MediaSource* _tmp1_;
+ MediaSource* _tmp2_;
GdkRectangle _tmp3_ = {0};
- gboolean _tmp4_ = FALSE;
+ gboolean _tmp4_;
GError * _inner_error_ = NULL;
-#line 132 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 146 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 133 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp0_ = self->event;
-#line 133 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp1_ = event_get_primary_source (_tmp0_);
-#line 133 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
media = _tmp1_;
-#line 136 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp2_ = media;
-#line 136 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
event_directory_item_get_paul_lynde_rect (_tmp2_, &_tmp3_);
-#line 136 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
self->priv->paul_lynde = _tmp3_;
-#line 138 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 152 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp4_ = checkerboard_item_is_exposed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 138 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 152 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
if (_tmp4_) {
-#line 1308 "EventDirectoryItem.c"
+#line 1431 "EventDirectoryItem.c"
{
GdkPixbuf* _tmp5_ = NULL;
- MediaSource* _tmp6_ = NULL;
- GdkRectangle _tmp7_ = {0};
- GdkPixbuf* _tmp8_ = NULL;
-#line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ MediaSource* _tmp6_;
+ GdkRectangle _tmp7_;
+ GdkPixbuf* _tmp8_;
+#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp6_ = media;
-#line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp7_ = self->priv->paul_lynde;
-#line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp8_ = event_directory_item_get_paul_lynde (_tmp6_, &_tmp7_, &_inner_error_);
-#line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp5_ = _tmp8_;
-#line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1324 "EventDirectoryItem.c"
- goto __catch53_g_error;
+#line 1447 "EventDirectoryItem.c"
+ goto __catch54_g_error;
}
-#line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_);
-#line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_object_unref0 (_tmp5_);
-#line 1331 "EventDirectoryItem.c"
+#line 1454 "EventDirectoryItem.c"
}
- goto __finally53;
- __catch53_g_error:
+ goto __finally54;
+ __catch54_g_error:
{
GError* err = NULL;
- Event* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- GError* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
-#line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ Event* _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ GError* _tmp12_;
+ const gchar* _tmp13_;
+#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
err = _inner_error_;
-#line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_inner_error_ = NULL;
-#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp9_ = self->event;
-#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject));
-#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp11_ = _tmp10_;
-#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp12_ = err;
-#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp13_ = _tmp12_->message;
-#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- g_critical ("EventDirectoryItem.vala:142: Unable to fetch preview for %s: %s", _tmp11_, _tmp13_);
-#line 142 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ g_critical ("EventDirectoryItem.vala:156: Unable to fetch preview for %s: %s", _tmp11_, _tmp13_);
+#line 156 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_free0 (_tmp11_);
-#line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_error_free0 (err);
-#line 1362 "EventDirectoryItem.c"
+#line 1485 "EventDirectoryItem.c"
}
- __finally53:
-#line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ __finally54:
+#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_object_unref0 (media);
-#line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_clear_error (&_inner_error_);
-#line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
return;
-#line 1375 "EventDirectoryItem.c"
+#line 1498 "EventDirectoryItem.c"
}
} else {
- GdkRectangle _tmp14_ = {0};
+ GdkRectangle _tmp14_;
Dimensions _tmp15_ = {0};
-#line 145 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp14_ = self->priv->paul_lynde;
-#line 145 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
dimensions_for_rectangle (&_tmp14_, &_tmp15_);
-#line 145 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
checkerboard_item_clear_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), &_tmp15_);
-#line 1386 "EventDirectoryItem.c"
+#line 1509 "EventDirectoryItem.c"
}
-#line 148 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 162 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
THUMBNAIL_VIEW_CLASS (event_directory_item_parent_class)->thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), TYPE_THUMBNAIL_VIEW, ThumbnailView));
-#line 132 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 146 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_object_unref0 (media);
-#line 1392 "EventDirectoryItem.c"
+#line 1515 "EventDirectoryItem.c"
}
static void event_directory_item_real_paint_shadow (CheckerboardItem* base, cairo_t* ctx, Dimensions* dimensions, GdkPoint* origin, gint radius, gfloat initial_alpha) {
EventDirectoryItem * self;
Dimensions altered = {0};
- Dimensions _tmp0_ = {0};
- gint _tmp1_ = 0;
- Dimensions _tmp2_ = {0};
- gint _tmp3_ = 0;
- cairo_t* _tmp4_ = NULL;
- Dimensions _tmp5_ = {0};
- GdkPoint _tmp6_ = {0};
- gfloat _tmp7_ = 0.0F;
-#line 151 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ Dimensions _tmp0_;
+ gint _tmp1_;
+ Dimensions _tmp2_;
+ gint _tmp3_;
+ cairo_t* _tmp4_;
+ Dimensions _tmp5_;
+ GdkPoint _tmp6_;
+ gfloat _tmp7_;
+#line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 151 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_return_if_fail (ctx != NULL);
-#line 151 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_return_if_fail (dimensions != NULL);
-#line 151 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_return_if_fail (origin != NULL);
-#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 167 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp0_ = *dimensions;
-#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 167 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp1_ = _tmp0_.width;
-#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 167 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp2_ = *dimensions;
-#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 167 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp3_ = _tmp2_.height;
-#line 153 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 167 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
dimensions_init (&altered, _tmp1_ - 25, _tmp3_ - 25);
-#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp4_ = ctx;
-#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp5_ = altered;
-#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp6_ = *origin;
-#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp7_ = initial_alpha;
-#line 154 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 168 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
CHECKERBOARD_ITEM_CLASS (event_directory_item_parent_class)->paint_shadow (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp4_, &_tmp5_, &_tmp6_, 36, _tmp7_);
-#line 1435 "EventDirectoryItem.c"
+#line 1558 "EventDirectoryItem.c"
}
static void event_directory_item_real_paint_border (CheckerboardItem* base, cairo_t* ctx, Dimensions* object_dimensions, GdkPoint* object_origin, gint border_width) {
EventDirectoryItem * self;
Dimensions dimensions = {0};
- Dimensions _tmp0_ = {0};
- gint _tmp1_ = 0;
+ Dimensions _tmp0_;
+ gint _tmp1_;
Dimensions _tmp2_ = {0};
GdkPoint origin = {0};
- GdkPoint _tmp3_ = {0};
- gint _tmp4_ = 0;
+ GdkPoint _tmp3_;
+ gint _tmp4_;
GdkPoint _tmp5_ = {0};
- cairo_t* _tmp6_ = NULL;
- Dimensions _tmp7_ = {0};
- GdkPoint _tmp8_ = {0};
-#line 157 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ cairo_t* _tmp6_;
+ Dimensions _tmp7_;
+ GdkPoint _tmp8_;
+#line 171 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 157 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_return_if_fail (ctx != NULL);
-#line 157 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_return_if_fail (object_dimensions != NULL);
-#line 157 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_return_if_fail (object_origin != NULL);
-#line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp0_ = *object_dimensions;
-#line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp1_ = border_width;
-#line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
checkerboard_item_get_border_dimensions (&_tmp0_, _tmp1_, &_tmp2_);
-#line 159 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
dimensions = _tmp2_;
-#line 160 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp3_ = *object_origin;
-#line 160 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp4_ = border_width;
-#line 160 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
checkerboard_item_get_border_origin (&_tmp3_, _tmp4_, &_tmp5_);
-#line 160 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
origin = _tmp5_;
-#line 162 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp6_ = ctx;
-#line 162 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp7_ = dimensions;
-#line 162 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp8_ = origin;
-#line 162 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
draw_rounded_corners_filled (_tmp6_, &_tmp7_, &_tmp8_, 6.0);
-#line 1484 "EventDirectoryItem.c"
+#line 1607 "EventDirectoryItem.c"
}
static void event_directory_item_real_paint_image (CheckerboardItem* base, cairo_t* ctx, GdkPixbuf* pixbuf, GdkPoint* origin) {
EventDirectoryItem * self;
Dimensions dimensions = {0};
- GdkPixbuf* _tmp0_ = NULL;
+ GdkPixbuf* _tmp0_;
Dimensions _tmp1_ = {0};
- GdkPixbuf* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- cairo_t* _tmp7_ = NULL;
- Dimensions _tmp8_ = {0};
- GdkPoint _tmp9_ = {0};
- cairo_t* _tmp10_ = NULL;
- GdkPixbuf* _tmp11_ = NULL;
- GdkPoint _tmp12_ = {0};
- gint _tmp13_ = 0;
- GdkPoint _tmp14_ = {0};
- gint _tmp15_ = 0;
- cairo_t* _tmp16_ = NULL;
-#line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ GdkPixbuf* _tmp2_;
+ gboolean _tmp3_;
+ cairo_t* _tmp7_;
+ Dimensions _tmp8_;
+ GdkPoint _tmp9_;
+ cairo_t* _tmp10_;
+ GdkPixbuf* _tmp11_;
+ GdkPoint _tmp12_;
+ gint _tmp13_;
+ GdkPoint _tmp14_;
+ gint _tmp15_;
+ cairo_t* _tmp16_;
+#line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_return_if_fail (ctx != NULL);
-#line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 165 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_return_if_fail (origin != NULL);
-#line 167 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 181 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp0_ = pixbuf;
-#line 167 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 181 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
dimensions_for_pixbuf (_tmp0_, &_tmp1_);
-#line 167 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 181 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
dimensions = _tmp1_;
-#line 169 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp2_ = pixbuf;
-#line 169 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp3_ = gdk_pixbuf_get_has_alpha (_tmp2_);
-#line 169 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
if (_tmp3_) {
-#line 1525 "EventDirectoryItem.c"
- cairo_t* _tmp4_ = NULL;
- Dimensions _tmp5_ = {0};
- GdkPoint _tmp6_ = {0};
-#line 170 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 1648 "EventDirectoryItem.c"
+ cairo_t* _tmp4_;
+ Dimensions _tmp5_;
+ GdkPoint _tmp6_;
+#line 184 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp4_ = ctx;
-#line 170 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp5_ = dimensions;
-#line 170 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp6_ = *origin;
-#line 170 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 184 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
draw_rounded_corners_filled (_tmp4_, &_tmp5_, &_tmp6_, 6.0);
-#line 1537 "EventDirectoryItem.c"
+#line 1660 "EventDirectoryItem.c"
}
-#line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp7_ = ctx;
-#line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp8_ = dimensions;
-#line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp9_ = *origin;
-#line 173 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
context_rounded_corners (_tmp7_, &_tmp8_, &_tmp9_, 6.0);
-#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp10_ = ctx;
-#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp11_ = pixbuf;
-#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp12_ = *origin;
-#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp13_ = _tmp12_.x;
-#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp14_ = *origin;
-#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp15_ = _tmp14_.y;
-#line 174 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
gdk_cairo_set_source_pixbuf (_tmp10_, _tmp11_, (gdouble) _tmp13_, (gdouble) _tmp15_);
-#line 175 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp16_ = ctx;
-#line 175 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
cairo_paint (_tmp16_);
-#line 1565 "EventDirectoryItem.c"
+#line 1688 "EventDirectoryItem.c"
}
static void event_directory_item_update_comment (EventDirectoryItem* self, gboolean init) {
gchar* comment = NULL;
- Event* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
-#line 178 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ Event* _tmp0_;
+ gchar* _tmp1_;
+ const gchar* _tmp2_;
+ gboolean _tmp3_;
+#line 192 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_return_if_fail (IS_EVENT_DIRECTORY_ITEM (self));
-#line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 193 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp0_ = self->event;
-#line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 193 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp1_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource));
-#line 179 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 193 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
comment = _tmp1_;
-#line 180 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp2_ = comment;
-#line 180 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp3_ = is_string_empty (_tmp2_);
-#line 180 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 194 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
if (_tmp3_) {
-#line 181 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 195 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
checkerboard_item_clear_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1591 "EventDirectoryItem.c"
+#line 1714 "EventDirectoryItem.c"
} else {
- gboolean _tmp4_ = FALSE;
-#line 182 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+ gboolean _tmp4_;
+#line 196 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp4_ = init;
-#line 182 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 196 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
if (!_tmp4_) {
-#line 1598 "EventDirectoryItem.c"
- const gchar* _tmp5_ = NULL;
-#line 183 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 1721 "EventDirectoryItem.c"
+ const gchar* _tmp5_;
+#line 197 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp5_ = comment;
-#line 183 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
checkerboard_item_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_, FALSE, PANGO_ALIGN_LEFT);
-#line 1604 "EventDirectoryItem.c"
+#line 1727 "EventDirectoryItem.c"
} else {
-#line 185 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 199 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
checkerboard_item_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), "", FALSE, PANGO_ALIGN_LEFT);
-#line 1608 "EventDirectoryItem.c"
+#line 1731 "EventDirectoryItem.c"
}
}
-#line 178 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
+#line 192 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_g_free0 (comment);
-#line 1613 "EventDirectoryItem.c"
+#line 1736 "EventDirectoryItem.c"
}
static gint event_directory_item_get_CROPPED_SCALE (void) {
gint result;
- gint _tmp0_ = 0;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
+ gint _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
#line 10 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
_tmp0_ = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_MEDIUM);
#line 10 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
@@ -1628,15 +1751,15 @@ static gint event_directory_item_get_CROPPED_SCALE (void) {
result = _tmp0_ + ((_tmp1_ - _tmp2_) / 2);
#line 10 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
return result;
-#line 1632 "EventDirectoryItem.c"
+#line 1755 "EventDirectoryItem.c"
}
static void event_directory_item_class_init (EventDirectoryItemClass * klass) {
- gint _tmp0_ = 0;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
+ gint _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
Dimensions _tmp4_ = {0};
Scaling _tmp5_ = {0};
#line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
@@ -1644,17 +1767,17 @@ static void event_directory_item_class_init (EventDirectoryItemClass * klass) {
#line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
g_type_class_add_private (klass, sizeof (EventDirectoryItemPrivate));
#line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- ((CheckerboardItemClass *) klass)->exposed = (void (*)(CheckerboardItem*)) event_directory_item_real_exposed;
+ ((CheckerboardItemClass *) klass)->exposed = (void (*) (CheckerboardItem *)) event_directory_item_real_exposed;
#line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- ((CheckerboardItemClass *) klass)->unexposed = (void (*)(CheckerboardItem*)) event_directory_item_real_unexposed;
+ ((CheckerboardItemClass *) klass)->unexposed = (void (*) (CheckerboardItem *)) event_directory_item_real_unexposed;
#line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- ((ThumbnailViewClass *) klass)->thumbnail_altered = (void (*)(ThumbnailView*)) event_directory_item_real_thumbnail_altered;
+ ((ThumbnailViewClass *) klass)->thumbnail_altered = (void (*) (ThumbnailView *)) event_directory_item_real_thumbnail_altered;
#line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- ((CheckerboardItemClass *) klass)->paint_shadow = (void (*)(CheckerboardItem*, cairo_t*, Dimensions*, GdkPoint*, gint, gfloat)) event_directory_item_real_paint_shadow;
+ ((CheckerboardItemClass *) klass)->paint_shadow = (void (*) (CheckerboardItem *, cairo_t*, Dimensions*, GdkPoint*, gint, gfloat)) event_directory_item_real_paint_shadow;
#line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- ((CheckerboardItemClass *) klass)->paint_border = (void (*)(CheckerboardItem*, cairo_t*, Dimensions*, GdkPoint*, gint)) event_directory_item_real_paint_border;
+ ((CheckerboardItemClass *) klass)->paint_border = (void (*) (CheckerboardItem *, cairo_t*, Dimensions*, GdkPoint*, gint)) event_directory_item_real_paint_border;
#line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
- ((CheckerboardItemClass *) klass)->paint_image = (void (*)(CheckerboardItem*, cairo_t*, GdkPixbuf*, GdkPoint*)) event_directory_item_real_paint_image;
+ ((CheckerboardItemClass *) klass)->paint_image = (void (*) (CheckerboardItem *, cairo_t*, GdkPixbuf*, GdkPoint*)) event_directory_item_real_paint_image;
#line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
G_OBJECT_CLASS (klass)->get_property = _vala_event_directory_item_get_property;
#line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
@@ -1673,7 +1796,7 @@ static void event_directory_item_class_init (EventDirectoryItemClass * klass) {
scaling_to_fill_viewport (&_tmp4_, &_tmp5_);
#line 15 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
event_directory_item_squared_scaling = _tmp5_;
-#line 1677 "EventDirectoryItem.c"
+#line 1800 "EventDirectoryItem.c"
}
@@ -1682,14 +1805,14 @@ static void event_directory_item_instance_init (EventDirectoryItem * self) {
self->priv = EVENT_DIRECTORY_ITEM_GET_PRIVATE (self);
#line 20 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
memset (&self->priv->paul_lynde, 0, sizeof (GdkRectangle));
-#line 1686 "EventDirectoryItem.c"
+#line 1809 "EventDirectoryItem.c"
}
-static void event_directory_item_finalize (GObject* obj) {
+static void event_directory_item_finalize (GObject * obj) {
EventDirectoryItem * self;
- EventSourceCollection* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
+ EventSourceCollection* _tmp0_;
+ guint _tmp1_;
#line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
#line 39 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
@@ -1702,7 +1825,7 @@ static void event_directory_item_finalize (GObject* obj) {
_g_object_unref0 (self->event);
#line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
G_OBJECT_CLASS (event_directory_item_parent_class)->finalize (obj);
-#line 1706 "EventDirectoryItem.c"
+#line 1829 "EventDirectoryItem.c"
}
@@ -1723,13 +1846,13 @@ static void _vala_event_directory_item_get_property (GObject * object, guint pro
self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
#line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
switch (property_id) {
-#line 1727 "EventDirectoryItem.c"
+#line 1850 "EventDirectoryItem.c"
default:
#line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 7 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
break;
-#line 1733 "EventDirectoryItem.c"
+#line 1856 "EventDirectoryItem.c"
}
}
diff --git a/src/events/EventDirectoryItem.vala b/src/events/EventDirectoryItem.vala
index f316de7..f75a8e0 100644
--- a/src/events/EventDirectoryItem.vala
+++ b/src/events/EventDirectoryItem.vala
@@ -54,7 +54,21 @@ class EventDirectoryItem : CheckerboardItem {
// scale and crop the center square of the media
private static Gdk.Pixbuf get_paul_lynde(MediaSource media, Gdk.Rectangle paul_lynde) throws Error {
- Gdk.Pixbuf pixbuf = media.get_preview_pixbuf(squared_scaling);
+ Gdk.Pixbuf pixbuf;
+
+ try {
+ pixbuf = media.get_preview_pixbuf(squared_scaling);
+ } catch (Error error) {
+ ThumbnailCache.fetch_async_scaled(media, ThumbnailCache.Size.BIG,
+ new Dimensions(ThumbnailCache.Size.BIG, ThumbnailCache.Size.BIG),
+ ThumbnailCache.DEFAULT_INTERP, () => {});
+ if (media is LibraryPhoto) {
+ LibraryPhoto photo = (LibraryPhoto) media;
+ pixbuf = photo.get_pixbuf(squared_scaling);
+ } else {
+ throw error;
+ }
+ }
Dimensions thumbnail_dimensions = Dimensions.for_pixbuf(pixbuf);
diff --git a/src/events/EventPage.c b/src/events/EventPage.c
index 23ca2e4..7b747fc 100644
--- a/src/events/EventPage.c
+++ b/src/events/EventPage.c
@@ -1,4 +1,4 @@
-/* EventPage.c generated by valac 0.34.7, the Vala compiler
+/* EventPage.c generated by valac 0.36.6, the Vala compiler
* generated from EventPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -884,7 +884,7 @@ GType app_window_get_type (void) G_GNUC_CONST;
GType library_window_get_type (void) G_GNUC_CONST;
LibraryWindow* library_window_get_app (void);
void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event);
-static void event_page_finalize (GObject* obj);
+static void event_page_finalize (GObject * obj);
GType no_event_page_get_type (void) G_GNUC_CONST;
enum {
NO_EVENT_PAGE_DUMMY_PROPERTY
@@ -930,7 +930,7 @@ void event_id_free (EventID* self);
void media_source_get_event_id (MediaSource* self, EventID* result);
#define EVENT_ID_INVALID ((gint64) -1)
gboolean view_manager_include_in_view (ViewManager* self, DataSource* source);
-static void no_event_page_finalize (GObject* obj);
+static void no_event_page_finalize (GObject * obj);
static const GActionEntry EVENT_PAGE_entries[3] = {{"MakePrimary", _event_page_on_make_primary_gsimple_action_activate_callback}, {"Rename", _event_page_on_rename_gsimple_action_activate_callback}, {"EditEventComment", _media_page_on_edit_comment_gsimple_action_activate_callback}};
@@ -980,15 +980,15 @@ static DataView* _media_page_create_thumbnail_create_view (DataSource* source, g
EventPage* event_page_construct (GType object_type, Event* page_event) {
EventPage * self = NULL;
- Event* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- Event* _tmp3_ = NULL;
- Event* _tmp4_ = NULL;
- Event* _tmp5_ = NULL;
- ViewCollection* _tmp6_ = NULL;
- ViewCollection* _tmp7_ = NULL;
- EventSourceCollection* _tmp8_ = NULL;
+ Event* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ Event* _tmp3_;
+ Event* _tmp4_;
+ Event* _tmp5_;
+ ViewCollection* _tmp6_;
+ ViewCollection* _tmp7_;
+ EventSourceCollection* _tmp8_;
#line 10 "/home/jens/Source/shotwell/src/events/EventPage.vala"
g_return_val_if_fail (IS_EVENT (page_event), NULL);
#line 11 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1040,8 +1040,8 @@ EventPage* event_page_new (Event* page_event) {
Event* event_page_get_event (EventPage* self) {
Event* result = NULL;
- Event* _tmp0_ = NULL;
- Event* _tmp1_ = NULL;
+ Event* _tmp0_;
+ Event* _tmp1_;
#line 21 "/home/jens/Source/shotwell/src/events/EventPage.vala"
g_return_val_if_fail (IS_EVENT_PAGE (self), NULL);
#line 22 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1059,11 +1059,11 @@ Event* event_page_get_event (EventPage* self) {
static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* event) {
EventPage * self;
gboolean result = FALSE;
- GdkEventKey* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- const gchar* _tmp2_ = NULL;
- GdkEventKey* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
+ GdkEventKey* _tmp0_;
+ guint _tmp1_;
+ const gchar* _tmp2_;
+ GdkEventKey* _tmp7_;
+ gboolean _tmp8_;
#line 25 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
#line 25 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1077,10 +1077,10 @@ static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
#line 30 "/home/jens/Source/shotwell/src/events/EventPage.vala"
if (g_strcmp0 (_tmp2_, "F2") == 0) {
#line 1080 "EventPage.c"
- ViewCollection* _tmp3_ = NULL;
- ViewCollection* _tmp4_ = NULL;
- gint _tmp5_ = 0;
- gboolean _tmp6_ = FALSE;
+ ViewCollection* _tmp3_;
+ ViewCollection* _tmp4_;
+ gint _tmp5_;
+ gboolean _tmp6_;
#line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 31 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1114,8 +1114,8 @@ static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
static void event_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
EventPage * self;
- GeeList* _tmp0_ = NULL;
- GeeList* _tmp1_ = NULL;
+ GeeList* _tmp0_;
+ GeeList* _tmp1_;
#line 44 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
#line 44 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1134,8 +1134,8 @@ static void event_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_f
static void event_page_real_add_actions (Page* base, GActionMap* map) {
EventPage * self;
- GActionMap* _tmp0_ = NULL;
- GActionMap* _tmp1_ = NULL;
+ GActionMap* _tmp0_;
+ GActionMap* _tmp1_;
#line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
#line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1154,7 +1154,7 @@ static void event_page_real_add_actions (Page* base, GActionMap* map) {
static void event_page_real_remove_actions (Page* base, GActionMap* map) {
EventPage * self;
- GActionMap* _tmp0_ = NULL;
+ GActionMap* _tmp0_;
#line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
#line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1181,9 +1181,9 @@ static void event_page_real_remove_actions (Page* base, GActionMap* map) {
entry = entry_collection[entry_it];
#line 1183 "EventPage.c"
{
- GActionMap* _tmp1_ = NULL;
- GActionEntry _tmp2_ = {0};
- const gchar* _tmp3_ = NULL;
+ GActionMap* _tmp1_;
+ GActionEntry _tmp2_;
+ const gchar* _tmp3_;
#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp1_ = map;
#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1201,8 +1201,8 @@ static void event_page_real_remove_actions (Page* base, GActionMap* map) {
static void event_page_real_init_actions (Page* base, gint selected_count, gint count) {
EventPage * self;
- gint _tmp0_ = 0;
- gint _tmp1_ = 0;
+ gint _tmp0_;
+ gint _tmp1_;
#line 69 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
#line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1217,9 +1217,9 @@ static void event_page_real_init_actions (Page* base, gint selected_count, gint
static void event_page_real_update_actions (Page* base, gint selected_count, gint count) {
EventPage * self;
- gint _tmp0_ = 0;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
+ gint _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
#line 73 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
#line 74 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1244,8 +1244,8 @@ static void event_page_real_get_config_photos_sort (MediaPage* base, gboolean* s
EventPage * self;
gboolean _vala_sort_order = FALSE;
gint _vala_sort_by = 0;
- ConfigFacade* _tmp0_ = NULL;
- ConfigFacade* _tmp1_ = NULL;
+ ConfigFacade* _tmp0_;
+ ConfigFacade* _tmp1_;
gboolean _tmp2_ = FALSE;
gint _tmp3_ = 0;
#line 86 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1279,10 +1279,10 @@ static void event_page_real_get_config_photos_sort (MediaPage* base, gboolean* s
static void event_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
EventPage * self;
- ConfigFacade* _tmp0_ = NULL;
- ConfigFacade* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- gint _tmp3_ = 0;
+ ConfigFacade* _tmp0_;
+ ConfigFacade* _tmp1_;
+ gboolean _tmp2_;
+ gint _tmp3_;
#line 90 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1302,9 +1302,9 @@ static void event_page_real_set_config_photos_sort (MediaPage* base, gboolean so
static void event_page_on_events_altered (EventPage* self, GeeMap* map) {
- GeeMap* _tmp0_ = NULL;
- Event* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ GeeMap* _tmp0_;
+ Event* _tmp1_;
+ gboolean _tmp2_;
#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
g_return_if_fail (IS_EVENT_PAGE (self));
#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1318,9 +1318,9 @@ static void event_page_on_events_altered (EventPage* self, GeeMap* map) {
#line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala"
if (_tmp2_) {
#line 1321 "EventPage.c"
- Event* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+ Event* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp3_ = self->priv->page_event;
#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1338,10 +1338,10 @@ static void event_page_on_events_altered (EventPage* self, GeeMap* map) {
static void event_page_real_on_edit_comment (MediaPage* base) {
EventPage * self;
- ViewCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gboolean _tmp3_ = FALSE;
+ ViewCollection* _tmp0_;
+ ViewCollection* _tmp1_;
+ gint _tmp2_;
+ gboolean _tmp3_;
#line 99 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1358,22 +1358,22 @@ static void event_page_real_on_edit_comment (MediaPage* base) {
if (_tmp3_) {
#line 1360 "EventPage.c"
EditCommentDialog* edit_comment_dialog = NULL;
- Event* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- EditCommentDialog* _tmp7_ = NULL;
- EditCommentDialog* _tmp8_ = NULL;
+ Event* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ EditCommentDialog* _tmp7_;
+ EditCommentDialog* _tmp8_;
gchar* new_comment = NULL;
- EditCommentDialog* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- const gchar* _tmp11_ = NULL;
+ EditCommentDialog* _tmp9_;
+ gchar* _tmp10_;
+ const gchar* _tmp11_;
EditEventCommentCommand* command = NULL;
- Event* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
- EditEventCommentCommand* _tmp14_ = NULL;
- CommandManager* _tmp15_ = NULL;
- CommandManager* _tmp16_ = NULL;
- EditEventCommentCommand* _tmp17_ = NULL;
+ Event* _tmp12_;
+ const gchar* _tmp13_;
+ EditEventCommentCommand* _tmp14_;
+ CommandManager* _tmp15_;
+ CommandManager* _tmp16_;
+ EditEventCommentCommand* _tmp17_;
#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp4_ = self->priv->page_event;
#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1441,17 +1441,17 @@ static void event_page_real_on_edit_comment (MediaPage* base) {
static void event_page_on_make_primary (EventPage* self) {
- ViewCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gboolean _tmp3_ = FALSE;
- Event* _tmp4_ = NULL;
- ViewCollection* _tmp5_ = NULL;
- ViewCollection* _tmp6_ = NULL;
- DataView* _tmp7_ = NULL;
- DataView* _tmp8_ = NULL;
- DataSource* _tmp9_ = NULL;
- MediaSource* _tmp10_ = NULL;
+ ViewCollection* _tmp0_;
+ ViewCollection* _tmp1_;
+ gint _tmp2_;
+ gboolean _tmp3_;
+ Event* _tmp4_;
+ ViewCollection* _tmp5_;
+ ViewCollection* _tmp6_;
+ DataView* _tmp7_;
+ DataView* _tmp8_;
+ DataSource* _tmp9_;
+ MediaSource* _tmp10_;
#line 115 "/home/jens/Source/shotwell/src/events/EventPage.vala"
g_return_if_fail (IS_EVENT_PAGE (self));
#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1497,9 +1497,9 @@ static void event_page_on_make_primary (EventPage* self) {
static void event_page_on_rename (EventPage* self) {
- LibraryWindow* _tmp0_ = NULL;
- LibraryWindow* _tmp1_ = NULL;
- Event* _tmp2_ = NULL;
+ LibraryWindow* _tmp0_;
+ LibraryWindow* _tmp1_;
+ Event* _tmp2_;
#line 122 "/home/jens/Source/shotwell/src/events/EventPage.vala"
g_return_if_fail (IS_EVENT_PAGE (self));
#line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1522,23 +1522,23 @@ static void event_page_class_init (EventPageClass * klass) {
#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
g_type_class_add_private (klass, sizeof (EventPagePrivate));
#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
- ((PageClass *) klass)->on_app_key_pressed = (gboolean (*)(Page*, GdkEventKey*)) event_page_real_on_app_key_pressed;
+ ((PageClass *) klass)->on_app_key_pressed = (gboolean (*) (Page *, GdkEventKey*)) event_page_real_on_app_key_pressed;
#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
- ((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) event_page_real_init_collect_ui_filenames;
+ ((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) event_page_real_init_collect_ui_filenames;
#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
- ((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) event_page_real_add_actions;
+ ((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) event_page_real_add_actions;
#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
- ((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) event_page_real_remove_actions;
+ ((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) event_page_real_remove_actions;
#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
- ((PageClass *) klass)->init_actions = (void (*)(Page*, gint, gint)) event_page_real_init_actions;
+ ((PageClass *) klass)->init_actions = (void (*) (Page *, gint, gint)) event_page_real_init_actions;
#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
- ((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) event_page_real_update_actions;
+ ((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) event_page_real_update_actions;
#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
- ((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) event_page_real_get_config_photos_sort;
+ ((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) event_page_real_get_config_photos_sort;
#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
- ((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) event_page_real_set_config_photos_sort;
+ ((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) event_page_real_set_config_photos_sort;
#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
- ((MediaPageClass *) klass)->on_edit_comment = (void (*)(MediaPage*)) event_page_real_on_edit_comment;
+ ((MediaPageClass *) klass)->on_edit_comment = (void (*) (MediaPage *)) event_page_real_on_edit_comment;
#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
G_OBJECT_CLASS (klass)->finalize = event_page_finalize;
#line 1545 "EventPage.c"
@@ -1552,12 +1552,12 @@ static void event_page_instance_init (EventPage * self) {
}
-static void event_page_finalize (GObject* obj) {
+static void event_page_finalize (GObject * obj) {
EventPage * self;
- EventSourceCollection* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- ViewCollection* _tmp2_ = NULL;
- ViewCollection* _tmp3_ = NULL;
+ EventSourceCollection* _tmp0_;
+ guint _tmp1_;
+ ViewCollection* _tmp2_;
+ ViewCollection* _tmp3_;
#line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENT_PAGE, EventPage);
#line 40 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1597,19 +1597,19 @@ GType event_page_get_type (void) {
NoEventPage* no_event_page_construct (GType object_type) {
NoEventPage * self = NULL;
ViewManager* filter = NULL;
- NoEventPageNoEventViewManager* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- ViewCollection* _tmp2_ = NULL;
- LibraryPhotoSourceCollection* _tmp3_ = NULL;
- Alteration* _tmp4_ = NULL;
- ViewCollectionMonitor* _tmp5_ = NULL;
- ViewCollectionMonitor* _tmp6_ = NULL;
- ViewCollection* _tmp7_ = NULL;
- ViewCollection* _tmp8_ = NULL;
- VideoSourceCollection* _tmp9_ = NULL;
- Alteration* _tmp10_ = NULL;
- ViewCollectionMonitor* _tmp11_ = NULL;
- ViewCollectionMonitor* _tmp12_ = NULL;
+ NoEventPageNoEventViewManager* _tmp0_;
+ ViewCollection* _tmp1_;
+ ViewCollection* _tmp2_;
+ LibraryPhotoSourceCollection* _tmp3_;
+ Alteration* _tmp4_;
+ ViewCollectionMonitor* _tmp5_;
+ ViewCollectionMonitor* _tmp6_;
+ ViewCollection* _tmp7_;
+ ViewCollection* _tmp8_;
+ VideoSourceCollection* _tmp9_;
+ Alteration* _tmp10_;
+ ViewCollectionMonitor* _tmp11_;
+ ViewCollectionMonitor* _tmp12_;
#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = (NoEventPage*) collection_page_construct (object_type, NO_EVENT_PAGE_NAME);
#line 148 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1667,8 +1667,8 @@ static void no_event_page_real_get_config_photos_sort (MediaPage* base, gboolean
NoEventPage * self;
gboolean _vala_sort_order = FALSE;
gint _vala_sort_by = 0;
- ConfigFacade* _tmp0_ = NULL;
- ConfigFacade* _tmp1_ = NULL;
+ ConfigFacade* _tmp0_;
+ ConfigFacade* _tmp1_;
gboolean _tmp2_ = FALSE;
gint _tmp3_ = 0;
#line 153 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1702,10 +1702,10 @@ static void no_event_page_real_get_config_photos_sort (MediaPage* base, gboolean
static void no_event_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
NoEventPage * self;
- ConfigFacade* _tmp0_ = NULL;
- ConfigFacade* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- gint _tmp3_ = 0;
+ ConfigFacade* _tmp0_;
+ ConfigFacade* _tmp1_;
+ gboolean _tmp2_;
+ gint _tmp3_;
#line 157 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NO_EVENT_PAGE, NoEventPage);
#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1726,7 +1726,7 @@ static void no_event_page_real_set_config_photos_sort (MediaPage* base, gboolean
static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_construct (GType object_type, NoEventPage* page) {
NoEventPageNoEventViewManager* self = NULL;
- NoEventPage* _tmp0_ = NULL;
+ NoEventPage* _tmp0_;
#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
g_return_val_if_fail (IS_NO_EVENT_PAGE (page), NULL);
#line 133 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1750,9 +1750,9 @@ static gboolean no_event_page_no_event_view_manager_real_include_in_view (ViewMa
NoEventPageNoEventViewManager * self;
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
- DataSource* _tmp1_ = NULL;
+ DataSource* _tmp1_;
EventID _tmp2_ = {0};
- gint64 _tmp3_ = 0LL;
+ gint64 _tmp3_;
#line 137 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, NO_EVENT_PAGE_TYPE_NO_EVENT_VIEW_MANAGER, NoEventPageNoEventViewManager);
#line 137 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1769,8 +1769,8 @@ static gboolean no_event_page_no_event_view_manager_real_include_in_view (ViewMa
_tmp0_ = FALSE;
#line 1771 "EventPage.c"
} else {
- DataSource* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+ DataSource* _tmp4_;
+ gboolean _tmp5_;
#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
_tmp4_ = source;
#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1791,7 +1791,7 @@ static void no_event_page_no_event_view_manager_class_init (NoEventPageNoEventVi
#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
no_event_page_no_event_view_manager_parent_class = g_type_class_peek_parent (klass);
#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
- ((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) no_event_page_no_event_view_manager_real_include_in_view;
+ ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) no_event_page_no_event_view_manager_real_include_in_view;
#line 1796 "EventPage.c"
}
@@ -1813,13 +1813,13 @@ static GType no_event_page_no_event_view_manager_get_type (void) {
static void no_event_page_class_init (NoEventPageClass * klass) {
- Alteration* _tmp0_ = NULL;
+ Alteration* _tmp0_;
#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
no_event_page_parent_class = g_type_class_peek_parent (klass);
#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
- ((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) no_event_page_real_get_config_photos_sort;
+ ((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) no_event_page_real_get_config_photos_sort;
#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
- ((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) no_event_page_real_set_config_photos_sort;
+ ((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) no_event_page_real_set_config_photos_sort;
#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
G_OBJECT_CLASS (klass)->finalize = no_event_page_finalize;
#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1834,7 +1834,7 @@ static void no_event_page_instance_init (NoEventPage * self) {
}
-static void no_event_page_finalize (GObject* obj) {
+static void no_event_page_finalize (GObject * obj) {
NoEventPage * self;
#line 127 "/home/jens/Source/shotwell/src/events/EventPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NO_EVENT_PAGE, NoEventPage);
diff --git a/src/events/Events.c b/src/events/Events.c
index 97f36d8..270b9ad 100644
--- a/src/events/Events.c
+++ b/src/events/Events.c
@@ -1,4 +1,4 @@
-/* Events.c generated by valac 0.34.7, the Vala compiler
+/* Events.c generated by valac 0.36.6, the Vala compiler
* generated from Events.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/events/EventsDirectoryPage.c b/src/events/EventsDirectoryPage.c
index 7617f27..897a401 100644
--- a/src/events/EventsDirectoryPage.c
+++ b/src/events/EventsDirectoryPage.c
@@ -1,4 +1,4 @@
-/* EventsDirectoryPage.c generated by valac 0.34.7, the Vala compiler
+/* EventsDirectoryPage.c generated by valac 0.36.6, the Vala compiler
* generated from EventsDirectoryPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1091,7 +1091,7 @@ GType indexable_get_type (void) G_GNUC_CONST;
const gchar* indexable_get_indexable_keywords (Indexable* self);
gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, int* result_length1);
SearchViewFilter* search_view_filter_construct (GType object_type);
-static void events_directory_page_finalize (GObject* obj);
+static void events_directory_page_finalize (GObject * obj);
GType master_events_directory_page_get_type (void) G_GNUC_CONST;
enum {
MASTER_EVENTS_DIRECTORY_PAGE_DUMMY_PROPERTY
@@ -1125,7 +1125,7 @@ enum {
};
static gboolean sub_events_directory_page_sub_event_directory_manager_real_include_in_view (ViewManager* base, DataSource* source);
gboolean view_manager_include_in_view (ViewManager* self, DataSource* source);
-static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager* obj);
+static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager * obj);
static const GActionEntry EVENTS_DIRECTORY_PAGE_entries[4] = {{"Rename", _events_directory_page_on_rename_gsimple_action_activate_callback}, {"Merge", _events_directory_page_on_merge_gsimple_action_activate_callback}, {"EditComment", _events_directory_page_on_edit_comment_gsimple_action_activate_callback}, {"ViewComment", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _events_directory_page_on_display_comments_gsimple_action_change_state_callback}};
@@ -1189,37 +1189,37 @@ static gpointer _view_manager_ref0 (gpointer self) {
EventsDirectoryPage* events_directory_page_construct (GType object_type, const gchar* page_name, ViewManager* view_manager, GeeCollection* initial_events) {
EventsDirectoryPage * self = NULL;
- const gchar* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- ViewCollection* _tmp2_ = NULL;
- ConfigFacade* _tmp3_ = NULL;
- ConfigFacade* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- void* _tmp6_ = NULL;
- GDestroyNotify _tmp7_ = NULL;
- Comparator _tmp8_ = NULL;
- Comparator _tmp9_ = NULL;
- void* _tmp9__target = NULL;
- GDestroyNotify _tmp9__target_destroy_notify = NULL;
- ViewCollection* _tmp10_ = NULL;
- ViewCollection* _tmp11_ = NULL;
- EventSourceCollection* _tmp12_ = NULL;
- ViewManager* _tmp13_ = NULL;
- GeeCollection* _tmp14_ = NULL;
- ViewCollectionMonitor* _tmp15_ = NULL;
- ViewCollectionMonitor* _tmp16_ = NULL;
- ViewCollection* _tmp17_ = NULL;
- ViewCollection* _tmp18_ = NULL;
- ConfigFacade* _tmp19_ = NULL;
- ConfigFacade* _tmp20_ = NULL;
- gboolean _tmp21_ = FALSE;
+ const gchar* _tmp0_;
+ ViewCollection* _tmp1_;
+ ViewCollection* _tmp2_;
+ ConfigFacade* _tmp3_;
+ ConfigFacade* _tmp4_;
+ gboolean _tmp5_;
+ void* _tmp6_;
+ GDestroyNotify _tmp7_;
+ Comparator _tmp8_;
+ Comparator _tmp9_;
+ void* _tmp9__target;
+ GDestroyNotify _tmp9__target_destroy_notify;
+ ViewCollection* _tmp10_;
+ ViewCollection* _tmp11_;
+ EventSourceCollection* _tmp12_;
+ ViewManager* _tmp13_;
+ GeeCollection* _tmp14_;
+ ViewCollectionMonitor* _tmp15_;
+ ViewCollectionMonitor* _tmp16_;
+ ViewCollection* _tmp17_;
+ ViewCollection* _tmp18_;
+ ConfigFacade* _tmp19_;
+ ConfigFacade* _tmp20_;
+ gboolean _tmp21_;
GValue _tmp22_ = {0};
- ViewManager* _tmp23_ = NULL;
- ViewManager* _tmp24_ = NULL;
+ ViewManager* _tmp23_;
+ ViewManager* _tmp24_;
GtkToolbar* toolbar = NULL;
- GtkToolbar* _tmp25_ = NULL;
+ GtkToolbar* _tmp25_;
GtkToolButton* merge_button = NULL;
- GtkToolButton* _tmp26_ = NULL;
+ GtkToolButton* _tmp26_;
#line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_val_if_fail (page_name != NULL, NULL);
#line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1344,8 +1344,8 @@ EventsDirectoryPage* events_directory_page_construct (GType object_type, const g
static void events_directory_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
EventsDirectoryPage * self;
- GeeList* _tmp0_ = NULL;
- GeeList* _tmp1_ = NULL;
+ GeeList* _tmp0_;
+ GeeList* _tmp1_;
#line 80 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
#line 80 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1364,8 +1364,8 @@ static void events_directory_page_real_init_collect_ui_filenames (Page* base, Ge
gboolean events_directory_page_event_comparator_predicate (DataObject* object, Alteration* alteration) {
gboolean result = FALSE;
- Alteration* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ Alteration* _tmp0_;
+ gboolean _tmp1_;
#line 86 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
#line 86 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1385,13 +1385,13 @@ gboolean events_directory_page_event_comparator_predicate (DataObject* object, A
static gint64 events_directory_page_event_ascending_comparator (void* a, void* b) {
gint64 result = 0LL;
time_t start_a = 0;
- void* _tmp0_ = NULL;
- Event* _tmp1_ = NULL;
- time_t _tmp2_ = 0;
+ void* _tmp0_;
+ Event* _tmp1_;
+ time_t _tmp2_;
time_t start_b = 0;
- void* _tmp3_ = NULL;
- Event* _tmp4_ = NULL;
- time_t _tmp5_ = 0;
+ void* _tmp3_;
+ Event* _tmp4_;
+ time_t _tmp5_;
#line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = a;
#line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1418,9 +1418,9 @@ static gint64 events_directory_page_event_ascending_comparator (void* a, void* b
static gint64 events_directory_page_event_descending_comparator (void* a, void* b) {
gint64 result = 0LL;
- void* _tmp0_ = NULL;
- void* _tmp1_ = NULL;
- gint64 _tmp2_ = 0LL;
+ void* _tmp0_;
+ void* _tmp1_;
+ gint64 _tmp2_;
#line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = b;
#line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1455,15 +1455,15 @@ static gint64 _events_directory_page_event_descending_comparator_comparator (voi
static Comparator events_directory_page_get_event_comparator (gboolean ascending, void** result_target, GDestroyNotify* result_target_destroy_notify) {
Comparator result = NULL;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = ascending;
#line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
if (_tmp0_) {
#line 1464 "EventsDirectoryPage.c"
- Comparator _tmp1_ = NULL;
- void* _tmp1__target = NULL;
- GDestroyNotify _tmp1__target_destroy_notify = NULL;
+ Comparator _tmp1_;
+ void* _tmp1__target;
+ GDestroyNotify _tmp1__target_destroy_notify;
#line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = _events_directory_page_event_ascending_comparator_comparator;
#line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1480,9 +1480,9 @@ static Comparator events_directory_page_get_event_comparator (gboolean ascending
return result;
#line 1482 "EventsDirectoryPage.c"
} else {
- Comparator _tmp2_ = NULL;
- void* _tmp2__target = NULL;
- GDestroyNotify _tmp2__target_destroy_notify = NULL;
+ Comparator _tmp2_;
+ void* _tmp2__target;
+ GDestroyNotify _tmp2__target_destroy_notify;
#line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp2_ = _events_directory_page_event_descending_comparator_comparator;
#line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1511,16 +1511,16 @@ static GVariant* _variant_new14 (gboolean value) {
static void events_directory_page_real_add_actions (Page* base, GActionMap* map) {
EventsDirectoryPage * self;
- GActionMap* _tmp0_ = NULL;
- GActionMap* _tmp1_ = NULL;
+ GActionMap* _tmp0_;
+ GActionMap* _tmp1_;
gboolean display_comments = FALSE;
- ConfigFacade* _tmp2_ = NULL;
- ConfigFacade* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
- gboolean _tmp5_ = FALSE;
- GAction* _tmp6_ = NULL;
- GAction* _tmp7_ = NULL;
- GVariant* _tmp8_ = NULL;
+ ConfigFacade* _tmp2_;
+ ConfigFacade* _tmp3_;
+ gboolean _tmp4_;
+ gboolean _tmp5_;
+ GAction* _tmp6_;
+ GAction* _tmp7_;
+ GVariant* _tmp8_;
#line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
#line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1563,7 +1563,7 @@ static void events_directory_page_real_add_actions (Page* base, GActionMap* map)
static void events_directory_page_real_remove_actions (Page* base, GActionMap* map) {
EventsDirectoryPage * self;
- GActionMap* _tmp0_ = NULL;
+ GActionMap* _tmp0_;
#line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
#line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1590,9 +1590,9 @@ static void events_directory_page_real_remove_actions (Page* base, GActionMap* m
entry = entry_collection[entry_it];
#line 1592 "EventsDirectoryPage.c"
{
- GActionMap* _tmp1_ = NULL;
- GActionEntry _tmp2_ = {0};
- const gchar* _tmp3_ = NULL;
+ GActionMap* _tmp1_;
+ GActionEntry _tmp2_;
+ const gchar* _tmp3_;
#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = map;
#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1610,11 +1610,11 @@ static void events_directory_page_real_remove_actions (Page* base, GActionMap* m
static void events_directory_page_real_init_actions (Page* base, gint selected_count, gint count) {
EventsDirectoryPage * self;
- gint _tmp0_ = 0;
- gint _tmp1_ = 0;
+ gint _tmp0_;
+ gint _tmp1_;
GSimpleAction* action = NULL;
- GAction* _tmp2_ = NULL;
- GSimpleAction* _tmp3_ = NULL;
+ GAction* _tmp2_;
+ GSimpleAction* _tmp3_;
#line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
#line 133 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1647,11 +1647,11 @@ static void events_directory_page_real_init_actions (Page* base, gint selected_c
static void events_directory_page_real_update_actions (Page* base, gint selected_count, gint count) {
EventsDirectoryPage * self;
- gint _tmp0_ = 0;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
+ gint _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
#line 140 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
#line 141 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1681,56 +1681,50 @@ static void events_directory_page_real_update_actions (Page* base, gint selected
static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPage* base) {
EventsDirectoryPage * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ gchar* _tmp0_;
#line 149 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- _tmp0_ = _ ("No events");
+ _tmp0_ = g_strdup (_ ("No events"));
#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- _tmp1_ = g_strdup (_tmp0_);
-#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 1697 "EventsDirectoryPage.c"
+#line 1694 "EventsDirectoryPage.c"
}
static gchar* events_directory_page_real_get_filter_no_match_message (CheckerboardPage* base) {
EventsDirectoryPage * self;
gchar* result = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ gchar* _tmp0_;
#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
#line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- _tmp0_ = _ ("No events found");
-#line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (_ ("No events found"));
#line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 1716 "EventsDirectoryPage.c"
+#line 1710 "EventsDirectoryPage.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return self ? g_object_ref (self) : NULL;
-#line 1723 "EventsDirectoryPage.c"
+#line 1717 "EventsDirectoryPage.c"
}
static void events_directory_page_real_on_item_activated (CheckerboardPage* base, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) {
EventsDirectoryPage * self;
EventDirectoryItem* event = NULL;
- CheckerboardItem* _tmp0_ = NULL;
- EventDirectoryItem* _tmp1_ = NULL;
- LibraryWindow* _tmp2_ = NULL;
- LibraryWindow* _tmp3_ = NULL;
- Event* _tmp4_ = NULL;
+ CheckerboardItem* _tmp0_;
+ EventDirectoryItem* _tmp1_;
+ LibraryWindow* _tmp2_;
+ LibraryWindow* _tmp3_;
+ Event* _tmp4_;
#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1755,23 +1749,23 @@ static void events_directory_page_real_on_item_activated (CheckerboardPage* base
_g_object_unref0 (_tmp3_);
#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (event);
-#line 1759 "EventsDirectoryPage.c"
+#line 1753 "EventsDirectoryPage.c"
}
static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value) {
- ViewCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- GVariant* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- void* _tmp4_ = NULL;
- GDestroyNotify _tmp5_ = NULL;
- Comparator _tmp6_ = NULL;
- Comparator _tmp7_ = NULL;
- void* _tmp7__target = NULL;
- GDestroyNotify _tmp7__target_destroy_notify = NULL;
- GSimpleAction* _tmp8_ = NULL;
- GVariant* _tmp9_ = NULL;
+ ViewCollection* _tmp0_;
+ ViewCollection* _tmp1_;
+ GVariant* _tmp2_;
+ const gchar* _tmp3_;
+ void* _tmp4_;
+ GDestroyNotify _tmp5_;
+ Comparator _tmp6_;
+ Comparator _tmp7_;
+ void* _tmp7__target;
+ GDestroyNotify _tmp7__target_destroy_notify;
+ GSimpleAction* _tmp8_;
+ GVariant* _tmp9_;
#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1810,39 +1804,39 @@ static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GS
_tmp9_ = value;
#line 168 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_simple_action_set_state (_tmp8_, _tmp9_);
-#line 1814 "EventsDirectoryPage.c"
+#line 1808 "EventsDirectoryPage.c"
}
static void events_directory_page_on_rename (EventsDirectoryPage* self) {
- ViewCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gboolean _tmp3_ = FALSE;
+ ViewCollection* _tmp0_;
+ ViewCollection* _tmp1_;
+ gint _tmp2_;
+ gboolean _tmp3_;
EventDirectoryItem* item = NULL;
- ViewCollection* _tmp4_ = NULL;
- ViewCollection* _tmp5_ = NULL;
- DataView* _tmp6_ = NULL;
- EventDirectoryItem* _tmp7_ = NULL;
+ ViewCollection* _tmp4_;
+ ViewCollection* _tmp5_;
+ DataView* _tmp6_;
+ EventDirectoryItem* _tmp7_;
EventRenameDialog* rename_dialog = NULL;
- EventDirectoryItem* _tmp8_ = NULL;
- Event* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- EventRenameDialog* _tmp12_ = NULL;
- EventRenameDialog* _tmp13_ = NULL;
+ EventDirectoryItem* _tmp8_;
+ Event* _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ EventRenameDialog* _tmp12_;
+ EventRenameDialog* _tmp13_;
gchar* new_name = NULL;
- EventRenameDialog* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- const gchar* _tmp16_ = NULL;
+ EventRenameDialog* _tmp14_;
+ gchar* _tmp15_;
+ const gchar* _tmp16_;
RenameEventCommand* command = NULL;
- EventDirectoryItem* _tmp17_ = NULL;
- Event* _tmp18_ = NULL;
- const gchar* _tmp19_ = NULL;
- RenameEventCommand* _tmp20_ = NULL;
- CommandManager* _tmp21_ = NULL;
- CommandManager* _tmp22_ = NULL;
- RenameEventCommand* _tmp23_ = NULL;
+ EventDirectoryItem* _tmp17_;
+ Event* _tmp18_;
+ const gchar* _tmp19_;
+ RenameEventCommand* _tmp20_;
+ CommandManager* _tmp21_;
+ CommandManager* _tmp22_;
+ RenameEventCommand* _tmp23_;
#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1859,7 +1853,7 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) {
if (_tmp3_) {
#line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return;
-#line 1863 "EventsDirectoryPage.c"
+#line 1857 "EventsDirectoryPage.c"
}
#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -1907,7 +1901,7 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) {
_g_object_unref0 (item);
#line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return;
-#line 1911 "EventsDirectoryPage.c"
+#line 1905 "EventsDirectoryPage.c"
}
#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp17_ = item;
@@ -1937,39 +1931,39 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) {
_text_entry_dialog_mediator_unref0 (rename_dialog);
#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (item);
-#line 1941 "EventsDirectoryPage.c"
+#line 1935 "EventsDirectoryPage.c"
}
void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
- ViewCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gboolean _tmp3_ = FALSE;
+ ViewCollection* _tmp0_;
+ ViewCollection* _tmp1_;
+ gint _tmp2_;
+ gboolean _tmp3_;
EventDirectoryItem* item = NULL;
- ViewCollection* _tmp4_ = NULL;
- ViewCollection* _tmp5_ = NULL;
- DataView* _tmp6_ = NULL;
- EventDirectoryItem* _tmp7_ = NULL;
+ ViewCollection* _tmp4_;
+ ViewCollection* _tmp5_;
+ DataView* _tmp6_;
+ EventDirectoryItem* _tmp7_;
EditCommentDialog* edit_comment_dialog = NULL;
- EventDirectoryItem* _tmp8_ = NULL;
- Event* _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- EditCommentDialog* _tmp12_ = NULL;
- EditCommentDialog* _tmp13_ = NULL;
+ EventDirectoryItem* _tmp8_;
+ Event* _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ EditCommentDialog* _tmp12_;
+ EditCommentDialog* _tmp13_;
gchar* new_comment = NULL;
- EditCommentDialog* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- const gchar* _tmp16_ = NULL;
+ EditCommentDialog* _tmp14_;
+ gchar* _tmp15_;
+ const gchar* _tmp16_;
EditEventCommentCommand* command = NULL;
- EventDirectoryItem* _tmp17_ = NULL;
- Event* _tmp18_ = NULL;
- const gchar* _tmp19_ = NULL;
- EditEventCommentCommand* _tmp20_ = NULL;
- CommandManager* _tmp21_ = NULL;
- CommandManager* _tmp22_ = NULL;
- EditEventCommentCommand* _tmp23_ = NULL;
+ EventDirectoryItem* _tmp17_;
+ Event* _tmp18_;
+ const gchar* _tmp19_;
+ EditEventCommentCommand* _tmp20_;
+ CommandManager* _tmp21_;
+ CommandManager* _tmp22_;
+ EditEventCommentCommand* _tmp23_;
#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1986,7 +1980,7 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
if (_tmp3_) {
#line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return;
-#line 1990 "EventsDirectoryPage.c"
+#line 1984 "EventsDirectoryPage.c"
}
#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -2034,7 +2028,7 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
_g_object_unref0 (item);
#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return;
-#line 2038 "EventsDirectoryPage.c"
+#line 2032 "EventsDirectoryPage.c"
}
#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp17_ = item;
@@ -2064,25 +2058,25 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (item);
-#line 2068 "EventsDirectoryPage.c"
+#line 2062 "EventsDirectoryPage.c"
}
static void events_directory_page_on_merge (EventsDirectoryPage* self) {
- ViewCollection* _tmp0_ = NULL;
- ViewCollection* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gboolean _tmp3_ = FALSE;
+ ViewCollection* _tmp0_;
+ ViewCollection* _tmp1_;
+ gint _tmp2_;
+ gboolean _tmp3_;
MergeEventsCommand* command = NULL;
- ViewCollection* _tmp4_ = NULL;
- ViewCollection* _tmp5_ = NULL;
- GeeList* _tmp6_ = NULL;
- GeeList* _tmp7_ = NULL;
- MergeEventsCommand* _tmp8_ = NULL;
- MergeEventsCommand* _tmp9_ = NULL;
- CommandManager* _tmp10_ = NULL;
- CommandManager* _tmp11_ = NULL;
- MergeEventsCommand* _tmp12_ = NULL;
+ ViewCollection* _tmp4_;
+ ViewCollection* _tmp5_;
+ GeeList* _tmp6_;
+ GeeList* _tmp7_;
+ MergeEventsCommand* _tmp8_;
+ MergeEventsCommand* _tmp9_;
+ CommandManager* _tmp10_;
+ CommandManager* _tmp11_;
+ MergeEventsCommand* _tmp12_;
#line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2099,7 +2093,7 @@ static void events_directory_page_on_merge (EventsDirectoryPage* self) {
if (_tmp3_) {
#line 205 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return;
-#line 2103 "EventsDirectoryPage.c"
+#line 2097 "EventsDirectoryPage.c"
}
#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -2131,18 +2125,18 @@ static void events_directory_page_on_merge (EventsDirectoryPage* self) {
_command_manager_unref0 (_tmp11_);
#line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (command);
-#line 2135 "EventsDirectoryPage.c"
+#line 2129 "EventsDirectoryPage.c"
}
static void events_directory_page_on_display_comments (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value) {
gboolean display = FALSE;
- GVariant* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- ConfigFacade* _tmp2_ = NULL;
- ConfigFacade* _tmp3_ = NULL;
- GSimpleAction* _tmp4_ = NULL;
- GVariant* _tmp5_ = NULL;
+ GVariant* _tmp0_;
+ gboolean _tmp1_;
+ ConfigFacade* _tmp2_;
+ ConfigFacade* _tmp3_;
+ GSimpleAction* _tmp4_;
+ GVariant* _tmp5_;
#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2169,22 +2163,22 @@ static void events_directory_page_on_display_comments (EventsDirectoryPage* self
_tmp5_ = value;
#line 218 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 2173 "EventsDirectoryPage.c"
+#line 2167 "EventsDirectoryPage.c"
}
static gpointer _view_filter_ref0 (gpointer self) {
#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return self ? view_filter_ref (self) : NULL;
-#line 2180 "EventsDirectoryPage.c"
+#line 2174 "EventsDirectoryPage.c"
}
static SearchViewFilter* events_directory_page_real_get_search_view_filter (CheckerboardPage* base) {
EventsDirectoryPage * self;
SearchViewFilter* result = NULL;
- EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_ = NULL;
- SearchViewFilter* _tmp1_ = NULL;
+ EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_;
+ SearchViewFilter* _tmp1_;
#line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2195,15 +2189,15 @@ static SearchViewFilter* events_directory_page_real_get_search_view_filter (Chec
result = _tmp1_;
#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2199 "EventsDirectoryPage.c"
+#line 2193 "EventsDirectoryPage.c"
}
static DataView* events_directory_page_event_directory_manager_real_create_view (ViewManager* base, DataSource* source) {
EventsDirectoryPageEventDirectoryManager * self;
DataView* result = NULL;
- DataSource* _tmp0_ = NULL;
- EventDirectoryItem* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ EventDirectoryItem* _tmp1_;
#line 9 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER, EventsDirectoryPageEventDirectoryManager);
#line 9 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2216,7 +2210,7 @@ static DataView* events_directory_page_event_directory_manager_real_create_view
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
#line 10 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2220 "EventsDirectoryPage.c"
+#line 2214 "EventsDirectoryPage.c"
}
@@ -2226,14 +2220,14 @@ EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_
self = (EventsDirectoryPageEventDirectoryManager*) view_manager_construct (object_type);
#line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return self;
-#line 2230 "EventsDirectoryPage.c"
+#line 2224 "EventsDirectoryPage.c"
}
EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_manager_new (void) {
#line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return events_directory_page_event_directory_manager_construct (EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER);
-#line 2237 "EventsDirectoryPage.c"
+#line 2231 "EventsDirectoryPage.c"
}
@@ -2241,8 +2235,8 @@ static void events_directory_page_event_directory_manager_class_init (EventsDire
#line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
events_directory_page_event_directory_manager_parent_class = g_type_class_peek_parent (klass);
#line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- ((ViewManagerClass *) klass)->create_view = (DataView* (*)(ViewManager*, DataSource*)) events_directory_page_event_directory_manager_real_create_view;
-#line 2246 "EventsDirectoryPage.c"
+ ((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) events_directory_page_event_directory_manager_real_create_view;
+#line 2240 "EventsDirectoryPage.c"
}
@@ -2271,48 +2265,48 @@ static guint events_directory_page_events_directory_search_view_filter_real_get_
result = (guint) SEARCH_FILTER_CRITERIA_TEXT;
#line 16 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2275 "EventsDirectoryPage.c"
+#line 2269 "EventsDirectoryPage.c"
}
static gboolean string_contains (const gchar* self, const gchar* needle) {
gboolean result = FALSE;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 2295 "EventsDirectoryPage.c"
+#line 2289 "EventsDirectoryPage.c"
}
static gboolean events_directory_page_events_directory_search_view_filter_real_predicate (ViewFilter* base, DataView* view) {
EventsDirectoryPageEventsDirectorySearchViewFilter * self;
gboolean result = FALSE;
- DataView* _tmp0_ = NULL;
- DataSource* _tmp1_ = NULL;
- DataSource* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ DataView* _tmp0_;
+ DataSource* _tmp1_;
+ DataSource* _tmp2_;
+ const gchar* _tmp3_;
+ gboolean _tmp4_;
Event* source = NULL;
- DataView* _tmp5_ = NULL;
- DataSource* _tmp6_ = NULL;
+ DataView* _tmp5_;
+ DataSource* _tmp6_;
const gchar* event_keywords = NULL;
- Event* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
- gboolean _tmp10_ = FALSE;
- gint _tmp11_ = 0;
- gchar** _tmp12_ = NULL;
+ Event* _tmp7_;
+ const gchar* _tmp8_;
+ const gchar* _tmp9_;
+ gboolean _tmp10_;
+ gint _tmp11_;
+ gchar** _tmp12_;
#line 19 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EVENTS_DIRECTORY_PAGE_TYPE_EVENTS_DIRECTORY_SEARCH_VIEW_FILTER, EventsDirectoryPageEventsDirectorySearchViewFilter);
#line 19 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2337,7 +2331,7 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
result = TRUE;
#line 22 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2341 "EventsDirectoryPage.c"
+#line 2335 "EventsDirectoryPage.c"
}
#line 24 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp5_ = view;
@@ -2363,11 +2357,11 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
_g_object_unref0 (source);
#line 27 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2367 "EventsDirectoryPage.c"
+#line 2361 "EventsDirectoryPage.c"
}
#line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp12_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp11_);
-#line 2371 "EventsDirectoryPage.c"
+#line 2365 "EventsDirectoryPage.c"
{
gchar** word_collection = NULL;
gint word_collection_length1 = 0;
@@ -2379,15 +2373,15 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
word_collection_length1 = _tmp11_;
#line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
for (word_it = 0; word_it < _tmp11_; word_it = word_it + 1) {
-#line 2383 "EventsDirectoryPage.c"
+#line 2377 "EventsDirectoryPage.c"
const gchar* word = NULL;
#line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
word = word_collection[word_it];
-#line 2387 "EventsDirectoryPage.c"
+#line 2381 "EventsDirectoryPage.c"
{
- const gchar* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
- gboolean _tmp15_ = FALSE;
+ const gchar* _tmp13_;
+ const gchar* _tmp14_;
+ gboolean _tmp15_;
#line 31 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp13_ = event_keywords;
#line 31 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2402,7 +2396,7 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
_g_object_unref0 (source);
#line 32 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2406 "EventsDirectoryPage.c"
+#line 2400 "EventsDirectoryPage.c"
}
}
}
@@ -2413,7 +2407,7 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
_g_object_unref0 (source);
#line 35 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2417 "EventsDirectoryPage.c"
+#line 2411 "EventsDirectoryPage.c"
}
@@ -2423,14 +2417,14 @@ static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page
self = (EventsDirectoryPageEventsDirectorySearchViewFilter*) search_view_filter_construct (object_type);
#line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return self;
-#line 2427 "EventsDirectoryPage.c"
+#line 2421 "EventsDirectoryPage.c"
}
static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_new (void) {
#line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return events_directory_page_events_directory_search_view_filter_construct (EVENTS_DIRECTORY_PAGE_TYPE_EVENTS_DIRECTORY_SEARCH_VIEW_FILTER);
-#line 2434 "EventsDirectoryPage.c"
+#line 2428 "EventsDirectoryPage.c"
}
@@ -2438,10 +2432,10 @@ static void events_directory_page_events_directory_search_view_filter_class_init
#line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
events_directory_page_events_directory_search_view_filter_parent_class = g_type_class_peek_parent (klass);
#line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- ((SearchViewFilterClass *) klass)->get_criteria = (guint (*)(SearchViewFilter*)) events_directory_page_events_directory_search_view_filter_real_get_criteria;
+ ((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) events_directory_page_events_directory_search_view_filter_real_get_criteria;
#line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- ((ViewFilterClass *) klass)->predicate = (gboolean (*)(ViewFilter*, DataView*)) events_directory_page_events_directory_search_view_filter_real_predicate;
-#line 2445 "EventsDirectoryPage.c"
+ ((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) events_directory_page_events_directory_search_view_filter_real_predicate;
+#line 2439 "EventsDirectoryPage.c"
}
@@ -2467,49 +2461,49 @@ static void events_directory_page_class_init (EventsDirectoryPageClass * klass)
#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_type_class_add_private (klass, sizeof (EventsDirectoryPagePrivate));
#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- ((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) events_directory_page_real_init_collect_ui_filenames;
+ ((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) events_directory_page_real_init_collect_ui_filenames;
#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- ((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) events_directory_page_real_add_actions;
+ ((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) events_directory_page_real_add_actions;
#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- ((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) events_directory_page_real_remove_actions;
+ ((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) events_directory_page_real_remove_actions;
#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- ((PageClass *) klass)->init_actions = (void (*)(Page*, gint, gint)) events_directory_page_real_init_actions;
+ ((PageClass *) klass)->init_actions = (void (*) (Page *, gint, gint)) events_directory_page_real_init_actions;
#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- ((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) events_directory_page_real_update_actions;
+ ((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) events_directory_page_real_update_actions;
#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- ((CheckerboardPageClass *) klass)->get_view_empty_message = (gchar* (*)(CheckerboardPage*)) events_directory_page_real_get_view_empty_message;
+ ((CheckerboardPageClass *) klass)->get_view_empty_message = (gchar* (*) (CheckerboardPage *)) events_directory_page_real_get_view_empty_message;
#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- ((CheckerboardPageClass *) klass)->get_filter_no_match_message = (gchar* (*)(CheckerboardPage*)) events_directory_page_real_get_filter_no_match_message;
+ ((CheckerboardPageClass *) klass)->get_filter_no_match_message = (gchar* (*) (CheckerboardPage *)) events_directory_page_real_get_filter_no_match_message;
#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- ((CheckerboardPageClass *) klass)->on_item_activated = (void (*)(CheckerboardPage*, CheckerboardItem*, CheckerboardPageActivator, CheckerboardPageKeyboardModifiers*)) events_directory_page_real_on_item_activated;
+ ((CheckerboardPageClass *) klass)->on_item_activated = (void (*) (CheckerboardPage *, CheckerboardItem*, CheckerboardPageActivator, CheckerboardPageKeyboardModifiers*)) events_directory_page_real_on_item_activated;
#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- ((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) events_directory_page_real_get_search_view_filter;
+ ((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) events_directory_page_real_get_search_view_filter;
#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
G_OBJECT_CLASS (klass)->finalize = events_directory_page_finalize;
-#line 2490 "EventsDirectoryPage.c"
+#line 2484 "EventsDirectoryPage.c"
}
static void events_directory_page_instance_init (EventsDirectoryPage * self) {
- EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_ = NULL;
+ EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_;
#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self->priv = EVENTS_DIRECTORY_PAGE_GET_PRIVATE (self);
#line 43 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = events_directory_page_events_directory_search_view_filter_new ();
#line 43 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self->priv->search_filter = _tmp0_;
-#line 2502 "EventsDirectoryPage.c"
+#line 2496 "EventsDirectoryPage.c"
}
-static void events_directory_page_finalize (GObject* obj) {
+static void events_directory_page_finalize (GObject * obj) {
EventsDirectoryPage * self;
GSimpleAction* action = NULL;
- GAction* _tmp0_ = NULL;
- GSimpleAction* _tmp1_ = NULL;
- GSimpleAction* _tmp2_ = NULL;
- GSimpleAction* _tmp3_ = NULL;
- guint _tmp4_ = 0U;
+ GAction* _tmp0_;
+ GSimpleAction* _tmp1_;
+ GSimpleAction* _tmp2_;
+ GSimpleAction* _tmp3_;
+ guint _tmp4_;
#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
#line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2520,7 +2514,7 @@ static void events_directory_page_finalize (GObject* obj) {
if (_tmp1_ == NULL) {
#line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_object_unref0 (_tmp0_);
-#line 2524 "EventsDirectoryPage.c"
+#line 2518 "EventsDirectoryPage.c"
}
#line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
action = _tmp1_;
@@ -2542,7 +2536,7 @@ static void events_directory_page_finalize (GObject* obj) {
_view_filter_unref0 (self->priv->search_filter);
#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
G_OBJECT_CLASS (events_directory_page_parent_class)->finalize (obj);
-#line 2546 "EventsDirectoryPage.c"
+#line 2540 "EventsDirectoryPage.c"
}
@@ -2560,11 +2554,11 @@ GType events_directory_page_get_type (void) {
MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_type) {
MasterEventsDirectoryPage * self = NULL;
- EventsDirectoryPageEventDirectoryManager* _tmp0_ = NULL;
- EventsDirectoryPageEventDirectoryManager* _tmp1_ = NULL;
- EventSourceCollection* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
- GeeCollection* _tmp4_ = NULL;
+ EventsDirectoryPageEventDirectoryManager* _tmp0_;
+ EventsDirectoryPageEventDirectoryManager* _tmp1_;
+ EventSourceCollection* _tmp2_;
+ GeeCollection* _tmp3_;
+ GeeCollection* _tmp4_;
#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = events_directory_page_event_directory_manager_new ();
#line 230 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2583,21 +2577,21 @@ MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_
_view_manager_unref0 (_tmp1_);
#line 229 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return self;
-#line 2587 "EventsDirectoryPage.c"
+#line 2581 "EventsDirectoryPage.c"
}
MasterEventsDirectoryPage* master_events_directory_page_new (void) {
#line 229 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return master_events_directory_page_construct (TYPE_MASTER_EVENTS_DIRECTORY_PAGE);
-#line 2594 "EventsDirectoryPage.c"
+#line 2588 "EventsDirectoryPage.c"
}
static void master_events_directory_page_class_init (MasterEventsDirectoryPageClass * klass) {
#line 226 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
master_events_directory_page_parent_class = g_type_class_peek_parent (klass);
-#line 2601 "EventsDirectoryPage.c"
+#line 2595 "EventsDirectoryPage.c"
}
@@ -2632,88 +2626,88 @@ GType sub_events_directory_page_directory_type_get_type (void) {
static gchar* g_time_format (struct tm *self, const gchar* format) {
gchar* result = NULL;
gchar* buffer = NULL;
- gchar* _tmp0_ = NULL;
- gint buffer_length1 = 0;
- gint _buffer_size_ = 0;
- gchar* _tmp1_ = NULL;
- gint _tmp1__length1 = 0;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gint _tmp3__length1 = 0;
- gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ gint buffer_length1;
+ gint _buffer_size_;
+ gchar* _tmp1_;
+ gint _tmp1__length1;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ gint _tmp3__length1;
+ gchar* _tmp4_;
+#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 2675 "EventsDirectoryPage.c"
+#line 2669 "EventsDirectoryPage.c"
}
SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time) {
SubEventsDirectoryPage * self = NULL;
gchar* page_name = NULL;
- SubEventsDirectoryPageDirectoryType _tmp0_ = 0;
- const gchar* _tmp5_ = NULL;
- SubEventsDirectoryPageDirectoryType _tmp6_ = 0;
- struct tm _tmp7_ = {0};
- SubEventsDirectoryPageSubEventDirectoryManager* _tmp8_ = NULL;
- SubEventsDirectoryPageSubEventDirectoryManager* _tmp9_ = NULL;
+ SubEventsDirectoryPageDirectoryType _tmp0_;
+ const gchar* _tmp5_;
+ SubEventsDirectoryPageDirectoryType _tmp6_;
+ struct tm _tmp7_;
+ SubEventsDirectoryPageSubEventDirectoryManager* _tmp8_;
+ SubEventsDirectoryPageSubEventDirectoryManager* _tmp9_;
#line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_val_if_fail (time != NULL, NULL);
#line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp0_ = type;
#line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED) {
-#line 2694 "EventsDirectoryPage.c"
- gchar* _tmp1_ = NULL;
+#line 2688 "EventsDirectoryPage.c"
+ gchar* _tmp1_;
#line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = g_strdup (SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME);
#line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_g_free0 (page_name);
#line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
page_name = _tmp1_;
-#line 2702 "EventsDirectoryPage.c"
+#line 2696 "EventsDirectoryPage.c"
} else {
const gchar* _tmp2_ = NULL;
- SubEventsDirectoryPageDirectoryType _tmp3_ = 0;
- gchar* _tmp4_ = NULL;
+ SubEventsDirectoryPageDirectoryType _tmp3_;
+ gchar* _tmp4_;
#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp3_ = type;
#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
if (_tmp3_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR) {
#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT;
-#line 2713 "EventsDirectoryPage.c"
+#line 2707 "EventsDirectoryPage.c"
} else {
#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT;
-#line 2717 "EventsDirectoryPage.c"
+#line 2711 "EventsDirectoryPage.c"
}
#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp4_ = g_time_format (time, _tmp2_);
@@ -2721,7 +2715,7 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
_g_free0 (page_name);
#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
page_name = _tmp4_;
-#line 2725 "EventsDirectoryPage.c"
+#line 2719 "EventsDirectoryPage.c"
}
#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp5_ = page_name;
@@ -2741,21 +2735,21 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
_g_free0 (page_name);
#line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return self;
-#line 2745 "EventsDirectoryPage.c"
+#line 2739 "EventsDirectoryPage.c"
}
SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) {
#line 287 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return sub_events_directory_page_construct (TYPE_SUB_EVENTS_DIRECTORY_PAGE, type, time);
-#line 2752 "EventsDirectoryPage.c"
+#line 2746 "EventsDirectoryPage.c"
}
gint sub_events_directory_page_get_month (SubEventsDirectoryPage* self) {
gint result = 0;
- ViewManager* _tmp0_ = NULL;
- gint _tmp1_ = 0;
+ ViewManager* _tmp0_;
+ gint _tmp1_;
#line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
#line 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2766,14 +2760,14 @@ gint sub_events_directory_page_get_month (SubEventsDirectoryPage* self) {
result = _tmp1_;
#line 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2770 "EventsDirectoryPage.c"
+#line 2764 "EventsDirectoryPage.c"
}
gint sub_events_directory_page_get_year (SubEventsDirectoryPage* self) {
gint result = 0;
- ViewManager* _tmp0_ = NULL;
- gint _tmp1_ = 0;
+ ViewManager* _tmp0_;
+ gint _tmp1_;
#line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
#line 303 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2784,14 +2778,14 @@ gint sub_events_directory_page_get_year (SubEventsDirectoryPage* self) {
result = _tmp1_;
#line 303 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2788 "EventsDirectoryPage.c"
+#line 2782 "EventsDirectoryPage.c"
}
SubEventsDirectoryPageDirectoryType sub_events_directory_page_get_event_directory_type (SubEventsDirectoryPage* self) {
SubEventsDirectoryPageDirectoryType result = 0;
- ViewManager* _tmp0_ = NULL;
- SubEventsDirectoryPageDirectoryType _tmp1_ = 0;
+ ViewManager* _tmp0_;
+ SubEventsDirectoryPageDirectoryType _tmp1_;
#line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
#line 307 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2802,16 +2796,16 @@ SubEventsDirectoryPageDirectoryType sub_events_directory_page_get_event_director
result = _tmp1_;
#line 307 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2806 "EventsDirectoryPage.c"
+#line 2800 "EventsDirectoryPage.c"
}
static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time) {
SubEventsDirectoryPageSubEventDirectoryManager* self = NULL;
- SubEventsDirectoryPageDirectoryType _tmp0_ = 0;
- SubEventsDirectoryPageDirectoryType _tmp3_ = 0;
- struct tm _tmp4_ = {0};
- gint _tmp5_ = 0;
+ SubEventsDirectoryPageDirectoryType _tmp0_;
+ SubEventsDirectoryPageDirectoryType _tmp3_;
+ struct tm _tmp4_;
+ gint _tmp5_;
#line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_val_if_fail (time != NULL, NULL);
#line 251 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2820,16 +2814,16 @@ static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page
_tmp0_ = type;
#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) {
-#line 2824 "EventsDirectoryPage.c"
- struct tm _tmp1_ = {0};
- gint _tmp2_ = 0;
+#line 2818 "EventsDirectoryPage.c"
+ struct tm _tmp1_;
+ gint _tmp2_;
#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp1_ = *time;
#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp2_ = _tmp1_.tm_mon;
#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self->priv->month = _tmp2_;
-#line 2833 "EventsDirectoryPage.c"
+#line 2827 "EventsDirectoryPage.c"
}
#line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp3_ = type;
@@ -2843,47 +2837,47 @@ static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page
self->priv->year = _tmp5_;
#line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return self;
-#line 2847 "EventsDirectoryPage.c"
+#line 2841 "EventsDirectoryPage.c"
}
static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) {
#line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return sub_events_directory_page_sub_event_directory_manager_construct (SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, type, time);
-#line 2854 "EventsDirectoryPage.c"
+#line 2848 "EventsDirectoryPage.c"
}
static void g_time_local (time_t time, struct tm* result) {
struct tm _result_ = {0};
struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return;
-#line 2869 "EventsDirectoryPage.c"
+#line 2863 "EventsDirectoryPage.c"
}
static gboolean sub_events_directory_page_sub_event_directory_manager_real_include_in_view (ViewManager* base, DataSource* source) {
SubEventsDirectoryPageSubEventDirectoryManager * self;
gboolean result = FALSE;
- DataSource* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ DataSource* _tmp0_;
+ gboolean _tmp1_;
EventSource* event = NULL;
- DataSource* _tmp2_ = NULL;
- EventSource* _tmp3_ = NULL;
+ DataSource* _tmp2_;
+ EventSource* _tmp3_;
struct tm event_time = {0};
- EventSource* _tmp4_ = NULL;
- time_t _tmp5_ = 0;
+ EventSource* _tmp4_;
+ time_t _tmp5_;
struct tm _tmp6_ = {0};
- struct tm _tmp7_ = {0};
- gint _tmp8_ = 0;
- gint _tmp9_ = 0;
+ struct tm _tmp7_;
+ gint _tmp8_;
+ gint _tmp9_;
#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager);
#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2898,7 +2892,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
result = FALSE;
#line 261 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2902 "EventsDirectoryPage.c"
+#line 2896 "EventsDirectoryPage.c"
}
#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp2_ = source;
@@ -2922,16 +2916,16 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
_tmp9_ = self->priv->year;
#line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
if (_tmp8_ == _tmp9_) {
-#line 2926 "EventsDirectoryPage.c"
- SubEventsDirectoryPageDirectoryType _tmp10_ = 0;
+#line 2920 "EventsDirectoryPage.c"
+ SubEventsDirectoryPageDirectoryType _tmp10_;
#line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp10_ = self->priv->type;
#line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
if (_tmp10_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) {
-#line 2932 "EventsDirectoryPage.c"
- struct tm _tmp11_ = {0};
- gint _tmp12_ = 0;
- gint _tmp13_ = 0;
+#line 2926 "EventsDirectoryPage.c"
+ struct tm _tmp11_;
+ gint _tmp12_;
+ gint _tmp13_;
#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
_tmp11_ = event_time;
#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2944,7 +2938,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
_g_object_unref0 (event);
#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2948 "EventsDirectoryPage.c"
+#line 2942 "EventsDirectoryPage.c"
}
#line 269 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
result = TRUE;
@@ -2952,7 +2946,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
_g_object_unref0 (event);
#line 269 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2956 "EventsDirectoryPage.c"
+#line 2950 "EventsDirectoryPage.c"
}
#line 271 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
result = FALSE;
@@ -2960,13 +2954,13 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
_g_object_unref0 (event);
#line 271 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2964 "EventsDirectoryPage.c"
+#line 2958 "EventsDirectoryPage.c"
}
static gint sub_events_directory_page_sub_event_directory_manager_get_month (SubEventsDirectoryPageSubEventDirectoryManager* self) {
gint result = 0;
- gint _tmp0_ = 0;
+ gint _tmp0_;
#line 274 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_val_if_fail (SUB_EVENTS_DIRECTORY_PAGE_IS_SUB_EVENT_DIRECTORY_MANAGER (self), 0);
#line 275 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2975,13 +2969,13 @@ static gint sub_events_directory_page_sub_event_directory_manager_get_month (Sub
result = _tmp0_;
#line 275 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2979 "EventsDirectoryPage.c"
+#line 2973 "EventsDirectoryPage.c"
}
static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubEventsDirectoryPageSubEventDirectoryManager* self) {
gint result = 0;
- gint _tmp0_ = 0;
+ gint _tmp0_;
#line 278 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_val_if_fail (SUB_EVENTS_DIRECTORY_PAGE_IS_SUB_EVENT_DIRECTORY_MANAGER (self), 0);
#line 279 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2990,13 +2984,13 @@ static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubE
result = _tmp0_;
#line 279 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 2994 "EventsDirectoryPage.c"
+#line 2988 "EventsDirectoryPage.c"
}
static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (SubEventsDirectoryPageSubEventDirectoryManager* self) {
SubEventsDirectoryPageDirectoryType result = 0;
- SubEventsDirectoryPageDirectoryType _tmp0_ = 0;
+ SubEventsDirectoryPageDirectoryType _tmp0_;
#line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_return_val_if_fail (SUB_EVENTS_DIRECTORY_PAGE_IS_SUB_EVENT_DIRECTORY_MANAGER (self), 0);
#line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -3005,7 +2999,7 @@ static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_d
result = _tmp0_;
#line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
return result;
-#line 3009 "EventsDirectoryPage.c"
+#line 3003 "EventsDirectoryPage.c"
}
@@ -3017,8 +3011,8 @@ static void sub_events_directory_page_sub_event_directory_manager_class_init (Su
#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
g_type_class_add_private (klass, sizeof (SubEventsDirectoryPageSubEventDirectoryManagerPrivate));
#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
- ((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) sub_events_directory_page_sub_event_directory_manager_real_include_in_view;
-#line 3022 "EventsDirectoryPage.c"
+ ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) sub_events_directory_page_sub_event_directory_manager_real_include_in_view;
+#line 3016 "EventsDirectoryPage.c"
}
@@ -3029,17 +3023,17 @@ static void sub_events_directory_page_sub_event_directory_manager_instance_init
self->priv->month = 0;
#line 247 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self->priv->year = 0;
-#line 3033 "EventsDirectoryPage.c"
+#line 3027 "EventsDirectoryPage.c"
}
-static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager* obj) {
+static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager * obj) {
SubEventsDirectoryPageSubEventDirectoryManager * self;
#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager);
#line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->finalize (obj);
-#line 3043 "EventsDirectoryPage.c"
+#line 3037 "EventsDirectoryPage.c"
}
@@ -3058,7 +3052,7 @@ static GType sub_events_directory_page_sub_event_directory_manager_get_type (voi
static void sub_events_directory_page_class_init (SubEventsDirectoryPageClass * klass) {
#line 234 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
sub_events_directory_page_parent_class = g_type_class_peek_parent (klass);
-#line 3062 "EventsDirectoryPage.c"
+#line 3056 "EventsDirectoryPage.c"
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 15:52:10 +0000