summaryrefslogtreecommitdiff
path: root/src/library/LibraryWindow.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-06-25 20:55:59 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-06-25 20:55:59 +0200
commitab841afa5cb39058d9ab2cebb67cfe6369443f6e (patch)
tree64961342a79003ee865b3f9f8f41f99f09f37a2e /src/library/LibraryWindow.c
parent49120f48474fc8fdc2448c75d961bc238213cfac (diff)
New upstream version 0.28.3upstream/0.28.3
Diffstat (limited to 'src/library/LibraryWindow.c')
-rw-r--r--src/library/LibraryWindow.c6586
1 files changed, 3376 insertions, 3210 deletions
diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c
index bb92872..906dbab 100644
--- a/src/library/LibraryWindow.c
+++ b/src/library/LibraryWindow.c
@@ -1,4 +1,4 @@
-/* LibraryWindow.c generated by valac 0.36.6, the Vala compiler
+/* LibraryWindow.c generated by valac 0.40.4, the Vala compiler
* generated from LibraryWindow.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -247,6 +248,11 @@ typedef struct _BasicPropertiesClass BasicPropertiesClass;
typedef struct _ExtendedPropertiesWindow ExtendedPropertiesWindow;
typedef struct _ExtendedPropertiesWindowClass ExtendedPropertiesWindowClass;
+enum {
+ LIBRARY_WINDOW_0_PROPERTY,
+ LIBRARY_WINDOW_NUM_PROPERTIES
+};
+static GParamSpec* library_window_properties[LIBRARY_WINDOW_NUM_PROPERTIES];
#define SIDEBAR_TYPE_SELECTABLE_ENTRY (sidebar_selectable_entry_get_type ())
#define SIDEBAR_SELECTABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY, SidebarSelectableEntry))
@@ -920,6 +926,11 @@ typedef struct _LibraryPhotoPagePrivate LibraryPhotoPagePrivate;
#define TYPE_RAW_DEVELOPER (raw_developer_get_type ())
typedef struct _LibraryWindowFullscreenPhotoPagePrivate LibraryWindowFullscreenPhotoPagePrivate;
+enum {
+ LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_0_PROPERTY,
+ LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* library_window_fullscreen_photo_page_properties[LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_NUM_PROPERTIES];
#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -1224,9 +1235,15 @@ void dimensions_free (Dimensions* self);
GType library_window_get_type (void) G_GNUC_CONST;
gpointer one_shot_scheduler_ref (gpointer instance);
void one_shot_scheduler_unref (gpointer instance);
-GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_one_shot_scheduler (GValue* value, gpointer v_object);
-void value_take_one_shot_scheduler (GValue* value, gpointer v_object);
+GParamSpec* param_spec_one_shot_scheduler (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_one_shot_scheduler (GValue* value,
+ gpointer v_object);
+void value_take_one_shot_scheduler (GValue* value,
+ gpointer v_object);
gpointer value_get_one_shot_scheduler (const GValue* value);
GType one_shot_scheduler_get_type (void) G_GNUC_CONST;
GType sidebar_tree_get_type (void) G_GNUC_CONST;
@@ -1243,9 +1260,15 @@ GType editing_host_page_get_type (void) G_GNUC_CONST;
GType library_photo_page_get_type (void) G_GNUC_CONST;
gpointer search_filter_actions_ref (gpointer instance);
void search_filter_actions_unref (gpointer instance);
-GParamSpec* param_spec_search_filter_actions (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_search_filter_actions (GValue* value, gpointer v_object);
-void value_take_search_filter_actions (GValue* value, gpointer v_object);
+GParamSpec* param_spec_search_filter_actions (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_search_filter_actions (GValue* value,
+ gpointer v_object);
+void value_take_search_filter_actions (GValue* value,
+ gpointer v_object);
gpointer value_get_search_filter_actions (const GValue* value);
GType search_filter_actions_get_type (void) G_GNUC_CONST;
GType search_filter_toolbar_get_type (void) G_GNUC_CONST;
@@ -1253,30 +1276,52 @@ GType properties_get_type (void) G_GNUC_CONST;
GType basic_properties_get_type (void) G_GNUC_CONST;
GType extended_properties_window_get_type (void) G_GNUC_CONST;
#define LIBRARY_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LIBRARY_WINDOW, LibraryWindowPrivate))
-enum {
- LIBRARY_WINDOW_DUMMY_PROPERTY
-};
GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
-static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepresentative* entry, Page* page);
-static void _library_window_on_page_created_sidebar_tree_page_created (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self);
-static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageRepresentative* entry, Page* page);
-static void _library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self);
-static void library_window_on_sidebar_entry_selected (LibraryWindow* self, SidebarSelectableEntry* selectable);
-static void _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender, SidebarSelectableEntry* selectable, gpointer self);
-static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* self, SidebarSelectableEntry* selectable);
-static void _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender, SidebarSelectableEntry* removed, gpointer self);
-static void library_window_unsubscribe_from_basic_information (LibraryWindow* self, Page* page);
+static void library_window_on_page_created (LibraryWindow* self,
+ SidebarPageRepresentative* entry,
+ Page* page);
+static void _library_window_on_page_created_sidebar_tree_page_created (SidebarTree* _sender,
+ SidebarPageRepresentative* entry,
+ Page* page,
+ gpointer self);
+static void library_window_on_destroying_page (LibraryWindow* self,
+ SidebarPageRepresentative* entry,
+ Page* page);
+static void _library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender,
+ SidebarPageRepresentative* entry,
+ Page* page,
+ gpointer self);
+static void library_window_on_sidebar_entry_selected (LibraryWindow* self,
+ SidebarSelectableEntry* selectable);
+static void _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender,
+ SidebarSelectableEntry* selectable,
+ gpointer self);
+static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* self,
+ SidebarSelectableEntry* selectable);
+static void _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender,
+ SidebarSelectableEntry* removed,
+ gpointer self);
+static void library_window_unsubscribe_from_basic_information (LibraryWindow* self,
+ Page* page);
Page* page_window_get_current_page (PageWindow* self);
static void library_window_hide_extended_properties (LibraryWindow* self);
-static void _library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender, gpointer self);
+static void _library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender,
+ gpointer self);
static void library_window_show_extended_properties (LibraryWindow* self);
-static void _library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender, gpointer self);
+static void _library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender,
+ gpointer self);
gpointer data_collection_ref (gpointer instance);
void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_data_collection (GValue* value,
+ gpointer v_object);
+void value_take_data_collection (GValue* value,
+ gpointer v_object);
gpointer value_get_data_collection (const GValue* value);
GType data_collection_get_type (void) G_GNUC_CONST;
GType source_collection_get_type (void) G_GNUC_CONST;
@@ -1284,9 +1329,15 @@ GType database_source_collection_get_type (void) G_GNUC_CONST;
GType media_source_collection_get_type (void) G_GNUC_CONST;
gpointer media_collection_registry_ref (gpointer instance);
void media_collection_registry_unref (gpointer instance);
-GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_media_collection_registry (GValue* value, gpointer v_object);
-void value_take_media_collection_registry (GValue* value, gpointer v_object);
+GParamSpec* param_spec_media_collection_registry (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_media_collection_registry (GValue* value,
+ gpointer v_object);
+void value_take_media_collection_registry (GValue* value,
+ gpointer v_object);
gpointer value_get_media_collection_registry (const GValue* value);
GType media_collection_registry_get_type (void) G_GNUC_CONST;
MediaCollectionRegistry* media_collection_registry_get_instance (void);
@@ -1296,52 +1347,95 @@ GType data_object_get_type (void) G_GNUC_CONST;
GType data_source_get_type (void) G_GNUC_CONST;
GType thumbnail_source_get_type (void) G_GNUC_CONST;
GType media_source_get_type (void) G_GNUC_CONST;
-static void _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self);
+static void _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender,
+ GeeCollection* added,
+ GeeCollection* removed,
+ gpointer self);
static void library_window_on_media_altered (LibraryWindow* self);
gpointer alteration_ref (gpointer instance);
void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_alteration (GValue* value,
+ gpointer v_object);
+void value_take_alteration (GValue* value,
+ gpointer v_object);
gpointer value_get_alteration (const GValue* value);
GType alteration_get_type (void) G_GNUC_CONST;
-static void _library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
+static void _library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender,
+ GeeMap* items,
+ gpointer self);
GType metadata_writer_get_type (void) G_GNUC_CONST;
MetadataWriter* metadata_writer_get_instance (void);
-static void library_window_on_metadata_writer_progress (LibraryWindow* self, guint completed, guint total);
-static void _library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender, guint completed, guint total, gpointer self);
+static void library_window_on_metadata_writer_progress (LibraryWindow* self,
+ guint completed,
+ guint total);
+static void _library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender,
+ guint completed,
+ guint total,
+ gpointer self);
GType directory_monitor_get_type (void) G_GNUC_CONST;
GType library_monitor_get_type (void) G_GNUC_CONST;
gpointer library_monitor_pool_ref (gpointer instance);
void library_monitor_pool_unref (gpointer instance);
-GParamSpec* param_spec_library_monitor_pool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_library_monitor_pool (GValue* value, gpointer v_object);
-void value_take_library_monitor_pool (GValue* value, gpointer v_object);
+GParamSpec* param_spec_library_monitor_pool (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_library_monitor_pool (GValue* value,
+ gpointer v_object);
+void value_take_library_monitor_pool (GValue* value,
+ gpointer v_object);
gpointer value_get_library_monitor_pool (const GValue* value);
GType library_monitor_pool_get_type (void) G_GNUC_CONST;
LibraryMonitorPool* library_monitor_pool_get_instance (void);
LibraryMonitor* library_monitor_pool_get_monitor (LibraryMonitorPool* self);
-static void library_window_on_library_monitor_destroyed (LibraryWindow* self, LibraryMonitor* monitor);
-static void library_window_on_library_monitor_installed (LibraryWindow* self, LibraryMonitor* monitor);
-static void _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self);
-static void _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self);
+static void library_window_on_library_monitor_destroyed (LibraryWindow* self,
+ LibraryMonitor* monitor);
+static void library_window_on_library_monitor_installed (LibraryWindow* self,
+ LibraryMonitor* monitor);
+static void _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender,
+ LibraryMonitor* monitor,
+ gpointer self);
+static void _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender,
+ LibraryMonitor* monitor,
+ gpointer self);
gpointer camera_table_ref (gpointer instance);
void camera_table_unref (gpointer instance);
-GParamSpec* param_spec_camera_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_camera_table (GValue* value, gpointer v_object);
-void value_take_camera_table (GValue* value, gpointer v_object);
+GParamSpec* param_spec_camera_table (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_camera_table (GValue* value,
+ gpointer v_object);
+void value_take_camera_table (GValue* value,
+ gpointer v_object);
gpointer value_get_camera_table (const GValue* value);
GType camera_table_get_type (void) G_GNUC_CONST;
CameraTable* camera_table_get_instance (void);
gpointer discovered_camera_ref (gpointer instance);
void discovered_camera_unref (gpointer instance);
-GParamSpec* param_spec_discovered_camera (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_discovered_camera (GValue* value, gpointer v_object);
-void value_take_discovered_camera (GValue* value, gpointer v_object);
+GParamSpec* param_spec_discovered_camera (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_discovered_camera (GValue* value,
+ gpointer v_object);
+void value_take_discovered_camera (GValue* value,
+ gpointer v_object);
gpointer value_get_discovered_camera (const GValue* value);
GType discovered_camera_get_type (void) G_GNUC_CONST;
-static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamera* camera);
-static void _library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self);
+static void library_window_on_camera_added (LibraryWindow* self,
+ DiscoveredCamera* camera);
+static void _library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender,
+ DiscoveredCamera* camera,
+ gpointer self);
static GType library_window_sidebar_root_position_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
GType library_window_target_type_get_type (void) G_GNUC_CONST;
LibraryBranch* library_branch_new (void);
@@ -1372,73 +1466,168 @@ BasicProperties* basic_properties_construct (GType object_type);
#define LIBRARY_WINDOW_TAG_PATH_MIME_TYPE "shotwell/tag-path"
#define LIBRARY_WINDOW_MEDIA_LIST_MIME_TYPE "shotwell/media-id-atom"
static void library_window_on_file_import (LibraryWindow* self);
-static void _library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void library_window_on_external_library_import (LibraryWindow* self);
-static void _library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void library_window_on_preferences (LibraryWindow* self);
-static void _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void library_window_on_empty_trash (LibraryWindow* self);
-static void _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void library_window_on_jump_to_event (LibraryWindow* self);
-static void _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void library_window_on_find (LibraryWindow* self);
-static void _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void library_window_on_new_search (LibraryWindow* self);
-static void _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void library_window_on_action_toggle (LibraryWindow* self, GAction* action, GVariant* value);
-static void _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void library_window_on_display_basic_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value);
-static void _library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
-static void library_window_on_display_extended_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value);
-static void _library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
-static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAction* action, GVariant* value);
-static void _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
-static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleAction* action, GVariant* variant);
-static void _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
-static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleAction* action, GVariant* variant);
-static void _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
-static void library_window_on_action_radio (LibraryWindow* self, GAction* action, GVariant* value);
-static void _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleAction* action, GVariant* value);
-static void _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
-LibraryWindow* library_window_new (ProgressMonitor progress_monitor, void* progress_monitor_target);
-LibraryWindow* library_window_construct (GType object_type, ProgressMonitor progress_monitor, void* progress_monitor_target);
+static void _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
+static void library_window_on_action_toggle (LibraryWindow* self,
+ GAction* action,
+ GVariant* value);
+static void _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
+static void library_window_on_display_basic_properties (LibraryWindow* self,
+ GSimpleAction* action,
+ GVariant* value);
+static void _library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action,
+ GVariant* value,
+ gpointer self);
+static void library_window_on_display_extended_properties (LibraryWindow* self,
+ GSimpleAction* action,
+ GVariant* value);
+static void _library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action,
+ GVariant* value,
+ gpointer self);
+static void library_window_on_display_searchbar (LibraryWindow* self,
+ GSimpleAction* action,
+ GVariant* value);
+static void _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action,
+ GVariant* value,
+ gpointer self);
+static void library_window_on_display_sidebar (LibraryWindow* self,
+ GSimpleAction* action,
+ GVariant* variant);
+static void _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action,
+ GVariant* value,
+ gpointer self);
+static void library_window_on_display_toolbar (LibraryWindow* self,
+ GSimpleAction* action,
+ GVariant* variant);
+static void _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action,
+ GVariant* value,
+ gpointer self);
+static void library_window_on_action_radio (LibraryWindow* self,
+ GAction* action,
+ GVariant* value);
+static void _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
+static void library_window_on_events_sort_changed (LibraryWindow* self,
+ GSimpleAction* action,
+ GVariant* value);
+static void _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action,
+ GVariant* value,
+ gpointer self);
+LibraryWindow* library_window_new (ProgressMonitor progress_monitor,
+ void* progress_monitor_target);
+LibraryWindow* library_window_construct (GType object_type,
+ ProgressMonitor progress_monitor,
+ void* progress_monitor_target);
AppWindow* app_window_construct (GType object_type);
-static void library_window_external_drop_handler (LibraryWindow* self, GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time);
-static void _library_window_external_drop_handler_sidebar_tree_external_drop_handler (GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time, gpointer self);
-SidebarTree* sidebar_tree_new (GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target);
-SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target);
-void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position);
+static void library_window_external_drop_handler (LibraryWindow* self,
+ GdkDragContext* context,
+ SidebarEntry* entry,
+ GtkSelectionData* data,
+ guint info,
+ guint time);
+static void _library_window_external_drop_handler_sidebar_tree_external_drop_handler (GdkDragContext* context,
+ SidebarEntry* entry,
+ GtkSelectionData* data,
+ guint info,
+ guint time,
+ gpointer self);
+SidebarTree* sidebar_tree_new (GtkTargetEntry* target_entries,
+ int target_entries_length1,
+ GdkDragAction actions,
+ SidebarTreeExternalDropHandler drop_handler,
+ void* drop_handler_target);
+SidebarTree* sidebar_tree_construct (GType object_type,
+ GtkTargetEntry* target_entries,
+ int target_entries_length1,
+ GdkDragAction actions,
+ SidebarTreeExternalDropHandler drop_handler,
+ void* drop_handler_target);
+void sidebar_tree_graft (SidebarTree* self,
+ SidebarBranch* branch,
+ gint position);
ExtendedPropertiesWindow* extended_properties_window_new (GtkWindow* owner);
-ExtendedPropertiesWindow* extended_properties_window_construct (GType object_type, GtkWindow* owner);
+ExtendedPropertiesWindow* extended_properties_window_construct (GType object_type,
+ GtkWindow* owner);
static void library_window_on_update_properties_now (LibraryWindow* self);
static void _library_window_on_update_properties_now_one_shot_callback (gpointer self);
-OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target);
-OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target);
+OneShotScheduler* one_shot_scheduler_new (const gchar* name,
+ OneShotCallback callback,
+ void* callback_target);
+OneShotScheduler* one_shot_scheduler_construct (GType object_type,
+ const gchar* name,
+ OneShotCallback callback,
+ void* callback_target);
SearchFilterToolbar* search_filter_toolbar_new (SearchFilterActions* actions);
-SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchFilterActions* actions);
-static void library_window_create_layout (LibraryWindow* self, Page* start_page);
+SearchFilterToolbar* search_filter_toolbar_construct (GType object_type,
+ SearchFilterActions* actions);
+static void library_window_create_layout (LibraryWindow* self,
+ Page* start_page);
GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST;
GType library_photos_entry_get_type (void) G_GNUC_CONST;
LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self);
Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self);
static void library_window_load_configuration (LibraryWindow* self);
-void application_set_accels_for_action (const gchar* action, gchar** accel, int accel_length1);
+void application_set_accels_for_action (const gchar* action,
+ gchar** accel,
+ int accel_length1);
GFile* directory_monitor_get_root (DirectoryMonitor* self);
static void library_window_on_library_monitor_discovery_started (LibraryWindow* self);
-static void _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender, gpointer self);
+static void _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender,
+ gpointer self);
static void library_window_on_library_monitor_discovery_completed (LibraryWindow* self);
-static void _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self);
-static void _library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender, gpointer self);
-static void library_window_on_library_monitor_auto_update_progress (LibraryWindow* self, gint completed_files, gint total_files);
-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);
+static void _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender,
+ gpointer self);
+static void _library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender,
+ gpointer self);
+static void library_window_on_library_monitor_auto_update_progress (LibraryWindow* self,
+ gint completed_files,
+ gint total_files);
+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);
static void library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self);
-static void _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender, gpointer self);
-static void library_window_on_library_monitor_auto_import_progress (LibraryWindow* self, guint64 completed_bytes, guint64 total_bytes);
-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);
+static void _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender,
+ gpointer self);
+static void library_window_on_library_monitor_auto_import_progress (LibraryWindow* self,
+ guint64 completed_bytes,
+ guint64 total_bytes);
+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);
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);
+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);
@@ -1448,68 +1637,111 @@ 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);
+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;
ViewCollection* page_get_view (Page* self);
gpointer view_filter_ref (gpointer instance);
void view_filter_unref (gpointer instance);
-GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_view_filter (GValue* value, gpointer v_object);
-void value_take_view_filter (GValue* value, gpointer v_object);
+GParamSpec* param_spec_view_filter (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_view_filter (GValue* value,
+ gpointer v_object);
+void value_take_view_filter (GValue* value,
+ gpointer v_object);
gpointer value_get_view_filter (const GValue* value);
GType view_filter_get_type (void) G_GNUC_CONST;
-static void library_window_on_view_filter_installed (LibraryWindow* self, ViewFilter* filter);
-static void _library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender, ViewFilter* filer, gpointer self);
-static void library_window_on_view_filter_removed (LibraryWindow* self, ViewFilter* filter);
-static void _library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender, ViewFilter* filer, gpointer self);
-void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Page* old_page, Page* new_page);
+static void library_window_on_view_filter_installed (LibraryWindow* self,
+ ViewFilter* filter);
+static void _library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender,
+ ViewFilter* filer,
+ gpointer self);
+static void library_window_on_view_filter_removed (LibraryWindow* self,
+ ViewFilter* filter);
+static void _library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender,
+ ViewFilter* filer,
+ gpointer self);
+void search_filter_actions_monitor_page_contents (SearchFilterActions* self,
+ Page* old_page,
+ Page* new_page);
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);
+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_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);
+GAction* page_get_common_action (Page* self,
+ const gchar* name,
+ gboolean log_warning);
GType checkerboard_page_get_type (void) G_GNUC_CONST;
-static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPage* page);
-static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show, CheckerboardPage* page);
+static void library_window_init_view_filter (LibraryWindow* self,
+ CheckerboardPage* page);
+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 void library_window_set_sidebar_visible (LibraryWindow* self,
+ gboolean visible);
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);
#define RESOURCES_APP_LIBRARY_ROLE _ ("Photo Manager")
GType tag_get_type (void) G_GNUC_CONST;
-void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag);
+void library_window_rename_tag_in_sidebar (LibraryWindow* self,
+ Tag* tag);
GType tags_sidebar_entry_get_type (void) G_GNUC_CONST;
-TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, Tag* tag);
-gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* entry);
+TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self,
+ Tag* tag);
+gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self,
+ SidebarEntry* entry);
GType event_source_get_type (void) G_GNUC_CONST;
GType event_get_type (void) G_GNUC_CONST;
-void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event);
+void library_window_rename_event_in_sidebar (LibraryWindow* self,
+ Event* event);
GType events_event_entry_get_type (void) G_GNUC_CONST;
-EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, Event* event);
+EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self,
+ Event* event);
GType saved_search_get_type (void) G_GNUC_CONST;
-void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch* search);
+void library_window_rename_search_in_sidebar (LibraryWindow* self,
+ SavedSearch* search);
GType searches_sidebar_entry_get_type (void) G_GNUC_CONST;
-SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self, SavedSearch* search);
+SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self,
+ SavedSearch* search);
static void library_window_real_on_quit (AppWindow* base);
-void configuration_facade_set_library_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions);
-void configuration_facade_set_sidebar_position (ConfigurationFacade* self, gint position);
+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);
GType media_page_get_type (void) G_GNUC_CONST;
GType collection_page_get_type (void) G_GNUC_CONST;
GType photo_source_get_type (void) G_GNUC_CONST;
GType photo_get_type (void) G_GNUC_CONST;
-static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, CollectionPage* page);
+static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self,
+ CollectionPage* page);
gint view_collection_get_selected_count (ViewCollection* self);
-GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t);
+GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self,
+ GType t);
GType library_photo_get_type (void) G_GNUC_CONST;
-GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t);
-static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* page, CollectionPage* * collection, Photo* * start, ViewCollection* * view_collection);
+GeeList* view_collection_get_sources_of_type (ViewCollection* self,
+ GType t);
+static gboolean library_window_get_fullscreen_photo (LibraryWindow* self,
+ Page* page,
+ CollectionPage* * collection,
+ Photo* * start,
+ ViewCollection* * view_collection);
GType events_directory_page_get_type (void) G_GNUC_CONST;
gint data_collection_get_count (DataCollection* self);
-DataObject* data_collection_get_at (DataCollection* self, gint index);
+DataObject* data_collection_get_at (DataCollection* self,
+ gint index);
GType data_view_get_type (void) G_GNUC_CONST;
DataSource* data_view_get_source (DataView* self);
GType event_page_get_type (void) G_GNUC_CONST;
@@ -1518,36 +1750,68 @@ gboolean editing_host_page_has_photo (EditingHostPage* self);
Photo* editing_host_page_get_photo (EditingHostPage* self);
static void library_window_real_on_fullscreen (AppWindow* base);
static GType library_window_fullscreen_photo_page_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_new (CollectionPage* collection, Photo* start, ViewCollection* view);
-static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_construct (GType object_type, CollectionPage* collection, Photo* start, ViewCollection* view);
-void app_window_go_fullscreen (AppWindow* self, Page* page);
+static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_new (CollectionPage* collection,
+ Photo* start,
+ ViewCollection* view);
+static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_construct (GType object_type,
+ CollectionPage* collection,
+ Photo* start,
+ ViewCollection* view);
+void app_window_go_fullscreen (AppWindow* self,
+ Page* page);
#define RESOURCES_CANCEL_LABEL _ ("_Cancel")
#define RESOURCES_OK_LABEL _ ("_OK")
gboolean app_dirs_is_in_import_dir (GFile* file);
GtkResponseType copy_files_dialog (void);
-static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* uris, const gchar* job_name, gboolean copy_to_library, gboolean recurse);
+static void library_window_dispatch_import_jobs (LibraryWindow* self,
+ GSList* uris,
+ const gchar* job_name,
+ gboolean copy_to_library,
+ gboolean recurse);
static void _g_free0_ (gpointer var);
-static void _g_slist_free__g_free0_ (GSList* self);
+static inline void _g_slist_free__g_free0_ (GSList* self);
GType data_imports_ui_data_imports_dialog_get_type (void) G_GNUC_CONST;
DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_create_instance (void);
-static void library_window_real_update_common_action_availability (AppWindow* base, Page* old_page, Page* new_page);
-void app_window_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page);
-void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name, gboolean sensitive);
-static void library_window_real_update_common_actions (AppWindow* base, Page* page, gint selected_count, gint count);
+static void library_window_real_update_common_action_availability (AppWindow* base,
+ Page* old_page,
+ Page* new_page);
+void app_window_update_common_action_availability (AppWindow* self,
+ Page* old_page,
+ Page* new_page);
+void app_window_set_common_action_sensitive (AppWindow* self,
+ const gchar* name,
+ gboolean sensitive);
+static void library_window_real_update_common_actions (AppWindow* base,
+ Page* page,
+ gint selected_count,
+ gint count);
static gboolean library_window_can_empty_trash (LibraryWindow* self);
-void app_window_set_common_action_visible (AppWindow* self, const gchar* name, gboolean visible);
+void app_window_set_common_action_visible (AppWindow* self,
+ const gchar* name,
+ gboolean visible);
static gboolean library_window_can_jump_to_event (LibraryWindow* self);
-void app_window_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count);
+void app_window_update_common_actions (AppWindow* self,
+ Page* page,
+ gint selected_count,
+ gint count);
GType library_photo_source_collection_get_type (void) G_GNUC_CONST;
gint media_source_collection_get_trashcan_count (MediaSourceCollection* self);
GType video_source_collection_get_type (void) G_GNUC_CONST;
GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollection* self);
-void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const gchar* progress_dialog_text);
+void remove_from_app (GeeCollection* sources,
+ const gchar* dialog_title,
+ const gchar* progress_dialog_text);
gpointer command_manager_ref (gpointer instance);
void command_manager_unref (gpointer instance);
-GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_command_manager (GValue* value, gpointer v_object);
-void value_take_command_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_command_manager (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_command_manager (GValue* value,
+ gpointer v_object);
+void value_take_command_manager (GValue* value,
+ gpointer v_object);
gpointer value_get_command_manager (const GValue* value);
GType command_manager_get_type (void) G_GNUC_CONST;
CommandManager* app_window_get_command_manager (void);
@@ -1556,99 +1820,194 @@ SavedSearchDialog* saved_search_dialog_new (void);
SavedSearchDialog* saved_search_dialog_construct (GType object_type);
GType saved_search_dialog_get_type (void) G_GNUC_CONST;
void saved_search_dialog_show (SavedSearchDialog* self);
-DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index);
+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);
+void library_window_switch_to_event (LibraryWindow* self,
+ Event* event);
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);
gint library_window_get_events_sort (LibraryWindow* self);
-void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self, gboolean sort);
+void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self,
+ gboolean sort);
void preferences_dialog_show_preferences (void);
-void properties_update_properties (Properties* self, Page* page);
-void configuration_facade_set_display_basic_properties (ConfigurationFacade* self, gboolean display);
+void properties_update_properties (Properties* self,
+ Page* page);
+void configuration_facade_set_display_basic_properties (ConfigurationFacade* self,
+ gboolean display);
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);
+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);
+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);
+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);
+void configuration_facade_set_display_toolbar (ConfigurationFacade* self,
+ gboolean display);
gboolean configuration_facade_get_display_toolbar (ConfigurationFacade* self);
-static void library_window_sync_extended_properties (LibraryWindow* self, gboolean show);
+static void library_window_sync_extended_properties (LibraryWindow* self,
+ gboolean show);
static GVariant* _variant_new9 (gboolean value);
-void configuration_facade_set_display_extended_properties (ConfigurationFacade* self, gboolean display);
+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);
+void library_window_enqueue_batch_import (LibraryWindow* self,
+ BatchImport* batch_import,
+ gboolean allow_user_cancel);
GType library_hideable_page_entry_get_type (void) G_GNUC_CONST;
GType library_import_queue_sidebar_entry_get_type (void) G_GNUC_CONST;
LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBranch* self);
-void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self, BatchImport* batch_import, gboolean allow_user_cancel);
+void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self,
+ BatchImport* batch_import,
+ gboolean allow_user_cancel);
gpointer import_manifest_ref (gpointer instance);
void import_manifest_unref (gpointer instance);
-GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_import_manifest (GValue* value, gpointer v_object);
-void value_take_import_manifest (GValue* value, gpointer v_object);
+GParamSpec* param_spec_import_manifest (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_import_manifest (GValue* value,
+ gpointer v_object);
+void value_take_import_manifest (GValue* value,
+ gpointer v_object);
gpointer value_get_import_manifest (const GValue* value);
GType import_manifest_get_type (void) G_GNUC_CONST;
-static void library_window_import_reporter (LibraryWindow* self, ImportManifest* manifest);
+static void library_window_import_reporter (LibraryWindow* self,
+ ImportManifest* manifest);
gpointer import_ui_question_params_ref (gpointer instance);
void import_ui_question_params_unref (gpointer instance);
-GParamSpec* import_ui_param_spec_question_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void import_ui_value_set_question_params (GValue* value, gpointer v_object);
-void import_ui_value_take_question_params (GValue* value, gpointer v_object);
+GParamSpec* import_ui_param_spec_question_params (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void import_ui_value_set_question_params (GValue* value,
+ gpointer v_object);
+void import_ui_value_take_question_params (GValue* value,
+ gpointer v_object);
gpointer import_ui_value_get_question_params (const GValue* value);
GType import_ui_question_params_get_type (void) G_GNUC_CONST;
-gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest_id, ImportUIQuestionParams* question);
+gboolean import_ui_report_manifest (ImportManifest* manifest,
+ gboolean show_dest_id,
+ ImportUIQuestionParams* question);
GFile* app_dirs_get_import_dir (void);
-GtkResponseType app_window_affirm_cancel_question (const gchar* message, const gchar* affirmative, const gchar* title, GtkWindow* parent);
+GtkResponseType app_window_affirm_cancel_question (const gchar* message,
+ const gchar* affirmative,
+ const gchar* title,
+ GtkWindow* parent);
AppWindow* app_window_get_instance (void);
gpointer batch_import_job_ref (gpointer instance);
void batch_import_job_unref (gpointer instance);
-GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_batch_import_job (GValue* value, gpointer v_object);
-void value_take_batch_import_job (GValue* value, gpointer v_object);
+GParamSpec* param_spec_batch_import_job (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_batch_import_job (GValue* value,
+ gpointer v_object);
+void value_take_batch_import_job (GValue* value,
+ gpointer v_object);
gpointer value_get_batch_import_job (const GValue* value);
GType batch_import_job_get_type (void) G_GNUC_CONST;
GType file_import_job_get_type (void) G_GNUC_CONST;
-void app_window_error_message (const gchar* message, GtkWindow* parent);
-FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library, gboolean recurse);
-FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library, gboolean recurse);
+void app_window_error_message (const gchar* message,
+ GtkWindow* parent);
+FileImportJob* file_import_job_new (GFile* file_or_dir,
+ gboolean copy_to_library,
+ gboolean recurse);
+FileImportJob* file_import_job_construct (GType object_type,
+ GFile* file_or_dir,
+ gboolean copy_to_library,
+ gboolean recurse);
gpointer batch_import_roll_ref (gpointer instance);
void batch_import_roll_unref (gpointer instance);
-GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_batch_import_roll (GValue* value, gpointer v_object);
-void value_take_batch_import_roll (GValue* value, gpointer v_object);
+GParamSpec* param_spec_batch_import_roll (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_batch_import_roll (GValue* value,
+ gpointer v_object);
+void value_take_batch_import_roll (GValue* value,
+ gpointer v_object);
gpointer value_get_batch_import_roll (const GValue* value);
GType batch_import_roll_get_type (void) G_GNUC_CONST;
-static void _library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self);
-BatchImport* batch_import_new (GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest);
-BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest);
+static void _library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest,
+ BatchImportRoll* import_roll,
+ gpointer self);
+BatchImport* batch_import_new (GeeIterable* jobs,
+ const gchar* name,
+ BatchImportImportReporter reporter,
+ void* reporter_target,
+ GeeArrayList* prefailed,
+ GeeArrayList* pre_already_imported,
+ GCancellable* cancellable,
+ BatchImportRoll* import_roll,
+ ImportManifest* skip_manifest);
+BatchImport* batch_import_construct (GType object_type,
+ GeeIterable* jobs,
+ const gchar* name,
+ BatchImportImportReporter reporter,
+ void* reporter_target,
+ GeeArrayList* prefailed,
+ GeeArrayList* pre_already_imported,
+ GCancellable* cancellable,
+ BatchImportRoll* import_roll,
+ ImportManifest* skip_manifest);
void library_window_switch_to_import_queue_page (LibraryWindow* self);
static GdkDragAction library_window_get_drag_action (LibraryWindow* self);
-static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext* context, gint x, gint y, guint time);
-static void library_window_real_drag_data_received (GtkWidget* base, GdkDragContext* context, gint x, gint y, GtkSelectionData* selection_data, guint info, guint time);
+static gboolean library_window_real_drag_motion (GtkWidget* base,
+ GdkDragContext* context,
+ gint x,
+ gint y,
+ guint time);
+static void library_window_real_drag_data_received (GtkWidget* base,
+ GdkDragContext* context,
+ gint x,
+ gint y,
+ GtkSelectionData* selection_data,
+ guint info,
+ guint time);
void library_window_switch_to_library_page (LibraryWindow* self);
-void library_window_switch_to_page (LibraryWindow* self, Page* page);
-void library_window_switch_to_tag (LibraryWindow* self, Tag* tag);
-void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* search);
-void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* controller, Photo* current);
-DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source);
+void library_window_switch_to_page (LibraryWindow* self,
+ Page* page);
+void library_window_switch_to_tag (LibraryWindow* self,
+ Tag* tag);
+void library_window_switch_to_saved_search (LibraryWindow* self,
+ SavedSearch* search);
+void library_window_switch_to_photo_page (LibraryWindow* self,
+ CollectionPage* controller,
+ Photo* current);
+DataView* view_collection_get_view_for_source (ViewCollection* self,
+ DataSource* source);
LibraryPhotoPage* library_photo_page_new (void);
LibraryPhotoPage* library_photo_page_construct (GType object_type);
-void library_window_add_to_stack (LibraryWindow* self, Page* page);
+void library_window_add_to_stack (LibraryWindow* self,
+ Page* page);
void spin_event_loop (void);
-void library_photo_page_display_for_collection (LibraryPhotoPage* self, CollectionPage* return_page, Photo* photo, ViewCollection* view);
+void library_photo_page_display_for_collection (LibraryPhotoPage* self,
+ CollectionPage* return_page,
+ Photo* photo,
+ ViewCollection* view);
GType camera_sidebar_entry_get_type (void) G_GNUC_CONST;
-CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, DiscoveredCamera* camera);
+CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self,
+ DiscoveredCamera* camera);
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 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_new10 (gboolean value);
gboolean configuration_facade_get_display_extended_properties (ConfigurationFacade* self);
@@ -1656,36 +2015,54 @@ static GVariant* _variant_new11 (gboolean value);
static GVariant* _variant_new12 (gboolean value);
gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* self);
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_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);
static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow* self);
static gboolean _library_window_on_pulse_background_progress_bar_gsource_func (gpointer self);
-static void library_window_clear_background_progress_bar (LibraryWindow* self, gint priority);
-static void library_window_update_background_progress_bar (LibraryWindow* self, const gchar* label, gint priority, gdouble count, gdouble total);
+static void library_window_clear_background_progress_bar (LibraryWindow* self,
+ gint priority);
+static void library_window_update_background_progress_bar (LibraryWindow* self,
+ const gchar* label,
+ gint priority,
+ gdouble count,
+ gdouble total);
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);
-static void library_window_real_set_current_page (PageWindow* base, Page* page);
-void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable);
+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);
void page_switching_from (Page* self);
void sidebar_tree_enable_editing (SidebarTree* self);
-void page_window_set_current_page (PageWindow* self, Page* page);
+void page_window_set_current_page (PageWindow* self,
+ Page* page);
void sidebar_tree_disable_editing (SidebarTree* self);
GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST;
gboolean sidebar_expandable_entry_expand_on_select (SidebarExpandableEntry* self);
-gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry);
-gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboolean mask_signal);
+gboolean sidebar_tree_expand_to_entry (SidebarTree* self,
+ SidebarEntry* entry);
+gboolean sidebar_tree_place_cursor (SidebarTree* self,
+ SidebarEntry* entry,
+ gboolean mask_signal);
static void library_window_on_update_properties (LibraryWindow* self);
-static void library_window_subscribe_for_basic_information (LibraryWindow* self, Page* page);
+static void library_window_subscribe_for_basic_information (LibraryWindow* self,
+ Page* page);
void page_switched_to (Page* self);
GMenuModel* page_get_menubar (Page* self);
void page_ready (Page* self);
GType search_view_filter_get_type (void) G_GNUC_CONST;
-void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchViewFilter* search_filter);
+void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self,
+ SearchViewFilter* search_filter);
SearchViewFilter* checkerboard_page_get_search_view_filter (CheckerboardPage* self);
-void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f);
+void view_collection_install_view_filter (ViewCollection* self,
+ ViewFilter* f);
DisabledViewFilter* disabled_view_filter_new (void);
DisabledViewFilter* disabled_view_filter_construct (GType object_type);
GType disabled_view_filter_get_type (void) G_GNUC_CONST;
@@ -1696,132 +2073,208 @@ gboolean sidebar_branch_get_show_branch (SidebarBranch* self);
GType events_directory_entry_get_type (void) G_GNUC_CONST;
GType events_master_directory_entry_get_type (void) G_GNUC_CONST;
EventsMasterDirectoryEntry* events_branch_get_master_entry (EventsBranch* self);
-static void _library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self);
-static void _library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
-static void _library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self);
-static void _library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self);
+static void _library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender,
+ GeeIterable* changed,
+ gpointer self);
+static void _library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender,
+ GeeMap* items,
+ gpointer self);
+static void _library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender,
+ GeeIterable* added,
+ GeeIterable* removed,
+ gpointer self);
+static void _library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender,
+ GeeCollection* changed,
+ gpointer self);
void one_shot_scheduler_at_idle (OneShotScheduler* self);
-void library_window_mounted_camera_shell_notification (LibraryWindow* self, const gchar* uri, gboolean at_startup);
+void library_window_mounted_camera_shell_notification (LibraryWindow* self,
+ const gchar* uri,
+ gboolean at_startup);
gchar* camera_table_get_port_uri (const gchar* port);
gboolean is_string_empty (const gchar* s);
-static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKey* event);
-gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, GdkEventKey* event);
+static gboolean library_window_real_key_press_event (GtkWidget* base,
+ GdkEventKey* event);
+gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self,
+ GdkEventKey* event);
gint thumbnail_get_MAX_SCALE (void);
#define CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING 24
GType fullscreen_window_get_type (void) G_GNUC_CONST;
gpointer injection_group_ref (gpointer instance);
void injection_group_unref (gpointer instance);
-GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_injection_group (GValue* value, gpointer v_object);
-void value_take_injection_group (GValue* value, gpointer v_object);
+GParamSpec* param_spec_injection_group (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_injection_group (GValue* value,
+ gpointer v_object);
+void value_take_injection_group (GValue* value,
+ gpointer v_object);
gpointer value_get_injection_group (const GValue* value);
GType injection_group_get_type (void) G_GNUC_CONST;
GType zoom_buffer_get_type (void) G_GNUC_CONST;
GType single_photo_page_update_reason_get_type (void) G_GNUC_CONST;
GType raw_developer_get_type (void) G_GNUC_CONST;
#define LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPagePrivate))
-enum {
- LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_DUMMY_PROPERTY
-};
static void library_window_fullscreen_photo_page_real_switched_to (Page* base);
static void library_window_fullscreen_photo_page_real_switching_from (Page* base);
-static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
+static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base,
+ GeeList* ui_filenames);
static void library_window_fullscreen_photo_page_finalize (GObject * obj);
static void library_window_finalize (GObject * obj);
-static void _vala_library_window_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_library_window_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec);
+static void _vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
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", 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) {
+static void
+_library_window_on_page_created_sidebar_tree_page_created (SidebarTree* _sender,
+ SidebarPageRepresentative* entry,
+ Page* page,
+ gpointer self)
+{
#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_page_created ((LibraryWindow*) self, entry, page);
-#line 1744 "LibraryWindow.c"
+#line 2150 "LibraryWindow.c"
}
-static void _library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self) {
+static void
+_library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender,
+ SidebarPageRepresentative* entry,
+ Page* page,
+ gpointer self)
+{
#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_destroying_page ((LibraryWindow*) self, entry, page);
-#line 1751 "LibraryWindow.c"
+#line 2162 "LibraryWindow.c"
}
-static void _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender, SidebarSelectableEntry* selectable, gpointer self) {
+static void
+_library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender,
+ SidebarSelectableEntry* selectable,
+ gpointer self)
+{
#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_sidebar_entry_selected ((LibraryWindow*) self, selectable);
-#line 1758 "LibraryWindow.c"
+#line 2173 "LibraryWindow.c"
}
-static void _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender, SidebarSelectableEntry* removed, gpointer self) {
+static void
+_library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender,
+ SidebarSelectableEntry* removed,
+ gpointer self)
+{
#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_sidebar_selected_entry_removed ((LibraryWindow*) self, removed);
-#line 1765 "LibraryWindow.c"
+#line 2184 "LibraryWindow.c"
}
-static void _library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender, gpointer self) {
+static void
+_library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender,
+ gpointer self)
+{
#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_hide_extended_properties ((LibraryWindow*) self);
-#line 1772 "LibraryWindow.c"
+#line 2194 "LibraryWindow.c"
}
-static void _library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender, gpointer self) {
+static void
+_library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender,
+ gpointer self)
+{
#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_show_extended_properties ((LibraryWindow*) self);
-#line 1779 "LibraryWindow.c"
+#line 2204 "LibraryWindow.c"
}
-static void _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
+static void
+_library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender,
+ GeeCollection* added,
+ GeeCollection* removed,
+ gpointer self)
+{
#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_trashcan_contents_altered ((LibraryWindow*) self);
-#line 1786 "LibraryWindow.c"
+#line 2216 "LibraryWindow.c"
}
-static void _library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
+static void
+_library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender,
+ GeeMap* items,
+ gpointer self)
+{
#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_media_altered ((LibraryWindow*) self);
-#line 1793 "LibraryWindow.c"
+#line 2227 "LibraryWindow.c"
}
-static void _library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender, guint completed, guint total, gpointer self) {
+static void
+_library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender,
+ guint completed,
+ guint total,
+ gpointer self)
+{
#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_metadata_writer_progress ((LibraryWindow*) self, completed, total);
-#line 1800 "LibraryWindow.c"
+#line 2239 "LibraryWindow.c"
}
-static void _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) {
+static void
+_library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender,
+ LibraryMonitor* monitor,
+ gpointer self)
+{
#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_library_monitor_installed ((LibraryWindow*) self, monitor);
-#line 1807 "LibraryWindow.c"
+#line 2250 "LibraryWindow.c"
}
-static void _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) {
+static void
+_library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender,
+ LibraryMonitor* monitor,
+ gpointer self)
+{
#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_library_monitor_destroyed ((LibraryWindow*) self, monitor);
-#line 1814 "LibraryWindow.c"
+#line 2261 "LibraryWindow.c"
}
-static void _library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) {
+static void
+_library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender,
+ DiscoveredCamera* camera,
+ gpointer self)
+{
#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_camera_added ((LibraryWindow*) self, camera);
-#line 1821 "LibraryWindow.c"
+#line 2272 "LibraryWindow.c"
}
-static GType library_window_sidebar_root_position_get_type (void) {
+static GType
+library_window_sidebar_root_position_get_type (void)
+{
static volatile gsize library_window_sidebar_root_position_type_id__volatile = 0;
if (g_once_init_enter (&library_window_sidebar_root_position_type_id__volatile)) {
static const GEnumValue values[] = {{LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_LIBRARY, "LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_LIBRARY", "library"}, {LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_CAMERAS, "LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_CAMERAS", "cameras"}, {LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_SAVED_SEARCH, "LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_SAVED_SEARCH", "saved-search"}, {LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_EVENTS, "LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_EVENTS", "events"}, {LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_FOLDERS, "LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_FOLDERS", "folders"}, {LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_TAGS, "LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_TAGS", "tags"}, {0, NULL, NULL}};
@@ -1833,7 +2286,9 @@ static GType library_window_sidebar_root_position_get_type (void) {
}
-GType library_window_target_type_get_type (void) {
+GType
+library_window_target_type_get_type (void)
+{
static volatile gsize library_window_target_type_type_id__volatile = 0;
if (g_once_init_enter (&library_window_target_type_type_id__volatile)) {
static const GEnumValue values[] = {{LIBRARY_WINDOW_TARGET_TYPE_URI_LIST, "LIBRARY_WINDOW_TARGET_TYPE_URI_LIST", "uri-list"}, {LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST, "LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST", "media-list"}, {LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH, "LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH", "tag-path"}, {0, NULL, NULL}};
@@ -1845,126 +2300,199 @@ 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) {
+static void
+_library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_file_import ((LibraryWindow*) self);
-#line 1852 "LibraryWindow.c"
+#line 2311 "LibraryWindow.c"
}
-static void _library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_external_library_import ((LibraryWindow*) self);
-#line 1859 "LibraryWindow.c"
+#line 2322 "LibraryWindow.c"
}
-static void _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_preferences ((LibraryWindow*) self);
-#line 1866 "LibraryWindow.c"
+#line 2333 "LibraryWindow.c"
}
-static void _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_empty_trash ((LibraryWindow*) self);
-#line 1873 "LibraryWindow.c"
+#line 2344 "LibraryWindow.c"
}
-static void _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_jump_to_event ((LibraryWindow*) self);
-#line 1880 "LibraryWindow.c"
+#line 2355 "LibraryWindow.c"
}
-static void _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_find ((LibraryWindow*) self);
-#line 1887 "LibraryWindow.c"
+#line 2366 "LibraryWindow.c"
}
-static void _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_new_search ((LibraryWindow*) self);
-#line 1894 "LibraryWindow.c"
+#line 2377 "LibraryWindow.c"
}
-static void _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_action_toggle ((LibraryWindow*) self, action, parameter);
-#line 1901 "LibraryWindow.c"
+#line 2388 "LibraryWindow.c"
}
-static void _library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+static void
+_library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action,
+ GVariant* value,
+ gpointer self)
+{
#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_display_basic_properties ((LibraryWindow*) self, action, value);
-#line 1908 "LibraryWindow.c"
+#line 2399 "LibraryWindow.c"
}
-static void _library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+static void
+_library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action,
+ GVariant* value,
+ gpointer self)
+{
#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_display_extended_properties ((LibraryWindow*) self, action, value);
-#line 1915 "LibraryWindow.c"
+#line 2410 "LibraryWindow.c"
}
-static void _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+static void
+_library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action,
+ GVariant* value,
+ gpointer self)
+{
#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_display_searchbar ((LibraryWindow*) self, action, value);
-#line 1922 "LibraryWindow.c"
+#line 2421 "LibraryWindow.c"
}
-static void _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+static void
+_library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action,
+ GVariant* value,
+ gpointer self)
+{
#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_display_sidebar ((LibraryWindow*) self, action, value);
-#line 1929 "LibraryWindow.c"
+#line 2432 "LibraryWindow.c"
}
-static void _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+static void
+_library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action,
+ GVariant* value,
+ gpointer self)
+{
#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_display_toolbar ((LibraryWindow*) self, action, value);
-#line 1936 "LibraryWindow.c"
+#line 2443 "LibraryWindow.c"
}
-static void _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_action_radio ((LibraryWindow*) self, action, parameter);
-#line 1943 "LibraryWindow.c"
+#line 2454 "LibraryWindow.c"
}
-static void _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+static void
+_library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action,
+ GVariant* value,
+ gpointer self)
+{
#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_events_sort_changed ((LibraryWindow*) self, action, value);
-#line 1950 "LibraryWindow.c"
+#line 2465 "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) {
+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 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_external_drop_handler ((LibraryWindow*) self, context, entry, data, info, time);
-#line 1957 "LibraryWindow.c"
+#line 2479 "LibraryWindow.c"
}
-static void _library_window_on_update_properties_now_one_shot_callback (gpointer self) {
+static void
+_library_window_on_update_properties_now_one_shot_callback (gpointer self)
+{
#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_update_properties_now ((LibraryWindow*) self);
-#line 1964 "LibraryWindow.c"
+#line 2488 "LibraryWindow.c"
}
-LibraryWindow* library_window_construct (GType object_type, ProgressMonitor progress_monitor, void* progress_monitor_target) {
+LibraryWindow*
+library_window_construct (GType object_type,
+ ProgressMonitor progress_monitor,
+ void* progress_monitor_target)
+{
LibraryWindow * self = NULL;
SidebarTree* _tmp0_;
SidebarTree* _tmp1_;
@@ -1995,30 +2523,30 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
Page* _tmp26_;
Page* _tmp27_;
GtkTargetEntry* main_window_dnd_targets = NULL;
+ GtkTargetEntry _tmp39_;
GtkTargetEntry _tmp40_;
- GtkTargetEntry _tmp41_;
- GtkTargetEntry* _tmp42_;
+ GtkTargetEntry* _tmp41_;
gint main_window_dnd_targets_length1;
gint _main_window_dnd_targets_size_;
- GtkTargetEntry* _tmp43_;
- gint _tmp43__length1;
+ GtkTargetEntry* _tmp42_;
+ gint _tmp42__length1;
+ MetadataWriter* _tmp43_;
MetadataWriter* _tmp44_;
- MetadataWriter* _tmp45_;
LibraryMonitor* monitor = NULL;
+ LibraryMonitorPool* _tmp45_;
LibraryMonitorPool* _tmp46_;
- LibraryMonitorPool* _tmp47_;
+ LibraryMonitor* _tmp47_;
LibraryMonitor* _tmp48_;
LibraryMonitor* _tmp49_;
- LibraryMonitor* _tmp50_;
+ LibraryMonitorPool* _tmp51_;
LibraryMonitorPool* _tmp52_;
LibraryMonitorPool* _tmp53_;
LibraryMonitorPool* _tmp54_;
- LibraryMonitorPool* _tmp55_;
+ CameraTable* _tmp55_;
CameraTable* _tmp56_;
- CameraTable* _tmp57_;
- GtkProgressBar* _tmp58_;
+ GtkProgressBar* _tmp57_;
#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- static const gchar* accels[] = {"<Primary>f", "F8", NULL};
+ static const gchar* accels[3] = {"<Primary>f", "F8", NULL};
#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self = (LibraryWindow*) app_window_construct (object_type);
#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2129,7 +2657,7 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
_g_object_unref0 (_tmp27_);
#line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_load_configuration (self);
-#line 2133 "LibraryWindow.c"
+#line 2661 "LibraryWindow.c"
{
GeeIterator* _media_sources_it = NULL;
MediaCollectionRegistry* _tmp28_;
@@ -2158,128 +2686,125 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
_media_sources_it = _tmp33_;
#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
while (TRUE) {
-#line 2162 "LibraryWindow.c"
+#line 2690 "LibraryWindow.c"
GeeIterator* _tmp34_;
- gboolean _tmp35_;
MediaSourceCollection* media_sources = NULL;
- GeeIterator* _tmp36_;
- gpointer _tmp37_;
+ GeeIterator* _tmp35_;
+ gpointer _tmp36_;
+ MediaSourceCollection* _tmp37_;
MediaSourceCollection* _tmp38_;
- MediaSourceCollection* _tmp39_;
#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp34_ = _media_sources_it;
#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp35_ = gee_iterator_next (_tmp34_);
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (!_tmp35_) {
+ if (!gee_iterator_next (_tmp34_)) {
#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
break;
-#line 2178 "LibraryWindow.c"
+#line 2703 "LibraryWindow.c"
}
#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp36_ = _media_sources_it;
+ _tmp35_ = _media_sources_it;
#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp37_ = gee_iterator_get (_tmp36_);
+ _tmp36_ = gee_iterator_get (_tmp35_);
#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- media_sources = (MediaSourceCollection*) _tmp37_;
+ media_sources = (MediaSourceCollection*) _tmp36_;
#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp38_ = media_sources;
+ _tmp37_ = media_sources;
#line 188 "/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);
+ g_signal_connect_object (_tmp37_, "trashcan-contents-altered", (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0);
#line 189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp39_ = media_sources;
+ _tmp38_ = media_sources;
#line 189 "/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);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_media_altered_data_collection_items_altered, self, 0);
#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (media_sources);
-#line 2196 "LibraryWindow.c"
+#line 2721 "LibraryWindow.c"
}
#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_media_sources_it);
-#line 2200 "LibraryWindow.c"
+#line 2725 "LibraryWindow.c"
}
#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp40_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_URI_LIST];
+ _tmp39_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_URI_LIST];
#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp41_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST];
+ _tmp40_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST];
#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp42_ = g_new0 (GtkTargetEntry, 2);
+ _tmp41_ = g_new0 (GtkTargetEntry, 2);
#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp42_[0] = _tmp40_;
+ _tmp41_[0] = _tmp39_;
#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp42_[1] = _tmp41_;
+ _tmp41_[1] = _tmp40_;
#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- main_window_dnd_targets = _tmp42_;
+ main_window_dnd_targets = _tmp41_;
#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
main_window_dnd_targets_length1 = 2;
#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_main_window_dnd_targets_size_ = main_window_dnd_targets_length1;
#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp43_ = main_window_dnd_targets;
+ _tmp42_ = main_window_dnd_targets;
#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp43__length1 = main_window_dnd_targets_length1;
+ _tmp42__length1 = main_window_dnd_targets_length1;
#line 200 "/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);
+ gtk_drag_dest_set (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), GTK_DEST_DEFAULT_ALL, _tmp42_, _tmp42__length1, (GDK_ACTION_COPY | GDK_ACTION_LINK) | GDK_ACTION_ASK);
#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp44_ = metadata_writer_get_instance ();
+ _tmp43_ = metadata_writer_get_instance ();
#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp45_ = _tmp44_;
+ _tmp44_ = _tmp43_;
#line 203 "/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);
+ g_signal_connect_object (_tmp44_, "progress", (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self, 0);
#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp45_);
+ _g_object_unref0 (_tmp44_);
#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp46_ = library_monitor_pool_get_instance ();
+ _tmp45_ = library_monitor_pool_get_instance ();
#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp47_ = _tmp46_;
+ _tmp46_ = _tmp45_;
#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp48_ = library_monitor_pool_get_monitor (_tmp47_);
+ _tmp47_ = library_monitor_pool_get_monitor (_tmp46_);
#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp49_ = _tmp48_;
+ _tmp48_ = _tmp47_;
#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _library_monitor_pool_unref0 (_tmp47_);
+ _library_monitor_pool_unref0 (_tmp46_);
#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- monitor = _tmp49_;
+ monitor = _tmp48_;
#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp50_ = monitor;
+ _tmp49_ = monitor;
#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp50_ != NULL) {
-#line 2248 "LibraryWindow.c"
- LibraryMonitor* _tmp51_;
+ if (_tmp49_ != NULL) {
+#line 2773 "LibraryWindow.c"
+ LibraryMonitor* _tmp50_;
#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp51_ = monitor;
+ _tmp50_ = monitor;
#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_on_library_monitor_installed (self, _tmp51_);
-#line 2254 "LibraryWindow.c"
+ library_window_on_library_monitor_installed (self, _tmp50_);
+#line 2779 "LibraryWindow.c"
}
#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp52_ = library_monitor_pool_get_instance ();
+ _tmp51_ = library_monitor_pool_get_instance ();
#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp53_ = _tmp52_;
+ _tmp52_ = _tmp51_;
#line 209 "/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);
+ g_signal_connect_object (_tmp52_, "monitor-installed", (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self, 0);
#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _library_monitor_pool_unref0 (_tmp53_);
+ _library_monitor_pool_unref0 (_tmp52_);
#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp54_ = library_monitor_pool_get_instance ();
+ _tmp53_ = library_monitor_pool_get_instance ();
#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp55_ = _tmp54_;
+ _tmp54_ = _tmp53_;
#line 210 "/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);
+ g_signal_connect_object (_tmp54_, "monitor-destroyed", (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self, 0);
#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _library_monitor_pool_unref0 (_tmp55_);
+ _library_monitor_pool_unref0 (_tmp54_);
#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp56_ = camera_table_get_instance ();
+ _tmp55_ = camera_table_get_instance ();
#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp57_ = _tmp56_;
+ _tmp56_ = _tmp55_;
#line 212 "/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);
+ g_signal_connect_object (_tmp56_, "camera-added", (GCallback) _library_window_on_camera_added_camera_table_camera_added, self, 0);
#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _camera_table_unref0 (_tmp57_);
+ _camera_table_unref0 (_tmp56_);
#line 214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp58_ = self->priv->background_progress_bar;
+ _tmp57_ = self->priv->background_progress_bar;
#line 214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_progress_bar_set_show_text (_tmp58_, TRUE);
+ gtk_progress_bar_set_show_text (_tmp57_, TRUE);
#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
application_set_accels_for_action ("win.CommonDisplaySearchbar", accels, G_N_ELEMENTS (accels));
#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2288,219 +2813,216 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
main_window_dnd_targets = (g_free (main_window_dnd_targets), NULL);
#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return self;
-#line 2292 "LibraryWindow.c"
+#line 2817 "LibraryWindow.c"
}
-LibraryWindow* library_window_new (ProgressMonitor progress_monitor, void* progress_monitor_target) {
+LibraryWindow*
+library_window_new (ProgressMonitor progress_monitor,
+ void* progress_monitor_target)
+{
#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return library_window_construct (TYPE_LIBRARY_WINDOW, progress_monitor, progress_monitor_target);
-#line 2299 "LibraryWindow.c"
+#line 2827 "LibraryWindow.c"
}
-static void _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender, gpointer self) {
+static void
+_library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender,
+ gpointer self)
+{
#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_library_monitor_discovery_started ((LibraryWindow*) self);
-#line 2306 "LibraryWindow.c"
+#line 2837 "LibraryWindow.c"
}
-static void _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) {
+static void
+_library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender,
+ gpointer self)
+{
#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self);
-#line 2313 "LibraryWindow.c"
+#line 2847 "LibraryWindow.c"
}
-static void _library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender, gpointer self) {
+static void
+_library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender,
+ gpointer self)
+{
#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self);
-#line 2320 "LibraryWindow.c"
+#line 2857 "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) {
+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 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_library_monitor_auto_update_progress ((LibraryWindow*) self, completed_files, total_files);
-#line 2327 "LibraryWindow.c"
+#line 2869 "LibraryWindow.c"
}
-static void _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender, gpointer self) {
+static void
+_library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender,
+ gpointer self)
+{
#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_library_monitor_auto_import_preparing ((LibraryWindow*) self);
-#line 2334 "LibraryWindow.c"
+#line 2879 "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) {
+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 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_library_monitor_auto_import_progress ((LibraryWindow*) self, completed_bytes, total_bytes);
-#line 2341 "LibraryWindow.c"
+#line 2891 "LibraryWindow.c"
}
-static void library_window_on_library_monitor_installed (LibraryWindow* self, LibraryMonitor* monitor) {
- LibraryMonitor* _tmp0_;
+static void
+library_window_on_library_monitor_installed (LibraryWindow* self,
+ LibraryMonitor* monitor)
+{
+ GFile* _tmp0_;
GFile* _tmp1_;
- GFile* _tmp2_;
+ gchar* _tmp2_;
gchar* _tmp3_;
- gchar* _tmp4_;
- LibraryMonitor* _tmp5_;
- LibraryMonitor* _tmp6_;
- LibraryMonitor* _tmp7_;
- LibraryMonitor* _tmp8_;
- LibraryMonitor* _tmp9_;
- LibraryMonitor* _tmp10_;
#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = monitor;
+ _tmp0_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
+ _tmp1_ = _tmp0_;
#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = _tmp1_;
+ _tmp2_ = g_file_get_path (_tmp1_);
#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = g_file_get_path (_tmp2_);
-#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_debug ("LibraryWindow.vala:251: on_library_monitor_installed: %s", _tmp4_);
+ g_debug ("LibraryWindow.vala:251: on_library_monitor_installed: %s", _tmp3_);
#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_free0 (_tmp4_);
+ _g_free0 (_tmp3_);
#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp2_);
-#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = monitor;
+ _g_object_unref0 (_tmp1_);
#line 253 "/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);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-started", (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self, 0);
#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = monitor;
-#line 254 "/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 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = monitor;
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self, 0);
#line 255 "/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);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "closed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self, 0);
#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = monitor;
-#line 256 "/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 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = monitor;
+ g_signal_connect_object (monitor, "auto-update-progress", (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self, 0);
#line 257 "/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);
+ g_signal_connect_object (monitor, "auto-import-preparing", (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self, 0);
#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = monitor;
-#line 258 "/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 2401 "LibraryWindow.c"
+ g_signal_connect_object (monitor, "auto-import-progress", (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self, 0);
+#line 2933 "LibraryWindow.c"
}
-static void library_window_on_library_monitor_destroyed (LibraryWindow* self, LibraryMonitor* monitor) {
- LibraryMonitor* _tmp0_;
+static void
+library_window_on_library_monitor_destroyed (LibraryWindow* self,
+ LibraryMonitor* monitor)
+{
+ GFile* _tmp0_;
GFile* _tmp1_;
- GFile* _tmp2_;
+ gchar* _tmp2_;
gchar* _tmp3_;
- gchar* _tmp4_;
- LibraryMonitor* _tmp5_;
+ guint _tmp4_;
+ guint _tmp5_;
guint _tmp6_;
- LibraryMonitor* _tmp7_;
+ guint _tmp7_;
guint _tmp8_;
- LibraryMonitor* _tmp9_;
- guint _tmp10_;
- LibraryMonitor* _tmp11_;
- guint _tmp12_;
- LibraryMonitor* _tmp13_;
- guint _tmp14_;
- LibraryMonitor* _tmp15_;
- guint _tmp16_;
+ guint _tmp9_;
#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = monitor;
-#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
+ _tmp0_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = g_file_get_path (_tmp2_);
+ _tmp2_ = g_file_get_path (_tmp1_);
#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_debug ("LibraryWindow.vala:262: on_library_monitor_destroyed: %s", _tmp4_);
+ g_debug ("LibraryWindow.vala:262: on_library_monitor_destroyed: %s", _tmp3_);
#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_free0 (_tmp4_);
+ _g_free0 (_tmp3_);
#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp2_);
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = monitor;
+ _g_object_unref0 (_tmp1_);
#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_parse_name ("discovery-started", TYPE_DIRECTORY_MONITOR, &_tmp6_, NULL, FALSE);
+ g_signal_parse_name ("discovery-started", TYPE_DIRECTORY_MONITOR, &_tmp4_, NULL, FALSE);
#line 264 "/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);
+ g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self);
#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = monitor;
+ g_signal_parse_name ("discovery-completed", TYPE_DIRECTORY_MONITOR, &_tmp5_, NULL, FALSE);
#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_parse_name ("discovery-completed", TYPE_DIRECTORY_MONITOR, &_tmp8_, NULL, FALSE);
-#line 265 "/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 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = monitor;
+ g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self);
#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_parse_name ("closed", TYPE_DIRECTORY_MONITOR, &_tmp10_, NULL, FALSE);
+ g_signal_parse_name ("closed", TYPE_DIRECTORY_MONITOR, &_tmp6_, NULL, FALSE);
#line 266 "/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);
+ g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (monitor, 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_completed_directory_monitor_closed, self);
#line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = monitor;
+ g_signal_parse_name ("auto-update-progress", TYPE_LIBRARY_MONITOR, &_tmp7_, NULL, FALSE);
#line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_parse_name ("auto-update-progress", TYPE_LIBRARY_MONITOR, &_tmp12_, NULL, FALSE);
-#line 267 "/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 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = monitor;
+ g_signal_handlers_disconnect_matched (monitor, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self);
#line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_parse_name ("auto-import-preparing", TYPE_LIBRARY_MONITOR, &_tmp14_, NULL, FALSE);
+ g_signal_parse_name ("auto-import-preparing", TYPE_LIBRARY_MONITOR, &_tmp8_, NULL, FALSE);
#line 268 "/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 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp15_ = monitor;
+ g_signal_handlers_disconnect_matched (monitor, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self);
#line 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_parse_name ("auto-import-progress", TYPE_LIBRARY_MONITOR, &_tmp16_, NULL, FALSE);
+ g_signal_parse_name ("auto-import-progress", TYPE_LIBRARY_MONITOR, &_tmp9_, NULL, FALSE);
#line 269 "/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 2479 "LibraryWindow.c"
+ g_signal_handlers_disconnect_matched (monitor, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self);
+#line 2993 "LibraryWindow.c"
}
-static GVariant* _variant_new1 (gboolean value) {
+static GVariant*
+_variant_new1 (gboolean value)
+{
#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2486 "LibraryWindow.c"
+#line 3002 "LibraryWindow.c"
}
-static GVariant* _variant_new2 (gboolean value) {
+static GVariant*
+_variant_new2 (gboolean value)
+{
#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2493 "LibraryWindow.c"
+#line 3011 "LibraryWindow.c"
}
-static GVariant* _variant_new3 (gboolean value) {
+static GVariant*
+_variant_new3 (gboolean value)
+{
#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2500 "LibraryWindow.c"
+#line 3020 "LibraryWindow.c"
}
-static void library_window_real_add_actions (AppWindow* base) {
+static void
+library_window_real_add_actions (AppWindow* base)
+{
LibraryWindow * self;
SearchFilterActions* _tmp0_;
gint _tmp1_;
@@ -2509,14 +3031,11 @@ static void library_window_real_add_actions (AppWindow* base) {
GAction* _tmp4_;
ConfigFacade* _tmp5_;
ConfigFacade* _tmp6_;
- gboolean _tmp7_;
- GVariant* _tmp8_;
- GAction* _tmp9_;
- gboolean _tmp10_;
+ GVariant* _tmp7_;
+ GAction* _tmp8_;
+ GVariant* _tmp9_;
+ GAction* _tmp10_;
GVariant* _tmp11_;
- GAction* _tmp12_;
- gboolean _tmp13_;
- GVariant* _tmp14_;
#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
#line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2538,62 +3057,62 @@ static void library_window_real_add_actions (AppWindow* base) {
#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp6_ = _tmp5_;
#line 298 "/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));
+ _tmp7_ = _variant_new1 (configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = _variant_new1 (_tmp7_);
+ g_action_change_state (_tmp4_, _tmp7_);
#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_action_change_state (_tmp4_, _tmp8_);
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_variant_unref0 (_tmp8_);
+ _g_variant_unref0 (_tmp7_);
#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_tmp6_);
#line 299 "/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");
+ _tmp8_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySidebar");
#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = library_window_is_sidebar_visible (self);
+ _tmp9_ = _variant_new2 (library_window_is_sidebar_visible (self));
#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = _variant_new2 (_tmp10_);
+ g_action_change_state (_tmp8_, _tmp9_);
#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_action_change_state (_tmp9_, _tmp11_);
-#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_variant_unref0 (_tmp11_);
+ _g_variant_unref0 (_tmp9_);
#line 300 "/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");
+ _tmp10_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayToolbar");
#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = library_window_is_toolbar_visible (self);
+ _tmp11_ = _variant_new3 (library_window_is_toolbar_visible (self));
#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = _variant_new3 (_tmp13_);
+ g_action_change_state (_tmp10_, _tmp11_);
#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_action_change_state (_tmp12_, _tmp14_);
-#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_variant_unref0 (_tmp14_);
-#line 2571 "LibraryWindow.c"
+ _g_variant_unref0 (_tmp11_);
+#line 3084 "LibraryWindow.c"
}
-static void _library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender, ViewFilter* filer, gpointer self) {
+static void
+_library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender,
+ ViewFilter* filer,
+ gpointer self)
+{
#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_view_filter_installed ((LibraryWindow*) self, filer);
-#line 2578 "LibraryWindow.c"
+#line 3095 "LibraryWindow.c"
}
-static void _library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender, ViewFilter* filer, gpointer self) {
+static void
+_library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender,
+ ViewFilter* filer,
+ gpointer self)
+{
#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_view_filter_removed ((LibraryWindow*) self, filer);
-#line 2585 "LibraryWindow.c"
+#line 3106 "LibraryWindow.c"
}
-static void library_window_real_switched_pages (PageWindow* base, Page* old_page, Page* new_page) {
+static void
+library_window_real_switched_pages (PageWindow* base,
+ Page* old_page,
+ Page* new_page)
+{
LibraryWindow * self;
- Page* _tmp0_;
- Page* _tmp1_;
- Page* _tmp2_;
- Page* _tmp11_;
- SearchFilterActions* _tmp18_;
- Page* _tmp19_;
- Page* _tmp20_;
+ SearchFilterActions* _tmp10_;
#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2601,158 +3120,142 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page
#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
#line 304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = old_page;
-#line 304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = new_page;
-#line 304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- PAGE_WINDOW_CLASS (library_window_parent_class)->switched_pages (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), _tmp0_, _tmp1_);
+ PAGE_WINDOW_CLASS (library_window_parent_class)->switched_pages (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), old_page, new_page);
#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = old_page;
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp2_ != NULL) {
-#line 2614 "LibraryWindow.c"
- Page* _tmp3_;
+ if (old_page != NULL) {
+#line 3127 "LibraryWindow.c"
+ ViewCollection* _tmp0_;
+ ViewCollection* _tmp1_;
+ guint _tmp2_;
+ ViewCollection* _tmp3_;
ViewCollection* _tmp4_;
- ViewCollection* _tmp5_;
- guint _tmp6_;
- Page* _tmp7_;
- ViewCollection* _tmp8_;
- ViewCollection* _tmp9_;
- guint _tmp10_;
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = old_page;
+ guint _tmp5_;
#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = page_get_view (_tmp3_);
+ _tmp0_ = page_get_view (old_page);
#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = _tmp4_;
+ _tmp1_ = _tmp0_;
#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_parse_name ("view-filter-installed", TYPE_VIEW_COLLECTION, &_tmp6_, NULL, FALSE);
+ g_signal_parse_name ("view-filter-installed", TYPE_VIEW_COLLECTION, &_tmp2_, NULL, FALSE);
#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self);
+ g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self);
#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _data_collection_unref0 (_tmp5_);
-#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = old_page;
+ _data_collection_unref0 (_tmp1_);
#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = page_get_view (_tmp7_);
+ _tmp3_ = page_get_view (old_page);
#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = _tmp8_;
+ _tmp4_ = _tmp3_;
#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_parse_name ("view-filter-removed", TYPE_VIEW_COLLECTION, &_tmp10_, NULL, FALSE);
+ g_signal_parse_name ("view-filter-removed", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE);
#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- 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);
+ 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_view_filter_removed_view_collection_view_filter_removed, self);
#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _data_collection_unref0 (_tmp9_);
-#line 2647 "LibraryWindow.c"
+ _data_collection_unref0 (_tmp4_);
+#line 3154 "LibraryWindow.c"
}
#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = new_page;
-#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp11_ != NULL) {
-#line 2653 "LibraryWindow.c"
- Page* _tmp12_;
- ViewCollection* _tmp13_;
- ViewCollection* _tmp14_;
- Page* _tmp15_;
- ViewCollection* _tmp16_;
- ViewCollection* _tmp17_;
-#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = new_page;
+ if (new_page != NULL) {
+#line 3158 "LibraryWindow.c"
+ ViewCollection* _tmp6_;
+ ViewCollection* _tmp7_;
+ ViewCollection* _tmp8_;
+ ViewCollection* _tmp9_;
#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = page_get_view (_tmp12_);
+ _tmp6_ = page_get_view (new_page);
#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = _tmp13_;
+ _tmp7_ = _tmp6_;
#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_connect_object (_tmp14_, "view-filter-installed", (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self, 0);
+ g_signal_connect_object (_tmp7_, "view-filter-installed", (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self, 0);
#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _data_collection_unref0 (_tmp14_);
-#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp15_ = new_page;
+ _data_collection_unref0 (_tmp7_);
#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp16_ = page_get_view (_tmp15_);
+ _tmp8_ = page_get_view (new_page);
#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp17_ = _tmp16_;
+ _tmp9_ = _tmp8_;
#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_connect_object (_tmp17_, "view-filter-removed", (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self, 0);
+ g_signal_connect_object (_tmp9_, "view-filter-removed", (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self, 0);
#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _data_collection_unref0 (_tmp17_);
-#line 2680 "LibraryWindow.c"
+ _data_collection_unref0 (_tmp9_);
+#line 3179 "LibraryWindow.c"
}
#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp18_ = self->priv->search_actions;
-#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp19_ = old_page;
+ _tmp10_ = self->priv->search_actions;
#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp20_ = new_page;
-#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- search_filter_actions_monitor_page_contents (_tmp18_, _tmp19_, _tmp20_);
-#line 2690 "LibraryWindow.c"
+ search_filter_actions_monitor_page_contents (_tmp10_, old_page, new_page);
+#line 3185 "LibraryWindow.c"
}
-static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender, gpointer self) {
+static void
+_library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender,
+ gpointer self)
+{
#line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_view_filter_refreshed ((LibraryWindow*) self);
-#line 2697 "LibraryWindow.c"
+#line 3195 "LibraryWindow.c"
}
-static void library_window_on_view_filter_installed (LibraryWindow* self, ViewFilter* filter) {
- ViewFilter* _tmp0_;
+static void
+library_window_on_view_filter_installed (LibraryWindow* self,
+ ViewFilter* filter)
+{
#line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_VIEW_FILTER (filter));
#line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = filter;
-#line 321 "/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 2711 "LibraryWindow.c"
+ g_signal_connect_object (filter, "refresh", (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self, 0);
+#line 3209 "LibraryWindow.c"
}
-static void library_window_on_view_filter_removed (LibraryWindow* self, ViewFilter* filter) {
- ViewFilter* _tmp0_;
- guint _tmp1_;
+static void
+library_window_on_view_filter_removed (LibraryWindow* self,
+ ViewFilter* filter)
+{
+ guint _tmp0_;
#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_VIEW_FILTER (filter));
#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = filter;
+ g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp0_, NULL, FALSE);
#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp1_, NULL, FALSE);
-#line 325 "/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 2728 "LibraryWindow.c"
+ g_signal_handlers_disconnect_matched (filter, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self);
+#line 3226 "LibraryWindow.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return self ? g_object_ref (self) : NULL;
-#line 2735 "LibraryWindow.c"
+#line 3235 "LibraryWindow.c"
}
-static GVariant* _variant_new4 (gboolean value) {
+static GVariant*
+_variant_new4 (gboolean value)
+{
#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2742 "LibraryWindow.c"
+#line 3244 "LibraryWindow.c"
}
-static void library_window_on_view_filter_refreshed (LibraryWindow* self) {
+static void
+library_window_on_view_filter_refreshed (LibraryWindow* self)
+{
Page* _tmp0_;
Page* _tmp1_;
ViewCollection* _tmp2_;
ViewCollection* _tmp3_;
gboolean _tmp4_;
- gboolean _tmp5_;
GAction* action = NULL;
+ GAction* _tmp5_;
GAction* _tmp6_;
GAction* _tmp7_;
- GAction* _tmp8_;
#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2764,49 +3267,49 @@ static void library_window_on_view_filter_refreshed (LibraryWindow* self) {
#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp3_ = _tmp2_;
#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = view_collection_are_items_filtered_out (_tmp3_);
-#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = !_tmp4_;
+ _tmp4_ = !view_collection_are_items_filtered_out (_tmp3_);
#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (_tmp3_);
#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_tmp1_);
#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp5_) {
+ if (_tmp4_) {
#line 332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 2779 "LibraryWindow.c"
+#line 3280 "LibraryWindow.c"
}
#line 335 "/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");
+ _tmp5_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = _g_object_ref0 (_tmp6_);
+ _tmp6_ = _g_object_ref0 (_tmp5_);
#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- action = _tmp7_;
+ action = _tmp6_;
#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = action;
+ _tmp7_ = action;
#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp8_ != NULL) {
-#line 2791 "LibraryWindow.c"
- GAction* _tmp9_;
- GVariant* _tmp10_;
+ if (_tmp7_ != NULL) {
+#line 3292 "LibraryWindow.c"
+ GAction* _tmp8_;
+ GVariant* _tmp9_;
#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = action;
+ _tmp8_ = action;
#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = _variant_new4 (TRUE);
+ _tmp9_ = _variant_new4 (TRUE);
#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_action_change_state (_tmp9_, _tmp10_);
+ g_action_change_state (_tmp8_, _tmp9_);
#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_variant_unref0 (_tmp10_);
-#line 2802 "LibraryWindow.c"
+ _g_variant_unref0 (_tmp9_);
+#line 3303 "LibraryWindow.c"
}
#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (action);
-#line 2806 "LibraryWindow.c"
+#line 3307 "LibraryWindow.c"
}
-static void library_window_real_show_all (GtkWidget* base) {
+static void
+library_window_real_show_all (GtkWidget* base)
+{
LibraryWindow * self;
GAction* basic_properties_action = NULL;
Page* _tmp0_;
@@ -2818,14 +3321,11 @@ static void library_window_real_show_all (GtkWidget* base) {
GVariant* _tmp6_;
GVariant* _tmp7_;
gboolean _tmp8_;
- gboolean _tmp9_;
CheckerboardPage* current_page = NULL;
- Page* _tmp11_;
+ Page* _tmp10_;
+ CheckerboardPage* _tmp11_;
CheckerboardPage* _tmp12_;
- CheckerboardPage* _tmp13_;
- gboolean _tmp15_;
- CheckerboardPage* _tmp16_;
- gboolean _tmp17_;
+ CheckerboardPage* _tmp14_;
#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
#line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2853,64 +3353,60 @@ static void library_window_real_show_all (GtkWidget* base) {
#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp7_ = _tmp6_;
#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = g_variant_get_boolean (_tmp7_);
-#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = !_tmp8_;
+ _tmp8_ = !g_variant_get_boolean (_tmp7_);
#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_variant_unref0 (_tmp7_);
#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp9_) {
-#line 2864 "LibraryWindow.c"
- GtkFrame* _tmp10_;
+ if (_tmp8_) {
+#line 3362 "LibraryWindow.c"
+ GtkFrame* _tmp9_;
#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = self->priv->bottom_frame;
+ _tmp9_ = self->priv->bottom_frame;
#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 2870 "LibraryWindow.c"
+ gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
+#line 3368 "LibraryWindow.c"
}
#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
+ _tmp10_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp11_) : NULL;
+ _tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp10_) : NULL;
#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp12_ == NULL) {
+ if (_tmp11_ == NULL) {
#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp11_);
-#line 2880 "LibraryWindow.c"
+ _g_object_unref0 (_tmp10_);
+#line 3378 "LibraryWindow.c"
}
#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- current_page = _tmp12_;
+ current_page = _tmp11_;
#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = current_page;
+ _tmp12_ = current_page;
#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp13_ != NULL) {
-#line 2888 "LibraryWindow.c"
- CheckerboardPage* _tmp14_;
+ if (_tmp12_ != NULL) {
+#line 3386 "LibraryWindow.c"
+ CheckerboardPage* _tmp13_;
#line 355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = current_page;
+ _tmp13_ = current_page;
#line 355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_init_view_filter (self, _tmp14_);
-#line 2894 "LibraryWindow.c"
+ library_window_init_view_filter (self, _tmp13_);
+#line 3392 "LibraryWindow.c"
}
#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp15_ = library_window_should_show_search_bar (self);
+ _tmp14_ = current_page;
#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp16_ = current_page;
-#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_toggle_search_bar (self, _tmp15_, _tmp16_);
-#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp17_ = library_window_is_sidebar_visible (self);
+ library_window_toggle_search_bar (self, library_window_should_show_search_bar (self), _tmp14_);
#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_set_sidebar_visible (self, _tmp17_);
+ library_window_set_sidebar_visible (self, library_window_is_sidebar_visible (self));
#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (current_page);
#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (basic_properties_action);
-#line 2910 "LibraryWindow.c"
+#line 3404 "LibraryWindow.c"
}
-LibraryWindow* library_window_get_app (void) {
+LibraryWindow*
+library_window_get_app (void)
+{
LibraryWindow* result = NULL;
AppWindow* _tmp0_;
AppWindow* _tmp1_;
@@ -2927,15 +3423,17 @@ LibraryWindow* library_window_get_app (void) {
result = _tmp2_;
#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 2931 "LibraryWindow.c"
+#line 3427 "LibraryWindow.c"
}
-gboolean library_window_is_mount_uri_supported (const gchar* uri) {
+gboolean
+library_window_is_mount_uri_supported (const gchar* uri)
+{
gboolean result = FALSE;
#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_val_if_fail (uri != NULL, FALSE);
-#line 2939 "LibraryWindow.c"
+#line 3437 "LibraryWindow.c"
{
const gchar** scheme_collection = NULL;
gint scheme_collection_length1 = 0;
@@ -2947,37 +3445,31 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) {
scheme_collection_length1 = G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES);
#line 371 "/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 2951 "LibraryWindow.c"
+#line 3449 "LibraryWindow.c"
gchar* _tmp0_;
gchar* scheme = NULL;
#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp0_ = g_strdup (scheme_collection[scheme_it]);
#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
scheme = _tmp0_;
-#line 2958 "LibraryWindow.c"
+#line 3456 "LibraryWindow.c"
{
const gchar* _tmp1_;
- const gchar* _tmp2_;
- gboolean _tmp3_;
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = uri;
#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = scheme;
+ _tmp1_ = scheme;
#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = g_str_has_prefix (_tmp1_, _tmp2_);
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp3_) {
+ if (g_str_has_prefix (uri, _tmp1_)) {
#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = TRUE;
#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_free0 (scheme);
#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 2977 "LibraryWindow.c"
+#line 3469 "LibraryWindow.c"
}
#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_free0 (scheme);
-#line 2981 "LibraryWindow.c"
+#line 3473 "LibraryWindow.c"
}
}
}
@@ -2985,11 +3477,13 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) {
result = FALSE;
#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 2989 "LibraryWindow.c"
+#line 3481 "LibraryWindow.c"
}
-static gchar* library_window_real_get_app_role (AppWindow* base) {
+static gchar*
+library_window_real_get_app_role (AppWindow* base)
+{
LibraryWindow * self;
gchar* result = NULL;
gchar* _tmp0_;
@@ -3001,16 +3495,18 @@ static gchar* library_window_real_get_app_role (AppWindow* base) {
result = _tmp0_;
#line 380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 3005 "LibraryWindow.c"
+#line 3499 "LibraryWindow.c"
}
-void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) {
+void
+library_window_rename_tag_in_sidebar (LibraryWindow* self,
+ Tag* tag)
+{
TagsSidebarEntry* entry = NULL;
TagsBranch* _tmp0_;
- Tag* _tmp1_;
+ TagsSidebarEntry* _tmp1_;
TagsSidebarEntry* _tmp2_;
- TagsSidebarEntry* _tmp3_;
#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3018,42 +3514,42 @@ void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) {
#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp0_ = self->priv->tags_branch;
#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = tag;
-#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_);
+ _tmp1_ = tags_branch_get_entry_for_tag (_tmp0_, tag);
#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- entry = _tmp2_;
+ entry = _tmp1_;
#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = entry;
+ _tmp2_ = entry;
#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp3_ != NULL) {
-#line 3031 "LibraryWindow.c"
- SidebarTree* _tmp4_;
- TagsSidebarEntry* _tmp5_;
+ if (_tmp2_ != NULL) {
+#line 3525 "LibraryWindow.c"
+ SidebarTree* _tmp3_;
+ TagsSidebarEntry* _tmp4_;
#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = self->priv->sidebar_tree;
+ _tmp3_ = self->priv->sidebar_tree;
#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = entry;
+ _tmp4_ = entry;
#line 386 "/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 3040 "LibraryWindow.c"
+ sidebar_tree_rename_entry_in_place (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+#line 3534 "LibraryWindow.c"
} else {
#line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_debug ("LibraryWindow.vala:388: No tag entry found for rename");
-#line 3044 "LibraryWindow.c"
+#line 3538 "LibraryWindow.c"
}
#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (entry);
-#line 3048 "LibraryWindow.c"
+#line 3542 "LibraryWindow.c"
}
-void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event) {
+void
+library_window_rename_event_in_sidebar (LibraryWindow* self,
+ Event* event)
+{
EventsEventEntry* entry = NULL;
EventsBranch* _tmp0_;
- Event* _tmp1_;
+ EventsEventEntry* _tmp1_;
EventsEventEntry* _tmp2_;
- EventsEventEntry* _tmp3_;
#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3061,42 +3557,42 @@ void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event)
#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp0_ = self->priv->events_branch;
#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = event;
+ _tmp1_ = events_branch_get_entry_for_event (_tmp0_, event);
#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_);
-#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- entry = _tmp2_;
+ entry = _tmp1_;
#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = entry;
+ _tmp2_ = entry;
#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp3_ != NULL) {
-#line 3074 "LibraryWindow.c"
- SidebarTree* _tmp4_;
- EventsEventEntry* _tmp5_;
+ if (_tmp2_ != NULL) {
+#line 3568 "LibraryWindow.c"
+ SidebarTree* _tmp3_;
+ EventsEventEntry* _tmp4_;
#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = self->priv->sidebar_tree;
+ _tmp3_ = self->priv->sidebar_tree;
#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = entry;
+ _tmp4_ = entry;
#line 394 "/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 3083 "LibraryWindow.c"
+ sidebar_tree_rename_entry_in_place (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+#line 3577 "LibraryWindow.c"
} else {
#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_debug ("LibraryWindow.vala:396: No event entry found for rename");
-#line 3087 "LibraryWindow.c"
+#line 3581 "LibraryWindow.c"
}
#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (entry);
-#line 3091 "LibraryWindow.c"
+#line 3585 "LibraryWindow.c"
}
-void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch* search) {
+void
+library_window_rename_search_in_sidebar (LibraryWindow* self,
+ SavedSearch* search)
+{
SearchesSidebarEntry* entry = NULL;
SearchesBranch* _tmp0_;
- SavedSearch* _tmp1_;
+ SearchesSidebarEntry* _tmp1_;
SearchesSidebarEntry* _tmp2_;
- SearchesSidebarEntry* _tmp3_;
#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3104,37 +3600,37 @@ void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch*
#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp0_ = self->priv->saved_search_branch;
#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = search;
+ _tmp1_ = searches_branch_get_entry_for_saved_search (_tmp0_, search);
#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_);
-#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- entry = _tmp2_;
+ entry = _tmp1_;
#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = entry;
+ _tmp2_ = entry;
#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp3_ != NULL) {
-#line 3117 "LibraryWindow.c"
- SidebarTree* _tmp4_;
- SearchesSidebarEntry* _tmp5_;
+ if (_tmp2_ != NULL) {
+#line 3611 "LibraryWindow.c"
+ SidebarTree* _tmp3_;
+ SearchesSidebarEntry* _tmp4_;
#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = self->priv->sidebar_tree;
+ _tmp3_ = self->priv->sidebar_tree;
#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = entry;
+ _tmp4_ = entry;
#line 402 "/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 3126 "LibraryWindow.c"
+ sidebar_tree_rename_entry_in_place (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+#line 3620 "LibraryWindow.c"
} else {
#line 404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_debug ("LibraryWindow.vala:404: No search entry found for rename");
-#line 3130 "LibraryWindow.c"
+#line 3624 "LibraryWindow.c"
}
#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (entry);
-#line 3134 "LibraryWindow.c"
+#line 3628 "LibraryWindow.c"
}
-static void library_window_real_on_quit (AppWindow* base) {
+static void
+library_window_real_on_quit (AppWindow* base)
+{
LibraryWindow * self;
ConfigFacade* _tmp0_;
ConfigFacade* _tmp1_;
@@ -3175,133 +3671,133 @@ static void library_window_real_on_quit (AppWindow* base) {
_g_object_unref0 (_tmp5_);
#line 412 "/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 3179 "LibraryWindow.c"
+#line 3675 "LibraryWindow.c"
}
-static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, CollectionPage* page) {
+static Photo*
+library_window_get_start_fullscreen_photo (LibraryWindow* self,
+ CollectionPage* page)
+{
Photo* result = NULL;
ViewCollection* view = NULL;
- CollectionPage* _tmp0_;
- ViewCollection* _tmp1_;
- GeeList* _tmp2_ = NULL;
- ViewCollection* _tmp3_;
- gint _tmp4_;
+ ViewCollection* _tmp0_;
+ GeeList* _tmp1_ = NULL;
+ ViewCollection* _tmp2_;
GeeList* sources = NULL;
- GeeList* _tmp9_;
- Photo* _tmp10_ = NULL;
- gboolean _tmp11_ = FALSE;
- GeeList* _tmp12_;
+ GeeList* _tmp7_;
+ Photo* _tmp8_ = NULL;
+ gboolean _tmp9_ = FALSE;
+ GeeList* _tmp10_;
#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_val_if_fail (IS_LIBRARY_WINDOW (self), NULL);
#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_val_if_fail (IS_COLLECTION_PAGE (page), NULL);
#line 416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = page;
+ _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_PAGE, Page));
#line 416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page));
-#line 416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- view = _tmp1_;
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = view;
+ view = _tmp0_;
#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = view_collection_get_selected_count (_tmp3_);
+ _tmp2_ = view;
#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp4_ > 0) {
-#line 3212 "LibraryWindow.c"
- ViewCollection* _tmp5_;
- GeeList* _tmp6_;
+ if (view_collection_get_selected_count (_tmp2_) > 0) {
+#line 3705 "LibraryWindow.c"
+ ViewCollection* _tmp3_;
+ GeeList* _tmp4_;
#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = view;
+ _tmp3_ = view;
#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = view_collection_get_selected_sources_of_type (_tmp5_, TYPE_LIBRARY_PHOTO);
+ _tmp4_ = view_collection_get_selected_sources_of_type (_tmp3_, TYPE_LIBRARY_PHOTO);
#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp2_);
+ _g_object_unref0 (_tmp1_);
#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = _tmp6_;
-#line 3223 "LibraryWindow.c"
+ _tmp1_ = _tmp4_;
+#line 3716 "LibraryWindow.c"
} else {
- ViewCollection* _tmp7_;
- GeeList* _tmp8_;
+ ViewCollection* _tmp5_;
+ GeeList* _tmp6_;
#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = view;
+ _tmp5_ = view;
#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = view_collection_get_sources_of_type (_tmp7_, TYPE_LIBRARY_PHOTO);
+ _tmp6_ = view_collection_get_sources_of_type (_tmp5_, TYPE_LIBRARY_PHOTO);
#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp2_);
+ _g_object_unref0 (_tmp1_);
#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = _tmp8_;
-#line 3235 "LibraryWindow.c"
+ _tmp1_ = _tmp6_;
+#line 3728 "LibraryWindow.c"
}
#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = _g_object_ref0 (_tmp2_);
+ _tmp7_ = _g_object_ref0 (_tmp1_);
#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- sources = _tmp9_;
+ sources = _tmp7_;
#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = sources;
+ _tmp10_ = sources;
#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp12_ != NULL) {
-#line 3245 "LibraryWindow.c"
- GeeList* _tmp13_;
- gint _tmp14_;
- gint _tmp15_;
+ if (_tmp10_ != NULL) {
+#line 3738 "LibraryWindow.c"
+ GeeList* _tmp11_;
+ gint _tmp12_;
+ gint _tmp13_;
#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = sources;
+ _tmp11_ = sources;
#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp15_ = _tmp14_;
+ _tmp13_ = _tmp12_;
#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = _tmp15_ != 0;
-#line 3257 "LibraryWindow.c"
+ _tmp9_ = _tmp13_ != 0;
+#line 3750 "LibraryWindow.c"
} else {
#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = FALSE;
-#line 3261 "LibraryWindow.c"
+ _tmp9_ = FALSE;
+#line 3754 "LibraryWindow.c"
}
#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp11_) {
-#line 3265 "LibraryWindow.c"
- GeeList* _tmp16_;
- gpointer _tmp17_;
+ if (_tmp9_) {
+#line 3758 "LibraryWindow.c"
+ GeeList* _tmp14_;
+ gpointer _tmp15_;
#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp16_ = sources;
+ _tmp14_ = sources;
#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp17_ = gee_list_get (_tmp16_, 0);
+ _tmp15_ = gee_list_get (_tmp14_, 0);
#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp10_);
+ _g_object_unref0 (_tmp8_);
#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp17_, TYPE_PHOTO, Photo);
-#line 3276 "LibraryWindow.c"
+ _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp15_, TYPE_PHOTO, Photo);
+#line 3769 "LibraryWindow.c"
} else {
#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp10_);
+ _g_object_unref0 (_tmp8_);
#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = NULL;
-#line 3282 "LibraryWindow.c"
+ _tmp8_ = NULL;
+#line 3775 "LibraryWindow.c"
}
#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- result = _tmp10_;
+ result = _tmp8_;
#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (sources);
#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp2_);
+ _g_object_unref0 (_tmp1_);
#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (view);
#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 3294 "LibraryWindow.c"
+#line 3787 "LibraryWindow.c"
}
-static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* page, CollectionPage* * collection, Photo* * start, ViewCollection* * view_collection) {
+static gboolean
+library_window_get_fullscreen_photo (LibraryWindow* self,
+ Page* page,
+ CollectionPage* * collection,
+ Photo* * start,
+ ViewCollection* * view_collection)
+{
CollectionPage* _vala_collection = NULL;
Photo* _vala_start = NULL;
ViewCollection* _vala_view_collection = NULL;
gboolean result = FALSE;
- Page* _tmp0_;
- Page* _tmp8_;
- Page* _tmp30_;
#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3319,36 +3815,31 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_vala_view_collection = NULL;
#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = page;
-#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_COLLECTION_PAGE)) {
-#line 3326 "LibraryWindow.c"
- Page* _tmp1_;
- CollectionPage* _tmp2_;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_COLLECTION_PAGE)) {
+#line 3820 "LibraryWindow.c"
+ CollectionPage* _tmp0_;
Photo* photo = NULL;
- CollectionPage* _tmp3_;
+ CollectionPage* _tmp1_;
+ Photo* _tmp2_;
+ Photo* _tmp3_;
Photo* _tmp4_;
Photo* _tmp5_;
- Photo* _tmp6_;
- Photo* _tmp7_;
#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = page;
-#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COLLECTION_PAGE, CollectionPage));
+ _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_COLLECTION_PAGE, CollectionPage));
#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_collection);
#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _vala_collection = _tmp2_;
+ _vala_collection = _tmp0_;
#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = _vala_collection;
+ _tmp1_ = _vala_collection;
#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = library_window_get_start_fullscreen_photo (self, _tmp3_);
+ _tmp2_ = library_window_get_start_fullscreen_photo (self, _tmp1_);
#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- photo = _tmp4_;
+ photo = _tmp2_;
#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = photo;
+ _tmp3_ = photo;
#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp5_ == NULL) {
+ if (_tmp3_ == NULL) {
#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = FALSE;
#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3357,44 +3848,44 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
if (collection) {
#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*collection = _vala_collection;
-#line 3361 "LibraryWindow.c"
+#line 3852 "LibraryWindow.c"
} else {
#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_collection);
-#line 3365 "LibraryWindow.c"
+#line 3856 "LibraryWindow.c"
}
#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (start) {
#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*start = _vala_start;
-#line 3371 "LibraryWindow.c"
+#line 3862 "LibraryWindow.c"
} else {
#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_start);
-#line 3375 "LibraryWindow.c"
+#line 3866 "LibraryWindow.c"
}
#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (view_collection) {
#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*view_collection = _vala_view_collection;
-#line 3381 "LibraryWindow.c"
+#line 3872 "LibraryWindow.c"
} else {
#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (_vala_view_collection);
-#line 3385 "LibraryWindow.c"
+#line 3876 "LibraryWindow.c"
}
#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 3389 "LibraryWindow.c"
+#line 3880 "LibraryWindow.c"
}
#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = photo;
+ _tmp4_ = photo;
#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = _g_object_ref0 (_tmp6_);
+ _tmp5_ = _g_object_ref0 (_tmp4_);
#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_start);
#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _vala_start = _tmp7_;
+ _vala_start = _tmp5_;
#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (_vala_view_collection);
#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3407,78 +3898,70 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
if (collection) {
#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*collection = _vala_collection;
-#line 3411 "LibraryWindow.c"
+#line 3902 "LibraryWindow.c"
} else {
#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_collection);
-#line 3415 "LibraryWindow.c"
+#line 3906 "LibraryWindow.c"
}
#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (start) {
#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*start = _vala_start;
-#line 3421 "LibraryWindow.c"
+#line 3912 "LibraryWindow.c"
} else {
#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_start);
-#line 3425 "LibraryWindow.c"
+#line 3916 "LibraryWindow.c"
}
#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (view_collection) {
#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*view_collection = _vala_view_collection;
-#line 3431 "LibraryWindow.c"
+#line 3922 "LibraryWindow.c"
} else {
#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (_vala_view_collection);
-#line 3435 "LibraryWindow.c"
+#line 3926 "LibraryWindow.c"
}
#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 3439 "LibraryWindow.c"
+#line 3930 "LibraryWindow.c"
}
#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = page;
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENTS_DIRECTORY_PAGE)) {
-#line 3445 "LibraryWindow.c"
+ if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_EVENTS_DIRECTORY_PAGE)) {
+#line 3934 "LibraryWindow.c"
ViewCollection* view = NULL;
- Page* _tmp9_;
- ViewCollection* _tmp10_;
- ViewCollection* _tmp11_;
- gint _tmp12_;
+ ViewCollection* _tmp6_;
+ ViewCollection* _tmp7_;
Event* event = NULL;
- ViewCollection* _tmp13_;
- DataObject* _tmp14_;
- DataView* _tmp15_;
- DataSource* _tmp16_;
- Event* _tmp17_;
- Event* _tmp18_;
+ ViewCollection* _tmp8_;
+ DataObject* _tmp9_;
+ DataView* _tmp10_;
+ DataSource* _tmp11_;
+ Event* _tmp12_;
+ Event* _tmp13_;
EventsEventEntry* entry = NULL;
- EventsBranch* _tmp19_;
- Event* _tmp20_;
- EventsEventEntry* _tmp21_;
- EventsEventEntry* _tmp22_;
- EventsEventEntry* _tmp23_;
- Page* _tmp24_;
+ EventsBranch* _tmp14_;
+ Event* _tmp15_;
+ EventsEventEntry* _tmp16_;
+ EventsEventEntry* _tmp17_;
+ EventsEventEntry* _tmp18_;
+ Page* _tmp19_;
Photo* photo = NULL;
- CollectionPage* _tmp25_;
- Photo* _tmp26_;
- Photo* _tmp27_;
- Photo* _tmp28_;
- Photo* _tmp29_;
-#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = page;
+ CollectionPage* _tmp20_;
+ Photo* _tmp21_;
+ Photo* _tmp22_;
+ Photo* _tmp23_;
+ Photo* _tmp24_;
#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = page_get_view (_tmp9_);
+ _tmp6_ = page_get_view (page);
#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- view = _tmp10_;
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = view;
+ view = _tmp6_;
#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection));
+ _tmp7_ = view;
#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp12_ == 0) {
+ if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)) == 0) {
#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = FALSE;
#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3487,54 +3970,54 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
if (collection) {
#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*collection = _vala_collection;
-#line 3491 "LibraryWindow.c"
+#line 3974 "LibraryWindow.c"
} else {
#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_collection);
-#line 3495 "LibraryWindow.c"
+#line 3978 "LibraryWindow.c"
}
#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (start) {
#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*start = _vala_start;
-#line 3501 "LibraryWindow.c"
+#line 3984 "LibraryWindow.c"
} else {
#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_start);
-#line 3505 "LibraryWindow.c"
+#line 3988 "LibraryWindow.c"
}
#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (view_collection) {
#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*view_collection = _vala_view_collection;
-#line 3511 "LibraryWindow.c"
+#line 3994 "LibraryWindow.c"
} else {
#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (_vala_view_collection);
-#line 3515 "LibraryWindow.c"
+#line 3998 "LibraryWindow.c"
}
#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 3519 "LibraryWindow.c"
+#line 4002 "LibraryWindow.c"
}
#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = view;
+ _tmp8_ = view;
#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), 0);
+ _tmp9_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), 0);
#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_VIEW, DataView);
+ _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_VIEW, DataView);
#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp16_ = data_view_get_source (_tmp15_);
+ _tmp11_ = data_view_get_source (_tmp10_);
#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_EVENT, Event);
+ _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_EVENT, Event);
#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp15_);
+ _g_object_unref0 (_tmp10_);
#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- event = _tmp17_;
+ event = _tmp12_;
#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp18_ = event;
+ _tmp13_ = event;
#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp18_ == NULL) {
+ if (_tmp13_ == NULL) {
#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = FALSE;
#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3545,48 +4028,48 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
if (collection) {
#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*collection = _vala_collection;
-#line 3549 "LibraryWindow.c"
+#line 4032 "LibraryWindow.c"
} else {
#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_collection);
-#line 3553 "LibraryWindow.c"
+#line 4036 "LibraryWindow.c"
}
#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (start) {
#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*start = _vala_start;
-#line 3559 "LibraryWindow.c"
+#line 4042 "LibraryWindow.c"
} else {
#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_start);
-#line 3563 "LibraryWindow.c"
+#line 4046 "LibraryWindow.c"
}
#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (view_collection) {
#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*view_collection = _vala_view_collection;
-#line 3569 "LibraryWindow.c"
+#line 4052 "LibraryWindow.c"
} else {
#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (_vala_view_collection);
-#line 3573 "LibraryWindow.c"
+#line 4056 "LibraryWindow.c"
}
#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 3577 "LibraryWindow.c"
+#line 4060 "LibraryWindow.c"
}
#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp19_ = self->priv->events_branch;
+ _tmp14_ = self->priv->events_branch;
#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp20_ = event;
+ _tmp15_ = event;
#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp21_ = events_branch_get_entry_for_event (_tmp19_, _tmp20_);
+ _tmp16_ = events_branch_get_entry_for_event (_tmp14_, _tmp15_);
#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- entry = _tmp21_;
+ entry = _tmp16_;
#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp22_ = entry;
+ _tmp17_ = entry;
#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp22_ == NULL) {
+ if (_tmp17_ == NULL) {
#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = FALSE;
#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3599,54 +4082,54 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
if (collection) {
#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*collection = _vala_collection;
-#line 3603 "LibraryWindow.c"
+#line 4086 "LibraryWindow.c"
} else {
#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_collection);
-#line 3607 "LibraryWindow.c"
+#line 4090 "LibraryWindow.c"
}
#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (start) {
#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*start = _vala_start;
-#line 3613 "LibraryWindow.c"
+#line 4096 "LibraryWindow.c"
} else {
#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_start);
-#line 3617 "LibraryWindow.c"
+#line 4100 "LibraryWindow.c"
}
#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (view_collection) {
#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*view_collection = _vala_view_collection;
-#line 3623 "LibraryWindow.c"
+#line 4106 "LibraryWindow.c"
} else {
#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (_vala_view_collection);
-#line 3627 "LibraryWindow.c"
+#line 4110 "LibraryWindow.c"
}
#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 3631 "LibraryWindow.c"
+#line 4114 "LibraryWindow.c"
}
#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp23_ = entry;
+ _tmp18_ = entry;
#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp24_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
+ _tmp19_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_collection);
#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _vala_collection = G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_EVENT_PAGE, EventPage), TYPE_COLLECTION_PAGE, CollectionPage);
+ _vala_collection = G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_EVENT_PAGE, EventPage), TYPE_COLLECTION_PAGE, CollectionPage);
#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp25_ = _vala_collection;
+ _tmp20_ = _vala_collection;
#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp26_ = library_window_get_start_fullscreen_photo (self, _tmp25_);
+ _tmp21_ = library_window_get_start_fullscreen_photo (self, _tmp20_);
#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- photo = _tmp26_;
+ photo = _tmp21_;
#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp27_ = photo;
+ _tmp22_ = photo;
#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp27_ == NULL) {
+ if (_tmp22_ == NULL) {
#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = FALSE;
#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3661,44 +4144,44 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
if (collection) {
#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*collection = _vala_collection;
-#line 3665 "LibraryWindow.c"
+#line 4148 "LibraryWindow.c"
} else {
#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_collection);
-#line 3669 "LibraryWindow.c"
+#line 4152 "LibraryWindow.c"
}
#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (start) {
#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*start = _vala_start;
-#line 3675 "LibraryWindow.c"
+#line 4158 "LibraryWindow.c"
} else {
#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_start);
-#line 3679 "LibraryWindow.c"
+#line 4162 "LibraryWindow.c"
}
#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (view_collection) {
#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*view_collection = _vala_view_collection;
-#line 3685 "LibraryWindow.c"
+#line 4168 "LibraryWindow.c"
} else {
#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (_vala_view_collection);
-#line 3689 "LibraryWindow.c"
+#line 4172 "LibraryWindow.c"
}
#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 3693 "LibraryWindow.c"
+#line 4176 "LibraryWindow.c"
}
#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp28_ = photo;
+ _tmp23_ = photo;
#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp29_ = _g_object_ref0 (_tmp28_);
+ _tmp24_ = _g_object_ref0 (_tmp23_);
#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_start);
#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _vala_start = _tmp29_;
+ _vala_start = _tmp24_;
#line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (_vala_view_collection);
#line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3717,72 +4200,66 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
if (collection) {
#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*collection = _vala_collection;
-#line 3721 "LibraryWindow.c"
+#line 4204 "LibraryWindow.c"
} else {
#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_collection);
-#line 3725 "LibraryWindow.c"
+#line 4208 "LibraryWindow.c"
}
#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (start) {
#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*start = _vala_start;
-#line 3731 "LibraryWindow.c"
+#line 4214 "LibraryWindow.c"
} else {
#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_start);
-#line 3735 "LibraryWindow.c"
+#line 4218 "LibraryWindow.c"
}
#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (view_collection) {
#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*view_collection = _vala_view_collection;
-#line 3741 "LibraryWindow.c"
+#line 4224 "LibraryWindow.c"
} else {
#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (_vala_view_collection);
-#line 3745 "LibraryWindow.c"
+#line 4228 "LibraryWindow.c"
}
#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 3749 "LibraryWindow.c"
+#line 4232 "LibraryWindow.c"
}
#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp30_ = page;
-#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 3755 "LibraryWindow.c"
+ if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_LIBRARY_PHOTO_PAGE)) {
+#line 4236 "LibraryWindow.c"
LibraryPhotoPage* photo_page = NULL;
- Page* _tmp31_;
- LibraryPhotoPage* _tmp32_;
+ LibraryPhotoPage* _tmp25_;
CollectionPage* controller = NULL;
- LibraryPhotoPage* _tmp33_;
- CollectionPage* _tmp34_;
- CollectionPage* _tmp35_;
- LibraryPhotoPage* _tmp36_;
- gboolean _tmp37_;
- CollectionPage* _tmp38_;
- CollectionPage* _tmp39_;
- LibraryPhotoPage* _tmp40_;
- Photo* _tmp41_;
- LibraryPhotoPage* _tmp42_;
- ViewCollection* _tmp43_;
-#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp31_ = page;
+ LibraryPhotoPage* _tmp26_;
+ CollectionPage* _tmp27_;
+ CollectionPage* _tmp28_;
+ LibraryPhotoPage* _tmp29_;
+ CollectionPage* _tmp30_;
+ CollectionPage* _tmp31_;
+ LibraryPhotoPage* _tmp32_;
+ Photo* _tmp33_;
+ LibraryPhotoPage* _tmp34_;
+ ViewCollection* _tmp35_;
#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage));
+ _tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage));
#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- photo_page = _tmp32_;
+ photo_page = _tmp25_;
#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp33_ = photo_page;
+ _tmp26_ = photo_page;
#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp34_ = library_photo_page_get_controller_page (_tmp33_);
+ _tmp27_ = library_photo_page_get_controller_page (_tmp26_);
#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- controller = _tmp34_;
+ controller = _tmp27_;
#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp35_ = controller;
+ _tmp28_ = controller;
#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp35_ == NULL) {
+ if (_tmp28_ == NULL) {
#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = FALSE;
#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3793,42 +4270,40 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
if (collection) {
#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*collection = _vala_collection;
-#line 3797 "LibraryWindow.c"
+#line 4274 "LibraryWindow.c"
} else {
#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_collection);
-#line 3801 "LibraryWindow.c"
+#line 4278 "LibraryWindow.c"
}
#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (start) {
#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*start = _vala_start;
-#line 3807 "LibraryWindow.c"
+#line 4284 "LibraryWindow.c"
} else {
#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_start);
-#line 3811 "LibraryWindow.c"
+#line 4288 "LibraryWindow.c"
}
#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (view_collection) {
#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*view_collection = _vala_view_collection;
-#line 3817 "LibraryWindow.c"
+#line 4294 "LibraryWindow.c"
} else {
#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (_vala_view_collection);
-#line 3821 "LibraryWindow.c"
+#line 4298 "LibraryWindow.c"
}
#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 3825 "LibraryWindow.c"
+#line 4302 "LibraryWindow.c"
}
#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp36_ = photo_page;
+ _tmp29_ = photo_page;
#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp37_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (!_tmp37_) {
+ if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = FALSE;
#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3839,60 +4314,60 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
if (collection) {
#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*collection = _vala_collection;
-#line 3843 "LibraryWindow.c"
+#line 4318 "LibraryWindow.c"
} else {
#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_collection);
-#line 3847 "LibraryWindow.c"
+#line 4322 "LibraryWindow.c"
}
#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (start) {
#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*start = _vala_start;
-#line 3853 "LibraryWindow.c"
+#line 4328 "LibraryWindow.c"
} else {
#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_start);
-#line 3857 "LibraryWindow.c"
+#line 4332 "LibraryWindow.c"
}
#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (view_collection) {
#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*view_collection = _vala_view_collection;
-#line 3863 "LibraryWindow.c"
+#line 4338 "LibraryWindow.c"
} else {
#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (_vala_view_collection);
-#line 3867 "LibraryWindow.c"
+#line 4342 "LibraryWindow.c"
}
#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 3871 "LibraryWindow.c"
+#line 4346 "LibraryWindow.c"
}
#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp38_ = controller;
+ _tmp30_ = controller;
#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp39_ = _g_object_ref0 (_tmp38_);
+ _tmp31_ = _g_object_ref0 (_tmp30_);
#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_collection);
#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _vala_collection = _tmp39_;
+ _vala_collection = _tmp31_;
#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp40_ = photo_page;
+ _tmp32_ = photo_page;
#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp41_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+ _tmp33_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_EDITING_HOST_PAGE, EditingHostPage));
#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_start);
#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _vala_start = _tmp41_;
+ _vala_start = _tmp33_;
#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp42_ = photo_page;
+ _tmp34_ = photo_page;
#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp43_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PAGE, Page));
+ _tmp35_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_PAGE, Page));
#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (_vala_view_collection);
#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _vala_view_collection = _tmp43_;
+ _vala_view_collection = _tmp35_;
#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = TRUE;
#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3903,35 +4378,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
if (collection) {
#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*collection = _vala_collection;
-#line 3907 "LibraryWindow.c"
+#line 4382 "LibraryWindow.c"
} else {
#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_collection);
-#line 3911 "LibraryWindow.c"
+#line 4386 "LibraryWindow.c"
}
#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (start) {
#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*start = _vala_start;
-#line 3917 "LibraryWindow.c"
+#line 4392 "LibraryWindow.c"
} else {
#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_start);
-#line 3921 "LibraryWindow.c"
+#line 4396 "LibraryWindow.c"
}
#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (view_collection) {
#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*view_collection = _vala_view_collection;
-#line 3927 "LibraryWindow.c"
+#line 4402 "LibraryWindow.c"
} else {
#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (_vala_view_collection);
-#line 3931 "LibraryWindow.c"
+#line 4406 "LibraryWindow.c"
}
#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 3935 "LibraryWindow.c"
+#line 4410 "LibraryWindow.c"
}
#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = FALSE;
@@ -3939,39 +4414,41 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
if (collection) {
#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*collection = _vala_collection;
-#line 3943 "LibraryWindow.c"
+#line 4418 "LibraryWindow.c"
} else {
#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_collection);
-#line 3947 "LibraryWindow.c"
+#line 4422 "LibraryWindow.c"
}
#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (start) {
#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*start = _vala_start;
-#line 3953 "LibraryWindow.c"
+#line 4428 "LibraryWindow.c"
} else {
#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_vala_start);
-#line 3957 "LibraryWindow.c"
+#line 4432 "LibraryWindow.c"
}
#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (view_collection) {
#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
*view_collection = _vala_view_collection;
-#line 3963 "LibraryWindow.c"
+#line 4438 "LibraryWindow.c"
} else {
#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (_vala_view_collection);
-#line 3967 "LibraryWindow.c"
+#line 4442 "LibraryWindow.c"
}
#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 3971 "LibraryWindow.c"
+#line 4446 "LibraryWindow.c"
}
-static void library_window_real_on_fullscreen (AppWindow* base) {
+static void
+library_window_real_on_fullscreen (AppWindow* base)
+{
LibraryWindow * self;
Page* current_page = NULL;
Page* _tmp0_;
@@ -4004,7 +4481,7 @@ static void library_window_real_on_fullscreen (AppWindow* base) {
_g_object_unref0 (current_page);
#line 494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 4008 "LibraryWindow.c"
+#line 4485 "LibraryWindow.c"
}
#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
view = NULL;
@@ -4036,7 +4513,7 @@ static void library_window_real_on_fullscreen (AppWindow* base) {
_g_object_unref0 (current_page);
#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 4040 "LibraryWindow.c"
+#line 4517 "LibraryWindow.c"
}
#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp7_ = collection;
@@ -4064,27 +4541,31 @@ static void library_window_real_on_fullscreen (AppWindow* base) {
_g_object_unref0 (collection);
#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (current_page);
-#line 4068 "LibraryWindow.c"
+#line 4545 "LibraryWindow.c"
}
-static void _g_free0_ (gpointer var) {
+static void
+_g_free0_ (gpointer var)
+{
#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
var = (g_free (var), NULL);
-#line 4075 "LibraryWindow.c"
+#line 4554 "LibraryWindow.c"
}
-static void _g_slist_free__g_free0_ (GSList* self) {
+static inline void
+_g_slist_free__g_free0_ (GSList* self)
+{
#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_slist_foreach (self, (GFunc) _g_free0_, NULL);
-#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_slist_free (self);
-#line 4084 "LibraryWindow.c"
+ g_slist_free_full (self, (GDestroyNotify) _g_free0_);
+#line 4563 "LibraryWindow.c"
}
-static void library_window_on_file_import (LibraryWindow* self) {
+static void
+library_window_on_file_import (LibraryWindow* self)
+{
GtkFileChooserDialog* import_dialog = NULL;
GtkFileChooserDialog* _tmp0_;
GtkFileChooserDialog* _tmp1_;
@@ -4100,13 +4581,12 @@ static void library_window_on_file_import (LibraryWindow* self) {
gint response = 0;
GtkFileChooserDialog* _tmp10_;
gint _tmp11_;
- gint _tmp12_;
- GtkFileChooserDialog* _tmp31_;
- gchar* _tmp32_;
- GtkCheckButton* _tmp33_;
- gboolean _tmp34_;
- gboolean _tmp35_;
- GtkFileChooserDialog* _tmp36_;
+ GtkFileChooserDialog* _tmp28_;
+ gchar* _tmp29_;
+ GtkCheckButton* _tmp30_;
+ gboolean _tmp31_;
+ gboolean _tmp32_;
+ GtkFileChooserDialog* _tmp33_;
#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4118,17 +4598,17 @@ static void library_window_on_file_import (LibraryWindow* self) {
#line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp1_ = import_dialog;
#line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
+ gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_file_chooser_get_type (), GtkFileChooser), FALSE);
#line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp2_ = import_dialog;
#line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE);
+ gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_file_chooser_get_type (), GtkFileChooser), TRUE);
#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp3_ = import_dialog;
#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp4_ = self->priv->import_dir;
#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp4_);
+ gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_file_chooser_get_type (), GtkFileChooser), _tmp4_);
#line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp5_ = (GtkCheckButton*) gtk_check_button_new_with_label (_ ("Recurse Into Subfolders"));
#line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4146,128 +4626,122 @@ static void library_window_on_file_import (LibraryWindow* self) {
#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp9_ = recursive;
#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_file_chooser_set_extra_widget (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
+ gtk_file_chooser_set_extra_widget (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_file_chooser_get_type (), GtkFileChooser), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp10_ = import_dialog;
#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_dialog_get_type (), GtkDialog));
-#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- response = _tmp11_;
+ response = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_dialog_get_type (), GtkDialog));
#line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = response;
+ _tmp11_ = response;
#line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp12_ == ((gint) GTK_RESPONSE_OK)) {
-#line 4161 "LibraryWindow.c"
- GtkFileChooserDialog* _tmp13_;
- GtkResponseType _tmp14_ = 0;
- GtkFileChooserDialog* _tmp15_;
+ if (_tmp11_ == ((gint) GTK_RESPONSE_OK)) {
+#line 4639 "LibraryWindow.c"
+ GtkFileChooserDialog* _tmp12_;
+ GtkResponseType _tmp13_ = 0;
+ GtkFileChooserDialog* _tmp14_;
+ gchar* _tmp15_;
gchar* _tmp16_;
- gchar* _tmp17_;
+ GFile* _tmp17_;
GFile* _tmp18_;
- GFile* _tmp19_;
- gboolean _tmp20_;
- gboolean _tmp21_;
+ gboolean _tmp19_;
GtkResponseType copy_files_response = 0;
- GtkResponseType _tmp23_;
+ GtkResponseType _tmp20_;
#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = import_dialog;
+ _tmp12_ = import_dialog;
#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp15_ = import_dialog;
+ _tmp14_ = import_dialog;
#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp16_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+ _tmp15_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_file_chooser_get_type (), GtkFileChooser));
#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp17_ = _tmp16_;
-#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp18_ = g_file_new_for_uri (_tmp17_);
+ _tmp16_ = _tmp15_;
#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp19_ = _tmp18_;
+ _tmp17_ = g_file_new_for_uri (_tmp16_);
#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp20_ = app_dirs_is_in_import_dir (_tmp19_);
+ _tmp18_ = _tmp17_;
#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp21_ = _tmp20_;
+ _tmp19_ = app_dirs_is_in_import_dir (_tmp18_);
#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp19_);
+ _g_object_unref0 (_tmp18_);
#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_free0 (_tmp17_);
+ _g_free0 (_tmp16_);
#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp21_) {
+ if (_tmp19_) {
#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = GTK_RESPONSE_REJECT;
-#line 4199 "LibraryWindow.c"
+ _tmp13_ = GTK_RESPONSE_REJECT;
+#line 4674 "LibraryWindow.c"
} else {
- GtkResponseType _tmp22_;
-#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp22_ = copy_files_dialog ();
#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = _tmp22_;
-#line 4206 "LibraryWindow.c"
+ _tmp13_ = copy_files_dialog ();
+#line 4678 "LibraryWindow.c"
}
#line 524 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- copy_files_response = _tmp14_;
+ copy_files_response = _tmp13_;
#line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp23_ = copy_files_response;
+ _tmp20_ = copy_files_response;
#line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp23_ != GTK_RESPONSE_CANCEL) {
-#line 4214 "LibraryWindow.c"
- GtkFileChooserDialog* _tmp24_;
- GSList* _tmp25_;
- GSList* _tmp26_;
- GtkResponseType _tmp27_;
- GtkCheckButton* _tmp28_;
- gboolean _tmp29_;
- gboolean _tmp30_;
+ if (_tmp20_ != GTK_RESPONSE_CANCEL) {
+#line 4686 "LibraryWindow.c"
+ GtkFileChooserDialog* _tmp21_;
+ GSList* _tmp22_;
+ GSList* _tmp23_;
+ GtkResponseType _tmp24_;
+ GtkCheckButton* _tmp25_;
+ gboolean _tmp26_;
+ gboolean _tmp27_;
#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp24_ = import_dialog;
+ _tmp21_ = import_dialog;
#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp25_ = gtk_file_chooser_get_uris (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+ _tmp22_ = gtk_file_chooser_get_uris (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_file_chooser_get_type (), GtkFileChooser));
#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp26_ = _tmp25_;
+ _tmp23_ = _tmp22_;
#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp27_ = copy_files_response;
+ _tmp24_ = copy_files_response;
#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp28_ = recursive;
+ _tmp25_ = recursive;
#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp29_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_toggle_button_get_type (), GtkToggleButton));
+ _tmp26_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_toggle_button_get_type (), GtkToggleButton));
#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp30_ = _tmp29_;
+ _tmp27_ = _tmp26_;
#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_dispatch_import_jobs (self, _tmp26_, "folders", _tmp27_ == GTK_RESPONSE_ACCEPT, _tmp30_);
+ library_window_dispatch_import_jobs (self, _tmp23_, "folders", _tmp24_ == GTK_RESPONSE_ACCEPT, _tmp27_);
#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- __g_slist_free__g_free0_0 (_tmp26_);
-#line 4240 "LibraryWindow.c"
+ __g_slist_free__g_free0_0 (_tmp23_);
+#line 4712 "LibraryWindow.c"
}
}
#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp31_ = import_dialog;
+ _tmp28_ = import_dialog;
#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp32_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+ _tmp29_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_file_chooser_get_type (), GtkFileChooser));
#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_free0 (self->priv->import_dir);
#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- self->priv->import_dir = _tmp32_;
+ self->priv->import_dir = _tmp29_;
#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp33_ = recursive;
+ _tmp30_ = recursive;
#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp34_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_toggle_button_get_type (), GtkToggleButton));
+ _tmp31_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_toggle_button_get_type (), GtkToggleButton));
#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp35_ = _tmp34_;
+ _tmp32_ = _tmp31_;
#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- self->priv->import_recursive = _tmp35_;
+ self->priv->import_recursive = _tmp32_;
#line 536 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp36_ = import_dialog;
+ _tmp33_ = import_dialog;
#line 536 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (recursive);
#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (import_dialog);
-#line 4267 "LibraryWindow.c"
+#line 4739 "LibraryWindow.c"
}
-static void library_window_on_external_library_import (LibraryWindow* self) {
+static void
+library_window_on_external_library_import (LibraryWindow* self)
+{
GtkDialog* import_dialog = NULL;
DataImportsUIDataImportsDialog* _tmp0_;
#line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4280,16 +4754,17 @@ static void library_window_on_external_library_import (LibraryWindow* self) {
gtk_dialog_run (import_dialog);
#line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (import_dialog);
-#line 4284 "LibraryWindow.c"
+#line 4758 "LibraryWindow.c"
}
-static void library_window_real_update_common_action_availability (AppWindow* base, Page* old_page, Page* new_page) {
+static void
+library_window_real_update_common_action_availability (AppWindow* base,
+ Page* old_page,
+ Page* new_page)
+{
LibraryWindow * self;
- Page* _tmp0_;
- Page* _tmp1_;
gboolean is_checkerboard = FALSE;
- Page* _tmp2_;
#line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
#line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4297,131 +4772,109 @@ static void library_window_real_update_common_action_availability (AppWindow* ba
#line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
#line 546 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = old_page;
-#line 546 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = new_page;
-#line 546 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- APP_WINDOW_CLASS (library_window_parent_class)->update_common_action_availability (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), _tmp0_, _tmp1_);
-#line 548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = new_page;
+ APP_WINDOW_CLASS (library_window_parent_class)->update_common_action_availability (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), old_page, new_page);
#line 548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_CHECKERBOARD_PAGE);
+ is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (new_page, TYPE_CHECKERBOARD_PAGE);
#line 550 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplaySearchbar", is_checkerboard);
#line 551 "/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 4314 "LibraryWindow.c"
+#line 4783 "LibraryWindow.c"
}
-static void library_window_real_update_common_actions (AppWindow* base, Page* page, gint selected_count, gint count) {
+static void
+library_window_real_update_common_actions (AppWindow* base,
+ Page* page,
+ gint selected_count,
+ gint count)
+{
LibraryWindow * self;
CollectionPage* collection = NULL;
Photo* start = NULL;
gboolean can_fullscreen = FALSE;
- Page* _tmp0_;
- CollectionPage* _tmp1_ = NULL;
- Photo* _tmp2_ = NULL;
- gboolean _tmp3_;
- gboolean _tmp4_;
- gboolean _tmp5_;
- Page* _tmp6_;
- gint _tmp7_;
- gint _tmp8_;
+ CollectionPage* _tmp0_ = NULL;
+ Photo* _tmp1_ = NULL;
+ gboolean _tmp2_;
#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_PAGE (page));
#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = page;
-#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = library_window_get_fullscreen_photo (self, _tmp0_, &_tmp1_, &_tmp2_, NULL);
+ _tmp2_ = library_window_get_fullscreen_photo (self, page, &_tmp0_, &_tmp1_, NULL);
#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (collection);
#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- collection = _tmp1_;
+ collection = _tmp0_;
#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (start);
#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- start = _tmp2_;
+ start = _tmp1_;
#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- can_fullscreen = _tmp3_;
-#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = library_window_can_empty_trash (self);
+ can_fullscreen = _tmp2_;
#line 562 "/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", _tmp4_);
+ app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", library_window_can_empty_trash (self));
#line 563 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
app_window_set_common_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", TRUE);
#line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = library_window_can_jump_to_event (self);
-#line 564 "/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", _tmp5_);
+ app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", library_window_can_jump_to_event (self));
#line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonFullscreen", can_fullscreen);
#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = page;
-#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = selected_count;
-#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = count;
-#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- APP_WINDOW_CLASS (library_window_parent_class)->update_common_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), _tmp6_, _tmp7_, _tmp8_);
+ APP_WINDOW_CLASS (library_window_parent_class)->update_common_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), page, selected_count, count);
#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (start);
#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (collection);
-#line 4374 "LibraryWindow.c"
+#line 4830 "LibraryWindow.c"
}
-static void library_window_on_trashcan_contents_altered (LibraryWindow* self) {
- gboolean _tmp0_;
+static void
+library_window_on_trashcan_contents_altered (LibraryWindow* self)
+{
#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = library_window_can_empty_trash (self);
-#line 571 "/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 4386 "LibraryWindow.c"
+ app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", library_window_can_empty_trash (self));
+#line 4841 "LibraryWindow.c"
}
-static gboolean library_window_can_empty_trash (LibraryWindow* self) {
+static gboolean
+library_window_can_empty_trash (LibraryWindow* self)
+{
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
LibraryPhotoSourceCollection* _tmp1_;
- gint _tmp2_;
#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp1_ = library_photo_global;
#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp2_ > 0) {
+ if (media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)) > 0) {
#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp0_ = TRUE;
-#line 4405 "LibraryWindow.c"
+#line 4859 "LibraryWindow.c"
} else {
- VideoSourceCollection* _tmp3_;
- gint _tmp4_;
-#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = video_global;
+ VideoSourceCollection* _tmp2_;
#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
+ _tmp2_ = video_global;
#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = _tmp4_ > 0;
-#line 4415 "LibraryWindow.c"
+ _tmp0_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)) > 0;
+#line 4866 "LibraryWindow.c"
}
#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = _tmp0_;
#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 4421 "LibraryWindow.c"
+#line 4872 "LibraryWindow.c"
}
-static void library_window_on_empty_trash (LibraryWindow* self) {
+static void
+library_window_on_empty_trash (LibraryWindow* self)
+{
GeeArrayList* to_remove = NULL;
GeeArrayList* _tmp0_;
LibraryPhotoSourceCollection* _tmp1_;
@@ -4470,11 +4923,13 @@ static void library_window_on_empty_trash (LibraryWindow* self) {
_command_manager_unref0 (_tmp8_);
#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (to_remove);
-#line 4474 "LibraryWindow.c"
+#line 4927 "LibraryWindow.c"
}
-static void library_window_on_new_search (LibraryWindow* self) {
+static void
+library_window_on_new_search (LibraryWindow* self)
+{
SavedSearchDialog* _tmp0_;
SavedSearchDialog* _tmp1_;
#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4489,11 +4944,13 @@ static void library_window_on_new_search (LibraryWindow* self) {
saved_search_dialog_show (_tmp1_);
#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_tmp1_);
-#line 4493 "LibraryWindow.c"
+#line 4948 "LibraryWindow.c"
}
-static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
+static gboolean
+library_window_can_jump_to_event (LibraryWindow* self)
+{
gboolean result = FALSE;
ViewCollection* view = NULL;
Page* _tmp0_;
@@ -4501,7 +4958,6 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
ViewCollection* _tmp2_;
ViewCollection* _tmp3_;
ViewCollection* _tmp4_;
- gint _tmp5_;
#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4519,24 +4975,22 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp4_ = view;
#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = view_collection_get_selected_count (_tmp4_);
-#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp5_ == 1) {
-#line 4526 "LibraryWindow.c"
+ if (view_collection_get_selected_count (_tmp4_) == 1) {
+#line 4980 "LibraryWindow.c"
DataSource* selected_source = NULL;
- ViewCollection* _tmp6_;
+ ViewCollection* _tmp5_;
+ DataSource* _tmp6_;
DataSource* _tmp7_;
- DataSource* _tmp8_;
#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = view;
+ _tmp5_ = view;
#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0);
+ _tmp6_ = view_collection_get_selected_source_at (_tmp5_, 0);
#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- selected_source = _tmp7_;
+ selected_source = _tmp6_;
#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = selected_source;
+ _tmp7_ = selected_source;
#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENT)) {
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_EVENT)) {
#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = TRUE;
#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4545,45 +4999,45 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
_data_collection_unref0 (view);
#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 4549 "LibraryWindow.c"
+#line 5003 "LibraryWindow.c"
} else {
- DataSource* _tmp9_;
+ DataSource* _tmp8_;
#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = selected_source;
+ _tmp8_ = selected_source;
#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_MEDIA_SOURCE)) {
-#line 4556 "LibraryWindow.c"
- ViewCollection* _tmp10_;
- DataSource* _tmp11_;
- MediaSource* _tmp12_;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_MEDIA_SOURCE)) {
+#line 5010 "LibraryWindow.c"
+ ViewCollection* _tmp9_;
+ DataSource* _tmp10_;
+ MediaSource* _tmp11_;
+ Event* _tmp12_;
Event* _tmp13_;
- Event* _tmp14_;
- gboolean _tmp15_;
+ gboolean _tmp14_;
#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = view;
+ _tmp9_ = view;
#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = view_collection_get_selected_source_at (_tmp10_, 0);
+ _tmp10_ = view_collection_get_selected_source_at (_tmp9_, 0);
#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource);
+ _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource);
#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = media_source_get_event (_tmp12_);
+ _tmp12_ = media_source_get_event (_tmp11_);
#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = _tmp13_;
+ _tmp13_ = _tmp12_;
#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp15_ = _tmp14_ != NULL;
+ _tmp14_ = _tmp13_ != NULL;
#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp14_);
+ _g_object_unref0 (_tmp13_);
#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp12_);
+ _g_object_unref0 (_tmp11_);
#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- result = _tmp15_;
+ result = _tmp14_;
#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (selected_source);
#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (view);
#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 4587 "LibraryWindow.c"
+#line 5041 "LibraryWindow.c"
} else {
#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = FALSE;
@@ -4593,12 +5047,12 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
_data_collection_unref0 (view);
#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 4597 "LibraryWindow.c"
+#line 5051 "LibraryWindow.c"
}
}
#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (selected_source);
-#line 4602 "LibraryWindow.c"
+#line 5056 "LibraryWindow.c"
} else {
#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = FALSE;
@@ -4606,31 +5060,32 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
_data_collection_unref0 (view);
#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 4610 "LibraryWindow.c"
+#line 5064 "LibraryWindow.c"
}
#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (view);
-#line 4614 "LibraryWindow.c"
+#line 5068 "LibraryWindow.c"
}
-static void library_window_on_jump_to_event (LibraryWindow* self) {
+static void
+library_window_on_jump_to_event (LibraryWindow* self)
+{
ViewCollection* view = NULL;
Page* _tmp0_;
Page* _tmp1_;
ViewCollection* _tmp2_;
ViewCollection* _tmp3_;
ViewCollection* _tmp4_;
- gint _tmp5_;
MediaSource* media = NULL;
- ViewCollection* _tmp6_;
- DataSource* _tmp7_;
+ ViewCollection* _tmp5_;
+ DataSource* _tmp6_;
+ MediaSource* _tmp7_;
MediaSource* _tmp8_;
MediaSource* _tmp9_;
- MediaSource* _tmp10_;
+ Event* _tmp10_;
Event* _tmp11_;
- Event* _tmp12_;
- gboolean _tmp13_;
+ gboolean _tmp12_;
#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4648,85 +5103,87 @@ static void library_window_on_jump_to_event (LibraryWindow* self) {
#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp4_ = view;
#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = view_collection_get_selected_count (_tmp4_);
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp5_ != 1) {
+ if (view_collection_get_selected_count (_tmp4_) != 1) {
#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (view);
#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 4659 "LibraryWindow.c"
+#line 5112 "LibraryWindow.c"
}
#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = view;
+ _tmp5_ = view;
#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0);
+ _tmp6_ = view_collection_get_selected_source_at (_tmp5_, 0);
#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp7_) : NULL;
+ _tmp7_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp6_) : NULL;
#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp8_ == NULL) {
+ if (_tmp7_ == NULL) {
#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp7_);
-#line 4671 "LibraryWindow.c"
+ _g_object_unref0 (_tmp6_);
+#line 5124 "LibraryWindow.c"
}
#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- media = _tmp8_;
+ media = _tmp7_;
#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = media;
+ _tmp8_ = media;
#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp9_ == NULL) {
+ if (_tmp8_ == NULL) {
#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (media);
#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (view);
#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 4685 "LibraryWindow.c"
+#line 5138 "LibraryWindow.c"
}
#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = media;
+ _tmp9_ = media;
#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = media_source_get_event (_tmp10_);
+ _tmp10_ = media_source_get_event (_tmp9_);
#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = _tmp11_;
+ _tmp11_ = _tmp10_;
#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = _tmp12_ != NULL;
+ _tmp12_ = _tmp11_ != NULL;
#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp12_);
+ _g_object_unref0 (_tmp11_);
#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp13_) {
-#line 4699 "LibraryWindow.c"
- MediaSource* _tmp14_;
+ if (_tmp12_) {
+#line 5152 "LibraryWindow.c"
+ MediaSource* _tmp13_;
+ Event* _tmp14_;
Event* _tmp15_;
- Event* _tmp16_;
#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = media;
+ _tmp13_ = media;
#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp15_ = media_source_get_event (_tmp14_);
+ _tmp14_ = media_source_get_event (_tmp13_);
#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp16_ = _tmp15_;
+ _tmp15_ = _tmp14_;
#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_switch_to_event (self, _tmp16_);
+ library_window_switch_to_event (self, _tmp15_);
#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp16_);
-#line 4713 "LibraryWindow.c"
+ _g_object_unref0 (_tmp15_);
+#line 5166 "LibraryWindow.c"
}
#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (media);
#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (view);
-#line 4719 "LibraryWindow.c"
+#line 5172 "LibraryWindow.c"
}
-static GVariant* _variant_new5 (gboolean value) {
+static GVariant*
+_variant_new5 (gboolean value)
+{
#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4726 "LibraryWindow.c"
+#line 5181 "LibraryWindow.c"
}
-static void library_window_on_find (LibraryWindow* self) {
+static void
+library_window_on_find (LibraryWindow* self)
+{
GAction* action = NULL;
GAction* _tmp0_;
GAction* _tmp1_;
@@ -4752,23 +5209,24 @@ static void library_window_on_find (LibraryWindow* self) {
search_filter_toolbar_take_focus (_tmp3_);
#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (action);
-#line 4756 "LibraryWindow.c"
+#line 5213 "LibraryWindow.c"
}
-static void library_window_on_media_altered (LibraryWindow* self) {
- gboolean _tmp0_;
+static void
+library_window_on_media_altered (LibraryWindow* self)
+{
#line 629 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = library_window_can_jump_to_event (self);
-#line 630 "/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 4768 "LibraryWindow.c"
+ app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", library_window_can_jump_to_event (self));
+#line 5224 "LibraryWindow.c"
}
-static void library_window_on_clear_search (LibraryWindow* self) {
+static void
+library_window_on_clear_search (LibraryWindow* self)
+{
gboolean _tmp0_;
#line 633 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
@@ -4776,18 +5234,20 @@ static void library_window_on_clear_search (LibraryWindow* self) {
_tmp0_ = self->priv->is_search_toolbar_visible;
#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp0_) {
-#line 4780 "LibraryWindow.c"
+#line 5238 "LibraryWindow.c"
SearchFilterActions* _tmp1_;
#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp1_ = self->priv->search_actions;
#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
search_filter_actions_reset (_tmp1_);
-#line 4786 "LibraryWindow.c"
+#line 5244 "LibraryWindow.c"
}
}
-gint library_window_get_events_sort (LibraryWindow* self) {
+gint
+library_window_get_events_sort (LibraryWindow* self)
+{
gint result = 0;
GSimpleAction* action = NULL;
GAction* _tmp0_;
@@ -4806,7 +5266,7 @@ gint library_window_get_events_sort (LibraryWindow* self) {
_tmp3_ = action;
#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp3_ != NULL) {
-#line 4810 "LibraryWindow.c"
+#line 5270 "LibraryWindow.c"
gint _tmp4_ = 0;
GSimpleAction* _tmp5_;
GVariant* _tmp6_;
@@ -4832,19 +5292,19 @@ gint library_window_get_events_sort (LibraryWindow* self) {
if (_tmp10_) {
#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp4_ = 0;
-#line 4836 "LibraryWindow.c"
+#line 5296 "LibraryWindow.c"
} else {
#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp4_ = 1;
-#line 4840 "LibraryWindow.c"
+#line 5300 "LibraryWindow.c"
}
#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp2_ = _tmp4_;
-#line 4844 "LibraryWindow.c"
+#line 5304 "LibraryWindow.c"
} else {
#line 643 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp2_ = 1;
-#line 4848 "LibraryWindow.c"
+#line 5308 "LibraryWindow.c"
}
#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = _tmp2_;
@@ -4852,17 +5312,18 @@ gint library_window_get_events_sort (LibraryWindow* self) {
_g_object_unref0 (action);
#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 4856 "LibraryWindow.c"
+#line 5316 "LibraryWindow.c"
}
-static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleAction* action, GVariant* value) {
+static void
+library_window_on_events_sort_changed (LibraryWindow* self,
+ GSimpleAction* action,
+ GVariant* value)
+{
ConfigFacade* _tmp0_;
ConfigFacade* _tmp1_;
- GVariant* _tmp2_;
- const gchar* _tmp3_;
- GSimpleAction* _tmp4_;
- GVariant* _tmp5_;
+ const gchar* _tmp2_;
#line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4872,300 +5333,277 @@ static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleA
#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp1_ = _tmp0_;
#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = value;
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = g_variant_get_string (_tmp2_, NULL);
+ _tmp2_ = g_variant_get_string (value, NULL);
#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- configuration_facade_set_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), g_strcmp0 (_tmp3_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0);
+ configuration_facade_set_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), g_strcmp0 (_tmp2_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0);
#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_tmp1_);
#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = action;
-#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = value;
-#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 4889 "LibraryWindow.c"
+ g_simple_action_set_state (action, value);
+#line 5344 "LibraryWindow.c"
}
-static void library_window_on_preferences (LibraryWindow* self) {
+static void
+library_window_on_preferences (LibraryWindow* self)
+{
#line 654 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
preferences_dialog_show_preferences ();
-#line 4898 "LibraryWindow.c"
+#line 5355 "LibraryWindow.c"
}
-static void library_window_on_display_basic_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value) {
+static void
+library_window_on_display_basic_properties (LibraryWindow* self,
+ GSimpleAction* action,
+ GVariant* value)
+{
gboolean display = FALSE;
- GVariant* _tmp0_;
- gboolean _tmp1_;
- gboolean _tmp2_;
- ConfigFacade* _tmp10_;
- ConfigFacade* _tmp11_;
- gboolean _tmp12_;
- GSimpleAction* _tmp13_;
- GVariant* _tmp14_;
+ gboolean _tmp0_;
+ ConfigFacade* _tmp8_;
+ ConfigFacade* _tmp9_;
+ gboolean _tmp10_;
#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (G_IS_SIMPLE_ACTION (action));
#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = value;
-#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- display = _tmp1_;
+ display = g_variant_get_boolean (value);
#line 661 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = display;
+ _tmp0_ = display;
#line 661 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp2_) {
-#line 4926 "LibraryWindow.c"
- BasicProperties* _tmp3_;
- Page* _tmp4_;
- Page* _tmp5_;
- GtkFrame* _tmp6_;
+ if (_tmp0_) {
+#line 5379 "LibraryWindow.c"
+ BasicProperties* _tmp1_;
+ Page* _tmp2_;
+ Page* _tmp3_;
+ GtkFrame* _tmp4_;
#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = self->priv->basic_properties;
+ _tmp1_ = self->priv->basic_properties;
#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
+ _tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = _tmp4_;
+ _tmp3_ = _tmp2_;
#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_);
+ properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PROPERTIES, Properties), _tmp3_);
#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp5_);
+ _g_object_unref0 (_tmp3_);
#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = self->priv->bottom_frame;
+ _tmp4_ = self->priv->bottom_frame;
#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 4945 "LibraryWindow.c"
+ gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
+#line 5398 "LibraryWindow.c"
} else {
- GtkPaned* _tmp7_;
- GtkWidget* _tmp8_;
+ GtkPaned* _tmp5_;
+ GtkWidget* _tmp6_;
#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = self->priv->sidebar_paned;
+ _tmp5_ = self->priv->sidebar_paned;
#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = gtk_paned_get_child2 (_tmp7_);
+ _tmp6_ = gtk_paned_get_child2 (_tmp5_);
#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp8_ != NULL) {
-#line 4955 "LibraryWindow.c"
- GtkFrame* _tmp9_;
+ if (_tmp6_ != NULL) {
+#line 5408 "LibraryWindow.c"
+ GtkFrame* _tmp7_;
#line 666 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = self->priv->bottom_frame;
+ _tmp7_ = self->priv->bottom_frame;
#line 666 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 4961 "LibraryWindow.c"
+ gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
+#line 5414 "LibraryWindow.c"
}
}
#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = config_facade_get_instance ();
+ _tmp8_ = config_facade_get_instance ();
#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = _tmp10_;
+ _tmp9_ = _tmp8_;
#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = display;
+ _tmp10_ = display;
#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- configuration_facade_set_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_);
+ configuration_facade_set_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp10_);
#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp11_);
-#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = action;
-#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = value;
+ _g_object_unref0 (_tmp9_);
#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_simple_action_set_state (_tmp13_, _tmp14_);
-#line 4980 "LibraryWindow.c"
+ g_simple_action_set_state (action, value);
+#line 5429 "LibraryWindow.c"
}
-static gboolean _variant_get6 (GVariant* value) {
+static gboolean
+_variant_get6 (GVariant* value)
+{
#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return g_variant_get_boolean (value);
-#line 4987 "LibraryWindow.c"
+#line 5438 "LibraryWindow.c"
}
-static GVariant* _variant_new7 (gboolean value) {
+static GVariant*
+_variant_new7 (gboolean value)
+{
#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4994 "LibraryWindow.c"
+#line 5447 "LibraryWindow.c"
}
-static void library_window_on_action_toggle (LibraryWindow* self, GAction* action, GVariant* value) {
+static void
+library_window_on_action_toggle (LibraryWindow* self,
+ GAction* action,
+ GVariant* value)
+{
GVariant* new_state = NULL;
- GAction* _tmp0_;
+ GVariant* _tmp0_;
GVariant* _tmp1_;
- GVariant* _tmp2_;
- gboolean _tmp3_;
+ gboolean _tmp2_;
+ GVariant* _tmp3_;
GVariant* _tmp4_;
- GVariant* _tmp5_;
- GAction* _tmp6_;
#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (G_IS_ACTION (action));
#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = action;
+ _tmp0_ = g_action_get_state (action);
#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = g_action_get_state (_tmp0_);
-#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = _variant_get6 (_tmp2_);
+ _tmp2_ = _variant_get6 (_tmp1_);
#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = _variant_new7 (!_tmp3_);
+ _tmp3_ = _variant_new7 (!_tmp2_);
#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_variant_unref0 (_tmp2_);
+ _g_variant_unref0 (_tmp1_);
#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- new_state = _tmp5_;
-#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = action;
+ new_state = _tmp4_;
#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_action_change_state (_tmp6_, new_state);
+ g_action_change_state (action, new_state);
#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_variant_unref0 (new_state);
-#line 5033 "LibraryWindow.c"
+#line 5484 "LibraryWindow.c"
}
-static void library_window_on_action_radio (LibraryWindow* self, GAction* action, GVariant* value) {
- GAction* _tmp0_;
- GVariant* _tmp1_;
+static void
+library_window_on_action_radio (LibraryWindow* self,
+ GAction* action,
+ GVariant* value)
+{
#line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (G_IS_ACTION (action));
#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = action;
-#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = value;
-#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_action_change_state (_tmp0_, _tmp1_);
-#line 5050 "LibraryWindow.c"
+ g_action_change_state (action, value);
+#line 5499 "LibraryWindow.c"
}
-static void library_window_on_display_extended_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value) {
+static void
+library_window_on_display_extended_properties (LibraryWindow* self,
+ GSimpleAction* action,
+ GVariant* value)
+{
gboolean display = FALSE;
- GVariant* _tmp0_;
- gboolean _tmp1_;
- gboolean _tmp2_;
- GSimpleAction* _tmp8_;
- GVariant* _tmp9_;
+ gboolean _tmp0_;
#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (G_IS_SIMPLE_ACTION (action));
#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = value;
-#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- display = _tmp1_;
+ display = g_variant_get_boolean (value);
#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = display;
+ _tmp0_ = display;
#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp2_) {
-#line 5075 "LibraryWindow.c"
- ExtendedPropertiesWindow* _tmp3_;
- Page* _tmp4_;
- Page* _tmp5_;
- ExtendedPropertiesWindow* _tmp6_;
+ if (_tmp0_) {
+#line 5520 "LibraryWindow.c"
+ ExtendedPropertiesWindow* _tmp1_;
+ Page* _tmp2_;
+ Page* _tmp3_;
+ ExtendedPropertiesWindow* _tmp4_;
#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = self->priv->extended_properties;
+ _tmp1_ = self->priv->extended_properties;
#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
+ _tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = _tmp4_;
+ _tmp3_ = _tmp2_;
#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- extended_properties_window_update_properties (_tmp3_, _tmp5_);
+ extended_properties_window_update_properties (_tmp1_, _tmp3_);
#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp5_);
+ _g_object_unref0 (_tmp3_);
#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = self->priv->extended_properties;
+ _tmp4_ = self->priv->extended_properties;
#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 5094 "LibraryWindow.c"
+ gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
+#line 5539 "LibraryWindow.c"
} else {
- ExtendedPropertiesWindow* _tmp7_;
+ ExtendedPropertiesWindow* _tmp5_;
#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = self->priv->extended_properties;
+ _tmp5_ = self->priv->extended_properties;
#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 5101 "LibraryWindow.c"
+ gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
+#line 5546 "LibraryWindow.c"
}
#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = action;
-#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = value;
-#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_simple_action_set_state (_tmp8_, _tmp9_);
-#line 5109 "LibraryWindow.c"
+ g_simple_action_set_state (action, value);
+#line 5550 "LibraryWindow.c"
}
-static GVariant* _variant_new8 (gboolean value) {
+static GVariant*
+_variant_new8 (gboolean value)
+{
#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5116 "LibraryWindow.c"
+#line 5559 "LibraryWindow.c"
}
-static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAction* action, GVariant* value) {
+static void
+library_window_on_display_searchbar (LibraryWindow* self,
+ GSimpleAction* action,
+ GVariant* value)
+{
gboolean is_shown = FALSE;
- GVariant* _tmp0_;
- gboolean _tmp1_;
- ConfigFacade* _tmp2_;
- ConfigFacade* _tmp3_;
- GSimpleAction* _tmp4_;
- GVariant* _tmp5_;
+ ConfigFacade* _tmp0_;
+ ConfigFacade* _tmp1_;
+ GVariant* _tmp2_;
#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (G_IS_SIMPLE_ACTION (action));
#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = value;
-#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- is_shown = _tmp1_;
+ is_shown = g_variant_get_boolean (value);
#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = config_facade_get_instance ();
+ _tmp0_ = config_facade_get_instance ();
#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = _tmp2_;
+ _tmp1_ = _tmp0_;
#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- configuration_facade_set_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), is_shown);
+ configuration_facade_set_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), is_shown);
#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp3_);
+ _g_object_unref0 (_tmp1_);
#line 701 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_show_search_bar (self, is_shown);
#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = action;
-#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = _variant_new8 (is_shown);
+ _tmp2_ = _variant_new8 (is_shown);
#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_simple_action_set_state (_tmp4_, _tmp5_);
+ g_simple_action_set_state (action, _tmp2_);
#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_variant_unref0 (_tmp5_);
-#line 5156 "LibraryWindow.c"
+ _g_variant_unref0 (_tmp2_);
+#line 5594 "LibraryWindow.c"
}
-void library_window_show_search_bar (LibraryWindow* self, gboolean display) {
+void
+library_window_show_search_bar (LibraryWindow* self,
+ gboolean display)
+{
Page* _tmp0_;
Page* _tmp1_;
gboolean _tmp2_;
- gboolean _tmp3_;
- gboolean _tmp4_;
- Page* _tmp5_;
- CheckerboardPage* _tmp6_;
- CheckerboardPage* _tmp7_;
- gboolean _tmp8_;
+ Page* _tmp3_;
+ CheckerboardPage* _tmp4_;
+ CheckerboardPage* _tmp5_;
#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5180,104 +5618,88 @@ void library_window_show_search_bar (LibraryWindow* self, gboolean display) {
if (_tmp2_) {
#line 707 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 5184 "LibraryWindow.c"
+#line 5622 "LibraryWindow.c"
}
#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = display;
-#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- self->priv->is_search_toolbar_visible = _tmp3_;
-#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = library_window_should_show_search_bar (self);
+ self->priv->is_search_toolbar_visible = display;
#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
+ _tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp5_) : NULL;
+ _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp3_) : NULL;
#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp6_ == NULL) {
+ if (_tmp4_ == NULL) {
#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp5_);
-#line 5200 "LibraryWindow.c"
+ _g_object_unref0 (_tmp3_);
+#line 5634 "LibraryWindow.c"
}
#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = _tmp6_;
+ _tmp5_ = _tmp4_;
#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_toggle_search_bar (self, _tmp4_, _tmp7_);
+ library_window_toggle_search_bar (self, library_window_should_show_search_bar (self), _tmp5_);
#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp7_);
-#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = display;
+ _g_object_unref0 (_tmp5_);
#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (!_tmp8_) {
-#line 5212 "LibraryWindow.c"
- SearchFilterActions* _tmp9_;
+ if (!display) {
+#line 5644 "LibraryWindow.c"
+ SearchFilterActions* _tmp6_;
#line 712 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = self->priv->search_actions;
+ _tmp6_ = self->priv->search_actions;
#line 712 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- search_filter_actions_reset (_tmp9_);
-#line 5218 "LibraryWindow.c"
+ search_filter_actions_reset (_tmp6_);
+#line 5650 "LibraryWindow.c"
}
}
-static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleAction* action, GVariant* variant) {
- GVariant* _tmp0_;
- gboolean _tmp1_;
- GSimpleAction* _tmp2_;
- GVariant* _tmp3_;
+static void
+library_window_on_display_sidebar (LibraryWindow* self,
+ GSimpleAction* action,
+ GVariant* variant)
+{
#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (G_IS_SIMPLE_ACTION (action));
#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = variant;
-#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_set_sidebar_visible (self, _tmp1_);
-#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = action;
+ library_window_set_sidebar_visible (self, g_variant_get_boolean (variant));
#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = variant;
-#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_simple_action_set_state (_tmp2_, _tmp3_);
-#line 5244 "LibraryWindow.c"
+ g_simple_action_set_state (action, variant);
+#line 5668 "LibraryWindow.c"
}
-static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean visible) {
+static void
+library_window_set_sidebar_visible (LibraryWindow* self,
+ gboolean visible)
+{
GtkPaned* _tmp0_;
- gboolean _tmp1_;
+ ConfigFacade* _tmp1_;
ConfigFacade* _tmp2_;
- ConfigFacade* _tmp3_;
- gboolean _tmp4_;
#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp0_ = self->priv->sidebar_paned;
#line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = visible;
-#line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_);
+ gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), visible);
#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = config_facade_get_instance ();
-#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = _tmp2_;
+ _tmp1_ = config_facade_get_instance ();
#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = visible;
+ _tmp2_ = _tmp1_;
#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- configuration_facade_set_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_);
+ configuration_facade_set_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), visible);
#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp3_);
-#line 5272 "LibraryWindow.c"
+ _g_object_unref0 (_tmp2_);
+#line 5693 "LibraryWindow.c"
}
-static gboolean library_window_is_sidebar_visible (LibraryWindow* self) {
+static gboolean
+library_window_is_sidebar_visible (LibraryWindow* self)
+{
gboolean result = FALSE;
ConfigFacade* _tmp0_;
ConfigFacade* _tmp1_;
gboolean _tmp2_;
- gboolean _tmp3_;
#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5287,43 +5709,36 @@ static gboolean library_window_is_sidebar_visible (LibraryWindow* self) {
#line 727 "/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 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = _tmp2_;
-#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_tmp1_);
#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- result = _tmp3_;
+ result = _tmp2_;
#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 5298 "LibraryWindow.c"
+#line 5718 "LibraryWindow.c"
}
-static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleAction* action, GVariant* variant) {
- GVariant* _tmp0_;
- gboolean _tmp1_;
- GSimpleAction* _tmp2_;
- GVariant* _tmp3_;
+static void
+library_window_on_display_toolbar (LibraryWindow* self,
+ GSimpleAction* action,
+ GVariant* variant)
+{
#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (G_IS_SIMPLE_ACTION (action));
#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = variant;
-#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_set_toolbar_visible (self, _tmp1_);
-#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = action;
+ library_window_set_toolbar_visible (self, g_variant_get_boolean (variant));
#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = variant;
-#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_simple_action_set_state (_tmp2_, _tmp3_);
-#line 5323 "LibraryWindow.c"
+ g_simple_action_set_state (action, variant);
+#line 5735 "LibraryWindow.c"
}
-static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean visible) {
+static void
+library_window_set_toolbar_visible (LibraryWindow* self,
+ gboolean visible)
+{
Page* _tmp0_;
Page* _tmp1_;
gboolean _tmp2_;
@@ -5333,9 +5748,8 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi
GtkToolbar* _tmp5_;
GtkToolbar* _tmp6_;
GtkToolbar* _tmp7_;
+ ConfigFacade* _tmp9_;
ConfigFacade* _tmp10_;
- ConfigFacade* _tmp11_;
- gboolean _tmp12_;
#line 736 "/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"
@@ -5350,7 +5764,7 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi
if (_tmp2_) {
#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 5354 "LibraryWindow.c"
+#line 5768 "LibraryWindow.c"
}
#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
@@ -5368,39 +5782,35 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi
_tmp7_ = toolbar;
#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp7_ != NULL) {
-#line 5372 "LibraryWindow.c"
+#line 5786 "LibraryWindow.c"
GtkRevealer* _tmp8_;
- gboolean _tmp9_;
#line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp8_ = self->priv->toolbar_revealer;
#line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = visible;
-#line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_revealer_set_reveal_child (_tmp8_, _tmp9_);
-#line 5381 "LibraryWindow.c"
+ gtk_revealer_set_reveal_child (_tmp8_, visible);
+#line 5792 "LibraryWindow.c"
}
#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = config_facade_get_instance ();
+ _tmp9_ = config_facade_get_instance ();
#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = _tmp10_;
+ _tmp10_ = _tmp9_;
#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = visible;
+ configuration_facade_set_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), visible);
#line 745 "/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 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp11_);
+ _g_object_unref0 (_tmp10_);
#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (toolbar);
-#line 5395 "LibraryWindow.c"
+#line 5804 "LibraryWindow.c"
}
-static gboolean library_window_is_toolbar_visible (LibraryWindow* self) {
+static gboolean
+library_window_is_toolbar_visible (LibraryWindow* self)
+{
gboolean result = FALSE;
ConfigFacade* _tmp0_;
ConfigFacade* _tmp1_;
gboolean _tmp2_;
- gboolean _tmp3_;
#line 748 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5410,51 +5820,56 @@ static gboolean library_window_is_toolbar_visible (LibraryWindow* self) {
#line 749 "/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 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = _tmp2_;
-#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_tmp1_);
#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- result = _tmp3_;
+ result = _tmp2_;
#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 5421 "LibraryWindow.c"
+#line 5829 "LibraryWindow.c"
}
-static void library_window_show_extended_properties (LibraryWindow* self) {
+static void
+library_window_show_extended_properties (LibraryWindow* self)
+{
#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_sync_extended_properties (self, TRUE);
-#line 5430 "LibraryWindow.c"
+#line 5840 "LibraryWindow.c"
}
-static void library_window_hide_extended_properties (LibraryWindow* self) {
+static void
+library_window_hide_extended_properties (LibraryWindow* self)
+{
#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 757 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_sync_extended_properties (self, FALSE);
-#line 5439 "LibraryWindow.c"
+#line 5851 "LibraryWindow.c"
}
-static GVariant* _variant_new9 (gboolean value) {
+static GVariant*
+_variant_new9 (gboolean value)
+{
#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5446 "LibraryWindow.c"
+#line 5860 "LibraryWindow.c"
}
-static void library_window_sync_extended_properties (LibraryWindow* self, gboolean show) {
+static void
+library_window_sync_extended_properties (LibraryWindow* self,
+ gboolean show)
+{
GAction* action = NULL;
GAction* _tmp0_;
GAction* _tmp1_;
- gboolean _tmp2_;
- GVariant* _tmp3_;
+ GVariant* _tmp2_;
+ ConfigFacade* _tmp3_;
ConfigFacade* _tmp4_;
- ConfigFacade* _tmp5_;
- gboolean _tmp6_;
#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5464,35 +5879,33 @@ static void library_window_sync_extended_properties (LibraryWindow* self, gboole
#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
action = _tmp1_;
#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = show;
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = _variant_new9 (_tmp2_);
+ _tmp2_ = _variant_new9 (show);
#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_action_change_state (action, _tmp3_);
+ g_action_change_state (action, _tmp2_);
#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_variant_unref0 (_tmp3_);
+ _g_variant_unref0 (_tmp2_);
#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = config_facade_get_instance ();
+ _tmp3_ = config_facade_get_instance ();
#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = _tmp4_;
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = show;
+ _tmp4_ = _tmp3_;
#line 765 "/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_);
+ configuration_facade_set_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), show);
#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp5_);
+ _g_object_unref0 (_tmp4_);
#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (action);
-#line 5487 "LibraryWindow.c"
+#line 5898 "LibraryWindow.c"
}
-void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel) {
+void
+library_window_enqueue_batch_import (LibraryWindow* self,
+ BatchImport* batch_import,
+ gboolean allow_user_cancel)
+{
LibraryBranch* _tmp0_;
LibraryImportQueueSidebarEntry* _tmp1_;
LibraryImportQueueSidebarEntry* _tmp2_;
- BatchImport* _tmp3_;
- gboolean _tmp4_;
#line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5504,37 +5917,43 @@ void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batc
#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp2_ = _tmp1_;
#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = batch_import;
-#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = allow_user_cancel;
-#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_import_queue_sidebar_entry_enqueue_and_schedule (_tmp2_, _tmp3_, _tmp4_);
-#line 5513 "LibraryWindow.c"
+ library_import_queue_sidebar_entry_enqueue_and_schedule (_tmp2_, batch_import, allow_user_cancel);
+#line 5922 "LibraryWindow.c"
}
-static void library_window_import_reporter (LibraryWindow* self, ImportManifest* manifest) {
- ImportManifest* _tmp0_;
+static void
+library_window_import_reporter (LibraryWindow* self,
+ ImportManifest* manifest)
+{
#line 772 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 772 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
#line 773 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = manifest;
-#line 773 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- import_ui_report_manifest (_tmp0_, TRUE, NULL);
-#line 5527 "LibraryWindow.c"
+ import_ui_report_manifest (manifest, TRUE, NULL);
+#line 5936 "LibraryWindow.c"
}
-static void _library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
+static void
+_library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest,
+ BatchImportRoll* import_roll,
+ gpointer self)
+{
#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_import_reporter ((LibraryWindow*) self, manifest);
-#line 5534 "LibraryWindow.c"
+#line 5947 "LibraryWindow.c"
}
-static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* uris, const gchar* job_name, gboolean copy_to_library, gboolean recurse) {
+static void
+library_window_dispatch_import_jobs (LibraryWindow* self,
+ GSList* uris,
+ const gchar* job_name,
+ gboolean copy_to_library,
+ gboolean recurse)
+{
gboolean _tmp0_ = FALSE;
GFile* _tmp1_;
GFile* _tmp2_;
@@ -5543,11 +5962,10 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
const gchar* _tmp5_;
gboolean _tmp6_;
GeeArrayList* jobs = NULL;
- GeeArrayList* _tmp15_;
- GSList* _tmp16_;
- GeeArrayList* _tmp30_;
- gint _tmp31_;
- gint _tmp32_;
+ GeeArrayList* _tmp14_;
+ GeeArrayList* _tmp26_;
+ gint _tmp27_;
+ gint _tmp28_;
#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5570,21 +5988,21 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
_g_object_unref0 (_tmp2_);
#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp6_) {
-#line 5574 "LibraryWindow.c"
+#line 5992 "LibraryWindow.c"
gboolean _tmp7_;
#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp7_ = self->priv->notify_library_is_home_dir;
#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp0_ = _tmp7_;
-#line 5580 "LibraryWindow.c"
+#line 5998 "LibraryWindow.c"
} else {
#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp0_ = FALSE;
-#line 5584 "LibraryWindow.c"
+#line 6002 "LibraryWindow.c"
}
#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp0_) {
-#line 5588 "LibraryWindow.c"
+#line 6006 "LibraryWindow.c"
GtkResponseType response = 0;
gchar* _tmp8_;
gchar* _tmp9_;
@@ -5592,7 +6010,6 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
AppWindow* _tmp11_;
GtkResponseType _tmp12_;
GtkResponseType _tmp13_;
- GtkResponseType _tmp14_;
#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp8_ = g_strdup_printf (_ ("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?"), "▸");
@@ -5605,79 +6022,73 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp12_ = app_window_affirm_cancel_question (_tmp9_, _ ("_Import"), _ ("Library Location"), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow));
#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = _tmp12_;
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_tmp11_);
#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_free0 (_tmp9_);
#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- response = _tmp13_;
+ response = _tmp12_;
#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = response;
+ _tmp13_ = response;
#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp14_ == GTK_RESPONSE_CANCEL) {
+ if (_tmp13_ == GTK_RESPONSE_CANCEL) {
#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 5621 "LibraryWindow.c"
+#line 6036 "LibraryWindow.c"
}
#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self->priv->notify_library_is_home_dir = FALSE;
-#line 5625 "LibraryWindow.c"
+#line 6040 "LibraryWindow.c"
}
#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp15_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
+ _tmp14_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- jobs = _tmp15_;
-#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp16_ = uris;
-#line 5633 "LibraryWindow.c"
+ jobs = _tmp14_;
+#line 6046 "LibraryWindow.c"
{
GSList* uri_collection = NULL;
GSList* uri_it = NULL;
#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- uri_collection = _tmp16_;
+ uri_collection = uris;
#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) {
-#line 5641 "LibraryWindow.c"
- gchar* _tmp17_;
+#line 6054 "LibraryWindow.c"
+ gchar* _tmp15_;
gchar* uri = NULL;
#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp17_ = g_strdup ((const gchar*) uri_it->data);
+ _tmp15_ = g_strdup ((const gchar*) uri_it->data);
#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- uri = _tmp17_;
-#line 5648 "LibraryWindow.c"
+ uri = _tmp15_;
+#line 6061 "LibraryWindow.c"
{
GFile* file_or_dir = NULL;
- const gchar* _tmp18_;
- GFile* _tmp19_;
- GFile* _tmp20_;
- gchar* _tmp21_;
- gchar* _tmp22_;
- gboolean _tmp23_;
- GeeArrayList* _tmp24_;
- GFile* _tmp25_;
- gboolean _tmp26_;
- gboolean _tmp27_;
- FileImportJob* _tmp28_;
- FileImportJob* _tmp29_;
+ const gchar* _tmp16_;
+ GFile* _tmp17_;
+ GFile* _tmp18_;
+ gchar* _tmp19_;
+ gchar* _tmp20_;
+ gboolean _tmp21_;
+ GeeArrayList* _tmp22_;
+ GFile* _tmp23_;
+ FileImportJob* _tmp24_;
+ FileImportJob* _tmp25_;
#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp18_ = uri;
+ _tmp16_ = uri;
#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp19_ = g_file_new_for_uri (_tmp18_);
+ _tmp17_ = g_file_new_for_uri (_tmp16_);
#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- file_or_dir = _tmp19_;
+ file_or_dir = _tmp17_;
#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp20_ = file_or_dir;
+ _tmp18_ = file_or_dir;
#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp21_ = g_file_get_path (_tmp20_);
+ _tmp19_ = g_file_get_path (_tmp18_);
#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp22_ = _tmp21_;
+ _tmp20_ = _tmp19_;
#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp23_ = _tmp22_ == NULL;
+ _tmp21_ = _tmp20_ == NULL;
#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_free0 (_tmp22_);
+ _g_free0 (_tmp20_);
#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp23_) {
+ if (_tmp21_) {
#line 795 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
app_window_error_message (_ ("Photos cannot be imported from this directory."), NULL);
#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5686,71 +6097,66 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
_g_free0 (uri);
#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
continue;
-#line 5689 "LibraryWindow.c"
+#line 6100 "LibraryWindow.c"
}
#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp24_ = jobs;
-#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp25_ = file_or_dir;
+ _tmp22_ = jobs;
#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp26_ = copy_to_library;
+ _tmp23_ = file_or_dir;
#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp27_ = recurse;
+ _tmp24_ = file_import_job_new (_tmp23_, copy_to_library, recurse);
#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp28_ = file_import_job_new (_tmp25_, _tmp26_, _tmp27_);
+ _tmp25_ = _tmp24_;
#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp29_ = _tmp28_;
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp25_);
#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_);
-#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _batch_import_job_unref0 (_tmp29_);
+ _batch_import_job_unref0 (_tmp25_);
#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (file_or_dir);
#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_free0 (uri);
-#line 5711 "LibraryWindow.c"
+#line 6118 "LibraryWindow.c"
}
}
}
#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp30_ = jobs;
+ _tmp26_ = jobs;
#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp31_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+ _tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp32_ = _tmp31_;
+ _tmp28_ = _tmp27_;
#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp32_ > 0) {
-#line 5723 "LibraryWindow.c"
+ if (_tmp28_ > 0) {
+#line 6130 "LibraryWindow.c"
BatchImport* batch_import = NULL;
- GeeArrayList* _tmp33_;
- const gchar* _tmp34_;
- BatchImport* _tmp35_;
- BatchImport* _tmp36_;
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp33_ = jobs;
+ GeeArrayList* _tmp29_;
+ BatchImport* _tmp30_;
+ BatchImport* _tmp31_;
#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp34_ = job_name;
+ _tmp29_ = jobs;
#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp35_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ITERABLE, GeeIterable), _tmp34_, _library_window_import_reporter_batch_import_import_reporter, self, NULL, NULL, NULL, NULL, NULL);
+ _tmp30_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ITERABLE, GeeIterable), job_name, _library_window_import_reporter_batch_import_import_reporter, self, NULL, NULL, NULL, NULL, NULL);
#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- batch_import = _tmp35_;
+ batch_import = _tmp30_;
#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp36_ = batch_import;
+ _tmp31_ = batch_import;
#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_enqueue_batch_import (self, _tmp36_, TRUE);
+ library_window_enqueue_batch_import (self, _tmp31_, TRUE);
#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_switch_to_import_queue_page (self);
#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (batch_import);
-#line 5745 "LibraryWindow.c"
+#line 6149 "LibraryWindow.c"
}
#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (jobs);
-#line 5749 "LibraryWindow.c"
+#line 6153 "LibraryWindow.c"
}
-static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
+static GdkDragAction
+library_window_get_drag_action (LibraryWindow* self)
+{
GdkDragAction result = 0;
GdkModifierType mask = 0;
GdkWindow* _tmp0_;
@@ -5797,31 +6203,31 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
_tmp10_ = ctrl;
#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp10_) {
-#line 5800 "LibraryWindow.c"
+#line 6206 "LibraryWindow.c"
gboolean _tmp11_;
#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp11_ = alt;
#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp9_ = !_tmp11_;
-#line 5806 "LibraryWindow.c"
+#line 6212 "LibraryWindow.c"
} else {
#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp9_ = FALSE;
-#line 5810 "LibraryWindow.c"
+#line 6216 "LibraryWindow.c"
}
#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp9_) {
-#line 5814 "LibraryWindow.c"
+#line 6220 "LibraryWindow.c"
gboolean _tmp12_;
#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp12_ = shift;
#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp8_ = !_tmp12_;
-#line 5820 "LibraryWindow.c"
+#line 6226 "LibraryWindow.c"
} else {
#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp8_ = FALSE;
-#line 5824 "LibraryWindow.c"
+#line 6230 "LibraryWindow.c"
}
#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp8_) {
@@ -5829,7 +6235,7 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
result = GDK_ACTION_COPY;
#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 5832 "LibraryWindow.c"
+#line 6238 "LibraryWindow.c"
} else {
gboolean _tmp13_ = FALSE;
gboolean _tmp14_ = FALSE;
@@ -5838,31 +6244,31 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
_tmp15_ = ctrl;
#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (!_tmp15_) {
-#line 5841 "LibraryWindow.c"
+#line 6247 "LibraryWindow.c"
gboolean _tmp16_;
#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp16_ = alt;
#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp14_ = _tmp16_;
-#line 5847 "LibraryWindow.c"
+#line 6253 "LibraryWindow.c"
} else {
#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp14_ = FALSE;
-#line 5851 "LibraryWindow.c"
+#line 6257 "LibraryWindow.c"
}
#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp14_) {
-#line 5855 "LibraryWindow.c"
+#line 6261 "LibraryWindow.c"
gboolean _tmp17_;
#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp17_ = shift;
#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp13_ = !_tmp17_;
-#line 5861 "LibraryWindow.c"
+#line 6267 "LibraryWindow.c"
} else {
#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp13_ = FALSE;
-#line 5865 "LibraryWindow.c"
+#line 6271 "LibraryWindow.c"
}
#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp13_) {
@@ -5870,7 +6276,7 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
result = GDK_ACTION_ASK;
#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 5873 "LibraryWindow.c"
+#line 6279 "LibraryWindow.c"
} else {
gboolean _tmp18_ = FALSE;
gboolean _tmp19_ = FALSE;
@@ -5879,31 +6285,31 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
_tmp20_ = ctrl;
#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp20_) {
-#line 5882 "LibraryWindow.c"
+#line 6288 "LibraryWindow.c"
gboolean _tmp21_;
#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp21_ = alt;
#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp19_ = !_tmp21_;
-#line 5888 "LibraryWindow.c"
+#line 6294 "LibraryWindow.c"
} else {
#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp19_ = FALSE;
-#line 5892 "LibraryWindow.c"
+#line 6298 "LibraryWindow.c"
}
#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp19_) {
-#line 5896 "LibraryWindow.c"
+#line 6302 "LibraryWindow.c"
gboolean _tmp22_;
#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp22_ = shift;
#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp18_ = _tmp22_;
-#line 5902 "LibraryWindow.c"
+#line 6308 "LibraryWindow.c"
} else {
#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp18_ = FALSE;
-#line 5906 "LibraryWindow.c"
+#line 6312 "LibraryWindow.c"
}
#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp18_) {
@@ -5911,126 +6317,106 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
result = GDK_ACTION_LINK;
#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 5914 "LibraryWindow.c"
+#line 6320 "LibraryWindow.c"
} else {
#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = GDK_ACTION_DEFAULT;
#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 5920 "LibraryWindow.c"
+#line 6326 "LibraryWindow.c"
}
}
}
}
-static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext* context, gint x, gint y, guint time) {
+static gboolean
+library_window_real_drag_motion (GtkWidget* base,
+ GdkDragContext* context,
+ gint x,
+ gint y,
+ guint time)
+{
LibraryWindow * self;
gboolean result = FALSE;
GdkAtom target = 0U;
- GdkDragContext* _tmp0_;
- GtkTargetList* _tmp1_;
+ GtkTargetList* _tmp0_;
+ GdkAtom _tmp1_;
GdkAtom _tmp2_;
- GdkAtom _tmp3_;
- GdkAtom _tmp4_;
- GdkDragContext* _tmp7_;
- GtkWidget* _tmp8_;
+ GtkWidget* _tmp3_;
GdkDragAction drag_action = 0;
- GdkDragAction _tmp11_;
- GdkDragAction _tmp12_;
- GdkDragContext* _tmp13_;
- GdkDragAction _tmp14_;
- guint _tmp15_;
+ GdkDragAction _tmp4_;
+ GdkDragAction _tmp5_;
#line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
#line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = context;
+ _tmp0_ = gtk_drag_dest_get_target_list (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 831 "/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 831 "/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 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- target = _tmp2_;
+ target = gtk_drag_dest_find_target (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), context, _tmp0_);
#line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = target;
+ _tmp1_ = target;
#line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = GDK_NONE;
+ _tmp2_ = GDK_NONE;
#line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp3_ == _tmp4_) {
-#line 5962 "LibraryWindow.c"
- GdkDragContext* _tmp5_;
- guint _tmp6_;
+ if (_tmp1_ == _tmp2_) {
#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_debug ("LibraryWindow.vala:833: drag target is GDK_NONE");
#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = context;
-#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = time;
-#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gdk_drag_status (_tmp5_, 0, (guint32) _tmp6_);
+ gdk_drag_status (context, 0, (guint32) time);
#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = TRUE;
#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 5977 "LibraryWindow.c"
+#line 6372 "LibraryWindow.c"
}
#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = context;
-#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = gtk_drag_get_source_widget (_tmp7_);
+ _tmp3_ = gtk_drag_get_source_widget (context);
#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp8_ != NULL) {
-#line 5985 "LibraryWindow.c"
- GdkDragContext* _tmp9_;
- guint _tmp10_;
-#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = context;
-#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = time;
+ if (_tmp3_ != NULL) {
#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gdk_drag_status (_tmp9_, GDK_ACTION_PRIVATE, (guint32) _tmp10_);
+ gdk_drag_status (context, GDK_ACTION_PRIVATE, (guint32) time);
#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = TRUE;
#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 5998 "LibraryWindow.c"
+#line 6384 "LibraryWindow.c"
}
#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = library_window_get_drag_action (self);
-#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- drag_action = _tmp11_;
+ drag_action = library_window_get_drag_action (self);
#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = drag_action;
+ _tmp4_ = drag_action;
#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp12_ == GDK_ACTION_DEFAULT) {
+ if (_tmp4_ == GDK_ACTION_DEFAULT) {
#line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
drag_action = GDK_ACTION_ASK;
-#line 6010 "LibraryWindow.c"
+#line 6394 "LibraryWindow.c"
}
#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = context;
-#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = drag_action;
+ _tmp5_ = drag_action;
#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp15_ = time;
-#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gdk_drag_status (_tmp13_, _tmp14_, (guint32) _tmp15_);
+ gdk_drag_status (context, _tmp5_, (guint32) time);
#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = TRUE;
#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 6024 "LibraryWindow.c"
+#line 6404 "LibraryWindow.c"
}
-static void library_window_real_drag_data_received (GtkWidget* base, GdkDragContext* context, gint x, gint y, GtkSelectionData* selection_data, guint info, guint time) {
+static void
+library_window_real_drag_data_received (GtkWidget* base,
+ GdkDragContext* context,
+ gint x,
+ gint y,
+ GtkSelectionData* selection_data,
+ guint info,
+ guint time)
+{
LibraryWindow * self;
- GtkSelectionData* _tmp0_;
- guchar* _tmp1_;
- GdkDragContext* _tmp2_;
- GtkWidget* _tmp3_;
+ guint8* _tmp0_;
+ GtkWidget* _tmp1_;
#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6038,69 +6424,48 @@ static void library_window_real_drag_data_received (GtkWidget* base, GdkDragCont
#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (selection_data != NULL);
#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = selection_data;
-#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = gtk_selection_data_get_data (_tmp0_);
+ _tmp0_ = gtk_selection_data_get_data (selection_data);
#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (-1 < 0) {
#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_debug ("LibraryWindow.vala:860: failed to retrieve SelectionData");
-#line 6048 "LibraryWindow.c"
+#line 6432 "LibraryWindow.c"
}
#line 864 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = context;
-#line 864 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = gtk_drag_get_source_widget (_tmp2_);
+ _tmp1_ = gtk_drag_get_source_widget (context);
#line 864 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp3_ == NULL) {
-#line 6056 "LibraryWindow.c"
- GdkDragContext* _tmp4_;
- GtkSelectionData* _tmp5_;
- guint _tmp6_;
- guint _tmp7_;
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = context;
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = selection_data;
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = info;
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = time;
+ if (_tmp1_ == NULL) {
#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_external_drop_handler (self, _tmp4_, NULL, _tmp5_, _tmp6_, _tmp7_);
-#line 6071 "LibraryWindow.c"
+ library_window_external_drop_handler (self, context, NULL, selection_data, info, time);
+#line 6440 "LibraryWindow.c"
} else {
- GdkDragContext* _tmp8_;
- guint _tmp9_;
-#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = context;
-#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = time;
#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_drag_finish (_tmp8_, FALSE, FALSE, (guint32) _tmp9_);
-#line 6081 "LibraryWindow.c"
+ gtk_drag_finish (context, FALSE, FALSE, (guint32) time);
+#line 6444 "LibraryWindow.c"
}
}
-static void library_window_external_drop_handler (LibraryWindow* self, GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time) {
+static void
+library_window_external_drop_handler (LibraryWindow* self,
+ GdkDragContext* context,
+ SidebarEntry* entry,
+ GtkSelectionData* data,
+ guint info,
+ guint time)
+{
gchar** uris_array = NULL;
- GtkSelectionData* _tmp0_;
+ gchar** _tmp0_;
gchar** _tmp1_;
- gchar** _tmp2_;
gint uris_array_length1;
gint _uris_array_size_;
GSList* uris = NULL;
- gchar** _tmp3_;
- gint _tmp3__length1;
+ gchar** _tmp2_;
+ gint _tmp2__length1;
GdkDragAction selected_action = 0;
- GdkDragContext* _tmp7_;
- GdkDragAction _tmp8_;
- GdkDragAction _tmp9_;
- GSList* _tmp21_;
- GdkDragAction _tmp22_;
- GdkDragContext* _tmp23_;
- guint _tmp24_;
+ GdkDragAction _tmp6_;
+ GSList* _tmp14_;
+ GdkDragAction _tmp15_;
#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6110,193 +6475,172 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo
#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (data != NULL);
#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = data;
-#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = _tmp1_ = gtk_selection_data_get_uris (_tmp0_);
+ _tmp1_ = _tmp0_ = gtk_selection_data_get_uris (data);
#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- uris_array = _tmp2_;
+ uris_array = _tmp1_;
#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- uris_array_length1 = _vala_array_length (_tmp1_);
+ uris_array_length1 = _vala_array_length (_tmp0_);
#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_uris_array_size_ = uris_array_length1;
#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
uris = NULL;
#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = uris_array;
+ _tmp2_ = uris_array;
#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3__length1 = uris_array_length1;
-#line 6128 "LibraryWindow.c"
+ _tmp2__length1 = uris_array_length1;
+#line 6491 "LibraryWindow.c"
{
gchar** uri_collection = NULL;
gint uri_collection_length1 = 0;
gint _uri_collection_size_ = 0;
gint uri_it = 0;
#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- uri_collection = _tmp3_;
+ uri_collection = _tmp2_;
#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- uri_collection_length1 = _tmp3__length1;
+ uri_collection_length1 = _tmp2__length1;
#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- for (uri_it = 0; uri_it < _tmp3__length1; uri_it = uri_it + 1) {
-#line 6140 "LibraryWindow.c"
- gchar* _tmp4_;
+ for (uri_it = 0; uri_it < _tmp2__length1; uri_it = uri_it + 1) {
+#line 6503 "LibraryWindow.c"
+ gchar* _tmp3_;
gchar* uri = NULL;
#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = g_strdup (uri_collection[uri_it]);
+ _tmp3_ = g_strdup (uri_collection[uri_it]);
#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- uri = _tmp4_;
-#line 6147 "LibraryWindow.c"
+ uri = _tmp3_;
+#line 6510 "LibraryWindow.c"
{
- const gchar* _tmp5_;
- gchar* _tmp6_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = uri;
+ _tmp4_ = uri;
#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = g_strdup (_tmp5_);
+ _tmp5_ = g_strdup (_tmp4_);
#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- uris = g_slist_append (uris, _tmp6_);
+ uris = g_slist_append (uris, _tmp5_);
#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_free0 (uri);
-#line 6159 "LibraryWindow.c"
+#line 6522 "LibraryWindow.c"
}
}
}
#line 878 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = context;
-#line 878 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = gdk_drag_context_get_selected_action (_tmp7_);
-#line 878 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- selected_action = _tmp8_;
+ selected_action = gdk_drag_context_get_selected_action (context);
#line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = selected_action;
+ _tmp6_ = selected_action;
#line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp9_ == GDK_ACTION_ASK) {
-#line 6173 "LibraryWindow.c"
+ if (_tmp6_ == GDK_ACTION_ASK) {
+#line 6532 "LibraryWindow.c"
GtkResponseType _result_ = 0;
- GSList* _tmp10_;
- GtkResponseType _tmp18_;
+ GSList* _tmp7_;
+ GtkResponseType _tmp13_;
#line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_result_ = GTK_RESPONSE_REJECT;
#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = uris;
-#line 6181 "LibraryWindow.c"
+ _tmp7_ = uris;
+#line 6540 "LibraryWindow.c"
{
GSList* uri_collection = NULL;
GSList* uri_it = NULL;
#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- uri_collection = _tmp10_;
+ uri_collection = _tmp7_;
#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) {
-#line 6189 "LibraryWindow.c"
- gchar* _tmp11_;
+#line 6548 "LibraryWindow.c"
+ gchar* _tmp8_;
gchar* uri = NULL;
#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = g_strdup ((const gchar*) uri_it->data);
+ _tmp8_ = g_strdup ((const gchar*) uri_it->data);
#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- uri = _tmp11_;
-#line 6196 "LibraryWindow.c"
+ uri = _tmp8_;
+#line 6555 "LibraryWindow.c"
{
- const gchar* _tmp12_;
- GFile* _tmp13_;
- GFile* _tmp14_;
- gboolean _tmp15_;
- gboolean _tmp16_;
-#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = uri;
+ const gchar* _tmp9_;
+ GFile* _tmp10_;
+ GFile* _tmp11_;
+ gboolean _tmp12_;
#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = g_file_new_for_uri (_tmp12_);
+ _tmp9_ = uri;
#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = _tmp13_;
+ _tmp10_ = g_file_new_for_uri (_tmp9_);
#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp15_ = app_dirs_is_in_import_dir (_tmp14_);
+ _tmp11_ = _tmp10_;
#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp16_ = !_tmp15_;
+ _tmp12_ = !app_dirs_is_in_import_dir (_tmp11_);
#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp14_);
+ _g_object_unref0 (_tmp11_);
#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp16_) {
-#line 6217 "LibraryWindow.c"
- GtkResponseType _tmp17_;
+ if (_tmp12_) {
#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp17_ = copy_files_dialog ();
-#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _result_ = _tmp17_;
+ _result_ = copy_files_dialog ();
#line 886 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_free0 (uri);
#line 886 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
break;
-#line 6227 "LibraryWindow.c"
+#line 6579 "LibraryWindow.c"
}
#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_free0 (uri);
-#line 6231 "LibraryWindow.c"
+#line 6583 "LibraryWindow.c"
}
}
}
#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp18_ = _result_;
+ _tmp13_ = _result_;
#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- switch (_tmp18_) {
+ switch (_tmp13_) {
#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
case GTK_RESPONSE_ACCEPT:
-#line 6241 "LibraryWindow.c"
+#line 6593 "LibraryWindow.c"
{
#line 892 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
selected_action = GDK_ACTION_COPY;
#line 893 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
break;
-#line 6247 "LibraryWindow.c"
+#line 6599 "LibraryWindow.c"
}
#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
case GTK_RESPONSE_REJECT:
-#line 6251 "LibraryWindow.c"
+#line 6603 "LibraryWindow.c"
{
#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
selected_action = GDK_ACTION_LINK;
#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
break;
-#line 6257 "LibraryWindow.c"
+#line 6609 "LibraryWindow.c"
}
default:
{
- GdkDragContext* _tmp19_;
- guint _tmp20_;
#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp19_ = context;
-#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp20_ = time;
-#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_drag_finish (_tmp19_, FALSE, FALSE, (guint32) _tmp20_);
+ gtk_drag_finish (context, FALSE, FALSE, (guint32) time);
#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
__g_slist_free__g_free0_0 (uris);
#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL);
#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 6275 "LibraryWindow.c"
+#line 6621 "LibraryWindow.c"
}
}
}
#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp21_ = uris;
+ _tmp14_ = uris;
#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp22_ = selected_action;
+ _tmp15_ = selected_action;
#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_dispatch_import_jobs (self, _tmp21_, "drag-and-drop", _tmp22_ == GDK_ACTION_COPY, TRUE);
-#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp23_ = context;
-#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp24_ = time;
+ library_window_dispatch_import_jobs (self, _tmp14_, "drag-and-drop", _tmp15_ == GDK_ACTION_COPY, TRUE);
#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_drag_finish (_tmp23_, TRUE, FALSE, (guint32) _tmp24_);
+ gtk_drag_finish (context, TRUE, FALSE, (guint32) time);
#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
__g_slist_free__g_free0_0 (uris);
#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL);
-#line 6295 "LibraryWindow.c"
+#line 6637 "LibraryWindow.c"
}
-void library_window_switch_to_library_page (LibraryWindow* self) {
+void
+library_window_switch_to_library_page (LibraryWindow* self)
+{
LibraryBranch* _tmp0_;
LibraryPhotosEntry* _tmp1_;
LibraryPhotosEntry* _tmp2_;
@@ -6318,16 +6662,18 @@ void library_window_switch_to_library_page (LibraryWindow* self) {
library_window_switch_to_page (self, _tmp4_);
#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_tmp4_);
-#line 6321 "LibraryWindow.c"
+#line 6665 "LibraryWindow.c"
}
-void library_window_switch_to_event (LibraryWindow* self, Event* event) {
+void
+library_window_switch_to_event (LibraryWindow* self,
+ Event* event)
+{
EventsEventEntry* entry = NULL;
EventsBranch* _tmp0_;
- Event* _tmp1_;
+ EventsEventEntry* _tmp1_;
EventsEventEntry* _tmp2_;
- EventsEventEntry* _tmp3_;
#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6335,43 +6681,43 @@ void library_window_switch_to_event (LibraryWindow* self, Event* event) {
#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp0_ = self->priv->events_branch;
#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = event;
+ _tmp1_ = events_branch_get_entry_for_event (_tmp0_, event);
#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_);
-#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- entry = _tmp2_;
+ entry = _tmp1_;
#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = entry;
+ _tmp2_ = entry;
#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp3_ != NULL) {
-#line 6347 "LibraryWindow.c"
- EventsEventEntry* _tmp4_;
+ if (_tmp2_ != NULL) {
+#line 6691 "LibraryWindow.c"
+ EventsEventEntry* _tmp3_;
+ Page* _tmp4_;
Page* _tmp5_;
- Page* _tmp6_;
#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = entry;
+ _tmp3_ = entry;
#line 919 "/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));
+ _tmp4_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_switch_to_page (self, _tmp6_);
+ library_window_switch_to_page (self, _tmp5_);
#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp6_);
-#line 6361 "LibraryWindow.c"
+ _g_object_unref0 (_tmp5_);
+#line 6705 "LibraryWindow.c"
}
#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (entry);
-#line 6365 "LibraryWindow.c"
+#line 6709 "LibraryWindow.c"
}
-void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) {
+void
+library_window_switch_to_tag (LibraryWindow* self,
+ Tag* tag)
+{
TagsSidebarEntry* entry = NULL;
TagsBranch* _tmp0_;
- Tag* _tmp1_;
+ TagsSidebarEntry* _tmp1_;
TagsSidebarEntry* _tmp2_;
- TagsSidebarEntry* _tmp3_;
#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6379,43 +6725,43 @@ void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) {
#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp0_ = self->priv->tags_branch;
#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = tag;
-#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_);
+ _tmp1_ = tags_branch_get_entry_for_tag (_tmp0_, tag);
#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- entry = _tmp2_;
+ entry = _tmp1_;
#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = entry;
+ _tmp2_ = entry;
#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp3_ != NULL) {
-#line 6391 "LibraryWindow.c"
- TagsSidebarEntry* _tmp4_;
+ if (_tmp2_ != NULL) {
+#line 6735 "LibraryWindow.c"
+ TagsSidebarEntry* _tmp3_;
+ Page* _tmp4_;
Page* _tmp5_;
- Page* _tmp6_;
#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = entry;
+ _tmp3_ = entry;
#line 925 "/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));
+ _tmp4_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_switch_to_page (self, _tmp6_);
+ library_window_switch_to_page (self, _tmp5_);
#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp6_);
-#line 6405 "LibraryWindow.c"
+ _g_object_unref0 (_tmp5_);
+#line 6749 "LibraryWindow.c"
}
#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (entry);
-#line 6409 "LibraryWindow.c"
+#line 6753 "LibraryWindow.c"
}
-void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* search) {
+void
+library_window_switch_to_saved_search (LibraryWindow* self,
+ SavedSearch* search)
+{
SearchesSidebarEntry* entry = NULL;
SearchesBranch* _tmp0_;
- SavedSearch* _tmp1_;
+ SearchesSidebarEntry* _tmp1_;
SearchesSidebarEntry* _tmp2_;
- SearchesSidebarEntry* _tmp3_;
#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6423,49 +6769,47 @@ void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* se
#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp0_ = self->priv->saved_search_branch;
#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = search;
+ _tmp1_ = searches_branch_get_entry_for_saved_search (_tmp0_, search);
#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_);
-#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- entry = _tmp2_;
+ entry = _tmp1_;
#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = entry;
+ _tmp2_ = entry;
#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp3_ != NULL) {
-#line 6435 "LibraryWindow.c"
- SearchesSidebarEntry* _tmp4_;
+ if (_tmp2_ != NULL) {
+#line 6779 "LibraryWindow.c"
+ SearchesSidebarEntry* _tmp3_;
+ Page* _tmp4_;
Page* _tmp5_;
- Page* _tmp6_;
#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = entry;
+ _tmp3_ = entry;
#line 931 "/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));
+ _tmp4_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_switch_to_page (self, _tmp6_);
+ library_window_switch_to_page (self, _tmp5_);
#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp6_);
-#line 6449 "LibraryWindow.c"
+ _g_object_unref0 (_tmp5_);
+#line 6793 "LibraryWindow.c"
}
#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (entry);
-#line 6453 "LibraryWindow.c"
+#line 6797 "LibraryWindow.c"
}
-void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* controller, Photo* current) {
- CollectionPage* _tmp0_;
+void
+library_window_switch_to_photo_page (LibraryWindow* self,
+ CollectionPage* controller,
+ Photo* current)
+{
+ ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- ViewCollection* _tmp2_;
- Photo* _tmp3_;
- DataView* _tmp4_;
- DataView* _tmp5_;
- LibraryPhotoPage* _tmp6_;
- LibraryPhotoPage* _tmp9_;
- CollectionPage* _tmp10_;
- Photo* _tmp11_;
- LibraryPhotoPage* _tmp12_;
+ DataView* _tmp2_;
+ DataView* _tmp3_;
+ LibraryPhotoPage* _tmp4_;
+ LibraryPhotoPage* _tmp7_;
+ LibraryPhotoPage* _tmp8_;
#line 934 "/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"
@@ -6473,63 +6817,57 @@ void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* c
#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_PHOTO (current));
#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = controller;
-#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page));
+ _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (controller, TYPE_PAGE, Page));
#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = _tmp1_;
-#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = current;
+ _tmp1_ = _tmp0_;
#line 935 "/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));
+ _tmp2_ = view_collection_get_view_for_source (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (current, TYPE_DATA_SOURCE, DataSource));
#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = _tmp4_;
+ _tmp3_ = _tmp2_;
#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _vala_assert (_tmp5_ != NULL, "controller.get_view().get_view_for_source(current) != null");
+ _vala_assert (_tmp3_ != NULL, "controller.get_view().get_view_for_source(current) != null");
#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp5_);
+ _g_object_unref0 (_tmp3_);
#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _data_collection_unref0 (_tmp2_);
+ _data_collection_unref0 (_tmp1_);
#line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = self->priv->photo_page;
+ _tmp4_ = self->priv->photo_page;
#line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp6_ == NULL) {
-#line 6497 "LibraryWindow.c"
- LibraryPhotoPage* _tmp7_;
- LibraryPhotoPage* _tmp8_;
+ if (_tmp4_ == NULL) {
+#line 6837 "LibraryWindow.c"
+ LibraryPhotoPage* _tmp5_;
+ LibraryPhotoPage* _tmp6_;
#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = library_photo_page_new ();
+ _tmp5_ = library_photo_page_new ();
#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_object_ref_sink (_tmp7_);
+ g_object_ref_sink (_tmp5_);
#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (self->priv->photo_page);
#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- self->priv->photo_page = _tmp7_;
+ self->priv->photo_page = _tmp5_;
#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = self->priv->photo_page;
+ _tmp6_ = self->priv->photo_page;
#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_add_to_stack (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
+ library_window_add_to_stack (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE, Page));
#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
spin_event_loop ();
-#line 6514 "LibraryWindow.c"
+#line 6854 "LibraryWindow.c"
}
#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = self->priv->photo_page;
+ _tmp7_ = self->priv->photo_page;
#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = controller;
-#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = current;
-#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_photo_page_display_for_collection (_tmp9_, _tmp10_, _tmp11_, NULL);
+ library_photo_page_display_for_collection (_tmp7_, controller, current, NULL);
#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = self->priv->photo_page;
+ _tmp8_ = self->priv->photo_page;
#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE, Page));
-#line 6528 "LibraryWindow.c"
+ library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
+#line 6864 "LibraryWindow.c"
}
-void library_window_switch_to_import_queue_page (LibraryWindow* self) {
+void
+library_window_switch_to_import_queue_page (LibraryWindow* self)
+{
LibraryBranch* _tmp0_;
LibraryImportQueueSidebarEntry* _tmp1_;
LibraryImportQueueSidebarEntry* _tmp2_;
@@ -6551,26 +6889,27 @@ void library_window_switch_to_import_queue_page (LibraryWindow* self) {
library_window_switch_to_page (self, _tmp4_);
#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_tmp4_);
-#line 6554 "LibraryWindow.c"
+#line 6892 "LibraryWindow.c"
}
-static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamera* camera) {
+static void
+library_window_on_camera_added (LibraryWindow* self,
+ DiscoveredCamera* camera)
+{
CameraSidebarEntry* entry = NULL;
CameraBranch* _tmp0_;
- DiscoveredCamera* _tmp1_;
+ CameraSidebarEntry* _tmp1_;
CameraSidebarEntry* _tmp2_;
- CameraSidebarEntry* _tmp3_;
ImportPage* page = NULL;
- CameraSidebarEntry* _tmp4_;
- Page* _tmp5_;
+ CameraSidebarEntry* _tmp3_;
+ Page* _tmp4_;
GFile* uri_file = NULL;
- DiscoveredCamera* _tmp6_;
- const gchar* _tmp7_;
- GFile* _tmp8_;
+ const gchar* _tmp5_;
+ GFile* _tmp6_;
GMount* mount = NULL;
- gboolean _tmp13_ = FALSE;
- GMount* _tmp14_;
+ gboolean _tmp11_ = FALSE;
+ GMount* _tmp12_;
GError * _inner_error_ = NULL;
#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
@@ -6579,65 +6918,61 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp0_ = self->priv->camera_branch;
#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = camera;
-#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = camera_branch_get_entry_for_camera (_tmp0_, _tmp1_);
+ _tmp1_ = camera_branch_get_entry_for_camera (_tmp0_, camera);
#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- entry = _tmp2_;
+ entry = _tmp1_;
#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = entry;
+ _tmp2_ = entry;
#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp3_ == NULL) {
+ if (_tmp2_ == NULL) {
#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (entry);
#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 6595 "LibraryWindow.c"
+#line 6932 "LibraryWindow.c"
}
#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = entry;
+ _tmp3_ = entry;
#line 958 "/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));
+ _tmp4_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- page = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_IMPORT_PAGE, ImportPage);
-#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = camera;
+ page = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_IMPORT_PAGE, ImportPage);
#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = _tmp6_->uri;
+ _tmp5_ = camera->uri;
#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = g_file_new_for_uri (_tmp7_);
+ _tmp6_ = g_file_new_for_uri (_tmp5_);
#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- uri_file = _tmp8_;
+ uri_file = _tmp6_;
#line 962 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
mount = NULL;
-#line 6613 "LibraryWindow.c"
+#line 6948 "LibraryWindow.c"
{
- GMount* _tmp9_ = NULL;
- GFile* _tmp10_;
- GMount* _tmp11_;
- GMount* _tmp12_;
+ GMount* _tmp7_ = NULL;
+ GFile* _tmp8_;
+ GMount* _tmp9_;
+ GMount* _tmp10_;
#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = uri_file;
+ _tmp8_ = uri_file;
#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = g_file_find_enclosing_mount (_tmp10_, NULL, &_inner_error_);
+ _tmp9_ = g_file_find_enclosing_mount (_tmp8_, NULL, &_inner_error_);
#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = _tmp11_;
+ _tmp7_ = _tmp9_;
#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6627 "LibraryWindow.c"
+#line 6962 "LibraryWindow.c"
goto __catch46_g_error;
}
#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = _tmp9_;
+ _tmp10_ = _tmp7_;
#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = NULL;
+ _tmp7_ = NULL;
#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (mount);
#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- mount = _tmp12_;
+ mount = _tmp10_;
#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp9_);
-#line 6640 "LibraryWindow.c"
+ _g_object_unref0 (_tmp7_);
+#line 6975 "LibraryWindow.c"
}
goto __finally46;
__catch46_g_error:
@@ -6649,7 +6984,7 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
_inner_error_ = NULL;
#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_error_free0 (err);
-#line 6652 "LibraryWindow.c"
+#line 6987 "LibraryWindow.c"
}
__finally46:
#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6668,63 +7003,54 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
g_clear_error (&_inner_error_);
#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 6671 "LibraryWindow.c"
+#line 7006 "LibraryWindow.c"
}
#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = mount;
+ _tmp12_ = mount;
#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp14_ != NULL) {
-#line 6677 "LibraryWindow.c"
- DiscoveredCamera* _tmp15_;
- const gchar* _tmp16_;
- gboolean _tmp17_;
-#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp15_ = camera;
-#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp16_ = _tmp15_->uri;
+ if (_tmp12_ != NULL) {
+#line 7012 "LibraryWindow.c"
+ const gchar* _tmp13_;
#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp17_ = g_str_has_prefix (_tmp16_, "file://");
+ _tmp13_ = camera->uri;
#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = !_tmp17_;
-#line 6689 "LibraryWindow.c"
+ _tmp11_ = !g_str_has_prefix (_tmp13_, "file://");
+#line 7018 "LibraryWindow.c"
} else {
#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = FALSE;
-#line 6693 "LibraryWindow.c"
+ _tmp11_ = FALSE;
+#line 7022 "LibraryWindow.c"
}
#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp13_) {
-#line 6697 "LibraryWindow.c"
- ImportPage* _tmp18_;
- GMount* _tmp19_;
- gboolean _tmp20_;
-#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp18_ = page;
+ if (_tmp11_) {
+#line 7026 "LibraryWindow.c"
+ ImportPage* _tmp14_;
+ GMount* _tmp15_;
#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp19_ = mount;
+ _tmp14_ = page;
#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp20_ = import_page_unmount_camera (_tmp18_, _tmp19_);
+ _tmp15_ = mount;
#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp20_) {
-#line 6709 "LibraryWindow.c"
- ImportPage* _tmp21_;
+ if (import_page_unmount_camera (_tmp14_, _tmp15_)) {
+#line 7035 "LibraryWindow.c"
+ ImportPage* _tmp16_;
#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp21_ = page;
+ _tmp16_ = page;
#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PAGE, Page));
-#line 6715 "LibraryWindow.c"
+ library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE, Page));
+#line 7041 "LibraryWindow.c"
} else {
#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
app_window_error_message ("Unable to unmount the camera at this time.", NULL);
-#line 6719 "LibraryWindow.c"
+#line 7045 "LibraryWindow.c"
}
} else {
- ImportPage* _tmp22_;
+ ImportPage* _tmp17_;
#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp22_ = page;
+ _tmp17_ = page;
#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE, Page));
-#line 6727 "LibraryWindow.c"
+ library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PAGE, Page));
+#line 7053 "LibraryWindow.c"
}
#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (mount);
@@ -6734,41 +7060,40 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
_g_object_unref0 (page);
#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (entry);
-#line 6737 "LibraryWindow.c"
+#line 7063 "LibraryWindow.c"
}
-void library_window_add_to_stack (LibraryWindow* self, Page* page) {
- Page* _tmp0_;
+void
+library_window_add_to_stack (LibraryWindow* self,
+ Page* page)
+{
+ GtkStack* _tmp0_;
GtkStack* _tmp1_;
- Page* _tmp2_;
- GtkStack* _tmp3_;
#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_PAGE (page));
#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = page;
-#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget));
#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = self->priv->stack;
-#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = page;
+ _tmp0_ = self->priv->stack;
#line 985 "/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));
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget));
#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = self->priv->stack;
+ _tmp1_ = self->priv->stack;
#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 6764 "LibraryWindow.c"
+ gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
+#line 7087 "LibraryWindow.c"
}
-static void library_window_remove_from_stack (LibraryWindow* self, Page* page) {
+static void
+library_window_remove_from_stack (LibraryWindow* self,
+ Page* page)
+{
GtkStack* _tmp0_;
- Page* _tmp1_;
- GtkStack* _tmp2_;
+ GtkStack* _tmp1_;
#line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6776,46 +7101,54 @@ static void library_window_remove_from_stack (LibraryWindow* self, Page* page) {
#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp0_ = self->priv->stack;
#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = page;
-#line 991 "/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));
+ gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget));
#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = self->priv->stack;
+ _tmp1_ = self->priv->stack;
#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 6786 "LibraryWindow.c"
+ gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
+#line 7109 "LibraryWindow.c"
}
-static GVariant* _variant_new10 (gboolean value) {
+static GVariant*
+_variant_new10 (gboolean value)
+{
#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6793 "LibraryWindow.c"
+#line 7118 "LibraryWindow.c"
}
-static GVariant* _variant_new11 (gboolean value) {
+static GVariant*
+_variant_new11 (gboolean value)
+{
#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6800 "LibraryWindow.c"
+#line 7127 "LibraryWindow.c"
}
-static GVariant* _variant_new12 (gboolean value) {
+static GVariant*
+_variant_new12 (gboolean value)
+{
#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6807 "LibraryWindow.c"
+#line 7136 "LibraryWindow.c"
}
-static GVariant* _variant_new13 (const gchar* value) {
+static GVariant*
+_variant_new13 (const gchar* value)
+{
#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return g_variant_ref_sink (g_variant_new_string (value));
-#line 6814 "LibraryWindow.c"
+#line 7145 "LibraryWindow.c"
}
-static void library_window_load_configuration (LibraryWindow* self) {
+static void
+library_window_load_configuration (LibraryWindow* self)
+{
GAction* basic_display_action = NULL;
GAction* _tmp0_;
GAction* _tmp1_;
@@ -6823,39 +7156,35 @@ static void library_window_load_configuration (LibraryWindow* self) {
GAction* _tmp3_;
ConfigFacade* _tmp4_;
ConfigFacade* _tmp5_;
- gboolean _tmp6_;
- GVariant* _tmp7_;
+ GVariant* _tmp6_;
GAction* extended_display_action = NULL;
+ GAction* _tmp7_;
GAction* _tmp8_;
GAction* _tmp9_;
GAction* _tmp10_;
- GAction* _tmp11_;
+ ConfigFacade* _tmp11_;
ConfigFacade* _tmp12_;
- ConfigFacade* _tmp13_;
- gboolean _tmp14_;
- GVariant* _tmp15_;
+ GVariant* _tmp13_;
GAction* search_bar_display_action = NULL;
+ GAction* _tmp14_;
+ GAction* _tmp15_;
GAction* _tmp16_;
GAction* _tmp17_;
- GAction* _tmp18_;
- GAction* _tmp19_;
- ConfigFacade* _tmp20_;
- ConfigFacade* _tmp21_;
- gboolean _tmp22_;
- GVariant* _tmp23_;
+ ConfigFacade* _tmp18_;
+ ConfigFacade* _tmp19_;
+ GVariant* _tmp20_;
GAction* sort_events_action = NULL;
- GAction* _tmp24_;
- GAction* _tmp25_;
- GAction* _tmp26_;
- const gchar* _tmp27_ = NULL;
- ConfigFacade* _tmp28_;
- ConfigFacade* _tmp29_;
- gboolean _tmp30_;
- gboolean _tmp31_;
+ GAction* _tmp21_;
+ GAction* _tmp22_;
+ GAction* _tmp23_;
+ const gchar* _tmp24_ = NULL;
+ ConfigFacade* _tmp25_;
+ ConfigFacade* _tmp26_;
+ gboolean _tmp27_;
gchar* event_sort_val = NULL;
- gchar* _tmp32_;
- GAction* _tmp33_;
- GVariant* _tmp34_;
+ gchar* _tmp28_;
+ GAction* _tmp29_;
+ GVariant* _tmp30_;
#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6875,109 +7204,101 @@ static void library_window_load_configuration (LibraryWindow* self) {
#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp5_ = _tmp4_;
#line 1001 "/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));
+ _tmp6_ = _variant_new10 (configuration_facade_get_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = _variant_new10 (_tmp6_);
+ g_action_change_state (_tmp3_, _tmp6_);
#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_action_change_state (_tmp3_, _tmp7_);
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_variant_unref0 (_tmp7_);
+ _g_variant_unref0 (_tmp6_);
#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_tmp5_);
#line 1003 "/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");
+ _tmp7_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayExtendedProperties");
#line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = _g_object_ref0 (_tmp8_);
+ _tmp8_ = _g_object_ref0 (_tmp7_);
#line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- extended_display_action = _tmp9_;
+ extended_display_action = _tmp8_;
#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = extended_display_action;
+ _tmp9_ = extended_display_action;
#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _vala_assert (_tmp10_ != NULL, "extended_display_action != null");
+ _vala_assert (_tmp9_ != NULL, "extended_display_action != null");
#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = extended_display_action;
-#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = config_facade_get_instance ();
+ _tmp10_ = extended_display_action;
#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = _tmp12_;
+ _tmp11_ = config_facade_get_instance ();
#line 1005 "/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));
+ _tmp12_ = _tmp11_;
#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp15_ = _variant_new11 (_tmp14_);
+ _tmp13_ = _variant_new11 (configuration_facade_get_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_action_change_state (_tmp11_, _tmp15_);
+ g_action_change_state (_tmp10_, _tmp13_);
#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_variant_unref0 (_tmp15_);
+ _g_variant_unref0 (_tmp13_);
#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp13_);
+ _g_object_unref0 (_tmp12_);
#line 1007 "/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");
+ _tmp14_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp17_ = _g_object_ref0 (_tmp16_);
+ _tmp15_ = _g_object_ref0 (_tmp14_);
#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- search_bar_display_action = _tmp17_;
+ search_bar_display_action = _tmp15_;
#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp18_ = search_bar_display_action;
+ _tmp16_ = search_bar_display_action;
#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _vala_assert (_tmp18_ != NULL, "search_bar_display_action != null");
+ _vala_assert (_tmp16_ != NULL, "search_bar_display_action != null");
#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp19_ = search_bar_display_action;
+ _tmp17_ = search_bar_display_action;
#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp20_ = config_facade_get_instance ();
+ _tmp18_ = config_facade_get_instance ();
#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp21_ = _tmp20_;
-#line 1009 "/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));
+ _tmp19_ = _tmp18_;
#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp23_ = _variant_new12 (_tmp22_);
+ _tmp20_ = _variant_new12 (configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_action_change_state (_tmp19_, _tmp23_);
+ g_action_change_state (_tmp17_, _tmp20_);
#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_variant_unref0 (_tmp23_);
+ _g_variant_unref0 (_tmp20_);
#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp21_);
+ _g_object_unref0 (_tmp19_);
#line 1011 "/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");
+ _tmp21_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonSortEvents");
#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp25_ = _g_object_ref0 (_tmp24_);
+ _tmp22_ = _g_object_ref0 (_tmp21_);
#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- sort_events_action = _tmp25_;
+ sort_events_action = _tmp22_;
#line 1012 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp26_ = sort_events_action;
+ _tmp23_ = sort_events_action;
#line 1012 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _vala_assert (_tmp26_ != NULL, "sort_events_action != null");
-#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp28_ = config_facade_get_instance ();
+ _vala_assert (_tmp23_ != NULL, "sort_events_action != null");
#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp29_ = _tmp28_;
+ _tmp25_ = config_facade_get_instance ();
#line 1017 "/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));
+ _tmp26_ = _tmp25_;
#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp31_ = _tmp30_;
+ _tmp27_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp29_);
+ _g_object_unref0 (_tmp26_);
#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp31_) {
+ if (_tmp27_) {
#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING;
-#line 6963 "LibraryWindow.c"
+ _tmp24_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING;
+#line 7284 "LibraryWindow.c"
} else {
#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING;
-#line 6967 "LibraryWindow.c"
+ _tmp24_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING;
+#line 7288 "LibraryWindow.c"
}
#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp32_ = g_strdup (_tmp27_);
+ _tmp28_ = g_strdup (_tmp24_);
#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- event_sort_val = _tmp32_;
+ event_sort_val = _tmp28_;
#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp33_ = sort_events_action;
+ _tmp29_ = sort_events_action;
#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp34_ = _variant_new13 (event_sort_val);
+ _tmp30_ = _variant_new13 (event_sort_val);
#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_action_change_state (_tmp33_, _tmp34_);
+ g_action_change_state (_tmp29_, _tmp30_);
#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_variant_unref0 (_tmp34_);
+ _g_variant_unref0 (_tmp30_);
#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_free0 (event_sort_val);
#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6988,71 +7309,64 @@ static void library_window_load_configuration (LibraryWindow* self) {
_g_object_unref0 (extended_display_action);
#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (basic_display_action);
-#line 6991 "LibraryWindow.c"
+#line 7312 "LibraryWindow.c"
}
-static gboolean _library_window_on_pulse_background_progress_bar_gsource_func (gpointer self) {
+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 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 7000 "LibraryWindow.c"
+#line 7323 "LibraryWindow.c"
}
-static void library_window_start_pulse_background_progress_bar (LibraryWindow* self, const gchar* label, gint priority) {
+static void
+library_window_start_pulse_background_progress_bar (LibraryWindow* self,
+ const gchar* label,
+ gint priority)
+{
gint _tmp0_;
- gint _tmp1_;
- gint _tmp2_;
- gint _tmp3_;
- GtkProgressBar* _tmp4_;
- const gchar* _tmp5_;
- GtkProgressBar* _tmp6_;
- guint _tmp7_;
+ GtkProgressBar* _tmp1_;
+ GtkProgressBar* _tmp2_;
#line 1023 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1023 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (label != NULL);
#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = priority;
+ _tmp0_ = self->priv->current_progress_priority;
#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = self->priv->current_progress_priority;
-#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp0_ < _tmp1_) {
+ if (priority < _tmp0_) {
#line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 7025 "LibraryWindow.c"
+#line 7345 "LibraryWindow.c"
}
#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = priority;
-#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
+ library_window_stop_pulse_background_progress_bar (self, priority, FALSE);
#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = priority;
-#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- self->priv->current_progress_priority = _tmp3_;
+ self->priv->current_progress_priority = priority;
#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = self->priv->background_progress_bar;
+ _tmp1_ = self->priv->background_progress_bar;
#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = label;
-#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_progress_bar_set_text (_tmp4_, _tmp5_);
+ gtk_progress_bar_set_text (_tmp1_, label);
#line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = self->priv->background_progress_bar;
+ _tmp2_ = self->priv->background_progress_bar;
#line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_progress_bar_pulse (_tmp6_);
+ gtk_progress_bar_pulse (_tmp2_);
#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_show_background_progress_bar (self);
#line 1035 "/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 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- self->priv->background_progress_pulse_id = _tmp7_;
-#line 7051 "LibraryWindow.c"
+ self->priv->background_progress_pulse_id = 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 7363 "LibraryWindow.c"
}
-static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow* self) {
+static gboolean
+library_window_on_pulse_background_progress_bar (LibraryWindow* self)
+{
gboolean result = FALSE;
GtkProgressBar* _tmp0_;
#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7065,210 +7379,175 @@ static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow*
result = TRUE;
#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 7068 "LibraryWindow.c"
+#line 7382 "LibraryWindow.c"
}
-static void library_window_stop_pulse_background_progress_bar (LibraryWindow* self, gint priority, gboolean clear) {
+static void
+library_window_stop_pulse_background_progress_bar (LibraryWindow* self,
+ gint priority,
+ gboolean clear)
+{
gint _tmp0_;
- gint _tmp1_;
- guint _tmp2_;
- gboolean _tmp4_;
+ guint _tmp1_;
#line 1045 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = priority;
-#line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = self->priv->current_progress_priority;
+ _tmp0_ = self->priv->current_progress_priority;
#line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp0_ < _tmp1_) {
+ if (priority < _tmp0_) {
#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 7087 "LibraryWindow.c"
+#line 7401 "LibraryWindow.c"
}
#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = self->priv->background_progress_pulse_id;
+ _tmp1_ = self->priv->background_progress_pulse_id;
#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp2_ != ((guint) 0)) {
-#line 7093 "LibraryWindow.c"
- guint _tmp3_;
+ if (_tmp1_ != ((guint) 0)) {
+#line 7407 "LibraryWindow.c"
+ guint _tmp2_;
#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = self->priv->background_progress_pulse_id;
+ _tmp2_ = self->priv->background_progress_pulse_id;
#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_source_remove (_tmp3_);
+ g_source_remove (_tmp2_);
#line 1051 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self->priv->background_progress_pulse_id = (guint) 0;
-#line 7101 "LibraryWindow.c"
+#line 7415 "LibraryWindow.c"
}
#line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = clear;
-#line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp4_) {
-#line 7107 "LibraryWindow.c"
- gint _tmp5_;
+ if (clear) {
#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = priority;
-#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_clear_background_progress_bar (self, _tmp5_);
-#line 7113 "LibraryWindow.c"
+ library_window_clear_background_progress_bar (self, priority);
+#line 7421 "LibraryWindow.c"
}
}
-static void library_window_update_background_progress_bar (LibraryWindow* self, const gchar* label, gint priority, gdouble count, gdouble total) {
+static void
+library_window_update_background_progress_bar (LibraryWindow* self,
+ const gchar* label,
+ gint priority,
+ gdouble count,
+ gdouble total)
+{
gint _tmp0_;
- gint _tmp1_;
- gint _tmp2_;
- gboolean _tmp3_ = FALSE;
- gboolean _tmp4_ = FALSE;
- gdouble _tmp5_;
- gint _tmp10_;
+ gboolean _tmp1_ = FALSE;
+ gboolean _tmp2_ = FALSE;
gdouble fraction = 0.0;
- gdouble _tmp11_;
- gdouble _tmp12_;
- GtkProgressBar* _tmp13_;
- gdouble _tmp14_;
- GtkProgressBar* _tmp15_;
- const gchar* _tmp16_;
- gdouble _tmp17_;
- gchar* _tmp18_;
- gchar* _tmp19_;
+ GtkProgressBar* _tmp3_;
+ gdouble _tmp4_;
+ GtkProgressBar* _tmp5_;
+ gdouble _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (label != NULL);
#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = priority;
-#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = self->priv->current_progress_priority;
+ _tmp0_ = self->priv->current_progress_priority;
#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp0_ < _tmp1_) {
+ if (priority < _tmp0_) {
#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 7148 "LibraryWindow.c"
+#line 7453 "LibraryWindow.c"
}
#line 1063 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = priority;
-#line 1063 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
-#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = count;
+ library_window_stop_pulse_background_progress_bar (self, priority, FALSE);
#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp5_ <= 0.0) {
+ if (count <= 0.0) {
#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = TRUE;
-#line 7160 "LibraryWindow.c"
+ _tmp2_ = TRUE;
+#line 7461 "LibraryWindow.c"
} else {
- gdouble _tmp6_;
#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = total;
-#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = _tmp6_ <= 0.0;
-#line 7167 "LibraryWindow.c"
+ _tmp2_ = total <= 0.0;
+#line 7465 "LibraryWindow.c"
}
#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp4_) {
+ if (_tmp2_) {
#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = TRUE;
-#line 7173 "LibraryWindow.c"
+ _tmp1_ = TRUE;
+#line 7471 "LibraryWindow.c"
} else {
- gdouble _tmp7_;
- gdouble _tmp8_;
-#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = count;
#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = total;
-#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = _tmp7_ >= _tmp8_;
-#line 7183 "LibraryWindow.c"
+ _tmp1_ = count >= total;
+#line 7475 "LibraryWindow.c"
}
#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp3_) {
-#line 7187 "LibraryWindow.c"
- gint _tmp9_;
-#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = priority;
+ if (_tmp1_) {
#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_clear_background_progress_bar (self, _tmp9_);
+ library_window_clear_background_progress_bar (self, priority);
#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 7195 "LibraryWindow.c"
+#line 7483 "LibraryWindow.c"
}
#line 1071 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = priority;
-#line 1071 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- self->priv->current_progress_priority = _tmp10_;
-#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = count;
+ self->priv->current_progress_priority = priority;
#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = total;
-#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- fraction = _tmp11_ / _tmp12_;
+ fraction = count / total;
#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = self->priv->background_progress_bar;
+ _tmp3_ = self->priv->background_progress_bar;
#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = fraction;
+ _tmp4_ = fraction;
#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_progress_bar_set_fraction (_tmp13_, _tmp14_);
+ gtk_progress_bar_set_fraction (_tmp3_, _tmp4_);
#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp15_ = self->priv->background_progress_bar;
+ _tmp5_ = self->priv->background_progress_bar;
#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp16_ = label;
+ _tmp6_ = fraction;
#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp17_ = fraction;
+ _tmp7_ = g_strdup_printf (_ ("%s (%d%%)"), label, (gint) (_tmp6_ * 100.0));
#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp18_ = g_strdup_printf (_ ("%s (%d%%)"), _tmp16_, (gint) (_tmp17_ * 100.0));
-#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp19_ = _tmp18_;
+ _tmp8_ = _tmp7_;
#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_progress_bar_set_text (_tmp15_, _tmp19_);
+ gtk_progress_bar_set_text (_tmp5_, _tmp8_);
#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_free0 (_tmp19_);
+ _g_free0 (_tmp8_);
#line 1076 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_show_background_progress_bar (self);
-#line 7229 "LibraryWindow.c"
+#line 7509 "LibraryWindow.c"
}
-static void library_window_clear_background_progress_bar (LibraryWindow* self, gint priority) {
+static void
+library_window_clear_background_progress_bar (LibraryWindow* self,
+ gint priority)
+{
gint _tmp0_;
- gint _tmp1_;
- gint _tmp2_;
- GtkProgressBar* _tmp3_;
- GtkProgressBar* _tmp4_;
+ GtkProgressBar* _tmp1_;
+ GtkProgressBar* _tmp2_;
#line 1085 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = priority;
-#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = self->priv->current_progress_priority;
+ _tmp0_ = self->priv->current_progress_priority;
#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp0_ < _tmp1_) {
+ if (priority < _tmp0_) {
#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 7249 "LibraryWindow.c"
+#line 7528 "LibraryWindow.c"
}
#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = priority;
-#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
+ library_window_stop_pulse_background_progress_bar (self, priority, FALSE);
#line 1091 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self->priv->current_progress_priority = 0;
#line 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = self->priv->background_progress_bar;
+ _tmp1_ = self->priv->background_progress_bar;
#line 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_progress_bar_set_fraction (_tmp3_, 0.0);
+ gtk_progress_bar_set_fraction (_tmp1_, 0.0);
#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = self->priv->background_progress_bar;
+ _tmp2_ = self->priv->background_progress_bar;
#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_progress_bar_set_text (_tmp4_, "");
+ gtk_progress_bar_set_text (_tmp2_, "");
#line 1095 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_hide_background_progress_bar (self);
-#line 7267 "LibraryWindow.c"
+#line 7544 "LibraryWindow.c"
}
-static void library_window_show_background_progress_bar (LibraryWindow* self) {
+static void
+library_window_show_background_progress_bar (LibraryWindow* self)
+{
gboolean _tmp0_;
#line 1103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
@@ -7276,7 +7555,7 @@ static void library_window_show_background_progress_bar (LibraryWindow* self) {
_tmp0_ = self->priv->background_progress_displayed;
#line 1104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (!_tmp0_) {
-#line 7279 "LibraryWindow.c"
+#line 7558 "LibraryWindow.c"
GtkBox* _tmp1_;
GtkFrame* _tmp2_;
GtkFrame* _tmp3_;
@@ -7292,12 +7571,14 @@ static void library_window_show_background_progress_bar (LibraryWindow* self) {
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
#line 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self->priv->background_progress_displayed = TRUE;
-#line 7295 "LibraryWindow.c"
+#line 7574 "LibraryWindow.c"
}
}
-static void library_window_hide_background_progress_bar (LibraryWindow* self) {
+static void
+library_window_hide_background_progress_bar (LibraryWindow* self)
+{
gboolean _tmp0_;
#line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
@@ -7305,7 +7586,7 @@ static void library_window_hide_background_progress_bar (LibraryWindow* self) {
_tmp0_ = self->priv->background_progress_displayed;
#line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp0_) {
-#line 7308 "LibraryWindow.c"
+#line 7589 "LibraryWindow.c"
GtkBox* _tmp1_;
GtkFrame* _tmp2_;
#line 1113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7316,104 +7597,101 @@ static void library_window_hide_background_progress_bar (LibraryWindow* self) {
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 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self->priv->background_progress_displayed = FALSE;
-#line 7319 "LibraryWindow.c"
+#line 7600 "LibraryWindow.c"
}
}
-static void library_window_on_library_monitor_discovery_started (LibraryWindow* self) {
+static void
+library_window_on_library_monitor_discovery_started (LibraryWindow* self)
+{
#line 1118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_start_pulse_background_progress_bar (self, _ ("Updating library…"), LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY);
-#line 7329 "LibraryWindow.c"
+#line 7612 "LibraryWindow.c"
}
-static void library_window_on_library_monitor_discovery_completed (LibraryWindow* self) {
+static void
+library_window_on_library_monitor_discovery_completed (LibraryWindow* self)
+{
#line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_stop_pulse_background_progress_bar (self, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY, TRUE);
-#line 7338 "LibraryWindow.c"
+#line 7623 "LibraryWindow.c"
}
-static void library_window_on_library_monitor_auto_update_progress (LibraryWindow* self, gint completed_files, gint total_files) {
- gint _tmp0_;
+static void
+library_window_on_library_monitor_auto_update_progress (LibraryWindow* self,
+ gint completed_files,
+ gint total_files)
+{
#line 1126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1127 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = total_files;
-#line 1127 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp0_ < LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES) {
+ if (total_files < LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES) {
#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY);
-#line 7352 "LibraryWindow.c"
+#line 7638 "LibraryWindow.c"
} else {
- gint _tmp1_;
- gint _tmp2_;
#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = completed_files;
-#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = total_files;
-#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_update_background_progress_bar (self, _ ("Updating library…"), LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_);
-#line 7362 "LibraryWindow.c"
+ library_window_update_background_progress_bar (self, _ ("Updating library…"), LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY, (gdouble) completed_files, (gdouble) total_files);
+#line 7642 "LibraryWindow.c"
}
}
-static void library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self) {
+static void
+library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self)
+{
#line 1135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_start_pulse_background_progress_bar (self, _ ("Preparing to auto-import photos…"), LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY);
-#line 7372 "LibraryWindow.c"
+#line 7654 "LibraryWindow.c"
}
-static void library_window_on_library_monitor_auto_import_progress (LibraryWindow* self, guint64 completed_bytes, guint64 total_bytes) {
- guint64 _tmp0_;
- guint64 _tmp1_;
+static void
+library_window_on_library_monitor_auto_import_progress (LibraryWindow* self,
+ guint64 completed_bytes,
+ guint64 total_bytes)
+{
#line 1140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = completed_bytes;
-#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = total_bytes;
-#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_update_background_progress_bar (self, _ ("Auto-importing photos…"), LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY, (gdouble) _tmp0_, (gdouble) _tmp1_);
-#line 7387 "LibraryWindow.c"
+ library_window_update_background_progress_bar (self, _ ("Auto-importing photos…"), LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY, (gdouble) completed_bytes, (gdouble) total_bytes);
+#line 7667 "LibraryWindow.c"
}
-static void library_window_on_metadata_writer_progress (LibraryWindow* self, guint completed, guint total) {
- guint _tmp0_;
+static void
+library_window_on_metadata_writer_progress (LibraryWindow* self,
+ guint completed,
+ guint total)
+{
#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = total;
-#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp0_ < ((guint) LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES)) {
+ if (total < ((guint) LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES)) {
#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY);
-#line 7401 "LibraryWindow.c"
+#line 7682 "LibraryWindow.c"
} else {
- guint _tmp1_;
- guint _tmp2_;
-#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = completed;
-#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = total;
#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_update_background_progress_bar (self, _ ("Writing metadata to files…"), LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_);
-#line 7411 "LibraryWindow.c"
+ library_window_update_background_progress_bar (self, _ ("Writing metadata to files…"), LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY, (gdouble) completed, (gdouble) total);
+#line 7686 "LibraryWindow.c"
}
}
-static void library_window_create_layout (LibraryWindow* self, Page* start_page) {
+static void
+library_window_create_layout (LibraryWindow* self,
+ Page* start_page)
+{
GtkScrolledWindow* scrolled_sidebar = NULL;
GtkScrolledWindow* _tmp0_;
SidebarTree* _tmp1_;
@@ -7456,15 +7734,12 @@ static void library_window_create_layout (LibraryWindow* self, Page* start_page)
GtkPaned* _tmp38_;
ConfigFacade* _tmp39_;
ConfigFacade* _tmp40_;
- gint _tmp41_;
- GtkStack* _tmp42_;
+ GtkStack* _tmp41_;
+ gint _tmp42_;
gint _tmp43_;
- gint _tmp44_;
- GtkBox* _tmp45_;
- GtkPaned* _tmp46_;
- GtkBox* _tmp47_;
- Page* _tmp48_;
- Page* _tmp49_;
+ GtkBox* _tmp44_;
+ GtkPaned* _tmp45_;
+ GtkBox* _tmp46_;
#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7618,111 +7893,95 @@ static void library_window_create_layout (LibraryWindow* self, Page* start_page)
#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp40_ = _tmp39_;
#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp41_ = configuration_facade_get_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_paned_set_position (_tmp38_, _tmp41_);
+ gtk_paned_set_position (_tmp38_, configuration_facade_get_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_tmp40_);
#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp42_ = self->priv->stack;
+ _tmp41_ = self->priv->stack;
#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp43_ = library_window_get_PAGE_MIN_WIDTH ();
+ _tmp42_ = library_window_get_PAGE_MIN_WIDTH ();
#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp44_ = _tmp43_;
+ _tmp43_ = _tmp42_;
#line 1197 "/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);
+ gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), _tmp43_, -1);
#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp45_ = self->priv->layout;
+ _tmp44_ = self->priv->layout;
#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp46_ = self->priv->client_paned;
+ _tmp45_ = self->priv->client_paned;
#line 1199 "/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);
+ gtk_box_pack_end (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
#line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp47_ = self->priv->layout;
+ _tmp46_ = self->priv->layout;
#line 1201 "/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 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp48_ = start_page;
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget));
#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_switch_to_page (self, _tmp48_);
+ library_window_switch_to_page (self, start_page);
#line 1204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp49_ = start_page;
-#line 1204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (start_page, gtk_widget_get_type (), GtkWidget));
#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (scrolled_sidebar);
-#line 7654 "LibraryWindow.c"
+#line 7923 "LibraryWindow.c"
}
-static void library_window_real_set_current_page (PageWindow* base, Page* page) {
+static void
+library_window_real_set_current_page (PageWindow* base,
+ Page* page)
+{
LibraryWindow * self;
- Page* _tmp0_;
#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_PAGE (page));
#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = page;
-#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_switch_to_page (self, _tmp0_);
-#line 7669 "LibraryWindow.c"
+ library_window_switch_to_page (self, page);
+#line 7938 "LibraryWindow.c"
}
-void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable) {
- gboolean _tmp0_;
+void
+library_window_set_page_switching_enabled (LibraryWindow* self,
+ gboolean should_enable)
+{
#line 1212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = should_enable;
-#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- self->priv->page_switching_enabled = _tmp0_;
-#line 7681 "LibraryWindow.c"
+ self->priv->page_switching_enabled = should_enable;
+#line 7950 "LibraryWindow.c"
}
-void library_window_switch_to_page (LibraryWindow* self, Page* page) {
+void
+library_window_switch_to_page (LibraryWindow* self,
+ Page* page)
+{
gboolean _tmp0_;
Page* _tmp1_;
Page* _tmp2_;
- Page* _tmp3_;
- gboolean _tmp4_;
+ gboolean _tmp3_;
Page* current_page = NULL;
+ Page* _tmp4_;
Page* _tmp5_;
- Page* _tmp6_;
- GtkStack* _tmp16_;
- Page* _tmp17_;
- Page* _tmp18_;
- Page* _tmp19_;
- gboolean _tmp21_;
- Page* _tmp22_;
+ GtkStack* _tmp15_;
SidebarEntry* entry = NULL;
- GeeHashMap* _tmp23_;
- Page* _tmp24_;
- gpointer _tmp25_;
- SidebarEntry* _tmp26_;
- Page* _tmp37_;
- Page* _tmp39_;
- Page* _tmp40_;
- Page* _tmp41_;
- Page* _tmp42_;
- Page* _tmp43_;
- GMenuModel* _tmp44_;
- GMenuModel* _tmp45_;
+ GeeHashMap* _tmp17_;
+ gpointer _tmp18_;
+ SidebarEntry* _tmp19_;
+ Page* _tmp29_;
+ Page* _tmp30_;
+ GMenuModel* _tmp31_;
+ GMenuModel* _tmp32_;
gboolean old = FALSE;
- GtkSettings* _tmp46_;
- gboolean _tmp47_;
- gboolean _tmp48_;
- GtkSettings* _tmp49_;
- gboolean _tmp50_;
- GtkSettings* _tmp51_;
- gboolean _tmp52_;
+ GtkSettings* _tmp33_;
+ gboolean _tmp34_;
+ gboolean _tmp35_;
+ GtkSettings* _tmp36_;
+ gboolean _tmp37_;
+ GtkSettings* _tmp38_;
+ gboolean _tmp39_;
GtkToolbar* toolbar = NULL;
- Page* _tmp53_;
- GtkToolbar* _tmp54_;
- GtkToolbar* _tmp55_;
- Page* _tmp61_;
+ GtkToolbar* _tmp40_;
+ GtkToolbar* _tmp41_;
#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7733,306 +7992,270 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
if (!_tmp0_) {
#line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 7736 "LibraryWindow.c"
+#line 7995 "LibraryWindow.c"
}
#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = page;
-#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
+ _tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = _tmp1_ == _tmp3_;
+ _tmp3_ = page == _tmp2_;
#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp3_);
+ _g_object_unref0 (_tmp2_);
#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp4_) {
+ if (_tmp3_) {
#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 7752 "LibraryWindow.c"
+#line 8009 "LibraryWindow.c"
}
#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
+ _tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- current_page = _tmp5_;
+ current_page = _tmp4_;
#line 1224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = current_page;
+ _tmp5_ = current_page;
#line 1224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp6_ != NULL) {
-#line 7762 "LibraryWindow.c"
+ if (_tmp5_ != NULL) {
+#line 8019 "LibraryWindow.c"
GtkToolbar* toolbar = NULL;
- Page* _tmp7_;
+ Page* _tmp6_;
+ GtkToolbar* _tmp7_;
GtkToolbar* _tmp8_;
- GtkToolbar* _tmp9_;
+ Page* _tmp11_;
Page* _tmp12_;
- Page* _tmp13_;
- Page* _tmp15_;
+ Page* _tmp14_;
#line 1225 "/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 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
application_set_menubar (NULL);
#line 1228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = current_page;
+ _tmp6_ = current_page;
#line 1228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = page_get_toolbar (_tmp7_);
+ _tmp7_ = page_get_toolbar (_tmp6_);
#line 1228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- toolbar = _tmp8_;
+ toolbar = _tmp7_;
#line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = toolbar;
+ _tmp8_ = toolbar;
#line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp9_ != NULL) {
-#line 7784 "LibraryWindow.c"
- GtkRevealer* _tmp10_;
- GtkToolbar* _tmp11_;
+ if (_tmp8_ != NULL) {
+#line 8041 "LibraryWindow.c"
+ GtkRevealer* _tmp9_;
+ GtkToolbar* _tmp10_;
#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = self->priv->toolbar_revealer;
+ _tmp9_ = self->priv->toolbar_revealer;
#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = toolbar;
+ _tmp10_ = toolbar;
#line 1230 "/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 7793 "LibraryWindow.c"
+ gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
+#line 8050 "LibraryWindow.c"
}
#line 1232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = current_page;
+ _tmp11_ = current_page;
#line 1232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- page_switching_from (_tmp12_);
+ page_switching_from (_tmp11_);
#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = current_page;
+ _tmp12_ = current_page;
#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 7803 "LibraryWindow.c"
- SidebarTree* _tmp14_;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_LIBRARY_PHOTO_PAGE)) {
+#line 8060 "LibraryWindow.c"
+ SidebarTree* _tmp13_;
#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = self->priv->sidebar_tree;
+ _tmp13_ = self->priv->sidebar_tree;
#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- sidebar_tree_enable_editing (_tmp14_);
-#line 7809 "LibraryWindow.c"
+ sidebar_tree_enable_editing (_tmp13_);
+#line 8066 "LibraryWindow.c"
}
#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp15_ = current_page;
+ _tmp14_ = current_page;
#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_unsubscribe_from_basic_information (self, _tmp15_);
+ library_window_unsubscribe_from_basic_information (self, _tmp14_);
#line 1224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (toolbar);
-#line 7817 "LibraryWindow.c"
+#line 8074 "LibraryWindow.c"
}
#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp16_ = self->priv->stack;
-#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp17_ = page;
+ _tmp15_ = self->priv->stack;
#line 1243 "/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));
+ gtk_stack_set_visible_child (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget));
#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp18_ = page;
-#line 1247 "/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 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp19_ = page;
+ 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), page);
#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 7833 "LibraryWindow.c"
- SidebarTree* _tmp20_;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_LIBRARY_PHOTO_PAGE)) {
+#line 8084 "LibraryWindow.c"
+ SidebarTree* _tmp16_;
#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp20_ = self->priv->sidebar_tree;
+ _tmp16_ = self->priv->sidebar_tree;
#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- sidebar_tree_disable_editing (_tmp20_);
-#line 7839 "LibraryWindow.c"
+ sidebar_tree_disable_editing (_tmp16_);
+#line 8090 "LibraryWindow.c"
}
#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp21_ = library_window_should_show_search_bar (self);
-#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp22_ = page;
-#line 1257 "/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 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp23_ = self->priv->page_map;
+ library_window_toggle_search_bar (self, library_window_should_show_search_bar (self), G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) page) : NULL);
#line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp24_ = page;
+ _tmp17_ = self->priv->page_map;
#line 1260 "/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_);
+ _tmp18_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), page);
#line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- entry = (SidebarEntry*) _tmp25_;
+ entry = (SidebarEntry*) _tmp18_;
#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp26_ = entry;
+ _tmp19_ = entry;
#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp26_ != NULL) {
-#line 7859 "LibraryWindow.c"
+ if (_tmp19_ != NULL) {
+#line 8104 "LibraryWindow.c"
SidebarExpandableEntry* expandable_entry = NULL;
- SidebarEntry* _tmp27_;
- SidebarExpandableEntry* _tmp28_;
- gboolean _tmp29_ = FALSE;
- SidebarExpandableEntry* _tmp30_;
- SidebarTree* _tmp35_;
- SidebarEntry* _tmp36_;
+ SidebarEntry* _tmp20_;
+ SidebarExpandableEntry* _tmp21_;
+ gboolean _tmp22_ = FALSE;
+ SidebarExpandableEntry* _tmp23_;
+ SidebarTree* _tmp27_;
+ SidebarEntry* _tmp28_;
#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp27_ = entry;
+ _tmp20_ = entry;
#line 1264 "/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);
+ _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, SIDEBAR_TYPE_EXPANDABLE_ENTRY) ? ((SidebarExpandableEntry*) _tmp20_) : NULL);
#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- expandable_entry = _tmp28_;
+ expandable_entry = _tmp21_;
#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp30_ = expandable_entry;
+ _tmp23_ = expandable_entry;
#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp30_ != NULL) {
-#line 7877 "LibraryWindow.c"
- SidebarExpandableEntry* _tmp31_;
- gboolean _tmp32_;
+ if (_tmp23_ != NULL) {
+#line 8122 "LibraryWindow.c"
+ SidebarExpandableEntry* _tmp24_;
#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp31_ = expandable_entry;
+ _tmp24_ = expandable_entry;
#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp32_ = sidebar_expandable_entry_expand_on_select (_tmp31_);
-#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp29_ = _tmp32_;
-#line 7886 "LibraryWindow.c"
+ _tmp22_ = sidebar_expandable_entry_expand_on_select (_tmp24_);
+#line 8128 "LibraryWindow.c"
} else {
#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp29_ = FALSE;
-#line 7890 "LibraryWindow.c"
+ _tmp22_ = FALSE;
+#line 8132 "LibraryWindow.c"
}
#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp29_) {
-#line 7894 "LibraryWindow.c"
- SidebarTree* _tmp33_;
- SidebarEntry* _tmp34_;
+ if (_tmp22_) {
+#line 8136 "LibraryWindow.c"
+ SidebarTree* _tmp25_;
+ SidebarEntry* _tmp26_;
#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp33_ = self->priv->sidebar_tree;
+ _tmp25_ = self->priv->sidebar_tree;
#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp34_ = entry;
+ _tmp26_ = entry;
#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- sidebar_tree_expand_to_entry (_tmp33_, _tmp34_);
-#line 7903 "LibraryWindow.c"
+ sidebar_tree_expand_to_entry (_tmp25_, _tmp26_);
+#line 8145 "LibraryWindow.c"
}
#line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp35_ = self->priv->sidebar_tree;
+ _tmp27_ = self->priv->sidebar_tree;
#line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp36_ = entry;
+ _tmp28_ = entry;
#line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- sidebar_tree_place_cursor (_tmp35_, _tmp36_, TRUE);
+ sidebar_tree_place_cursor (_tmp27_, _tmp28_, TRUE);
#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (expandable_entry);
-#line 7913 "LibraryWindow.c"
+#line 8155 "LibraryWindow.c"
}
#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_update_properties (self);
#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp37_ = page;
-#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, TYPE_CHECKERBOARD_PAGE)) {
-#line 7921 "LibraryWindow.c"
- Page* _tmp38_;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_CHECKERBOARD_PAGE)) {
#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp38_ = page;
-#line 1274 "/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 7927 "LibraryWindow.c"
+ library_window_init_view_filter (self, G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
+#line 8163 "LibraryWindow.c"
}
#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp39_ = page;
-#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
+ gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget));
#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp40_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
+ _tmp29_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp41_ = _tmp40_;
+ _tmp30_ = _tmp29_;
#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_subscribe_for_basic_information (self, _tmp41_);
+ library_window_subscribe_for_basic_information (self, _tmp30_);
#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp41_);
+ _g_object_unref0 (_tmp30_);
#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp42_ = page;
-#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- page_switched_to (_tmp42_);
-#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp43_ = page;
+ page_switched_to (page);
#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp44_ = page_get_menubar (_tmp43_);
+ _tmp31_ = page_get_menubar (page);
#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp45_ = _tmp44_;
+ _tmp32_ = _tmp31_;
#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- application_set_menubar (_tmp45_);
+ application_set_menubar (_tmp32_);
#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp45_);
+ _g_object_unref0 (_tmp32_);
#line 1284 "/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 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp46_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+ _tmp33_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_object_get (_tmp46_, "gtk-shell-shows-menubar", &_tmp47_, NULL);
+ g_object_get (_tmp33_, "gtk-shell-shows-menubar", &_tmp34_, NULL);
#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp48_ = _tmp47_;
+ _tmp35_ = _tmp34_;
#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- old = _tmp48_;
+ old = _tmp35_;
#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp49_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+ _tmp36_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp50_ = old;
+ _tmp37_ = old;
#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_object_set (_tmp49_, "gtk-shell-shows-menubar", !_tmp50_, NULL);
+ g_object_set (_tmp36_, "gtk-shell-shows-menubar", !_tmp37_, NULL);
#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp51_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+ _tmp38_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp52_ = old;
+ _tmp39_ = old;
#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_object_set (_tmp51_, "gtk-shell-shows-menubar", _tmp52_, NULL);
+ g_object_set (_tmp38_, "gtk-shell-shows-menubar", _tmp39_, NULL);
#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp53_ = page;
+ _tmp40_ = page_get_toolbar (page);
#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp54_ = page_get_toolbar (_tmp53_);
-#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- toolbar = _tmp54_;
+ toolbar = _tmp40_;
#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp55_ = toolbar;
+ _tmp41_ = toolbar;
#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp55_ != NULL) {
-#line 7987 "LibraryWindow.c"
- GtkRevealer* _tmp56_;
- GtkToolbar* _tmp57_;
- GtkToolbar* _tmp58_;
- GtkRevealer* _tmp59_;
- gboolean _tmp60_;
+ if (_tmp41_ != NULL) {
+#line 8215 "LibraryWindow.c"
+ GtkRevealer* _tmp42_;
+ GtkToolbar* _tmp43_;
+ GtkToolbar* _tmp44_;
+ GtkRevealer* _tmp45_;
#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp56_ = self->priv->toolbar_revealer;
+ _tmp42_ = self->priv->toolbar_revealer;
#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp57_ = toolbar;
+ _tmp43_ = toolbar;
#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget));
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget));
#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp58_ = toolbar;
+ _tmp44_ = toolbar;
#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp59_ = self->priv->toolbar_revealer;
+ gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget));
#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp60_ = library_window_is_toolbar_visible (self);
+ _tmp45_ = self->priv->toolbar_revealer;
#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- gtk_revealer_set_reveal_child (_tmp59_, _tmp60_);
-#line 8009 "LibraryWindow.c"
+ gtk_revealer_set_reveal_child (_tmp45_, library_window_is_toolbar_visible (self));
+#line 8234 "LibraryWindow.c"
}
#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp61_ = page;
-#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- page_ready (_tmp61_);
+ page_ready (page);
#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (toolbar);
#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (entry);
#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (current_page);
-#line 8021 "LibraryWindow.c"
+#line 8244 "LibraryWindow.c"
}
-static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPage* page) {
+static void
+library_window_init_view_filter (LibraryWindow* self,
+ CheckerboardPage* page)
+{
SearchFilterToolbar* _tmp0_;
- CheckerboardPage* _tmp1_;
+ SearchViewFilter* _tmp1_;
SearchViewFilter* _tmp2_;
- SearchViewFilter* _tmp3_;
- CheckerboardPage* _tmp4_;
- ViewCollection* _tmp5_;
- ViewCollection* _tmp6_;
- CheckerboardPage* _tmp7_;
- SearchViewFilter* _tmp8_;
- SearchViewFilter* _tmp9_;
+ ViewCollection* _tmp3_;
+ ViewCollection* _tmp4_;
+ SearchViewFilter* _tmp5_;
+ SearchViewFilter* _tmp6_;
#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8040,38 +8263,34 @@ static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPa
#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp0_ = self->priv->search_toolbar;
#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = page;
-#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = checkerboard_page_get_search_view_filter (_tmp1_);
+ _tmp1_ = checkerboard_page_get_search_view_filter (page);
#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- search_filter_toolbar_set_view_filter (_tmp0_, _tmp3_);
+ search_filter_toolbar_set_view_filter (_tmp0_, _tmp2_);
#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _view_filter_unref0 (_tmp3_);
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = page;
+ _view_filter_unref0 (_tmp2_);
#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE, Page));
+ _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_PAGE, Page));
#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = _tmp5_;
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = page;
+ _tmp4_ = _tmp3_;
#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = checkerboard_page_get_search_view_filter (_tmp7_);
+ _tmp5_ = checkerboard_page_get_search_view_filter (page);
#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = _tmp8_;
+ _tmp6_ = _tmp5_;
#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- view_collection_install_view_filter (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_FILTER, ViewFilter));
+ view_collection_install_view_filter (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_VIEW_FILTER, ViewFilter));
#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _view_filter_unref0 (_tmp9_);
+ _view_filter_unref0 (_tmp6_);
#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _data_collection_unref0 (_tmp6_);
-#line 8070 "LibraryWindow.c"
+ _data_collection_unref0 (_tmp4_);
+#line 8287 "LibraryWindow.c"
}
-static gboolean library_window_should_show_search_bar (LibraryWindow* self) {
+static gboolean
+library_window_should_show_search_bar (LibraryWindow* self)
+{
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
Page* _tmp1_;
@@ -8089,30 +8308,32 @@ static gboolean library_window_should_show_search_bar (LibraryWindow* self) {
_g_object_unref0 (_tmp2_);
#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp3_) {
-#line 8092 "LibraryWindow.c"
+#line 8311 "LibraryWindow.c"
gboolean _tmp4_;
#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp4_ = self->priv->is_search_toolbar_visible;
#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp0_ = _tmp4_;
-#line 8098 "LibraryWindow.c"
+#line 8317 "LibraryWindow.c"
} else {
#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp0_ = FALSE;
-#line 8102 "LibraryWindow.c"
+#line 8321 "LibraryWindow.c"
}
#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = _tmp0_;
#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 8108 "LibraryWindow.c"
+#line 8327 "LibraryWindow.c"
}
-static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show, CheckerboardPage* page) {
+static void
+library_window_toggle_search_bar (LibraryWindow* self,
+ gboolean show,
+ CheckerboardPage* page)
+{
SearchFilterToolbar* _tmp0_;
- gboolean _tmp1_;
- gboolean _tmp2_;
#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8120,102 +8341,79 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show
#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp0_ = self->priv->search_toolbar;
#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = show;
-#line 1310 "/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 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = show;
+ gtk_revealer_set_reveal_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_revealer_get_type (), GtkRevealer), show);
#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp2_) {
-#line 8130 "LibraryWindow.c"
- CheckerboardPage* _tmp3_;
- SearchFilterToolbar* _tmp4_;
- CheckerboardPage* _tmp5_;
+ if (show) {
+#line 8347 "LibraryWindow.c"
+ SearchFilterToolbar* _tmp1_;
+ SearchViewFilter* _tmp2_;
+ SearchViewFilter* _tmp3_;
+ ViewCollection* _tmp4_;
+ ViewCollection* _tmp5_;
SearchViewFilter* _tmp6_;
SearchViewFilter* _tmp7_;
- CheckerboardPage* _tmp8_;
- ViewCollection* _tmp9_;
- ViewCollection* _tmp10_;
- CheckerboardPage* _tmp11_;
- SearchViewFilter* _tmp12_;
- SearchViewFilter* _tmp13_;
-#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = page;
#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _vala_assert (NULL != _tmp3_, "null != page");
+ _vala_assert (NULL != page, "null != page");
#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = self->priv->search_toolbar;
+ _tmp1_ = self->priv->search_toolbar;
#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = page;
+ _tmp2_ = checkerboard_page_get_search_view_filter (page);
#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = checkerboard_page_get_search_view_filter (_tmp5_);
+ _tmp3_ = _tmp2_;
#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = _tmp6_;
-#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- search_filter_toolbar_set_view_filter (_tmp4_, _tmp7_);
+ search_filter_toolbar_set_view_filter (_tmp1_, _tmp3_);
#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _view_filter_unref0 (_tmp7_);
-#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = page;
+ _view_filter_unref0 (_tmp3_);
#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
+ _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_PAGE, Page));
#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = _tmp9_;
-#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = page;
+ _tmp5_ = _tmp4_;
#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = checkerboard_page_get_search_view_filter (_tmp11_);
+ _tmp6_ = checkerboard_page_get_search_view_filter (page);
#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = _tmp12_;
+ _tmp7_ = _tmp6_;
#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- view_collection_install_view_filter (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_VIEW_FILTER, ViewFilter));
+ view_collection_install_view_filter (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIEW_FILTER, ViewFilter));
#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _view_filter_unref0 (_tmp13_);
+ _view_filter_unref0 (_tmp7_);
#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _data_collection_unref0 (_tmp10_);
-#line 8176 "LibraryWindow.c"
+ _data_collection_unref0 (_tmp5_);
+#line 8381 "LibraryWindow.c"
} else {
- CheckerboardPage* _tmp14_;
#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = page;
-#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp14_ != NULL) {
-#line 8183 "LibraryWindow.c"
- CheckerboardPage* _tmp15_;
- ViewCollection* _tmp16_;
- ViewCollection* _tmp17_;
- DisabledViewFilter* _tmp18_;
- DisabledViewFilter* _tmp19_;
+ if (page != NULL) {
+#line 8385 "LibraryWindow.c"
+ ViewCollection* _tmp8_;
+ ViewCollection* _tmp9_;
+ DisabledViewFilter* _tmp10_;
+ DisabledViewFilter* _tmp11_;
#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp15_ = page;
+ _tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_PAGE, Page));
#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE, Page));
+ _tmp9_ = _tmp8_;
#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp17_ = _tmp16_;
+ _tmp10_ = disabled_view_filter_new ();
#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp18_ = disabled_view_filter_new ();
+ _tmp11_ = _tmp10_;
#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp19_ = _tmp18_;
+ view_collection_install_view_filter (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_VIEW_FILTER, ViewFilter));
#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- view_collection_install_view_filter (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_VIEW_FILTER, ViewFilter));
+ _view_filter_unref0 (_tmp11_);
#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _view_filter_unref0 (_tmp19_);
-#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _data_collection_unref0 (_tmp17_);
-#line 8205 "LibraryWindow.c"
+ _data_collection_unref0 (_tmp9_);
+#line 8404 "LibraryWindow.c"
}
}
}
-static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepresentative* entry, Page* page) {
+static void
+library_window_on_page_created (LibraryWindow* self,
+ SidebarPageRepresentative* entry,
+ Page* page)
+{
GeeHashMap* _tmp0_;
- Page* _tmp1_;
- gboolean _tmp2_;
- GeeHashMap* _tmp3_;
- Page* _tmp4_;
- SidebarPageRepresentative* _tmp5_;
- Page* _tmp6_;
+ GeeHashMap* _tmp1_;
#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8225,37 +8423,28 @@ static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepr
#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp0_ = self->priv->page_map;
#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = page;
-#line 1322 "/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 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _vala_assert (!_tmp2_, "!page_map.has_key(page)");
+ _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), page), "!page_map.has_key(page)");
#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = self->priv->page_map;
+ _tmp1_ = self->priv->page_map;
#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = page;
-#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = entry;
-#line 1323 "/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 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = page;
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), page, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry));
#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_add_to_stack (self, _tmp6_);
-#line 8245 "LibraryWindow.c"
+ library_window_add_to_stack (self, page);
+#line 8433 "LibraryWindow.c"
}
-static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageRepresentative* entry, Page* page) {
+static void
+library_window_on_destroying_page (LibraryWindow* self,
+ SidebarPageRepresentative* entry,
+ Page* page)
+{
Page* _tmp0_;
Page* _tmp1_;
- Page* _tmp2_;
- gboolean _tmp3_;
- Page* _tmp9_;
+ gboolean _tmp2_;
gboolean removed = FALSE;
- GeeHashMap* _tmp10_;
- Page* _tmp11_;
- gboolean _tmp12_;
+ GeeHashMap* _tmp8_;
+ gboolean _tmp9_;
#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8263,115 +8452,109 @@ static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageR
#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_PAGE (page));
#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = page;
-#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
+ _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = _tmp0_ == _tmp2_;
+ _tmp2_ = page == _tmp1_;
#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp2_);
+ _g_object_unref0 (_tmp1_);
#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp3_) {
-#line 8277 "LibraryWindow.c"
- LibraryBranch* _tmp4_;
+ if (_tmp2_) {
+#line 8464 "LibraryWindow.c"
+ LibraryBranch* _tmp3_;
+ LibraryPhotosEntry* _tmp4_;
LibraryPhotosEntry* _tmp5_;
- LibraryPhotosEntry* _tmp6_;
+ Page* _tmp6_;
Page* _tmp7_;
- Page* _tmp8_;
#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = self->priv->library_branch;
+ _tmp3_ = self->priv->library_branch;
#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = library_branch_get_photos_entry (_tmp4_);
+ _tmp4_ = library_branch_get_photos_entry (_tmp3_);
#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = _tmp5_;
+ _tmp5_ = _tmp4_;
#line 1331 "/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));
+ _tmp6_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = _tmp7_;
+ _tmp7_ = _tmp6_;
#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_switch_to_page (self, _tmp8_);
+ library_window_switch_to_page (self, _tmp7_);
#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp8_);
-#line 8297 "LibraryWindow.c"
+ _g_object_unref0 (_tmp7_);
+#line 8484 "LibraryWindow.c"
}
#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = page;
-#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_remove_from_stack (self, _tmp9_);
+ library_window_remove_from_stack (self, page);
#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = self->priv->page_map;
+ _tmp8_ = self->priv->page_map;
#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = page;
+ _tmp9_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), page, NULL);
#line 1335 "/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 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- removed = _tmp12_;
+ removed = _tmp9_;
#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_vala_assert (removed, "removed");
-#line 8313 "LibraryWindow.c"
+#line 8496 "LibraryWindow.c"
}
-static void library_window_on_sidebar_entry_selected (LibraryWindow* self, SidebarSelectableEntry* selectable) {
+static void
+library_window_on_sidebar_entry_selected (LibraryWindow* self,
+ SidebarSelectableEntry* selectable)
+{
SidebarPageRepresentative* page_rep = NULL;
- SidebarSelectableEntry* _tmp0_;
+ SidebarPageRepresentative* _tmp0_;
SidebarPageRepresentative* _tmp1_;
- SidebarPageRepresentative* _tmp2_;
#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable));
#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = selectable;
-#line 1340 "/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);
+ _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (selectable, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) selectable) : NULL);
#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- page_rep = _tmp1_;
+ page_rep = _tmp0_;
#line 1341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = page_rep;
+ _tmp1_ = page_rep;
#line 1341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp2_ != NULL) {
-#line 8336 "LibraryWindow.c"
- SidebarPageRepresentative* _tmp3_;
+ if (_tmp1_ != NULL) {
+#line 8519 "LibraryWindow.c"
+ SidebarPageRepresentative* _tmp2_;
+ Page* _tmp3_;
Page* _tmp4_;
- Page* _tmp5_;
#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = page_rep;
+ _tmp2_ = page_rep;
#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = sidebar_page_representative_get_page (_tmp3_);
+ _tmp3_ = sidebar_page_representative_get_page (_tmp2_);
#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_switch_to_page (self, _tmp5_);
+ library_window_switch_to_page (self, _tmp4_);
#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp5_);
-#line 8350 "LibraryWindow.c"
+ _g_object_unref0 (_tmp4_);
+#line 8533 "LibraryWindow.c"
}
#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (page_rep);
-#line 8354 "LibraryWindow.c"
+#line 8537 "LibraryWindow.c"
}
-static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* self, SidebarSelectableEntry* selectable) {
+static void
+library_window_on_sidebar_selected_entry_removed (LibraryWindow* self,
+ SidebarSelectableEntry* selectable)
+{
LibraryLastImportSidebarEntry* last_import_entry = NULL;
LibraryBranch* _tmp0_;
LibraryLastImportSidebarEntry* _tmp1_;
LibraryLastImportSidebarEntry* _tmp2_;
LibraryLastImportSidebarEntry* _tmp3_;
gboolean _tmp4_ = FALSE;
- SidebarSelectableEntry* _tmp5_;
- gboolean _tmp12_ = FALSE;
- SidebarSelectableEntry* _tmp13_;
- gboolean _tmp21_ = FALSE;
- SidebarSelectableEntry* _tmp22_;
- LibraryBranch* _tmp30_;
- LibraryPhotosEntry* _tmp31_;
- LibraryPhotosEntry* _tmp32_;
- Page* _tmp33_;
- Page* _tmp34_;
+ gboolean _tmp11_ = FALSE;
+ gboolean _tmp18_ = FALSE;
+ LibraryBranch* _tmp25_;
+ LibraryPhotosEntry* _tmp26_;
+ LibraryPhotosEntry* _tmp27_;
+ Page* _tmp28_;
+ Page* _tmp29_;
#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8387,209 +8570,214 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel
#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
last_import_entry = _tmp3_;
#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = selectable;
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY)) {
-#line 8393 "LibraryWindow.c"
- LibraryLastImportSidebarEntry* _tmp6_;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (selectable, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY)) {
+#line 8574 "LibraryWindow.c"
+ LibraryLastImportSidebarEntry* _tmp5_;
+ gboolean _tmp6_;
gboolean _tmp7_;
- gboolean _tmp8_;
#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = last_import_entry;
+ _tmp5_ = last_import_entry;
#line 1352 "/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));
+ _tmp6_ = library_hideable_page_entry_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry));
#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = _tmp7_;
+ _tmp7_ = _tmp6_;
#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = _tmp8_;
-#line 8405 "LibraryWindow.c"
+ _tmp4_ = _tmp7_;
+#line 8586 "LibraryWindow.c"
} else {
#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp4_ = FALSE;
-#line 8409 "LibraryWindow.c"
+#line 8590 "LibraryWindow.c"
}
#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp4_) {
-#line 8413 "LibraryWindow.c"
- LibraryLastImportSidebarEntry* _tmp9_;
+#line 8594 "LibraryWindow.c"
+ LibraryLastImportSidebarEntry* _tmp8_;
+ Page* _tmp9_;
Page* _tmp10_;
- Page* _tmp11_;
#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = last_import_entry;
+ _tmp8_ = last_import_entry;
#line 1353 "/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));
+ _tmp9_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = _tmp10_;
+ _tmp10_ = _tmp9_;
#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_switch_to_page (self, _tmp11_);
+ library_window_switch_to_page (self, _tmp10_);
#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp11_);
+ _g_object_unref0 (_tmp10_);
#line 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (last_import_entry);
#line 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 8431 "LibraryWindow.c"
+#line 8612 "LibraryWindow.c"
}
#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = selectable;
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, EVENTS_TYPE_EVENT_ENTRY)) {
-#line 8437 "LibraryWindow.c"
- EventsBranch* _tmp14_;
- gboolean _tmp15_;
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = self->priv->events_branch;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (selectable, EVENTS_TYPE_EVENT_ENTRY)) {
+#line 8616 "LibraryWindow.c"
+ EventsBranch* _tmp12_;
#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp15_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+ _tmp12_ = self->priv->events_branch;
#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = _tmp15_;
-#line 8446 "LibraryWindow.c"
+ _tmp11_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+#line 8622 "LibraryWindow.c"
} else {
#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = FALSE;
-#line 8450 "LibraryWindow.c"
+ _tmp11_ = FALSE;
+#line 8626 "LibraryWindow.c"
}
#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp12_) {
-#line 8454 "LibraryWindow.c"
- EventsBranch* _tmp16_;
- EventsMasterDirectoryEntry* _tmp17_;
- EventsMasterDirectoryEntry* _tmp18_;
- Page* _tmp19_;
- Page* _tmp20_;
+ if (_tmp11_) {
+#line 8630 "LibraryWindow.c"
+ EventsBranch* _tmp13_;
+ EventsMasterDirectoryEntry* _tmp14_;
+ EventsMasterDirectoryEntry* _tmp15_;
+ Page* _tmp16_;
+ Page* _tmp17_;
#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp16_ = self->priv->events_branch;
+ _tmp13_ = self->priv->events_branch;
#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp17_ = events_branch_get_master_entry (_tmp16_);
+ _tmp14_ = events_branch_get_master_entry (_tmp13_);
#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp18_ = _tmp17_;
+ _tmp15_ = _tmp14_;
#line 1360 "/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));
+ _tmp16_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp20_ = _tmp19_;
+ _tmp17_ = _tmp16_;
#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_switch_to_page (self, _tmp20_);
+ library_window_switch_to_page (self, _tmp17_);
#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp20_);
+ _g_object_unref0 (_tmp17_);
#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp18_);
+ _g_object_unref0 (_tmp15_);
#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (last_import_entry);
#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 8480 "LibraryWindow.c"
+#line 8656 "LibraryWindow.c"
}
#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp22_ = selectable;
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, EVENTS_TYPE_DIRECTORY_ENTRY)) {
-#line 8486 "LibraryWindow.c"
- EventsBranch* _tmp23_;
- gboolean _tmp24_;
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp23_ = self->priv->events_branch;
+ if (G_TYPE_CHECK_INSTANCE_TYPE (selectable, EVENTS_TYPE_DIRECTORY_ENTRY)) {
+#line 8660 "LibraryWindow.c"
+ EventsBranch* _tmp19_;
#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp24_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+ _tmp19_ = self->priv->events_branch;
#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp21_ = _tmp24_;
-#line 8495 "LibraryWindow.c"
+ _tmp18_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+#line 8666 "LibraryWindow.c"
} else {
#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp21_ = FALSE;
-#line 8499 "LibraryWindow.c"
+ _tmp18_ = FALSE;
+#line 8670 "LibraryWindow.c"
}
#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp21_) {
-#line 8503 "LibraryWindow.c"
- EventsBranch* _tmp25_;
- EventsMasterDirectoryEntry* _tmp26_;
- EventsMasterDirectoryEntry* _tmp27_;
- Page* _tmp28_;
- Page* _tmp29_;
+ if (_tmp18_) {
+#line 8674 "LibraryWindow.c"
+ EventsBranch* _tmp20_;
+ EventsMasterDirectoryEntry* _tmp21_;
+ EventsMasterDirectoryEntry* _tmp22_;
+ Page* _tmp23_;
+ Page* _tmp24_;
#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp25_ = self->priv->events_branch;
+ _tmp20_ = self->priv->events_branch;
#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp26_ = events_branch_get_master_entry (_tmp25_);
+ _tmp21_ = events_branch_get_master_entry (_tmp20_);
#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp27_ = _tmp26_;
+ _tmp22_ = _tmp21_;
#line 1367 "/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));
+ _tmp23_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp29_ = _tmp28_;
+ _tmp24_ = _tmp23_;
#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_switch_to_page (self, _tmp29_);
+ library_window_switch_to_page (self, _tmp24_);
#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp29_);
+ _g_object_unref0 (_tmp24_);
#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp27_);
+ _g_object_unref0 (_tmp22_);
#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (last_import_entry);
#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 8529 "LibraryWindow.c"
+#line 8700 "LibraryWindow.c"
}
#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp30_ = self->priv->library_branch;
+ _tmp25_ = self->priv->library_branch;
#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp31_ = library_branch_get_photos_entry (_tmp30_);
+ _tmp26_ = library_branch_get_photos_entry (_tmp25_);
#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp32_ = _tmp31_;
+ _tmp27_ = _tmp26_;
#line 1373 "/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));
+ _tmp28_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp34_ = _tmp33_;
+ _tmp29_ = _tmp28_;
#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_switch_to_page (self, _tmp34_);
+ library_window_switch_to_page (self, _tmp29_);
#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp34_);
+ _g_object_unref0 (_tmp29_);
#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (last_import_entry);
-#line 8547 "LibraryWindow.c"
+#line 8718 "LibraryWindow.c"
}
-static void _library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
+static void
+_library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender,
+ GeeIterable* changed,
+ gpointer self)
+{
#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_update_properties ((LibraryWindow*) self);
-#line 8554 "LibraryWindow.c"
+#line 8729 "LibraryWindow.c"
}
-static void _library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
+static void
+_library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender,
+ GeeMap* items,
+ gpointer self)
+{
#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_update_properties ((LibraryWindow*) self);
-#line 8561 "LibraryWindow.c"
+#line 8740 "LibraryWindow.c"
}
-static void _library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
+static void
+_library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender,
+ GeeIterable* added,
+ GeeIterable* removed,
+ gpointer self)
+{
#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_update_properties ((LibraryWindow*) self);
-#line 8568 "LibraryWindow.c"
+#line 8752 "LibraryWindow.c"
}
-static void _library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
+static void
+_library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender,
+ GeeCollection* changed,
+ gpointer self)
+{
#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_update_properties ((LibraryWindow*) self);
-#line 8575 "LibraryWindow.c"
+#line 8763 "LibraryWindow.c"
}
-static void library_window_subscribe_for_basic_information (LibraryWindow* self, Page* page) {
+static void
+library_window_subscribe_for_basic_information (LibraryWindow* self,
+ Page* page)
+{
ViewCollection* view = NULL;
- Page* _tmp0_;
- ViewCollection* _tmp1_;
+ ViewCollection* _tmp0_;
#line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_PAGE (page));
#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = page;
+ _tmp0_ = page_get_view (page);
#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = page_get_view (_tmp0_);
-#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- view = _tmp1_;
+ view = _tmp0_;
#line 1379 "/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 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8600,51 +8788,53 @@ static void library_window_subscribe_for_basic_information (LibraryWindow* self,
g_signal_connect_object (view, "items-visibility-changed", (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self, 0);
#line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (view);
-#line 8603 "LibraryWindow.c"
+#line 8791 "LibraryWindow.c"
}
-static void library_window_unsubscribe_from_basic_information (LibraryWindow* self, Page* page) {
+static void
+library_window_unsubscribe_from_basic_information (LibraryWindow* self,
+ Page* page)
+{
ViewCollection* view = NULL;
- Page* _tmp0_;
- ViewCollection* _tmp1_;
+ ViewCollection* _tmp0_;
+ guint _tmp1_;
guint _tmp2_;
guint _tmp3_;
guint _tmp4_;
- guint _tmp5_;
#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_PAGE (page));
#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = page;
-#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = page_get_view (_tmp0_);
+ _tmp0_ = page_get_view (page);
#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- view = _tmp1_;
+ view = _tmp0_;
#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp2_, NULL, FALSE);
+ g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp1_, NULL, FALSE);
#line 1388 "/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);
+ g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self);
#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE);
+ g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp2_, NULL, FALSE);
#line 1389 "/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);
+ 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, _tmp2_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_items_altered, self);
#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE);
+ g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE);
#line 1390 "/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);
+ 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_contents_altered, self);
#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE);
+ g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp4_, NULL, FALSE);
#line 1391 "/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);
+ g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self);
#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (view);
-#line 8643 "LibraryWindow.c"
+#line 8831 "LibraryWindow.c"
}
-static void library_window_on_update_properties (LibraryWindow* self) {
+static void
+library_window_on_update_properties (LibraryWindow* self)
+{
OneShotScheduler* _tmp0_;
#line 1394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
@@ -8652,11 +8842,13 @@ static void library_window_on_update_properties (LibraryWindow* self) {
_tmp0_ = self->priv->properties_scheduler;
#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
one_shot_scheduler_at_idle (_tmp0_);
-#line 8655 "LibraryWindow.c"
+#line 8845 "LibraryWindow.c"
}
-static void library_window_on_update_properties_now (LibraryWindow* self) {
+static void
+library_window_on_update_properties_now (LibraryWindow* self)
+{
GtkFrame* _tmp0_;
gboolean _tmp1_;
gboolean _tmp2_;
@@ -8673,7 +8865,7 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
_tmp2_ = _tmp1_;
#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp2_) {
-#line 8676 "LibraryWindow.c"
+#line 8868 "LibraryWindow.c"
BasicProperties* _tmp3_;
Page* _tmp4_;
Page* _tmp5_;
@@ -8687,7 +8879,7 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_);
#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_tmp5_);
-#line 8690 "LibraryWindow.c"
+#line 8882 "LibraryWindow.c"
}
#line 1402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp6_ = self->priv->extended_properties;
@@ -8697,7 +8889,7 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
_tmp8_ = _tmp7_;
#line 1402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp8_) {
-#line 8700 "LibraryWindow.c"
+#line 8892 "LibraryWindow.c"
ExtendedPropertiesWindow* _tmp9_;
Page* _tmp10_;
Page* _tmp11_;
@@ -8711,263 +8903,237 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
extended_properties_window_update_properties (_tmp9_, _tmp11_);
#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_tmp11_);
-#line 8714 "LibraryWindow.c"
+#line 8906 "LibraryWindow.c"
}
}
-static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
+static gchar*
+string_replace (const gchar* self,
+ const gchar* old,
+ const gchar* replacement)
+{
gchar* result = NULL;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
GError * _inner_error_ = NULL;
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if ((*((gchar*) self)) == '\0') {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp1_ = TRUE;
-#line 8734 "LibraryWindow.c"
+#line 8930 "LibraryWindow.c"
} else {
- const gchar* _tmp2_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 8741 "LibraryWindow.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = (*((gchar*) old)) == '\0';
+#line 8934 "LibraryWindow.c"
}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp1_) {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = TRUE;
-#line 8747 "LibraryWindow.c"
+#line 8940 "LibraryWindow.c"
} else {
- const gchar* _tmp3_;
- const gchar* _tmp4_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = replacement;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 8757 "LibraryWindow.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = g_strcmp0 (old, replacement) == 0;
+#line 8944 "LibraryWindow.c"
}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 8761 "LibraryWindow.c"
- gchar* _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = g_strdup (self);
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 8948 "LibraryWindow.c"
+ gchar* _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = g_strdup (self);
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 8769 "LibraryWindow.c"
+#line 8956 "LibraryWindow.c"
}
{
GRegex* regex = NULL;
- const gchar* _tmp6_;
- gchar* _tmp7_;
- gchar* _tmp8_;
- GRegex* _tmp9_;
- GRegex* _tmp10_;
- gchar* _tmp11_ = NULL;
- GRegex* _tmp12_;
- const gchar* _tmp13_;
- gchar* _tmp14_;
- gchar* _tmp15_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = old;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = g_regex_escape_string (_tmp6_, -1);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = _tmp7_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = _tmp9_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _g_free0 (_tmp8_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- regex = _tmp10_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ GRegex* _tmp5_;
+ GRegex* _tmp6_;
+ gchar* _tmp7_ = NULL;
+ GRegex* _tmp8_;
+ gchar* _tmp9_;
+ gchar* _tmp10_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = g_regex_escape_string (old, -1);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = _tmp3_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = _tmp5_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _g_free0 (_tmp4_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ regex = _tmp6_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 8801 "LibraryWindow.c"
+#line 8984 "LibraryWindow.c"
goto __catch48_g_regex_error;
}
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/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 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return NULL;
-#line 8810 "LibraryWindow.c"
+#line 8993 "LibraryWindow.c"
}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = regex;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = replacement;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = _tmp14_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp8_ = regex;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = _tmp9_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 8826 "LibraryWindow.c"
+#line 9007 "LibraryWindow.c"
goto __catch48_g_regex_error;
}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/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 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return NULL;
-#line 8837 "LibraryWindow.c"
+#line 9018 "LibraryWindow.c"
}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = _tmp11_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = NULL;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp15_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _g_free0 (_tmp11_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp10_ = _tmp7_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = NULL;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp10_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _g_free0 (_tmp7_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 8851 "LibraryWindow.c"
+#line 9032 "LibraryWindow.c"
}
goto __finally48;
__catch48_g_regex_error:
{
GError* e = NULL;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_g_error_free0 (e);
-#line 8865 "LibraryWindow.c"
+#line 9046 "LibraryWindow.c"
}
__finally48:
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/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 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return NULL;
-#line 8876 "LibraryWindow.c"
+#line 9057 "LibraryWindow.c"
}
}
-void library_window_mounted_camera_shell_notification (LibraryWindow* self, const gchar* uri, gboolean at_startup) {
- const gchar* _tmp0_;
- const gchar* _tmp1_;
- gboolean _tmp2_;
+void
+library_window_mounted_camera_shell_notification (LibraryWindow* self,
+ const gchar* uri,
+ gboolean at_startup)
+{
GFile* uri_file = NULL;
- const gchar* _tmp4_;
- GFile* _tmp5_;
+ GFile* _tmp0_;
GMount* mount = NULL;
gchar* alt_uri = NULL;
- const gchar* _tmp12_;
- gboolean _tmp13_;
- gboolean _tmp18_;
GError * _inner_error_ = NULL;
#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (IS_LIBRARY_WINDOW (self));
#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (uri != NULL);
#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = uri;
-#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_debug ("LibraryWindow.vala:1407: mount point reported: %s", _tmp0_);
-#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = uri;
-#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = library_window_is_mount_uri_supported (_tmp1_);
+ g_debug ("LibraryWindow.vala:1407: mount point reported: %s", uri);
#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (!_tmp2_) {
-#line 8908 "LibraryWindow.c"
- const gchar* _tmp3_;
+ if (!library_window_is_mount_uri_supported (uri)) {
#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = uri;
-#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_debug ("LibraryWindow.vala:1411: Unsupported mount scheme: %s", _tmp3_);
+ g_debug ("LibraryWindow.vala:1411: Unsupported mount scheme: %s", uri);
#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 8916 "LibraryWindow.c"
+#line 9084 "LibraryWindow.c"
}
#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = uri;
-#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = g_file_new_for_uri (_tmp4_);
+ _tmp0_ = g_file_new_for_uri (uri);
#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- uri_file = _tmp5_;
+ uri_file = _tmp0_;
#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
mount = NULL;
-#line 8926 "LibraryWindow.c"
+#line 9092 "LibraryWindow.c"
{
- GMount* _tmp6_ = NULL;
- GFile* _tmp7_;
- GMount* _tmp8_;
- GMount* _tmp9_;
+ GMount* _tmp1_ = NULL;
+ GFile* _tmp2_;
+ GMount* _tmp3_;
+ GMount* _tmp4_;
#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = uri_file;
+ _tmp2_ = uri_file;
#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = g_file_find_enclosing_mount (_tmp7_, NULL, &_inner_error_);
+ _tmp3_ = g_file_find_enclosing_mount (_tmp2_, NULL, &_inner_error_);
#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = _tmp8_;
+ _tmp1_ = _tmp3_;
#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8940 "LibraryWindow.c"
+#line 9106 "LibraryWindow.c"
goto __catch47_g_error;
}
#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = _tmp6_;
+ _tmp4_ = _tmp1_;
#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = NULL;
+ _tmp1_ = NULL;
#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (mount);
#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- mount = _tmp9_;
+ mount = _tmp4_;
#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp6_);
-#line 8953 "LibraryWindow.c"
+ _g_object_unref0 (_tmp1_);
+#line 9119 "LibraryWindow.c"
}
goto __finally47;
__catch47_g_error:
{
GError* err = NULL;
- GError* _tmp10_;
- const gchar* _tmp11_;
+ GError* _tmp5_;
+ const gchar* _tmp6_;
#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
err = _inner_error_;
#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_inner_error_ = NULL;
#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp10_ = err;
+ _tmp5_ = err;
#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = _tmp10_->message;
+ _tmp6_ = _tmp5_->message;
#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_debug ("LibraryWindow.vala:1423: %s", _tmp11_);
+ g_debug ("LibraryWindow.vala:1423: %s", _tmp6_);
#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_error_free0 (err);
#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8976,7 +9142,7 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
_g_object_unref0 (uri_file);
#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 8979 "LibraryWindow.c"
+#line 9145 "LibraryWindow.c"
}
__finally47:
#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8991,79 +9157,58 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
g_clear_error (&_inner_error_);
#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return;
-#line 8994 "LibraryWindow.c"
+#line 9160 "LibraryWindow.c"
}
#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
alt_uri = NULL;
#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp12_ = uri;
-#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = g_str_has_prefix (_tmp12_, "file://");
-#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp13_) {
-#line 9004 "LibraryWindow.c"
- const gchar* _tmp14_;
- gchar* _tmp15_;
- gchar* _tmp16_;
- gchar* _tmp17_;
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = uri;
+ if (g_str_has_prefix (uri, "file://")) {
+#line 9166 "LibraryWindow.c"
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp15_ = string_replace (_tmp14_, "file://", "disk:");
+ _tmp7_ = string_replace (uri, "file://", "disk:");
#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp16_ = _tmp15_;
+ _tmp8_ = _tmp7_;
#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp17_ = camera_table_get_port_uri (_tmp16_);
+ _tmp9_ = camera_table_get_port_uri (_tmp8_);
#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_free0 (alt_uri);
#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- alt_uri = _tmp17_;
+ alt_uri = _tmp9_;
#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_free0 (_tmp16_);
-#line 9023 "LibraryWindow.c"
+ _g_free0 (_tmp8_);
+#line 9182 "LibraryWindow.c"
}
#line 1434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp18_ = at_startup;
-#line 1434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp18_) {
-#line 9029 "LibraryWindow.c"
- const gchar* _tmp19_;
- gboolean _tmp20_;
- const gchar* _tmp23_;
- gboolean _tmp24_;
-#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp19_ = uri;
-#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp20_ = is_string_empty (_tmp19_);
+ if (at_startup) {
+#line 9186 "LibraryWindow.c"
+ const gchar* _tmp11_;
#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (!_tmp20_) {
-#line 9040 "LibraryWindow.c"
- GeeHashSet* _tmp21_;
- const gchar* _tmp22_;
-#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp21_ = library_window_initial_camera_uris;
+ if (!is_string_empty (uri)) {
+#line 9190 "LibraryWindow.c"
+ GeeHashSet* _tmp10_;
#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp22_ = uri;
+ _tmp10_ = library_window_initial_camera_uris;
#line 1436 "/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 9049 "LibraryWindow.c"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), uri);
+#line 9196 "LibraryWindow.c"
}
#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp23_ = alt_uri;
+ _tmp11_ = alt_uri;
#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp24_ = is_string_empty (_tmp23_);
-#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (!_tmp24_) {
-#line 9057 "LibraryWindow.c"
- GeeHashSet* _tmp25_;
- const gchar* _tmp26_;
+ if (!is_string_empty (_tmp11_)) {
+#line 9202 "LibraryWindow.c"
+ GeeHashSet* _tmp12_;
+ const gchar* _tmp13_;
#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp25_ = library_window_initial_camera_uris;
+ _tmp12_ = library_window_initial_camera_uris;
#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp26_ = alt_uri;
+ _tmp13_ = alt_uri;
#line 1439 "/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 9066 "LibraryWindow.c"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
+#line 9211 "LibraryWindow.c"
}
}
#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9072,11 +9217,14 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
_g_object_unref0 (mount);
#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (uri_file);
-#line 9075 "LibraryWindow.c"
+#line 9220 "LibraryWindow.c"
}
-static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
+static gboolean
+library_window_real_key_press_event (GtkWidget* base,
+ GdkEventKey* event)
+{
LibraryWindow * self;
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
@@ -9084,11 +9232,8 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe
SidebarTree* _tmp2_;
gboolean _tmp3_;
gboolean _tmp4_;
- GdkEventKey* _tmp11_;
- gboolean _tmp12_;
- GdkEventKey* _tmp13_;
- guint _tmp14_;
- const gchar* _tmp15_;
+ guint _tmp8_;
+ const gchar* _tmp9_;
#line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
#line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9101,43 +9246,34 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe
_tmp4_ = _tmp3_;
#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp4_) {
-#line 9104 "LibraryWindow.c"
+#line 9249 "LibraryWindow.c"
SidebarTree* _tmp5_;
- GdkEventKey* _tmp6_;
- gboolean _tmp7_;
#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp5_ = self->priv->sidebar_tree;
#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp6_ = event;
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp7_ = sidebar_tree_is_keypress_interpreted (_tmp5_, _tmp6_);
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = _tmp7_;
-#line 9116 "LibraryWindow.c"
+ _tmp1_ = sidebar_tree_is_keypress_interpreted (_tmp5_, event);
+#line 9255 "LibraryWindow.c"
} else {
#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp1_ = FALSE;
-#line 9120 "LibraryWindow.c"
+#line 9259 "LibraryWindow.c"
}
#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp1_) {
-#line 9124 "LibraryWindow.c"
- SidebarTree* _tmp8_;
- GdkEventKey* _tmp9_;
- gboolean _tmp10_ = FALSE;
+#line 9263 "LibraryWindow.c"
+ SidebarTree* _tmp6_;
+ gboolean _tmp7_ = FALSE;
#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp8_ = self->priv->sidebar_tree;
+ _tmp6_ = self->priv->sidebar_tree;
#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp9_ = event;
+ g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), "key-press-event", event, &_tmp7_);
#line 1445 "/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 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = _tmp10_;
-#line 9136 "LibraryWindow.c"
+ _tmp0_ = _tmp7_;
+#line 9272 "LibraryWindow.c"
} else {
#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp0_ = FALSE;
-#line 9140 "LibraryWindow.c"
+#line 9276 "LibraryWindow.c"
}
#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
if (_tmp0_) {
@@ -9145,45 +9281,41 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe
result = TRUE;
#line 1446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 9148 "LibraryWindow.c"
+#line 9284 "LibraryWindow.c"
}
#line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp11_ = event;
-#line 1449 "/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 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp12_) {
+ if (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), event)) {
#line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = TRUE;
#line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 9160 "LibraryWindow.c"
+#line 9292 "LibraryWindow.c"
}
#line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp13_ = event;
-#line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp14_ = _tmp13_->keyval;
+ _tmp8_ = event->keyval;
#line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp15_ = gdk_keyval_name (_tmp14_);
+ _tmp9_ = gdk_keyval_name (_tmp8_);
#line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (g_strcmp0 (_tmp15_, "Escape") == 0) {
+ if (g_strcmp0 (_tmp9_, "Escape") == 0) {
#line 1453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_on_clear_search (self);
#line 1454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = TRUE;
#line 1454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 9176 "LibraryWindow.c"
+#line 9306 "LibraryWindow.c"
}
#line 1457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
result = FALSE;
#line 1457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return result;
-#line 9182 "LibraryWindow.c"
+#line 9312 "LibraryWindow.c"
}
-gint library_window_get_PAGE_MIN_WIDTH (void) {
+gint
+library_window_get_PAGE_MIN_WIDTH (void)
+{
gint result;
gint _tmp0_;
gint _tmp1_;
@@ -9195,25 +9327,29 @@ 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 9198 "LibraryWindow.c"
+#line 9330 "LibraryWindow.c"
}
-static gpointer _data_collection_ref0 (gpointer self) {
+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 9205 "LibraryWindow.c"
+#line 9339 "LibraryWindow.c"
}
-static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_construct (GType object_type, CollectionPage* collection, Photo* start, ViewCollection* view) {
+static LibraryWindowFullscreenPhotoPage*
+library_window_fullscreen_photo_page_construct (GType object_type,
+ CollectionPage* collection,
+ Photo* start,
+ ViewCollection* view)
+{
LibraryWindowFullscreenPhotoPage * self = NULL;
CollectionPage* _tmp0_;
- CollectionPage* _tmp1_;
- Photo* _tmp2_;
- Photo* _tmp3_;
- ViewCollection* _tmp4_;
- ViewCollection* _tmp5_;
+ Photo* _tmp1_;
+ ViewCollection* _tmp2_;
#line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_val_if_fail (IS_COLLECTION_PAGE (collection), NULL);
#line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9223,43 +9359,43 @@ static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_co
#line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self = (LibraryWindowFullscreenPhotoPage*) library_photo_page_construct (object_type);
#line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = collection;
-#line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (collection);
#line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (self->priv->collection);
#line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- self->priv->collection = _tmp1_;
+ self->priv->collection = _tmp0_;
#line 77 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp2_ = start;
-#line 77 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp3_ = _g_object_ref0 (_tmp2_);
+ _tmp1_ = _g_object_ref0 (start);
#line 77 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (self->priv->start);
#line 77 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- self->priv->start = _tmp3_;
+ self->priv->start = _tmp1_;
#line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp4_ = view;
-#line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp5_ = _data_collection_ref0 (_tmp4_);
+ _tmp2_ = _data_collection_ref0 (view);
#line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (self->priv->view);
#line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- self->priv->view = _tmp5_;
+ self->priv->view = _tmp2_;
#line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
return self;
-#line 9251 "LibraryWindow.c"
+#line 9381 "LibraryWindow.c"
}
-static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_new (CollectionPage* collection, Photo* start, ViewCollection* view) {
+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 9258 "LibraryWindow.c"
+#line 9392 "LibraryWindow.c"
}
-static void library_window_fullscreen_photo_page_real_switched_to (Page* base) {
+static void
+library_window_fullscreen_photo_page_real_switched_to (Page* base)
+{
LibraryWindowFullscreenPhotoPage * self;
CollectionPage* _tmp0_;
Photo* _tmp1_;
@@ -9276,34 +9412,38 @@ 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 9279 "LibraryWindow.c"
+#line 9415 "LibraryWindow.c"
}
-static void library_window_fullscreen_photo_page_real_switching_from (Page* base) {
+static void
+library_window_fullscreen_photo_page_real_switching_from (Page* base)
+{
LibraryWindowFullscreenPhotoPage * self;
#line 87 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage);
-#line 9287 "LibraryWindow.c"
+#line 9425 "LibraryWindow.c"
}
-static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
+static void
+library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base,
+ GeeList* ui_filenames)
+{
LibraryWindowFullscreenPhotoPage * self;
- GeeList* _tmp0_;
#line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage);
#line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
g_return_if_fail (GEE_IS_LIST (ui_filenames));
#line 93 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp0_ = ui_filenames;
-#line 93 "/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 9302 "LibraryWindow.c"
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui");
+#line 9440 "LibraryWindow.c"
}
-static void library_window_fullscreen_photo_page_class_init (LibraryWindowFullscreenPhotoPageClass * klass) {
+static void
+library_window_fullscreen_photo_page_class_init (LibraryWindowFullscreenPhotoPageClass * klass)
+{
#line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_fullscreen_photo_page_parent_class = g_type_class_peek_parent (klass);
#line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9316,18 +9456,22 @@ static void library_window_fullscreen_photo_page_class_init (LibraryWindowFullsc
((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) 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 9319 "LibraryWindow.c"
+#line 9459 "LibraryWindow.c"
}
-static void library_window_fullscreen_photo_page_instance_init (LibraryWindowFullscreenPhotoPage * self) {
+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 9326 "LibraryWindow.c"
+#line 9468 "LibraryWindow.c"
}
-static void library_window_fullscreen_photo_page_finalize (GObject * obj) {
+static void
+library_window_fullscreen_photo_page_finalize (GObject * obj)
+{
LibraryWindowFullscreenPhotoPage * self;
#line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage);
@@ -9339,11 +9483,13 @@ 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 9342 "LibraryWindow.c"
+#line 9486 "LibraryWindow.c"
}
-static GType library_window_fullscreen_photo_page_get_type (void) {
+static GType
+library_window_fullscreen_photo_page_get_type (void)
+{
static volatile gsize library_window_fullscreen_photo_page_type_id__volatile = 0;
if (g_once_init_enter (&library_window_fullscreen_photo_page_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (LibraryWindowFullscreenPhotoPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_window_fullscreen_photo_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryWindowFullscreenPhotoPage), 0, (GInstanceInitFunc) library_window_fullscreen_photo_page_instance_init, NULL };
@@ -9355,7 +9501,9 @@ static GType library_window_fullscreen_photo_page_get_type (void) {
}
-static void library_window_class_init (LibraryWindowClass * klass) {
+static void
+library_window_class_init (LibraryWindowClass * klass)
+{
GeeHashSet* _tmp0_;
#line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_parent_class = g_type_class_peek_parent (klass);
@@ -9393,11 +9541,13 @@ static void library_window_class_init (LibraryWindowClass * klass) {
_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
#line 122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
library_window_initial_camera_uris = _tmp0_;
-#line 9396 "LibraryWindow.c"
+#line 9544 "LibraryWindow.c"
}
-static void library_window_instance_init (LibraryWindow * self) {
+static void
+library_window_instance_init (LibraryWindow * self)
+{
const gchar* _tmp0_;
gchar* _tmp1_;
GtkPaned* _tmp2_;
@@ -9536,11 +9686,13 @@ static void library_window_instance_init (LibraryWindow * self) {
self->priv->current_progress_priority = 0;
#line 146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self->priv->background_progress_pulse_id = (guint) 0;
-#line 9539 "LibraryWindow.c"
+#line 9689 "LibraryWindow.c"
}
-static void library_window_finalize (GObject * obj) {
+static void
+library_window_finalize (GObject * obj)
+{
LibraryWindow * self;
SidebarTree* _tmp0_;
guint _tmp1_;
@@ -9556,24 +9708,24 @@ static void library_window_finalize (GObject * obj) {
guint _tmp11_;
ExtendedPropertiesWindow* _tmp12_;
guint _tmp13_;
+ MetadataWriter* _tmp27_;
MetadataWriter* _tmp28_;
- MetadataWriter* _tmp29_;
- guint _tmp30_;
+ guint _tmp29_;
LibraryMonitor* monitor = NULL;
+ LibraryMonitorPool* _tmp30_;
LibraryMonitorPool* _tmp31_;
- LibraryMonitorPool* _tmp32_;
+ LibraryMonitor* _tmp32_;
LibraryMonitor* _tmp33_;
LibraryMonitor* _tmp34_;
- LibraryMonitor* _tmp35_;
+ LibraryMonitorPool* _tmp36_;
LibraryMonitorPool* _tmp37_;
- LibraryMonitorPool* _tmp38_;
- guint _tmp39_;
+ guint _tmp38_;
+ LibraryMonitorPool* _tmp39_;
LibraryMonitorPool* _tmp40_;
- LibraryMonitorPool* _tmp41_;
- guint _tmp42_;
+ guint _tmp41_;
+ CameraTable* _tmp42_;
CameraTable* _tmp43_;
- CameraTable* _tmp44_;
- guint _tmp45_;
+ guint _tmp44_;
#line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_WINDOW, LibraryWindow);
#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9620,7 +9772,7 @@ static void library_window_finalize (GObject * obj) {
g_signal_parse_name ("show", gtk_widget_get_type (), &_tmp13_, NULL, FALSE);
#line 231 "/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 9623 "LibraryWindow.c"
+#line 9775 "LibraryWindow.c"
{
GeeIterator* _media_sources_it = NULL;
MediaCollectionRegistry* _tmp14_;
@@ -9649,116 +9801,113 @@ static void library_window_finalize (GObject * obj) {
_media_sources_it = _tmp19_;
#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
while (TRUE) {
-#line 9652 "LibraryWindow.c"
+#line 9804 "LibraryWindow.c"
GeeIterator* _tmp20_;
- gboolean _tmp21_;
MediaSourceCollection* media_sources = NULL;
- GeeIterator* _tmp22_;
- gpointer _tmp23_;
- MediaSourceCollection* _tmp24_;
- guint _tmp25_;
- MediaSourceCollection* _tmp26_;
- guint _tmp27_;
+ GeeIterator* _tmp21_;
+ gpointer _tmp22_;
+ MediaSourceCollection* _tmp23_;
+ guint _tmp24_;
+ MediaSourceCollection* _tmp25_;
+ guint _tmp26_;
#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_tmp20_ = _media_sources_it;
#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp21_ = gee_iterator_next (_tmp20_);
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (!_tmp21_) {
+ if (!gee_iterator_next (_tmp20_)) {
#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
break;
-#line 9670 "LibraryWindow.c"
+#line 9819 "LibraryWindow.c"
}
#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp22_ = _media_sources_it;
+ _tmp21_ = _media_sources_it;
#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp23_ = gee_iterator_get (_tmp22_);
+ _tmp22_ = gee_iterator_get (_tmp21_);
#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- media_sources = (MediaSourceCollection*) _tmp23_;
+ media_sources = (MediaSourceCollection*) _tmp22_;
#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp24_ = media_sources;
+ _tmp23_ = media_sources;
#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp25_, NULL, FALSE);
+ g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp24_, NULL, FALSE);
#line 234 "/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);
+ g_signal_handlers_disconnect_matched (_tmp23_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp24_, 0, NULL, (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self);
#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp26_ = media_sources;
+ _tmp25_ = media_sources;
#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp27_, NULL, FALSE);
+ g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp26_, NULL, FALSE);
#line 235 "/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);
+ g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _library_window_on_media_altered_data_collection_items_altered, self);
#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_data_collection_unref0 (media_sources);
-#line 9692 "LibraryWindow.c"
+#line 9841 "LibraryWindow.c"
}
#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (_media_sources_it);
-#line 9696 "LibraryWindow.c"
+#line 9845 "LibraryWindow.c"
}
#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp28_ = metadata_writer_get_instance ();
+ _tmp27_ = metadata_writer_get_instance ();
#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp29_ = _tmp28_;
+ _tmp28_ = _tmp27_;
#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_parse_name ("progress", TYPE_METADATA_WRITER, &_tmp30_, NULL, FALSE);
+ g_signal_parse_name ("progress", TYPE_METADATA_WRITER, &_tmp29_, NULL, FALSE);
#line 238 "/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);
+ g_signal_handlers_disconnect_matched (_tmp28_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp29_, 0, NULL, (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self);
#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _g_object_unref0 (_tmp29_);
+ _g_object_unref0 (_tmp28_);
#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp31_ = library_monitor_pool_get_instance ();
+ _tmp30_ = library_monitor_pool_get_instance ();
#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp32_ = _tmp31_;
+ _tmp31_ = _tmp30_;
#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp33_ = library_monitor_pool_get_monitor (_tmp32_);
+ _tmp32_ = library_monitor_pool_get_monitor (_tmp31_);
#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp34_ = _tmp33_;
+ _tmp33_ = _tmp32_;
#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _library_monitor_pool_unref0 (_tmp32_);
+ _library_monitor_pool_unref0 (_tmp31_);
#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- monitor = _tmp34_;
+ monitor = _tmp33_;
#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp35_ = monitor;
+ _tmp34_ = monitor;
#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- if (_tmp35_ != NULL) {
-#line 9724 "LibraryWindow.c"
- LibraryMonitor* _tmp36_;
+ if (_tmp34_ != NULL) {
+#line 9873 "LibraryWindow.c"
+ LibraryMonitor* _tmp35_;
#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp36_ = monitor;
+ _tmp35_ = monitor;
#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- library_window_on_library_monitor_destroyed (self, _tmp36_);
-#line 9730 "LibraryWindow.c"
+ library_window_on_library_monitor_destroyed (self, _tmp35_);
+#line 9879 "LibraryWindow.c"
}
#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp37_ = library_monitor_pool_get_instance ();
+ _tmp36_ = library_monitor_pool_get_instance ();
#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp38_ = _tmp37_;
+ _tmp37_ = _tmp36_;
#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_parse_name ("monitor-installed", TYPE_LIBRARY_MONITOR_POOL, &_tmp39_, NULL, FALSE);
+ g_signal_parse_name ("monitor-installed", TYPE_LIBRARY_MONITOR_POOL, &_tmp38_, NULL, FALSE);
#line 244 "/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);
+ g_signal_handlers_disconnect_matched (_tmp37_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp38_, 0, NULL, (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self);
#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _library_monitor_pool_unref0 (_tmp38_);
+ _library_monitor_pool_unref0 (_tmp37_);
#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp40_ = library_monitor_pool_get_instance ();
+ _tmp39_ = library_monitor_pool_get_instance ();
#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp41_ = _tmp40_;
+ _tmp40_ = _tmp39_;
#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_parse_name ("monitor-destroyed", TYPE_LIBRARY_MONITOR_POOL, &_tmp42_, NULL, FALSE);
+ g_signal_parse_name ("monitor-destroyed", TYPE_LIBRARY_MONITOR_POOL, &_tmp41_, NULL, FALSE);
#line 245 "/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);
+ g_signal_handlers_disconnect_matched (_tmp40_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp41_, 0, NULL, (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self);
#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _library_monitor_pool_unref0 (_tmp41_);
+ _library_monitor_pool_unref0 (_tmp40_);
#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp43_ = camera_table_get_instance ();
+ _tmp42_ = camera_table_get_instance ();
#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _tmp44_ = _tmp43_;
+ _tmp43_ = _tmp42_;
#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- g_signal_parse_name ("camera-added", TYPE_CAMERA_TABLE, &_tmp45_, NULL, FALSE);
+ g_signal_parse_name ("camera-added", TYPE_CAMERA_TABLE, &_tmp44_, NULL, FALSE);
#line 247 "/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);
+ g_signal_handlers_disconnect_matched (_tmp43_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp44_, 0, NULL, (GCallback) _library_window_on_camera_added_camera_table_camera_added, self);
#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
- _camera_table_unref0 (_tmp44_);
+ _camera_table_unref0 (_tmp43_);
#line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
_g_object_unref0 (monitor);
#line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9813,11 +9962,13 @@ static void library_window_finalize (GObject * obj) {
_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 9816 "LibraryWindow.c"
+#line 9965 "LibraryWindow.c"
}
-GType library_window_get_type (void) {
+GType
+library_window_get_type (void)
+{
static volatile gsize library_window_type_id__volatile = 0;
if (g_once_init_enter (&library_window_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (LibraryWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryWindow), 0, (GInstanceInitFunc) library_window_instance_init, NULL };
@@ -9829,23 +9980,32 @@ GType library_window_get_type (void) {
}
-static void _vala_library_window_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+static void
+_vala_library_window_get_property (GObject * object,
+ guint property_id,
+ GValue * value,
+ GParamSpec * pspec)
+{
LibraryWindow * self;
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 9837 "LibraryWindow.c"
+#line 9993 "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 9843 "LibraryWindow.c"
+#line 9999 "LibraryWindow.c"
}
}
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
if ((array != NULL) && (destroy_func != NULL)) {
int i;
for (i = 0; i < array_length; i = i + 1) {
@@ -9857,13 +10017,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
}
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
_vala_array_destroy (array, array_length, destroy_func);
g_free (array);
}
-static gint _vala_array_length (gpointer array) {
+static gint
+_vala_array_length (gpointer array)
+{
int length;
length = 0;
if (array) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 07:01:07 +0000