diff options
Diffstat (limited to 'src/library/LibraryWindow.c')
| -rw-r--r-- | src/library/LibraryWindow.c | 4562 |
1 files changed, 2346 insertions, 2216 deletions
diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c index b300d1c..e4d802b 100644 --- a/src/library/LibraryWindow.c +++ b/src/library/LibraryWindow.c @@ -1,4 +1,4 @@ -/* LibraryWindow.c generated by valac 0.34.2, the Vala compiler +/* LibraryWindow.c generated by valac 0.32.1, the Vala compiler * generated from LibraryWindow.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -456,6 +456,27 @@ typedef struct _SidebarSimplePageEntryClass SidebarSimplePageEntryClass; typedef struct _LibraryPhotosEntry LibraryPhotosEntry; typedef struct _LibraryPhotosEntryClass LibraryPhotosEntryClass; +#define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ()) +#define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade)) +#define CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass)) +#define IS_CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONFIGURATION_FACADE)) +#define IS_CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONFIGURATION_FACADE)) +#define CONFIGURATION_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass)) + +typedef struct _ConfigurationFacade ConfigurationFacade; +typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass; + +#define CONFIG_TYPE_FACADE (config_facade_get_type ()) +#define CONFIG_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CONFIG_TYPE_FACADE, ConfigFacade)) +#define CONFIG_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CONFIG_TYPE_FACADE, ConfigFacadeClass)) +#define CONFIG_IS_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CONFIG_TYPE_FACADE)) +#define CONFIG_IS_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CONFIG_TYPE_FACADE)) +#define CONFIG_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CONFIG_TYPE_FACADE, ConfigFacadeClass)) + +typedef struct _ConfigFacade ConfigFacade; +typedef struct _ConfigFacadeClass ConfigFacadeClass; +#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL))) + #define TYPE_VIEW_COLLECTION (view_collection_get_type ()) #define VIEW_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIEW_COLLECTION, ViewCollection)) #define VIEW_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VIEW_COLLECTION, ViewCollectionClass)) @@ -475,7 +496,6 @@ typedef struct _ViewCollectionClass ViewCollectionClass; typedef struct _ViewFilter ViewFilter; typedef struct _ViewFilterClass ViewFilterClass; -#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL))) #define TYPE_CHECKERBOARD_PAGE (checkerboard_page_get_type ()) #define CHECKERBOARD_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHECKERBOARD_PAGE, CheckerboardPage)) @@ -557,26 +577,6 @@ typedef struct _SavedSearchClass SavedSearchClass; typedef struct _SearchesSidebarEntry SearchesSidebarEntry; typedef struct _SearchesSidebarEntryClass SearchesSidebarEntryClass; -#define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ()) -#define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade)) -#define CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass)) -#define IS_CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONFIGURATION_FACADE)) -#define IS_CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONFIGURATION_FACADE)) -#define CONFIGURATION_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass)) - -typedef struct _ConfigurationFacade ConfigurationFacade; -typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass; - -#define CONFIG_TYPE_FACADE (config_facade_get_type ()) -#define CONFIG_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CONFIG_TYPE_FACADE, ConfigFacade)) -#define CONFIG_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CONFIG_TYPE_FACADE, ConfigFacadeClass)) -#define CONFIG_IS_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CONFIG_TYPE_FACADE)) -#define CONFIG_IS_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CONFIG_TYPE_FACADE)) -#define CONFIG_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CONFIG_TYPE_FACADE, ConfigFacadeClass)) - -typedef struct _ConfigFacade ConfigFacade; -typedef struct _ConfigFacadeClass ConfigFacadeClass; - #define TYPE_MEDIA_PAGE (media_page_get_type ()) #define MEDIA_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_PAGE, MediaPage)) #define MEDIA_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_PAGE, MediaPageClass)) @@ -1010,6 +1010,7 @@ struct _LibraryWindowPrivate { GtkStack* stack; GtkBox* layout; GtkBox* right_vbox; + GtkRevealer* toolbar_revealer; gint current_progress_priority; guint background_progress_pulse_id; }; @@ -1436,6 +1437,15 @@ static void _library_window_on_library_monitor_auto_import_progress_library_moni static void library_window_real_add_actions (AppWindow* base); void app_window_add_actions (AppWindow* self); GActionEntry* search_filter_actions_get_actions (SearchFilterActions* self, int* result_length1); +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_display_search_bar (ConfigurationFacade* self); +static GVariant* _variant_new1 (gboolean value); +static gboolean library_window_is_sidebar_visible (LibraryWindow* self); +static GVariant* _variant_new2 (gboolean value); +static gboolean library_window_is_toolbar_visible (LibraryWindow* self); +static GVariant* _variant_new3 (gboolean value); static void library_window_real_switched_pages (PageWindow* base, Page* old_page, Page* new_page); void page_window_switched_pages (PageWindow* self, Page* old_page, Page* new_page); GType view_collection_get_type (void) G_GNUC_CONST; @@ -1455,7 +1465,7 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag static void library_window_on_view_filter_refreshed (LibraryWindow* self); static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender, gpointer self); gboolean view_collection_are_items_filtered_out (ViewCollection* self); -static GVariant* _variant_new1 (gboolean value); +static GVariant* _variant_new4 (gboolean value); static void library_window_real_show_all (GtkWidget* base); GAction* page_get_common_action (Page* self, const gchar* name, gboolean log_warning); GType checkerboard_page_get_type (void) G_GNUC_CONST; @@ -1463,7 +1473,6 @@ static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPa static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show, CheckerboardPage* page); static gboolean library_window_should_show_search_bar (LibraryWindow* self); static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean visible); -static gboolean library_window_is_sidebar_visible (LibraryWindow* self); LibraryWindow* library_window_get_app (void); gboolean library_window_is_mount_uri_supported (const gchar* uri); static gchar* library_window_real_get_app_role (AppWindow* base); @@ -1483,9 +1492,6 @@ void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch* GType searches_sidebar_entry_get_type (void) G_GNUC_CONST; SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self, SavedSearch* search); static void library_window_real_on_quit (AppWindow* base); -GType configuration_facade_get_type (void) G_GNUC_CONST; -GType config_facade_get_type (void) G_GNUC_CONST; -ConfigFacade* config_facade_get_instance (void); void configuration_facade_set_library_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions); void configuration_facade_set_sidebar_position (ConfigurationFacade* self, gint position); void app_window_on_quit (AppWindow* self); @@ -1557,7 +1563,7 @@ void saved_search_dialog_show (SavedSearchDialog* self); DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index); Event* media_source_get_event (MediaSource* self); void library_window_switch_to_event (LibraryWindow* self, Event* event); -static GVariant* _variant_new2 (gboolean value); +static GVariant* _variant_new5 (gboolean value); void search_filter_toolbar_take_focus (SearchFilterToolbar* self); static void library_window_on_clear_search (LibraryWindow* self); void search_filter_actions_reset (SearchFilterActions* self); @@ -1566,20 +1572,20 @@ void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self, void preferences_dialog_show (void); void properties_update_properties (Properties* self, Page* page); void configuration_facade_set_display_basic_properties (ConfigurationFacade* self, gboolean display); -static gboolean _variant_get3 (GVariant* value); -static GVariant* _variant_new4 (gboolean value); +static gboolean _variant_get6 (GVariant* value); +static GVariant* _variant_new7 (gboolean value); void extended_properties_window_update_properties (ExtendedPropertiesWindow* self, Page* page); void configuration_facade_set_display_search_bar (ConfigurationFacade* self, gboolean display); void library_window_show_search_bar (LibraryWindow* self, gboolean display); +static GVariant* _variant_new8 (gboolean value); void configuration_facade_set_display_sidebar (ConfigurationFacade* self, gboolean display); gboolean configuration_facade_get_display_sidebar (ConfigurationFacade* self); static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean visible); GtkToolbar* page_get_toolbar (Page* self); void configuration_facade_set_display_toolbar (ConfigurationFacade* self, gboolean display); -static gboolean library_window_is_toolbar_visible (LibraryWindow* self); gboolean configuration_facade_get_display_toolbar (ConfigurationFacade* self); static void library_window_sync_extended_properties (LibraryWindow* self, gboolean show); -static GVariant* _variant_new5 (gboolean value); +static GVariant* _variant_new9 (gboolean value); void configuration_facade_set_display_extended_properties (ConfigurationFacade* self, gboolean display); GType batch_import_get_type (void) G_GNUC_CONST; void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel); @@ -1648,13 +1654,12 @@ GType import_page_get_type (void) G_GNUC_CONST; gboolean import_page_unmount_camera (ImportPage* self, GMount* mount); static void library_window_remove_from_stack (LibraryWindow* self, Page* page); gboolean configuration_facade_get_display_basic_properties (ConfigurationFacade* self); -static GVariant* _variant_new6 (gboolean value); +static GVariant* _variant_new10 (gboolean value); gboolean configuration_facade_get_display_extended_properties (ConfigurationFacade* self); -static GVariant* _variant_new7 (gboolean value); -gboolean configuration_facade_get_display_search_bar (ConfigurationFacade* self); -static GVariant* _variant_new8 (gboolean value); +static GVariant* _variant_new11 (gboolean value); +static GVariant* _variant_new12 (gboolean value); gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* self); -static GVariant* _variant_new9 (const gchar* value); +static GVariant* _variant_new13 (const gchar* value); static void library_window_start_pulse_background_progress_bar (LibraryWindow* self, const gchar* label, gint priority); static void library_window_stop_pulse_background_progress_bar (LibraryWindow* self, gint priority, gboolean clear); static void library_window_show_background_progress_bar (LibraryWindow* self); @@ -1665,6 +1670,7 @@ static void library_window_update_background_progress_bar (LibraryWindow* self, static void library_window_hide_background_progress_bar (LibraryWindow* self); gint configuration_facade_get_sidebar_position (ConfigurationFacade* self); gint library_window_get_PAGE_MIN_WIDTH (void); +void application_set_appmenu (GMenuModel* model); static void library_window_real_set_current_page (PageWindow* base, Page* page); void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable); void application_set_menubar (GMenuModel* model); @@ -1733,89 +1739,89 @@ static gint _vala_array_length (gpointer array); static const gchar* LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES[3] = {"gphoto2:", "disk:", "file:"}; const GtkTargetEntry LIBRARY_WINDOW_DND_TARGET_ENTRIES[3] = {{"text/uri-list", (guint) GTK_TARGET_OTHER_APP, (guint) LIBRARY_WINDOW_TARGET_TYPE_URI_LIST}, {LIBRARY_WINDOW_MEDIA_LIST_MIME_TYPE, (guint) GTK_TARGET_SAME_APP, (guint) LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST}, {LIBRARY_WINDOW_TAG_PATH_MIME_TYPE, (guint) GTK_TARGET_SAME_WIDGET, (guint) LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH}}; -static const GActionEntry LIBRARY_WINDOW_common_actions[13] = {{"CommonFileImport", _library_window_on_file_import_gsimple_action_activate_callback}, {"ExternalLibraryImport", _library_window_on_external_library_import_gsimple_action_activate_callback}, {"CommonPreferences", _library_window_on_preferences_gsimple_action_activate_callback}, {"CommonEmptyTrash", _library_window_on_empty_trash_gsimple_action_activate_callback}, {"CommonJumpToEvent", _library_window_on_jump_to_event_gsimple_action_activate_callback}, {"CommonFind", _library_window_on_find_gsimple_action_activate_callback}, {"CommonNewSearch", _library_window_on_new_search_gsimple_action_activate_callback}, {"CommonDisplayBasicProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_basic_properties_gsimple_action_change_state_callback}, {"CommonDisplayExtendedProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_extended_properties_gsimple_action_change_state_callback}, {"CommonDisplaySearchbar", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_searchbar_gsimple_action_change_state_callback}, {"CommonDisplaySidebar", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "true", _library_window_on_display_sidebar_gsimple_action_change_state_callback}, {"CommonDisplayToolbar", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "true", _library_window_on_display_toolbar_gsimple_action_change_state_callback}, {"CommonSortEvents", _library_window_on_action_radio_gsimple_action_activate_callback, "s", "'ascending'", _library_window_on_events_sort_changed_gsimple_action_change_state_callback}}; +static const GActionEntry LIBRARY_WINDOW_common_actions[13] = {{"CommonFileImport", _library_window_on_file_import_gsimple_action_activate_callback}, {"ExternalLibraryImport", _library_window_on_external_library_import_gsimple_action_activate_callback}, {"CommonPreferences", _library_window_on_preferences_gsimple_action_activate_callback}, {"CommonEmptyTrash", _library_window_on_empty_trash_gsimple_action_activate_callback}, {"CommonJumpToEvent", _library_window_on_jump_to_event_gsimple_action_activate_callback}, {"CommonFind", _library_window_on_find_gsimple_action_activate_callback}, {"CommonNewSearch", _library_window_on_new_search_gsimple_action_activate_callback}, {"CommonDisplayBasicProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_basic_properties_gsimple_action_change_state_callback}, {"CommonDisplayExtendedProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_extended_properties_gsimple_action_change_state_callback}, {"CommonDisplaySearchbar", NULL, NULL, "false", _library_window_on_display_searchbar_gsimple_action_change_state_callback}, {"CommonDisplaySidebar", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "true", _library_window_on_display_sidebar_gsimple_action_change_state_callback}, {"CommonDisplayToolbar", NULL, NULL, "true", _library_window_on_display_toolbar_gsimple_action_change_state_callback}, {"CommonSortEvents", _library_window_on_action_radio_gsimple_action_activate_callback, "s", "'ascending'", _library_window_on_events_sort_changed_gsimple_action_change_state_callback}}; static void _library_window_on_page_created_sidebar_tree_page_created (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self) { -#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_page_created ((LibraryWindow*) self, entry, page); -#line 1742 "LibraryWindow.c" +#line 1748 "LibraryWindow.c" } static void _library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self) { -#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_destroying_page ((LibraryWindow*) self, entry, page); -#line 1749 "LibraryWindow.c" +#line 1755 "LibraryWindow.c" } static void _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender, SidebarSelectableEntry* selectable, gpointer self) { -#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_sidebar_entry_selected ((LibraryWindow*) self, selectable); -#line 1756 "LibraryWindow.c" +#line 1762 "LibraryWindow.c" } static void _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender, SidebarSelectableEntry* removed, gpointer self) { -#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_sidebar_selected_entry_removed ((LibraryWindow*) self, removed); -#line 1763 "LibraryWindow.c" +#line 1769 "LibraryWindow.c" } static void _library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender, gpointer self) { -#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_hide_extended_properties ((LibraryWindow*) self); -#line 1770 "LibraryWindow.c" +#line 1776 "LibraryWindow.c" } static void _library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender, gpointer self) { -#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_show_extended_properties ((LibraryWindow*) self); -#line 1777 "LibraryWindow.c" +#line 1783 "LibraryWindow.c" } static void _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) { -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_trashcan_contents_altered ((LibraryWindow*) self); -#line 1784 "LibraryWindow.c" +#line 1790 "LibraryWindow.c" } static void _library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { -#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_media_altered ((LibraryWindow*) self); -#line 1791 "LibraryWindow.c" +#line 1797 "LibraryWindow.c" } static void _library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender, guint completed, guint total, gpointer self) { -#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_metadata_writer_progress ((LibraryWindow*) self, completed, total); -#line 1798 "LibraryWindow.c" +#line 1804 "LibraryWindow.c" } static void _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) { -#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_installed ((LibraryWindow*) self, monitor); -#line 1805 "LibraryWindow.c" +#line 1811 "LibraryWindow.c" } static void _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) { -#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_destroyed ((LibraryWindow*) self, monitor); -#line 1812 "LibraryWindow.c" +#line 1818 "LibraryWindow.c" } static void _library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) { -#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_camera_added ((LibraryWindow*) self, camera); -#line 1819 "LibraryWindow.c" +#line 1825 "LibraryWindow.c" } @@ -1844,121 +1850,121 @@ GType library_window_target_type_get_type (void) { static void _library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_file_import ((LibraryWindow*) self); -#line 1850 "LibraryWindow.c" +#line 1856 "LibraryWindow.c" } static void _library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_external_library_import ((LibraryWindow*) self); -#line 1857 "LibraryWindow.c" +#line 1863 "LibraryWindow.c" } static void _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_preferences ((LibraryWindow*) self); -#line 1864 "LibraryWindow.c" +#line 1870 "LibraryWindow.c" } static void _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_empty_trash ((LibraryWindow*) self); -#line 1871 "LibraryWindow.c" +#line 1877 "LibraryWindow.c" } static void _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_jump_to_event ((LibraryWindow*) self); -#line 1878 "LibraryWindow.c" +#line 1884 "LibraryWindow.c" } static void _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_find ((LibraryWindow*) self); -#line 1885 "LibraryWindow.c" +#line 1891 "LibraryWindow.c" } static void _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_new_search ((LibraryWindow*) self); -#line 1892 "LibraryWindow.c" +#line 1898 "LibraryWindow.c" } static void _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_action_toggle ((LibraryWindow*) self, action, parameter); -#line 1899 "LibraryWindow.c" +#line 1905 "LibraryWindow.c" } static void _library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { -#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_display_basic_properties ((LibraryWindow*) self, action, value); -#line 1906 "LibraryWindow.c" +#line 1912 "LibraryWindow.c" } static void _library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { -#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_display_extended_properties ((LibraryWindow*) self, action, value); -#line 1913 "LibraryWindow.c" +#line 1919 "LibraryWindow.c" } static void _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { -#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_display_searchbar ((LibraryWindow*) self, action, value); -#line 1920 "LibraryWindow.c" +#line 1926 "LibraryWindow.c" } static void _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { -#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_display_sidebar ((LibraryWindow*) self, action, value); -#line 1927 "LibraryWindow.c" +#line 1933 "LibraryWindow.c" } static void _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { -#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_display_toolbar ((LibraryWindow*) self, action, value); -#line 1934 "LibraryWindow.c" +#line 1940 "LibraryWindow.c" } static void _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { -#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_action_radio ((LibraryWindow*) self, action, parameter); -#line 1941 "LibraryWindow.c" +#line 1947 "LibraryWindow.c" } static void _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) { -#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_events_sort_changed ((LibraryWindow*) self, action, value); -#line 1948 "LibraryWindow.c" +#line 1954 "LibraryWindow.c" } static void _library_window_external_drop_handler_sidebar_tree_external_drop_handler (GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time, gpointer self) { -#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_external_drop_handler ((LibraryWindow*) self, context, entry, data, info, time); -#line 1955 "LibraryWindow.c" +#line 1961 "LibraryWindow.c" } static void _library_window_on_update_properties_now_one_shot_callback (gpointer self) { -#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties_now ((LibraryWindow*) self); -#line 1962 "LibraryWindow.c" +#line 1968 "LibraryWindow.c" } @@ -2015,117 +2021,117 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog CameraTable* _tmp56_ = NULL; CameraTable* _tmp57_ = NULL; GtkProgressBar* _tmp58_ = NULL; -#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = (LibraryWindow*) app_window_construct (object_type); -#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = sidebar_tree_new (LIBRARY_WINDOW_DND_TARGET_ENTRIES, G_N_ELEMENTS (LIBRARY_WINDOW_DND_TARGET_ENTRIES), GDK_ACTION_ASK, _library_window_external_drop_handler_sidebar_tree_external_drop_handler, self); -#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp0_); -#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->sidebar_tree); -#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->sidebar_tree = _tmp0_; -#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->sidebar_tree; -#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp1_, "page-created", (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self, 0); #line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_connect_object (_tmp1_, "page-created", (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self, 0); +#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->sidebar_tree; -#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp2_, "destroying-page", (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self, 0); #line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_connect_object (_tmp2_, "destroying-page", (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self, 0); +#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->sidebar_tree; -#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp3_, "entry-selected", (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self, 0); #line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_connect_object (_tmp3_, "entry-selected", (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self, 0); +#line 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->sidebar_tree; -#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp4_, "selected-entry-removed", (GCallback) _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed, self, 0); -#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = self->priv->sidebar_tree; -#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->library_branch; -#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sidebar_tree_graft (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_LIBRARY); #line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + sidebar_tree_graft (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_LIBRARY); +#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = self->priv->sidebar_tree; -#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = self->priv->tags_branch; -#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sidebar_tree_graft (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_TAGS); #line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + sidebar_tree_graft (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_TAGS); +#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->sidebar_tree; -#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = self->priv->folders_branch; -#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sidebar_tree_graft (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_FOLDERS); #line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + sidebar_tree_graft (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_FOLDERS); +#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = self->priv->sidebar_tree; -#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = self->priv->events_branch; -#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sidebar_tree_graft (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_EVENTS); #line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + sidebar_tree_graft (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_EVENTS); +#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = self->priv->sidebar_tree; -#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = self->priv->camera_branch; -#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - sidebar_tree_graft (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_CAMERAS); #line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + sidebar_tree_graft (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_CAMERAS); +#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = self->priv->sidebar_tree; -#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = self->priv->saved_search_branch; -#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_graft (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_SAVED_SEARCH); -#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = extended_properties_window_new (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow)); -#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp17_); -#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->extended_properties); -#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->extended_properties = _tmp17_; #line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->extended_properties = _tmp17_; +#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = self->priv->extended_properties; -#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), "hide", (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self, 0); #line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), "hide", (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self, 0); +#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = self->priv->extended_properties; -#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), "show", (GCallback) _library_window_show_extended_properties_gtk_widget_show, self, 0); -#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = one_shot_scheduler_new ("LibraryWindow properties", _library_window_on_update_properties_now_one_shot_callback, self); -#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _one_shot_scheduler_unref0 (self->priv->properties_scheduler); -#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->properties_scheduler = _tmp20_; -#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = self->priv->search_actions; -#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = search_filter_toolbar_new (_tmp21_); -#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp22_); -#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->search_toolbar); -#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->search_toolbar = _tmp22_; -#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = self->priv->library_branch; -#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = library_branch_get_photos_entry (_tmp23_); -#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = _tmp24_; -#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = _tmp26_; -#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_create_layout (self, _tmp27_); -#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp27_); -#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_load_configuration (self); -#line 2129 "LibraryWindow.c" +#line 2135 "LibraryWindow.c" { GeeIterator* _media_sources_it = NULL; MediaCollectionRegistry* _tmp28_ = NULL; @@ -2134,27 +2140,27 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog GeeCollection* _tmp31_ = NULL; GeeIterator* _tmp32_ = NULL; GeeIterator* _tmp33_ = NULL; -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = media_collection_registry_get_instance (); -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = _tmp28_; -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp30_ = media_collection_registry_get_all (_tmp29_); -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = _tmp30_; -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = _tmp32_; -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp31_); -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _media_collection_registry_unref0 (_tmp29_); -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _media_sources_it = _tmp33_; -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" while (TRUE) { -#line 2158 "LibraryWindow.c" +#line 2164 "LibraryWindow.c" GeeIterator* _tmp34_ = NULL; gboolean _tmp35_ = FALSE; MediaSourceCollection* media_sources = NULL; @@ -2162,176 +2168,176 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog gpointer _tmp37_ = NULL; MediaSourceCollection* _tmp38_ = NULL; MediaSourceCollection* _tmp39_ = NULL; -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = _media_sources_it; -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp35_ = gee_iterator_next (_tmp34_); -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp35_) { -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 2174 "LibraryWindow.c" +#line 2180 "LibraryWindow.c" } -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp36_ = _media_sources_it; -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp37_ = gee_iterator_get (_tmp36_); -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - media_sources = (MediaSourceCollection*) _tmp37_; #line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + media_sources = (MediaSourceCollection*) _tmp37_; +#line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp38_ = media_sources; -#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp38_, "trashcan-contents-altered", (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0); #line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_connect_object (_tmp38_, "trashcan-contents-altered", (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0); +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp39_ = media_sources; -#line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_media_altered_data_collection_items_altered, self, 0); -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (media_sources); -#line 2192 "LibraryWindow.c" +#line 2198 "LibraryWindow.c" } -#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_media_sources_it); -#line 2196 "LibraryWindow.c" +#line 2202 "LibraryWindow.c" } -#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp40_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_URI_LIST]; -#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp41_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST]; -#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp42_ = g_new0 (GtkTargetEntry, 2); -#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp42_[0] = _tmp40_; -#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp42_[1] = _tmp41_; -#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" main_window_dnd_targets = _tmp42_; -#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" main_window_dnd_targets_length1 = 2; -#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _main_window_dnd_targets_size_ = main_window_dnd_targets_length1; -#line 196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp43_ = main_window_dnd_targets; -#line 196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp43__length1 = main_window_dnd_targets_length1; -#line 196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_drag_dest_set (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), GTK_DEST_DEFAULT_ALL, _tmp43_, _tmp43__length1, (GDK_ACTION_COPY | GDK_ACTION_LINK) | GDK_ACTION_ASK); -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp44_ = metadata_writer_get_instance (); -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp45_ = _tmp44_; -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp45_, "progress", (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self, 0); -#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp45_); -#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp46_ = library_monitor_pool_get_instance (); -#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp47_ = _tmp46_; -#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp48_ = library_monitor_pool_get_monitor (_tmp47_); -#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp49_ = _tmp48_; -#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _library_monitor_pool_unref0 (_tmp47_); -#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - monitor = _tmp49_; #line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + monitor = _tmp49_; +#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp50_ = monitor; -#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp50_ != NULL) { -#line 2244 "LibraryWindow.c" +#line 2250 "LibraryWindow.c" LibraryMonitor* _tmp51_ = NULL; -#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp51_ = monitor; -#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_installed (self, _tmp51_); -#line 2250 "LibraryWindow.c" +#line 2256 "LibraryWindow.c" } -#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp52_ = library_monitor_pool_get_instance (); -#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp53_ = _tmp52_; -#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp53_, "monitor-installed", (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self, 0); -#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _library_monitor_pool_unref0 (_tmp53_); #line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _library_monitor_pool_unref0 (_tmp53_); +#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp54_ = library_monitor_pool_get_instance (); -#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp55_ = _tmp54_; -#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp55_, "monitor-destroyed", (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self, 0); -#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _library_monitor_pool_unref0 (_tmp55_); -#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp56_ = camera_table_get_instance (); -#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp57_ = _tmp56_; -#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp57_, "camera-added", (GCallback) _library_window_on_camera_added_camera_table_camera_added, self, 0); -#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _camera_table_unref0 (_tmp57_); -#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp58_ = self->priv->background_progress_bar; -#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_set_show_text (_tmp58_, TRUE); -#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (monitor); -#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" main_window_dnd_targets = (g_free (main_window_dnd_targets), NULL); -#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return self; -#line 2286 "LibraryWindow.c" +#line 2292 "LibraryWindow.c" } LibraryWindow* library_window_new (ProgressMonitor progress_monitor, void* progress_monitor_target) { -#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return library_window_construct (TYPE_LIBRARY_WINDOW, progress_monitor, progress_monitor_target); -#line 2293 "LibraryWindow.c" +#line 2299 "LibraryWindow.c" } static void _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender, gpointer self) { -#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_discovery_started ((LibraryWindow*) self); -#line 2300 "LibraryWindow.c" +#line 2306 "LibraryWindow.c" } static void _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) { -#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self); -#line 2307 "LibraryWindow.c" +#line 2313 "LibraryWindow.c" } static void _library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender, gpointer self) { -#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self); -#line 2314 "LibraryWindow.c" +#line 2320 "LibraryWindow.c" } static void _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress (LibraryMonitor* _sender, gint completed_files, gint total_files, gpointer self) { -#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_auto_update_progress ((LibraryWindow*) self, completed_files, total_files); -#line 2321 "LibraryWindow.c" +#line 2327 "LibraryWindow.c" } static void _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender, gpointer self) { -#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_auto_import_preparing ((LibraryWindow*) self); -#line 2328 "LibraryWindow.c" +#line 2334 "LibraryWindow.c" } static void _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress (LibraryMonitor* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) { -#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_auto_import_progress ((LibraryWindow*) self, completed_bytes, total_bytes); -#line 2335 "LibraryWindow.c" +#line 2341 "LibraryWindow.c" } @@ -2347,51 +2353,51 @@ static void library_window_on_library_monitor_installed (LibraryWindow* self, Li LibraryMonitor* _tmp8_ = NULL; LibraryMonitor* _tmp9_ = NULL; LibraryMonitor* _tmp10_ = NULL; -#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_return_if_fail (IS_LIBRARY_MONITOR (monitor)); #line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_return_if_fail (IS_LIBRARY_MONITOR (monitor)); +#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = monitor; -#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor)); -#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = g_file_get_path (_tmp2_); -#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp3_; -#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:243: on_library_monitor_installed: %s", _tmp4_); -#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:244: on_library_monitor_installed: %s", _tmp4_); +#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp4_); -#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = monitor; -#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-started", (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self, 0); #line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-started", (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self, 0); +#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = monitor; -#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self, 0); #line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self, 0); +#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = monitor; -#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "closed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self, 0); #line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "closed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self, 0); +#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = monitor; -#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp8_, "auto-update-progress", (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self, 0); #line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_connect_object (_tmp8_, "auto-update-progress", (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self, 0); +#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = monitor; -#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_connect_object (_tmp9_, "auto-import-preparing", (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self, 0); #line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_connect_object (_tmp9_, "auto-import-preparing", (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self, 0); +#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = monitor; -#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp10_, "auto-import-progress", (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self, 0); -#line 2395 "LibraryWindow.c" +#line 2401 "LibraryWindow.c" } @@ -2413,63 +2419,84 @@ static void library_window_on_library_monitor_destroyed (LibraryWindow* self, Li guint _tmp14_ = 0U; LibraryMonitor* _tmp15_ = NULL; guint _tmp16_ = 0U; -#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_return_if_fail (IS_LIBRARY_MONITOR (monitor)); #line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_return_if_fail (IS_LIBRARY_MONITOR (monitor)); +#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = monitor; -#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor)); -#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = g_file_get_path (_tmp2_); -#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp3_; -#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:254: on_library_monitor_destroyed: %s", _tmp4_); -#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:255: on_library_monitor_destroyed: %s", _tmp4_); +#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp4_); -#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = monitor; -#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("discovery-started", TYPE_DIRECTORY_MONITOR, &_tmp6_, NULL, FALSE); -#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self); #line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self); +#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = monitor; -#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("discovery-completed", TYPE_DIRECTORY_MONITOR, &_tmp8_, NULL, FALSE); -#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self); #line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self); +#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = monitor; -#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("closed", TYPE_DIRECTORY_MONITOR, &_tmp10_, NULL, FALSE); -#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self); #line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self); +#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = monitor; -#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("auto-update-progress", TYPE_LIBRARY_MONITOR, &_tmp12_, NULL, FALSE); -#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self); #line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self); +#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = monitor; -#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("auto-import-preparing", TYPE_LIBRARY_MONITOR, &_tmp14_, NULL, FALSE); -#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self); #line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self); +#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = monitor; -#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("auto-import-progress", TYPE_LIBRARY_MONITOR, &_tmp16_, NULL, FALSE); -#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self); -#line 2473 "LibraryWindow.c" +#line 2479 "LibraryWindow.c" +} + + +static GVariant* _variant_new1 (gboolean value) { +#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + return g_variant_ref_sink (g_variant_new_boolean (value)); +#line 2486 "LibraryWindow.c" +} + + +static GVariant* _variant_new2 (gboolean value) { +#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + return g_variant_ref_sink (g_variant_new_boolean (value)); +#line 2493 "LibraryWindow.c" +} + + +static GVariant* _variant_new3 (gboolean value) { +#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + return g_variant_ref_sink (g_variant_new_boolean (value)); +#line 2500 "LibraryWindow.c" } @@ -2479,35 +2506,82 @@ static void library_window_real_add_actions (AppWindow* base) { gint _tmp1_ = 0; GActionEntry* _tmp2_ = NULL; SearchFilterActions* _tmp3_ = NULL; -#line 290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + GAction* _tmp4_ = NULL; + ConfigFacade* _tmp5_ = NULL; + ConfigFacade* _tmp6_ = NULL; + gboolean _tmp7_ = FALSE; + GVariant* _tmp8_ = NULL; + GAction* _tmp9_ = NULL; + gboolean _tmp10_ = FALSE; + GVariant* _tmp11_ = NULL; + GAction* _tmp12_ = NULL; + gboolean _tmp13_ = FALSE; + GVariant* _tmp14_ = NULL; +#line 286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" APP_WINDOW_CLASS (library_window_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)); -#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), LIBRARY_WINDOW_common_actions, G_N_ELEMENTS (LIBRARY_WINDOW_common_actions), self); -#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->search_actions; -#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = search_filter_actions_get_actions (_tmp0_, &_tmp1_); -#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->search_actions; -#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), _tmp2_, _tmp1_, _tmp3_); -#line 2497 "LibraryWindow.c" +#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp4_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar"); +#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp5_ = config_facade_get_instance (); +#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp6_ = _tmp5_; +#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp7_ = configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); +#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp8_ = _variant_new1 (_tmp7_); +#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_action_change_state (_tmp4_, _tmp8_); +#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_variant_unref0 (_tmp8_); +#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (_tmp6_); +#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp9_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySidebar"); +#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp10_ = library_window_is_sidebar_visible (self); +#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp11_ = _variant_new2 (_tmp10_); +#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_action_change_state (_tmp9_, _tmp11_); +#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_variant_unref0 (_tmp11_); +#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp12_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayToolbar"); +#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp13_ = library_window_is_toolbar_visible (self); +#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp14_ = _variant_new3 (_tmp13_); +#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_action_change_state (_tmp12_, _tmp14_); +#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_variant_unref0 (_tmp14_); +#line 2571 "LibraryWindow.c" } static void _library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender, ViewFilter* filer, gpointer self) { #line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_view_filter_installed ((LibraryWindow*) self, filer); -#line 2504 "LibraryWindow.c" +#line 2578 "LibraryWindow.c" } static void _library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender, ViewFilter* filer, gpointer self) { #line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_view_filter_removed ((LibraryWindow*) self, filer); -#line 2511 "LibraryWindow.c" +#line 2585 "LibraryWindow.c" } @@ -2536,7 +2610,7 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page _tmp2_ = old_page; #line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_ != NULL) { -#line 2540 "LibraryWindow.c" +#line 2614 "LibraryWindow.c" Page* _tmp3_ = NULL; ViewCollection* _tmp4_ = NULL; ViewCollection* _tmp5_ = NULL; @@ -2569,13 +2643,13 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self); #line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp9_); -#line 2573 "LibraryWindow.c" +#line 2647 "LibraryWindow.c" } #line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = new_page; #line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp11_ != NULL) { -#line 2579 "LibraryWindow.c" +#line 2653 "LibraryWindow.c" Page* _tmp12_ = NULL; ViewCollection* _tmp13_ = NULL; ViewCollection* _tmp14_ = NULL; @@ -2602,7 +2676,7 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page g_signal_connect_object (_tmp17_, "view-filter-removed", (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self, 0); #line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp17_); -#line 2606 "LibraryWindow.c" +#line 2680 "LibraryWindow.c" } #line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = self->priv->search_actions; @@ -2612,14 +2686,14 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page _tmp20_ = new_page; #line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_filter_actions_monitor_page_contents (_tmp18_, _tmp19_, _tmp20_); -#line 2616 "LibraryWindow.c" +#line 2690 "LibraryWindow.c" } static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender, gpointer self) { #line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_view_filter_refreshed ((LibraryWindow*) self); -#line 2623 "LibraryWindow.c" +#line 2697 "LibraryWindow.c" } @@ -2633,7 +2707,7 @@ static void library_window_on_view_filter_installed (LibraryWindow* self, ViewFi _tmp0_ = filter; #line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (_tmp0_, "refresh", (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self, 0); -#line 2637 "LibraryWindow.c" +#line 2711 "LibraryWindow.c" } @@ -2650,21 +2724,21 @@ static void library_window_on_view_filter_removed (LibraryWindow* self, ViewFilt g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp1_, NULL, FALSE); #line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self); -#line 2654 "LibraryWindow.c" +#line 2728 "LibraryWindow.c" } static gpointer _g_object_ref0 (gpointer self) { #line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return self ? g_object_ref (self) : NULL; -#line 2661 "LibraryWindow.c" +#line 2735 "LibraryWindow.c" } -static GVariant* _variant_new1 (gboolean value) { +static GVariant* _variant_new4 (gboolean value) { #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 2668 "LibraryWindow.c" +#line 2742 "LibraryWindow.c" } @@ -2701,7 +2775,7 @@ static void library_window_on_view_filter_refreshed (LibraryWindow* self) { if (_tmp5_) { #line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 2705 "LibraryWindow.c" +#line 2779 "LibraryWindow.c" } #line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar"); @@ -2713,22 +2787,22 @@ static void library_window_on_view_filter_refreshed (LibraryWindow* self) { _tmp8_ = action; #line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_ != NULL) { -#line 2717 "LibraryWindow.c" +#line 2791 "LibraryWindow.c" GAction* _tmp9_ = NULL; GVariant* _tmp10_ = NULL; #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = action; #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = _variant_new1 (TRUE); + _tmp10_ = _variant_new4 (TRUE); #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (_tmp9_, _tmp10_); #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp10_); -#line 2728 "LibraryWindow.c" +#line 2802 "LibraryWindow.c" } #line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (action); -#line 2732 "LibraryWindow.c" +#line 2806 "LibraryWindow.c" } @@ -2786,13 +2860,13 @@ static void library_window_real_show_all (GtkWidget* base) { _g_variant_unref0 (_tmp7_); #line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp9_) { -#line 2790 "LibraryWindow.c" +#line 2864 "LibraryWindow.c" GtkFrame* _tmp10_ = NULL; #line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = self->priv->bottom_frame; #line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget)); -#line 2796 "LibraryWindow.c" +#line 2870 "LibraryWindow.c" } #line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); @@ -2802,7 +2876,7 @@ static void library_window_real_show_all (GtkWidget* base) { if (_tmp12_ == NULL) { #line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp11_); -#line 2806 "LibraryWindow.c" +#line 2880 "LibraryWindow.c" } #line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" current_page = _tmp12_; @@ -2810,13 +2884,13 @@ static void library_window_real_show_all (GtkWidget* base) { _tmp13_ = current_page; #line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_ != NULL) { -#line 2814 "LibraryWindow.c" +#line 2888 "LibraryWindow.c" CheckerboardPage* _tmp14_ = NULL; #line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = current_page; #line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_init_view_filter (self, _tmp14_); -#line 2820 "LibraryWindow.c" +#line 2894 "LibraryWindow.c" } #line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = library_window_should_show_search_bar (self); @@ -2832,7 +2906,7 @@ static void library_window_real_show_all (GtkWidget* base) { _g_object_unref0 (current_page); #line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (basic_properties_action); -#line 2836 "LibraryWindow.c" +#line 2910 "LibraryWindow.c" } @@ -2853,7 +2927,7 @@ LibraryWindow* library_window_get_app (void) { result = _tmp2_; #line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 2857 "LibraryWindow.c" +#line 2931 "LibraryWindow.c" } @@ -2861,7 +2935,7 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) { gboolean result = FALSE; #line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (uri != NULL, FALSE); -#line 2865 "LibraryWindow.c" +#line 2939 "LibraryWindow.c" { const gchar** scheme_collection = NULL; gint scheme_collection_length1 = 0; @@ -2873,14 +2947,14 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) { scheme_collection_length1 = G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES); #line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" for (scheme_it = 0; scheme_it < G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES); scheme_it = scheme_it + 1) { -#line 2877 "LibraryWindow.c" +#line 2951 "LibraryWindow.c" gchar* _tmp0_ = NULL; gchar* scheme = NULL; #line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = g_strdup (scheme_collection[scheme_it]); #line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" scheme = _tmp0_; -#line 2884 "LibraryWindow.c" +#line 2958 "LibraryWindow.c" { const gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; @@ -2899,11 +2973,11 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) { _g_free0 (scheme); #line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 2903 "LibraryWindow.c" +#line 2977 "LibraryWindow.c" } #line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (scheme); -#line 2907 "LibraryWindow.c" +#line 2981 "LibraryWindow.c" } } } @@ -2911,7 +2985,7 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) { result = FALSE; #line 369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 2915 "LibraryWindow.c" +#line 2989 "LibraryWindow.c" } @@ -2927,7 +3001,7 @@ static gchar* library_window_real_get_app_role (AppWindow* base) { result = _tmp0_; #line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 2931 "LibraryWindow.c" +#line 3005 "LibraryWindow.c" } @@ -2953,7 +3027,7 @@ void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) { _tmp3_ = entry; #line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 2957 "LibraryWindow.c" +#line 3031 "LibraryWindow.c" SidebarTree* _tmp4_ = NULL; TagsSidebarEntry* _tmp5_ = NULL; #line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -2962,15 +3036,15 @@ void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) { _tmp5_ = entry; #line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 2966 "LibraryWindow.c" +#line 3040 "LibraryWindow.c" } else { #line 381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_debug ("LibraryWindow.vala:381: No tag entry found for rename"); -#line 2970 "LibraryWindow.c" +#line 3044 "LibraryWindow.c" } #line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 2974 "LibraryWindow.c" +#line 3048 "LibraryWindow.c" } @@ -2996,7 +3070,7 @@ void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event) _tmp3_ = entry; #line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 3000 "LibraryWindow.c" +#line 3074 "LibraryWindow.c" SidebarTree* _tmp4_ = NULL; EventsEventEntry* _tmp5_ = NULL; #line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3005,15 +3079,15 @@ void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event) _tmp5_ = entry; #line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 3009 "LibraryWindow.c" +#line 3083 "LibraryWindow.c" } else { #line 389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_debug ("LibraryWindow.vala:389: No event entry found for rename"); -#line 3013 "LibraryWindow.c" +#line 3087 "LibraryWindow.c" } #line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 3017 "LibraryWindow.c" +#line 3091 "LibraryWindow.c" } @@ -3039,7 +3113,7 @@ void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch* _tmp3_ = entry; #line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 3043 "LibraryWindow.c" +#line 3117 "LibraryWindow.c" SidebarTree* _tmp4_ = NULL; SearchesSidebarEntry* _tmp5_ = NULL; #line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3048,15 +3122,15 @@ void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch* _tmp5_ = entry; #line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 3052 "LibraryWindow.c" +#line 3126 "LibraryWindow.c" } else { #line 397 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_debug ("LibraryWindow.vala:397: No search entry found for rename"); -#line 3056 "LibraryWindow.c" +#line 3130 "LibraryWindow.c" } #line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 3060 "LibraryWindow.c" +#line 3134 "LibraryWindow.c" } @@ -3101,7 +3175,7 @@ static void library_window_real_on_quit (AppWindow* base) { _g_object_unref0 (_tmp5_); #line 405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" APP_WINDOW_CLASS (library_window_parent_class)->on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)); -#line 3105 "LibraryWindow.c" +#line 3179 "LibraryWindow.c" } @@ -3134,7 +3208,7 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co _tmp4_ = view_collection_get_selected_count (_tmp3_); #line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_ > 0) { -#line 3138 "LibraryWindow.c" +#line 3212 "LibraryWindow.c" ViewCollection* _tmp5_ = NULL; GeeList* _tmp6_ = NULL; #line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3145,7 +3219,7 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co _g_object_unref0 (_tmp2_); #line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp6_; -#line 3149 "LibraryWindow.c" +#line 3223 "LibraryWindow.c" } else { ViewCollection* _tmp7_ = NULL; GeeList* _tmp8_ = NULL; @@ -3157,7 +3231,7 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co _g_object_unref0 (_tmp2_); #line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp8_; -#line 3161 "LibraryWindow.c" +#line 3235 "LibraryWindow.c" } #line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _g_object_ref0 (_tmp2_); @@ -3167,7 +3241,7 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co _tmp12_ = sources; #line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp12_ != NULL) { -#line 3171 "LibraryWindow.c" +#line 3245 "LibraryWindow.c" GeeList* _tmp13_ = NULL; gint _tmp14_ = 0; gint _tmp15_ = 0; @@ -3179,15 +3253,15 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co _tmp15_ = _tmp14_; #line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = _tmp15_ != 0; -#line 3183 "LibraryWindow.c" +#line 3257 "LibraryWindow.c" } else { #line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = FALSE; -#line 3187 "LibraryWindow.c" +#line 3261 "LibraryWindow.c" } #line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp11_) { -#line 3191 "LibraryWindow.c" +#line 3265 "LibraryWindow.c" GeeList* _tmp16_ = NULL; gpointer _tmp17_ = NULL; #line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -3198,13 +3272,13 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co _g_object_unref0 (_tmp10_); #line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp17_, TYPE_PHOTO, Photo); -#line 3202 "LibraryWindow.c" +#line 3276 "LibraryWindow.c" } else { #line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp10_); #line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = NULL; -#line 3208 "LibraryWindow.c" +#line 3282 "LibraryWindow.c" } #line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp10_; @@ -3216,7 +3290,7 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co _data_collection_unref0 (view); #line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3220 "LibraryWindow.c" +#line 3294 "LibraryWindow.c" } @@ -3248,7 +3322,7 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* _tmp0_ = page; #line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_COLLECTION_PAGE)) { -#line 3252 "LibraryWindow.c" +#line 3326 "LibraryWindow.c" Page* _tmp1_ = NULL; CollectionPage* _tmp2_ = NULL; Photo* photo = NULL; @@ -3283,35 +3357,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3287 "LibraryWindow.c" +#line 3361 "LibraryWindow.c" } else { #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3291 "LibraryWindow.c" +#line 3365 "LibraryWindow.c" } #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3297 "LibraryWindow.c" +#line 3371 "LibraryWindow.c" } else { #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3301 "LibraryWindow.c" +#line 3375 "LibraryWindow.c" } #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3307 "LibraryWindow.c" +#line 3381 "LibraryWindow.c" } else { #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3311 "LibraryWindow.c" +#line 3385 "LibraryWindow.c" } #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3315 "LibraryWindow.c" +#line 3389 "LibraryWindow.c" } #line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = photo; @@ -3333,41 +3407,41 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3337 "LibraryWindow.c" +#line 3411 "LibraryWindow.c" } else { #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3341 "LibraryWindow.c" +#line 3415 "LibraryWindow.c" } #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3347 "LibraryWindow.c" +#line 3421 "LibraryWindow.c" } else { #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3351 "LibraryWindow.c" +#line 3425 "LibraryWindow.c" } #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3357 "LibraryWindow.c" +#line 3431 "LibraryWindow.c" } else { #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3361 "LibraryWindow.c" +#line 3435 "LibraryWindow.c" } #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3365 "LibraryWindow.c" +#line 3439 "LibraryWindow.c" } #line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = page; #line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENTS_DIRECTORY_PAGE)) { -#line 3371 "LibraryWindow.c" +#line 3445 "LibraryWindow.c" ViewCollection* view = NULL; Page* _tmp9_ = NULL; ViewCollection* _tmp10_ = NULL; @@ -3413,35 +3487,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3417 "LibraryWindow.c" +#line 3491 "LibraryWindow.c" } else { #line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3421 "LibraryWindow.c" +#line 3495 "LibraryWindow.c" } #line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3427 "LibraryWindow.c" +#line 3501 "LibraryWindow.c" } else { #line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3431 "LibraryWindow.c" +#line 3505 "LibraryWindow.c" } #line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3437 "LibraryWindow.c" +#line 3511 "LibraryWindow.c" } else { #line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3441 "LibraryWindow.c" +#line 3515 "LibraryWindow.c" } #line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3445 "LibraryWindow.c" +#line 3519 "LibraryWindow.c" } #line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = view; @@ -3471,35 +3545,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3475 "LibraryWindow.c" +#line 3549 "LibraryWindow.c" } else { #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3479 "LibraryWindow.c" +#line 3553 "LibraryWindow.c" } #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3485 "LibraryWindow.c" +#line 3559 "LibraryWindow.c" } else { #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3489 "LibraryWindow.c" +#line 3563 "LibraryWindow.c" } #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3495 "LibraryWindow.c" +#line 3569 "LibraryWindow.c" } else { #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3499 "LibraryWindow.c" +#line 3573 "LibraryWindow.c" } #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3503 "LibraryWindow.c" +#line 3577 "LibraryWindow.c" } #line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = self->priv->events_branch; @@ -3525,35 +3599,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3529 "LibraryWindow.c" +#line 3603 "LibraryWindow.c" } else { #line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3533 "LibraryWindow.c" +#line 3607 "LibraryWindow.c" } #line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3539 "LibraryWindow.c" +#line 3613 "LibraryWindow.c" } else { #line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3543 "LibraryWindow.c" +#line 3617 "LibraryWindow.c" } #line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3549 "LibraryWindow.c" +#line 3623 "LibraryWindow.c" } else { #line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3553 "LibraryWindow.c" +#line 3627 "LibraryWindow.c" } #line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3557 "LibraryWindow.c" +#line 3631 "LibraryWindow.c" } #line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = entry; @@ -3587,35 +3661,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3591 "LibraryWindow.c" +#line 3665 "LibraryWindow.c" } else { #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3595 "LibraryWindow.c" +#line 3669 "LibraryWindow.c" } #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3601 "LibraryWindow.c" +#line 3675 "LibraryWindow.c" } else { #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3605 "LibraryWindow.c" +#line 3679 "LibraryWindow.c" } #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3611 "LibraryWindow.c" +#line 3685 "LibraryWindow.c" } else { #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3615 "LibraryWindow.c" +#line 3689 "LibraryWindow.c" } #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3619 "LibraryWindow.c" +#line 3693 "LibraryWindow.c" } #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = photo; @@ -3643,41 +3717,41 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3647 "LibraryWindow.c" +#line 3721 "LibraryWindow.c" } else { #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3651 "LibraryWindow.c" +#line 3725 "LibraryWindow.c" } #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3657 "LibraryWindow.c" +#line 3731 "LibraryWindow.c" } else { #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3661 "LibraryWindow.c" +#line 3735 "LibraryWindow.c" } #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3667 "LibraryWindow.c" +#line 3741 "LibraryWindow.c" } else { #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3671 "LibraryWindow.c" +#line 3745 "LibraryWindow.c" } #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3675 "LibraryWindow.c" +#line 3749 "LibraryWindow.c" } #line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp30_ = page; #line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO_PAGE)) { -#line 3681 "LibraryWindow.c" +#line 3755 "LibraryWindow.c" LibraryPhotoPage* photo_page = NULL; Page* _tmp31_ = NULL; LibraryPhotoPage* _tmp32_ = NULL; @@ -3719,35 +3793,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3723 "LibraryWindow.c" +#line 3797 "LibraryWindow.c" } else { #line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3727 "LibraryWindow.c" +#line 3801 "LibraryWindow.c" } #line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3733 "LibraryWindow.c" +#line 3807 "LibraryWindow.c" } else { #line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3737 "LibraryWindow.c" +#line 3811 "LibraryWindow.c" } #line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3743 "LibraryWindow.c" +#line 3817 "LibraryWindow.c" } else { #line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3747 "LibraryWindow.c" +#line 3821 "LibraryWindow.c" } #line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3751 "LibraryWindow.c" +#line 3825 "LibraryWindow.c" } #line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp36_ = photo_page; @@ -3765,35 +3839,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3769 "LibraryWindow.c" +#line 3843 "LibraryWindow.c" } else { #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3773 "LibraryWindow.c" +#line 3847 "LibraryWindow.c" } #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3779 "LibraryWindow.c" +#line 3853 "LibraryWindow.c" } else { #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3783 "LibraryWindow.c" +#line 3857 "LibraryWindow.c" } #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3789 "LibraryWindow.c" +#line 3863 "LibraryWindow.c" } else { #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3793 "LibraryWindow.c" +#line 3867 "LibraryWindow.c" } #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3797 "LibraryWindow.c" +#line 3871 "LibraryWindow.c" } #line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp38_ = controller; @@ -3829,35 +3903,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3833 "LibraryWindow.c" +#line 3907 "LibraryWindow.c" } else { #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3837 "LibraryWindow.c" +#line 3911 "LibraryWindow.c" } #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3843 "LibraryWindow.c" +#line 3917 "LibraryWindow.c" } else { #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3847 "LibraryWindow.c" +#line 3921 "LibraryWindow.c" } #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3853 "LibraryWindow.c" +#line 3927 "LibraryWindow.c" } else { #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3857 "LibraryWindow.c" +#line 3931 "LibraryWindow.c" } #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3861 "LibraryWindow.c" +#line 3935 "LibraryWindow.c" } #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; @@ -3865,35 +3939,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* if (collection) { #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *collection = _vala_collection; -#line 3869 "LibraryWindow.c" +#line 3943 "LibraryWindow.c" } else { #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_collection); -#line 3873 "LibraryWindow.c" +#line 3947 "LibraryWindow.c" } #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (start) { #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *start = _vala_start; -#line 3879 "LibraryWindow.c" +#line 3953 "LibraryWindow.c" } else { #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_vala_start); -#line 3883 "LibraryWindow.c" +#line 3957 "LibraryWindow.c" } #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (view_collection) { #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" *view_collection = _vala_view_collection; -#line 3889 "LibraryWindow.c" +#line 3963 "LibraryWindow.c" } else { #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_vala_view_collection); -#line 3893 "LibraryWindow.c" +#line 3967 "LibraryWindow.c" } #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 3897 "LibraryWindow.c" +#line 3971 "LibraryWindow.c" } @@ -3930,7 +4004,7 @@ static void library_window_real_on_fullscreen (AppWindow* base) { _g_object_unref0 (current_page); #line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 3934 "LibraryWindow.c" +#line 4008 "LibraryWindow.c" } #line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = NULL; @@ -3962,7 +4036,7 @@ static void library_window_real_on_fullscreen (AppWindow* base) { _g_object_unref0 (current_page); #line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 3966 "LibraryWindow.c" +#line 4040 "LibraryWindow.c" } #line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = collection; @@ -3990,14 +4064,14 @@ static void library_window_real_on_fullscreen (AppWindow* base) { _g_object_unref0 (collection); #line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (current_page); -#line 3994 "LibraryWindow.c" +#line 4068 "LibraryWindow.c" } static void _g_free0_ (gpointer var) { #line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" var = (g_free (var), NULL); -#line 4001 "LibraryWindow.c" +#line 4075 "LibraryWindow.c" } @@ -4006,7 +4080,7 @@ static void _g_slist_free__g_free0_ (GSList* self) { g_slist_foreach (self, (GFunc) _g_free0_, NULL); #line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_slist_free (self); -#line 4010 "LibraryWindow.c" +#line 4084 "LibraryWindow.c" } @@ -4059,7 +4133,7 @@ static void library_window_on_file_import (LibraryWindow* self) { _tmp8_ = response; #line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_ == ((gint) GTK_RESPONSE_OK)) { -#line 4063 "LibraryWindow.c" +#line 4137 "LibraryWindow.c" GtkResponseType _tmp9_ = 0; GtkFileChooserDialog* _tmp10_ = NULL; gchar* _tmp11_ = NULL; @@ -4092,14 +4166,14 @@ static void library_window_on_file_import (LibraryWindow* self) { if (_tmp16_) { #line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = GTK_RESPONSE_REJECT; -#line 4096 "LibraryWindow.c" +#line 4170 "LibraryWindow.c" } else { GtkResponseType _tmp17_ = 0; #line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = copy_files_dialog (); #line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _tmp17_; -#line 4103 "LibraryWindow.c" +#line 4177 "LibraryWindow.c" } #line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" copy_files_response = _tmp9_; @@ -4107,7 +4181,7 @@ static void library_window_on_file_import (LibraryWindow* self) { _tmp18_ = copy_files_response; #line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp18_ != GTK_RESPONSE_CANCEL) { -#line 4111 "LibraryWindow.c" +#line 4185 "LibraryWindow.c" GtkFileChooserDialog* _tmp19_ = NULL; GSList* _tmp20_ = NULL; GSList* _tmp21_ = NULL; @@ -4124,7 +4198,7 @@ static void library_window_on_file_import (LibraryWindow* self) { library_window_dispatch_import_jobs (self, _tmp21_, "folders", _tmp22_ == GTK_RESPONSE_ACCEPT); #line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" __g_slist_free__g_free0_0 (_tmp21_); -#line 4128 "LibraryWindow.c" +#line 4202 "LibraryWindow.c" } } #line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4141,7 +4215,7 @@ static void library_window_on_file_import (LibraryWindow* self) { gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget)); #line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (import_dialog); -#line 4145 "LibraryWindow.c" +#line 4219 "LibraryWindow.c" } @@ -4158,7 +4232,7 @@ static void library_window_on_external_library_import (LibraryWindow* self) { gtk_dialog_run (import_dialog); #line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (import_dialog); -#line 4162 "LibraryWindow.c" +#line 4236 "LibraryWindow.c" } @@ -4188,7 +4262,7 @@ static void library_window_real_update_common_action_availability (AppWindow* ba app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplaySearchbar", is_checkerboard); #line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonFind", is_checkerboard); -#line 4192 "LibraryWindow.c" +#line 4266 "LibraryWindow.c" } @@ -4248,7 +4322,7 @@ static void library_window_real_update_common_actions (AppWindow* base, Page* pa _g_object_unref0 (start); #line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (collection); -#line 4252 "LibraryWindow.c" +#line 4326 "LibraryWindow.c" } @@ -4260,7 +4334,7 @@ static void library_window_on_trashcan_contents_altered (LibraryWindow* self) { _tmp0_ = library_window_can_empty_trash (self); #line 558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", _tmp0_); -#line 4264 "LibraryWindow.c" +#line 4338 "LibraryWindow.c" } @@ -4279,7 +4353,7 @@ static gboolean library_window_can_empty_trash (LibraryWindow* self) { if (_tmp2_ > 0) { #line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = TRUE; -#line 4283 "LibraryWindow.c" +#line 4357 "LibraryWindow.c" } else { VideoSourceCollection* _tmp3_ = NULL; gint _tmp4_ = 0; @@ -4289,13 +4363,13 @@ static gboolean library_window_can_empty_trash (LibraryWindow* self) { _tmp4_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)); #line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _tmp4_ > 0; -#line 4293 "LibraryWindow.c" +#line 4367 "LibraryWindow.c" } #line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp0_; #line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4299 "LibraryWindow.c" +#line 4373 "LibraryWindow.c" } @@ -4354,7 +4428,7 @@ static void library_window_on_empty_trash (LibraryWindow* self) { _command_manager_unref0 (_tmp10_); #line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (to_remove); -#line 4358 "LibraryWindow.c" +#line 4432 "LibraryWindow.c" } @@ -4371,7 +4445,7 @@ static void library_window_on_new_search (LibraryWindow* self) { saved_search_dialog_show (_tmp1_); #line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _saved_search_dialog_unref0 (_tmp1_); -#line 4375 "LibraryWindow.c" +#line 4449 "LibraryWindow.c" } @@ -4404,7 +4478,7 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) { _tmp5_ = view_collection_get_selected_count (_tmp4_); #line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp5_ == 1) { -#line 4408 "LibraryWindow.c" +#line 4482 "LibraryWindow.c" DataSource* selected_source = NULL; ViewCollection* _tmp6_ = NULL; DataSource* _tmp7_ = NULL; @@ -4427,14 +4501,14 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) { _data_collection_unref0 (view); #line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4431 "LibraryWindow.c" +#line 4505 "LibraryWindow.c" } else { DataSource* _tmp9_ = NULL; #line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = selected_source; #line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_MEDIA_SOURCE)) { -#line 4438 "LibraryWindow.c" +#line 4512 "LibraryWindow.c" ViewCollection* _tmp10_ = NULL; DataSource* _tmp11_ = NULL; MediaSource* _tmp12_ = NULL; @@ -4465,7 +4539,7 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) { _data_collection_unref0 (view); #line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4469 "LibraryWindow.c" +#line 4543 "LibraryWindow.c" } else { #line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; @@ -4475,12 +4549,12 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) { _data_collection_unref0 (view); #line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4479 "LibraryWindow.c" +#line 4553 "LibraryWindow.c" } } #line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (selected_source); -#line 4484 "LibraryWindow.c" +#line 4558 "LibraryWindow.c" } else { #line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; @@ -4488,11 +4562,11 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) { _data_collection_unref0 (view); #line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4492 "LibraryWindow.c" +#line 4566 "LibraryWindow.c" } #line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 4496 "LibraryWindow.c" +#line 4570 "LibraryWindow.c" } @@ -4537,7 +4611,7 @@ static void library_window_on_jump_to_event (LibraryWindow* self) { _data_collection_unref0 (view); #line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 4541 "LibraryWindow.c" +#line 4615 "LibraryWindow.c" } #line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = view; @@ -4549,7 +4623,7 @@ static void library_window_on_jump_to_event (LibraryWindow* self) { if (_tmp8_ == NULL) { #line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp7_); -#line 4553 "LibraryWindow.c" +#line 4627 "LibraryWindow.c" } #line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" media = _tmp8_; @@ -4563,7 +4637,7 @@ static void library_window_on_jump_to_event (LibraryWindow* self) { _data_collection_unref0 (view); #line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 4567 "LibraryWindow.c" +#line 4641 "LibraryWindow.c" } #line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = media; @@ -4577,7 +4651,7 @@ static void library_window_on_jump_to_event (LibraryWindow* self) { _g_object_unref0 (_tmp12_); #line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_) { -#line 4581 "LibraryWindow.c" +#line 4655 "LibraryWindow.c" MediaSource* _tmp14_ = NULL; Event* _tmp15_ = NULL; Event* _tmp16_ = NULL; @@ -4591,20 +4665,20 @@ static void library_window_on_jump_to_event (LibraryWindow* self) { library_window_switch_to_event (self, _tmp16_); #line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp16_); -#line 4595 "LibraryWindow.c" +#line 4669 "LibraryWindow.c" } #line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (media); #line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 4601 "LibraryWindow.c" +#line 4675 "LibraryWindow.c" } -static GVariant* _variant_new2 (gboolean value) { +static GVariant* _variant_new5 (gboolean value) { #line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 4608 "LibraryWindow.c" +#line 4682 "LibraryWindow.c" } @@ -4623,7 +4697,7 @@ static void library_window_on_find (LibraryWindow* self) { #line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" action = _tmp1_; #line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = _variant_new2 (TRUE); + _tmp2_ = _variant_new5 (TRUE); #line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (action, _tmp2_); #line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4634,7 +4708,7 @@ static void library_window_on_find (LibraryWindow* self) { search_filter_toolbar_take_focus (_tmp3_); #line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (action); -#line 4638 "LibraryWindow.c" +#line 4712 "LibraryWindow.c" } @@ -4646,7 +4720,7 @@ static void library_window_on_media_altered (LibraryWindow* self) { _tmp0_ = library_window_can_jump_to_event (self); #line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", _tmp0_); -#line 4650 "LibraryWindow.c" +#line 4724 "LibraryWindow.c" } @@ -4658,13 +4732,13 @@ static void library_window_on_clear_search (LibraryWindow* self) { _tmp0_ = self->priv->is_search_toolbar_visible; #line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { -#line 4662 "LibraryWindow.c" +#line 4736 "LibraryWindow.c" SearchFilterActions* _tmp1_ = NULL; #line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->search_actions; #line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_filter_actions_reset (_tmp1_); -#line 4668 "LibraryWindow.c" +#line 4742 "LibraryWindow.c" } } @@ -4688,7 +4762,7 @@ gint library_window_get_events_sort (LibraryWindow* self) { _tmp3_ = action; #line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 4692 "LibraryWindow.c" +#line 4766 "LibraryWindow.c" gint _tmp4_ = 0; GSimpleAction* _tmp5_ = NULL; GVariant* _tmp6_ = NULL; @@ -4714,19 +4788,19 @@ gint library_window_get_events_sort (LibraryWindow* self) { if (_tmp10_) { #line 629 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = 0; -#line 4718 "LibraryWindow.c" +#line 4792 "LibraryWindow.c" } else { #line 629 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = 1; -#line 4722 "LibraryWindow.c" +#line 4796 "LibraryWindow.c" } #line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp4_; -#line 4726 "LibraryWindow.c" +#line 4800 "LibraryWindow.c" } else { #line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = 1; -#line 4730 "LibraryWindow.c" +#line 4804 "LibraryWindow.c" } #line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp2_; @@ -4734,7 +4808,7 @@ gint library_window_get_events_sort (LibraryWindow* self) { _g_object_unref0 (action); #line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 4738 "LibraryWindow.c" +#line 4812 "LibraryWindow.c" } @@ -4767,7 +4841,7 @@ static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleA _tmp5_ = value; #line 638 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_simple_action_set_state (_tmp4_, _tmp5_); -#line 4771 "LibraryWindow.c" +#line 4845 "LibraryWindow.c" } @@ -4776,7 +4850,7 @@ static void library_window_on_preferences (LibraryWindow* self) { g_return_if_fail (IS_LIBRARY_WINDOW (self)); #line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" preferences_dialog_show (); -#line 4780 "LibraryWindow.c" +#line 4854 "LibraryWindow.c" } @@ -4804,7 +4878,7 @@ static void library_window_on_display_basic_properties (LibraryWindow* self, GSi _tmp2_ = display; #line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 4808 "LibraryWindow.c" +#line 4882 "LibraryWindow.c" BasicProperties* _tmp3_ = NULL; Page* _tmp4_ = NULL; Page* _tmp5_ = NULL; @@ -4823,7 +4897,7 @@ static void library_window_on_display_basic_properties (LibraryWindow* self, GSi _tmp6_ = self->priv->bottom_frame; #line 650 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); -#line 4827 "LibraryWindow.c" +#line 4901 "LibraryWindow.c" } else { GtkPaned* _tmp7_ = NULL; GtkWidget* _tmp8_ = NULL; @@ -4833,13 +4907,13 @@ static void library_window_on_display_basic_properties (LibraryWindow* self, GSi _tmp8_ = gtk_paned_get_child2 (_tmp7_); #line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_ != NULL) { -#line 4837 "LibraryWindow.c" +#line 4911 "LibraryWindow.c" GtkFrame* _tmp9_ = NULL; #line 653 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->bottom_frame; #line 653 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget)); -#line 4843 "LibraryWindow.c" +#line 4917 "LibraryWindow.c" } } #line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4858,21 +4932,21 @@ static void library_window_on_display_basic_properties (LibraryWindow* self, GSi _tmp14_ = value; #line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_simple_action_set_state (_tmp13_, _tmp14_); -#line 4862 "LibraryWindow.c" +#line 4936 "LibraryWindow.c" } -static gboolean _variant_get3 (GVariant* value) { +static gboolean _variant_get6 (GVariant* value) { #line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_get_boolean (value); -#line 4869 "LibraryWindow.c" +#line 4943 "LibraryWindow.c" } -static GVariant* _variant_new4 (gboolean value) { +static GVariant* _variant_new7 (gboolean value) { #line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 4876 "LibraryWindow.c" +#line 4950 "LibraryWindow.c" } @@ -4896,9 +4970,9 @@ static void library_window_on_action_toggle (LibraryWindow* self, GAction* actio #line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; #line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = _variant_get3 (_tmp2_); + _tmp3_ = _variant_get6 (_tmp2_); #line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = _variant_new4 (!_tmp3_); + _tmp4_ = _variant_new7 (!_tmp3_); #line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; #line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -4911,7 +4985,7 @@ static void library_window_on_action_toggle (LibraryWindow* self, GAction* actio g_action_change_state (_tmp6_, new_state); #line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (new_state); -#line 4915 "LibraryWindow.c" +#line 4989 "LibraryWindow.c" } @@ -4928,7 +5002,7 @@ static void library_window_on_action_radio (LibraryWindow* self, GAction* action _tmp1_ = value; #line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (_tmp0_, _tmp1_); -#line 4932 "LibraryWindow.c" +#line 5006 "LibraryWindow.c" } @@ -4953,7 +5027,7 @@ static void library_window_on_display_extended_properties (LibraryWindow* self, _tmp2_ = display; #line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 4957 "LibraryWindow.c" +#line 5031 "LibraryWindow.c" ExtendedPropertiesWindow* _tmp3_ = NULL; Page* _tmp4_ = NULL; Page* _tmp5_ = NULL; @@ -4972,14 +5046,14 @@ static void library_window_on_display_extended_properties (LibraryWindow* self, _tmp6_ = self->priv->extended_properties; #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); -#line 4976 "LibraryWindow.c" +#line 5050 "LibraryWindow.c" } else { ExtendedPropertiesWindow* _tmp7_ = NULL; #line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = self->priv->extended_properties; #line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget)); -#line 4983 "LibraryWindow.c" +#line 5057 "LibraryWindow.c" } #line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = action; @@ -4987,7 +5061,14 @@ static void library_window_on_display_extended_properties (LibraryWindow* self, _tmp9_ = value; #line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_simple_action_set_state (_tmp8_, _tmp9_); -#line 4991 "LibraryWindow.c" +#line 5065 "LibraryWindow.c" +} + + +static GVariant* _variant_new8 (gboolean value) { +#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + return g_variant_ref_sink (g_variant_new_boolean (value)); +#line 5072 "LibraryWindow.c" } @@ -5019,13 +5100,15 @@ static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAct _g_object_unref0 (_tmp3_); #line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_show_search_bar (self, is_shown); -#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = action; -#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = value; -#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp5_ = _variant_new8 (is_shown); +#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_simple_action_set_state (_tmp4_, _tmp5_); -#line 5029 "LibraryWindow.c" +#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_variant_unref0 (_tmp5_); +#line 5112 "LibraryWindow.c" } @@ -5039,55 +5122,55 @@ void library_window_show_search_bar (LibraryWindow* self, gboolean display) { CheckerboardPage* _tmp6_ = NULL; CheckerboardPage* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; -#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 692 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_CHECKERBOARD_PAGE); -#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 5057 "LibraryWindow.c" +#line 5140 "LibraryWindow.c" } -#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 696 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = display; -#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 696 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->is_search_toolbar_visible = _tmp3_; -#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = library_window_should_show_search_bar (self); -#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp5_) : NULL; -#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp6_ == NULL) { -#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 5073 "LibraryWindow.c" +#line 5156 "LibraryWindow.c" } -#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = _tmp6_; -#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_toggle_search_bar (self, _tmp4_, _tmp7_); -#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp7_); -#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = display; -#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp8_) { -#line 5085 "LibraryWindow.c" +#line 5168 "LibraryWindow.c" SearchFilterActions* _tmp9_ = NULL; -#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->search_actions; -#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_filter_actions_reset (_tmp9_); -#line 5091 "LibraryWindow.c" +#line 5174 "LibraryWindow.c" } } @@ -5097,23 +5180,23 @@ static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleActio gboolean _tmp1_ = FALSE; GSimpleAction* _tmp2_ = NULL; GVariant* _tmp3_ = NULL; -#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); -#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = variant; -#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_set_sidebar_visible (self, _tmp1_); -#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = action; -#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = variant; -#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_simple_action_set_state (_tmp2_, _tmp3_); -#line 5117 "LibraryWindow.c" +#line 5200 "LibraryWindow.c" } @@ -5123,25 +5206,25 @@ static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean vi ConfigFacade* _tmp2_ = NULL; ConfigFacade* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 708 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->sidebar_paned; -#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = visible; -#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_); -#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = config_facade_get_instance (); -#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = visible; -#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" configuration_facade_set_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_); -#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp3_); -#line 5145 "LibraryWindow.c" +#line 5228 "LibraryWindow.c" } @@ -5151,23 +5234,23 @@ static gboolean library_window_is_sidebar_visible (LibraryWindow* self) { ConfigFacade* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; -#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 713 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); -#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = config_facade_get_instance (); -#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = configuration_facade_get_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp3_; -#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5171 "LibraryWindow.c" +#line 5254 "LibraryWindow.c" } @@ -5176,78 +5259,95 @@ static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleActio gboolean _tmp1_ = FALSE; GSimpleAction* _tmp2_ = NULL; GVariant* _tmp3_ = NULL; -#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 717 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 717 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (G_IS_SIMPLE_ACTION (action)); -#line 719 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = variant; -#line 719 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = g_variant_get_boolean (_tmp0_); -#line 719 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_set_toolbar_visible (self, _tmp1_); -#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = action; -#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = variant; -#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_simple_action_set_state (_tmp2_, _tmp3_); -#line 5196 "LibraryWindow.c" +#line 5279 "LibraryWindow.c" } static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean visible) { - GtkToolbar* toolbar = NULL; Page* _tmp0_ = NULL; Page* _tmp1_ = NULL; - GtkToolbar* _tmp2_ = NULL; - GtkToolbar* _tmp3_ = NULL; - GtkToolbar* _tmp4_ = NULL; - ConfigFacade* _tmp7_ = NULL; - ConfigFacade* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; -#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gboolean _tmp2_ = FALSE; + GtkToolbar* toolbar = NULL; + Page* _tmp3_ = NULL; + Page* _tmp4_ = NULL; + GtkToolbar* _tmp5_ = NULL; + GtkToolbar* _tmp6_ = NULL; + GtkToolbar* _tmp7_ = NULL; + ConfigFacade* _tmp10_ = NULL; + ConfigFacade* _tmp11_ = NULL; + gboolean _tmp12_ = FALSE; +#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp2_ = page_get_toolbar (_tmp1_); -#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = _tmp2_; -#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp2_ = _tmp1_ == NULL; +#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); +#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + if (_tmp2_) { #line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - toolbar = _tmp3_; -#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp4_ = toolbar; -#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - if (_tmp4_ != NULL) { -#line 5228 "LibraryWindow.c" - GtkToolbar* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; -#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp5_ = toolbar; -#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp6_ = visible; -#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), _tmp6_); -#line 5237 "LibraryWindow.c" + return; +#line 5310 "LibraryWindow.c" } +#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); +#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp4_ = _tmp3_; +#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp5_ = page_get_toolbar (_tmp4_); +#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp6_ = _tmp5_; +#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (_tmp4_); +#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + toolbar = _tmp6_; #line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = config_facade_get_instance (); -#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp8_ = _tmp7_; -#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp9_ = visible; -#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - configuration_facade_set_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp9_); + _tmp7_ = toolbar; #line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp8_); -#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + if (_tmp7_ != NULL) { +#line 5328 "LibraryWindow.c" + GtkRevealer* _tmp8_ = NULL; + gboolean _tmp9_ = FALSE; +#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp8_ = self->priv->toolbar_revealer; +#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp9_ = visible; +#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_revealer_set_reveal_child (_tmp8_, _tmp9_); +#line 5337 "LibraryWindow.c" + } +#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp10_ = config_facade_get_instance (); +#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp11_ = _tmp10_; +#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp12_ = visible; +#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + configuration_facade_set_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_); +#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (_tmp11_); +#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (toolbar); -#line 5251 "LibraryWindow.c" +#line 5351 "LibraryWindow.c" } @@ -5257,48 +5357,48 @@ static gboolean library_window_is_toolbar_visible (LibraryWindow* self) { ConfigFacade* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; -#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 735 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); -#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = config_facade_get_instance (); -#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp0_; -#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = configuration_facade_get_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp1_); -#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp3_; -#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5277 "LibraryWindow.c" +#line 5377 "LibraryWindow.c" } static void library_window_show_extended_properties (LibraryWindow* self) { -#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 739 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 740 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_sync_extended_properties (self, TRUE); -#line 5286 "LibraryWindow.c" +#line 5386 "LibraryWindow.c" } static void library_window_hide_extended_properties (LibraryWindow* self) { -#line 740 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_sync_extended_properties (self, FALSE); -#line 5295 "LibraryWindow.c" +#line 5395 "LibraryWindow.c" } -static GVariant* _variant_new5 (gboolean value) { -#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +static GVariant* _variant_new9 (gboolean value) { +#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 5302 "LibraryWindow.c" +#line 5402 "LibraryWindow.c" } @@ -5311,35 +5411,35 @@ static void library_window_sync_extended_properties (LibraryWindow* self, gboole ConfigFacade* _tmp4_ = NULL; ConfigFacade* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; -#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 747 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 748 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayExtendedProperties"); -#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 748 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 748 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" action = _tmp1_; -#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = show; -#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp3_ = _variant_new5 (_tmp2_); -#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp3_ = _variant_new9 (_tmp2_); +#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (action, _tmp3_); -#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_variant_unref0 (_tmp3_); #line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_variant_unref0 (_tmp3_); +#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = config_facade_get_instance (); -#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = show; -#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" configuration_facade_set_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_); -#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 747 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (action); -#line 5343 "LibraryWindow.c" +#line 5443 "LibraryWindow.c" } @@ -5349,44 +5449,44 @@ void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batc LibraryImportQueueSidebarEntry* _tmp2_ = NULL; BatchImport* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_BATCH_IMPORT (batch_import)); -#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->library_branch; -#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = library_branch_get_import_queue_entry (_tmp0_); -#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = batch_import; -#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = allow_user_cancel; -#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_import_queue_sidebar_entry_enqueue_and_schedule (_tmp2_, _tmp3_, _tmp4_); -#line 5369 "LibraryWindow.c" +#line 5469 "LibraryWindow.c" } static void library_window_import_reporter (LibraryWindow* self, ImportManifest* manifest) { ImportManifest* _tmp0_ = NULL; -#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 759 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 759 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_IMPORT_MANIFEST (manifest)); -#line 757 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = manifest; -#line 757 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" import_ui_report_manifest (_tmp0_, TRUE, NULL); -#line 5383 "LibraryWindow.c" +#line 5483 "LibraryWindow.c" } static void _library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { -#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_import_reporter ((LibraryWindow*) self, manifest); -#line 5390 "LibraryWindow.c" +#line 5490 "LibraryWindow.c" } @@ -5404,43 +5504,43 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur GeeArrayList* _tmp33_ = NULL; gint _tmp34_ = 0; gint _tmp35_ = 0; -#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 763 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 763 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (job_name != NULL); -#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = app_dirs_get_import_dir (); -#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = g_file_get_path (_tmp2_); -#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp3_; -#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = g_get_home_dir (); -#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = g_strcmp0 (_tmp4_, _tmp5_) == 0; -#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp4_); -#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp6_) { -#line 5430 "LibraryWindow.c" +#line 5530 "LibraryWindow.c" gboolean _tmp7_ = FALSE; -#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = self->priv->notify_library_is_home_dir; -#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _tmp7_; -#line 5436 "LibraryWindow.c" +#line 5536 "LibraryWindow.c" } else { -#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = FALSE; -#line 5440 "LibraryWindow.c" +#line 5540 "LibraryWindow.c" } -#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { -#line 5444 "LibraryWindow.c" +#line 5544 "LibraryWindow.c" GtkResponseType response = 0; const gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; @@ -5452,65 +5552,65 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur GtkResponseType _tmp15_ = 0; GtkResponseType _tmp16_ = 0; GtkResponseType _tmp17_ = 0; -#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = _ ("Shotwell is configured to import photos to your home directory.\n" "We recommend changing this in <span weight=\"bold\">Edit %s Preference" \ "s</span>.\n" "Do you want to continue importing photos?"); -#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = g_strdup_printf (_tmp8_, "▸"); -#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = _tmp9_; -#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = _ ("_Import"); -#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = _ ("Library Location"); -#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = app_window_get_instance (); -#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp13_; -#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = app_window_affirm_cancel_question (_tmp10_, _tmp11_, _tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow)); -#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = _tmp15_; -#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp14_); -#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp10_); -#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" response = _tmp16_; -#line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = response; -#line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp17_ == GTK_RESPONSE_CANCEL) { -#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 772 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 5486 "LibraryWindow.c" +#line 5586 "LibraryWindow.c" } -#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 774 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->notify_library_is_home_dir = FALSE; -#line 5490 "LibraryWindow.c" +#line 5590 "LibraryWindow.c" } -#line 774 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL); -#line 774 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" jobs = _tmp18_; -#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = uris; -#line 5498 "LibraryWindow.c" +#line 5598 "LibraryWindow.c" { GSList* uri_collection = NULL; GSList* uri_it = NULL; -#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri_collection = _tmp19_; -#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) { -#line 5506 "LibraryWindow.c" +#line 5606 "LibraryWindow.c" gchar* _tmp20_ = NULL; gchar* uri = NULL; -#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = g_strdup ((const gchar*) uri_it->data); -#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri = _tmp20_; -#line 5513 "LibraryWindow.c" +#line 5613 "LibraryWindow.c" { GFile* file_or_dir = NULL; const gchar* _tmp21_ = NULL; @@ -5524,95 +5624,95 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur gboolean _tmp30_ = FALSE; FileImportJob* _tmp31_ = NULL; FileImportJob* _tmp32_ = NULL; -#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = uri; -#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = g_file_new_for_uri (_tmp21_); -#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" file_or_dir = _tmp22_; -#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = file_or_dir; -#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = g_file_get_path (_tmp23_); -#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = _tmp24_; -#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = _tmp25_ == NULL; -#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp25_); -#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp26_) { -#line 5545 "LibraryWindow.c" +#line 5645 "LibraryWindow.c" const gchar* _tmp27_ = NULL; -#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 782 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = _ ("Photos cannot be imported from this directory."); -#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 782 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_error_message (_tmp27_, NULL); -#line 781 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (file_or_dir); -#line 781 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 781 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" continue; -#line 5557 "LibraryWindow.c" +#line 5657 "LibraryWindow.c" } -#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = jobs; -#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = file_or_dir; -#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp30_ = copy_to_library; -#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = file_import_job_new (_tmp29_, _tmp30_); -#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = _tmp31_; -#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp32_); -#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _batch_import_job_unref0 (_tmp32_); -#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (file_or_dir); -#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 5577 "LibraryWindow.c" +#line 5677 "LibraryWindow.c" } } } -#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = jobs; -#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp35_ = _tmp34_; -#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp35_ > 0) { -#line 5589 "LibraryWindow.c" +#line 5689 "LibraryWindow.c" BatchImport* batch_import = NULL; GeeArrayList* _tmp36_ = NULL; const gchar* _tmp37_ = NULL; BatchImport* _tmp38_ = NULL; BatchImport* _tmp39_ = NULL; -#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp36_ = jobs; -#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp37_ = job_name; -#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp38_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ITERABLE, GeeIterable), _tmp37_, _library_window_import_reporter_batch_import_import_reporter, self, NULL, NULL, NULL, NULL, NULL); -#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" batch_import = _tmp38_; -#line 789 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp39_ = batch_import; -#line 789 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_enqueue_batch_import (self, _tmp39_, TRUE); -#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_import_queue_page (self); -#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (batch_import); -#line 5611 "LibraryWindow.c" +#line 5711 "LibraryWindow.c" } -#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 763 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (jobs); -#line 5615 "LibraryWindow.c" +#line 5715 "LibraryWindow.c" } @@ -5633,157 +5733,157 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) { gboolean _tmp8_ = FALSE; gboolean _tmp9_ = FALSE; gboolean _tmp10_ = FALSE; -#line 794 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0); #line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0); +#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = gdk_display_get_default (); -#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = gdk_display_get_device_manager (_tmp1_); -#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = gdk_device_manager_get_client_pointer (_tmp2_); -#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gdk_window_get_device_position (_tmp0_, _tmp3_, NULL, NULL, &_tmp4_); -#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - mask = _tmp4_; #line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + mask = _tmp4_; +#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = mask; -#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" ctrl = (_tmp5_ & GDK_CONTROL_MASK) != 0; -#line 801 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = mask; -#line 801 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" alt = (_tmp6_ & GDK_MOD1_MASK) != 0; -#line 802 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = mask; -#line 802 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" shift = (_tmp7_ & GDK_SHIFT_MASK) != 0; -#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = ctrl; -#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp10_) { -#line 5666 "LibraryWindow.c" +#line 5766 "LibraryWindow.c" gboolean _tmp11_ = FALSE; -#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = alt; -#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = !_tmp11_; -#line 5672 "LibraryWindow.c" +#line 5772 "LibraryWindow.c" } else { -#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = FALSE; -#line 5676 "LibraryWindow.c" +#line 5776 "LibraryWindow.c" } -#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp9_) { -#line 5680 "LibraryWindow.c" +#line 5780 "LibraryWindow.c" gboolean _tmp12_ = FALSE; -#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = shift; -#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = !_tmp12_; -#line 5686 "LibraryWindow.c" +#line 5786 "LibraryWindow.c" } else { -#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = FALSE; -#line 5690 "LibraryWindow.c" +#line 5790 "LibraryWindow.c" } -#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_) { -#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = GDK_ACTION_COPY; -#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5698 "LibraryWindow.c" +#line 5798 "LibraryWindow.c" } else { gboolean _tmp13_ = FALSE; gboolean _tmp14_ = FALSE; gboolean _tmp15_ = FALSE; -#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = ctrl; -#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp15_) { -#line 5707 "LibraryWindow.c" +#line 5807 "LibraryWindow.c" gboolean _tmp16_ = FALSE; -#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = alt; -#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp16_; -#line 5713 "LibraryWindow.c" +#line 5813 "LibraryWindow.c" } else { -#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = FALSE; -#line 5717 "LibraryWindow.c" +#line 5817 "LibraryWindow.c" } -#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp14_) { -#line 5721 "LibraryWindow.c" +#line 5821 "LibraryWindow.c" gboolean _tmp17_ = FALSE; -#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = shift; -#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = !_tmp17_; -#line 5727 "LibraryWindow.c" +#line 5827 "LibraryWindow.c" } else { -#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = FALSE; -#line 5731 "LibraryWindow.c" +#line 5831 "LibraryWindow.c" } -#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_) { -#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 810 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = GDK_ACTION_ASK; -#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 810 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5739 "LibraryWindow.c" +#line 5839 "LibraryWindow.c" } else { gboolean _tmp18_ = FALSE; gboolean _tmp19_ = FALSE; gboolean _tmp20_ = FALSE; -#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = ctrl; -#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp20_) { -#line 5748 "LibraryWindow.c" +#line 5848 "LibraryWindow.c" gboolean _tmp21_ = FALSE; -#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = alt; -#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = !_tmp21_; -#line 5754 "LibraryWindow.c" +#line 5854 "LibraryWindow.c" } else { -#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = FALSE; -#line 5758 "LibraryWindow.c" +#line 5858 "LibraryWindow.c" } -#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp19_) { -#line 5762 "LibraryWindow.c" +#line 5862 "LibraryWindow.c" gboolean _tmp22_ = FALSE; -#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = shift; -#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = _tmp22_; -#line 5768 "LibraryWindow.c" +#line 5868 "LibraryWindow.c" } else { -#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = FALSE; -#line 5772 "LibraryWindow.c" +#line 5872 "LibraryWindow.c" } -#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp18_) { -#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 812 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = GDK_ACTION_LINK; -#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 812 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5780 "LibraryWindow.c" +#line 5880 "LibraryWindow.c" } else { -#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = GDK_ACTION_DEFAULT; -#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5786 "LibraryWindow.c" +#line 5886 "LibraryWindow.c" } } } @@ -5807,87 +5907,87 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext GdkDragContext* _tmp13_ = NULL; GdkDragAction _tmp14_ = 0; guint _tmp15_ = 0U; -#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE); -#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = context; -#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = gtk_drag_dest_get_target_list (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget)); -#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = gtk_drag_dest_find_target (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_, _tmp1_); -#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" target = _tmp2_; -#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = target; -#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = GDK_NONE; -#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ == _tmp4_) { -#line 5828 "LibraryWindow.c" +#line 5928 "LibraryWindow.c" GdkDragContext* _tmp5_ = NULL; guint _tmp6_ = 0U; -#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:817: drag target is GDK_NONE"); -#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:820: drag target is GDK_NONE"); +#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = context; -#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = time; -#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gdk_drag_status (_tmp5_, 0, (guint32) _tmp6_); -#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5843 "LibraryWindow.c" +#line 5943 "LibraryWindow.c" } -#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = context; -#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = gtk_drag_get_source_widget (_tmp7_); -#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_ != NULL) { -#line 5851 "LibraryWindow.c" +#line 5951 "LibraryWindow.c" GdkDragContext* _tmp9_ = NULL; guint _tmp10_ = 0U; -#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = context; -#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = time; -#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gdk_drag_status (_tmp9_, GDK_ACTION_PRIVATE, (guint32) _tmp10_); -#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5864 "LibraryWindow.c" +#line 5964 "LibraryWindow.c" } -#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = library_window_get_drag_action (self); -#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" drag_action = _tmp11_; -#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = drag_action; -#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp12_ == GDK_ACTION_DEFAULT) { -#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" drag_action = GDK_ACTION_ASK; -#line 5876 "LibraryWindow.c" +#line 5976 "LibraryWindow.c" } -#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = context; -#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = drag_action; -#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = time; -#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gdk_drag_status (_tmp13_, _tmp14_, (guint32) _tmp15_); -#line 838 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 838 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 5890 "LibraryWindow.c" +#line 5990 "LibraryWindow.c" } @@ -5897,54 +5997,54 @@ static void library_window_real_drag_data_received (GtkWidget* base, GdkDragCont guchar* _tmp1_ = NULL; GdkDragContext* _tmp2_ = NULL; GtkWidget* _tmp3_ = NULL; -#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 844 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 844 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (GDK_IS_DRAG_CONTEXT (context)); -#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 844 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (selection_data != NULL); -#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 846 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = selection_data; -#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 846 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = gtk_selection_data_get_data (_tmp0_); -#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 846 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (-1 < 0) { -#line 844 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:844: failed to retrieve SelectionData"); -#line 5914 "LibraryWindow.c" +#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:847: failed to retrieve SelectionData"); +#line 6014 "LibraryWindow.c" } -#line 848 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = context; -#line 848 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = gtk_drag_get_source_widget (_tmp2_); -#line 848 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ == NULL) { -#line 5922 "LibraryWindow.c" +#line 6022 "LibraryWindow.c" GdkDragContext* _tmp4_ = NULL; GtkSelectionData* _tmp5_ = NULL; guint _tmp6_ = 0U; guint _tmp7_ = 0U; -#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = context; -#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = selection_data; -#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = info; -#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = time; -#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_external_drop_handler (self, _tmp4_, NULL, _tmp5_, _tmp6_, _tmp7_); -#line 5937 "LibraryWindow.c" +#line 6037 "LibraryWindow.c" } else { GdkDragContext* _tmp8_ = NULL; guint _tmp9_ = 0U; -#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = context; -#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = time; -#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_drag_finish (_tmp8_, FALSE, FALSE, (guint32) _tmp9_); -#line 5947 "LibraryWindow.c" +#line 6047 "LibraryWindow.c" } } @@ -5967,198 +6067,198 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo GdkDragAction _tmp22_ = 0; GdkDragContext* _tmp23_ = NULL; guint _tmp24_ = 0U; -#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (GDK_IS_DRAG_CONTEXT (context)); -#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail ((entry == NULL) || SIDEBAR_IS_ENTRY (entry)); -#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (data != NULL); -#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = data; -#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_ = gtk_selection_data_get_uris (_tmp0_); -#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris_array = _tmp2_; -#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris_array_length1 = _vala_array_length (_tmp1_); -#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _uris_array_size_ = uris_array_length1; -#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 861 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris = NULL; -#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = uris_array; -#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3__length1 = uris_array_length1; -#line 5994 "LibraryWindow.c" +#line 6094 "LibraryWindow.c" { gchar** uri_collection = NULL; gint uri_collection_length1 = 0; gint _uri_collection_size_ = 0; gint uri_it = 0; -#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri_collection = _tmp3_; -#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri_collection_length1 = _tmp3__length1; -#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" for (uri_it = 0; uri_it < _tmp3__length1; uri_it = uri_it + 1) { -#line 6006 "LibraryWindow.c" +#line 6106 "LibraryWindow.c" gchar* _tmp4_ = NULL; gchar* uri = NULL; -#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = g_strdup (uri_collection[uri_it]); -#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri = _tmp4_; -#line 6013 "LibraryWindow.c" +#line 6113 "LibraryWindow.c" { const gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = uri; -#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = g_strdup (_tmp5_); -#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris = g_slist_append (uris, _tmp6_); -#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 6025 "LibraryWindow.c" +#line 6125 "LibraryWindow.c" } } } -#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = context; -#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = gdk_drag_context_get_selected_action (_tmp7_); -#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" selected_action = _tmp8_; -#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = selected_action; -#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp9_ == GDK_ACTION_ASK) { -#line 6039 "LibraryWindow.c" +#line 6139 "LibraryWindow.c" GtkResponseType _result_ = 0; GSList* _tmp10_ = NULL; GtkResponseType _tmp18_ = 0; -#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _result_ = GTK_RESPONSE_REJECT; -#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = uris; -#line 6047 "LibraryWindow.c" +#line 6147 "LibraryWindow.c" { GSList* uri_collection = NULL; GSList* uri_it = NULL; -#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri_collection = _tmp10_; -#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) { -#line 6055 "LibraryWindow.c" +#line 6155 "LibraryWindow.c" gchar* _tmp11_ = NULL; gchar* uri = NULL; -#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = g_strdup ((const gchar*) uri_it->data); -#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri = _tmp11_; -#line 6062 "LibraryWindow.c" +#line 6162 "LibraryWindow.c" { const gchar* _tmp12_ = NULL; GFile* _tmp13_ = NULL; GFile* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; gboolean _tmp16_ = FALSE; -#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = uri; -#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = g_file_new_for_uri (_tmp12_); -#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp13_; -#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = app_dirs_is_in_import_dir (_tmp14_); -#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = !_tmp15_; -#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp14_); -#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp16_) { -#line 6083 "LibraryWindow.c" +#line 6183 "LibraryWindow.c" GtkResponseType _tmp17_ = 0; -#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = copy_files_dialog (); -#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _result_ = _tmp17_; -#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 873 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 873 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 6093 "LibraryWindow.c" +#line 6193 "LibraryWindow.c" } -#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (uri); -#line 6097 "LibraryWindow.c" +#line 6197 "LibraryWindow.c" } } } -#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = _result_; -#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" switch (_tmp18_) { -#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" case GTK_RESPONSE_ACCEPT: -#line 6107 "LibraryWindow.c" +#line 6207 "LibraryWindow.c" { -#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" selected_action = GDK_ACTION_COPY; -#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 880 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 6113 "LibraryWindow.c" +#line 6213 "LibraryWindow.c" } -#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" case GTK_RESPONSE_REJECT: -#line 6117 "LibraryWindow.c" +#line 6217 "LibraryWindow.c" { -#line 880 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" selected_action = GDK_ACTION_LINK; -#line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 6123 "LibraryWindow.c" +#line 6223 "LibraryWindow.c" } default: { GdkDragContext* _tmp19_ = NULL; guint _tmp20_ = 0U; -#line 885 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 888 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = context; -#line 885 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 888 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = time; -#line 885 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 888 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_drag_finish (_tmp19_, FALSE, FALSE, (guint32) _tmp20_); -#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" __g_slist_free__g_free0_0 (uris); -#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL); -#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6141 "LibraryWindow.c" +#line 6241 "LibraryWindow.c" } } } -#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = uris; -#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = selected_action; -#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_dispatch_import_jobs (self, _tmp21_, "drag-and-drop", _tmp22_ == GDK_ACTION_COPY); -#line 893 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = context; -#line 893 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = time; -#line 893 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_drag_finish (_tmp23_, TRUE, FALSE, (guint32) _tmp24_); -#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" __g_slist_free__g_free0_0 (uris); -#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL); -#line 6161 "LibraryWindow.c" +#line 6261 "LibraryWindow.c" } @@ -6168,23 +6268,23 @@ void library_window_switch_to_library_page (LibraryWindow* self) { LibraryPhotosEntry* _tmp2_ = NULL; Page* _tmp3_ = NULL; Page* _tmp4_ = NULL; -#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->library_branch; -#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = library_branch_get_photos_entry (_tmp0_); -#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp3_; -#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp4_); -#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp4_); -#line 6187 "LibraryWindow.c" +#line 6287 "LibraryWindow.c" } @@ -6194,41 +6294,41 @@ void library_window_switch_to_event (LibraryWindow* self, Event* event) { Event* _tmp1_ = NULL; EventsEventEntry* _tmp2_ = NULL; EventsEventEntry* _tmp3_ = NULL; -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_EVENT (event)); -#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 904 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->events_branch; -#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 904 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = event; -#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 904 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_); -#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 904 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp2_; -#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 905 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = entry; -#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 905 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 6213 "LibraryWindow.c" +#line 6313 "LibraryWindow.c" EventsEventEntry* _tmp4_ = NULL; Page* _tmp5_ = NULL; Page* _tmp6_ = NULL; -#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = entry; -#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; -#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp6_); -#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); -#line 6227 "LibraryWindow.c" +#line 6327 "LibraryWindow.c" } -#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 6231 "LibraryWindow.c" +#line 6331 "LibraryWindow.c" } @@ -6238,41 +6338,41 @@ void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) { Tag* _tmp1_ = NULL; TagsSidebarEntry* _tmp2_ = NULL; TagsSidebarEntry* _tmp3_ = NULL; -#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_TAG (tag)); -#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->tags_branch; -#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = tag; -#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_); -#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp2_; -#line 908 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 911 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = entry; -#line 908 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 911 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 6257 "LibraryWindow.c" +#line 6357 "LibraryWindow.c" TagsSidebarEntry* _tmp4_ = NULL; Page* _tmp5_ = NULL; Page* _tmp6_ = NULL; -#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = entry; -#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; -#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp6_); -#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); -#line 6271 "LibraryWindow.c" +#line 6371 "LibraryWindow.c" } -#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 6275 "LibraryWindow.c" +#line 6375 "LibraryWindow.c" } @@ -6282,41 +6382,41 @@ void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* se SavedSearch* _tmp1_ = NULL; SearchesSidebarEntry* _tmp2_ = NULL; SearchesSidebarEntry* _tmp3_ = NULL; -#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_SAVED_SEARCH (search)); -#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->saved_search_branch; -#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = search; -#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_); -#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp2_; -#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = entry; -#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ != NULL) { -#line 6301 "LibraryWindow.c" +#line 6401 "LibraryWindow.c" SearchesSidebarEntry* _tmp4_ = NULL; Page* _tmp5_ = NULL; Page* _tmp6_ = NULL; -#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = entry; -#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; -#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp6_); -#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); -#line 6315 "LibraryWindow.c" +#line 6415 "LibraryWindow.c" } -#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 6319 "LibraryWindow.c" +#line 6419 "LibraryWindow.c" } @@ -6332,66 +6432,66 @@ void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* c CollectionPage* _tmp10_ = NULL; Photo* _tmp11_ = NULL; LibraryPhotoPage* _tmp12_ = NULL; -#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_COLLECTION_PAGE (controller)); -#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PHOTO (current)); -#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = controller; -#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page)); -#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = current; -#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = view_collection_get_view_for_source (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource)); -#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (_tmp5_ != NULL, "controller.get_view().get_view_for_source(current) != null"); -#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp2_); -#line 920 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->photo_page; -#line 920 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp6_ == NULL) { -#line 6363 "LibraryWindow.c" +#line 6463 "LibraryWindow.c" LibraryPhotoPage* _tmp7_ = NULL; LibraryPhotoPage* _tmp8_ = NULL; -#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = library_photo_page_new (); -#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp7_); -#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->photo_page); -#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->photo_page = _tmp7_; -#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = self->priv->photo_page; -#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_add_to_stack (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page)); -#line 926 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" spin_event_loop (); -#line 6380 "LibraryWindow.c" +#line 6480 "LibraryWindow.c" } -#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->photo_page; -#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = controller; -#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = current; -#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_photo_page_display_for_collection (_tmp9_, _tmp10_, _tmp11_, NULL); -#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 933 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = self->priv->photo_page; -#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 933 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE, Page)); -#line 6394 "LibraryWindow.c" +#line 6494 "LibraryWindow.c" } @@ -6401,23 +6501,23 @@ void library_window_switch_to_import_queue_page (LibraryWindow* self) { LibraryImportQueueSidebarEntry* _tmp2_ = NULL; Page* _tmp3_ = NULL; Page* _tmp4_ = NULL; -#line 933 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->library_branch; -#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = library_branch_get_import_queue_entry (_tmp0_); -#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp3_; -#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp4_); -#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp4_); -#line 6420 "LibraryWindow.c" +#line 6520 "LibraryWindow.c" } @@ -6438,169 +6538,169 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer gboolean _tmp13_ = FALSE; GMount* _tmp14_ = NULL; GError * _inner_error_ = NULL; -#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_DISCOVERED_CAMERA (camera)); -#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 941 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->camera_branch; -#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 941 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = camera; -#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 941 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = camera_branch_get_entry_for_camera (_tmp0_, _tmp1_); -#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 941 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = _tmp2_; -#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = entry; -#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_ == NULL) { -#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6461 "LibraryWindow.c" +#line 6561 "LibraryWindow.c" } -#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = entry; -#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" page = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_IMPORT_PAGE, ImportPage); -#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = camera; -#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = _tmp6_->uri; -#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = g_file_new_for_uri (_tmp7_); -#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - uri_file = _tmp8_; #line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + uri_file = _tmp8_; +#line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" mount = NULL; -#line 6479 "LibraryWindow.c" +#line 6579 "LibraryWindow.c" { GMount* _tmp9_ = NULL; GFile* _tmp10_ = NULL; GMount* _tmp11_ = NULL; GMount* _tmp12_ = NULL; -#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = uri_file; -#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = g_file_find_enclosing_mount (_tmp10_, NULL, &_inner_error_); -#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _tmp11_; -#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6493 "LibraryWindow.c" +#line 6593 "LibraryWindow.c" goto __catch39_g_error; } -#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = _tmp9_; -#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = NULL; -#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" mount = _tmp12_; -#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp9_); -#line 6506 "LibraryWindow.c" +#line 6606 "LibraryWindow.c" } goto __finally39; __catch39_g_error: { GError* err = NULL; -#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" err = _inner_error_; -#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _inner_error_ = NULL; -#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_error_free0 (err); -#line 6518 "LibraryWindow.c" +#line 6618 "LibraryWindow.c" } __finally39: -#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (uri_file); -#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (page); -#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_clear_error (&_inner_error_); -#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6537 "LibraryWindow.c" +#line 6637 "LibraryWindow.c" } -#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = mount; -#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp14_ != NULL) { -#line 6543 "LibraryWindow.c" +#line 6643 "LibraryWindow.c" DiscoveredCamera* _tmp15_ = NULL; const gchar* _tmp16_ = NULL; gboolean _tmp17_ = FALSE; -#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = camera; -#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = _tmp15_->uri; -#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = g_str_has_prefix (_tmp16_, "file://"); -#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = !_tmp17_; -#line 6555 "LibraryWindow.c" +#line 6655 "LibraryWindow.c" } else { -#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = FALSE; -#line 6559 "LibraryWindow.c" +#line 6659 "LibraryWindow.c" } -#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_) { -#line 6563 "LibraryWindow.c" +#line 6663 "LibraryWindow.c" ImportPage* _tmp18_ = NULL; GMount* _tmp19_ = NULL; gboolean _tmp20_ = FALSE; -#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = page; -#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = mount; -#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = import_page_unmount_camera (_tmp18_, _tmp19_); -#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp20_) { -#line 6575 "LibraryWindow.c" +#line 6675 "LibraryWindow.c" ImportPage* _tmp21_ = NULL; -#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = page; -#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PAGE, Page)); -#line 6581 "LibraryWindow.c" +#line 6681 "LibraryWindow.c" } else { -#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 961 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" app_window_error_message ("Unable to unmount the camera at this time.", NULL); -#line 6585 "LibraryWindow.c" +#line 6685 "LibraryWindow.c" } } else { ImportPage* _tmp22_ = NULL; -#line 960 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = page; -#line 960 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE, Page)); -#line 6593 "LibraryWindow.c" +#line 6693 "LibraryWindow.c" } -#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (uri_file); -#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (page); -#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 6603 "LibraryWindow.c" +#line 6703 "LibraryWindow.c" } @@ -6609,25 +6709,25 @@ void library_window_add_to_stack (LibraryWindow* self, Page* page) { GtkStack* _tmp1_ = NULL; Page* _tmp2_ = NULL; GtkStack* _tmp3_ = NULL; -#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 968 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 968 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 967 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 967 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->stack; -#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = page; -#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); -#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->stack; -#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); -#line 6630 "LibraryWindow.c" +#line 6730 "LibraryWindow.c" } @@ -6635,49 +6735,49 @@ static void library_window_remove_from_stack (LibraryWindow* self, Page* page) { GtkStack* _tmp0_ = NULL; Page* _tmp1_ = NULL; GtkStack* _tmp2_ = NULL; -#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 977 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 977 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 975 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->stack; -#line 975 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page; -#line 975 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); #line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); +#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->stack; -#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); -#line 6652 "LibraryWindow.c" +#line 6752 "LibraryWindow.c" } -static GVariant* _variant_new6 (gboolean value) { -#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +static GVariant* _variant_new10 (gboolean value) { +#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 6659 "LibraryWindow.c" +#line 6759 "LibraryWindow.c" } -static GVariant* _variant_new7 (gboolean value) { -#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +static GVariant* _variant_new11 (gboolean value) { +#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 6666 "LibraryWindow.c" +#line 6766 "LibraryWindow.c" } -static GVariant* _variant_new8 (gboolean value) { -#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +static GVariant* _variant_new12 (gboolean value) { +#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_boolean (value)); -#line 6673 "LibraryWindow.c" +#line 6773 "LibraryWindow.c" } -static GVariant* _variant_new9 (const gchar* value) { -#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +static GVariant* _variant_new13 (const gchar* value) { +#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return g_variant_ref_sink (g_variant_new_string (value)); -#line 6680 "LibraryWindow.c" +#line 6780 "LibraryWindow.c" } @@ -6722,148 +6822,148 @@ static void library_window_load_configuration (LibraryWindow* self) { gchar* _tmp32_ = NULL; GAction* _tmp33_ = NULL; GVariant* _tmp34_ = NULL; -#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 986 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayBasicProperties"); -#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 986 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 986 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" basic_display_action = _tmp1_; -#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = basic_display_action; -#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (_tmp2_ != NULL, "basic_display_action != null"); -#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = basic_display_action; -#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = config_facade_get_instance (); -#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = configuration_facade_get_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp7_ = _variant_new6 (_tmp6_); -#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp7_ = _variant_new10 (_tmp6_); +#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (_tmp3_, _tmp7_); -#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp7_); -#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayExtendedProperties"); -#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _g_object_ref0 (_tmp8_); -#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" extended_display_action = _tmp9_; -#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = extended_display_action; -#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (_tmp10_ != NULL, "extended_display_action != null"); -#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = extended_display_action; -#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = config_facade_get_instance (); -#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = _tmp12_; -#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = configuration_facade_get_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp15_ = _variant_new7 (_tmp14_); -#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp15_ = _variant_new11 (_tmp14_); +#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (_tmp11_, _tmp15_); -#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp15_); -#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp13_); -#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar"); -#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = _g_object_ref0 (_tmp16_); -#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_bar_display_action = _tmp17_; -#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = search_bar_display_action; -#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (_tmp18_ != NULL, "search_bar_display_action != null"); -#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = search_bar_display_action; -#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = config_facade_get_instance (); -#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = _tmp20_; -#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp23_ = _variant_new8 (_tmp22_); -#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp23_ = _variant_new12 (_tmp22_); +#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (_tmp19_, _tmp23_); -#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp23_); -#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp21_); -#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonSortEvents"); -#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = _g_object_ref0 (_tmp24_); -#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sort_events_action = _tmp25_; -#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = sort_events_action; -#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (_tmp26_ != NULL, "sort_events_action != null"); -#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = config_facade_get_instance (); -#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = _tmp28_; -#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp30_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = _tmp30_; -#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp29_); -#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp31_) { -#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING; -#line 6829 "LibraryWindow.c" +#line 6929 "LibraryWindow.c" } else { -#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING; -#line 6833 "LibraryWindow.c" +#line 6933 "LibraryWindow.c" } -#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = g_strdup (_tmp27_); -#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - event_sort_val = _tmp32_; #line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + event_sort_val = _tmp32_; +#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = sort_events_action; -#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp34_ = _variant_new9 (event_sort_val); -#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp34_ = _variant_new13 (event_sort_val); +#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_action_change_state (_tmp33_, _tmp34_); -#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_variant_unref0 (_tmp34_); -#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (event_sort_val); -#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (sort_events_action); -#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (search_bar_display_action); -#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (extended_display_action); -#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (basic_display_action); -#line 6857 "LibraryWindow.c" +#line 6957 "LibraryWindow.c" } static gboolean _library_window_on_pulse_background_progress_bar_gsource_func (gpointer self) { gboolean result; result = library_window_on_pulse_background_progress_bar ((LibraryWindow*) self); -#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 6866 "LibraryWindow.c" +#line 6966 "LibraryWindow.c" } @@ -6876,62 +6976,62 @@ static void library_window_start_pulse_background_progress_bar (LibraryWindow* s const gchar* _tmp5_ = NULL; GtkProgressBar* _tmp6_ = NULL; guint _tmp7_ = 0U; -#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (label != NULL); -#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = priority; -#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->current_progress_priority; -#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_ < _tmp1_) { -#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1012 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6891 "LibraryWindow.c" +#line 6991 "LibraryWindow.c" } -#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1014 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = priority; -#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1014 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE); -#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = priority; -#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->current_progress_priority = _tmp3_; -#line 1015 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->background_progress_bar; -#line 1015 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = label; -#line 1015 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_set_text (_tmp4_, _tmp5_); -#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->background_progress_bar; -#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_pulse (_tmp6_); -#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_show_background_progress_bar (self); -#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) LIBRARY_WINDOW_BACKGROUND_PROGRESS_PULSE_MSEC, _library_window_on_pulse_background_progress_bar_gsource_func, g_object_ref (self), g_object_unref); -#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_pulse_id = _tmp7_; -#line 6917 "LibraryWindow.c" +#line 7017 "LibraryWindow.c" } static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow* self) { gboolean result = FALSE; GtkProgressBar* _tmp0_ = NULL; -#line 1023 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1026 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); -#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->background_progress_bar; -#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_pulse (_tmp0_); -#line 1026 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 1026 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 6934 "LibraryWindow.c" +#line 7034 "LibraryWindow.c" } @@ -6940,43 +7040,43 @@ static void library_window_stop_pulse_background_progress_bar (LibraryWindow* se gint _tmp1_ = 0; guint _tmp2_ = 0U; gboolean _tmp4_ = FALSE; -#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1030 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = priority; -#line 1030 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->current_progress_priority; -#line 1030 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_ < _tmp1_) { -#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1034 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 6953 "LibraryWindow.c" +#line 7053 "LibraryWindow.c" } -#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1036 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->background_progress_pulse_id; -#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1036 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_ != ((guint) 0)) { -#line 6959 "LibraryWindow.c" +#line 7059 "LibraryWindow.c" guint _tmp3_ = 0U; -#line 1034 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->background_progress_pulse_id; -#line 1034 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_source_remove (_tmp3_); -#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1038 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_pulse_id = (guint) 0; -#line 6967 "LibraryWindow.c" +#line 7067 "LibraryWindow.c" } -#line 1038 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1041 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = clear; -#line 1038 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1041 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 6973 "LibraryWindow.c" +#line 7073 "LibraryWindow.c" gint _tmp5_ = 0; -#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = priority; -#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_clear_background_progress_bar (self, _tmp5_); -#line 6979 "LibraryWindow.c" +#line 7079 "LibraryWindow.c" } } @@ -7000,102 +7100,102 @@ static void library_window_update_background_progress_bar (LibraryWindow* self, gdouble _tmp18_ = 0.0; gchar* _tmp19_ = NULL; gchar* _tmp20_ = NULL; -#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1045 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1045 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (label != NULL); -#line 1044 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = priority; -#line 1044 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->current_progress_priority; -#line 1044 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_ < _tmp1_) { -#line 1045 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7015 "LibraryWindow.c" +#line 7115 "LibraryWindow.c" } -#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = priority; -#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE); -#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = count; -#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp5_ <= 0.0) { -#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = TRUE; -#line 7027 "LibraryWindow.c" +#line 7127 "LibraryWindow.c" } else { gdouble _tmp6_ = 0.0; -#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = total; -#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp6_ <= 0.0; -#line 7034 "LibraryWindow.c" +#line 7134 "LibraryWindow.c" } -#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = TRUE; -#line 7040 "LibraryWindow.c" +#line 7140 "LibraryWindow.c" } else { gdouble _tmp7_ = 0.0; gdouble _tmp8_ = 0.0; -#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = count; -#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = total; -#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp7_ >= _tmp8_; -#line 7050 "LibraryWindow.c" +#line 7150 "LibraryWindow.c" } -#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_) { -#line 7054 "LibraryWindow.c" +#line 7154 "LibraryWindow.c" gint _tmp9_ = 0; -#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = priority; -#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_clear_background_progress_bar (self, _tmp9_); -#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7062 "LibraryWindow.c" +#line 7162 "LibraryWindow.c" } -#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = priority; -#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->current_progress_priority = _tmp10_; -#line 1057 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = count; -#line 1057 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = total; -#line 1057 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" fraction = _tmp11_ / _tmp12_; -#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = self->priv->background_progress_bar; -#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = fraction; -#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_set_fraction (_tmp13_, _tmp14_); -#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = self->priv->background_progress_bar; -#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = _ ("%s (%d%%)"); -#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = label; -#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = fraction; -#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = g_strdup_printf (_tmp16_, _tmp17_, (gint) (_tmp18_ * 100.0)); -#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = _tmp19_; -#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_set_text (_tmp15_, _tmp20_); -#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp20_); -#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1063 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_show_background_progress_bar (self); -#line 7098 "LibraryWindow.c" +#line 7198 "LibraryWindow.c" } @@ -7105,149 +7205,149 @@ static void library_window_clear_background_progress_bar (LibraryWindow* self, g gint _tmp2_ = 0; GtkProgressBar* _tmp3_ = NULL; GtkProgressBar* _tmp4_ = NULL; -#line 1069 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1072 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1070 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = priority; -#line 1070 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->current_progress_priority; -#line 1070 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_ < _tmp1_) { -#line 1071 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7118 "LibraryWindow.c" +#line 7218 "LibraryWindow.c" } -#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1076 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = priority; -#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1076 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE); -#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->current_progress_priority = 0; -#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1080 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->background_progress_bar; -#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1080 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_set_fraction (_tmp3_, 0.0); -#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1081 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->background_progress_bar; -#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1081 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_progress_bar_set_text (_tmp4_, ""); -#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_hide_background_progress_bar (self); -#line 7136 "LibraryWindow.c" +#line 7236 "LibraryWindow.c" } static void library_window_show_background_progress_bar (LibraryWindow* self) { gboolean _tmp0_ = FALSE; -#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1090 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1091 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->background_progress_displayed; -#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1091 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp0_) { -#line 7148 "LibraryWindow.c" +#line 7248 "LibraryWindow.c" GtkBox* _tmp1_ = NULL; GtkFrame* _tmp2_ = NULL; GtkFrame* _tmp3_ = NULL; -#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1092 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->top_section; -#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1092 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->background_progress_frame; -#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1092 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_box_pack_end (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 1090 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->background_progress_frame; -#line 1090 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); -#line 1091 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_displayed = TRUE; -#line 7164 "LibraryWindow.c" +#line 7264 "LibraryWindow.c" } } static void library_window_hide_background_progress_bar (LibraryWindow* self) { gboolean _tmp0_ = FALSE; -#line 1095 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1096 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1099 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->background_progress_displayed; -#line 1096 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1099 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { -#line 7177 "LibraryWindow.c" +#line 7277 "LibraryWindow.c" GtkBox* _tmp1_ = NULL; GtkFrame* _tmp2_ = NULL; -#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->top_section; -#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->background_progress_frame; -#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); -#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_displayed = FALSE; -#line 7188 "LibraryWindow.c" +#line 7288 "LibraryWindow.c" } } static void library_window_on_library_monitor_discovery_started (LibraryWindow* self) { const gchar* _tmp0_ = NULL; -#line 1102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _ ("Updating library…"); -#line 1103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_start_pulse_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY); -#line 7201 "LibraryWindow.c" +#line 7301 "LibraryWindow.c" } static void library_window_on_library_monitor_discovery_completed (LibraryWindow* self) { -#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_stop_pulse_background_progress_bar (self, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY, TRUE); -#line 7210 "LibraryWindow.c" +#line 7310 "LibraryWindow.c" } static void library_window_on_library_monitor_auto_update_progress (LibraryWindow* self, gint completed_files, gint total_files) { gint _tmp0_ = 0; -#line 1110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = total_files; -#line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_ < LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES) { -#line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY); -#line 7224 "LibraryWindow.c" +#line 7324 "LibraryWindow.c" } else { const gchar* _tmp1_ = NULL; gint _tmp2_ = 0; gint _tmp3_ = 0; -#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _ ("Updating library…"); -#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = completed_files; -#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = total_files; -#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_update_background_progress_bar (self, _tmp1_, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY, (gdouble) _tmp2_, (gdouble) _tmp3_); -#line 7237 "LibraryWindow.c" +#line 7337 "LibraryWindow.c" } } static void library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self) { const gchar* _tmp0_ = NULL; -#line 1119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _ ("Preparing to auto-import photos…"); -#line 1120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_start_pulse_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY); -#line 7250 "LibraryWindow.c" +#line 7350 "LibraryWindow.c" } @@ -7255,44 +7355,44 @@ static void library_window_on_library_monitor_auto_import_progress (LibraryWindo const gchar* _tmp0_ = NULL; guint64 _tmp1_ = 0ULL; guint64 _tmp2_ = 0ULL; -#line 1124 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1127 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _ ("Auto-importing photos…"); -#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = completed_bytes; -#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = total_bytes; -#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_update_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_); -#line 7268 "LibraryWindow.c" +#line 7368 "LibraryWindow.c" } static void library_window_on_metadata_writer_progress (LibraryWindow* self, guint completed, guint total) { guint _tmp0_ = 0U; -#line 1129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = total; -#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_ < ((guint) LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES)) { -#line 1131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY); -#line 7282 "LibraryWindow.c" +#line 7382 "LibraryWindow.c" } else { const gchar* _tmp1_ = NULL; guint _tmp2_ = 0U; guint _tmp3_ = 0U; -#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _ ("Writing metadata to files…"); -#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = completed; -#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = total; -#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_update_background_progress_bar (self, _tmp1_, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY, (gdouble) _tmp2_, (gdouble) _tmp3_); -#line 7295 "LibraryWindow.c" +#line 7395 "LibraryWindow.c" } } @@ -7329,232 +7429,253 @@ static void library_window_create_layout (LibraryWindow* self, Page* start_page) SearchFilterToolbar* _tmp27_ = NULL; GtkBox* _tmp28_ = NULL; GtkStack* _tmp29_ = NULL; - GtkPaned* _tmp30_ = NULL; - GtkPaned* _tmp31_ = NULL; + GtkBox* _tmp30_ = NULL; + GtkRevealer* _tmp31_ = NULL; GtkPaned* _tmp32_ = NULL; - SidebarTree* _tmp33_ = NULL; + GtkPaned* _tmp33_ = NULL; GtkPaned* _tmp34_ = NULL; - GtkBox* _tmp35_ = NULL; + SidebarTree* _tmp35_ = NULL; GtkPaned* _tmp36_ = NULL; - ConfigFacade* _tmp37_ = NULL; - ConfigFacade* _tmp38_ = NULL; - gint _tmp39_ = 0; - GtkStack* _tmp40_ = NULL; + GtkBox* _tmp37_ = NULL; + GtkPaned* _tmp38_ = NULL; + ConfigFacade* _tmp39_ = NULL; + ConfigFacade* _tmp40_ = NULL; gint _tmp41_ = 0; - gint _tmp42_ = 0; - GtkBox* _tmp43_ = NULL; - GtkPaned* _tmp44_ = NULL; + GtkStack* _tmp42_ = NULL; + gint _tmp43_ = 0; + gint _tmp44_ = 0; GtkBox* _tmp45_ = NULL; - Page* _tmp46_ = NULL; - Page* _tmp47_ = NULL; -#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + GtkPaned* _tmp46_ = NULL; + GtkBox* _tmp47_ = NULL; + GtkBuilder* builder = NULL; + GtkBuilder* _tmp48_ = NULL; + GObject* _tmp49_ = NULL; + Page* _tmp50_ = NULL; + Page* _tmp51_ = NULL; +#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_return_if_fail (IS_PAGE (start_page)); #line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_return_if_fail (IS_PAGE (start_page)); +#line 1144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL); -#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp0_); -#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" scrolled_sidebar = _tmp0_; -#line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_scrolled_window_set_policy (scrolled_sidebar, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); -#line 1143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = self->priv->sidebar_tree; -#line 1143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (scrolled_sidebar, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); -#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1148 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->background_progress_frame; -#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1148 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), (guint) 2); -#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->background_progress_frame; -#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->background_progress_bar; -#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); -#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = self->priv->background_progress_frame; -#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget)); -#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_style_context_remove_class (_tmp6_, "frame"); #line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_style_context_remove_class (_tmp6_, "frame"); +#line 1153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = self->priv->basic_properties; -#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL); -#line 1151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = self->priv->basic_properties; -#line 1151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER); -#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->basic_properties; -#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 1153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = self->priv->basic_properties; -#line 1153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = self->priv->basic_properties; -#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 10); -#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = self->priv->basic_properties; -#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), 10); -#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = self->priv->basic_properties; -#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 6); -#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = self->priv->basic_properties; -#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), 0); -#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = self->priv->bottom_frame; -#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = self->priv->basic_properties; -#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget)); -#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = self->priv->bottom_frame; -#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget)); -#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_style_context_remove_class (_tmp18_, "frame"); -#line 1164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = self->priv->top_section; -#line 1164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (scrolled_sidebar, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); -#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = self->priv->sidebar_paned; -#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = self->priv->top_section; -#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_paned_pack1 (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE); -#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = self->priv->sidebar_paned; -#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = self->priv->bottom_frame; -#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_paned_pack2 (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE); -#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = self->priv->sidebar_paned; -#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_paned_set_position (_tmp24_, 1000); -#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); -#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_ref_sink (_tmp25_); -#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->right_vbox); -#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->right_vbox = _tmp25_; -#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp26_ = self->priv->right_vbox; -#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp27_ = self->priv->search_toolbar; -#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); -#line 1172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp28_ = self->priv->right_vbox; -#line 1172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp29_ = self->priv->stack; -#line 1172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_box_pack_start (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp30_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); -#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_object_ref_sink (_tmp30_); + _tmp26_ = self->priv->right_vbox; #line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (self->priv->client_paned); + _tmp27_ = self->priv->search_toolbar; #line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->client_paned = _tmp30_; + gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0); #line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp31_ = self->priv->client_paned; + _tmp28_ = self->priv->right_vbox; #line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp32_ = self->priv->sidebar_paned; + _tmp29_ = self->priv->stack; #line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_paned_pack1 (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE); + gtk_box_pack_start (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp33_ = self->priv->sidebar_tree; + _tmp30_ = self->priv->right_vbox; #line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), LIBRARY_WINDOW_SIDEBAR_MIN_WIDTH, -1); -#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp34_ = self->priv->client_paned; -#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp35_ = self->priv->right_vbox; -#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_paned_pack2 (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE); -#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp36_ = self->priv->client_paned; + _tmp31_ = self->priv->toolbar_revealer; +#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget)); #line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp37_ = config_facade_get_instance (); + _tmp32_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); #line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp38_ = _tmp37_; + g_object_ref_sink (_tmp32_); #line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp39_ = configuration_facade_get_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); -#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_paned_set_position (_tmp36_, _tmp39_); + _g_object_unref0 (self->priv->client_paned); #line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _g_object_unref0 (_tmp38_); -#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp40_ = self->priv->stack; -#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp41_ = library_window_get_PAGE_MIN_WIDTH (); + self->priv->client_paned = _tmp32_; +#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp33_ = self->priv->client_paned; +#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp34_ = self->priv->sidebar_paned; +#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_paned_pack1 (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE); #line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp42_ = _tmp41_; + _tmp35_ = self->priv->sidebar_tree; #line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), _tmp42_, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), LIBRARY_WINDOW_SIDEBAR_MIN_WIDTH, -1); +#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp36_ = self->priv->client_paned; +#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp37_ = self->priv->right_vbox; +#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_paned_pack2 (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE); +#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp38_ = self->priv->client_paned; +#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp39_ = config_facade_get_instance (); #line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp43_ = self->priv->layout; + _tmp40_ = _tmp39_; #line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp44_ = self->priv->client_paned; + _tmp41_ = configuration_facade_get_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)); #line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_box_pack_end (_tmp43_, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_paned_set_position (_tmp38_, _tmp41_); +#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (_tmp40_); #line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp45_ = self->priv->layout; + _tmp42_ = self->priv->stack; #line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget)); + _tmp43_ = library_window_get_PAGE_MIN_WIDTH (); +#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp44_ = _tmp43_; +#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), _tmp44_, -1); +#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp45_ = self->priv->layout; #line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp46_ = start_page; + _tmp46_ = self->priv->client_paned; #line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - library_window_switch_to_page (self, _tmp46_); -#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp47_ = start_page; -#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget)); -#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_box_pack_end (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); +#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp47_ = self->priv->layout; +#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget)); +#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp48_ = gtk_builder_new_from_resource ("/org/gnome/Shotwell/appmenu.ui"); +#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + builder = _tmp48_; +#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp49_ = gtk_builder_get_object (builder, "appmenu"); +#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + application_set_appmenu (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp49_, g_menu_get_type ()) ? ((GMenu*) _tmp49_) : NULL, g_menu_model_get_type (), GMenuModel)); +#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp50_ = start_page; +#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + library_window_switch_to_page (self, _tmp50_); +#line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp51_ = start_page; +#line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget)); +#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (builder); +#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (scrolled_sidebar); -#line 7530 "LibraryWindow.c" +#line 7651 "LibraryWindow.c" } static void library_window_real_set_current_page (PageWindow* base, Page* page) { LibraryWindow * self; Page* _tmp0_ = NULL; -#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp0_); -#line 7545 "LibraryWindow.c" +#line 7666 "LibraryWindow.c" } void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable) { gboolean _tmp0_ = FALSE; -#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = should_enable; -#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->page_switching_enabled = _tmp0_; -#line 7557 "LibraryWindow.c" +#line 7678 "LibraryWindow.c" } @@ -7591,43 +7712,43 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { GtkToolbar* _tmp47_ = NULL; GtkToolbar* _tmp48_ = NULL; Page* _tmp54_ = NULL; -#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->page_switching_enabled; -#line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp0_) { -#line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7604 "LibraryWindow.c" +#line 7725 "LibraryWindow.c" } -#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page; -#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp1_ == _tmp3_; -#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp3_); -#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 1204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 7620 "LibraryWindow.c" +#line 7741 "LibraryWindow.c" } -#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" current_page = _tmp5_; -#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = current_page; -#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp6_ != NULL) { -#line 7630 "LibraryWindow.c" +#line 7751 "LibraryWindow.c" GtkToolbar* toolbar = NULL; Page* _tmp7_ = NULL; GtkToolbar* _tmp8_ = NULL; @@ -7635,96 +7756,96 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { Page* _tmp12_ = NULL; Page* _tmp13_ = NULL; Page* _tmp15_ = NULL; -#line 1208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), FALSE); -#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" application_set_menubar (NULL); -#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = current_page; -#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = page_get_toolbar (_tmp7_); -#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" toolbar = _tmp8_; -#line 1212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = toolbar; -#line 1212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp9_ != NULL) { -#line 7652 "LibraryWindow.c" - GtkBox* _tmp10_ = NULL; +#line 7773 "LibraryWindow.c" + GtkRevealer* _tmp10_ = NULL; GtkToolbar* _tmp11_ = NULL; -#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp10_ = self->priv->right_vbox; -#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp10_ = self->priv->toolbar_revealer; +#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = toolbar; -#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget)); -#line 7661 "LibraryWindow.c" +#line 7782 "LibraryWindow.c" } -#line 1215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = current_page; -#line 1215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" page_switching_from (_tmp12_); -#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = current_page; -#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO_PAGE)) { -#line 7671 "LibraryWindow.c" +#line 7792 "LibraryWindow.c" SidebarTree* _tmp14_ = NULL; -#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = self->priv->sidebar_tree; -#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_enable_editing (_tmp14_); -#line 7677 "LibraryWindow.c" +#line 7798 "LibraryWindow.c" } -#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = current_page; -#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_unsubscribe_from_basic_information (self, _tmp15_); -#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (toolbar); -#line 7685 "LibraryWindow.c" +#line 7806 "LibraryWindow.c" } -#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = self->priv->stack; -#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = page; -#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_stack_set_visible_child (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget)); -#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = page; -#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" PAGE_WINDOW_CLASS (library_window_parent_class)->set_current_page (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), _tmp18_); -#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = page; -#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_LIBRARY_PHOTO_PAGE)) { -#line 7701 "LibraryWindow.c" +#line 7822 "LibraryWindow.c" SidebarTree* _tmp20_ = NULL; -#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = self->priv->sidebar_tree; -#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_disable_editing (_tmp20_); -#line 7707 "LibraryWindow.c" +#line 7828 "LibraryWindow.c" } -#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = library_window_should_show_search_bar (self); -#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = page; -#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_toggle_search_bar (self, _tmp21_, G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp22_) : NULL); -#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = self->priv->page_map; -#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = page; -#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_); -#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" entry = (SidebarEntry*) _tmp25_; -#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = entry; -#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp26_ != NULL) { -#line 7727 "LibraryWindow.c" +#line 7848 "LibraryWindow.c" SidebarExpandableEntry* expandable_entry = NULL; SidebarEntry* _tmp27_ = NULL; SidebarExpandableEntry* _tmp28_ = NULL; @@ -7732,141 +7853,141 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) { SidebarExpandableEntry* _tmp30_ = NULL; SidebarTree* _tmp35_ = NULL; SidebarEntry* _tmp36_ = NULL; -#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = entry; -#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, SIDEBAR_TYPE_EXPANDABLE_ENTRY) ? ((SidebarExpandableEntry*) _tmp27_) : NULL); -#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" expandable_entry = _tmp28_; -#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp30_ = expandable_entry; -#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp30_ != NULL) { -#line 7745 "LibraryWindow.c" +#line 7866 "LibraryWindow.c" SidebarExpandableEntry* _tmp31_ = NULL; gboolean _tmp32_ = FALSE; -#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = expandable_entry; -#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = sidebar_expandable_entry_expand_on_select (_tmp31_); -#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = _tmp32_; -#line 7754 "LibraryWindow.c" +#line 7875 "LibraryWindow.c" } else { -#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = FALSE; -#line 7758 "LibraryWindow.c" +#line 7879 "LibraryWindow.c" } -#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp29_) { -#line 7762 "LibraryWindow.c" +#line 7883 "LibraryWindow.c" SidebarTree* _tmp33_ = NULL; SidebarEntry* _tmp34_ = NULL; -#line 1249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = self->priv->sidebar_tree; -#line 1249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = entry; -#line 1249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_expand_to_entry (_tmp33_, _tmp34_); -#line 7771 "LibraryWindow.c" +#line 7892 "LibraryWindow.c" } -#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp35_ = self->priv->sidebar_tree; -#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp36_ = entry; -#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" sidebar_tree_place_cursor (_tmp35_, _tmp36_, TRUE); -#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (expandable_entry); -#line 7781 "LibraryWindow.c" +#line 7902 "LibraryWindow.c" } -#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties (self); -#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp37_ = page; -#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, TYPE_CHECKERBOARD_PAGE)) { -#line 7789 "LibraryWindow.c" +#line 7910 "LibraryWindow.c" Page* _tmp38_ = NULL; -#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp38_ = page; -#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_init_view_filter (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)); -#line 7795 "LibraryWindow.c" +#line 7916 "LibraryWindow.c" } -#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp39_ = page; -#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget)); -#line 1262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp40_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp41_ = _tmp40_; -#line 1262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_subscribe_for_basic_information (self, _tmp41_); -#line 1262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp41_); -#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp42_ = page; -#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" page_switched_to (_tmp42_); -#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp43_ = page; -#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp44_ = page_get_menubar (_tmp43_); -#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp45_ = _tmp44_; -#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" application_set_menubar (_tmp45_); -#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp45_); -#line 1267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), TRUE); -#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp46_ = page; -#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp47_ = page_get_toolbar (_tmp46_); -#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" toolbar = _tmp47_; -#line 1270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp48_ = toolbar; -#line 1270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp48_ != NULL) { -#line 7835 "LibraryWindow.c" - GtkBox* _tmp49_ = NULL; +#line 7956 "LibraryWindow.c" + GtkRevealer* _tmp49_ = NULL; GtkToolbar* _tmp50_ = NULL; GtkToolbar* _tmp51_ = NULL; - GtkToolbar* _tmp52_ = NULL; + GtkRevealer* _tmp52_ = NULL; gboolean _tmp53_ = FALSE; -#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp49_ = self->priv->right_vbox; -#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp49_ = self->priv->toolbar_revealer; +#line 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp50_ = toolbar; -#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget)); -#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp51_ = toolbar; -#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget)); -#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _tmp52_ = toolbar; -#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp52_ = self->priv->toolbar_revealer; +#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp53_ = library_window_is_toolbar_visible (self); -#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), _tmp53_); -#line 7857 "LibraryWindow.c" +#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + gtk_revealer_set_reveal_child (_tmp52_, _tmp53_); +#line 7978 "LibraryWindow.c" } -#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp54_ = page; -#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" page_ready (_tmp54_); -#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (toolbar); -#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (entry); -#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (current_page); -#line 7869 "LibraryWindow.c" +#line 7990 "LibraryWindow.c" } @@ -7881,41 +8002,41 @@ static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPa CheckerboardPage* _tmp7_ = NULL; SearchViewFilter* _tmp8_ = NULL; SearchViewFilter* _tmp9_ = NULL; -#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_CHECKERBOARD_PAGE (page)); -#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->search_toolbar; -#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page; -#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = checkerboard_page_get_search_view_filter (_tmp1_); -#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp2_; -#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_filter_toolbar_set_view_filter (_tmp0_, _tmp3_); -#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _view_filter_unref0 (_tmp3_); -#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = page; -#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE, Page)); -#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; -#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = page; -#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = checkerboard_page_get_search_view_filter (_tmp7_); -#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _tmp8_; -#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view_collection_install_view_filter (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_FILTER, ViewFilter)); -#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _view_filter_unref0 (_tmp9_); -#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp6_); -#line 7918 "LibraryWindow.c" +#line 8039 "LibraryWindow.c" } @@ -7925,35 +8046,35 @@ static gboolean library_window_should_show_search_bar (LibraryWindow* self) { Page* _tmp1_ = NULL; Page* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE); -#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_CHECKERBOARD_PAGE); -#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_) { -#line 7940 "LibraryWindow.c" +#line 8061 "LibraryWindow.c" gboolean _tmp4_ = FALSE; -#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->is_search_toolbar_visible; -#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _tmp4_; -#line 7946 "LibraryWindow.c" +#line 8067 "LibraryWindow.c" } else { -#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = FALSE; -#line 7950 "LibraryWindow.c" +#line 8071 "LibraryWindow.c" } -#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = _tmp0_; -#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 7956 "LibraryWindow.c" +#line 8077 "LibraryWindow.c" } @@ -7961,21 +8082,21 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show SearchFilterToolbar* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; -#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail ((page == NULL) || IS_CHECKERBOARD_PAGE (page)); -#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->search_toolbar; -#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = show; -#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gtk_revealer_set_reveal_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_revealer_get_type (), GtkRevealer), _tmp1_); -#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = show; -#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 7978 "LibraryWindow.c" +#line 8099 "LibraryWindow.c" CheckerboardPage* _tmp3_ = NULL; SearchFilterToolbar* _tmp4_ = NULL; CheckerboardPage* _tmp5_ = NULL; @@ -7987,70 +8108,70 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show CheckerboardPage* _tmp11_ = NULL; SearchViewFilter* _tmp12_ = NULL; SearchViewFilter* _tmp13_ = NULL; -#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = page; -#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (NULL != _tmp3_, "null != page"); -#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->search_toolbar; -#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = page; -#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = checkerboard_page_get_search_view_filter (_tmp5_); -#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = _tmp6_; -#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" search_filter_toolbar_set_view_filter (_tmp4_, _tmp7_); -#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _view_filter_unref0 (_tmp7_); -#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = page; -#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page)); -#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = _tmp9_; -#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = page; -#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = checkerboard_page_get_search_view_filter (_tmp11_); -#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = _tmp12_; -#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view_collection_install_view_filter (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_VIEW_FILTER, ViewFilter)); -#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _view_filter_unref0 (_tmp13_); -#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp10_); -#line 8024 "LibraryWindow.c" +#line 8145 "LibraryWindow.c" } else { CheckerboardPage* _tmp14_ = NULL; -#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = page; -#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp14_ != NULL) { -#line 8031 "LibraryWindow.c" +#line 8152 "LibraryWindow.c" CheckerboardPage* _tmp15_ = NULL; ViewCollection* _tmp16_ = NULL; ViewCollection* _tmp17_ = NULL; DisabledViewFilter* _tmp18_ = NULL; DisabledViewFilter* _tmp19_ = NULL; -#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = page; -#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE, Page)); -#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = _tmp16_; -#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = disabled_view_filter_new (); -#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = _tmp18_; -#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view_collection_install_view_filter (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_VIEW_FILTER, ViewFilter)); -#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _view_filter_unref0 (_tmp19_); -#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (_tmp17_); -#line 8053 "LibraryWindow.c" +#line 8174 "LibraryWindow.c" } } } @@ -8064,33 +8185,33 @@ static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepr Page* _tmp4_ = NULL; SidebarPageRepresentative* _tmp5_ = NULL; Page* _tmp6_ = NULL; -#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry)); -#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->page_map; -#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page; -#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (!_tmp2_, "!page_map.has_key(page)"); -#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->page_map; -#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = page; -#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = entry; -#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry)); -#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = page; -#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_add_to_stack (self, _tmp6_); -#line 8093 "LibraryWindow.c" +#line 8214 "LibraryWindow.c" } @@ -8104,61 +8225,61 @@ static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageR GeeHashMap* _tmp10_ = NULL; Page* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; -#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry)); -#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _tmp0_ == _tmp2_; -#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp2_); -#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp3_) { -#line 8125 "LibraryWindow.c" +#line 8246 "LibraryWindow.c" LibraryBranch* _tmp4_ = NULL; LibraryPhotosEntry* _tmp5_ = NULL; LibraryPhotosEntry* _tmp6_ = NULL; Page* _tmp7_ = NULL; Page* _tmp8_ = NULL; -#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->library_branch; -#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = library_branch_get_photos_entry (_tmp4_); -#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp5_; -#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = _tmp7_; -#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp8_); -#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp8_); -#line 8145 "LibraryWindow.c" +#line 8266 "LibraryWindow.c" } -#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = page; -#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_remove_from_stack (self, _tmp9_); -#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = self->priv->page_map; -#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = page; -#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL); -#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" removed = _tmp12_; -#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _vala_assert (removed, "removed"); -#line 8161 "LibraryWindow.c" +#line 8282 "LibraryWindow.c" } @@ -8167,39 +8288,39 @@ static void library_window_on_sidebar_entry_selected (LibraryWindow* self, Sideb SidebarSelectableEntry* _tmp0_ = NULL; SidebarPageRepresentative* _tmp1_ = NULL; SidebarPageRepresentative* _tmp2_ = NULL; -#line 1319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable)); -#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = selectable; -#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp0_) : NULL); -#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" page_rep = _tmp1_; -#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = page_rep; -#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_ != NULL) { -#line 8184 "LibraryWindow.c" +#line 8305 "LibraryWindow.c" SidebarPageRepresentative* _tmp3_ = NULL; Page* _tmp4_ = NULL; Page* _tmp5_ = NULL; -#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = page_rep; -#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = sidebar_page_representative_get_page (_tmp3_); -#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp5_); -#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 8198 "LibraryWindow.c" +#line 8319 "LibraryWindow.c" } -#line 1319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (page_rep); -#line 8202 "LibraryWindow.c" +#line 8323 "LibraryWindow.c" } @@ -8220,207 +8341,207 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel LibraryPhotosEntry* _tmp32_ = NULL; Page* _tmp33_ = NULL; Page* _tmp34_ = NULL; -#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable)); -#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->library_branch; -#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = library_branch_get_last_imported_entry (_tmp0_); -#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = _g_object_ref0 (_tmp2_); -#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" last_import_entry = _tmp3_; -#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = selectable; -#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY)) { -#line 8241 "LibraryWindow.c" +#line 8362 "LibraryWindow.c" LibraryLastImportSidebarEntry* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; gboolean _tmp8_ = FALSE; -#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = last_import_entry; -#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = library_hideable_page_entry_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry)); -#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = _tmp7_; -#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp8_; -#line 8253 "LibraryWindow.c" +#line 8374 "LibraryWindow.c" } else { -#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = FALSE; -#line 8257 "LibraryWindow.c" +#line 8378 "LibraryWindow.c" } -#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 8261 "LibraryWindow.c" +#line 8382 "LibraryWindow.c" LibraryLastImportSidebarEntry* _tmp9_ = NULL; Page* _tmp10_ = NULL; Page* _tmp11_ = NULL; -#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = last_import_entry; -#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = _tmp10_; -#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp11_); -#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp11_); -#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (last_import_entry); -#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8279 "LibraryWindow.c" +#line 8400 "LibraryWindow.c" } -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = selectable; -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, EVENTS_TYPE_EVENT_ENTRY)) { -#line 8285 "LibraryWindow.c" +#line 8406 "LibraryWindow.c" EventsBranch* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = self->priv->events_branch; -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch)); -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = _tmp15_; -#line 8294 "LibraryWindow.c" +#line 8415 "LibraryWindow.c" } else { -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = FALSE; -#line 8298 "LibraryWindow.c" +#line 8419 "LibraryWindow.c" } -#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp12_) { -#line 8302 "LibraryWindow.c" +#line 8423 "LibraryWindow.c" EventsBranch* _tmp16_ = NULL; EventsMasterDirectoryEntry* _tmp17_ = NULL; EventsMasterDirectoryEntry* _tmp18_ = NULL; Page* _tmp19_ = NULL; Page* _tmp20_ = NULL; -#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = self->priv->events_branch; -#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = events_branch_get_master_entry (_tmp16_); -#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = _tmp17_; -#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = _tmp19_; -#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp20_); -#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp20_); -#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp18_); -#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (last_import_entry); -#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8328 "LibraryWindow.c" +#line 8449 "LibraryWindow.c" } -#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = selectable; -#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, EVENTS_TYPE_DIRECTORY_ENTRY)) { -#line 8334 "LibraryWindow.c" +#line 8455 "LibraryWindow.c" EventsBranch* _tmp23_ = NULL; gboolean _tmp24_ = FALSE; -#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = self->priv->events_branch; -#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_BRANCH, SidebarBranch)); -#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = _tmp24_; -#line 8343 "LibraryWindow.c" +#line 8464 "LibraryWindow.c" } else { -#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = FALSE; -#line 8347 "LibraryWindow.c" +#line 8468 "LibraryWindow.c" } -#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp21_) { -#line 8351 "LibraryWindow.c" +#line 8472 "LibraryWindow.c" EventsBranch* _tmp25_ = NULL; EventsMasterDirectoryEntry* _tmp26_ = NULL; EventsMasterDirectoryEntry* _tmp27_ = NULL; Page* _tmp28_ = NULL; Page* _tmp29_ = NULL; -#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = self->priv->events_branch; -#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = events_branch_get_master_entry (_tmp25_); -#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp27_ = _tmp26_; -#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = _tmp28_; -#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp29_); -#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp29_); -#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp27_); -#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (last_import_entry); -#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8377 "LibraryWindow.c" +#line 8498 "LibraryWindow.c" } -#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp30_ = self->priv->library_branch; -#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = library_branch_get_photos_entry (_tmp30_); -#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = _tmp31_; -#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative)); -#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = _tmp33_; -#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_switch_to_page (self, _tmp34_); -#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp34_); -#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (last_import_entry); -#line 8395 "LibraryWindow.c" +#line 8516 "LibraryWindow.c" } static void _library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) { -#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 8402 "LibraryWindow.c" +#line 8523 "LibraryWindow.c" } static void _library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { -#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 8409 "LibraryWindow.c" +#line 8530 "LibraryWindow.c" } static void _library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) { -#line 1361 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 8416 "LibraryWindow.c" +#line 8537 "LibraryWindow.c" } static void _library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) { -#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_update_properties ((LibraryWindow*) self); -#line 8423 "LibraryWindow.c" +#line 8544 "LibraryWindow.c" } @@ -8428,27 +8549,27 @@ static void library_window_subscribe_for_basic_information (LibraryWindow* self, ViewCollection* view = NULL; Page* _tmp0_ = NULL; ViewCollection* _tmp1_ = NULL; -#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 1357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page_get_view (_tmp0_); -#line 1357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = _tmp1_; -#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (view, "items-state-changed", (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self, 0); -#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_update_properties_data_collection_items_altered, self, 0); -#line 1361 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self, 0); -#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_connect_object (view, "items-visibility-changed", (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self, 0); -#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 8451 "LibraryWindow.c" +#line 8572 "LibraryWindow.c" } @@ -8460,47 +8581,47 @@ static void library_window_unsubscribe_from_basic_information (LibraryWindow* se guint _tmp3_ = 0U; guint _tmp4_ = 0U; guint _tmp5_ = 0U; -#line 1365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_PAGE (page)); -#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = page; -#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = page_get_view (_tmp0_); -#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" view = _tmp1_; -#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp2_, NULL, FALSE); -#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self); -#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE); -#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_items_altered, self); -#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE); -#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self); -#line 1371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE); -#line 1371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self); -#line 1365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (view); -#line 8491 "LibraryWindow.c" +#line 8612 "LibraryWindow.c" } static void library_window_on_update_properties (LibraryWindow* self) { OneShotScheduler* _tmp0_ = NULL; -#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->properties_scheduler; -#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" one_shot_scheduler_at_idle (_tmp0_); -#line 8503 "LibraryWindow.c" +#line 8624 "LibraryWindow.c" } @@ -8511,55 +8632,55 @@ static void library_window_on_update_properties_now (LibraryWindow* self) { ExtendedPropertiesWindow* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; gboolean _tmp8_ = FALSE; -#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->bottom_frame; -#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = _tmp1_; -#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp2_) { -#line 8524 "LibraryWindow.c" +#line 8645 "LibraryWindow.c" BasicProperties* _tmp3_ = NULL; Page* _tmp4_ = NULL; Page* _tmp5_ = NULL; -#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = self->priv->basic_properties; -#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = _tmp4_; -#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_); -#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp5_); -#line 8538 "LibraryWindow.c" +#line 8659 "LibraryWindow.c" } -#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->extended_properties; -#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); -#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = _tmp7_; -#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp8_) { -#line 8548 "LibraryWindow.c" +#line 8669 "LibraryWindow.c" ExtendedPropertiesWindow* _tmp9_ = NULL; Page* _tmp10_ = NULL; Page* _tmp11_ = NULL; -#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = self->priv->extended_properties; -#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = _tmp10_; -#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" extended_properties_window_update_properties (_tmp9_, _tmp11_); -#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp11_); -#line 8562 "LibraryWindow.c" +#line 8683 "LibraryWindow.c" } } @@ -8567,13 +8688,13 @@ static void library_window_on_update_properties_now (LibraryWindow* self) { static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 8576 "LibraryWindow.c" +#line 8697 "LibraryWindow.c" { GRegex* regex = NULL; const gchar* _tmp0_ = NULL; @@ -8586,100 +8707,100 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = old; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" regex = _tmp4_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 8607 "LibraryWindow.c" +#line 8728 "LibraryWindow.c" goto __catch41_g_regex_error; } -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return NULL; -#line 8616 "LibraryWindow.c" +#line 8737 "LibraryWindow.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp7_ = replacement; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 8632 "LibraryWindow.c" +#line 8753 "LibraryWindow.c" goto __catch41_g_regex_error; } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return NULL; -#line 8643 "LibraryWindow.c" +#line 8764 "LibraryWindow.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = _tmp9_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; -#line 8657 "LibraryWindow.c" +#line 8778 "LibraryWindow.c" } goto __finally41; __catch41_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 8671 "LibraryWindow.c" +#line 8792 "LibraryWindow.c" } __finally41: -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return NULL; -#line 8682 "LibraryWindow.c" +#line 8803 "LibraryWindow.c" } } @@ -8697,66 +8818,66 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons gboolean _tmp13_ = FALSE; gboolean _tmp18_ = FALSE; GError * _inner_error_ = NULL; -#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (IS_LIBRARY_WINDOW (self)); -#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_if_fail (uri != NULL); -#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = uri; -#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:1387: mount point reported: %s", _tmp0_); -#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:1394: mount point reported: %s", _tmp0_); +#line 1397 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = uri; -#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1397 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = library_window_is_mount_uri_supported (_tmp1_); -#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1397 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp2_) { -#line 8714 "LibraryWindow.c" +#line 8835 "LibraryWindow.c" const gchar* _tmp3_ = NULL; -#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp3_ = uri; -#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:1391: Unsupported mount scheme: %s", _tmp3_); -#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:1398: Unsupported mount scheme: %s", _tmp3_); +#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8722 "LibraryWindow.c" +#line 8843 "LibraryWindow.c" } -#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = uri; -#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = g_file_new_for_uri (_tmp4_); -#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" uri_file = _tmp5_; -#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" mount = NULL; -#line 8732 "LibraryWindow.c" +#line 8853 "LibraryWindow.c" { GMount* _tmp6_ = NULL; GFile* _tmp7_ = NULL; GMount* _tmp8_ = NULL; GMount* _tmp9_ = NULL; -#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = uri_file; -#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = g_file_find_enclosing_mount (_tmp7_, NULL, &_inner_error_); -#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = _tmp8_; -#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8746 "LibraryWindow.c" +#line 8867 "LibraryWindow.c" goto __catch40_g_error; } -#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _tmp6_; -#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = NULL; -#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" mount = _tmp9_; -#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp6_); -#line 8759 "LibraryWindow.c" +#line 8880 "LibraryWindow.c" } goto __finally40; __catch40_g_error: @@ -8764,121 +8885,121 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons GError* err = NULL; GError* _tmp10_ = NULL; const gchar* _tmp11_ = NULL; -#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" err = _inner_error_; -#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _inner_error_ = NULL; -#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = err; -#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = _tmp10_->message; -#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_debug ("LibraryWindow.vala:1403: %s", _tmp11_); -#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_debug ("LibraryWindow.vala:1410: %s", _tmp11_); +#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_error_free0 (err); -#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (uri_file); -#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8785 "LibraryWindow.c" +#line 8906 "LibraryWindow.c" } __finally40: -#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (uri_file); -#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_clear_error (&_inner_error_); -#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return; -#line 8800 "LibraryWindow.c" +#line 8921 "LibraryWindow.c" } -#line 1409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" alt_uri = NULL; -#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = uri; -#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = g_str_has_prefix (_tmp12_, "file://"); -#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp13_) { -#line 8810 "LibraryWindow.c" +#line 8931 "LibraryWindow.c" const gchar* _tmp14_ = NULL; gchar* _tmp15_ = NULL; gchar* _tmp16_ = NULL; gchar* _tmp17_ = NULL; -#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = uri; -#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = string_replace (_tmp14_, "file://", "disk:"); -#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = _tmp15_; -#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = camera_table_get_port_uri (_tmp16_); -#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (alt_uri); -#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" alt_uri = _tmp17_; -#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (_tmp16_); -#line 8829 "LibraryWindow.c" +#line 8950 "LibraryWindow.c" } -#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = at_startup; -#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp18_) { -#line 8835 "LibraryWindow.c" +#line 8956 "LibraryWindow.c" const gchar* _tmp19_ = NULL; gboolean _tmp20_ = FALSE; const gchar* _tmp23_ = NULL; gboolean _tmp24_ = FALSE; -#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = uri; -#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = is_string_empty (_tmp19_); -#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp20_) { -#line 8846 "LibraryWindow.c" +#line 8967 "LibraryWindow.c" GeeHashSet* _tmp21_ = NULL; const gchar* _tmp22_ = NULL; -#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = library_window_initial_camera_uris; -#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = uri; -#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_); -#line 8855 "LibraryWindow.c" +#line 8976 "LibraryWindow.c" } -#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = alt_uri; -#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = is_string_empty (_tmp23_); -#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp24_) { -#line 8863 "LibraryWindow.c" +#line 8984 "LibraryWindow.c" GeeHashSet* _tmp25_ = NULL; const gchar* _tmp26_ = NULL; -#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp25_ = library_window_initial_camera_uris; -#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = alt_uri; -#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_); -#line 8872 "LibraryWindow.c" +#line 8993 "LibraryWindow.c" } } -#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_free0 (alt_uri); -#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (mount); -#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (uri_file); -#line 8881 "LibraryWindow.c" +#line 9002 "LibraryWindow.c" } @@ -8895,97 +9016,97 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe GdkEventKey* _tmp13_ = NULL; guint _tmp14_ = 0U; const gchar* _tmp15_ = NULL; -#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->sidebar_tree; -#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), "has-focus", &_tmp3_, NULL); -#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = _tmp3_; -#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp4_) { -#line 8910 "LibraryWindow.c" +#line 9031 "LibraryWindow.c" SidebarTree* _tmp5_ = NULL; GdkEventKey* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; -#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp5_ = self->priv->sidebar_tree; -#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = event; -#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp7_ = sidebar_tree_is_keypress_interpreted (_tmp5_, _tmp6_); -#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = _tmp7_; -#line 8922 "LibraryWindow.c" +#line 9043 "LibraryWindow.c" } else { -#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp1_ = FALSE; -#line 8926 "LibraryWindow.c" +#line 9047 "LibraryWindow.c" } -#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp1_) { -#line 8930 "LibraryWindow.c" +#line 9051 "LibraryWindow.c" SidebarTree* _tmp8_ = NULL; GdkEventKey* _tmp9_ = NULL; gboolean _tmp10_ = FALSE; -#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = self->priv->sidebar_tree; -#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = event; -#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp9_, &_tmp10_); -#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = _tmp10_; -#line 8942 "LibraryWindow.c" +#line 9063 "LibraryWindow.c" } else { -#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = FALSE; -#line 8946 "LibraryWindow.c" +#line 9067 "LibraryWindow.c" } -#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp0_) { -#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1433 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1433 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 8954 "LibraryWindow.c" +#line 9075 "LibraryWindow.c" } -#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp11_ = event; -#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = GTK_WIDGET_CLASS (library_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), _tmp11_); -#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp12_) { -#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 8966 "LibraryWindow.c" +#line 9087 "LibraryWindow.c" } -#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp13_ = event; -#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = _tmp13_->keyval; -#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = gdk_keyval_name (_tmp14_); -#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (g_strcmp0 (_tmp15_, "Escape") == 0) { -#line 1433 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_clear_search (self); -#line 1434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = TRUE; -#line 1434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 8982 "LibraryWindow.c" +#line 9103 "LibraryWindow.c" } -#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" result = FALSE; -#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 8988 "LibraryWindow.c" +#line 9109 "LibraryWindow.c" } @@ -9001,14 +9122,14 @@ gint library_window_get_PAGE_MIN_WIDTH (void) { result = _tmp1_ + (CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING * 2); #line 12 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return result; -#line 9004 "LibraryWindow.c" +#line 9125 "LibraryWindow.c" } static gpointer _data_collection_ref0 (gpointer self) { #line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return self ? data_collection_ref (self) : NULL; -#line 9011 "LibraryWindow.c" +#line 9132 "LibraryWindow.c" } @@ -9054,14 +9175,14 @@ static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_co self->priv->view = _tmp5_; #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return self; -#line 9057 "LibraryWindow.c" +#line 9178 "LibraryWindow.c" } static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_new (CollectionPage* collection, Photo* start, ViewCollection* view) { #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" return library_window_fullscreen_photo_page_construct (LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, collection, start, view); -#line 9064 "LibraryWindow.c" +#line 9185 "LibraryWindow.c" } @@ -9082,7 +9203,7 @@ static void library_window_fullscreen_photo_page_real_switched_to (Page* base) { library_photo_page_display_for_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), _tmp0_, _tmp1_, _tmp2_); #line 84 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" PAGE_CLASS (library_window_fullscreen_photo_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), TYPE_PAGE, Page)); -#line 9085 "LibraryWindow.c" +#line 9206 "LibraryWindow.c" } @@ -9097,7 +9218,7 @@ static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames _tmp0_ = ui_filenames; #line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui"); -#line 9100 "LibraryWindow.c" +#line 9221 "LibraryWindow.c" } @@ -9112,14 +9233,14 @@ static void library_window_fullscreen_photo_page_class_init (LibraryWindowFullsc ((PageClass *) klass)->init_collect_ui_filenames = library_window_fullscreen_photo_page_real_init_collect_ui_filenames; #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" G_OBJECT_CLASS (klass)->finalize = library_window_fullscreen_photo_page_finalize; -#line 9115 "LibraryWindow.c" +#line 9236 "LibraryWindow.c" } static void library_window_fullscreen_photo_page_instance_init (LibraryWindowFullscreenPhotoPage * self) { #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv = LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_GET_PRIVATE (self); -#line 9122 "LibraryWindow.c" +#line 9243 "LibraryWindow.c" } @@ -9135,7 +9256,7 @@ static void library_window_fullscreen_photo_page_finalize (GObject* obj) { _data_collection_unref0 (self->priv->view); #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" G_OBJECT_CLASS (library_window_fullscreen_photo_page_parent_class)->finalize (obj); -#line 9138 "LibraryWindow.c" +#line 9259 "LibraryWindow.c" } @@ -9189,7 +9310,7 @@ static void library_window_class_init (LibraryWindowClass * klass) { _tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_initial_camera_uris = _tmp0_; -#line 9192 "LibraryWindow.c" +#line 9313 "LibraryWindow.c" } @@ -9213,6 +9334,7 @@ static void library_window_instance_init (LibraryWindow * self) { BasicProperties* _tmp16_ = NULL; GtkStack* _tmp17_ = NULL; GtkBox* _tmp18_ = NULL; + GtkRevealer* _tmp19_ = NULL; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv = LIBRARY_WINDOW_GET_PRIVATE (self); #line 95 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" @@ -9319,11 +9441,17 @@ static void library_window_instance_init (LibraryWindow * self) { g_object_ref_sink (_tmp18_); #line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->layout = _tmp18_; -#line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - self->priv->current_progress_priority = 0; +#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _tmp19_ = (GtkRevealer*) gtk_revealer_new (); +#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_object_ref_sink (_tmp19_); +#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->toolbar_revealer = _tmp19_; #line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + self->priv->current_progress_priority = 0; +#line 143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self->priv->background_progress_pulse_id = (guint) 0; -#line 9326 "LibraryWindow.c" +#line 9454 "LibraryWindow.c" } @@ -9363,51 +9491,51 @@ static void library_window_finalize (GObject* obj) { guint _tmp45_ = 0U; #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_WINDOW, LibraryWindow); -#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp0_ = self->priv->sidebar_tree; -#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("page-created", SIDEBAR_TYPE_TREE, &_tmp1_, NULL, FALSE); -#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self); #line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self); +#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp2_ = self->priv->sidebar_tree; -#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_TREE, &_tmp3_, NULL, FALSE); -#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self); #line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self); +#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp4_ = self->priv->sidebar_tree; -#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("entry-selected", SIDEBAR_TYPE_TREE, &_tmp5_, NULL, FALSE); -#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self); #line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self); +#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp6_ = self->priv->sidebar_tree; -#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("selected-entry-removed", SIDEBAR_TYPE_TREE, &_tmp7_, NULL, FALSE); -#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed, self); -#line 220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp8_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp9_ = _tmp8_; -#line 220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_unsubscribe_from_basic_information (self, _tmp9_); -#line 220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp9_); -#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp10_ = self->priv->extended_properties; -#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("hide", gtk_widget_get_type (), &_tmp11_, NULL, FALSE); -#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self); #line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self); +#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp12_ = self->priv->extended_properties; -#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("show", gtk_widget_get_type (), &_tmp13_, NULL, FALSE); -#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _library_window_show_extended_properties_gtk_widget_show, self); -#line 9410 "LibraryWindow.c" +#line 9538 "LibraryWindow.c" { GeeIterator* _media_sources_it = NULL; MediaCollectionRegistry* _tmp14_ = NULL; @@ -9416,27 +9544,27 @@ static void library_window_finalize (GObject* obj) { GeeCollection* _tmp17_ = NULL; GeeIterator* _tmp18_ = NULL; GeeIterator* _tmp19_ = NULL; -#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp14_ = media_collection_registry_get_instance (); -#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp15_ = _tmp14_; -#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp16_ = media_collection_registry_get_all (_tmp15_); -#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp17_ = _tmp16_; -#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp19_ = _tmp18_; -#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp17_); -#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _media_collection_registry_unref0 (_tmp15_); -#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _media_sources_it = _tmp19_; -#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" while (TRUE) { -#line 9439 "LibraryWindow.c" +#line 9567 "LibraryWindow.c" GeeIterator* _tmp20_ = NULL; gboolean _tmp21_ = FALSE; MediaSourceCollection* media_sources = NULL; @@ -9446,105 +9574,105 @@ static void library_window_finalize (GObject* obj) { guint _tmp25_ = 0U; MediaSourceCollection* _tmp26_ = NULL; guint _tmp27_ = 0U; -#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp20_ = _media_sources_it; -#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp21_ = gee_iterator_next (_tmp20_); -#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (!_tmp21_) { -#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 9457 "LibraryWindow.c" +#line 9585 "LibraryWindow.c" } -#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp22_ = _media_sources_it; -#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp23_ = gee_iterator_get (_tmp22_); -#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - media_sources = (MediaSourceCollection*) _tmp23_; #line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + media_sources = (MediaSourceCollection*) _tmp23_; +#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp24_ = media_sources; -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp25_, NULL, FALSE); -#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self); #line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self); +#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp26_ = media_sources; -#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp27_, NULL, FALSE); -#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp27_, 0, NULL, (GCallback) _library_window_on_media_altered_data_collection_items_altered, self); -#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _data_collection_unref0 (media_sources); -#line 9479 "LibraryWindow.c" +#line 9607 "LibraryWindow.c" } -#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_media_sources_it); -#line 9483 "LibraryWindow.c" +#line 9611 "LibraryWindow.c" } -#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp28_ = metadata_writer_get_instance (); -#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp29_ = _tmp28_; -#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("progress", TYPE_METADATA_WRITER, &_tmp30_, NULL, FALSE); -#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp29_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp30_, 0, NULL, (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self); -#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (_tmp29_); -#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp31_ = library_monitor_pool_get_instance (); -#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp32_ = _tmp31_; -#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp33_ = library_monitor_pool_get_monitor (_tmp32_); -#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp34_ = _tmp33_; -#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _library_monitor_pool_unref0 (_tmp32_); -#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - monitor = _tmp34_; #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + monitor = _tmp34_; +#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp35_ = monitor; -#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" if (_tmp35_ != NULL) { -#line 9511 "LibraryWindow.c" +#line 9639 "LibraryWindow.c" LibraryMonitor* _tmp36_ = NULL; -#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp36_ = monitor; -#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" library_window_on_library_monitor_destroyed (self, _tmp36_); -#line 9517 "LibraryWindow.c" +#line 9645 "LibraryWindow.c" } -#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp37_ = library_monitor_pool_get_instance (); -#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp38_ = _tmp37_; -#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("monitor-installed", TYPE_LIBRARY_MONITOR_POOL, &_tmp39_, NULL, FALSE); -#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp38_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp39_, 0, NULL, (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self); -#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" - _library_monitor_pool_unref0 (_tmp38_); #line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _library_monitor_pool_unref0 (_tmp38_); +#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp40_ = library_monitor_pool_get_instance (); -#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp41_ = _tmp40_; -#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("monitor-destroyed", TYPE_LIBRARY_MONITOR_POOL, &_tmp42_, NULL, FALSE); -#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp41_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp42_, 0, NULL, (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self); -#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _library_monitor_pool_unref0 (_tmp41_); -#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp43_ = camera_table_get_instance (); -#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _tmp44_ = _tmp43_; -#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_parse_name ("camera-added", TYPE_CAMERA_TABLE, &_tmp45_, NULL, FALSE); -#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" g_signal_handlers_disconnect_matched (_tmp44_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp45_, 0, NULL, (GCallback) _library_window_on_camera_added_camera_table_camera_added, self); -#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" +#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _camera_table_unref0 (_tmp44_); #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (monitor); @@ -9596,9 +9724,11 @@ static void library_window_finalize (GObject* obj) { _g_object_unref0 (self->priv->layout); #line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" _g_object_unref0 (self->priv->right_vbox); +#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" + _g_object_unref0 (self->priv->toolbar_revealer); #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" G_OBJECT_CLASS (library_window_parent_class)->finalize (obj); -#line 9601 "LibraryWindow.c" +#line 9731 "LibraryWindow.c" } @@ -9619,13 +9749,13 @@ static void _vala_library_window_get_property (GObject * object, guint property_ self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_LIBRARY_WINDOW, LibraryWindow); #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" switch (property_id) { -#line 9622 "LibraryWindow.c" +#line 9752 "LibraryWindow.c" default: #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala" break; -#line 9628 "LibraryWindow.c" +#line 9758 "LibraryWindow.c" } } |