diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-06-25 21:12:13 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-06-25 21:12:13 +0200 |
commit | 059a62ee3c820a42fbce980c3256049adecc9100 (patch) | |
tree | e51eab94fd7d65459640ca227fb2257bb41d2acb /src/events/EventsDirectoryPage.c | |
parent | 55778740c211992cc86ea87588ab62c6750f36d1 (diff) | |
parent | e8f4d7a9cdd37c5a9fb3b6991a4e9173829808da (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/events/EventsDirectoryPage.c')
-rw-r--r-- | src/events/EventsDirectoryPage.c | 1919 |
1 files changed, 1048 insertions, 871 deletions
diff --git a/src/events/EventsDirectoryPage.c b/src/events/EventsDirectoryPage.c index 44368cb..0eb6a88 100644 --- a/src/events/EventsDirectoryPage.c +++ b/src/events/EventsDirectoryPage.c @@ -1,4 +1,4 @@ -/* EventsDirectoryPage.c generated by valac 0.36.6, the Vala compiler +/* EventsDirectoryPage.c generated by valac 0.40.4, the Vala compiler * generated from EventsDirectoryPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include <glib.h> #include <glib-object.h> #include <gtk/gtk.h> @@ -190,6 +191,11 @@ typedef struct _ViewManagerClass ViewManagerClass; typedef struct _EventsDirectoryPageEventsDirectorySearchViewFilter EventsDirectoryPageEventsDirectorySearchViewFilter; typedef struct _EventsDirectoryPageEventsDirectorySearchViewFilterClass EventsDirectoryPageEventsDirectorySearchViewFilterClass; +enum { + EVENTS_DIRECTORY_PAGE_0_PROPERTY, + EVENTS_DIRECTORY_PAGE_NUM_PROPERTIES +}; +static GParamSpec* events_directory_page_properties[EVENTS_DIRECTORY_PAGE_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _view_manager_unref0(var) ((var == NULL) ? NULL : (var = (view_manager_unref (var), NULL))) #define _view_filter_unref0(var) ((var == NULL) ? NULL : (var = (view_filter_unref (var), NULL))) @@ -534,6 +540,11 @@ typedef struct _IndexableIface IndexableIface; typedef struct _MasterEventsDirectoryPage MasterEventsDirectoryPage; typedef struct _MasterEventsDirectoryPageClass MasterEventsDirectoryPageClass; typedef struct _MasterEventsDirectoryPagePrivate MasterEventsDirectoryPagePrivate; +enum { + MASTER_EVENTS_DIRECTORY_PAGE_0_PROPERTY, + MASTER_EVENTS_DIRECTORY_PAGE_NUM_PROPERTIES +}; +static GParamSpec* master_events_directory_page_properties[MASTER_EVENTS_DIRECTORY_PAGE_NUM_PROPERTIES]; #define TYPE_SUB_EVENTS_DIRECTORY_PAGE (sub_events_directory_page_get_type ()) #define SUB_EVENTS_DIRECTORY_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SUB_EVENTS_DIRECTORY_PAGE, SubEventsDirectoryPage)) @@ -545,6 +556,11 @@ typedef struct _MasterEventsDirectoryPagePrivate MasterEventsDirectoryPagePrivat typedef struct _SubEventsDirectoryPage SubEventsDirectoryPage; typedef struct _SubEventsDirectoryPageClass SubEventsDirectoryPageClass; typedef struct _SubEventsDirectoryPagePrivate SubEventsDirectoryPagePrivate; +enum { + SUB_EVENTS_DIRECTORY_PAGE_0_PROPERTY, + SUB_EVENTS_DIRECTORY_PAGE_NUM_PROPERTIES +}; +static GParamSpec* sub_events_directory_page_properties[SUB_EVENTS_DIRECTORY_PAGE_NUM_PROPERTIES]; #define SUB_EVENTS_DIRECTORY_PAGE_TYPE_DIRECTORY_TYPE (sub_events_directory_page_directory_type_get_type ()) @@ -877,9 +893,15 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType checkerboard_page_get_type (void) G_GNUC_CONST; @@ -893,224 +915,359 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType search_view_filter_get_type (void) G_GNUC_CONST; gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; GType events_directory_page_get_type (void) G_GNUC_CONST; gpointer view_manager_ref (gpointer instance); void view_manager_unref (gpointer instance); -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_manager (GValue* value, gpointer v_object); -void value_take_view_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_manager (GValue* value, + gpointer v_object); +void value_take_view_manager (GValue* value, + gpointer v_object); gpointer value_get_view_manager (const GValue* value); GType view_manager_get_type (void) G_GNUC_CONST; static GType events_directory_page_events_directory_search_view_filter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define EVENTS_DIRECTORY_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPagePrivate)) -enum { - EVENTS_DIRECTORY_PAGE_DUMMY_PROPERTY -}; -GAction* page_get_action (Page* self, const gchar* name); -static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value); -static void _events_directory_page_on_sort_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self); +GAction* page_get_action (Page* self, + const gchar* name); +static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, + GSimpleAction* action, + GVariant* value); +static void _events_directory_page_on_sort_changed_g_simple_action_change_state (GSimpleAction* _sender, + GVariant* value, + gpointer self); static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_new (void); static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_construct (GType object_type); #define EVENTS_DIRECTORY_PAGE_MIN_PHOTOS_FOR_PROGRESS_WINDOW 50 static void events_directory_page_on_rename (EventsDirectoryPage* self); -static void _events_directory_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _events_directory_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); static void events_directory_page_on_merge (EventsDirectoryPage* self); -static void _events_directory_page_on_merge_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _events_directory_page_on_merge_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); void events_directory_page_on_edit_comment (EventsDirectoryPage* self); -static void _events_directory_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -void page_on_action_toggle (Page* self, GAction* action, GVariant* value); -static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); -static void events_directory_page_on_display_comments (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value); -static void _events_directory_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self); +static void _events_directory_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +void page_on_action_toggle (Page* self, + GAction* action, + GVariant* value); +static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); +static void events_directory_page_on_display_comments (EventsDirectoryPage* self, + GSimpleAction* action, + GVariant* value); +static void _events_directory_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self); GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; GType event_source_get_type (void) G_GNUC_CONST; GType event_get_type (void) G_GNUC_CONST; -EventsDirectoryPage* events_directory_page_construct (GType object_type, const gchar* page_name, ViewManager* view_manager, GeeCollection* initial_events); -CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name); +EventsDirectoryPage* events_directory_page_construct (GType object_type, + const gchar* page_name, + ViewManager* view_manager, + GeeCollection* initial_events); +CheckerboardPage* checkerboard_page_construct (GType object_type, + const gchar* page_name); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; ViewCollection* page_get_view (Page* self); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; -void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target); -static Comparator events_directory_page_get_event_comparator (gboolean ascending, void** result_target, GDestroyNotify* result_target_destroy_notify); +void data_collection_set_comparator (DataCollection* self, + Comparator comparator, + void* comparator_target, + ComparatorPredicate predicate, + void* predicate_target); +static Comparator events_directory_page_get_event_comparator (gboolean ascending, + void** result_target, + GDestroyNotify* result_target_destroy_notify); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* self); -gboolean events_directory_page_event_comparator_predicate (DataObject* object, Alteration* alteration); -static gboolean _events_directory_page_event_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self); +gboolean events_directory_page_event_comparator_predicate (DataObject* object, + Alteration* alteration); +static gboolean _events_directory_page_event_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self); GType source_collection_get_type (void) G_GNUC_CONST; gpointer view_collection_monitor_ref (gpointer instance); void view_collection_monitor_unref (gpointer instance); -GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void view_collection_value_set_monitor (GValue* value, gpointer v_object); -void view_collection_value_take_monitor (GValue* value, gpointer v_object); +GParamSpec* view_collection_param_spec_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void view_collection_value_set_monitor (GValue* value, + gpointer v_object); +void view_collection_value_take_monitor (GValue* value, + gpointer v_object); gpointer view_collection_value_get_monitor (const GValue* value); GType view_collection_monitor_get_type (void) G_GNUC_CONST; -ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target); +ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq, + GeeCollection* initial, + ProgressMonitor progress_monitor, + void* progress_monitor_target); GType database_source_collection_get_type (void) G_GNUC_CONST; GType container_source_collection_get_type (void) G_GNUC_CONST; GType event_source_collection_get_type (void) G_GNUC_CONST; -void data_collection_set_property (DataCollection* self, const gchar* name, GValue* val, ValueEqualFunc value_equals, void* value_equals_target); +void data_collection_set_property (DataCollection* self, + const gchar* name, + GValue* val, + ValueEqualFunc value_equals, + void* value_equals_target); #define EVENT_PROP_SHOW_COMMENTS "show-comments" gboolean configuration_facade_get_display_event_comments (ConfigurationFacade* self); -void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path); +void checkerboard_page_init_item_context_menu (CheckerboardPage* self, + const gchar* path); GtkToolbar* page_get_toolbar (Page* self); #define RESOURCES_MERGE_LABEL _ ("Merge") #define RESOURCES_MERGE_TOOLTIP _ ("Combine events into a single event") -static void events_directory_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail); -static gint64 events_directory_page_event_ascending_comparator (void* a, void* b); +static void events_directory_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames); +void page_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames); +gboolean alteration_has_detail (Alteration* self, + const gchar* subject, + const gchar* detail); +static gint64 events_directory_page_event_ascending_comparator (void* a, + void* b); GType event_directory_item_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); time_t event_source_get_start_time (EventSource* self); -static gint64 events_directory_page_event_descending_comparator (void* a, void* b); -static gint64 _events_directory_page_event_ascending_comparator_comparator (void* a, void* b, gpointer self); -static gint64 _events_directory_page_event_descending_comparator_comparator (void* a, void* b, gpointer self); -static void events_directory_page_real_add_actions (Page* base, GActionMap* map); -void page_add_actions (Page* self, GActionMap* map); +static gint64 events_directory_page_event_descending_comparator (void* a, + void* b); +static gint64 _events_directory_page_event_ascending_comparator_comparator (void* a, + void* b, + gpointer self); +static gint64 _events_directory_page_event_descending_comparator_comparator (void* a, + void* b, + gpointer self); +static void events_directory_page_real_add_actions (Page* base, + GActionMap* map); +void page_add_actions (Page* self, + GActionMap* map); static GVariant* _variant_new14 (gboolean value); -static void events_directory_page_real_remove_actions (Page* base, GActionMap* map); -void page_remove_actions (Page* self, GActionMap* map); -static void events_directory_page_real_init_actions (Page* base, gint selected_count, gint count); -void page_init_actions (Page* self, gint selected_count, gint count); -static void events_directory_page_real_update_actions (Page* base, gint selected_count, gint count); -void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); -void page_update_actions (Page* self, gint selected_count, gint count); +static void events_directory_page_real_remove_actions (Page* base, + GActionMap* map); +void page_remove_actions (Page* self, + GActionMap* map); +static void events_directory_page_real_init_actions (Page* base, + gint selected_count, + gint count); +void page_init_actions (Page* self, + gint selected_count, + gint count); +static void events_directory_page_real_update_actions (Page* base, + gint selected_count, + gint count); +void page_set_action_sensitive (Page* self, + const gchar* name, + gboolean sensitive); +void page_update_actions (Page* self, + gint selected_count, + gint count); static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPage* base); static gchar* events_directory_page_real_get_filter_no_match_message (CheckerboardPage* base); -static void events_directory_page_real_on_item_activated (CheckerboardPage* base, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers); +static void events_directory_page_real_on_item_activated (CheckerboardPage* base, + CheckerboardItem* item, + CheckerboardPageActivator activator, + CheckerboardPageKeyboardModifiers* modifiers); 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_switch_to_event (LibraryWindow* self, Event* event); +void library_window_switch_to_event (LibraryWindow* self, + Event* event); #define LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING "ascending" gint view_collection_get_selected_count (ViewCollection* self); -DataView* view_collection_get_selected_at (ViewCollection* self, gint index); +DataView* view_collection_get_selected_at (ViewCollection* self, + gint index); gpointer text_entry_dialog_mediator_ref (gpointer instance); void text_entry_dialog_mediator_unref (gpointer instance); -GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_text_entry_dialog_mediator (GValue* value, gpointer v_object); -void value_take_text_entry_dialog_mediator (GValue* value, gpointer v_object); +GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_text_entry_dialog_mediator (GValue* value, + gpointer v_object); +void value_take_text_entry_dialog_mediator (GValue* value, + gpointer v_object); gpointer value_get_text_entry_dialog_mediator (const GValue* value); GType text_entry_dialog_mediator_get_type (void) G_GNUC_CONST; GType event_rename_dialog_get_type (void) G_GNUC_CONST; gchar* event_get_raw_name (Event* self); EventRenameDialog* event_rename_dialog_new (const gchar* event_name); -EventRenameDialog* event_rename_dialog_construct (GType object_type, const gchar* event_name); +EventRenameDialog* event_rename_dialog_construct (GType object_type, + const gchar* event_name); gchar* event_rename_dialog_execute (EventRenameDialog* self); GType command_get_type (void) G_GNUC_CONST; GType page_command_get_type (void) G_GNUC_CONST; GType simple_proxyable_command_get_type (void) G_GNUC_CONST; GType rename_event_command_get_type (void) G_GNUC_CONST; -RenameEventCommand* rename_event_command_new (Event* event, const gchar* new_name); -RenameEventCommand* rename_event_command_construct (GType object_type, Event* event, const gchar* new_name); +RenameEventCommand* rename_event_command_new (Event* event, + const gchar* new_name); +RenameEventCommand* rename_event_command_construct (GType object_type, + Event* event, + const gchar* new_name); gpointer command_manager_ref (gpointer instance); void command_manager_unref (gpointer instance); -GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_command_manager (GValue* value, gpointer v_object); -void value_take_command_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_command_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_command_manager (GValue* value, + gpointer v_object); +void value_take_command_manager (GValue* value, + gpointer v_object); gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* page_get_command_manager (Page* self); -void command_manager_execute (CommandManager* self, Command* command); +void command_manager_execute (CommandManager* self, + Command* command); gpointer multi_text_entry_dialog_mediator_ref (gpointer instance); void multi_text_entry_dialog_mediator_unref (gpointer instance); -GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object); -void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object); +GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_multi_text_entry_dialog_mediator (GValue* value, + gpointer v_object); +void value_take_multi_text_entry_dialog_mediator (GValue* value, + gpointer v_object); gpointer value_get_multi_text_entry_dialog_mediator (const GValue* value); GType multi_text_entry_dialog_mediator_get_type (void) G_GNUC_CONST; GType edit_comment_dialog_get_type (void) G_GNUC_CONST; gchar* event_source_get_comment (EventSource* self); -EditCommentDialog* edit_comment_dialog_new (const gchar* comment, gboolean is_event); -EditCommentDialog* edit_comment_dialog_construct (GType object_type, const gchar* comment, gboolean is_event); +EditCommentDialog* edit_comment_dialog_new (const gchar* comment, + gboolean is_event); +EditCommentDialog* edit_comment_dialog_construct (GType object_type, + const gchar* comment, + gboolean is_event); gchar* edit_comment_dialog_execute (EditCommentDialog* self); GType edit_event_comment_command_get_type (void) G_GNUC_CONST; -EditEventCommentCommand* edit_event_comment_command_new (Event* event, const gchar* new_comment); -EditEventCommentCommand* edit_event_comment_command_construct (GType object_type, Event* event, const gchar* new_comment); +EditEventCommentCommand* edit_event_comment_command_new (Event* event, + const gchar* new_comment); +EditEventCommentCommand* edit_event_comment_command_construct (GType object_type, + Event* event, + const gchar* new_comment); GType move_photos_command_get_type (void) G_GNUC_CONST; GType merge_events_command_get_type (void) G_GNUC_CONST; GeeList* view_collection_get_selected (ViewCollection* self); MergeEventsCommand* merge_events_command_new (GeeIterable* iter); -MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterable* iter); -void checkerboard_page_set_display_comments (CheckerboardPage* self, gboolean display); -void configuration_facade_set_display_event_comments (ConfigurationFacade* self, gboolean display); +MergeEventsCommand* merge_events_command_construct (GType object_type, + GeeIterable* iter); +void checkerboard_page_set_display_comments (CheckerboardPage* self, + gboolean display); +void configuration_facade_set_display_event_comments (ConfigurationFacade* self, + gboolean display); static SearchViewFilter* events_directory_page_real_get_search_view_filter (CheckerboardPage* base); GType events_directory_page_event_directory_manager_get_type (void) G_GNUC_CONST; -enum { - EVENTS_DIRECTORY_PAGE_EVENT_DIRECTORY_MANAGER_DUMMY_PROPERTY -}; -static DataView* events_directory_page_event_directory_manager_real_create_view (ViewManager* base, DataSource* source); +static DataView* events_directory_page_event_directory_manager_real_create_view (ViewManager* base, + DataSource* source); EventDirectoryItem* event_directory_item_new (Event* event); -EventDirectoryItem* event_directory_item_construct (GType object_type, Event* event); +EventDirectoryItem* event_directory_item_construct (GType object_type, + Event* event); EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_manager_new (void); EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_manager_construct (GType object_type); ViewManager* view_manager_construct (GType object_type); -enum { - EVENTS_DIRECTORY_PAGE_EVENTS_DIRECTORY_SEARCH_VIEW_FILTER_DUMMY_PROPERTY -}; static guint events_directory_page_events_directory_search_view_filter_real_get_criteria (SearchViewFilter* base); GType search_filter_criteria_get_type (void) G_GNUC_CONST; -static gboolean events_directory_page_events_directory_search_view_filter_real_predicate (ViewFilter* base, DataView* view); +static gboolean events_directory_page_events_directory_search_view_filter_real_predicate (ViewFilter* base, + DataView* view); DataSource* data_view_get_source (DataView* self); gboolean is_string_empty (const gchar* s); const gchar* search_view_filter_get_search_filter (SearchViewFilter* self); 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); +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); GType master_events_directory_page_get_type (void) G_GNUC_CONST; -enum { - MASTER_EVENTS_DIRECTORY_PAGE_DUMMY_PROPERTY -}; #define MASTER_EVENTS_DIRECTORY_PAGE_NAME _ ("All Events") MasterEventsDirectoryPage* master_events_directory_page_new (void); MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_type); GeeCollection* data_collection_get_all (DataCollection* self); GType sub_events_directory_page_get_type (void) G_GNUC_CONST; -enum { - SUB_EVENTS_DIRECTORY_PAGE_DUMMY_PROPERTY -}; GType sub_events_directory_page_directory_type_get_type (void) G_GNUC_CONST; #define SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME _ ("Undated") #define SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT _ ("%Y") #define SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT _ ("%B") -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); -static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, struct tm* time); -static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time); +SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, + struct tm* time); +SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type, + SubEventsDirectoryPageDirectoryType type, + struct tm* time); +static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, + struct tm* time); +static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_construct (GType object_type, + SubEventsDirectoryPageDirectoryType type, + struct tm* time); static GType sub_events_directory_page_sub_event_directory_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; gint sub_events_directory_page_get_month (SubEventsDirectoryPage* self); static gint sub_events_directory_page_sub_event_directory_manager_get_month (SubEventsDirectoryPageSubEventDirectoryManager* self); @@ -1119,106 +1276,134 @@ static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubE SubEventsDirectoryPageDirectoryType sub_events_directory_page_get_event_directory_type (SubEventsDirectoryPage* self); static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (SubEventsDirectoryPageSubEventDirectoryManager* self); #define SUB_EVENTS_DIRECTORY_PAGE_SUB_EVENT_DIRECTORY_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManagerPrivate)) -enum { - SUB_EVENTS_DIRECTORY_PAGE_SUB_EVENT_DIRECTORY_MANAGER_DUMMY_PROPERTY -}; -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 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 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}}; -static void _events_directory_page_on_sort_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self) { +static void +_events_directory_page_on_sort_changed_g_simple_action_change_state (GSimpleAction* _sender, + GVariant* value, + gpointer self) +{ #line 77 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_on_sort_changed ((EventsDirectoryPage*) self, _sender, value); -#line 1135 "EventsDirectoryPage.c" +#line 1295 "EventsDirectoryPage.c" } -static void _events_directory_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_events_directory_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_on_rename ((EventsDirectoryPage*) self); -#line 1142 "EventsDirectoryPage.c" +#line 1306 "EventsDirectoryPage.c" } -static void _events_directory_page_on_merge_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_events_directory_page_on_merge_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_on_merge ((EventsDirectoryPage*) self); -#line 1149 "EventsDirectoryPage.c" +#line 1317 "EventsDirectoryPage.c" } -static void _events_directory_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_events_directory_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_on_edit_comment ((EventsDirectoryPage*) self); -#line 1156 "EventsDirectoryPage.c" +#line 1328 "EventsDirectoryPage.c" } -static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" page_on_action_toggle ((Page*) self, action, parameter); -#line 1163 "EventsDirectoryPage.c" +#line 1339 "EventsDirectoryPage.c" } -static void _events_directory_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { +static void +_events_directory_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, + GVariant* value, + gpointer self) +{ #line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_on_display_comments ((EventsDirectoryPage*) self, action, value); -#line 1170 "EventsDirectoryPage.c" +#line 1350 "EventsDirectoryPage.c" } -static gboolean _events_directory_page_event_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) { +static gboolean +_events_directory_page_event_comparator_predicate_comparator_predicate (DataObject* object, + Alteration* alteration, + gpointer self) +{ gboolean result; result = events_directory_page_event_comparator_predicate (object, alteration); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1179 "EventsDirectoryPage.c" +#line 1363 "EventsDirectoryPage.c" } -static gpointer _view_manager_ref0 (gpointer self) { +static gpointer +_view_manager_ref0 (gpointer self) +{ #line 59 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self ? view_manager_ref (self) : NULL; -#line 1186 "EventsDirectoryPage.c" +#line 1372 "EventsDirectoryPage.c" } -EventsDirectoryPage* events_directory_page_construct (GType object_type, const gchar* page_name, ViewManager* view_manager, GeeCollection* initial_events) { +EventsDirectoryPage* +events_directory_page_construct (GType object_type, + const gchar* page_name, + ViewManager* view_manager, + GeeCollection* initial_events) +{ EventsDirectoryPage * self = NULL; - const gchar* _tmp0_; + ViewCollection* _tmp0_; ViewCollection* _tmp1_; - ViewCollection* _tmp2_; + ConfigFacade* _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_; - ViewManager* _tmp24_; + void* _tmp4_; + GDestroyNotify _tmp5_; + Comparator _tmp6_; + Comparator _tmp7_; + void* _tmp7__target; + GDestroyNotify _tmp7__target_destroy_notify; + ViewCollection* _tmp8_; + ViewCollection* _tmp9_; + EventSourceCollection* _tmp10_; + ViewCollectionMonitor* _tmp11_; + ViewCollectionMonitor* _tmp12_; + ViewCollection* _tmp13_; + ViewCollection* _tmp14_; + ConfigFacade* _tmp15_; + ConfigFacade* _tmp16_; + GValue _tmp17_ = {0}; + ViewManager* _tmp18_; GtkToolbar* toolbar = NULL; - GtkToolbar* _tmp25_; + GtkToolbar* _tmp19_; GtkToolButton* merge_button = NULL; - GtkToolButton* _tmp26_; + GtkToolButton* _tmp20_; #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" @@ -1226,103 +1411,91 @@ EventsDirectoryPage* events_directory_page_construct (GType object_type, const g #line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail ((initial_events == NULL) || GEE_IS_COLLECTION (initial_events), NULL); #line 47 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = page_name; -#line 47 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - self = (EventsDirectoryPage*) checkerboard_page_construct (object_type, _tmp0_); -#line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + self = (EventsDirectoryPage*) checkerboard_page_construct (object_type, page_name); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = _tmp1_; + _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = config_facade_get_instance (); + _tmp1_ = _tmp0_; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = _tmp3_; + _tmp2_ = config_facade_get_instance (); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp3_ = _tmp2_; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = events_directory_page_get_event_comparator (_tmp5_, &_tmp6_, &_tmp7_); + _tmp6_ = events_directory_page_get_event_comparator (configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)), &_tmp4_, &_tmp5_); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = _tmp8_; + _tmp7_ = _tmp6_; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9__target = _tmp6_; + _tmp7__target = _tmp4_; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9__target_destroy_notify = _tmp7_; + _tmp7__target_destroy_notify = _tmp5_; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), _tmp9_, _tmp6_, _events_directory_page_event_comparator_predicate_comparator_predicate, NULL); + data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), _tmp7_, _tmp4_, _events_directory_page_event_comparator_predicate_comparator_predicate, NULL); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - (_tmp9__target_destroy_notify == NULL) ? NULL : (_tmp9__target_destroy_notify (_tmp9__target), NULL); + (_tmp7__target_destroy_notify == NULL) ? NULL : (_tmp7__target_destroy_notify (_tmp7__target), NULL); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = NULL; + _tmp7_ = NULL; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9__target = NULL; + _tmp7__target = NULL; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9__target_destroy_notify = NULL; + _tmp7__target_destroy_notify = NULL; #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp4_); + _g_object_unref0 (_tmp3_); #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _data_collection_unref0 (_tmp2_); -#line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp11_ = _tmp10_; + _data_collection_unref0 (_tmp1_); #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp12_ = event_global; + _tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp13_ = view_manager; + _tmp9_ = _tmp8_; #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp14_ = initial_events; + _tmp10_ = event_global; #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp15_ = view_collection_monitor_source_collection (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp13_, NULL, _tmp14_, NULL, NULL); + _tmp11_ = view_collection_monitor_source_collection (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_SOURCE_COLLECTION, SourceCollection), view_manager, NULL, initial_events, NULL, NULL); #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp16_ = _tmp15_; + _tmp12_ = _tmp11_; #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _view_collection_monitor_unref0 (_tmp16_); + _view_collection_monitor_unref0 (_tmp12_); #line 52 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _data_collection_unref0 (_tmp11_); -#line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _data_collection_unref0 (_tmp9_); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp18_ = _tmp17_; + _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp19_ = config_facade_get_instance (); + _tmp14_ = _tmp13_; #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp20_ = _tmp19_; + _tmp15_ = config_facade_get_instance (); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp21_ = configuration_facade_get_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp16_ = _tmp15_; #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_value_init (&_tmp22_, G_TYPE_BOOLEAN); + g_value_init (&_tmp17_, G_TYPE_BOOLEAN); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_value_set_boolean (&_tmp22_, _tmp21_); + g_value_set_boolean (&_tmp17_, configuration_facade_get_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade))); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_COLLECTION, DataCollection), EVENT_PROP_SHOW_COMMENTS, &_tmp22_, NULL, NULL); + data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), EVENT_PROP_SHOW_COMMENTS, &_tmp17_, NULL, NULL); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - G_IS_VALUE (&_tmp22_) ? (g_value_unset (&_tmp22_), NULL) : NULL; + G_IS_VALUE (&_tmp17_) ? (g_value_unset (&_tmp17_), NULL) : NULL; #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp16_); #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _data_collection_unref0 (_tmp18_); + _data_collection_unref0 (_tmp14_); #line 57 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "EventsDirectoryContextMenu"); #line 59 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp23_ = view_manager; -#line 59 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp24_ = _view_manager_ref0 (_tmp23_); + _tmp18_ = _view_manager_ref0 (view_manager); #line 59 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _view_manager_unref0 (self->view_manager); #line 59 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - self->view_manager = _tmp24_; + self->view_manager = _tmp18_; #line 62 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp25_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp19_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 62 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - toolbar = _tmp25_; + toolbar = _tmp19_; #line 65 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp26_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_MERGE_LABEL); + _tmp20_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_MERGE_LABEL); #line 65 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_object_ref_sink (_tmp26_); + g_object_ref_sink (_tmp20_); #line 65 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - merge_button = _tmp26_; + merge_button = _tmp20_; #line 66 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (merge_button, GTK_TYPE_ACTIONABLE, GtkActionable), "win.Merge"); + gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (merge_button, gtk_actionable_get_type (), GtkActionable), "win.Merge"); #line 67 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (merge_button, gtk_tool_item_get_type (), GtkToolItem), TRUE); #line 68 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1337,241 +1510,225 @@ EventsDirectoryPage* events_directory_page_construct (GType object_type, const g _g_object_unref0 (toolbar); #line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self; -#line 1341 "EventsDirectoryPage.c" +#line 1514 "EventsDirectoryPage.c" } -static void events_directory_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { +static void +events_directory_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames) +{ EventsDirectoryPage * self; - 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" g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 81 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = ui_filenames; -#line 81 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "events_directory.ui"); -#line 83 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = ui_filenames; + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "events_directory.ui"); #line 83 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - PAGE_CLASS (events_directory_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp1_); -#line 1361 "EventsDirectoryPage.c" + PAGE_CLASS (events_directory_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), ui_filenames); +#line 1531 "EventsDirectoryPage.c" } -gboolean events_directory_page_event_comparator_predicate (DataObject* object, Alteration* alteration) { +gboolean +events_directory_page_event_comparator_predicate (DataObject* object, + Alteration* alteration) +{ gboolean result = 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" g_return_val_if_fail (IS_ALTERATION (alteration), FALSE); #line 87 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = alteration; -#line 87 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = alteration_has_detail (_tmp0_, "metadata", "time"); -#line 87 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp1_; + result = alteration_has_detail (alteration, "metadata", "time"); #line 87 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1381 "EventsDirectoryPage.c" +#line 1548 "EventsDirectoryPage.c" } -static gint64 events_directory_page_event_ascending_comparator (void* a, void* b) { +static gint64 +events_directory_page_event_ascending_comparator (void* a, + void* b) +{ gint64 result = 0LL; time_t start_a = 0; - void* _tmp0_; - Event* _tmp1_; - time_t _tmp2_; + Event* _tmp0_; time_t start_b = 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" - _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((EventDirectoryItem*) _tmp0_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)->event; + Event* _tmp1_; #line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_EVENT_SOURCE, EventSource)); + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST ((EventDirectoryItem*) a, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)->event; #line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - start_a = _tmp2_; + start_a = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_SOURCE, EventSource)); #line 92 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = b; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((EventDirectoryItem*) b, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)->event; #line 92 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST ((EventDirectoryItem*) _tmp3_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)->event; -#line 92 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_EVENT_SOURCE, EventSource)); -#line 92 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - start_b = _tmp5_; + start_b = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_EVENT_SOURCE, EventSource)); #line 94 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = (gint64) (start_a - start_b); #line 94 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1415 "EventsDirectoryPage.c" +#line 1573 "EventsDirectoryPage.c" } -static gint64 events_directory_page_event_descending_comparator (void* a, void* b) { +static gint64 +events_directory_page_event_descending_comparator (void* a, + void* b) +{ gint64 result = 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" - _tmp1_ = a; #line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = events_directory_page_event_ascending_comparator (_tmp0_, _tmp1_); -#line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp2_; + result = events_directory_page_event_ascending_comparator (b, a); #line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1434 "EventsDirectoryPage.c" +#line 1586 "EventsDirectoryPage.c" } -static gint64 _events_directory_page_event_ascending_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_events_directory_page_event_ascending_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = events_directory_page_event_ascending_comparator (a, b); #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1443 "EventsDirectoryPage.c" +#line 1599 "EventsDirectoryPage.c" } -static gint64 _events_directory_page_event_descending_comparator_comparator (void* a, void* b, gpointer self) { +static gint64 +_events_directory_page_event_descending_comparator_comparator (void* a, + void* b, + gpointer self) +{ gint64 result; result = events_directory_page_event_descending_comparator (a, b); #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1452 "EventsDirectoryPage.c" +#line 1612 "EventsDirectoryPage.c" } -static Comparator events_directory_page_get_event_comparator (gboolean ascending, void** result_target, GDestroyNotify* result_target_destroy_notify) { +static Comparator +events_directory_page_get_event_comparator (gboolean ascending, + void** result_target, + GDestroyNotify* result_target_destroy_notify) +{ Comparator result = NULL; - 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 1463 "EventsDirectoryPage.c" - Comparator _tmp1_; - void* _tmp1__target; - GDestroyNotify _tmp1__target_destroy_notify; + if (ascending) { +#line 1624 "EventsDirectoryPage.c" + Comparator _tmp0_; + void* _tmp0__target; + GDestroyNotify _tmp0__target_destroy_notify; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = _events_directory_page_event_ascending_comparator_comparator; + _tmp0_ = _events_directory_page_event_ascending_comparator_comparator; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1__target = NULL; + _tmp0__target = NULL; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1__target_destroy_notify = NULL; + _tmp0__target_destroy_notify = NULL; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - *result_target = _tmp1__target; + *result_target = _tmp0__target; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - *result_target_destroy_notify = _tmp1__target_destroy_notify; + *result_target_destroy_notify = _tmp0__target_destroy_notify; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp1_; + result = _tmp0_; #line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1481 "EventsDirectoryPage.c" +#line 1642 "EventsDirectoryPage.c" } else { - Comparator _tmp2_; - void* _tmp2__target; - GDestroyNotify _tmp2__target_destroy_notify; + Comparator _tmp1_; + void* _tmp1__target; + GDestroyNotify _tmp1__target_destroy_notify; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = _events_directory_page_event_descending_comparator_comparator; + _tmp1_ = _events_directory_page_event_descending_comparator_comparator; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2__target = NULL; + _tmp1__target = NULL; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2__target_destroy_notify = NULL; + _tmp1__target_destroy_notify = NULL; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - *result_target = _tmp2__target; + *result_target = _tmp1__target; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - *result_target_destroy_notify = _tmp2__target_destroy_notify; + *result_target_destroy_notify = _tmp1__target_destroy_notify; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp2_; + result = _tmp1_; #line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1500 "EventsDirectoryPage.c" +#line 1661 "EventsDirectoryPage.c" } } -static GVariant* _variant_new14 (gboolean value) { +static GVariant* +_variant_new14 (gboolean value) +{ #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 1508 "EventsDirectoryPage.c" +#line 1671 "EventsDirectoryPage.c" } -static void events_directory_page_real_add_actions (Page* base, GActionMap* map) { +static void +events_directory_page_real_add_actions (Page* base, + GActionMap* map) +{ EventsDirectoryPage * self; - GActionMap* _tmp0_; - GActionMap* _tmp1_; gboolean display_comments = FALSE; - ConfigFacade* _tmp2_; - ConfigFacade* _tmp3_; - gboolean _tmp4_; - gboolean _tmp5_; - GAction* _tmp6_; - GAction* _tmp7_; - GVariant* _tmp8_; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + gboolean _tmp2_; + GAction* _tmp3_; + GAction* _tmp4_; + GVariant* _tmp5_; #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" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 118 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = map; -#line 118 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - PAGE_CLASS (events_directory_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); -#line 119 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = map; + PAGE_CLASS (events_directory_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map); #line 119 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_action_map_add_action_entries (_tmp1_, EVENTS_DIRECTORY_PAGE_entries, G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries), self); -#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = config_facade_get_instance (); + g_action_map_add_action_entries (map, EVENTS_DIRECTORY_PAGE_entries, G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries), self); #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_; + _tmp0_ = config_facade_get_instance (); #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = configuration_facade_get_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); + _tmp1_ = _tmp0_; #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = _tmp4_; + _tmp2_ = configuration_facade_get_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - display_comments = _tmp5_; + display_comments = _tmp2_; #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment"); + _tmp3_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment"); #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = _tmp6_; + _tmp4_ = _tmp3_; #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = _variant_new14 (display_comments); + _tmp5_ = _variant_new14 (display_comments); #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_action_change_state (_tmp7_, _tmp8_); + g_action_change_state (_tmp4_, _tmp5_); #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_variant_unref0 (_tmp8_); + _g_variant_unref0 (_tmp5_); #line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp7_); -#line 1560 "EventsDirectoryPage.c" + _g_object_unref0 (_tmp4_); +#line 1717 "EventsDirectoryPage.c" } -static void events_directory_page_real_remove_actions (Page* base, GActionMap* map) { +static void +events_directory_page_real_remove_actions (Page* base, + GActionMap* map) +{ EventsDirectoryPage * self; - 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" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 126 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = map; -#line 126 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - PAGE_CLASS (events_directory_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_); -#line 1575 "EventsDirectoryPage.c" + PAGE_CLASS (events_directory_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map); +#line 1732 "EventsDirectoryPage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -1583,99 +1740,85 @@ static void events_directory_page_real_remove_actions (Page* base, GActionMap* m entry_collection_length1 = G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries); #line 127 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries); entry_it = entry_it + 1) { -#line 1587 "EventsDirectoryPage.c" +#line 1744 "EventsDirectoryPage.c" GActionEntry entry = {0}; #line 127 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" entry = entry_collection[entry_it]; -#line 1591 "EventsDirectoryPage.c" +#line 1748 "EventsDirectoryPage.c" { - GActionMap* _tmp1_; - GActionEntry _tmp2_; - const gchar* _tmp3_; -#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = map; + GActionEntry _tmp0_; + const gchar* _tmp1_; #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = entry; + _tmp0_ = entry; #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_.name; + _tmp1_ = _tmp0_.name; #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_action_map_remove_action (_tmp1_, _tmp3_); -#line 1604 "EventsDirectoryPage.c" + g_action_map_remove_action (map, _tmp1_); +#line 1758 "EventsDirectoryPage.c" } } } } -static void events_directory_page_real_init_actions (Page* base, gint selected_count, gint count) { +static void +events_directory_page_real_init_actions (Page* base, + gint selected_count, + gint count) +{ EventsDirectoryPage * self; - gint _tmp0_; - gint _tmp1_; GSimpleAction* action = NULL; - GAction* _tmp2_; - GSimpleAction* _tmp3_; + GAction* _tmp0_; + GSimpleAction* _tmp1_; #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" - _tmp0_ = selected_count; -#line 133 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = count; -#line 133 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - PAGE_CLASS (events_directory_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_, _tmp1_); + PAGE_CLASS (events_directory_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), selected_count, count); #line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSortEvents"); + _tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSortEvents"); #line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL; + _tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL; #line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp3_ == NULL) { + if (_tmp1_ == NULL) { #line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp2_); -#line 1634 "EventsDirectoryPage.c" + _g_object_unref0 (_tmp0_); +#line 1786 "EventsDirectoryPage.c" } #line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - action = _tmp3_; + action = _tmp1_; #line 136 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _vala_assert (action != NULL, "action != null"); #line 137 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_signal_connect_object (action, "change-state", (GCallback) _events_directory_page_on_sort_changed_g_simple_action_change_state, self, 0); #line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (action); -#line 1644 "EventsDirectoryPage.c" +#line 1796 "EventsDirectoryPage.c" } -static void events_directory_page_real_update_actions (Page* base, gint selected_count, gint count) { +static void +events_directory_page_real_update_actions (Page* base, + gint selected_count, + gint count) +{ EventsDirectoryPage * self; - 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" - _tmp0_ = selected_count; -#line 141 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Merge", _tmp0_ > 1); -#line 142 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = selected_count; + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Merge", selected_count > 1); #line 142 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rename", _tmp1_ == 1); + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rename", selected_count == 1); #line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = selected_count; -#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditComment", _tmp2_ == 1); -#line 145 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = selected_count; + page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditComment", selected_count == 1); #line 145 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = count; -#line 145 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - PAGE_CLASS (events_directory_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp3_, _tmp4_); -#line 1675 "EventsDirectoryPage.c" + PAGE_CLASS (events_directory_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), selected_count, count); +#line 1816 "EventsDirectoryPage.c" } -static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPage* base) { +static gchar* +events_directory_page_real_get_view_empty_message (CheckerboardPage* base) +{ EventsDirectoryPage * self; gchar* result = NULL; gchar* _tmp0_; @@ -1687,11 +1830,13 @@ static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPag result = _tmp0_; #line 149 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1691 "EventsDirectoryPage.c" +#line 1834 "EventsDirectoryPage.c" } -static gchar* events_directory_page_real_get_filter_no_match_message (CheckerboardPage* base) { +static gchar* +events_directory_page_real_get_filter_no_match_message (CheckerboardPage* base) +{ EventsDirectoryPage * self; gchar* result = NULL; gchar* _tmp0_; @@ -1703,25 +1848,31 @@ static gchar* events_directory_page_real_get_filter_no_match_message (Checkerboa result = _tmp0_; #line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 1707 "EventsDirectoryPage.c" +#line 1852 "EventsDirectoryPage.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 158 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self ? g_object_ref (self) : NULL; -#line 1714 "EventsDirectoryPage.c" +#line 1861 "EventsDirectoryPage.c" } -static void events_directory_page_real_on_item_activated (CheckerboardPage* base, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) { +static void +events_directory_page_real_on_item_activated (CheckerboardPage* base, + CheckerboardItem* item, + CheckerboardPageActivator activator, + CheckerboardPageKeyboardModifiers* modifiers) +{ EventsDirectoryPage * self; EventDirectoryItem* event = NULL; - CheckerboardItem* _tmp0_; - EventDirectoryItem* _tmp1_; + EventDirectoryItem* _tmp0_; + LibraryWindow* _tmp1_; LibraryWindow* _tmp2_; - LibraryWindow* _tmp3_; - Event* _tmp4_; + Event* _tmp3_; #line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage); #line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1729,40 +1880,39 @@ static void events_directory_page_real_on_item_activated (CheckerboardPage* base #line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (modifiers != NULL); #line 158 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = item; + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (item, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)); #line 158 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)); -#line 158 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - event = _tmp1_; + event = _tmp0_; #line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = library_window_get_app (); + _tmp1_ = library_window_get_app (); #line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = event->event; + _tmp3_ = event->event; #line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - library_window_switch_to_event (_tmp3_, _tmp4_); + library_window_switch_to_event (_tmp2_, _tmp3_); #line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp2_); #line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (event); -#line 1750 "EventsDirectoryPage.c" +#line 1899 "EventsDirectoryPage.c" } -static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value) { +static void +events_directory_page_on_sort_changed (EventsDirectoryPage* self, + GSimpleAction* action, + GVariant* value) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - GVariant* _tmp2_; - const gchar* _tmp3_; - void* _tmp4_; - GDestroyNotify _tmp5_; + const gchar* _tmp2_; + void* _tmp3_; + GDestroyNotify _tmp4_; + Comparator _tmp5_; Comparator _tmp6_; - Comparator _tmp7_; - void* _tmp7__target; - GDestroyNotify _tmp7__target_destroy_notify; - GSimpleAction* _tmp8_; - GVariant* _tmp9_; + void* _tmp6__target; + GDestroyNotify _tmp6__target_destroy_notify; #line 162 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self)); #line 162 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1772,68 +1922,63 @@ static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GS #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp1_ = _tmp0_; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = value; + _tmp2_ = g_variant_get_string (value, NULL); #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = g_variant_get_string (_tmp2_, NULL); + _tmp5_ = events_directory_page_get_event_comparator (g_strcmp0 (_tmp2_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0, &_tmp3_, &_tmp4_); #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = events_directory_page_get_event_comparator (g_strcmp0 (_tmp3_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0, &_tmp4_, &_tmp5_); + _tmp6_ = _tmp5_; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = _tmp6_; + _tmp6__target = _tmp3_; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7__target = _tmp4_; + _tmp6__target_destroy_notify = _tmp4_; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7__target_destroy_notify = _tmp5_; + data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), _tmp6_, _tmp3_, _events_directory_page_event_comparator_predicate_comparator_predicate, NULL); #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), _tmp7_, _tmp4_, _events_directory_page_event_comparator_predicate_comparator_predicate, NULL); + (_tmp6__target_destroy_notify == NULL) ? NULL : (_tmp6__target_destroy_notify (_tmp6__target), NULL); #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - (_tmp7__target_destroy_notify == NULL) ? NULL : (_tmp7__target_destroy_notify (_tmp7__target), NULL); + _tmp6_ = NULL; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = NULL; + _tmp6__target = NULL; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7__target = NULL; -#line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7__target_destroy_notify = NULL; + _tmp6__target_destroy_notify = NULL; #line 163 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _data_collection_unref0 (_tmp1_); #line 167 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = action; -#line 167 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = value; -#line 167 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_simple_action_set_state (_tmp8_, _tmp9_); -#line 1805 "EventsDirectoryPage.c" + g_simple_action_set_state (action, value); +#line 1949 "EventsDirectoryPage.c" } -static void events_directory_page_on_rename (EventsDirectoryPage* self) { +static void +events_directory_page_on_rename (EventsDirectoryPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; EventDirectoryItem* item = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; - DataView* _tmp6_; - EventDirectoryItem* _tmp7_; + DataView* _tmp5_; + EventDirectoryItem* _tmp6_; EventRenameDialog* rename_dialog = NULL; - EventDirectoryItem* _tmp8_; - Event* _tmp9_; + EventDirectoryItem* _tmp7_; + Event* _tmp8_; + gchar* _tmp9_; gchar* _tmp10_; - gchar* _tmp11_; + EventRenameDialog* _tmp11_; EventRenameDialog* _tmp12_; - EventRenameDialog* _tmp13_; gchar* new_name = NULL; - EventRenameDialog* _tmp14_; - gchar* _tmp15_; - const gchar* _tmp16_; + EventRenameDialog* _tmp13_; + gchar* _tmp14_; + const gchar* _tmp15_; RenameEventCommand* command = NULL; - EventDirectoryItem* _tmp17_; - Event* _tmp18_; - const gchar* _tmp19_; - RenameEventCommand* _tmp20_; + EventDirectoryItem* _tmp16_; + Event* _tmp17_; + const gchar* _tmp18_; + RenameEventCommand* _tmp19_; + CommandManager* _tmp20_; CommandManager* _tmp21_; - CommandManager* _tmp22_; - RenameEventCommand* _tmp23_; + RenameEventCommand* _tmp22_; #line 170 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self)); #line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1841,55 +1986,53 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) { #line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp1_ = _tmp0_; #line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_ != 1; + _tmp2_ = view_collection_get_selected_count (_tmp1_) != 1; #line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _data_collection_unref0 (_tmp1_); #line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return; -#line 1854 "EventsDirectoryPage.c" +#line 1997 "EventsDirectoryPage.c" } #line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = view_collection_get_selected_at (_tmp5_, 0); + _tmp5_ = view_collection_get_selected_at (_tmp4_, 0); #line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); #line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 175 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - item = _tmp7_; + item = _tmp6_; #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = item; + _tmp7_ = item; #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = _tmp8_->event; + _tmp8_ = _tmp7_->event; #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp10_ = event_get_raw_name (_tmp9_); + _tmp9_ = event_get_raw_name (_tmp8_); #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp12_ = event_rename_dialog_new (_tmp11_); + _tmp11_ = event_rename_dialog_new (_tmp10_); #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp10_); #line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - rename_dialog = _tmp13_; + rename_dialog = _tmp12_; #line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp14_ = rename_dialog; + _tmp13_ = rename_dialog; #line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp15_ = event_rename_dialog_execute (_tmp14_); + _tmp14_ = event_rename_dialog_execute (_tmp13_); #line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - new_name = _tmp15_; + new_name = _tmp14_; #line 179 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp16_ = new_name; + _tmp15_ = new_name; #line 179 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp16_ == NULL) { + if (_tmp15_ == NULL) { #line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_free0 (new_name); #line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1898,28 +2041,28 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) { _g_object_unref0 (item); #line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return; -#line 1902 "EventsDirectoryPage.c" +#line 2045 "EventsDirectoryPage.c" } #line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp17_ = item; + _tmp16_ = item; #line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp18_ = _tmp17_->event; + _tmp17_ = _tmp16_->event; #line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp19_ = new_name; + _tmp18_ = new_name; #line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp20_ = rename_event_command_new (_tmp18_, _tmp19_); + _tmp19_ = rename_event_command_new (_tmp17_, _tmp18_); #line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - command = _tmp20_; + command = _tmp19_; #line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp23_ = command; + _tmp22_ = command; #line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command)); #line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _command_manager_unref0 (_tmp22_); + _command_manager_unref0 (_tmp21_); #line 170 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (command); #line 170 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1928,39 +2071,40 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) { _text_entry_dialog_mediator_unref0 (rename_dialog); #line 170 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (item); -#line 1932 "EventsDirectoryPage.c" +#line 2075 "EventsDirectoryPage.c" } -void events_directory_page_on_edit_comment (EventsDirectoryPage* self) { +void +events_directory_page_on_edit_comment (EventsDirectoryPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; EventDirectoryItem* item = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; - DataView* _tmp6_; - EventDirectoryItem* _tmp7_; + DataView* _tmp5_; + EventDirectoryItem* _tmp6_; EditCommentDialog* edit_comment_dialog = NULL; - EventDirectoryItem* _tmp8_; - Event* _tmp9_; + EventDirectoryItem* _tmp7_; + Event* _tmp8_; + gchar* _tmp9_; gchar* _tmp10_; - gchar* _tmp11_; + EditCommentDialog* _tmp11_; EditCommentDialog* _tmp12_; - EditCommentDialog* _tmp13_; gchar* new_comment = NULL; - EditCommentDialog* _tmp14_; - gchar* _tmp15_; - const gchar* _tmp16_; + EditCommentDialog* _tmp13_; + gchar* _tmp14_; + const gchar* _tmp15_; EditEventCommentCommand* command = NULL; - EventDirectoryItem* _tmp17_; - Event* _tmp18_; - const gchar* _tmp19_; - EditEventCommentCommand* _tmp20_; + EventDirectoryItem* _tmp16_; + Event* _tmp17_; + const gchar* _tmp18_; + EditEventCommentCommand* _tmp19_; + CommandManager* _tmp20_; CommandManager* _tmp21_; - CommandManager* _tmp22_; - EditEventCommentCommand* _tmp23_; + EditEventCommentCommand* _tmp22_; #line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self)); #line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -1968,55 +2112,53 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) { #line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp1_ = _tmp0_; #line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_ != 1; + _tmp2_ = view_collection_get_selected_count (_tmp1_) != 1; #line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _data_collection_unref0 (_tmp1_); #line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return; -#line 1981 "EventsDirectoryPage.c" +#line 2123 "EventsDirectoryPage.c" } #line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = view_collection_get_selected_at (_tmp5_, 0); + _tmp5_ = view_collection_get_selected_at (_tmp4_, 0); #line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem); #line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 191 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - item = _tmp7_; + item = _tmp6_; #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = item; + _tmp7_ = item; #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = _tmp8_->event; + _tmp8_ = _tmp7_->event; #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp10_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_EVENT_SOURCE, EventSource)); + _tmp9_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_EVENT_SOURCE, EventSource)); #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp12_ = edit_comment_dialog_new (_tmp11_, FALSE); + _tmp11_ = edit_comment_dialog_new (_tmp10_, FALSE); #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_free0 (_tmp11_); + _g_free0 (_tmp10_); #line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - edit_comment_dialog = _tmp13_; + edit_comment_dialog = _tmp12_; #line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp14_ = edit_comment_dialog; + _tmp13_ = edit_comment_dialog; #line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp15_ = edit_comment_dialog_execute (_tmp14_); + _tmp14_ = edit_comment_dialog_execute (_tmp13_); #line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - new_comment = _tmp15_; + new_comment = _tmp14_; #line 195 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp16_ = new_comment; + _tmp15_ = new_comment; #line 195 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp16_ == NULL) { + if (_tmp15_ == NULL) { #line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_free0 (new_comment); #line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2025,28 +2167,28 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) { _g_object_unref0 (item); #line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return; -#line 2029 "EventsDirectoryPage.c" +#line 2171 "EventsDirectoryPage.c" } #line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp17_ = item; + _tmp16_ = item; #line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp18_ = _tmp17_->event; + _tmp17_ = _tmp16_->event; #line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp19_ = new_comment; + _tmp18_ = new_comment; #line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp20_ = edit_event_comment_command_new (_tmp18_, _tmp19_); + _tmp19_ = edit_event_comment_command_new (_tmp17_, _tmp18_); #line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - command = _tmp20_; + command = _tmp19_; #line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp23_ = command; + _tmp22_ = command; #line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command)); #line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _command_manager_unref0 (_tmp22_); + _command_manager_unref0 (_tmp21_); #line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (command); #line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2055,25 +2197,26 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) { _multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog); #line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (item); -#line 2059 "EventsDirectoryPage.c" +#line 2201 "EventsDirectoryPage.c" } -static void events_directory_page_on_merge (EventsDirectoryPage* self) { +static void +events_directory_page_on_merge (EventsDirectoryPage* self) +{ ViewCollection* _tmp0_; ViewCollection* _tmp1_; - gint _tmp2_; - gboolean _tmp3_; + gboolean _tmp2_; MergeEventsCommand* command = NULL; + ViewCollection* _tmp3_; ViewCollection* _tmp4_; - ViewCollection* _tmp5_; + GeeList* _tmp5_; GeeList* _tmp6_; - GeeList* _tmp7_; + MergeEventsCommand* _tmp7_; MergeEventsCommand* _tmp8_; - MergeEventsCommand* _tmp9_; + CommandManager* _tmp9_; CommandManager* _tmp10_; - CommandManager* _tmp11_; - MergeEventsCommand* _tmp12_; + MergeEventsCommand* _tmp11_; #line 202 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self)); #line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2081,97 +2224,91 @@ static void events_directory_page_on_merge (EventsDirectoryPage* self) { #line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp1_ = _tmp0_; #line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_ <= 1; + _tmp2_ = view_collection_get_selected_count (_tmp1_) <= 1; #line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _data_collection_unref0 (_tmp1_); #line 203 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp3_) { + if (_tmp2_) { #line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return; -#line 2094 "EventsDirectoryPage.c" +#line 2235 "EventsDirectoryPage.c" } #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = view_collection_get_selected (_tmp5_); + _tmp5_ = view_collection_get_selected (_tmp4_); #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = _tmp6_; + _tmp6_ = _tmp5_; #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = merge_events_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp7_ = merge_events_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable)); #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _data_collection_unref0 (_tmp5_); + _data_collection_unref0 (_tmp4_); #line 206 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - command = _tmp9_; + command = _tmp8_; #line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp12_ = command; + _tmp11_ = command; #line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command)); + command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command)); #line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _command_manager_unref0 (_tmp11_); + _command_manager_unref0 (_tmp10_); #line 202 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (command); -#line 2126 "EventsDirectoryPage.c" +#line 2267 "EventsDirectoryPage.c" } -static void events_directory_page_on_display_comments (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value) { +static void +events_directory_page_on_display_comments (EventsDirectoryPage* self, + GSimpleAction* action, + GVariant* value) +{ gboolean display = FALSE; - GVariant* _tmp0_; - gboolean _tmp1_; - ConfigFacade* _tmp2_; - ConfigFacade* _tmp3_; - GSimpleAction* _tmp4_; - GVariant* _tmp5_; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; #line 210 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self)); #line 210 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); #line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = value; -#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - display = _tmp1_; + display = g_variant_get_boolean (value); #line 213 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" checkerboard_page_set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display); #line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = config_facade_get_instance (); + _tmp0_ = config_facade_get_instance (); #line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - configuration_facade_set_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); + configuration_facade_set_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display); #line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp3_); -#line 217 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = action; + _g_object_unref0 (_tmp1_); #line 217 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = value; -#line 217 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_simple_action_set_state (_tmp4_, _tmp5_); -#line 2164 "EventsDirectoryPage.c" + g_simple_action_set_state (action, value); +#line 2297 "EventsDirectoryPage.c" } -static gpointer _view_filter_ref0 (gpointer self) { +static gpointer +_view_filter_ref0 (gpointer self) +{ #line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self ? view_filter_ref (self) : NULL; -#line 2171 "EventsDirectoryPage.c" +#line 2306 "EventsDirectoryPage.c" } -static SearchViewFilter* events_directory_page_real_get_search_view_filter (CheckerboardPage* base) { +static SearchViewFilter* +events_directory_page_real_get_search_view_filter (CheckerboardPage* base) +{ EventsDirectoryPage * self; SearchViewFilter* result = NULL; EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_; @@ -2186,62 +2323,72 @@ static SearchViewFilter* events_directory_page_real_get_search_view_filter (Chec result = _tmp1_; #line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2190 "EventsDirectoryPage.c" +#line 2327 "EventsDirectoryPage.c" } -static DataView* events_directory_page_event_directory_manager_real_create_view (ViewManager* base, DataSource* source) { +static DataView* +events_directory_page_event_directory_manager_real_create_view (ViewManager* base, + DataSource* source) +{ EventsDirectoryPageEventDirectoryManager * self; DataView* result = NULL; - DataSource* _tmp0_; - EventDirectoryItem* _tmp1_; + EventDirectoryItem* _tmp0_; #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" g_return_val_if_fail (IS_DATA_SOURCE (source), NULL); #line 10 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = source; + _tmp0_ = event_directory_item_new (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_EVENT, Event)); #line 10 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = event_directory_item_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event)); -#line 10 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView); #line 10 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2211 "EventsDirectoryPage.c" +#line 2348 "EventsDirectoryPage.c" } -EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_manager_construct (GType object_type) { +EventsDirectoryPageEventDirectoryManager* +events_directory_page_event_directory_manager_construct (GType object_type) +{ EventsDirectoryPageEventDirectoryManager* self = NULL; #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = (EventsDirectoryPageEventDirectoryManager*) view_manager_construct (object_type); #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self; -#line 2221 "EventsDirectoryPage.c" +#line 2360 "EventsDirectoryPage.c" } -EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_manager_new (void) { +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 2228 "EventsDirectoryPage.c" +#line 2369 "EventsDirectoryPage.c" } -static void events_directory_page_event_directory_manager_class_init (EventsDirectoryPageEventDirectoryManagerClass * klass) { +static void +events_directory_page_event_directory_manager_class_init (EventsDirectoryPageEventDirectoryManagerClass * klass) +{ #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 2237 "EventsDirectoryPage.c" +#line 2380 "EventsDirectoryPage.c" } -static void events_directory_page_event_directory_manager_instance_init (EventsDirectoryPageEventDirectoryManager * self) { +static void +events_directory_page_event_directory_manager_instance_init (EventsDirectoryPageEventDirectoryManager * self) +{ } -GType events_directory_page_event_directory_manager_get_type (void) { +GType +events_directory_page_event_directory_manager_get_type (void) +{ static volatile gsize events_directory_page_event_directory_manager_type_id__volatile = 0; if (g_once_init_enter (&events_directory_page_event_directory_manager_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsDirectoryPageEventDirectoryManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_directory_page_event_directory_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsDirectoryPageEventDirectoryManager), 0, (GInstanceInitFunc) events_directory_page_event_directory_manager_instance_init, NULL }; @@ -2253,7 +2400,9 @@ GType events_directory_page_event_directory_manager_get_type (void) { } -static guint events_directory_page_events_directory_search_view_filter_real_get_criteria (SearchViewFilter* base) { +static guint +events_directory_page_events_directory_search_view_filter_real_get_criteria (SearchViewFilter* base) +{ EventsDirectoryPageEventsDirectorySearchViewFilter * self; guint result = 0U; #line 15 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2262,138 +2411,126 @@ 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 2266 "EventsDirectoryPage.c" +#line 2415 "EventsDirectoryPage.c" } -static gboolean string_contains (const gchar* self, const gchar* needle) { +static gboolean +string_contains (const gchar* self, + const gchar* needle) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = needle; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_ != NULL; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = strstr ((gchar*) self, (gchar*) needle); +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_ != NULL; +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2286 "EventsDirectoryPage.c" +#line 2435 "EventsDirectoryPage.c" } -static gboolean events_directory_page_events_directory_search_view_filter_real_predicate (ViewFilter* base, DataView* view) { +static gboolean +events_directory_page_events_directory_search_view_filter_real_predicate (ViewFilter* base, + DataView* view) +{ EventsDirectoryPageEventsDirectorySearchViewFilter * self; gboolean result = FALSE; - DataView* _tmp0_; + DataSource* _tmp0_; DataSource* _tmp1_; - DataSource* _tmp2_; - const gchar* _tmp3_; - gboolean _tmp4_; + const gchar* _tmp2_; Event* source = NULL; - DataView* _tmp5_; - DataSource* _tmp6_; + DataSource* _tmp3_; const gchar* event_keywords = NULL; - Event* _tmp7_; - const gchar* _tmp8_; - const gchar* _tmp9_; - gboolean _tmp10_; - gint _tmp11_; - gchar** _tmp12_; + Event* _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; + gint _tmp7_; + gchar** _tmp8_; #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" g_return_val_if_fail (IS_DATA_VIEW (view), FALSE); #line 20 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = view; + _tmp0_ = data_view_get_source (view); #line 20 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = data_view_get_source (_tmp0_); -#line 20 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 20 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_EVENT), "view.get_source() is Event"); + _vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENT), "view.get_source() is Event"); #line 20 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _g_object_unref0 (_tmp2_); -#line 21 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = search_view_filter_get_search_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); + _g_object_unref0 (_tmp1_); #line 21 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = is_string_empty (_tmp3_); + _tmp2_ = search_view_filter_get_search_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter)); #line 21 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp4_) { + if (is_string_empty (_tmp2_)) { #line 22 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = TRUE; #line 22 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2332 "EventsDirectoryPage.c" +#line 2476 "EventsDirectoryPage.c" } #line 24 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = view; + _tmp3_ = data_view_get_source (view); #line 24 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = data_view_get_source (_tmp5_); -#line 24 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - source = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT, Event); + source = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_EVENT, Event); #line 25 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = source; + _tmp4_ = source; #line 25 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_INDEXABLE, Indexable)); + _tmp5_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_INDEXABLE, Indexable)); #line 25 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - event_keywords = _tmp8_; -#line 26 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = event_keywords; + event_keywords = _tmp5_; #line 26 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp10_ = is_string_empty (_tmp9_); + _tmp6_ = event_keywords; #line 26 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp10_) { + if (is_string_empty (_tmp6_)) { #line 27 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = FALSE; #line 27 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (source); #line 27 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2358 "EventsDirectoryPage.c" +#line 2498 "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 2362 "EventsDirectoryPage.c" + _tmp8_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp7_); +#line 2502 "EventsDirectoryPage.c" { gchar** word_collection = NULL; gint word_collection_length1 = 0; gint _word_collection_size_ = 0; gint word_it = 0; #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - word_collection = _tmp12_; + word_collection = _tmp8_; #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - word_collection_length1 = _tmp11_; + word_collection_length1 = _tmp7_; #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - for (word_it = 0; word_it < _tmp11_; word_it = word_it + 1) { -#line 2374 "EventsDirectoryPage.c" + for (word_it = 0; word_it < _tmp7_; word_it = word_it + 1) { +#line 2514 "EventsDirectoryPage.c" const gchar* word = NULL; #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" word = word_collection[word_it]; -#line 2378 "EventsDirectoryPage.c" +#line 2518 "EventsDirectoryPage.c" { - const gchar* _tmp13_; - const gchar* _tmp14_; - gboolean _tmp15_; + const gchar* _tmp9_; + const gchar* _tmp10_; #line 31 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp13_ = event_keywords; + _tmp9_ = event_keywords; #line 31 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp14_ = word; + _tmp10_ = word; #line 31 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp15_ = string_contains (_tmp13_, _tmp14_); -#line 31 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (!_tmp15_) { + if (!string_contains (_tmp9_, _tmp10_)) { #line 32 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = FALSE; #line 32 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (source); #line 32 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2397 "EventsDirectoryPage.c" +#line 2534 "EventsDirectoryPage.c" } } } @@ -2404,43 +2541,53 @@ 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 2408 "EventsDirectoryPage.c" +#line 2545 "EventsDirectoryPage.c" } -static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_construct (GType object_type) { +static EventsDirectoryPageEventsDirectorySearchViewFilter* +events_directory_page_events_directory_search_view_filter_construct (GType object_type) +{ EventsDirectoryPageEventsDirectorySearchViewFilter* self = NULL; #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = (EventsDirectoryPageEventsDirectorySearchViewFilter*) search_view_filter_construct (object_type); #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self; -#line 2418 "EventsDirectoryPage.c" +#line 2557 "EventsDirectoryPage.c" } -static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_new (void) { +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 2425 "EventsDirectoryPage.c" +#line 2566 "EventsDirectoryPage.c" } -static void events_directory_page_events_directory_search_view_filter_class_init (EventsDirectoryPageEventsDirectorySearchViewFilterClass * klass) { +static void +events_directory_page_events_directory_search_view_filter_class_init (EventsDirectoryPageEventsDirectorySearchViewFilterClass * klass) +{ #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; #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 2436 "EventsDirectoryPage.c" +#line 2579 "EventsDirectoryPage.c" } -static void events_directory_page_events_directory_search_view_filter_instance_init (EventsDirectoryPageEventsDirectorySearchViewFilter * self) { +static void +events_directory_page_events_directory_search_view_filter_instance_init (EventsDirectoryPageEventsDirectorySearchViewFilter * self) +{ } -static GType events_directory_page_events_directory_search_view_filter_get_type (void) { +static GType +events_directory_page_events_directory_search_view_filter_get_type (void) +{ static volatile gsize events_directory_page_events_directory_search_view_filter_type_id__volatile = 0; if (g_once_init_enter (&events_directory_page_events_directory_search_view_filter_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsDirectoryPageEventsDirectorySearchViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_directory_page_events_directory_search_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsDirectoryPageEventsDirectorySearchViewFilter), 0, (GInstanceInitFunc) events_directory_page_events_directory_search_view_filter_instance_init, NULL }; @@ -2452,7 +2599,9 @@ static GType events_directory_page_events_directory_search_view_filter_get_type } -static void events_directory_page_class_init (EventsDirectoryPageClass * klass) { +static void +events_directory_page_class_init (EventsDirectoryPageClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" events_directory_page_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2477,11 +2626,13 @@ static void events_directory_page_class_init (EventsDirectoryPageClass * klass) ((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 2481 "EventsDirectoryPage.c" +#line 2630 "EventsDirectoryPage.c" } -static void events_directory_page_instance_init (EventsDirectoryPage * self) { +static void +events_directory_page_instance_init (EventsDirectoryPage * self) +{ EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self->priv = EVENTS_DIRECTORY_PAGE_GET_PRIVATE (self); @@ -2489,11 +2640,13 @@ static void events_directory_page_instance_init (EventsDirectoryPage * self) { _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 2493 "EventsDirectoryPage.c" +#line 2644 "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_; @@ -2511,7 +2664,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 2515 "EventsDirectoryPage.c" +#line 2668 "EventsDirectoryPage.c" } #line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" action = _tmp1_; @@ -2533,11 +2686,13 @@ 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 2537 "EventsDirectoryPage.c" +#line 2690 "EventsDirectoryPage.c" } -GType events_directory_page_get_type (void) { +GType +events_directory_page_get_type (void) +{ static volatile gsize events_directory_page_type_id__volatile = 0; if (g_once_init_enter (&events_directory_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EventsDirectoryPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) events_directory_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EventsDirectoryPage), 0, (GInstanceInitFunc) events_directory_page_instance_init, NULL }; @@ -2549,7 +2704,9 @@ GType events_directory_page_get_type (void) { } -MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_type) { +MasterEventsDirectoryPage* +master_events_directory_page_construct (GType object_type) +{ MasterEventsDirectoryPage * self = NULL; EventsDirectoryPageEventDirectoryManager* _tmp0_; EventsDirectoryPageEventDirectoryManager* _tmp1_; @@ -2574,29 +2731,37 @@ MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_ _view_manager_unref0 (_tmp1_); #line 228 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self; -#line 2578 "EventsDirectoryPage.c" +#line 2735 "EventsDirectoryPage.c" } -MasterEventsDirectoryPage* master_events_directory_page_new (void) { +MasterEventsDirectoryPage* +master_events_directory_page_new (void) +{ #line 228 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return master_events_directory_page_construct (TYPE_MASTER_EVENTS_DIRECTORY_PAGE); -#line 2585 "EventsDirectoryPage.c" +#line 2744 "EventsDirectoryPage.c" } -static void master_events_directory_page_class_init (MasterEventsDirectoryPageClass * klass) { +static void +master_events_directory_page_class_init (MasterEventsDirectoryPageClass * klass) +{ #line 225 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" master_events_directory_page_parent_class = g_type_class_peek_parent (klass); -#line 2592 "EventsDirectoryPage.c" +#line 2753 "EventsDirectoryPage.c" } -static void master_events_directory_page_instance_init (MasterEventsDirectoryPage * self) { +static void +master_events_directory_page_instance_init (MasterEventsDirectoryPage * self) +{ } -GType master_events_directory_page_get_type (void) { +GType +master_events_directory_page_get_type (void) +{ static volatile gsize master_events_directory_page_type_id__volatile = 0; if (g_once_init_enter (&master_events_directory_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (MasterEventsDirectoryPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) master_events_directory_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MasterEventsDirectoryPage), 0, (GInstanceInitFunc) master_events_directory_page_instance_init, NULL }; @@ -2608,7 +2773,9 @@ GType master_events_directory_page_get_type (void) { } -GType sub_events_directory_page_directory_type_get_type (void) { +GType +sub_events_directory_page_directory_type_get_type (void) +{ static volatile gsize sub_events_directory_page_directory_type_type_id__volatile = 0; if (g_once_init_enter (&sub_events_directory_page_directory_type_type_id__volatile)) { static const GEnumValue values[] = {{SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR, "SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR", "year"}, {SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH, "SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH", "month"}, {SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED, "SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED", "undated"}, {0, NULL, NULL}}; @@ -2620,7 +2787,10 @@ GType sub_events_directory_page_directory_type_get_type (void) { } -static gchar* g_time_format (struct tm *self, const gchar* format) { +static gchar* +g_time_format (struct tm *self, + const gchar* format) +{ gchar* result = NULL; gchar* buffer = NULL; gchar* _tmp0_; @@ -2628,314 +2798,301 @@ static gchar* g_time_format (struct tm *self, const gchar* format) { gint _buffer_size_; gchar* _tmp1_; gint _tmp1__length1; - const gchar* _tmp2_; + gchar* _tmp2_; + gint _tmp2__length1; gchar* _tmp3_; - gint _tmp3__length1; - gchar* _tmp4_; -#line 2854 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2874 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (format != NULL, NULL); -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_new0 (gchar, 64); -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer = _tmp0_; -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer_length1 = 64; -#line 2855 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2875 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _buffer_size_ = buffer_length1; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = buffer; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1__length1 = buffer_length1; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = format; -#line 2856 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self)); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = buffer; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3__length1 = buffer_length1; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = g_strdup ((const gchar*) _tmp3_); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2876 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + strftime (_tmp1_, _tmp1__length1, format, &(*self)); +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = buffer; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2__length1 = buffer_length1; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_strdup ((const gchar*) _tmp2_); +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp3_; +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" buffer = (g_free (buffer), NULL); -#line 2857 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2877 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 2666 "EventsDirectoryPage.c" +#line 2833 "EventsDirectoryPage.c" } -SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time) { +SubEventsDirectoryPage* +sub_events_directory_page_construct (GType object_type, + SubEventsDirectoryPageDirectoryType type, + struct tm* time) +{ SubEventsDirectoryPage * self = NULL; gchar* page_name = NULL; - SubEventsDirectoryPageDirectoryType _tmp0_; - const gchar* _tmp5_; - SubEventsDirectoryPageDirectoryType _tmp6_; - struct tm _tmp7_; - SubEventsDirectoryPageSubEventDirectoryManager* _tmp8_; - SubEventsDirectoryPageSubEventDirectoryManager* _tmp9_; + const gchar* _tmp3_; + struct tm _tmp4_; + SubEventsDirectoryPageSubEventDirectoryManager* _tmp5_; + SubEventsDirectoryPageSubEventDirectoryManager* _tmp6_; #line 286 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (time != NULL, NULL); #line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = type; -#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED) { -#line 2685 "EventsDirectoryPage.c" - gchar* _tmp1_; + if (type == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED) { +#line 2852 "EventsDirectoryPage.c" + gchar* _tmp0_; #line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = g_strdup (SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME); + _tmp0_ = g_strdup (SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME); #line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_free0 (page_name); #line 289 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - page_name = _tmp1_; -#line 2693 "EventsDirectoryPage.c" + page_name = _tmp0_; +#line 2860 "EventsDirectoryPage.c" } else { - const gchar* _tmp2_ = NULL; - SubEventsDirectoryPageDirectoryType _tmp3_; - gchar* _tmp4_; -#line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = type; + const gchar* _tmp1_ = NULL; + gchar* _tmp2_; #line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp3_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR) { + if (type == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR) { #line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT; -#line 2704 "EventsDirectoryPage.c" + _tmp1_ = SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT; +#line 2868 "EventsDirectoryPage.c" } else { #line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT; -#line 2708 "EventsDirectoryPage.c" + _tmp1_ = SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT; +#line 2872 "EventsDirectoryPage.c" } #line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = g_time_format (time, _tmp2_); + _tmp2_ = g_time_format (time, _tmp1_); #line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_free0 (page_name); #line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - page_name = _tmp4_; -#line 2716 "EventsDirectoryPage.c" + page_name = _tmp2_; +#line 2880 "EventsDirectoryPage.c" } #line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = page_name; + _tmp3_ = page_name; #line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp6_ = type; -#line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = *time; + _tmp4_ = *time; #line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = sub_events_directory_page_sub_event_directory_manager_new (_tmp6_, &_tmp7_); + _tmp5_ = sub_events_directory_page_sub_event_directory_manager_new (type, &_tmp4_); #line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = _tmp8_; + _tmp6_ = _tmp5_; #line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - self = (SubEventsDirectoryPage*) events_directory_page_construct (object_type, _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_MANAGER, ViewManager), NULL); + self = (SubEventsDirectoryPage*) events_directory_page_construct (object_type, _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_VIEW_MANAGER, ViewManager), NULL); #line 294 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _view_manager_unref0 (_tmp9_); + _view_manager_unref0 (_tmp6_); #line 286 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_free0 (page_name); #line 286 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self; -#line 2736 "EventsDirectoryPage.c" +#line 2898 "EventsDirectoryPage.c" } -SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) { +SubEventsDirectoryPage* +sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, + struct tm* time) +{ #line 286 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return sub_events_directory_page_construct (TYPE_SUB_EVENTS_DIRECTORY_PAGE, type, time); -#line 2743 "EventsDirectoryPage.c" +#line 2908 "EventsDirectoryPage.c" } -gint sub_events_directory_page_get_month (SubEventsDirectoryPage* self) { +gint +sub_events_directory_page_get_month (SubEventsDirectoryPage* self) +{ gint result = 0; ViewManager* _tmp0_; - gint _tmp1_; #line 297 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0); #line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager; #line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = sub_events_directory_page_sub_event_directory_manager_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager)); -#line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp1_; + result = sub_events_directory_page_sub_event_directory_manager_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager)); #line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2761 "EventsDirectoryPage.c" +#line 2925 "EventsDirectoryPage.c" } -gint sub_events_directory_page_get_year (SubEventsDirectoryPage* self) { +gint +sub_events_directory_page_get_year (SubEventsDirectoryPage* self) +{ gint result = 0; ViewManager* _tmp0_; - gint _tmp1_; #line 301 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0); #line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager; #line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = sub_events_directory_page_sub_event_directory_manager_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager)); -#line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp1_; + result = sub_events_directory_page_sub_event_directory_manager_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager)); #line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2779 "EventsDirectoryPage.c" +#line 2942 "EventsDirectoryPage.c" } -SubEventsDirectoryPageDirectoryType sub_events_directory_page_get_event_directory_type (SubEventsDirectoryPage* self) { +SubEventsDirectoryPageDirectoryType +sub_events_directory_page_get_event_directory_type (SubEventsDirectoryPage* self) +{ SubEventsDirectoryPageDirectoryType result = 0; ViewManager* _tmp0_; - SubEventsDirectoryPageDirectoryType _tmp1_; #line 305 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0); #line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager; #line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager)); -#line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp1_; + result = sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager)); #line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2797 "EventsDirectoryPage.c" +#line 2959 "EventsDirectoryPage.c" } -static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_construct (GType object_type, SubEventsDirectoryPageDirectoryType type, struct tm* time) { +static SubEventsDirectoryPageSubEventDirectoryManager* +sub_events_directory_page_sub_event_directory_manager_construct (GType object_type, + SubEventsDirectoryPageDirectoryType type, + struct tm* time) +{ SubEventsDirectoryPageSubEventDirectoryManager* self = NULL; - SubEventsDirectoryPageDirectoryType _tmp0_; - SubEventsDirectoryPageDirectoryType _tmp3_; - struct tm _tmp4_; - gint _tmp5_; + struct tm _tmp2_; + gint _tmp3_; #line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (time != NULL, NULL); #line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self = (SubEventsDirectoryPageSubEventDirectoryManager*) events_directory_page_event_directory_manager_construct (object_type); #line 252 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = type; -#line 252 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) { -#line 2815 "EventsDirectoryPage.c" - struct tm _tmp1_; - gint _tmp2_; + if (type == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) { +#line 2977 "EventsDirectoryPage.c" + struct tm _tmp0_; + gint _tmp1_; #line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = *time; + _tmp0_ = *time; #line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = _tmp1_.tm_mon; + _tmp1_ = _tmp0_.tm_mon; #line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - self->priv->month = _tmp2_; -#line 2824 "EventsDirectoryPage.c" + self->priv->month = _tmp1_; +#line 2986 "EventsDirectoryPage.c" } #line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = type; -#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - self->priv->type = _tmp3_; + self->priv->type = type; #line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = *time; + _tmp2_ = *time; #line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = _tmp4_.tm_year; + _tmp3_ = _tmp2_.tm_year; #line 255 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - self->priv->year = _tmp5_; + self->priv->year = _tmp3_; #line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return self; -#line 2838 "EventsDirectoryPage.c" +#line 2998 "EventsDirectoryPage.c" } -static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) { +static SubEventsDirectoryPageSubEventDirectoryManager* +sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, + struct tm* time) +{ #line 249 "/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 2845 "EventsDirectoryPage.c" +#line 3008 "EventsDirectoryPage.c" } -static void g_time_local (time_t time, struct tm* result) { +static void +g_time_local (time_t time, + struct tm* result) +{ struct tm _result_ = {0}; struct tm _tmp0_ = {0}; -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" localtime_r (&time, &_tmp0_); -#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2866 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" *result = _result_; -#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 2867 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return; -#line 2860 "EventsDirectoryPage.c" +#line 3026 "EventsDirectoryPage.c" } -static gboolean sub_events_directory_page_sub_event_directory_manager_real_include_in_view (ViewManager* base, DataSource* source) { +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_; - gboolean _tmp1_; EventSource* event = NULL; - DataSource* _tmp2_; - EventSource* _tmp3_; + EventSource* _tmp0_; struct tm event_time = {0}; - EventSource* _tmp4_; - time_t _tmp5_; - struct tm _tmp6_ = {0}; - struct tm _tmp7_; - gint _tmp8_; - gint _tmp9_; + EventSource* _tmp1_; + struct tm _tmp2_ = {0}; + struct tm _tmp3_; + gint _tmp4_; + gint _tmp5_; #line 258 "/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 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp0_ = source; -#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp1_ = VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER, EventsDirectoryPageEventDirectoryManager), TYPE_VIEW_MANAGER, ViewManager), _tmp0_); -#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (!_tmp1_) { + if (!VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER, EventsDirectoryPageEventDirectoryManager), TYPE_VIEW_MANAGER, ViewManager), source)) { #line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = FALSE; #line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2893 "EventsDirectoryPage.c" +#line 3054 "EventsDirectoryPage.c" } #line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp2_ = source; -#line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EVENT_SOURCE, EventSource)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_EVENT_SOURCE, EventSource)); #line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - event = _tmp3_; -#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp4_ = event; + event = _tmp0_; #line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp5_ = event_source_get_start_time (_tmp4_); + _tmp1_ = event; #line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - g_time_local (_tmp5_, &_tmp6_); + g_time_local (event_source_get_start_time (_tmp1_), &_tmp2_); #line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - event_time = _tmp6_; + event_time = _tmp2_; #line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp7_ = event_time; + _tmp3_ = event_time; #line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp8_ = _tmp7_.tm_year; + _tmp4_ = _tmp3_.tm_year; #line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp9_ = self->priv->year; + _tmp5_ = self->priv->year; #line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp8_ == _tmp9_) { -#line 2917 "EventsDirectoryPage.c" - SubEventsDirectoryPageDirectoryType _tmp10_; + if (_tmp4_ == _tmp5_) { +#line 3074 "EventsDirectoryPage.c" + SubEventsDirectoryPageDirectoryType _tmp6_; #line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp10_ = self->priv->type; + _tmp6_ = self->priv->type; #line 265 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - if (_tmp10_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) { -#line 2923 "EventsDirectoryPage.c" - struct tm _tmp11_; - gint _tmp12_; - gint _tmp13_; + if (_tmp6_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) { +#line 3080 "EventsDirectoryPage.c" + struct tm _tmp7_; + gint _tmp8_; + gint _tmp9_; #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp11_ = event_time; + _tmp7_ = event_time; #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp12_ = _tmp11_.tm_mon; + _tmp8_ = _tmp7_.tm_mon; #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - _tmp13_ = self->priv->month; + _tmp9_ = self->priv->month; #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" - result = _tmp12_ == _tmp13_; + result = _tmp8_ == _tmp9_; #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" _g_object_unref0 (event); #line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2939 "EventsDirectoryPage.c" +#line 3096 "EventsDirectoryPage.c" } #line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = TRUE; @@ -2943,7 +3100,7 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu _g_object_unref0 (event); #line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2947 "EventsDirectoryPage.c" +#line 3104 "EventsDirectoryPage.c" } #line 270 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" result = FALSE; @@ -2951,11 +3108,13 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu _g_object_unref0 (event); #line 270 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2955 "EventsDirectoryPage.c" +#line 3112 "EventsDirectoryPage.c" } -static gint sub_events_directory_page_sub_event_directory_manager_get_month (SubEventsDirectoryPageSubEventDirectoryManager* self) { +static gint +sub_events_directory_page_sub_event_directory_manager_get_month (SubEventsDirectoryPageSubEventDirectoryManager* self) +{ gint result = 0; gint _tmp0_; #line 273 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2966,11 +3125,13 @@ static gint sub_events_directory_page_sub_event_directory_manager_get_month (Sub result = _tmp0_; #line 274 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2970 "EventsDirectoryPage.c" +#line 3129 "EventsDirectoryPage.c" } -static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubEventsDirectoryPageSubEventDirectoryManager* self) { +static gint +sub_events_directory_page_sub_event_directory_manager_get_year (SubEventsDirectoryPageSubEventDirectoryManager* self) +{ gint result = 0; gint _tmp0_; #line 277 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2981,11 +3142,13 @@ static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubE result = _tmp0_; #line 278 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 2985 "EventsDirectoryPage.c" +#line 3146 "EventsDirectoryPage.c" } -static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (SubEventsDirectoryPageSubEventDirectoryManager* self) { +static SubEventsDirectoryPageDirectoryType +sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (SubEventsDirectoryPageSubEventDirectoryManager* self) +{ SubEventsDirectoryPageDirectoryType result = 0; SubEventsDirectoryPageDirectoryType _tmp0_; #line 281 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -2996,11 +3159,13 @@ static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_d result = _tmp0_; #line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" return result; -#line 3000 "EventsDirectoryPage.c" +#line 3163 "EventsDirectoryPage.c" } -static void sub_events_directory_page_sub_event_directory_manager_class_init (SubEventsDirectoryPageSubEventDirectoryManagerClass * klass) { +static void +sub_events_directory_page_sub_event_directory_manager_class_init (SubEventsDirectoryPageSubEventDirectoryManagerClass * klass) +{ #line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" sub_events_directory_page_sub_event_directory_manager_parent_class = g_type_class_peek_parent (klass); #line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" @@ -3009,32 +3174,38 @@ static void sub_events_directory_page_sub_event_directory_manager_class_init (Su g_type_class_add_private (klass, sizeof (SubEventsDirectoryPageSubEventDirectoryManagerPrivate)); #line 244 "/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 3013 "EventsDirectoryPage.c" +#line 3178 "EventsDirectoryPage.c" } -static void sub_events_directory_page_sub_event_directory_manager_instance_init (SubEventsDirectoryPageSubEventDirectoryManager * self) { +static void +sub_events_directory_page_sub_event_directory_manager_instance_init (SubEventsDirectoryPageSubEventDirectoryManager * self) +{ #line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self->priv = SUB_EVENTS_DIRECTORY_PAGE_SUB_EVENT_DIRECTORY_MANAGER_GET_PRIVATE (self); #line 245 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self->priv->month = 0; #line 246 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" self->priv->year = 0; -#line 3024 "EventsDirectoryPage.c" +#line 3191 "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 244 "/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 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->finalize (obj); -#line 3034 "EventsDirectoryPage.c" +#line 3203 "EventsDirectoryPage.c" } -static GType sub_events_directory_page_sub_event_directory_manager_get_type (void) { +static GType +sub_events_directory_page_sub_event_directory_manager_get_type (void) +{ static volatile gsize sub_events_directory_page_sub_event_directory_manager_type_id__volatile = 0; if (g_once_init_enter (&sub_events_directory_page_sub_event_directory_manager_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SubEventsDirectoryPageSubEventDirectoryManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sub_events_directory_page_sub_event_directory_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SubEventsDirectoryPageSubEventDirectoryManager), 0, (GInstanceInitFunc) sub_events_directory_page_sub_event_directory_manager_instance_init, NULL }; @@ -3046,18 +3217,24 @@ static GType sub_events_directory_page_sub_event_directory_manager_get_type (voi } -static void sub_events_directory_page_class_init (SubEventsDirectoryPageClass * klass) { +static void +sub_events_directory_page_class_init (SubEventsDirectoryPageClass * klass) +{ #line 233 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala" sub_events_directory_page_parent_class = g_type_class_peek_parent (klass); -#line 3053 "EventsDirectoryPage.c" +#line 3226 "EventsDirectoryPage.c" } -static void sub_events_directory_page_instance_init (SubEventsDirectoryPage * self) { +static void +sub_events_directory_page_instance_init (SubEventsDirectoryPage * self) +{ } -GType sub_events_directory_page_get_type (void) { +GType +sub_events_directory_page_get_type (void) +{ static volatile gsize sub_events_directory_page_type_id__volatile = 0; if (g_once_init_enter (&sub_events_directory_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (SubEventsDirectoryPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sub_events_directory_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SubEventsDirectoryPage), 0, (GInstanceInitFunc) sub_events_directory_page_instance_init, NULL }; |