summaryrefslogtreecommitdiff
path: root/src/CollectionPage.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/CollectionPage.c')
-rw-r--r--src/CollectionPage.c4216
1 files changed, 2257 insertions, 1959 deletions
diff --git a/src/CollectionPage.c b/src/CollectionPage.c
index 01e92e8..6086969 100644
--- a/src/CollectionPage.c
+++ b/src/CollectionPage.c
@@ -1,4 +1,4 @@
-/* CollectionPage.c generated by valac 0.36.6, the Vala compiler
+/* CollectionPage.c generated by valac 0.40.4, the Vala compiler
* generated from CollectionPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
* See the COPYING file in this distribution.
*/
+
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -247,6 +248,11 @@ typedef struct _DefaultSearchViewFilterClass DefaultSearchViewFilterClass;
typedef struct _CollectionPageCollectionSearchViewFilter CollectionPageCollectionSearchViewFilter;
typedef struct _CollectionPageCollectionSearchViewFilterClass CollectionPageCollectionSearchViewFilterClass;
+enum {
+ COLLECTION_PAGE_0_PROPERTY,
+ COLLECTION_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* collection_page_properties[COLLECTION_PAGE_NUM_PROPERTIES];
#define _exporter_ui_unref0(var) ((var == NULL) ? NULL : (var = (exporter_ui_unref (var), NULL)))
#define _view_filter_unref0(var) ((var == NULL) ? NULL : (var = (view_filter_unref (var), NULL)))
@@ -1004,9 +1010,15 @@ static gpointer collection_page_collection_search_view_filter_parent_class = NUL
gpointer view_manager_ref (gpointer instance);
void view_manager_unref (gpointer instance);
-GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_view_manager (GValue* value, gpointer v_object);
-void value_take_view_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_view_manager (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_view_manager (GValue* value,
+ gpointer v_object);
+void value_take_view_manager (GValue* value,
+ gpointer v_object);
gpointer value_get_view_manager (const GValue* value);
GType view_manager_get_type (void) G_GNUC_CONST;
GType data_object_get_type (void) G_GNUC_CONST;
@@ -1018,22 +1030,28 @@ GType checkerboard_page_get_type (void) G_GNUC_CONST;
GType media_page_get_type (void) G_GNUC_CONST;
GType collection_page_get_type (void) G_GNUC_CONST;
#define COLLECTION_VIEW_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManagerPrivate))
-enum {
- COLLECTION_VIEW_MANAGER_DUMMY_PROPERTY
-};
CollectionViewManager* collection_view_manager_new (CollectionPage* page);
-CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page);
+CollectionViewManager* collection_view_manager_construct (GType object_type,
+ CollectionPage* page);
ViewManager* view_manager_construct (GType object_type);
-static DataView* collection_view_manager_real_create_view (ViewManager* base, DataSource* source);
-DataView* media_page_create_thumbnail (MediaPage* self, DataSource* source);
+static DataView* collection_view_manager_real_create_view (ViewManager* base,
+ DataSource* source);
+DataView* media_page_create_thumbnail (MediaPage* self,
+ DataSource* source);
static void collection_view_manager_finalize (ViewManager * obj);
GType page_window_get_type (void) G_GNUC_CONST;
GType fullscreen_window_get_type (void) G_GNUC_CONST;
gpointer injection_group_ref (gpointer instance);
void injection_group_unref (gpointer instance);
-GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_injection_group (GValue* value, gpointer v_object);
-void value_take_injection_group (GValue* value, gpointer v_object);
+GParamSpec* param_spec_injection_group (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_injection_group (GValue* value,
+ gpointer v_object);
+void value_take_injection_group (GValue* value,
+ gpointer v_object);
gpointer value_get_injection_group (const GValue* value);
GType injection_group_get_type (void) G_GNUC_CONST;
GType thumbnail_view_get_type (void) G_GNUC_CONST;
@@ -1044,17 +1062,29 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con
void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self);
gpointer view_filter_ref (gpointer instance);
void view_filter_unref (gpointer instance);
-GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_view_filter (GValue* value, gpointer v_object);
-void value_take_view_filter (GValue* value, gpointer v_object);
+GParamSpec* param_spec_view_filter (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_view_filter (GValue* value,
+ gpointer v_object);
+void value_take_view_filter (GValue* value,
+ gpointer v_object);
gpointer value_get_view_filter (const GValue* value);
GType view_filter_get_type (void) G_GNUC_CONST;
GType search_view_filter_get_type (void) G_GNUC_CONST;
gpointer core_tracker_ref (gpointer instance);
void core_tracker_unref (gpointer instance);
-GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void core_value_set_tracker (GValue* value, gpointer v_object);
-void core_value_take_tracker (GValue* value, gpointer v_object);
+GParamSpec* core_param_spec_tracker (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void core_value_set_tracker (GValue* value,
+ gpointer v_object);
+void core_value_take_tracker (GValue* value,
+ gpointer v_object);
gpointer core_value_get_tracker (const GValue* value);
GType core_tracker_get_type (void) G_GNUC_CONST;
GType core_view_tracker_get_type (void) G_GNUC_CONST;
@@ -1062,108 +1092,194 @@ GType rating_get_type (void) G_GNUC_CONST;
GType raw_developer_get_type (void) G_GNUC_CONST;
gpointer exporter_ui_ref (gpointer instance);
void exporter_ui_unref (gpointer instance);
-GParamSpec* param_spec_exporter_ui (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_exporter_ui (GValue* value, gpointer v_object);
-void value_take_exporter_ui (GValue* value, gpointer v_object);
+GParamSpec* param_spec_exporter_ui (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_exporter_ui (GValue* value,
+ gpointer v_object);
+void value_take_exporter_ui (GValue* value,
+ gpointer v_object);
gpointer value_get_exporter_ui (const GValue* value);
GType exporter_ui_get_type (void) G_GNUC_CONST;
GType default_search_view_filter_get_type (void) G_GNUC_CONST;
GType collection_page_collection_search_view_filter_get_type (void) G_GNUC_CONST;
#define COLLECTION_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_COLLECTION_PAGE, CollectionPagePrivate))
-enum {
- COLLECTION_PAGE_DUMMY_PROPERTY
-};
CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_new (void);
CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_construct (GType object_type);
#define COLLECTION_PAGE_DESKTOP_SLIDESHOW_TRANSITION_SEC 2.0
static void collection_page_on_print (CollectionPage* self);
-static void _collection_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _collection_page_on_print_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void collection_page_on_publish (CollectionPage* self);
-static void _collection_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _collection_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void collection_page_on_rotate_clockwise (CollectionPage* self);
-static void _collection_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _collection_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void collection_page_on_rotate_counterclockwise (CollectionPage* self);
-static void _collection_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _collection_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void collection_page_on_flip_horizontally (CollectionPage* self);
-static void _collection_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _collection_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void collection_page_on_flip_vertically (CollectionPage* self);
-static void _collection_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _collection_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void collection_page_on_enhance (CollectionPage* self);
-static void _collection_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _collection_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void collection_page_on_copy_adjustments (CollectionPage* self);
-static void _collection_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _collection_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void collection_page_on_paste_adjustments (CollectionPage* self);
-static void _collection_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _collection_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void collection_page_on_revert (CollectionPage* self);
-static void _collection_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _collection_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
void collection_page_on_set_background (CollectionPage* self);
-static void _collection_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _collection_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void collection_page_on_duplicate_photo (CollectionPage* self);
-static void _collection_page_on_duplicate_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _collection_page_on_duplicate_photo_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void collection_page_on_adjust_date_time (CollectionPage* self);
-static void _collection_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _collection_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void collection_page_on_external_edit (CollectionPage* self);
-static void _collection_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _collection_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void collection_page_on_external_edit_raw (CollectionPage* self);
-static void _collection_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _collection_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
static void collection_page_on_slideshow (CollectionPage* self);
-static void _collection_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-CollectionPage* collection_page_construct (GType object_type, const gchar* page_name);
-MediaPage* media_page_construct (GType object_type, const gchar* page_name);
+static void _collection_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self);
+CollectionPage* collection_page_construct (GType object_type,
+ const gchar* page_name);
+MediaPage* media_page_construct (GType object_type,
+ const gchar* page_name);
gpointer data_collection_ref (gpointer instance);
void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_data_collection (GValue* value,
+ gpointer v_object);
+void value_take_data_collection (GValue* value,
+ gpointer v_object);
gpointer value_get_data_collection (const GValue* value);
GType data_collection_get_type (void) G_GNUC_CONST;
GType view_collection_get_type (void) G_GNUC_CONST;
ViewCollection* page_get_view (Page* self);
gpointer alteration_ref (gpointer instance);
void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_alteration (GValue* value,
+ gpointer v_object);
+void value_take_alteration (GValue* value,
+ gpointer v_object);
gpointer value_get_alteration (const GValue* value);
GType alteration_get_type (void) G_GNUC_CONST;
-static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* altered);
-static void _collection_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
-void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path);
-void page_init_toolbar (Page* self, const gchar* path);
+static void collection_page_on_photos_altered (CollectionPage* self,
+ GeeMap* altered);
+static void _collection_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender,
+ GeeMap* items,
+ gpointer self);
+void checkerboard_page_init_item_context_menu (CheckerboardPage* self,
+ const gchar* path);
+void page_init_toolbar (Page* self,
+ const gchar* path);
GType configuration_facade_get_type (void) G_GNUC_CONST;
GType config_facade_get_type (void) G_GNUC_CONST;
ConfigFacade* config_facade_get_instance (void);
static void collection_page_on_external_app_changed (CollectionPage* self);
-static void _collection_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self);
+static void _collection_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender,
+ gpointer self);
static GtkToolbar* collection_page_real_get_toolbar (Page* base);
GtkToolbar* page_get_toolbar (Page* self);
GType media_page_zoom_slider_assembly_get_type (void) G_GNUC_CONST;
MediaPageZoomSliderAssembly* media_page_create_zoom_slider_assembly (MediaPage* self);
-void media_page_connect_slider (MediaPage* self, MediaPageZoomSliderAssembly* slider);
+void media_page_connect_slider (MediaPage* self,
+ MediaPageZoomSliderAssembly* slider);
static InjectionGroup* collection_page_create_file_menu_injectables (void);
InjectionGroup* injection_group_new (const gchar* path);
-InjectionGroup* injection_group_construct (GType object_type, const gchar* path);
-void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator);
+InjectionGroup* injection_group_construct (GType object_type,
+ const gchar* path);
+void injection_group_add_menu_item (InjectionGroup* self,
+ const gchar* name,
+ const gchar* action,
+ const gchar* accellerator);
void injection_group_add_separator (InjectionGroup* self);
static InjectionGroup* collection_page_create_edit_menu_injectables (void);
static InjectionGroup* collection_page_create_view_menu_fullscreen_injectables (void);
static InjectionGroup* collection_page_create_photos_menu_edits_injectables (void);
static InjectionGroup* collection_page_create_photos_menu_date_injectables (void);
static InjectionGroup* collection_page_create_photos_menu_externals_injectables (void);
-static void collection_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
-void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static void collection_page_real_add_actions (Page* base, GActionMap* map);
-void page_add_actions (Page* self, GActionMap* map);
-static void collection_page_real_remove_actions (Page* base, GActionMap* map);
-void page_remove_actions (Page* self, GActionMap* map);
-static InjectionGroup** collection_page_real_init_collect_injection_groups (Page* base, int* result_length1);
-InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1);
-static void _vala_array_add80 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add81 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add82 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add83 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add84 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add85 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
+static void collection_page_real_init_collect_ui_filenames (Page* base,
+ GeeList* ui_filenames);
+void page_init_collect_ui_filenames (Page* self,
+ GeeList* ui_filenames);
+static void collection_page_real_add_actions (Page* base,
+ GActionMap* map);
+void page_add_actions (Page* self,
+ GActionMap* map);
+static void collection_page_real_remove_actions (Page* base,
+ GActionMap* map);
+void page_remove_actions (Page* self,
+ GActionMap* map);
+static InjectionGroup** collection_page_real_init_collect_injection_groups (Page* base,
+ int* result_length1);
+InjectionGroup** page_init_collect_injection_groups (Page* self,
+ int* result_length1);
+static void _vala_array_add80 (InjectionGroup** * array,
+ int* length,
+ int* size,
+ InjectionGroup* value);
+static void _vala_array_add81 (InjectionGroup** * array,
+ int* length,
+ int* size,
+ InjectionGroup* value);
+static void _vala_array_add82 (InjectionGroup** * array,
+ int* length,
+ int* size,
+ InjectionGroup* value);
+static void _vala_array_add83 (InjectionGroup** * array,
+ int* length,
+ int* size,
+ InjectionGroup* value);
+static void _vala_array_add84 (InjectionGroup** * array,
+ int* length,
+ int* size,
+ InjectionGroup* value);
+static void _vala_array_add85 (InjectionGroup** * array,
+ int* length,
+ int* size,
+ InjectionGroup* value);
static gboolean collection_page_selection_has_video (CollectionPage* self);
GType thumbnail_source_get_type (void) G_GNUC_CONST;
GType media_source_get_type (void) G_GNUC_CONST;
@@ -1173,15 +1289,26 @@ static gboolean collection_page_page_has_photo (CollectionPage* self);
gboolean media_source_collection_has_photo (GeeCollection* media);
GeeCollection* view_collection_get_sources (ViewCollection* self);
static gboolean collection_page_selection_has_photo (CollectionPage* self);
-static void collection_page_real_init_actions (Page* base, gint selected_count, gint count);
-void page_init_actions (Page* self, gint selected_count, gint count);
-void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
-static void collection_page_real_update_actions (Page* base, gint selected_count, gint count);
+static void collection_page_real_init_actions (Page* base,
+ gint selected_count,
+ gint count);
+void page_init_actions (Page* self,
+ gint selected_count,
+ gint count);
+void page_set_action_sensitive (Page* self,
+ const gchar* name,
+ gboolean sensitive);
+static void collection_page_real_update_actions (Page* base,
+ gint selected_count,
+ gint count);
GType app_window_get_type (void) G_GNUC_CONST;
AppWindow* app_window_get_instance (void);
Page* page_window_get_current_page (PageWindow* self);
-void page_update_actions (Page* self, gint selected_count, gint count);
-DataView* view_collection_get_selected_at (ViewCollection* self, gint index);
+void page_update_actions (Page* self,
+ gint selected_count,
+ gint count);
+DataView* view_collection_get_selected_at (ViewCollection* self,
+ gint index);
DataSource* data_view_get_source (DataView* self);
GType video_source_get_type (void) G_GNUC_CONST;
GType video_get_type (void) G_GNUC_CONST;
@@ -1196,22 +1323,36 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self);
gboolean photo_has_color_adjustments (Photo* self);
#define RESOURCES_SET_BACKGROUND_MENU _ ("Set as _Desktop Background")
#define RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU _ ("Set as _Desktop Slideshow…")
-void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_label);
+void page_update_menu_item_label (Page* self,
+ const gchar* id,
+ const gchar* new_label);
gboolean data_view_is_selected (DataView* self);
-gboolean alteration_has_subject (Alteration* self, const gchar* subject);
+gboolean alteration_has_subject (Alteration* self,
+ const gchar* subject);
GType library_photo_get_type (void) G_GNUC_CONST;
gint view_collection_get_selected_count (ViewCollection* self);
gpointer print_manager_ref (gpointer instance);
void print_manager_unref (gpointer instance);
-GParamSpec* param_spec_print_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_print_manager (GValue* value, gpointer v_object);
-void value_take_print_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_print_manager (const gchar* name,
+ const gchar* nick,
+ const gchar* blurb,
+ GType object_type,
+ GParamFlags flags);
+void value_set_print_manager (GValue* value,
+ gpointer v_object);
+void value_take_print_manager (GValue* value,
+ gpointer v_object);
gpointer value_get_print_manager (const GValue* value);
GType print_manager_get_type (void) G_GNUC_CONST;
PrintManager* print_manager_get_instance (void);
-void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print);
-GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t);
-static void collection_page_real_on_item_activated (CheckerboardPage* base, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers);
+void print_manager_spool_photo (PrintManager* self,
+ GeeCollection* to_print);
+GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self,
+ GType t);
+static void collection_page_real_on_item_activated (CheckerboardPage* base,
+ CheckerboardItem* item,
+ CheckerboardPageActivator activator,
+ CheckerboardPageKeyboardModifiers* modifiers);
GType media_source_item_get_type (void) G_GNUC_CONST;
GType thumbnail_get_type (void) G_GNUC_CONST;
MediaSource* thumbnail_get_media_source (Thumbnail* self);
@@ -1219,18 +1360,29 @@ void media_page_on_play_video (MediaPage* self);
gchar* data_object_to_string (DataObject* self);
GType library_window_get_type (void) G_GNUC_CONST;
LibraryWindow* library_window_get_app (void);
-void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* controller, Photo* current);
-static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey* event);
-void page_activate_action (Page* self, const gchar* name);
-gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event);
+void library_window_switch_to_photo_page (LibraryWindow* self,
+ CollectionPage* controller,
+ Photo* current);
+static gboolean collection_page_real_on_app_key_pressed (Page* base,
+ GdkEventKey* event);
+void page_activate_action (Page* self,
+ const gchar* name);
+gboolean page_on_app_key_pressed (Page* self,
+ GdkEventKey* event);
static void collection_page_real_on_export (MediaPage* base);
GType exporter_get_type (void) G_GNUC_CONST;
-ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback done, void* done_target, gboolean export_in_place);
+ExporterUI* video_export_many (GeeCollection* videos,
+ ExporterCompletionCallback done,
+ void* done_target,
+ gboolean export_in_place);
static void collection_page_on_export_completed (CollectionPage* self);
-static void _collection_page_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self);
+static void _collection_page_on_export_completed_exporter_completion_callback (Exporter* exporter,
+ gboolean is_cancelled,
+ gpointer self);
GType export_dialog_get_type (void) G_GNUC_CONST;
ExportDialog* export_dialog_new (const gchar* title);
-ExportDialog* export_dialog_construct (GType object_type, const gchar* title);
+ExportDialog* export_dialog_construct (GType object_type,
+ const gchar* title);
GType export_format_parameters_get_type (void) G_GNUC_CONST;
GType export_format_mode_get_type (void) G_GNUC_CONST;
GType jpeg_quality_get_type (void) G_GNUC_CONST;
@@ -1239,27 +1391,55 @@ void export_format_parameters_free (ExportFormatParameters* self);
void export_format_parameters_current (ExportFormatParameters* result);
void export_format_parameters_last (ExportFormatParameters* result);
GType scale_constraint_get_type (void) G_GNUC_CONST;
-gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint* constraint, ExportFormatParameters* parameters);
+gboolean export_dialog_execute (ExportDialog* self,
+ gint* scale,
+ ScaleConstraint* constraint,
+ ExportFormatParameters* parameters);
GType scaling_get_type (void) G_GNUC_CONST;
GType dimensions_get_type (void) G_GNUC_CONST;
Dimensions* dimensions_dup (const Dimensions* self);
void dimensions_free (Dimensions* self);
Scaling* scaling_dup (const Scaling* self);
void scaling_free (Scaling* self);
-void scaling_for_constraint (ScaleConstraint constraint, gint scale, gboolean scale_up, Scaling* result);
+void scaling_for_constraint (ScaleConstraint constraint,
+ gint scale,
+ gboolean scale_up,
+ Scaling* result);
GFile* export_ui_choose_file (const gchar* current_file_basename);
-gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParameters* params);
+gchar* photo_get_export_basename_for_parameters (Photo* self,
+ ExportFormatParameters* params);
void page_window_set_busy_cursor (PageWindow* self);
-void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error);
-PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportFormatParameters* params);
+void photo_export (Photo* self,
+ GFile* dest_file,
+ Scaling* scaling,
+ JpegQuality quality,
+ PhotoFileFormat export_format,
+ gboolean direct_copy_unmodified,
+ gboolean export_metadata,
+ GError** error);
+PhotoFileFormat photo_get_export_format_for_parameters (Photo* self,
+ ExportFormatParameters* params);
void page_window_set_normal_cursor (PageWindow* self);
-GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining);
+GtkResponseType export_error_dialog (GFile* dest,
+ gboolean photos_remaining);
GFile* export_ui_choose_dir (const gchar* user_title);
-Exporter* exporter_new (GeeCollection* to_export, GFile* dir, Scaling* scaling, ExportFormatParameters* export_params, gboolean auto_replace_all);
-Exporter* exporter_construct (GType object_type, GeeCollection* to_export, GFile* dir, Scaling* scaling, ExportFormatParameters* export_params, gboolean auto_replace_all);
+Exporter* exporter_new (GeeCollection* to_export,
+ GFile* dir,
+ Scaling* scaling,
+ ExportFormatParameters* export_params,
+ gboolean auto_replace_all);
+Exporter* exporter_construct (GType object_type,
+ GeeCollection* to_export,
+ GFile* dir,
+ Scaling* scaling,
+ ExportFormatParameters* export_params,
+ gboolean auto_replace_all);
ExporterUI* exporter_ui_new (Exporter* exporter);
-ExporterUI* exporter_ui_construct (GType object_type, Exporter* exporter);
-void exporter_ui_export (ExporterUI* self, ExporterCompletionCallback completion_callback, void* completion_callback_target);
+ExporterUI* exporter_ui_construct (GType object_type,
+ Exporter* exporter);
+void exporter_ui_export (ExporterUI* self,
+ ExporterCompletionCallback completion_callback,
+ void* completion_callback_target);
gboolean photo_has_transformations (Photo* self);
gboolean photo_has_editable (Photo* self);
static gboolean collection_page_can_revert_editable_selected (CollectionPage* self);
@@ -1271,135 +1451,220 @@ GeeList* view_collection_get_selected (ViewCollection* self);
GType rotation_get_type (void) G_GNUC_CONST;
#define RESOURCES_ROTATE_CW_FULL_LABEL _ ("Rotate Right")
#define RESOURCES_ROTATE_CW_TOOLTIP _ ("Rotate the photos right (press Ctrl to rotate left)")
-RotateMultipleCommand* rotate_multiple_command_new (GeeIterable* iter, Rotation rotation, const gchar* name, const gchar* explanation, const gchar* progress_text, const gchar* undo_progress_text);
-RotateMultipleCommand* rotate_multiple_command_construct (GType object_type, GeeIterable* iter, Rotation rotation, const gchar* name, const gchar* explanation, const gchar* progress_text, const gchar* undo_progress_text);
+RotateMultipleCommand* rotate_multiple_command_new (GeeIterable* iter,
+ Rotation rotation,
+ const gchar* name,
+ const gchar* explanation,
+ const gchar* progress_text,
+ const gchar* undo_progress_text);
+RotateMultipleCommand* rotate_multiple_command_construct (GType object_type,
+ GeeIterable* iter,
+ Rotation rotation,
+ const gchar* name,
+ const gchar* explanation,
+ const gchar* progress_text,
+ const gchar* undo_progress_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* page_get_command_manager (Page* self);
-void command_manager_execute (CommandManager* self, Command* command);
+void command_manager_execute (CommandManager* self,
+ Command* command);
void publishing_ui_publishing_dialog_go (GeeCollection* to_publish);
#define RESOURCES_ROTATE_CCW_FULL_LABEL _ ("Rotate Left")
#define RESOURCES_ROTATE_CCW_TOOLTIP _ ("Rotate the photos left")
#define RESOURCES_HFLIP_LABEL _ ("Flip Horizontally")
#define RESOURCES_VFLIP_LABEL _ ("Flip Vertically")
-gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos);
-void photo_revert_to_master (Photo* self, gboolean notify);
+gboolean revert_editable_dialog (GtkWindow* owner,
+ GeeCollection* photos);
+void photo_revert_to_master (Photo* self,
+ gboolean notify);
GType multiple_photo_transformation_command_get_type (void) G_GNUC_CONST;
GType revert_multiple_command_get_type (void) G_GNUC_CONST;
RevertMultipleCommand* revert_multiple_command_new (GeeIterable* iter);
-RevertMultipleCommand* revert_multiple_command_construct (GType object_type, GeeIterable* iter);
+RevertMultipleCommand* revert_multiple_command_construct (GType object_type,
+ GeeIterable* iter);
PixelTransformationBundle* photo_get_color_adjustments (Photo* self);
GType adjust_colors_multiple_command_get_type (void) G_GNUC_CONST;
#define RESOURCES_PASTE_ADJUSTMENTS_LABEL _ ("Paste Color Adjustments")
#define RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP _ ("Apply copied color adjustments to the selected photos")
-AdjustColorsMultipleCommand* adjust_colors_multiple_command_new (GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation);
-AdjustColorsMultipleCommand* adjust_colors_multiple_command_construct (GType object_type, GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation);
+AdjustColorsMultipleCommand* adjust_colors_multiple_command_new (GeeIterable* iter,
+ PixelTransformationBundle* transformations,
+ const gchar* name,
+ const gchar* explanation);
+AdjustColorsMultipleCommand* adjust_colors_multiple_command_construct (GType object_type,
+ GeeIterable* iter,
+ PixelTransformationBundle* transformations,
+ const gchar* name,
+ const gchar* explanation);
GType enhance_multiple_command_get_type (void) G_GNUC_CONST;
EnhanceMultipleCommand* enhance_multiple_command_new (GeeIterable* iter);
-EnhanceMultipleCommand* enhance_multiple_command_construct (GType object_type, GeeIterable* iter);
+EnhanceMultipleCommand* enhance_multiple_command_construct (GType object_type,
+ GeeIterable* iter);
GType duplicate_multiple_photos_command_get_type (void) G_GNUC_CONST;
DuplicateMultiplePhotosCommand* duplicate_multiple_photos_command_new (GeeIterable* iter);
-DuplicateMultiplePhotosCommand* duplicate_multiple_photos_command_construct (GType object_type, GeeIterable* iter);
+DuplicateMultiplePhotosCommand* duplicate_multiple_photos_command_construct (GType object_type,
+ GeeIterable* iter);
GType dateable_get_type (void) G_GNUC_CONST;
GType adjust_date_time_dialog_get_type (void) G_GNUC_CONST;
-AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video);
-AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video);
-gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* time_shift, gboolean* keep_relativity, gboolean* modify_originals);
+AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source,
+ gint photo_count,
+ gboolean display_options,
+ gboolean contains_video,
+ gboolean only_video);
+AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type,
+ Dateable* source,
+ gint photo_count,
+ gboolean display_options,
+ gboolean contains_video,
+ gboolean only_video);
+gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self,
+ gint64* time_shift,
+ gboolean* keep_relativity,
+ gboolean* modify_originals);
GType adjust_date_time_photos_command_get_type (void) G_GNUC_CONST;
-AdjustDateTimePhotosCommand* adjust_date_time_photos_command_new (GeeIterable* iter, gint64 time_shift, gboolean keep_relativity, gboolean modify_originals);
-AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType object_type, GeeIterable* iter, gint64 time_shift, gboolean keep_relativity, gboolean modify_originals);
-void photo_open_with_external_editor (Photo* self, GError** error);
-void open_external_editor_error_dialog (GError* err, Photo* photo);
-void photo_open_with_raw_external_editor (Photo* self, GError** error);
-void app_window_error_message (const gchar* message, GtkWindow* parent);
+AdjustDateTimePhotosCommand* adjust_date_time_photos_command_new (GeeIterable* iter,
+ gint64 time_shift,
+ gboolean keep_relativity,
+ gboolean modify_originals);
+AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType object_type,
+ GeeIterable* iter,
+ gint64 time_shift,
+ gboolean keep_relativity,
+ gboolean modify_originals);
+void photo_open_with_external_editor (Photo* self,
+ GError** error);
+void open_external_editor_error_dialog (GError* err,
+ Photo* photo);
+void photo_open_with_raw_external_editor (Photo* self,
+ GError** error);
+void app_window_error_message (const gchar* message,
+ GtkWindow* parent);
gchar* resources_launch_editor_failed (GError* err);
-void media_source_collection_filter_media (GeeCollection* media, GeeCollection* photos, GeeCollection* videos);
+void media_source_collection_filter_media (GeeCollection* media,
+ GeeCollection* photos,
+ GeeCollection* videos);
GType set_background_photo_dialog_get_type (void) G_GNUC_CONST;
SetBackgroundPhotoDialog* set_background_photo_dialog_new (void);
SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type);
-gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gboolean* desktop_background, gboolean* screensaver);
-void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolean screensaver);
+gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self,
+ gboolean* desktop_background,
+ gboolean* screensaver);
+void desktop_integration_set_background (Photo* photo,
+ gboolean desktop,
+ gboolean screensaver);
GType set_background_slideshow_dialog_get_type (void) G_GNUC_CONST;
SetBackgroundSlideshowDialog* set_background_slideshow_dialog_new (void);
SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType object_type);
-gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self, gint* delay_value, gboolean* desktop_background, gboolean* screensaver);
-void desktop_integration_set_background_slideshow (GeeCollection* photos, gdouble duration, gdouble transition, gboolean desktop_background, gboolean screensaver);
+gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog* self,
+ gint* delay_value,
+ gboolean* desktop_background,
+ gboolean* screensaver);
+void desktop_integration_set_background_slideshow (GeeCollection* photos,
+ gdouble duration,
+ gdouble transition,
+ gboolean desktop_background,
+ gboolean screensaver);
gint data_collection_get_count (DataCollection* self);
-GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t);
-DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source);
-void app_window_go_fullscreen (AppWindow* self, Page* page);
+GeeList* view_collection_get_sources_of_type (ViewCollection* self,
+ GType t);
+DataView* view_collection_get_view_for_source (ViewCollection* self,
+ DataSource* source);
+void app_window_go_fullscreen (AppWindow* self,
+ Page* page);
GType source_collection_get_type (void) G_GNUC_CONST;
GType database_source_collection_get_type (void) G_GNUC_CONST;
GType media_source_collection_get_type (void) G_GNUC_CONST;
GType library_photo_source_collection_get_type (void) G_GNUC_CONST;
-SlideshowPage* slideshow_page_new (SourceCollection* sources, ViewCollection* controller, Photo* start);
-SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* sources, ViewCollection* controller, Photo* start);
+SlideshowPage* slideshow_page_new (SourceCollection* sources,
+ ViewCollection* controller,
+ Photo* start);
+SlideshowPage* slideshow_page_construct (GType object_type,
+ SourceCollection* sources,
+ ViewCollection* controller,
+ Photo* start);
GType single_photo_page_get_type (void) G_GNUC_CONST;
GType slideshow_page_get_type (void) G_GNUC_CONST;
-static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* event);
-gboolean page_on_ctrl_pressed (Page* self, GdkEventKey* event);
-static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey* event);
-gboolean page_on_ctrl_released (Page* self, GdkEventKey* event);
+static gboolean collection_page_real_on_ctrl_pressed (Page* base,
+ GdkEventKey* event);
+gboolean page_on_ctrl_pressed (Page* self,
+ GdkEventKey* event);
+static gboolean collection_page_real_on_ctrl_released (Page* base,
+ GdkEventKey* event);
+gboolean page_on_ctrl_released (Page* self,
+ GdkEventKey* event);
static SearchViewFilter* collection_page_real_get_search_view_filter (CheckerboardPage* base);
-enum {
- COLLECTION_PAGE_COLLECTION_SEARCH_VIEW_FILTER_DUMMY_PROPERTY
-};
static guint collection_page_collection_search_view_filter_real_get_criteria (SearchViewFilter* base);
GType search_filter_criteria_get_type (void) G_GNUC_CONST;
DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type);
static void collection_page_finalize (GObject * obj);
-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_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
static const GActionEntry COLLECTION_PAGE_entries[16] = {{"Print", _collection_page_on_print_gsimple_action_activate_callback}, {"Publish", _collection_page_on_publish_gsimple_action_activate_callback}, {"RotateClockwise", _collection_page_on_rotate_clockwise_gsimple_action_activate_callback}, {"RotateCounterclockwise", _collection_page_on_rotate_counterclockwise_gsimple_action_activate_callback}, {"FlipHorizontally", _collection_page_on_flip_horizontally_gsimple_action_activate_callback}, {"FlipVertically", _collection_page_on_flip_vertically_gsimple_action_activate_callback}, {"Enhance", _collection_page_on_enhance_gsimple_action_activate_callback}, {"CopyColorAdjustments", _collection_page_on_copy_adjustments_gsimple_action_activate_callback}, {"PasteColorAdjustments", _collection_page_on_paste_adjustments_gsimple_action_activate_callback}, {"Revert", _collection_page_on_revert_gsimple_action_activate_callback}, {"SetBackground", _collection_page_on_set_background_gsimple_action_activate_callback}, {"Duplicate", _collection_page_on_duplicate_photo_gsimple_action_activate_callback}, {"AdjustDateTime", _collection_page_on_adjust_date_time_gsimple_action_activate_callback}, {"ExternalEdit", _collection_page_on_external_edit_gsimple_action_activate_callback}, {"ExternalEditRAW", _collection_page_on_external_edit_raw_gsimple_action_activate_callback}, {"Slideshow", _collection_page_on_slideshow_gsimple_action_activate_callback}};
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 11 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return self ? g_object_ref (self) : NULL;
-#line 1365 "CollectionPage.c"
+#line 1626 "CollectionPage.c"
}
-CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page) {
+CollectionViewManager*
+collection_view_manager_construct (GType object_type,
+ CollectionPage* page)
+{
CollectionViewManager* self = NULL;
CollectionPage* _tmp0_;
- CollectionPage* _tmp1_;
#line 10 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_val_if_fail (IS_COLLECTION_PAGE (page), NULL);
#line 10 "/home/jens/Source/shotwell/src/CollectionPage.vala"
self = (CollectionViewManager*) view_manager_construct (object_type);
#line 11 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp0_ = page;
-#line 11 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp0_ = _g_object_ref0 (page);
#line 11 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (self->priv->page);
#line 11 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- self->priv->page = _tmp1_;
+ self->priv->page = _tmp0_;
#line 10 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return self;
-#line 1387 "CollectionPage.c"
+#line 1648 "CollectionPage.c"
}
-CollectionViewManager* collection_view_manager_new (CollectionPage* page) {
+CollectionViewManager*
+collection_view_manager_new (CollectionPage* page)
+{
#line 10 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return collection_view_manager_construct (TYPE_COLLECTION_VIEW_MANAGER, page);
-#line 1394 "CollectionPage.c"
+#line 1657 "CollectionPage.c"
}
-static DataView* collection_view_manager_real_create_view (ViewManager* base, DataSource* source) {
+static DataView*
+collection_view_manager_real_create_view (ViewManager* base,
+ DataSource* source)
+{
CollectionViewManager * self;
DataView* result = NULL;
CollectionPage* _tmp0_;
- DataSource* _tmp1_;
- DataView* _tmp2_;
+ DataView* _tmp1_;
#line 14 "/home/jens/Source/shotwell/src/CollectionPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManager);
#line 14 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -1407,18 +1672,18 @@ static DataView* collection_view_manager_real_create_view (ViewManager* base, Da
#line 15 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp0_ = self->priv->page;
#line 15 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp1_ = source;
-#line 15 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp2_ = media_page_create_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_PAGE, MediaPage), _tmp1_);
+ _tmp1_ = media_page_create_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_PAGE, MediaPage), source);
#line 15 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- result = _tmp2_;
+ result = _tmp1_;
#line 15 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 1418 "CollectionPage.c"
+#line 1681 "CollectionPage.c"
}
-static void collection_view_manager_class_init (CollectionViewManagerClass * klass) {
+static void
+collection_view_manager_class_init (CollectionViewManagerClass * klass)
+{
#line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_view_manager_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -1427,18 +1692,22 @@ static void collection_view_manager_class_init (CollectionViewManagerClass * kla
g_type_class_add_private (klass, sizeof (CollectionViewManagerPrivate));
#line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala"
((ViewManagerClass *) klass)->create_view = (DataView* (*) (ViewManager *, DataSource*)) collection_view_manager_real_create_view;
-#line 1431 "CollectionPage.c"
+#line 1696 "CollectionPage.c"
}
-static void collection_view_manager_instance_init (CollectionViewManager * self) {
+static void
+collection_view_manager_instance_init (CollectionViewManager * self)
+{
#line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala"
self->priv = COLLECTION_VIEW_MANAGER_GET_PRIVATE (self);
-#line 1438 "CollectionPage.c"
+#line 1705 "CollectionPage.c"
}
-static void collection_view_manager_finalize (ViewManager * obj) {
+static void
+collection_view_manager_finalize (ViewManager * obj)
+{
CollectionViewManager * self;
#line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManager);
@@ -1446,11 +1715,13 @@ static void collection_view_manager_finalize (ViewManager * obj) {
_g_object_unref0 (self->priv->page);
#line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala"
VIEW_MANAGER_CLASS (collection_view_manager_parent_class)->finalize (obj);
-#line 1450 "CollectionPage.c"
+#line 1719 "CollectionPage.c"
}
-GType collection_view_manager_get_type (void) {
+GType
+collection_view_manager_get_type (void)
+{
static volatile gsize collection_view_manager_type_id__volatile = 0;
if (g_once_init_enter (&collection_view_manager_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (CollectionViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) collection_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CollectionViewManager), 0, (GInstanceInitFunc) collection_view_manager_instance_init, NULL };
@@ -1462,153 +1733,224 @@ GType collection_view_manager_get_type (void) {
}
-static void _collection_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_collection_page_on_print_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_print ((CollectionPage*) self);
-#line 1469 "CollectionPage.c"
+#line 1744 "CollectionPage.c"
}
-static void _collection_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_collection_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_publish ((CollectionPage*) self);
-#line 1476 "CollectionPage.c"
+#line 1755 "CollectionPage.c"
}
-static void _collection_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_collection_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_rotate_clockwise ((CollectionPage*) self);
-#line 1483 "CollectionPage.c"
+#line 1766 "CollectionPage.c"
}
-static void _collection_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_collection_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_rotate_counterclockwise ((CollectionPage*) self);
-#line 1490 "CollectionPage.c"
+#line 1777 "CollectionPage.c"
}
-static void _collection_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_collection_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_flip_horizontally ((CollectionPage*) self);
-#line 1497 "CollectionPage.c"
+#line 1788 "CollectionPage.c"
}
-static void _collection_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_collection_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_flip_vertically ((CollectionPage*) self);
-#line 1504 "CollectionPage.c"
+#line 1799 "CollectionPage.c"
}
-static void _collection_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_collection_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_enhance ((CollectionPage*) self);
-#line 1511 "CollectionPage.c"
+#line 1810 "CollectionPage.c"
}
-static void _collection_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_collection_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_copy_adjustments ((CollectionPage*) self);
-#line 1518 "CollectionPage.c"
+#line 1821 "CollectionPage.c"
}
-static void _collection_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_collection_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_paste_adjustments ((CollectionPage*) self);
-#line 1525 "CollectionPage.c"
+#line 1832 "CollectionPage.c"
}
-static void _collection_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_collection_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_revert ((CollectionPage*) self);
-#line 1532 "CollectionPage.c"
+#line 1843 "CollectionPage.c"
}
-static void _collection_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_collection_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_set_background ((CollectionPage*) self);
-#line 1539 "CollectionPage.c"
+#line 1854 "CollectionPage.c"
}
-static void _collection_page_on_duplicate_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_collection_page_on_duplicate_photo_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_duplicate_photo ((CollectionPage*) self);
-#line 1546 "CollectionPage.c"
+#line 1865 "CollectionPage.c"
}
-static void _collection_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_collection_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_adjust_date_time ((CollectionPage*) self);
-#line 1553 "CollectionPage.c"
+#line 1876 "CollectionPage.c"
}
-static void _collection_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_collection_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_external_edit ((CollectionPage*) self);
-#line 1560 "CollectionPage.c"
+#line 1887 "CollectionPage.c"
}
-static void _collection_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_collection_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_external_edit_raw ((CollectionPage*) self);
-#line 1567 "CollectionPage.c"
+#line 1898 "CollectionPage.c"
}
-static void _collection_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_collection_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action,
+ GVariant* parameter,
+ gpointer self)
+{
#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_slideshow ((CollectionPage*) self);
-#line 1574 "CollectionPage.c"
+#line 1909 "CollectionPage.c"
}
-static void _collection_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
+static void
+_collection_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender,
+ GeeMap* items,
+ gpointer self)
+{
#line 35 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_photos_altered ((CollectionPage*) self, items);
-#line 1581 "CollectionPage.c"
+#line 1920 "CollectionPage.c"
}
-static void _collection_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self) {
+static void
+_collection_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender,
+ gpointer self)
+{
#line 43 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_external_app_changed ((CollectionPage*) self);
-#line 1588 "CollectionPage.c"
+#line 1930 "CollectionPage.c"
}
-CollectionPage* collection_page_construct (GType object_type, const gchar* page_name) {
+CollectionPage*
+collection_page_construct (GType object_type,
+ const gchar* page_name)
+{
CollectionPage * self = NULL;
- const gchar* _tmp0_;
+ ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- ViewCollection* _tmp2_;
+ ConfigFacade* _tmp2_;
ConfigFacade* _tmp3_;
- ConfigFacade* _tmp4_;
#line 32 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_val_if_fail (page_name != NULL, NULL);
#line 33 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp0_ = page_name;
-#line 33 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- self = (CollectionPage*) media_page_construct (object_type, _tmp0_);
+ self = (CollectionPage*) media_page_construct (object_type, page_name);
#line 35 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 35 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 35 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _collection_page_on_photos_altered_data_collection_items_altered, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _collection_page_on_photos_altered_data_collection_items_altered, self, 0);
#line 35 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp2_);
+ _data_collection_unref0 (_tmp1_);
#line 37 "/home/jens/Source/shotwell/src/CollectionPage.vala"
checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "CollectionContextMenu");
#line 38 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -1616,20 +1958,22 @@ CollectionPage* collection_page_construct (GType object_type, const gchar* page_
#line 40 "/home/jens/Source/shotwell/src/CollectionPage.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
#line 43 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = config_facade_get_instance ();
+ _tmp2_ = config_facade_get_instance ();
#line 43 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 43 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "external-app-changed", (GCallback) _collection_page_on_external_app_changed_configuration_facade_external_app_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "external-app-changed", (GCallback) _collection_page_on_external_app_changed_configuration_facade_external_app_changed, self, 0);
#line 43 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp4_);
+ _g_object_unref0 (_tmp3_);
#line 32 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return self;
-#line 1629 "CollectionPage.c"
+#line 1971 "CollectionPage.c"
}
-static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
+static GtkToolbar*
+collection_page_real_get_toolbar (Page* base)
+{
CollectionPage * self;
GtkToolbar* result = NULL;
GtkToolbar* _tmp0_;
@@ -1641,7 +1985,7 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
#line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if (_tmp0_ == NULL) {
-#line 1645 "CollectionPage.c"
+#line 1989 "CollectionPage.c"
GtkToolbar* _tmp1_;
GtkToolbar* _tmp2_;
GtkSeparatorToolItem* separator = NULL;
@@ -1759,7 +2103,7 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
#line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp24_ = G_OBJECT_GET_CLASS (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, G_TYPE_OBJECT, GObject));
#line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp25_ = gtk_binding_set_by_class (_tmp24_);
+ _tmp25_ = gtk_binding_set_by_class ((gpointer) _tmp24_);
#line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
binding_set = _tmp25_;
#line 69 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -1778,7 +2122,7 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
_g_object_unref0 (drawn_separator);
#line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (separator);
-#line 1782 "CollectionPage.c"
+#line 2126 "CollectionPage.c"
}
#line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp28_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
@@ -1788,11 +2132,13 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
result = _tmp29_;
#line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 1792 "CollectionPage.c"
+#line 2136 "CollectionPage.c"
}
-static InjectionGroup* collection_page_create_file_menu_injectables (void) {
+static InjectionGroup*
+collection_page_create_file_menu_injectables (void)
+{
InjectionGroup* result = NULL;
InjectionGroup* group = NULL;
InjectionGroup* _tmp0_;
@@ -1814,11 +2160,13 @@ static InjectionGroup* collection_page_create_file_menu_injectables (void) {
result = group;
#line 86 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 1818 "CollectionPage.c"
+#line 2164 "CollectionPage.c"
}
-static InjectionGroup* collection_page_create_edit_menu_injectables (void) {
+static InjectionGroup*
+collection_page_create_edit_menu_injectables (void)
+{
InjectionGroup* result = NULL;
InjectionGroup* group = NULL;
InjectionGroup* _tmp0_;
@@ -1832,11 +2180,13 @@ static InjectionGroup* collection_page_create_edit_menu_injectables (void) {
result = group;
#line 94 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 1836 "CollectionPage.c"
+#line 2184 "CollectionPage.c"
}
-static InjectionGroup* collection_page_create_view_menu_fullscreen_injectables (void) {
+static InjectionGroup*
+collection_page_create_view_menu_fullscreen_injectables (void)
+{
InjectionGroup* result = NULL;
InjectionGroup* group = NULL;
InjectionGroup* _tmp0_;
@@ -1854,11 +2204,13 @@ static InjectionGroup* collection_page_create_view_menu_fullscreen_injectables (
result = group;
#line 104 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 1858 "CollectionPage.c"
+#line 2208 "CollectionPage.c"
}
-static InjectionGroup* collection_page_create_photos_menu_edits_injectables (void) {
+static InjectionGroup*
+collection_page_create_photos_menu_edits_injectables (void)
+{
InjectionGroup* result = NULL;
InjectionGroup* group = NULL;
InjectionGroup* _tmp0_;
@@ -1890,11 +2242,13 @@ static InjectionGroup* collection_page_create_photos_menu_edits_injectables (voi
result = group;
#line 129 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 1894 "CollectionPage.c"
+#line 2246 "CollectionPage.c"
}
-static InjectionGroup* collection_page_create_photos_menu_date_injectables (void) {
+static InjectionGroup*
+collection_page_create_photos_menu_date_injectables (void)
+{
InjectionGroup* result = NULL;
InjectionGroup* group = NULL;
InjectionGroup* _tmp0_;
@@ -1908,11 +2262,13 @@ static InjectionGroup* collection_page_create_photos_menu_date_injectables (void
result = group;
#line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 1912 "CollectionPage.c"
+#line 2266 "CollectionPage.c"
}
-static InjectionGroup* collection_page_create_photos_menu_externals_injectables (void) {
+static InjectionGroup*
+collection_page_create_photos_menu_externals_injectables (void)
+{
InjectionGroup* result = NULL;
InjectionGroup* group = NULL;
InjectionGroup* _tmp0_;
@@ -1930,62 +2286,56 @@ static InjectionGroup* collection_page_create_photos_menu_externals_injectables
result = group;
#line 151 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 1934 "CollectionPage.c"
+#line 2290 "CollectionPage.c"
}
-static void collection_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
+static void
+collection_page_real_init_collect_ui_filenames (Page* base,
+ GeeList* ui_filenames)
+{
CollectionPage * self;
- GeeList* _tmp0_;
- GeeList* _tmp1_;
#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (GEE_IS_LIST (ui_filenames));
#line 155 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp0_ = ui_filenames;
-#line 155 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- PAGE_CLASS (collection_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_);
+ PAGE_CLASS (collection_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), ui_filenames);
#line 157 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp1_ = ui_filenames;
-#line 157 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "collection.ui");
-#line 1954 "CollectionPage.c"
+ gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "collection.ui");
+#line 2307 "CollectionPage.c"
}
-static void collection_page_real_add_actions (Page* base, GActionMap* map) {
+static void
+collection_page_real_add_actions (Page* base,
+ GActionMap* map)
+{
CollectionPage * self;
- GActionMap* _tmp0_;
- GActionMap* _tmp1_;
#line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
#line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (G_IS_ACTION_MAP (map));
#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp0_ = map;
-#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- PAGE_CLASS (collection_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_);
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp1_ = map;
+ PAGE_CLASS (collection_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), map);
#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- g_action_map_add_action_entries (_tmp1_, COLLECTION_PAGE_entries, G_N_ELEMENTS (COLLECTION_PAGE_entries), self);
-#line 1974 "CollectionPage.c"
+ g_action_map_add_action_entries (map, COLLECTION_PAGE_entries, G_N_ELEMENTS (COLLECTION_PAGE_entries), self);
+#line 2324 "CollectionPage.c"
}
-static void collection_page_real_remove_actions (Page* base, GActionMap* map) {
+static void
+collection_page_real_remove_actions (Page* base,
+ GActionMap* map)
+{
CollectionPage * self;
- GActionMap* _tmp0_;
#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (G_IS_ACTION_MAP (map));
#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp0_ = map;
-#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- PAGE_CLASS (collection_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_);
-#line 1989 "CollectionPage.c"
+ PAGE_CLASS (collection_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), map);
+#line 2339 "CollectionPage.c"
{
GActionEntry* entry_collection = NULL;
gint entry_collection_length1 = 0;
@@ -1997,133 +2347,163 @@ static void collection_page_real_remove_actions (Page* base, GActionMap* map) {
entry_collection_length1 = G_N_ELEMENTS (COLLECTION_PAGE_entries);
#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
for (entry_it = 0; entry_it < G_N_ELEMENTS (COLLECTION_PAGE_entries); entry_it = entry_it + 1) {
-#line 2001 "CollectionPage.c"
+#line 2351 "CollectionPage.c"
GActionEntry entry = {0};
#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
entry = entry_collection[entry_it];
-#line 2005 "CollectionPage.c"
+#line 2355 "CollectionPage.c"
{
- GActionMap* _tmp1_;
- GActionEntry _tmp2_;
- const gchar* _tmp3_;
+ GActionEntry _tmp0_;
+ const gchar* _tmp1_;
#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp1_ = map;
+ _tmp0_ = entry;
#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp2_ = entry;
+ _tmp1_ = _tmp0_.name;
#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = _tmp2_.name;
-#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 2018 "CollectionPage.c"
+ g_action_map_remove_action (map, _tmp1_);
+#line 2365 "CollectionPage.c"
}
}
}
}
-static void _vala_array_add80 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void
+_vala_array_add80 (InjectionGroup** * array,
+ int* length,
+ int* size,
+ InjectionGroup* value)
+{
#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if ((*length) == (*size)) {
#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2032 "CollectionPage.c"
+#line 2384 "CollectionPage.c"
}
#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
(*array)[(*length)++] = value;
#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
(*array)[*length] = NULL;
-#line 2038 "CollectionPage.c"
+#line 2390 "CollectionPage.c"
}
-static void _vala_array_add81 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void
+_vala_array_add81 (InjectionGroup** * array,
+ int* length,
+ int* size,
+ InjectionGroup* value)
+{
#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if ((*length) == (*size)) {
#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2049 "CollectionPage.c"
+#line 2406 "CollectionPage.c"
}
#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
(*array)[(*length)++] = value;
#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
(*array)[*length] = NULL;
-#line 2055 "CollectionPage.c"
+#line 2412 "CollectionPage.c"
}
-static void _vala_array_add82 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void
+_vala_array_add82 (InjectionGroup** * array,
+ int* length,
+ int* size,
+ InjectionGroup* value)
+{
#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if ((*length) == (*size)) {
#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2066 "CollectionPage.c"
+#line 2428 "CollectionPage.c"
}
#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
(*array)[(*length)++] = value;
#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
(*array)[*length] = NULL;
-#line 2072 "CollectionPage.c"
+#line 2434 "CollectionPage.c"
}
-static void _vala_array_add83 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void
+_vala_array_add83 (InjectionGroup** * array,
+ int* length,
+ int* size,
+ InjectionGroup* value)
+{
#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if ((*length) == (*size)) {
#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2083 "CollectionPage.c"
+#line 2450 "CollectionPage.c"
}
#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
(*array)[(*length)++] = value;
#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
(*array)[*length] = NULL;
-#line 2089 "CollectionPage.c"
+#line 2456 "CollectionPage.c"
}
-static void _vala_array_add84 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void
+_vala_array_add84 (InjectionGroup** * array,
+ int* length,
+ int* size,
+ InjectionGroup* value)
+{
#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if ((*length) == (*size)) {
#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2100 "CollectionPage.c"
+#line 2472 "CollectionPage.c"
}
#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
(*array)[(*length)++] = value;
#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
(*array)[*length] = NULL;
-#line 2106 "CollectionPage.c"
+#line 2478 "CollectionPage.c"
}
-static void _vala_array_add85 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void
+_vala_array_add85 (InjectionGroup** * array,
+ int* length,
+ int* size,
+ InjectionGroup* value)
+{
#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if ((*length) == (*size)) {
#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
*size = (*size) ? (2 * (*size)) : 4;
#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2117 "CollectionPage.c"
+#line 2494 "CollectionPage.c"
}
#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
(*array)[(*length)++] = value;
#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
(*array)[*length] = NULL;
-#line 2123 "CollectionPage.c"
+#line 2500 "CollectionPage.c"
}
-static InjectionGroup** collection_page_real_init_collect_injection_groups (Page* base, int* result_length1) {
+static InjectionGroup**
+collection_page_real_init_collect_injection_groups (Page* base,
+ int* result_length1)
+{
CollectionPage * self;
InjectionGroup** result = NULL;
InjectionGroup** groups = NULL;
@@ -2217,24 +2597,25 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page
if (result_length1) {
#line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
*result_length1 = _tmp14__length1;
-#line 2221 "CollectionPage.c"
+#line 2601 "CollectionPage.c"
}
#line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
result = _tmp14_;
#line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 2227 "CollectionPage.c"
+#line 2607 "CollectionPage.c"
}
-static gboolean collection_page_selection_has_video (CollectionPage* self) {
+static gboolean
+collection_page_selection_has_video (CollectionPage* self)
+{
gboolean result = FALSE;
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
GeeList* _tmp2_;
GeeCollection* _tmp3_;
gboolean _tmp4_;
- gboolean _tmp5_;
#line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2248,27 +2629,26 @@ static gboolean collection_page_selection_has_video (CollectionPage* self) {
#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp4_ = media_source_collection_has_video (_tmp3_);
#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = _tmp4_;
-#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (_tmp3_);
#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_data_collection_unref0 (_tmp1_);
#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- result = _tmp5_;
+ result = _tmp4_;
#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 2261 "CollectionPage.c"
+#line 2640 "CollectionPage.c"
}
-static gboolean collection_page_page_has_photo (CollectionPage* self) {
+static gboolean
+collection_page_page_has_photo (CollectionPage* self)
+{
gboolean result = FALSE;
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
GeeCollection* _tmp2_;
GeeCollection* _tmp3_;
gboolean _tmp4_;
- gboolean _tmp5_;
#line 209 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2282,27 +2662,26 @@ static gboolean collection_page_page_has_photo (CollectionPage* self) {
#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp4_ = media_source_collection_has_photo (_tmp3_);
#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = _tmp4_;
-#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (_tmp3_);
#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_data_collection_unref0 (_tmp1_);
#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- result = _tmp5_;
+ result = _tmp4_;
#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 2295 "CollectionPage.c"
+#line 2673 "CollectionPage.c"
}
-static gboolean collection_page_selection_has_photo (CollectionPage* self) {
+static gboolean
+collection_page_selection_has_photo (CollectionPage* self)
+{
gboolean result = FALSE;
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
GeeList* _tmp2_;
GeeCollection* _tmp3_;
gboolean _tmp4_;
- gboolean _tmp5_;
#line 213 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2316,31 +2695,27 @@ static gboolean collection_page_selection_has_photo (CollectionPage* self) {
#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp4_ = media_source_collection_has_photo (_tmp3_);
#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = _tmp4_;
-#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (_tmp3_);
#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_data_collection_unref0 (_tmp1_);
#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- result = _tmp5_;
+ result = _tmp4_;
#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 2329 "CollectionPage.c"
+#line 2706 "CollectionPage.c"
}
-static void collection_page_real_init_actions (Page* base, gint selected_count, gint count) {
+static void
+collection_page_real_init_actions (Page* base,
+ gint selected_count,
+ gint count)
+{
CollectionPage * self;
- gint _tmp0_;
- gint _tmp1_;
#line 217 "/home/jens/Source/shotwell/src/CollectionPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp0_ = selected_count;
-#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp1_ = count;
-#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- PAGE_CLASS (collection_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_, _tmp1_);
+ PAGE_CLASS (collection_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), selected_count, count);
#line 220 "/home/jens/Source/shotwell/src/CollectionPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", TRUE);
#line 221 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2349,68 +2724,66 @@ static void collection_page_real_init_actions (Page* base, gint selected_count,
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", TRUE);
#line 223 "/home/jens/Source/shotwell/src/CollectionPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", TRUE);
-#line 2353 "CollectionPage.c"
+#line 2728 "CollectionPage.c"
}
-static void collection_page_real_update_actions (Page* base, gint selected_count, gint count) {
+static void
+collection_page_real_update_actions (Page* base,
+ gint selected_count,
+ gint count)
+{
CollectionPage * self;
AppWindow* _tmp0_;
AppWindow* _tmp1_;
Page* _tmp2_;
Page* _tmp3_;
gboolean _tmp4_;
- gint _tmp5_;
- gint _tmp6_;
gboolean one_selected = FALSE;
- gint _tmp7_;
gboolean has_selected = FALSE;
- gint _tmp8_;
gboolean primary_is_video = FALSE;
- gboolean _tmp9_;
+ gboolean _tmp5_;
gboolean selection_has_videos = FALSE;
- gboolean _tmp17_;
gboolean page_has_photos = FALSE;
+ gboolean _tmp13_ = FALSE;
+ gboolean _tmp14_;
+ gboolean _tmp16_ = FALSE;
+ gboolean _tmp17_ = FALSE;
gboolean _tmp18_;
- gboolean _tmp19_ = FALSE;
- gboolean _tmp20_;
- gboolean _tmp22_ = FALSE;
- gboolean _tmp23_ = FALSE;
- gboolean _tmp24_;
- gboolean _tmp31_ = FALSE;
- gboolean _tmp32_ = FALSE;
- gboolean _tmp33_ = FALSE;
- gboolean _tmp34_;
- gboolean _tmp48_ = FALSE;
- gboolean _tmp49_;
- gboolean _tmp51_ = FALSE;
- gboolean _tmp52_;
+ gboolean _tmp24_ = FALSE;
+ gboolean _tmp25_ = FALSE;
+ gboolean _tmp26_ = FALSE;
+ gboolean _tmp27_;
+ gboolean _tmp39_ = FALSE;
+ gboolean _tmp40_;
+ gboolean _tmp41_ = FALSE;
+ gboolean _tmp42_;
+ gboolean _tmp44_ = FALSE;
+ gboolean _tmp45_ = FALSE;
+ gboolean _tmp46_;
gboolean _tmp54_ = FALSE;
gboolean _tmp55_ = FALSE;
gboolean _tmp56_;
- gboolean _tmp65_ = FALSE;
- gboolean _tmp66_ = FALSE;
- gboolean _tmp67_;
- gboolean _tmp70_ = FALSE;
+ gboolean _tmp58_ = FALSE;
+ gboolean _tmp59_;
+ gboolean _tmp61_ = FALSE;
+ gboolean _tmp62_;
+ gboolean _tmp64_ = FALSE;
+ gboolean _tmp65_;
+ gboolean _tmp67_ = FALSE;
+ gboolean _tmp68_;
+ gboolean _tmp70_;
gboolean _tmp71_;
- gboolean _tmp73_ = FALSE;
- gboolean _tmp74_;
- gboolean _tmp76_ = FALSE;
- gboolean _tmp77_;
- gboolean _tmp79_ = FALSE;
+ gboolean _tmp72_;
+ gboolean _tmp73_;
+ gboolean _tmp74_ = FALSE;
+ gboolean _tmp75_;
+ gboolean _tmp77_ = FALSE;
+ gboolean _tmp78_;
gboolean _tmp80_;
+ gboolean _tmp81_ = FALSE;
gboolean _tmp82_;
- gboolean _tmp83_;
gboolean _tmp84_;
- gboolean _tmp85_;
- gboolean _tmp86_ = FALSE;
- gboolean _tmp87_;
- gboolean _tmp89_ = FALSE;
- gboolean _tmp90_;
- gboolean _tmp92_;
- gboolean _tmp93_ = FALSE;
- gboolean _tmp94_;
- gboolean _tmp96_;
#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
#line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2431,665 +2804,619 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
if (_tmp4_) {
#line 229 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 2435 "CollectionPage.c"
+#line 2808 "CollectionPage.c"
}
#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = selected_count;
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = count;
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- PAGE_CLASS (collection_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp5_, _tmp6_);
-#line 234 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = selected_count;
+ PAGE_CLASS (collection_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), selected_count, count);
#line 234 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- one_selected = _tmp7_ == 1;
-#line 235 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = selected_count;
+ one_selected = selected_count == 1;
#line 235 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- has_selected = _tmp8_ > 0;
+ has_selected = selected_count > 0;
#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
primary_is_video = FALSE;
#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = has_selected;
+ _tmp5_ = has_selected;
#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp9_) {
-#line 2457 "CollectionPage.c"
- ViewCollection* _tmp10_;
- ViewCollection* _tmp11_;
- DataView* _tmp12_;
- DataView* _tmp13_;
- DataSource* _tmp14_;
- DataSource* _tmp15_;
- gboolean _tmp16_;
+ if (_tmp5_) {
+#line 2822 "CollectionPage.c"
+ ViewCollection* _tmp6_;
+ ViewCollection* _tmp7_;
+ DataView* _tmp8_;
+ DataView* _tmp9_;
+ DataSource* _tmp10_;
+ DataSource* _tmp11_;
+ gboolean _tmp12_;
#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp11_ = _tmp10_;
+ _tmp7_ = _tmp6_;
#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp12_ = view_collection_get_selected_at (_tmp11_, 0);
+ _tmp8_ = view_collection_get_selected_at (_tmp7_, 0);
#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp13_ = _tmp12_;
+ _tmp9_ = _tmp8_;
#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp14_ = data_view_get_source (_tmp13_);
+ _tmp10_ = data_view_get_source (_tmp9_);
#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp15_ = _tmp14_;
+ _tmp11_ = _tmp10_;
#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_VIDEO);
+ _tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_VIDEO);
#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp15_);
+ _g_object_unref0 (_tmp11_);
#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp13_);
+ _g_object_unref0 (_tmp9_);
#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp11_);
+ _data_collection_unref0 (_tmp7_);
#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp16_) {
+ if (_tmp12_) {
#line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
primary_is_video = TRUE;
-#line 2489 "CollectionPage.c"
+#line 2854 "CollectionPage.c"
}
}
#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp17_ = collection_page_selection_has_video (self);
-#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- selection_has_videos = _tmp17_;
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp18_ = collection_page_page_has_photo (self);
+ selection_has_videos = collection_page_selection_has_video (self);
#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_has_photos = _tmp18_;
+ page_has_photos = collection_page_page_has_photo (self);
#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp20_ = has_selected;
+ _tmp14_ = has_selected;
#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp20_) {
-#line 2504 "CollectionPage.c"
- gboolean _tmp21_;
+ if (_tmp14_) {
+#line 2865 "CollectionPage.c"
+ gboolean _tmp15_;
#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp21_ = selection_has_videos;
+ _tmp15_ = selection_has_videos;
#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp19_ = !_tmp21_;
-#line 2510 "CollectionPage.c"
+ _tmp13_ = !_tmp15_;
+#line 2871 "CollectionPage.c"
} else {
#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp19_ = FALSE;
-#line 2514 "CollectionPage.c"
+ _tmp13_ = FALSE;
+#line 2875 "CollectionPage.c"
}
#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Duplicate", _tmp19_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Duplicate", _tmp13_);
#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp24_ = primary_is_video;
+ _tmp18_ = primary_is_video;
#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (!_tmp24_) {
-#line 2522 "CollectionPage.c"
- gboolean _tmp25_;
+ if (!_tmp18_) {
+#line 2883 "CollectionPage.c"
+ gboolean _tmp19_;
#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp25_ = one_selected;
+ _tmp19_ = one_selected;
#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp23_ = _tmp25_;
-#line 2528 "CollectionPage.c"
+ _tmp17_ = _tmp19_;
+#line 2889 "CollectionPage.c"
} else {
#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp23_ = FALSE;
-#line 2532 "CollectionPage.c"
+ _tmp17_ = FALSE;
+#line 2893 "CollectionPage.c"
}
#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp23_) {
-#line 2536 "CollectionPage.c"
- ConfigFacade* _tmp26_;
- ConfigFacade* _tmp27_;
- gchar* _tmp28_;
- gchar* _tmp29_;
- gboolean _tmp30_;
+ if (_tmp17_) {
+#line 2897 "CollectionPage.c"
+ ConfigFacade* _tmp20_;
+ ConfigFacade* _tmp21_;
+ gchar* _tmp22_;
+ gchar* _tmp23_;
#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp26_ = config_facade_get_instance ();
+ _tmp20_ = config_facade_get_instance ();
#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp27_ = _tmp26_;
-#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp28_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp21_ = _tmp20_;
#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp29_ = _tmp28_;
+ _tmp22_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp30_ = is_string_empty (_tmp29_);
+ _tmp23_ = _tmp22_;
#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp22_ = !_tmp30_;
+ _tmp16_ = !is_string_empty (_tmp23_);
#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_free0 (_tmp29_);
+ _g_free0 (_tmp23_);
#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp27_);
-#line 2558 "CollectionPage.c"
+ _g_object_unref0 (_tmp21_);
+#line 2916 "CollectionPage.c"
} else {
#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp22_ = FALSE;
-#line 2562 "CollectionPage.c"
+ _tmp16_ = FALSE;
+#line 2920 "CollectionPage.c"
}
#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp22_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp16_);
#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp34_ = one_selected;
+ _tmp27_ = one_selected;
#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp34_) {
-#line 2570 "CollectionPage.c"
- gboolean _tmp35_;
+ if (_tmp27_) {
+#line 2928 "CollectionPage.c"
+ gboolean _tmp28_;
#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp35_ = primary_is_video;
+ _tmp28_ = primary_is_video;
#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp33_ = !_tmp35_;
-#line 2576 "CollectionPage.c"
+ _tmp26_ = !_tmp28_;
+#line 2934 "CollectionPage.c"
} else {
#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp33_ = FALSE;
-#line 2580 "CollectionPage.c"
+ _tmp26_ = FALSE;
+#line 2938 "CollectionPage.c"
}
#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp33_) {
-#line 2584 "CollectionPage.c"
- ViewCollection* _tmp36_;
- ViewCollection* _tmp37_;
- DataView* _tmp38_;
- DataView* _tmp39_;
- DataSource* _tmp40_;
- Photo* _tmp41_;
- PhotoFileFormat _tmp42_;
-#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp36_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ if (_tmp26_) {
+#line 2942 "CollectionPage.c"
+ ViewCollection* _tmp29_;
+ ViewCollection* _tmp30_;
+ DataView* _tmp31_;
+ DataView* _tmp32_;
+ DataSource* _tmp33_;
+ Photo* _tmp34_;
#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp37_ = _tmp36_;
+ _tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp38_ = view_collection_get_selected_at (_tmp37_, 0);
+ _tmp30_ = _tmp29_;
#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp39_ = _tmp38_;
+ _tmp31_ = view_collection_get_selected_at (_tmp30_, 0);
#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp40_ = data_view_get_source (_tmp39_);
+ _tmp32_ = _tmp31_;
#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp41_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PHOTO, Photo);
+ _tmp33_ = data_view_get_source (_tmp32_);
#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp42_ = photo_get_master_file_format (_tmp41_);
+ _tmp34_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PHOTO, Photo);
#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp32_ = _tmp42_ == PHOTO_FILE_FORMAT_RAW;
+ _tmp25_ = photo_get_master_file_format (_tmp34_) == PHOTO_FILE_FORMAT_RAW;
#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp41_);
+ _g_object_unref0 (_tmp34_);
#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp39_);
+ _g_object_unref0 (_tmp32_);
#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp37_);
-#line 2614 "CollectionPage.c"
+ _data_collection_unref0 (_tmp30_);
+#line 2969 "CollectionPage.c"
} else {
#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp32_ = FALSE;
-#line 2618 "CollectionPage.c"
+ _tmp25_ = FALSE;
+#line 2973 "CollectionPage.c"
}
#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp32_) {
-#line 2622 "CollectionPage.c"
- ConfigFacade* _tmp43_;
- ConfigFacade* _tmp44_;
- gchar* _tmp45_;
- gchar* _tmp46_;
- gboolean _tmp47_;
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp43_ = config_facade_get_instance ();
+ if (_tmp25_) {
+#line 2977 "CollectionPage.c"
+ ConfigFacade* _tmp35_;
+ ConfigFacade* _tmp36_;
+ gchar* _tmp37_;
+ gchar* _tmp38_;
#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp44_ = _tmp43_;
+ _tmp35_ = config_facade_get_instance ();
#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp45_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp36_ = _tmp35_;
#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp46_ = _tmp45_;
+ _tmp37_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp47_ = is_string_empty (_tmp46_);
+ _tmp38_ = _tmp37_;
#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp31_ = !_tmp47_;
+ _tmp24_ = !is_string_empty (_tmp38_);
#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_free0 (_tmp46_);
+ _g_free0 (_tmp38_);
#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp44_);
-#line 2644 "CollectionPage.c"
+ _g_object_unref0 (_tmp36_);
+#line 2996 "CollectionPage.c"
} else {
#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp31_ = FALSE;
-#line 2648 "CollectionPage.c"
+ _tmp24_ = FALSE;
+#line 3000 "CollectionPage.c"
}
#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp31_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp24_);
#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp49_ = selection_has_videos;
+ _tmp40_ = selection_has_videos;
#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (!_tmp49_) {
-#line 2656 "CollectionPage.c"
- gboolean _tmp50_;
+ if (!_tmp40_) {
#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp50_ = collection_page_can_revert_selected (self);
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp48_ = _tmp50_;
-#line 2662 "CollectionPage.c"
+ _tmp39_ = collection_page_can_revert_selected (self);
+#line 3010 "CollectionPage.c"
} else {
#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp48_ = FALSE;
-#line 2666 "CollectionPage.c"
+ _tmp39_ = FALSE;
+#line 3014 "CollectionPage.c"
}
#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp48_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp39_);
#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp52_ = selection_has_videos;
+ _tmp42_ = selection_has_videos;
#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (!_tmp52_) {
-#line 2674 "CollectionPage.c"
- gboolean _tmp53_;
+ if (!_tmp42_) {
+#line 3022 "CollectionPage.c"
+ gboolean _tmp43_;
#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp53_ = has_selected;
+ _tmp43_ = has_selected;
#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp51_ = _tmp53_;
-#line 2680 "CollectionPage.c"
+ _tmp41_ = _tmp43_;
+#line 3028 "CollectionPage.c"
} else {
#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp51_ = FALSE;
-#line 2684 "CollectionPage.c"
+ _tmp41_ = FALSE;
+#line 3032 "CollectionPage.c"
}
#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp51_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp41_);
#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp56_ = selection_has_videos;
+ _tmp46_ = selection_has_videos;
#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (!_tmp56_) {
-#line 2692 "CollectionPage.c"
- gboolean _tmp57_;
+ if (!_tmp46_) {
+#line 3040 "CollectionPage.c"
+ gboolean _tmp47_;
#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp57_ = one_selected;
+ _tmp47_ = one_selected;
#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp55_ = _tmp57_;
-#line 2698 "CollectionPage.c"
+ _tmp45_ = _tmp47_;
+#line 3046 "CollectionPage.c"
} else {
#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp55_ = FALSE;
-#line 2702 "CollectionPage.c"
+ _tmp45_ = FALSE;
+#line 3050 "CollectionPage.c"
}
#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp55_) {
-#line 2706 "CollectionPage.c"
- ViewCollection* _tmp58_;
- ViewCollection* _tmp59_;
- DataView* _tmp60_;
- DataView* _tmp61_;
- DataSource* _tmp62_;
- Photo* _tmp63_;
- gboolean _tmp64_;
+ if (_tmp45_) {
+#line 3054 "CollectionPage.c"
+ ViewCollection* _tmp48_;
+ ViewCollection* _tmp49_;
+ DataView* _tmp50_;
+ DataView* _tmp51_;
+ DataSource* _tmp52_;
+ Photo* _tmp53_;
#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp58_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp48_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp59_ = _tmp58_;
+ _tmp49_ = _tmp48_;
#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp60_ = view_collection_get_selected_at (_tmp59_, 0);
+ _tmp50_ = view_collection_get_selected_at (_tmp49_, 0);
#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp61_ = _tmp60_;
+ _tmp51_ = _tmp50_;
#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp62_ = data_view_get_source (_tmp61_);
+ _tmp52_ = data_view_get_source (_tmp51_);
#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp63_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_PHOTO, Photo);
+ _tmp53_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_PHOTO, Photo);
#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp64_ = photo_has_color_adjustments (_tmp63_);
+ _tmp44_ = photo_has_color_adjustments (_tmp53_);
#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp54_ = _tmp64_;
+ _g_object_unref0 (_tmp53_);
#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp63_);
+ _g_object_unref0 (_tmp51_);
#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp61_);
-#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp59_);
-#line 2736 "CollectionPage.c"
+ _data_collection_unref0 (_tmp49_);
+#line 3081 "CollectionPage.c"
} else {
#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp54_ = FALSE;
-#line 2740 "CollectionPage.c"
+ _tmp44_ = FALSE;
+#line 3085 "CollectionPage.c"
}
#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp54_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp44_);
#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp67_ = selection_has_videos;
+ _tmp56_ = selection_has_videos;
#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (!_tmp67_) {
-#line 2748 "CollectionPage.c"
- gboolean _tmp68_;
+ if (!_tmp56_) {
+#line 3093 "CollectionPage.c"
+ gboolean _tmp57_;
#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp68_ = has_selected;
+ _tmp57_ = has_selected;
#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp66_ = _tmp68_;
-#line 2754 "CollectionPage.c"
+ _tmp55_ = _tmp57_;
+#line 3099 "CollectionPage.c"
} else {
#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp66_ = FALSE;
-#line 2758 "CollectionPage.c"
+ _tmp55_ = FALSE;
+#line 3103 "CollectionPage.c"
}
#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp66_) {
-#line 2762 "CollectionPage.c"
- gboolean _tmp69_;
-#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp69_ = pixel_transformation_bundle_has_copied_color_adjustments ();
+ if (_tmp55_) {
#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp65_ = _tmp69_;
-#line 2768 "CollectionPage.c"
+ _tmp54_ = pixel_transformation_bundle_has_copied_color_adjustments ();
+#line 3109 "CollectionPage.c"
} else {
#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp65_ = FALSE;
-#line 2772 "CollectionPage.c"
+ _tmp54_ = FALSE;
+#line 3113 "CollectionPage.c"
}
#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", _tmp65_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", _tmp54_);
#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp71_ = selection_has_videos;
+ _tmp59_ = selection_has_videos;
#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (!_tmp71_) {
-#line 2780 "CollectionPage.c"
- gboolean _tmp72_;
+ if (!_tmp59_) {
+#line 3121 "CollectionPage.c"
+ gboolean _tmp60_;
#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp72_ = has_selected;
+ _tmp60_ = has_selected;
#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp70_ = _tmp72_;
-#line 2786 "CollectionPage.c"
+ _tmp58_ = _tmp60_;
+#line 3127 "CollectionPage.c"
} else {
#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp70_ = FALSE;
-#line 2790 "CollectionPage.c"
+ _tmp58_ = FALSE;
+#line 3131 "CollectionPage.c"
}
#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp70_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp58_);
#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp74_ = selection_has_videos;
+ _tmp62_ = selection_has_videos;
#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (!_tmp74_) {
-#line 2798 "CollectionPage.c"
- gboolean _tmp75_;
+ if (!_tmp62_) {
+#line 3139 "CollectionPage.c"
+ gboolean _tmp63_;
#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp75_ = has_selected;
+ _tmp63_ = has_selected;
#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp73_ = _tmp75_;
-#line 2804 "CollectionPage.c"
+ _tmp61_ = _tmp63_;
+#line 3145 "CollectionPage.c"
} else {
#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp73_ = FALSE;
-#line 2808 "CollectionPage.c"
+ _tmp61_ = FALSE;
+#line 3149 "CollectionPage.c"
}
#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp73_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp61_);
#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp77_ = selection_has_videos;
+ _tmp65_ = selection_has_videos;
#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (!_tmp77_) {
-#line 2816 "CollectionPage.c"
- gboolean _tmp78_;
+ if (!_tmp65_) {
+#line 3157 "CollectionPage.c"
+ gboolean _tmp66_;
#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp78_ = has_selected;
+ _tmp66_ = has_selected;
#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp76_ = _tmp78_;
-#line 2822 "CollectionPage.c"
+ _tmp64_ = _tmp66_;
+#line 3163 "CollectionPage.c"
} else {
#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp76_ = FALSE;
-#line 2826 "CollectionPage.c"
+ _tmp64_ = FALSE;
+#line 3167 "CollectionPage.c"
}
#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp76_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp64_);
#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp80_ = selection_has_videos;
+ _tmp68_ = selection_has_videos;
#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (!_tmp80_) {
-#line 2834 "CollectionPage.c"
- gboolean _tmp81_;
+ if (!_tmp68_) {
+#line 3175 "CollectionPage.c"
+ gboolean _tmp69_;
#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp81_ = has_selected;
+ _tmp69_ = has_selected;
#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp79_ = _tmp81_;
-#line 2840 "CollectionPage.c"
+ _tmp67_ = _tmp69_;
+#line 3181 "CollectionPage.c"
} else {
#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp79_ = FALSE;
-#line 2844 "CollectionPage.c"
+ _tmp67_ = FALSE;
+#line 3185 "CollectionPage.c"
}
#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp79_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp67_);
#line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp82_ = has_selected;
+ _tmp70_ = has_selected;
#line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp82_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp70_);
#line 270 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp83_ = has_selected;
+ _tmp71_ = has_selected;
#line 270 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NewEvent", _tmp83_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NewEvent", _tmp71_);
#line 271 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp84_ = has_selected;
+ _tmp72_ = has_selected;
#line 271 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AddTags", _tmp84_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AddTags", _tmp72_);
#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp85_ = one_selected;
+ _tmp73_ = one_selected;
#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ModifyTags", _tmp85_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ModifyTags", _tmp73_);
#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp87_ = page_has_photos;
+ _tmp75_ = page_has_photos;
#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp87_) {
-#line 2868 "CollectionPage.c"
- gboolean _tmp88_;
+ if (_tmp75_) {
+#line 3209 "CollectionPage.c"
+ gboolean _tmp76_;
#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp88_ = primary_is_video;
+ _tmp76_ = primary_is_video;
#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp86_ = !_tmp88_;
-#line 2874 "CollectionPage.c"
+ _tmp74_ = !_tmp76_;
+#line 3215 "CollectionPage.c"
} else {
#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp86_ = FALSE;
-#line 2878 "CollectionPage.c"
+ _tmp74_ = FALSE;
+#line 3219 "CollectionPage.c"
}
#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Slideshow", _tmp86_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Slideshow", _tmp74_);
#line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp90_ = selection_has_videos;
+ _tmp78_ = selection_has_videos;
#line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (!_tmp90_) {
-#line 2886 "CollectionPage.c"
- gboolean _tmp91_;
+ if (!_tmp78_) {
+#line 3227 "CollectionPage.c"
+ gboolean _tmp79_;
#line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp91_ = has_selected;
+ _tmp79_ = has_selected;
#line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp89_ = _tmp91_;
-#line 2892 "CollectionPage.c"
+ _tmp77_ = _tmp79_;
+#line 3233 "CollectionPage.c"
} else {
#line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp89_ = FALSE;
-#line 2896 "CollectionPage.c"
+ _tmp77_ = FALSE;
+#line 3237 "CollectionPage.c"
}
#line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp89_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp77_);
#line 275 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp92_ = has_selected;
+ _tmp80_ = has_selected;
#line 275 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", _tmp92_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", _tmp80_);
#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp94_ = selection_has_videos;
+ _tmp82_ = selection_has_videos;
#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (!_tmp94_) {
-#line 2908 "CollectionPage.c"
- gboolean _tmp95_;
+ if (!_tmp82_) {
+#line 3249 "CollectionPage.c"
+ gboolean _tmp83_;
#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp95_ = has_selected;
+ _tmp83_ = has_selected;
#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp93_ = _tmp95_;
-#line 2914 "CollectionPage.c"
+ _tmp81_ = _tmp83_;
+#line 3255 "CollectionPage.c"
} else {
#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp93_ = FALSE;
-#line 2918 "CollectionPage.c"
+ _tmp81_ = FALSE;
+#line 3259 "CollectionPage.c"
}
#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp93_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp81_);
#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp96_ = has_selected;
+ _tmp84_ = has_selected;
#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp96_) {
-#line 2926 "CollectionPage.c"
- const gchar* _tmp97_ = NULL;
- gboolean _tmp98_;
+ if (_tmp84_) {
+#line 3267 "CollectionPage.c"
+ const gchar* _tmp85_ = NULL;
+ gboolean _tmp86_;
gchar* label = NULL;
- gchar* _tmp99_;
- const gchar* _tmp100_;
+ gchar* _tmp87_;
+ const gchar* _tmp88_;
#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_debug ("CollectionPage.vala:279: Setting action label for SetBackground...");
#line 280 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp98_ = one_selected;
+ _tmp86_ = one_selected;
#line 280 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp98_) {
+ if (_tmp86_) {
#line 281 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp97_ = RESOURCES_SET_BACKGROUND_MENU;
-#line 2940 "CollectionPage.c"
+ _tmp85_ = RESOURCES_SET_BACKGROUND_MENU;
+#line 3281 "CollectionPage.c"
} else {
#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp97_ = RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU;
-#line 2944 "CollectionPage.c"
+ _tmp85_ = RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU;
+#line 3285 "CollectionPage.c"
}
#line 280 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp99_ = g_strdup (_tmp97_);
+ _tmp87_ = g_strdup (_tmp85_);
#line 280 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- label = _tmp99_;
+ label = _tmp87_;
#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp100_ = label;
+ _tmp88_ = label;
#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp100_);
+ page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp88_);
#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_free0 (label);
-#line 2956 "CollectionPage.c"
+#line 3297 "CollectionPage.c"
}
}
-static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* altered) {
+static void
+collection_page_on_photos_altered (CollectionPage* self,
+ GeeMap* altered)
+{
#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (IS_COLLECTION_PAGE (self));
#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (GEE_IS_MAP (altered));
-#line 2966 "CollectionPage.c"
+#line 3310 "CollectionPage.c"
{
GeeIterator* _object_it = NULL;
- GeeMap* _tmp0_;
+ GeeSet* _tmp0_;
GeeSet* _tmp1_;
GeeSet* _tmp2_;
- GeeSet* _tmp3_;
+ GeeIterator* _tmp3_;
GeeIterator* _tmp4_;
- GeeIterator* _tmp5_;
#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp0_ = altered;
+ _tmp0_ = gee_map_get_keys (altered);
#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp1_ = gee_map_get_keys (_tmp0_);
+ _tmp1_ = _tmp0_;
#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp2_ = _tmp1_;
#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = _tmp2_;
-#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable));
#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp3_);
+ _g_object_unref0 (_tmp2_);
#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _object_it = _tmp5_;
+ _object_it = _tmp4_;
#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
while (TRUE) {
-#line 2993 "CollectionPage.c"
- GeeIterator* _tmp6_;
- gboolean _tmp7_;
+#line 3334 "CollectionPage.c"
+ GeeIterator* _tmp5_;
DataObject* object = NULL;
- GeeIterator* _tmp8_;
- gpointer _tmp9_;
+ GeeIterator* _tmp6_;
+ gpointer _tmp7_;
DataView* view = NULL;
- DataObject* _tmp10_;
+ DataObject* _tmp8_;
+ DataView* _tmp9_;
+ gboolean _tmp10_ = FALSE;
DataView* _tmp11_;
- gboolean _tmp12_ = FALSE;
- DataView* _tmp13_;
- gboolean _tmp14_;
LibraryPhoto* photo = NULL;
- DataView* _tmp20_;
- DataSource* _tmp21_;
- LibraryPhoto* _tmp22_;
- LibraryPhoto* _tmp23_;
- gboolean _tmp24_;
- LibraryPhoto* _tmp25_;
- gboolean _tmp26_;
-#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = _object_it;
+ DataView* _tmp15_;
+ DataSource* _tmp16_;
+ LibraryPhoto* _tmp17_;
+ LibraryPhoto* _tmp18_;
+ LibraryPhoto* _tmp19_;
#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = gee_iterator_next (_tmp6_);
+ _tmp5_ = _object_it;
#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (!_tmp7_) {
+ if (!gee_iterator_next (_tmp5_)) {
#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
break;
-#line 3021 "CollectionPage.c"
+#line 3356 "CollectionPage.c"
}
#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = _object_it;
+ _tmp6_ = _object_it;
#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = gee_iterator_get (_tmp8_);
+ _tmp7_ = gee_iterator_get (_tmp6_);
#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- object = (DataObject*) _tmp9_;
+ object = (DataObject*) _tmp7_;
#line 291 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp10_ = object;
+ _tmp8_ = object;
#line 291 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView));
+ _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView));
#line 291 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- view = _tmp11_;
-#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp13_ = view;
+ view = _tmp9_;
#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp14_ = data_view_is_selected (_tmp13_);
+ _tmp11_ = view;
#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (!_tmp14_) {
+ if (!data_view_is_selected (_tmp11_)) {
#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp12_ = TRUE;
-#line 3043 "CollectionPage.c"
+ _tmp10_ = TRUE;
+#line 3376 "CollectionPage.c"
} else {
- GeeMap* _tmp15_;
- DataView* _tmp16_;
- gpointer _tmp17_;
- Alteration* _tmp18_;
- gboolean _tmp19_;
+ DataView* _tmp12_;
+ gpointer _tmp13_;
+ Alteration* _tmp14_;
#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp15_ = altered;
+ _tmp12_ = view;
#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp16_ = view;
+ _tmp13_ = gee_map_get (altered, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp17_ = gee_map_get (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject));
+ _tmp14_ = (Alteration*) _tmp13_;
#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp18_ = (Alteration*) _tmp17_;
+ _tmp10_ = !alteration_has_subject (_tmp14_, "image");
#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp19_ = alteration_has_subject (_tmp18_, "image");
-#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp12_ = !_tmp19_;
-#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _alteration_unref0 (_tmp18_);
-#line 3064 "CollectionPage.c"
+ _alteration_unref0 (_tmp14_);
+#line 3391 "CollectionPage.c"
}
#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp12_) {
+ if (_tmp10_) {
#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (view);
#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (object);
#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
continue;
-#line 3074 "CollectionPage.c"
+#line 3401 "CollectionPage.c"
}
#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp20_ = view;
+ _tmp15_ = view;
#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp21_ = data_view_get_source (_tmp20_);
+ _tmp16_ = data_view_get_source (_tmp15_);
#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp22_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp21_) : NULL;
+ _tmp17_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp16_) : NULL;
#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp22_ == NULL) {
+ if (_tmp17_ == NULL) {
#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp21_);
-#line 3086 "CollectionPage.c"
+ _g_object_unref0 (_tmp16_);
+#line 3413 "CollectionPage.c"
}
#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- photo = _tmp22_;
+ photo = _tmp17_;
#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp23_ = photo;
+ _tmp18_ = photo;
#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp23_ == NULL) {
+ if (_tmp18_ == NULL) {
#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (photo);
#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3098,18 +3425,14 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
_g_object_unref0 (object);
#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
continue;
-#line 3102 "CollectionPage.c"
+#line 3429 "CollectionPage.c"
}
#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp24_ = collection_page_can_revert_selected (self);
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp24_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", collection_page_can_revert_selected (self));
#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp25_ = photo;
+ _tmp19_ = photo;
#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp26_ = photo_has_color_adjustments (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO, Photo));
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp26_);
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", photo_has_color_adjustments (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PHOTO, Photo)));
#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (photo);
#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3118,20 +3441,21 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
_g_object_unref0 (object);
#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
break;
-#line 3122 "CollectionPage.c"
+#line 3445 "CollectionPage.c"
}
#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (_object_it);
-#line 3126 "CollectionPage.c"
+#line 3449 "CollectionPage.c"
}
}
-static void collection_page_on_print (CollectionPage* self) {
+static void
+collection_page_on_print (CollectionPage* self)
+{
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- gint _tmp2_;
- gboolean _tmp3_;
+ gboolean _tmp2_;
#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (IS_COLLECTION_PAGE (self));
#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3139,53 +3463,52 @@ static void collection_page_on_print (CollectionPage* self) {
#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp1_ = _tmp0_;
#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = _tmp2_ > 0;
+ _tmp2_ = view_collection_get_selected_count (_tmp1_) > 0;
#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_data_collection_unref0 (_tmp1_);
#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp3_) {
-#line 3150 "CollectionPage.c"
+ if (_tmp2_) {
+#line 3472 "CollectionPage.c"
+ PrintManager* _tmp3_;
PrintManager* _tmp4_;
- PrintManager* _tmp5_;
+ ViewCollection* _tmp5_;
ViewCollection* _tmp6_;
- ViewCollection* _tmp7_;
- GeeList* _tmp8_;
- GeeCollection* _tmp9_;
+ GeeList* _tmp7_;
+ GeeCollection* _tmp8_;
#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = print_manager_get_instance ();
+ _tmp3_ = print_manager_get_instance ();
#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO);
+ _tmp7_ = view_collection_get_selected_sources_of_type (_tmp6_, TYPE_PHOTO);
#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
+ _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection);
#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- print_manager_spool_photo (_tmp5_, _tmp9_);
+ print_manager_spool_photo (_tmp4_, _tmp8_);
#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp9_);
+ _g_object_unref0 (_tmp8_);
#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp7_);
+ _data_collection_unref0 (_tmp6_);
#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _print_manager_unref0 (_tmp5_);
-#line 3177 "CollectionPage.c"
+ _print_manager_unref0 (_tmp4_);
+#line 3499 "CollectionPage.c"
}
}
-static void collection_page_on_external_app_changed (CollectionPage* self) {
+static void
+collection_page_on_external_app_changed (CollectionPage* self)
+{
gint selected_count = 0;
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
gint _tmp2_;
- gint _tmp3_;
- gboolean _tmp4_ = FALSE;
- gint _tmp5_;
+ gboolean _tmp3_ = FALSE;
+ gint _tmp4_;
#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (IS_COLLECTION_PAGE (self));
#line 317 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3195,64 +3518,65 @@ static void collection_page_on_external_app_changed (CollectionPage* self) {
#line 317 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp2_ = view_collection_get_selected_count (_tmp1_);
#line 317 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = _tmp2_;
-#line 317 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_data_collection_unref0 (_tmp1_);
#line 317 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- selected_count = _tmp3_;
+ selected_count = _tmp2_;
#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = selected_count;
+ _tmp4_ = selected_count;
#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp5_ == 1) {
-#line 3208 "CollectionPage.c"
+ if (_tmp4_ == 1) {
+#line 3529 "CollectionPage.c"
+ ConfigFacade* _tmp5_;
ConfigFacade* _tmp6_;
- ConfigFacade* _tmp7_;
+ gchar* _tmp7_;
gchar* _tmp8_;
- gchar* _tmp9_;
#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = config_facade_get_instance ();
+ _tmp5_ = config_facade_get_instance ();
#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+ _tmp7_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = g_strcmp0 (_tmp9_, "") != 0;
+ _tmp3_ = g_strcmp0 (_tmp8_, "") != 0;
#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_free0 (_tmp9_);
+ _g_free0 (_tmp8_);
#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp7_);
-#line 3227 "CollectionPage.c"
+ _g_object_unref0 (_tmp6_);
+#line 3548 "CollectionPage.c"
} else {
#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = FALSE;
-#line 3231 "CollectionPage.c"
+ _tmp3_ = FALSE;
+#line 3552 "CollectionPage.c"
}
#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp4_);
-#line 3235 "CollectionPage.c"
+ page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp3_);
+#line 3556 "CollectionPage.c"
}
-static void collection_page_real_on_item_activated (CheckerboardPage* base, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) {
+static void
+collection_page_real_on_item_activated (CheckerboardPage* base,
+ CheckerboardItem* item,
+ CheckerboardPageActivator activator,
+ CheckerboardPageKeyboardModifiers* modifiers)
+{
CollectionPage * self;
Thumbnail* thumbnail = NULL;
- CheckerboardItem* _tmp0_;
+ Thumbnail* _tmp0_;
Thumbnail* _tmp1_;
- Thumbnail* _tmp2_;
+ MediaSource* _tmp2_;
MediaSource* _tmp3_;
- MediaSource* _tmp4_;
- gboolean _tmp5_;
+ gboolean _tmp4_;
LibraryPhoto* photo = NULL;
- Thumbnail* _tmp6_;
- MediaSource* _tmp7_;
+ Thumbnail* _tmp5_;
+ MediaSource* _tmp6_;
+ LibraryPhoto* _tmp7_;
LibraryPhoto* _tmp8_;
LibraryPhoto* _tmp9_;
- LibraryPhoto* _tmp10_;
+ gchar* _tmp10_;
gchar* _tmp11_;
- gchar* _tmp12_;
- CheckerboardPageActivator _tmp13_;
#line 328 "/home/jens/Source/shotwell/src/CollectionPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
#line 328 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3260,147 +3584,140 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec
#line 328 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (modifiers != NULL);
#line 330 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp0_ = item;
-#line 330 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL, Thumbnail));
+ _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (item, TYPE_THUMBNAIL, Thumbnail));
#line 330 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- thumbnail = _tmp1_;
+ thumbnail = _tmp0_;
#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp2_ = thumbnail;
+ _tmp1_ = thumbnail;
#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = thumbnail_get_media_source (_tmp2_);
+ _tmp2_ = thumbnail_get_media_source (_tmp1_);
#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_VIDEO);
+ _tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_VIDEO);
#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp4_);
+ _g_object_unref0 (_tmp3_);
#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp5_) {
+ if (_tmp4_) {
#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
media_page_on_play_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage));
#line 337 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (thumbnail);
#line 337 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 3287 "CollectionPage.c"
+#line 3609 "CollectionPage.c"
}
#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = thumbnail;
+ _tmp5_ = thumbnail;
#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = thumbnail_get_media_source (_tmp6_);
+ _tmp6_ = thumbnail_get_media_source (_tmp5_);
#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp7_) : NULL;
+ _tmp7_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp6_) : NULL;
#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp8_ == NULL) {
+ if (_tmp7_ == NULL) {
#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp7_);
-#line 3299 "CollectionPage.c"
+ _g_object_unref0 (_tmp6_);
+#line 3621 "CollectionPage.c"
}
#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- photo = _tmp8_;
+ photo = _tmp7_;
#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = photo;
+ _tmp8_ = photo;
#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp9_ == NULL) {
+ if (_tmp8_ == NULL) {
#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (photo);
#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (thumbnail);
#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 3313 "CollectionPage.c"
+#line 3635 "CollectionPage.c"
}
#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp10_ = photo;
+ _tmp9_ = photo;
#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject));
+ _tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject));
#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp12_ = _tmp11_;
+ _tmp11_ = _tmp10_;
#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- g_debug ("CollectionPage.vala:345: activating %s", _tmp12_);
+ g_debug ("CollectionPage.vala:345: activating %s", _tmp11_);
#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_free0 (_tmp12_);
-#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp13_ = activator;
+ _g_free0 (_tmp11_);
#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp13_ == CHECKERBOARD_PAGE_ACTIVATOR_MOUSE) {
-#line 3329 "CollectionPage.c"
- CheckerboardPageKeyboardModifiers _tmp14_;
- gboolean _tmp15_;
+ if (activator == CHECKERBOARD_PAGE_ACTIVATOR_MOUSE) {
+#line 3649 "CollectionPage.c"
+ CheckerboardPageKeyboardModifiers _tmp12_;
+ gboolean _tmp13_;
#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp14_ = *modifiers;
+ _tmp12_ = *modifiers;
#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp15_ = _tmp14_.super_pressed;
+ _tmp13_ = _tmp12_.super_pressed;
#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp15_) {
+ if (_tmp13_) {
#line 349 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_external_edit (self);
-#line 3340 "CollectionPage.c"
+#line 3660 "CollectionPage.c"
} else {
- LibraryWindow* _tmp16_;
- LibraryWindow* _tmp17_;
- LibraryPhoto* _tmp18_;
+ LibraryWindow* _tmp14_;
+ LibraryWindow* _tmp15_;
+ LibraryPhoto* _tmp16_;
#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp16_ = library_window_get_app ();
+ _tmp14_ = library_window_get_app ();
#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp17_ = _tmp16_;
+ _tmp15_ = _tmp14_;
#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp18_ = photo;
+ _tmp16_ = photo;
#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- library_window_switch_to_photo_page (_tmp17_, self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo));
+ library_window_switch_to_photo_page (_tmp15_, self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO, Photo));
#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp17_);
-#line 3355 "CollectionPage.c"
+ _g_object_unref0 (_tmp15_);
+#line 3675 "CollectionPage.c"
}
} else {
- CheckerboardPageActivator _tmp19_;
#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp19_ = activator;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp19_ == CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD) {
-#line 3363 "CollectionPage.c"
- gboolean _tmp20_ = FALSE;
- CheckerboardPageKeyboardModifiers _tmp21_;
- gboolean _tmp22_;
+ if (activator == CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD) {
+#line 3680 "CollectionPage.c"
+ gboolean _tmp17_ = FALSE;
+ CheckerboardPageKeyboardModifiers _tmp18_;
+ gboolean _tmp19_;
#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp21_ = *modifiers;
+ _tmp18_ = *modifiers;
#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp22_ = _tmp21_.shift_pressed;
+ _tmp19_ = _tmp18_.shift_pressed;
#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (!_tmp22_) {
-#line 3373 "CollectionPage.c"
- CheckerboardPageKeyboardModifiers _tmp23_;
- gboolean _tmp24_;
+ if (!_tmp19_) {
+#line 3690 "CollectionPage.c"
+ CheckerboardPageKeyboardModifiers _tmp20_;
+ gboolean _tmp21_;
#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp23_ = *modifiers;
+ _tmp20_ = *modifiers;
#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp24_ = _tmp23_.ctrl_pressed;
+ _tmp21_ = _tmp20_.ctrl_pressed;
#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp20_ = !_tmp24_;
-#line 3382 "CollectionPage.c"
+ _tmp17_ = !_tmp21_;
+#line 3699 "CollectionPage.c"
} else {
#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp20_ = FALSE;
-#line 3386 "CollectionPage.c"
+ _tmp17_ = FALSE;
+#line 3703 "CollectionPage.c"
}
#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp20_) {
-#line 3390 "CollectionPage.c"
- LibraryWindow* _tmp25_;
- LibraryWindow* _tmp26_;
- LibraryPhoto* _tmp27_;
+ if (_tmp17_) {
+#line 3707 "CollectionPage.c"
+ LibraryWindow* _tmp22_;
+ LibraryWindow* _tmp23_;
+ LibraryPhoto* _tmp24_;
#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp25_ = library_window_get_app ();
+ _tmp22_ = library_window_get_app ();
#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp26_ = _tmp25_;
+ _tmp23_ = _tmp22_;
#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp27_ = photo;
+ _tmp24_ = photo;
#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- library_window_switch_to_photo_page (_tmp26_, self, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_PHOTO, Photo));
+ library_window_switch_to_photo_page (_tmp23_, self, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PHOTO, Photo));
#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp26_);
-#line 3404 "CollectionPage.c"
+ _g_object_unref0 (_tmp23_);
+#line 3721 "CollectionPage.c"
}
}
}
@@ -3408,42 +3725,44 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec
_g_object_unref0 (photo);
#line 328 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (thumbnail);
-#line 3412 "CollectionPage.c"
+#line 3729 "CollectionPage.c"
}
-static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey* event) {
+static gboolean
+collection_page_real_on_app_key_pressed (Page* base,
+ GdkEventKey* event)
+{
CollectionPage * self;
gboolean result = FALSE;
gboolean handled = FALSE;
- GdkEventKey* _tmp0_;
- guint _tmp1_;
+ guint _tmp0_;
+ const gchar* _tmp1_;
const gchar* _tmp2_;
- const gchar* _tmp3_;
- GQuark _tmp5_ = 0U;
+ GQuark _tmp4_ = 0U;
#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- static GQuark _tmp4_label0 = 0;
+ static GQuark _tmp3_label0 = 0;
#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- static GQuark _tmp4_label1 = 0;
+ static GQuark _tmp3_label1 = 0;
#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- static GQuark _tmp4_label2 = 0;
+ static GQuark _tmp3_label2 = 0;
#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- static GQuark _tmp4_label3 = 0;
+ static GQuark _tmp3_label3 = 0;
#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- static GQuark _tmp4_label4 = 0;
+ static GQuark _tmp3_label4 = 0;
#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- static GQuark _tmp4_label5 = 0;
+ static GQuark _tmp3_label5 = 0;
#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- static GQuark _tmp4_label6 = 0;
+ static GQuark _tmp3_label6 = 0;
#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- static GQuark _tmp4_label7 = 0;
+ static GQuark _tmp3_label7 = 0;
#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- static GQuark _tmp4_label8 = 0;
+ static GQuark _tmp3_label8 = 0;
#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- static GQuark _tmp4_label9 = 0;
-#line 3445 "CollectionPage.c"
- gboolean _tmp8_ = FALSE;
- gboolean _tmp9_;
+ static GQuark _tmp3_label9 = 0;
+#line 3764 "CollectionPage.c"
+ gboolean _tmp6_ = FALSE;
+ gboolean _tmp7_;
#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3451,107 +3770,102 @@ static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey
#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
handled = TRUE;
#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp0_ = event;
+ _tmp0_ = event->keyval;
#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp1_ = _tmp0_->keyval;
+ _tmp1_ = gdk_keyval_name (_tmp0_);
#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp2_ = gdk_keyval_name (_tmp1_);
-#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
+ _tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_);
#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if ((((((((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("Page_Up")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("KP_Page_Up"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("Page_Down"))))) || (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("KP_Page_Down"))))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("Home"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Home"))))) || (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("End"))))) || (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("KP_End"))))) {
+ if ((((((((_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Page_Up")))) || (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("KP_Page_Up"))))) || (_tmp4_ == ((0 != _tmp3_label2) ? _tmp3_label2 : (_tmp3_label2 = g_quark_from_static_string ("Page_Down"))))) || (_tmp4_ == ((0 != _tmp3_label3) ? _tmp3_label3 : (_tmp3_label3 = g_quark_from_static_string ("KP_Page_Down"))))) || (_tmp4_ == ((0 != _tmp3_label4) ? _tmp3_label4 : (_tmp3_label4 = g_quark_from_static_string ("Home"))))) || (_tmp4_ == ((0 != _tmp3_label5) ? _tmp3_label5 : (_tmp3_label5 = g_quark_from_static_string ("KP_Home"))))) || (_tmp4_ == ((0 != _tmp3_label6) ? _tmp3_label6 : (_tmp3_label6 = g_quark_from_static_string ("End"))))) || (_tmp4_ == ((0 != _tmp3_label7) ? _tmp3_label7 : (_tmp3_label7 = g_quark_from_static_string ("KP_End"))))) {
#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
switch (0) {
-#line 3468 "CollectionPage.c"
+#line 3785 "CollectionPage.c"
default:
{
- GdkEventKey* _tmp6_;
- gboolean _tmp7_ = FALSE;
-#line 369 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = event;
+ gboolean _tmp5_ = FALSE;
#line 369 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp6_, &_tmp7_);
+ g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "key-press-event", event, &_tmp5_);
#line 370 "/home/jens/Source/shotwell/src/CollectionPage.vala"
break;
-#line 3479 "CollectionPage.c"
+#line 3793 "CollectionPage.c"
}
}
- } else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("bracketright")))) {
+ } else if (_tmp4_ == ((0 != _tmp3_label8) ? _tmp3_label8 : (_tmp3_label8 = g_quark_from_static_string ("bracketright")))) {
#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
switch (0) {
-#line 3485 "CollectionPage.c"
+#line 3799 "CollectionPage.c"
default:
{
#line 373 "/home/jens/Source/shotwell/src/CollectionPage.vala"
page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
#line 374 "/home/jens/Source/shotwell/src/CollectionPage.vala"
break;
-#line 3492 "CollectionPage.c"
+#line 3806 "CollectionPage.c"
}
}
- } else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("bracketleft")))) {
+ } else if (_tmp4_ == ((0 != _tmp3_label9) ? _tmp3_label9 : (_tmp3_label9 = g_quark_from_static_string ("bracketleft")))) {
#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
switch (0) {
-#line 3498 "CollectionPage.c"
+#line 3812 "CollectionPage.c"
default:
{
#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise");
#line 378 "/home/jens/Source/shotwell/src/CollectionPage.vala"
break;
-#line 3505 "CollectionPage.c"
+#line 3819 "CollectionPage.c"
}
}
} else {
#line 360 "/home/jens/Source/shotwell/src/CollectionPage.vala"
switch (0) {
-#line 3511 "CollectionPage.c"
+#line 3825 "CollectionPage.c"
default:
{
#line 381 "/home/jens/Source/shotwell/src/CollectionPage.vala"
handled = FALSE;
#line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala"
break;
-#line 3518 "CollectionPage.c"
+#line 3832 "CollectionPage.c"
}
}
}
#line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = handled;
+ _tmp7_ = handled;
#line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp9_) {
+ if (_tmp7_) {
#line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = TRUE;
-#line 3528 "CollectionPage.c"
+ _tmp6_ = TRUE;
+#line 3842 "CollectionPage.c"
} else {
- GdkEventKey* _tmp10_;
- gboolean _tmp11_;
#line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp10_ = event;
-#line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp11_ = PAGE_CLASS (collection_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp10_);
-#line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = _tmp11_;
-#line 3538 "CollectionPage.c"
+ _tmp6_ = PAGE_CLASS (collection_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), event);
+#line 3846 "CollectionPage.c"
}
#line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- result = _tmp8_;
+ result = _tmp6_;
#line 385 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 3544 "CollectionPage.c"
+#line 3852 "CollectionPage.c"
}
-static void _collection_page_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) {
+static void
+_collection_page_on_export_completed_exporter_completion_callback (Exporter* exporter,
+ gboolean is_cancelled,
+ gpointer self)
+{
#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_on_export_completed ((CollectionPage*) self);
-#line 3551 "CollectionPage.c"
+#line 3863 "CollectionPage.c"
}
-static void collection_page_real_on_export (MediaPage* base) {
+static void
+collection_page_real_on_export (MediaPage* base)
+{
CollectionPage * self;
ExporterUI* _tmp0_;
GeeCollection* export_list = NULL;
@@ -3563,45 +3877,43 @@ static void collection_page_real_on_export (MediaPage* base) {
gint _tmp6_;
gint _tmp7_;
gboolean has_some_photos = FALSE;
- gboolean _tmp8_;
gboolean has_some_videos = FALSE;
+ gboolean _tmp8_ = FALSE;
gboolean _tmp9_;
- gboolean _tmp10_ = FALSE;
gboolean _tmp11_;
- gboolean _tmp13_;
gchar* title = NULL;
- gboolean _tmp16_;
+ gboolean _tmp14_;
ExportDialog* export_dialog = NULL;
- const gchar* _tmp25_;
- ExportDialog* _tmp26_;
- ExportFormatParameters _tmp27_ = {0};
- gboolean _tmp28_;
+ const gchar* _tmp23_;
+ ExportDialog* _tmp24_;
+ ExportFormatParameters _tmp25_ = {0};
+ gboolean _tmp26_;
ExportFormatParameters export_params = {0};
gint scale = 0;
ScaleConstraint constraint = 0;
- ExportDialog* _tmp31_;
- gint _tmp32_ = 0;
- ScaleConstraint _tmp33_ = 0;
- gboolean _tmp34_;
+ ExportDialog* _tmp29_;
+ gint _tmp30_ = 0;
+ ScaleConstraint _tmp31_ = 0;
+ gboolean _tmp32_;
Scaling scaling = {0};
- ScaleConstraint _tmp35_;
- gint _tmp36_;
- Scaling _tmp37_ = {0};
- GeeCollection* _tmp38_;
- gint _tmp39_;
- gint _tmp40_;
+ ScaleConstraint _tmp33_;
+ gint _tmp34_;
+ Scaling _tmp35_ = {0};
+ GeeCollection* _tmp36_;
+ gint _tmp37_;
+ gint _tmp38_;
GFile* export_dir = NULL;
- const gchar* _tmp75_;
- GFile* _tmp76_;
- GFile* _tmp77_;
- GeeCollection* _tmp78_;
- GFile* _tmp79_;
- Scaling _tmp80_;
- ExportFormatParameters _tmp81_;
- Exporter* _tmp82_;
- Exporter* _tmp83_;
- ExporterUI* _tmp84_;
- ExporterUI* _tmp85_;
+ const gchar* _tmp71_;
+ GFile* _tmp72_;
+ GFile* _tmp73_;
+ GeeCollection* _tmp74_;
+ GFile* _tmp75_;
+ Scaling _tmp76_;
+ ExportFormatParameters _tmp77_;
+ Exporter* _tmp78_;
+ Exporter* _tmp79_;
+ ExporterUI* _tmp80_;
+ ExporterUI* _tmp81_;
GError * _inner_error_ = NULL;
#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
@@ -3611,7 +3923,7 @@ static void collection_page_real_on_export (MediaPage* base) {
if (_tmp0_ != NULL) {
#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 3615 "CollectionPage.c"
+#line 3927 "CollectionPage.c"
}
#line 392 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -3637,136 +3949,132 @@ static void collection_page_real_on_export (MediaPage* base) {
_g_object_unref0 (export_list);
#line 395 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 3641 "CollectionPage.c"
+#line 3953 "CollectionPage.c"
}
#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = collection_page_selection_has_photo (self);
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- has_some_photos = _tmp8_;
+ has_some_photos = collection_page_selection_has_photo (self);
#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = collection_page_selection_has_video (self);
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- has_some_videos = _tmp9_;
+ has_some_videos = collection_page_selection_has_video (self);
#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp11_ = has_some_photos;
+ _tmp9_ = has_some_photos;
#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp11_) {
+ if (_tmp9_) {
#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp10_ = TRUE;
-#line 3657 "CollectionPage.c"
+ _tmp8_ = TRUE;
+#line 3965 "CollectionPage.c"
} else {
- gboolean _tmp12_;
+ gboolean _tmp10_;
#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp12_ = has_some_videos;
+ _tmp10_ = has_some_videos;
#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp10_ = _tmp12_;
-#line 3664 "CollectionPage.c"
+ _tmp8_ = _tmp10_;
+#line 3972 "CollectionPage.c"
}
#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _vala_assert (_tmp10_, "has_some_photos || has_some_videos");
+ _vala_assert (_tmp8_, "has_some_photos || has_some_videos");
#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp13_ = has_some_photos;
+ _tmp11_ = has_some_photos;
#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (!_tmp13_) {
-#line 3672 "CollectionPage.c"
- GeeCollection* _tmp14_;
- ExporterUI* _tmp15_;
+ if (!_tmp11_) {
+#line 3980 "CollectionPage.c"
+ GeeCollection* _tmp12_;
+ ExporterUI* _tmp13_;
#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp14_ = export_list;
+ _tmp12_ = export_list;
#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp15_ = video_export_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _collection_page_on_export_completed_exporter_completion_callback, self, FALSE);
+ _tmp13_ = video_export_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _collection_page_on_export_completed_exporter_completion_callback, self, FALSE);
#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_exporter_ui_unref0 (self->priv->exporter);
#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- self->priv->exporter = _tmp15_;
+ self->priv->exporter = _tmp13_;
#line 405 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (export_list);
#line 405 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 3687 "CollectionPage.c"
+#line 3995 "CollectionPage.c"
}
#line 408 "/home/jens/Source/shotwell/src/CollectionPage.vala"
title = NULL;
#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp16_ = has_some_videos;
+ _tmp14_ = has_some_videos;
#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp16_) {
-#line 3695 "CollectionPage.c"
- GeeCollection* _tmp17_;
- gint _tmp18_;
- gint _tmp19_;
- gchar* _tmp20_;
+ if (_tmp14_) {
+#line 4003 "CollectionPage.c"
+ GeeCollection* _tmp15_;
+ gint _tmp16_;
+ gint _tmp17_;
+ gchar* _tmp18_;
#line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp17_ = export_list;
+ _tmp15_ = export_list;
#line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp18_ = gee_collection_get_size (_tmp17_);
+ _tmp16_ = gee_collection_get_size (_tmp15_);
#line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp19_ = _tmp18_;
+ _tmp17_ = _tmp16_;
#line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp20_ = g_strdup (ngettext ("Export Photo/Video", "Export Photos/Videos", (gulong) _tmp19_));
+ _tmp18_ = g_strdup (ngettext ("Export Photo/Video", "Export Photos/Videos", (gulong) _tmp17_));
#line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_free0 (title);
#line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- title = _tmp20_;
-#line 3712 "CollectionPage.c"
+ title = _tmp18_;
+#line 4020 "CollectionPage.c"
} else {
- GeeCollection* _tmp21_;
- gint _tmp22_;
- gint _tmp23_;
- gchar* _tmp24_;
+ GeeCollection* _tmp19_;
+ gint _tmp20_;
+ gint _tmp21_;
+ gchar* _tmp22_;
#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp21_ = export_list;
+ _tmp19_ = export_list;
#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp22_ = gee_collection_get_size (_tmp21_);
+ _tmp20_ = gee_collection_get_size (_tmp19_);
#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp23_ = _tmp22_;
+ _tmp21_ = _tmp20_;
#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp24_ = g_strdup (ngettext ("Export Photo", "Export Photos", (gulong) _tmp23_));
+ _tmp22_ = g_strdup (ngettext ("Export Photo", "Export Photos", (gulong) _tmp21_));
#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_free0 (title);
#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- title = _tmp24_;
-#line 3730 "CollectionPage.c"
+ title = _tmp22_;
+#line 4038 "CollectionPage.c"
}
#line 413 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp25_ = title;
+ _tmp23_ = title;
#line 413 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp26_ = export_dialog_new (_tmp25_);
+ _tmp24_ = export_dialog_new (_tmp23_);
#line 413 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- g_object_ref_sink (_tmp26_);
+ g_object_ref_sink (_tmp24_);
#line 413 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- export_dialog = _tmp26_;
+ export_dialog = _tmp24_;
#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp28_ = has_some_videos;
+ _tmp26_ = has_some_videos;
#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp28_) {
-#line 3744 "CollectionPage.c"
- ExportFormatParameters _tmp29_ = {0};
+ if (_tmp26_) {
+#line 4052 "CollectionPage.c"
+ ExportFormatParameters _tmp27_ = {0};
#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- export_format_parameters_current (&_tmp29_);
+ export_format_parameters_current (&_tmp27_);
#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp27_ = _tmp29_;
-#line 3750 "CollectionPage.c"
+ _tmp25_ = _tmp27_;
+#line 4058 "CollectionPage.c"
} else {
- ExportFormatParameters _tmp30_ = {0};
+ ExportFormatParameters _tmp28_ = {0};
#line 424 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- export_format_parameters_last (&_tmp30_);
+ export_format_parameters_last (&_tmp28_);
#line 424 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp27_ = _tmp30_;
-#line 3757 "CollectionPage.c"
+ _tmp25_ = _tmp28_;
+#line 4065 "CollectionPage.c"
}
#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- export_params = _tmp27_;
+ export_params = _tmp25_;
#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp31_ = export_dialog;
+ _tmp29_ = export_dialog;
#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp34_ = export_dialog_execute (_tmp31_, &_tmp32_, &_tmp33_, &export_params);
+ _tmp32_ = export_dialog_execute (_tmp29_, &_tmp30_, &_tmp31_, &export_params);
#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- scale = _tmp32_;
+ scale = _tmp30_;
#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- constraint = _tmp33_;
+ constraint = _tmp31_;
#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (!_tmp34_) {
+ if (!_tmp32_) {
#line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (export_dialog);
#line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3775,111 +4083,108 @@ static void collection_page_real_on_export (MediaPage* base) {
_g_object_unref0 (export_list);
#line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 3779 "CollectionPage.c"
+#line 4087 "CollectionPage.c"
}
#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp35_ = constraint;
+ _tmp33_ = constraint;
#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp36_ = scale;
+ _tmp34_ = scale;
#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- scaling_for_constraint (_tmp35_, _tmp36_, FALSE, &_tmp37_);
+ scaling_for_constraint (_tmp33_, _tmp34_, FALSE, &_tmp35_);
#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- scaling = _tmp37_;
+ scaling = _tmp35_;
#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp38_ = export_list;
+ _tmp36_ = export_list;
#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp39_ = gee_collection_get_size (_tmp38_);
+ _tmp37_ = gee_collection_get_size (_tmp36_);
#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp40_ = _tmp39_;
+ _tmp38_ = _tmp37_;
#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp40_ == 1) {
-#line 3797 "CollectionPage.c"
+ if (_tmp38_ == 1) {
+#line 4105 "CollectionPage.c"
LibraryPhoto* photo = NULL;
GFile* save_as = NULL;
- LibraryPhoto* _tmp49_;
- ExportFormatParameters _tmp50_;
- gchar* _tmp51_;
- gchar* _tmp52_;
- GFile* _tmp53_;
- GFile* _tmp54_;
- GFile* _tmp55_;
+ LibraryPhoto* _tmp46_;
+ ExportFormatParameters _tmp47_;
+ gchar* _tmp48_;
+ gchar* _tmp49_;
+ GFile* _tmp50_;
+ GFile* _tmp51_;
+ GFile* _tmp52_;
#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
photo = NULL;
-#line 3809 "CollectionPage.c"
+#line 4117 "CollectionPage.c"
{
GeeIterator* _p_it = NULL;
- GeeCollection* _tmp41_;
- GeeIterator* _tmp42_;
+ GeeCollection* _tmp39_;
+ GeeIterator* _tmp40_;
#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp41_ = export_list;
+ _tmp39_ = export_list;
#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp42_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp40_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection), GEE_TYPE_ITERABLE, GeeIterable));
#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _p_it = _tmp42_;
+ _p_it = _tmp40_;
#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
while (TRUE) {
-#line 3822 "CollectionPage.c"
- GeeIterator* _tmp43_;
- gboolean _tmp44_;
+#line 4130 "CollectionPage.c"
+ GeeIterator* _tmp41_;
LibraryPhoto* p = NULL;
- GeeIterator* _tmp45_;
- gpointer _tmp46_;
- LibraryPhoto* _tmp47_;
- LibraryPhoto* _tmp48_;
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp43_ = _p_it;
+ GeeIterator* _tmp42_;
+ gpointer _tmp43_;
+ LibraryPhoto* _tmp44_;
+ LibraryPhoto* _tmp45_;
#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp44_ = gee_iterator_next (_tmp43_);
+ _tmp41_ = _p_it;
#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (!_tmp44_) {
+ if (!gee_iterator_next (_tmp41_)) {
#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
break;
-#line 3838 "CollectionPage.c"
+#line 4143 "CollectionPage.c"
}
#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp45_ = _p_it;
+ _tmp42_ = _p_it;
#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp46_ = gee_iterator_get (_tmp45_);
+ _tmp43_ = gee_iterator_get (_tmp42_);
#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- p = (LibraryPhoto*) _tmp46_;
+ p = (LibraryPhoto*) _tmp43_;
#line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp47_ = p;
+ _tmp44_ = p;
#line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp48_ = _g_object_ref0 (_tmp47_);
+ _tmp45_ = _g_object_ref0 (_tmp44_);
#line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (photo);
#line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- photo = _tmp48_;
+ photo = _tmp45_;
#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (p);
#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
break;
-#line 3858 "CollectionPage.c"
+#line 4163 "CollectionPage.c"
}
#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (_p_it);
-#line 3862 "CollectionPage.c"
+#line 4167 "CollectionPage.c"
}
#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp49_ = photo;
+ _tmp46_ = photo;
#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp50_ = export_params;
+ _tmp47_ = export_params;
#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp51_ = photo_get_export_basename_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_PHOTO, Photo), &_tmp50_);
+ _tmp48_ = photo_get_export_basename_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_PHOTO, Photo), &_tmp47_);
#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp52_ = _tmp51_;
+ _tmp49_ = _tmp48_;
#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp53_ = export_ui_choose_file (_tmp52_);
+ _tmp50_ = export_ui_choose_file (_tmp49_);
#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp54_ = _tmp53_;
+ _tmp51_ = _tmp50_;
#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_free0 (_tmp52_);
+ _g_free0 (_tmp49_);
#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- save_as = _tmp54_;
+ save_as = _tmp51_;
#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp55_ = save_as;
+ _tmp52_ = save_as;
#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp55_ == NULL) {
+ if (_tmp52_ == NULL) {
#line 444 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (save_as);
#line 444 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -3892,100 +4197,97 @@ static void collection_page_real_on_export (MediaPage* base) {
_g_object_unref0 (export_list);
#line 444 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 3896 "CollectionPage.c"
+#line 4201 "CollectionPage.c"
}
{
- AppWindow* _tmp56_;
- AppWindow* _tmp57_;
- LibraryPhoto* _tmp58_;
- GFile* _tmp59_;
- Scaling _tmp60_;
+ AppWindow* _tmp53_;
+ AppWindow* _tmp54_;
+ LibraryPhoto* _tmp55_;
+ GFile* _tmp56_;
+ Scaling _tmp57_;
+ ExportFormatParameters _tmp58_;
+ JpegQuality _tmp59_;
+ LibraryPhoto* _tmp60_;
ExportFormatParameters _tmp61_;
- JpegQuality _tmp62_;
- LibraryPhoto* _tmp63_;
+ ExportFormatParameters _tmp62_;
+ ExportFormatMode _tmp63_;
ExportFormatParameters _tmp64_;
- PhotoFileFormat _tmp65_;
- ExportFormatParameters _tmp66_;
- ExportFormatMode _tmp67_;
- ExportFormatParameters _tmp68_;
- gboolean _tmp69_;
- AppWindow* _tmp70_;
- AppWindow* _tmp71_;
+ gboolean _tmp65_;
+ AppWindow* _tmp66_;
+ AppWindow* _tmp67_;
#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp56_ = app_window_get_instance ();
+ _tmp53_ = app_window_get_instance ();
#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp57_ = _tmp56_;
+ _tmp54_ = _tmp53_;
#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_PAGE_WINDOW, PageWindow));
+ page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_PAGE_WINDOW, PageWindow));
#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp57_);
+ _g_object_unref0 (_tmp54_);
#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp58_ = photo;
+ _tmp55_ = photo;
#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp59_ = save_as;
+ _tmp56_ = save_as;
#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp60_ = scaling;
+ _tmp57_ = scaling;
#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp61_ = export_params;
-#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp62_ = _tmp61_.quality;
+ _tmp58_ = export_params;
#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp63_ = photo;
+ _tmp59_ = _tmp58_.quality;
#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp64_ = export_params;
+ _tmp60_ = photo;
#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp65_ = photo_get_export_format_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_PHOTO, Photo), &_tmp64_);
+ _tmp61_ = export_params;
#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp66_ = export_params;
+ _tmp62_ = export_params;
#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp67_ = _tmp66_.mode;
+ _tmp63_ = _tmp62_.mode;
#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp68_ = export_params;
+ _tmp64_ = export_params;
#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp69_ = _tmp68_.export_metadata;
+ _tmp65_ = _tmp64_.export_metadata;
#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_PHOTO, Photo), _tmp59_, &_tmp60_, _tmp62_, _tmp65_, _tmp67_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp69_, &_inner_error_);
+ photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_PHOTO, Photo), _tmp56_, &_tmp57_, _tmp59_, photo_get_export_format_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_PHOTO, Photo), &_tmp61_), _tmp63_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp65_, &_inner_error_);
#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3951 "CollectionPage.c"
+#line 4253 "CollectionPage.c"
goto __catch245_g_error;
}
#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp70_ = app_window_get_instance ();
+ _tmp66_ = app_window_get_instance ();
#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp71_ = _tmp70_;
+ _tmp67_ = _tmp66_;
#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, TYPE_PAGE_WINDOW, PageWindow));
+ page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_PAGE_WINDOW, PageWindow));
#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp71_);
-#line 3962 "CollectionPage.c"
+ _g_object_unref0 (_tmp67_);
+#line 4264 "CollectionPage.c"
}
goto __finally245;
__catch245_g_error:
{
GError* err = NULL;
- AppWindow* _tmp72_;
- AppWindow* _tmp73_;
- GFile* _tmp74_;
+ AppWindow* _tmp68_;
+ AppWindow* _tmp69_;
+ GFile* _tmp70_;
#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
err = _inner_error_;
#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_inner_error_ = NULL;
#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp72_ = app_window_get_instance ();
+ _tmp68_ = app_window_get_instance ();
#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp73_ = _tmp72_;
+ _tmp69_ = _tmp68_;
#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_PAGE_WINDOW, PageWindow));
+ page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_PAGE_WINDOW, PageWindow));
#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp73_);
+ _g_object_unref0 (_tmp69_);
#line 454 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp74_ = save_as;
+ _tmp70_ = save_as;
#line 454 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- export_error_dialog (_tmp74_, FALSE);
+ export_error_dialog (_tmp70_, FALSE);
#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_error_free0 (err);
-#line 3989 "CollectionPage.c"
+#line 4291 "CollectionPage.c"
}
__finally245:
#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4006,7 +4308,7 @@ static void collection_page_real_on_export (MediaPage* base) {
g_clear_error (&_inner_error_);
#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 4010 "CollectionPage.c"
+#line 4312 "CollectionPage.c"
}
#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (save_as);
@@ -4020,18 +4322,18 @@ static void collection_page_real_on_export (MediaPage* base) {
_g_object_unref0 (export_list);
#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 4024 "CollectionPage.c"
+#line 4326 "CollectionPage.c"
}
#line 461 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp75_ = title;
+ _tmp71_ = title;
#line 461 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp76_ = export_ui_choose_dir (_tmp75_);
+ _tmp72_ = export_ui_choose_dir (_tmp71_);
#line 461 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- export_dir = _tmp76_;
+ export_dir = _tmp72_;
#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp77_ = export_dir;
+ _tmp73_ = export_dir;
#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp77_ == NULL) {
+ if (_tmp73_ == NULL) {
#line 463 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (export_dir);
#line 463 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4042,32 +4344,32 @@ static void collection_page_real_on_export (MediaPage* base) {
_g_object_unref0 (export_list);
#line 463 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 4046 "CollectionPage.c"
+#line 4348 "CollectionPage.c"
}
#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp78_ = export_list;
+ _tmp74_ = export_list;
#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp79_ = export_dir;
+ _tmp75_ = export_dir;
#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp80_ = scaling;
+ _tmp76_ = scaling;
#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp81_ = export_params;
+ _tmp77_ = export_params;
#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp82_ = exporter_new (_tmp78_, _tmp79_, &_tmp80_, &_tmp81_, FALSE);
+ _tmp78_ = exporter_new (_tmp74_, _tmp75_, &_tmp76_, &_tmp77_, FALSE);
#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp83_ = _tmp82_;
+ _tmp79_ = _tmp78_;
#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp84_ = exporter_ui_new (_tmp83_);
+ _tmp80_ = exporter_ui_new (_tmp79_);
#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_exporter_ui_unref0 (self->priv->exporter);
#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- self->priv->exporter = _tmp84_;
+ self->priv->exporter = _tmp80_;
#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp83_);
+ _g_object_unref0 (_tmp79_);
#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp85_ = self->priv->exporter;
+ _tmp81_ = self->priv->exporter;
#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- exporter_ui_export (_tmp85_, _collection_page_on_export_completed_exporter_completion_callback, self);
+ exporter_ui_export (_tmp81_, _collection_page_on_export_completed_exporter_completion_callback, self);
#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (export_dir);
#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4076,26 +4378,30 @@ static void collection_page_real_on_export (MediaPage* base) {
_g_free0 (title);
#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (export_list);
-#line 4080 "CollectionPage.c"
+#line 4382 "CollectionPage.c"
}
-static void collection_page_on_export_completed (CollectionPage* self) {
+static void
+collection_page_on_export_completed (CollectionPage* self)
+{
#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (IS_COLLECTION_PAGE (self));
#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_exporter_ui_unref0 (self->priv->exporter);
#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
self->priv->exporter = NULL;
-#line 4091 "CollectionPage.c"
+#line 4395 "CollectionPage.c"
}
-static gboolean collection_page_can_revert_selected (CollectionPage* self) {
+static gboolean
+collection_page_can_revert_selected (CollectionPage* self)
+{
gboolean result = FALSE;
#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 4099 "CollectionPage.c"
+#line 4405 "CollectionPage.c"
{
GeeList* _source_list = NULL;
ViewCollection* _tmp0_;
@@ -4131,7 +4437,7 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
_source_index = -1;
#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
while (TRUE) {
-#line 4135 "CollectionPage.c"
+#line 4441 "CollectionPage.c"
gint _tmp7_;
gint _tmp8_;
gint _tmp9_;
@@ -4156,7 +4462,7 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
if (!(_tmp8_ < _tmp9_)) {
#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
break;
-#line 4160 "CollectionPage.c"
+#line 4466 "CollectionPage.c"
}
#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp10_ = _source_list;
@@ -4176,37 +4482,31 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
_tmp16_ = photo;
#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if (_tmp16_ != NULL) {
-#line 4180 "CollectionPage.c"
+#line 4486 "CollectionPage.c"
gboolean _tmp17_ = FALSE;
LibraryPhoto* _tmp18_;
- gboolean _tmp19_;
#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp18_ = photo;
#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp19_ = photo_has_transformations (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo));
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp19_) {
+ if (photo_has_transformations (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo))) {
#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp17_ = TRUE;
-#line 4192 "CollectionPage.c"
+#line 4495 "CollectionPage.c"
} else {
- LibraryPhoto* _tmp20_;
- gboolean _tmp21_;
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp20_ = photo;
+ LibraryPhoto* _tmp19_;
#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp21_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo));
+ _tmp19_ = photo;
#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp17_ = _tmp21_;
-#line 4202 "CollectionPage.c"
+ _tmp17_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PHOTO, Photo));
+#line 4502 "CollectionPage.c"
}
#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp15_ = _tmp17_;
-#line 4206 "CollectionPage.c"
+#line 4506 "CollectionPage.c"
} else {
#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp15_ = FALSE;
-#line 4210 "CollectionPage.c"
+#line 4510 "CollectionPage.c"
}
#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if (_tmp15_) {
@@ -4220,31 +4520,33 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
_g_object_unref0 (_source_list);
#line 477 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 4224 "CollectionPage.c"
+#line 4524 "CollectionPage.c"
}
#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (photo);
#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (source);
-#line 4230 "CollectionPage.c"
+#line 4530 "CollectionPage.c"
}
#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (_source_list);
-#line 4234 "CollectionPage.c"
+#line 4534 "CollectionPage.c"
}
#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
result = FALSE;
#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 4240 "CollectionPage.c"
+#line 4540 "CollectionPage.c"
}
-static gboolean collection_page_can_revert_editable_selected (CollectionPage* self) {
+static gboolean
+collection_page_can_revert_editable_selected (CollectionPage* self)
+{
gboolean result = FALSE;
#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 4248 "CollectionPage.c"
+#line 4550 "CollectionPage.c"
{
GeeList* _source_list = NULL;
ViewCollection* _tmp0_;
@@ -4280,7 +4582,7 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
_source_index = -1;
#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
while (TRUE) {
-#line 4284 "CollectionPage.c"
+#line 4586 "CollectionPage.c"
gint _tmp7_;
gint _tmp8_;
gint _tmp9_;
@@ -4305,7 +4607,7 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
if (!(_tmp8_ < _tmp9_)) {
#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
break;
-#line 4309 "CollectionPage.c"
+#line 4611 "CollectionPage.c"
}
#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp10_ = _source_list;
@@ -4325,20 +4627,17 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
_tmp16_ = photo;
#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if (_tmp16_ != NULL) {
-#line 4329 "CollectionPage.c"
+#line 4631 "CollectionPage.c"
LibraryPhoto* _tmp17_;
- gboolean _tmp18_;
#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp17_ = photo;
#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp18_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo));
-#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp15_ = _tmp18_;
-#line 4338 "CollectionPage.c"
+ _tmp15_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo));
+#line 4637 "CollectionPage.c"
} else {
#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp15_ = FALSE;
-#line 4342 "CollectionPage.c"
+#line 4641 "CollectionPage.c"
}
#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if (_tmp15_) {
@@ -4352,41 +4651,42 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
_g_object_unref0 (_source_list);
#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 4356 "CollectionPage.c"
+#line 4655 "CollectionPage.c"
}
#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (photo);
#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (source);
-#line 4362 "CollectionPage.c"
+#line 4661 "CollectionPage.c"
}
#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (_source_list);
-#line 4366 "CollectionPage.c"
+#line 4665 "CollectionPage.c"
}
#line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala"
result = FALSE;
#line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 4372 "CollectionPage.c"
+#line 4671 "CollectionPage.c"
}
-static void collection_page_on_rotate_clockwise (CollectionPage* self) {
+static void
+collection_page_on_rotate_clockwise (CollectionPage* self)
+{
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- gint _tmp2_;
- gboolean _tmp3_;
+ gboolean _tmp2_;
RotateMultipleCommand* command = NULL;
+ ViewCollection* _tmp3_;
ViewCollection* _tmp4_;
- ViewCollection* _tmp5_;
+ GeeList* _tmp5_;
GeeList* _tmp6_;
- GeeList* _tmp7_;
+ RotateMultipleCommand* _tmp7_;
RotateMultipleCommand* _tmp8_;
- RotateMultipleCommand* _tmp9_;
+ CommandManager* _tmp9_;
CommandManager* _tmp10_;
- CommandManager* _tmp11_;
- RotateMultipleCommand* _tmp12_;
+ RotateMultipleCommand* _tmp11_;
#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (IS_COLLECTION_PAGE (self));
#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4394,56 +4694,55 @@ static void collection_page_on_rotate_clockwise (CollectionPage* self) {
#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp1_ = _tmp0_;
#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = _tmp2_ == 0;
+ _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_data_collection_unref0 (_tmp1_);
#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp3_) {
+ if (_tmp2_) {
#line 495 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 4407 "CollectionPage.c"
+#line 4705 "CollectionPage.c"
}
#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = view_collection_get_selected (_tmp5_);
+ _tmp5_ = view_collection_get_selected (_tmp4_);
#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP, _ ("Rotating"), _ ("Undoing Rotate"));
+ _tmp7_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP, _ ("Rotating"), _ ("Undoing Rotate"));
#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp7_);
+ _g_object_unref0 (_tmp6_);
#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp5_);
+ _data_collection_unref0 (_tmp4_);
#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- command = _tmp9_;
+ command = _tmp8_;
#line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp11_ = _tmp10_;
+ _tmp10_ = _tmp9_;
#line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp12_ = command;
+ _tmp11_ = command;
#line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
+ command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
#line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _command_manager_unref0 (_tmp11_);
+ _command_manager_unref0 (_tmp10_);
#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (command);
-#line 4439 "CollectionPage.c"
+#line 4737 "CollectionPage.c"
}
-static void collection_page_on_publish (CollectionPage* self) {
+static void
+collection_page_on_publish (CollectionPage* self)
+{
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- gint _tmp2_;
- gboolean _tmp3_;
+ gboolean _tmp2_;
#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (IS_COLLECTION_PAGE (self));
#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4451,52 +4750,51 @@ static void collection_page_on_publish (CollectionPage* self) {
#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp1_ = _tmp0_;
#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = _tmp2_ > 0;
+ _tmp2_ = view_collection_get_selected_count (_tmp1_) > 0;
#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_data_collection_unref0 (_tmp1_);
#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp3_) {
-#line 4462 "CollectionPage.c"
+ if (_tmp2_) {
+#line 4759 "CollectionPage.c"
+ ViewCollection* _tmp3_;
ViewCollection* _tmp4_;
- ViewCollection* _tmp5_;
- GeeList* _tmp6_;
- GeeCollection* _tmp7_;
+ GeeList* _tmp5_;
+ GeeCollection* _tmp6_;
#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = view_collection_get_selected_sources (_tmp5_);
+ _tmp5_ = view_collection_get_selected_sources (_tmp4_);
#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
+ _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection);
#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- publishing_ui_publishing_dialog_go (_tmp7_);
+ publishing_ui_publishing_dialog_go (_tmp6_);
#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp7_);
+ _g_object_unref0 (_tmp6_);
#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp5_);
-#line 4481 "CollectionPage.c"
+ _data_collection_unref0 (_tmp4_);
+#line 4778 "CollectionPage.c"
}
}
-static void collection_page_on_rotate_counterclockwise (CollectionPage* self) {
+static void
+collection_page_on_rotate_counterclockwise (CollectionPage* self)
+{
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- gint _tmp2_;
- gboolean _tmp3_;
+ gboolean _tmp2_;
RotateMultipleCommand* command = NULL;
+ ViewCollection* _tmp3_;
ViewCollection* _tmp4_;
- ViewCollection* _tmp5_;
+ GeeList* _tmp5_;
GeeList* _tmp6_;
- GeeList* _tmp7_;
+ RotateMultipleCommand* _tmp7_;
RotateMultipleCommand* _tmp8_;
- RotateMultipleCommand* _tmp9_;
+ CommandManager* _tmp9_;
CommandManager* _tmp10_;
- CommandManager* _tmp11_;
- RotateMultipleCommand* _tmp12_;
+ RotateMultipleCommand* _tmp11_;
#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (IS_COLLECTION_PAGE (self));
#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4504,66 +4802,65 @@ static void collection_page_on_rotate_counterclockwise (CollectionPage* self) {
#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp1_ = _tmp0_;
#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = _tmp2_ == 0;
+ _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_data_collection_unref0 (_tmp1_);
#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp3_) {
+ if (_tmp2_) {
#line 511 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 4517 "CollectionPage.c"
+#line 4813 "CollectionPage.c"
}
#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = view_collection_get_selected (_tmp5_);
+ _tmp5_ = view_collection_get_selected (_tmp4_);
#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP, _ ("Rotating"), _ ("Undoing Rotate"));
+ _tmp7_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP, _ ("Rotating"), _ ("Undoing Rotate"));
#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp7_);
+ _g_object_unref0 (_tmp6_);
#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp5_);
+ _data_collection_unref0 (_tmp4_);
#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- command = _tmp9_;
+ command = _tmp8_;
#line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp11_ = _tmp10_;
+ _tmp10_ = _tmp9_;
#line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp12_ = command;
+ _tmp11_ = command;
#line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
+ command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
#line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _command_manager_unref0 (_tmp11_);
+ _command_manager_unref0 (_tmp10_);
#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (command);
-#line 4549 "CollectionPage.c"
+#line 4845 "CollectionPage.c"
}
-static void collection_page_on_flip_horizontally (CollectionPage* self) {
+static void
+collection_page_on_flip_horizontally (CollectionPage* self)
+{
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- gint _tmp2_;
- gboolean _tmp3_;
+ gboolean _tmp2_;
RotateMultipleCommand* command = NULL;
+ ViewCollection* _tmp3_;
ViewCollection* _tmp4_;
- ViewCollection* _tmp5_;
+ GeeList* _tmp5_;
GeeList* _tmp6_;
- GeeList* _tmp7_;
+ RotateMultipleCommand* _tmp7_;
RotateMultipleCommand* _tmp8_;
- RotateMultipleCommand* _tmp9_;
+ CommandManager* _tmp9_;
CommandManager* _tmp10_;
- CommandManager* _tmp11_;
- RotateMultipleCommand* _tmp12_;
+ RotateMultipleCommand* _tmp11_;
#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (IS_COLLECTION_PAGE (self));
#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4571,66 +4868,65 @@ static void collection_page_on_flip_horizontally (CollectionPage* self) {
#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp1_ = _tmp0_;
#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = _tmp2_ == 0;
+ _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_data_collection_unref0 (_tmp1_);
#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp3_) {
+ if (_tmp2_) {
#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 4584 "CollectionPage.c"
+#line 4879 "CollectionPage.c"
}
#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = view_collection_get_selected (_tmp5_);
+ _tmp5_ = view_collection_get_selected (_tmp4_);
#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "", _ ("Flipping Horizontally"), _ ("Undoing Flip Horizontally"));
+ _tmp7_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "", _ ("Flipping Horizontally"), _ ("Undoing Flip Horizontally"));
#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp7_);
+ _g_object_unref0 (_tmp6_);
#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp5_);
+ _data_collection_unref0 (_tmp4_);
#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- command = _tmp9_;
+ command = _tmp8_;
#line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp11_ = _tmp10_;
+ _tmp10_ = _tmp9_;
#line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp12_ = command;
+ _tmp11_ = command;
#line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
+ command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
#line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _command_manager_unref0 (_tmp11_);
+ _command_manager_unref0 (_tmp10_);
#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (command);
-#line 4616 "CollectionPage.c"
+#line 4911 "CollectionPage.c"
}
-static void collection_page_on_flip_vertically (CollectionPage* self) {
+static void
+collection_page_on_flip_vertically (CollectionPage* self)
+{
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- gint _tmp2_;
- gboolean _tmp3_;
+ gboolean _tmp2_;
RotateMultipleCommand* command = NULL;
+ ViewCollection* _tmp3_;
ViewCollection* _tmp4_;
- ViewCollection* _tmp5_;
+ GeeList* _tmp5_;
GeeList* _tmp6_;
- GeeList* _tmp7_;
+ RotateMultipleCommand* _tmp7_;
RotateMultipleCommand* _tmp8_;
- RotateMultipleCommand* _tmp9_;
+ CommandManager* _tmp9_;
CommandManager* _tmp10_;
- CommandManager* _tmp11_;
- RotateMultipleCommand* _tmp12_;
+ RotateMultipleCommand* _tmp11_;
#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (IS_COLLECTION_PAGE (self));
#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4638,67 +4934,65 @@ static void collection_page_on_flip_vertically (CollectionPage* self) {
#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp1_ = _tmp0_;
#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = _tmp2_ == 0;
+ _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_data_collection_unref0 (_tmp1_);
#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp3_) {
+ if (_tmp2_) {
#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 4651 "CollectionPage.c"
+#line 4945 "CollectionPage.c"
}
#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = view_collection_get_selected (_tmp5_);
+ _tmp5_ = view_collection_get_selected (_tmp4_);
#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "", _ ("Flipping Vertically"), _ ("Undoing Flip Vertically"));
+ _tmp7_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "", _ ("Flipping Vertically"), _ ("Undoing Flip Vertically"));
#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp7_);
+ _g_object_unref0 (_tmp6_);
#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp5_);
+ _data_collection_unref0 (_tmp4_);
#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- command = _tmp9_;
+ command = _tmp8_;
#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp11_ = _tmp10_;
+ _tmp10_ = _tmp9_;
#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp12_ = command;
+ _tmp11_ = command;
#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
+ command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _command_manager_unref0 (_tmp11_);
+ _command_manager_unref0 (_tmp10_);
#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (command);
-#line 4683 "CollectionPage.c"
+#line 4977 "CollectionPage.c"
}
-static void collection_page_on_revert (CollectionPage* self) {
+static void
+collection_page_on_revert (CollectionPage* self)
+{
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- gint _tmp2_;
- gboolean _tmp3_;
- gboolean _tmp4_;
+ gboolean _tmp2_;
RevertMultipleCommand* command = NULL;
- ViewCollection* _tmp27_;
- ViewCollection* _tmp28_;
- GeeList* _tmp29_;
- GeeList* _tmp30_;
- RevertMultipleCommand* _tmp31_;
+ ViewCollection* _tmp24_;
+ ViewCollection* _tmp25_;
+ GeeList* _tmp26_;
+ GeeList* _tmp27_;
+ RevertMultipleCommand* _tmp28_;
+ RevertMultipleCommand* _tmp29_;
+ CommandManager* _tmp30_;
+ CommandManager* _tmp31_;
RevertMultipleCommand* _tmp32_;
- CommandManager* _tmp33_;
- CommandManager* _tmp34_;
- RevertMultipleCommand* _tmp35_;
#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (IS_COLLECTION_PAGE (self));
#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4706,186 +5000,180 @@ static void collection_page_on_revert (CollectionPage* self) {
#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp1_ = _tmp0_;
#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = _tmp2_ == 0;
+ _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_data_collection_unref0 (_tmp1_);
#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp3_) {
+ if (_tmp2_) {
#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 4719 "CollectionPage.c"
+#line 5011 "CollectionPage.c"
}
#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = collection_page_can_revert_editable_selected (self);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp4_) {
-#line 4725 "CollectionPage.c"
- AppWindow* _tmp5_;
- AppWindow* _tmp6_;
- ViewCollection* _tmp7_;
- ViewCollection* _tmp8_;
- GeeList* _tmp9_;
- GeeCollection* _tmp10_;
- gboolean _tmp11_;
- gboolean _tmp12_;
-#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = app_window_get_instance ();
+ if (collection_page_can_revert_editable_selected (self)) {
+#line 5015 "CollectionPage.c"
+ AppWindow* _tmp3_;
+ AppWindow* _tmp4_;
+ ViewCollection* _tmp5_;
+ ViewCollection* _tmp6_;
+ GeeList* _tmp7_;
+ GeeCollection* _tmp8_;
+ gboolean _tmp9_;
#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = _tmp5_;
+ _tmp3_ = app_window_get_instance ();
#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp4_ = _tmp3_;
#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = _tmp7_;
+ _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = view_collection_get_selected_sources (_tmp8_);
+ _tmp6_ = _tmp5_;
#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection);
+ _tmp7_ = view_collection_get_selected_sources (_tmp6_);
#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp11_ = revert_editable_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp10_);
+ _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection);
#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp12_ = !_tmp11_;
+ _tmp9_ = !revert_editable_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow), _tmp8_);
#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp10_);
+ _g_object_unref0 (_tmp8_);
#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp8_);
+ _data_collection_unref0 (_tmp6_);
#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp6_);
+ _g_object_unref0 (_tmp4_);
#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp12_) {
+ if (_tmp9_) {
#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 4760 "CollectionPage.c"
+#line 5047 "CollectionPage.c"
}
{
GeeList* _object_list = NULL;
- ViewCollection* _tmp13_;
- ViewCollection* _tmp14_;
- GeeList* _tmp15_;
- GeeList* _tmp16_;
+ ViewCollection* _tmp10_;
+ ViewCollection* _tmp11_;
+ GeeList* _tmp12_;
+ GeeList* _tmp13_;
gint _object_size = 0;
- GeeList* _tmp17_;
- gint _tmp18_;
- gint _tmp19_;
+ GeeList* _tmp14_;
+ gint _tmp15_;
+ gint _tmp16_;
gint _object_index = 0;
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp14_ = _tmp13_;
+ _tmp11_ = _tmp10_;
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp15_ = view_collection_get_selected_sources (_tmp14_);
+ _tmp12_ = view_collection_get_selected_sources (_tmp11_);
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp16_ = _tmp15_;
+ _tmp13_ = _tmp12_;
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp14_);
+ _data_collection_unref0 (_tmp11_);
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _object_list = _tmp16_;
+ _object_list = _tmp13_;
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp17_ = _object_list;
+ _tmp14_ = _object_list;
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp15_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp19_ = _tmp18_;
+ _tmp16_ = _tmp15_;
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _object_size = _tmp19_;
+ _object_size = _tmp16_;
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_object_index = -1;
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
while (TRUE) {
-#line 4797 "CollectionPage.c"
- gint _tmp20_;
- gint _tmp21_;
- gint _tmp22_;
+#line 5084 "CollectionPage.c"
+ gint _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
DataObject* object = NULL;
- GeeList* _tmp23_;
- gint _tmp24_;
- gpointer _tmp25_;
- DataObject* _tmp26_;
+ GeeList* _tmp20_;
+ gint _tmp21_;
+ gpointer _tmp22_;
+ DataObject* _tmp23_;
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp20_ = _object_index;
+ _tmp17_ = _object_index;
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _object_index = _tmp20_ + 1;
+ _object_index = _tmp17_ + 1;
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp21_ = _object_index;
+ _tmp18_ = _object_index;
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp22_ = _object_size;
+ _tmp19_ = _object_size;
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (!(_tmp21_ < _tmp22_)) {
+ if (!(_tmp18_ < _tmp19_)) {
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
break;
-#line 4818 "CollectionPage.c"
+#line 5105 "CollectionPage.c"
}
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp23_ = _object_list;
+ _tmp20_ = _object_list;
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp24_ = _object_index;
+ _tmp21_ = _object_index;
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp25_ = gee_list_get (_tmp23_, _tmp24_);
+ _tmp22_ = gee_list_get (_tmp20_, _tmp21_);
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- object = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp25_, TYPE_DATA_OBJECT, DataObject);
+ object = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp22_, TYPE_DATA_OBJECT, DataObject);
#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp26_ = object;
+ _tmp23_ = object;
#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_PHOTO, Photo), TRUE);
+ photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO, Photo), TRUE);
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (object);
-#line 4834 "CollectionPage.c"
+#line 5121 "CollectionPage.c"
}
#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (_object_list);
-#line 4838 "CollectionPage.c"
+#line 5125 "CollectionPage.c"
}
}
#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp27_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp28_ = _tmp27_;
+ _tmp25_ = _tmp24_;
#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp29_ = view_collection_get_selected (_tmp28_);
+ _tmp26_ = view_collection_get_selected (_tmp25_);
#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp30_ = _tmp29_;
+ _tmp27_ = _tmp26_;
#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp31_ = revert_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp28_ = revert_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ITERABLE, GeeIterable));
#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp32_ = _tmp31_;
+ _tmp29_ = _tmp28_;
#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp30_);
+ _g_object_unref0 (_tmp27_);
#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp28_);
+ _data_collection_unref0 (_tmp25_);
#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- command = _tmp32_;
+ command = _tmp29_;
#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp33_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp30_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp34_ = _tmp33_;
+ _tmp31_ = _tmp30_;
#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp35_ = command;
+ _tmp32_ = command;
#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- command_manager_execute (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_COMMAND, Command));
+ command_manager_execute (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_COMMAND, Command));
#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _command_manager_unref0 (_tmp34_);
+ _command_manager_unref0 (_tmp31_);
#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (command);
-#line 4871 "CollectionPage.c"
+#line 5158 "CollectionPage.c"
}
-void collection_page_on_copy_adjustments (CollectionPage* self) {
+void
+collection_page_on_copy_adjustments (CollectionPage* self)
+{
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- gint _tmp2_;
- gboolean _tmp3_;
+ gboolean _tmp2_;
Photo* photo = NULL;
+ ViewCollection* _tmp3_;
ViewCollection* _tmp4_;
- ViewCollection* _tmp5_;
+ DataView* _tmp5_;
DataView* _tmp6_;
- DataView* _tmp7_;
- DataSource* _tmp8_;
+ DataSource* _tmp7_;
+ Photo* _tmp8_;
Photo* _tmp9_;
- Photo* _tmp10_;
+ PixelTransformationBundle* _tmp10_;
PixelTransformationBundle* _tmp11_;
- PixelTransformationBundle* _tmp12_;
#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (IS_COLLECTION_PAGE (self));
#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4893,72 +5181,71 @@ void collection_page_on_copy_adjustments (CollectionPage* self) {
#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp1_ = _tmp0_;
#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = _tmp2_ != 1;
+ _tmp2_ = view_collection_get_selected_count (_tmp1_) != 1;
#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_data_collection_unref0 (_tmp1_);
#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp3_) {
+ if (_tmp2_) {
#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 4906 "CollectionPage.c"
+#line 5192 "CollectionPage.c"
}
#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
+ _tmp5_ = view_collection_get_selected_at (_tmp4_, 0);
#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = data_view_get_source (_tmp7_);
+ _tmp7_ = data_view_get_source (_tmp6_);
#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
+ _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO, Photo);
#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp7_);
+ _g_object_unref0 (_tmp6_);
#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp5_);
+ _data_collection_unref0 (_tmp4_);
#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- photo = _tmp9_;
+ photo = _tmp8_;
#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp10_ = photo;
+ _tmp9_ = photo;
#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp11_ = photo_get_color_adjustments (_tmp10_);
+ _tmp10_ = photo_get_color_adjustments (_tmp9_);
#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp12_ = _tmp11_;
+ _tmp11_ = _tmp10_;
#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- pixel_transformation_bundle_set_copied_color_adjustments (_tmp12_);
+ pixel_transformation_bundle_set_copied_color_adjustments (_tmp11_);
#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _pixel_transformation_bundle_unref0 (_tmp12_);
+ _pixel_transformation_bundle_unref0 (_tmp11_);
#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE);
#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (photo);
-#line 4940 "CollectionPage.c"
+#line 5226 "CollectionPage.c"
}
-void collection_page_on_paste_adjustments (CollectionPage* self) {
+void
+collection_page_on_paste_adjustments (CollectionPage* self)
+{
PixelTransformationBundle* copied_adjustments = NULL;
PixelTransformationBundle* _tmp0_;
gboolean _tmp1_ = FALSE;
ViewCollection* _tmp2_;
ViewCollection* _tmp3_;
- gint _tmp4_;
- gboolean _tmp5_;
+ gboolean _tmp4_;
AdjustColorsMultipleCommand* command = NULL;
+ ViewCollection* _tmp6_;
ViewCollection* _tmp7_;
- ViewCollection* _tmp8_;
+ GeeList* _tmp8_;
GeeList* _tmp9_;
- GeeList* _tmp10_;
- PixelTransformationBundle* _tmp11_;
+ PixelTransformationBundle* _tmp10_;
+ AdjustColorsMultipleCommand* _tmp11_;
AdjustColorsMultipleCommand* _tmp12_;
- AdjustColorsMultipleCommand* _tmp13_;
+ CommandManager* _tmp13_;
CommandManager* _tmp14_;
- CommandManager* _tmp15_;
- AdjustColorsMultipleCommand* _tmp16_;
+ AdjustColorsMultipleCommand* _tmp15_;
#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (IS_COLLECTION_PAGE (self));
#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -4970,23 +5257,21 @@ void collection_page_on_paste_adjustments (CollectionPage* self) {
#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp3_ = _tmp2_;
#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = _tmp4_ == 0;
+ _tmp4_ = view_collection_get_selected_count (_tmp3_) == 0;
#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_data_collection_unref0 (_tmp3_);
#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp5_) {
+ if (_tmp4_) {
#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp1_ = TRUE;
-#line 4983 "CollectionPage.c"
+#line 5268 "CollectionPage.c"
} else {
- PixelTransformationBundle* _tmp6_;
+ PixelTransformationBundle* _tmp5_;
#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = copied_adjustments;
+ _tmp5_ = copied_adjustments;
#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp1_ = _tmp6_ == NULL;
-#line 4990 "CollectionPage.c"
+ _tmp1_ = _tmp5_ == NULL;
+#line 5275 "CollectionPage.c"
}
#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if (_tmp1_) {
@@ -4994,61 +5279,62 @@ void collection_page_on_paste_adjustments (CollectionPage* self) {
_pixel_transformation_bundle_unref0 (copied_adjustments);
#line 568 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 4998 "CollectionPage.c"
+#line 5283 "CollectionPage.c"
}
#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = _tmp7_;
+ _tmp7_ = _tmp6_;
#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = view_collection_get_selected (_tmp8_);
+ _tmp8_ = view_collection_get_selected (_tmp7_);
#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp10_ = _tmp9_;
+ _tmp9_ = _tmp8_;
#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp11_ = copied_adjustments;
+ _tmp10_ = copied_adjustments;
#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp12_ = adjust_colors_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable), _tmp11_, RESOURCES_PASTE_ADJUSTMENTS_LABEL, RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP);
+ _tmp11_ = adjust_colors_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable), _tmp10_, RESOURCES_PASTE_ADJUSTMENTS_LABEL, RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP);
#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp13_ = _tmp12_;
+ _tmp12_ = _tmp11_;
#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp10_);
+ _g_object_unref0 (_tmp9_);
#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp8_);
+ _data_collection_unref0 (_tmp7_);
#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- command = _tmp13_;
+ command = _tmp12_;
#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp14_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp13_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp15_ = _tmp14_;
+ _tmp14_ = _tmp13_;
#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp16_ = command;
+ _tmp15_ = command;
#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- command_manager_execute (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command));
+ command_manager_execute (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_COMMAND, Command));
#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _command_manager_unref0 (_tmp15_);
+ _command_manager_unref0 (_tmp14_);
#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (command);
#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 5034 "CollectionPage.c"
+#line 5319 "CollectionPage.c"
}
-static void collection_page_on_enhance (CollectionPage* self) {
+static void
+collection_page_on_enhance (CollectionPage* self)
+{
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- gint _tmp2_;
- gboolean _tmp3_;
+ gboolean _tmp2_;
EnhanceMultipleCommand* command = NULL;
+ ViewCollection* _tmp3_;
ViewCollection* _tmp4_;
- ViewCollection* _tmp5_;
+ GeeList* _tmp5_;
GeeList* _tmp6_;
- GeeList* _tmp7_;
+ EnhanceMultipleCommand* _tmp7_;
EnhanceMultipleCommand* _tmp8_;
- EnhanceMultipleCommand* _tmp9_;
+ CommandManager* _tmp9_;
CommandManager* _tmp10_;
- CommandManager* _tmp11_;
- EnhanceMultipleCommand* _tmp12_;
+ EnhanceMultipleCommand* _tmp11_;
#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (IS_COLLECTION_PAGE (self));
#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5056,66 +5342,65 @@ static void collection_page_on_enhance (CollectionPage* self) {
#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp1_ = _tmp0_;
#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = _tmp2_ == 0;
+ _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_data_collection_unref0 (_tmp1_);
#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp3_) {
+ if (_tmp2_) {
#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 5069 "CollectionPage.c"
+#line 5353 "CollectionPage.c"
}
#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = view_collection_get_selected (_tmp5_);
+ _tmp5_ = view_collection_get_selected (_tmp4_);
#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = enhance_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp7_ = enhance_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp7_);
+ _g_object_unref0 (_tmp6_);
#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp5_);
+ _data_collection_unref0 (_tmp4_);
#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- command = _tmp9_;
+ command = _tmp8_;
#line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp11_ = _tmp10_;
+ _tmp10_ = _tmp9_;
#line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp12_ = command;
+ _tmp11_ = command;
#line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
+ command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
#line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _command_manager_unref0 (_tmp11_);
+ _command_manager_unref0 (_tmp10_);
#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (command);
-#line 5101 "CollectionPage.c"
+#line 5385 "CollectionPage.c"
}
-static void collection_page_on_duplicate_photo (CollectionPage* self) {
+static void
+collection_page_on_duplicate_photo (CollectionPage* self)
+{
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- gint _tmp2_;
- gboolean _tmp3_;
+ gboolean _tmp2_;
DuplicateMultiplePhotosCommand* command = NULL;
+ ViewCollection* _tmp3_;
ViewCollection* _tmp4_;
- ViewCollection* _tmp5_;
+ GeeList* _tmp5_;
GeeList* _tmp6_;
- GeeList* _tmp7_;
+ DuplicateMultiplePhotosCommand* _tmp7_;
DuplicateMultiplePhotosCommand* _tmp8_;
- DuplicateMultiplePhotosCommand* _tmp9_;
+ CommandManager* _tmp9_;
CommandManager* _tmp10_;
- CommandManager* _tmp11_;
- DuplicateMultiplePhotosCommand* _tmp12_;
+ DuplicateMultiplePhotosCommand* _tmp11_;
#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (IS_COLLECTION_PAGE (self));
#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5123,82 +5408,80 @@ static void collection_page_on_duplicate_photo (CollectionPage* self) {
#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp1_ = _tmp0_;
#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = _tmp2_ == 0;
+ _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_data_collection_unref0 (_tmp1_);
#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp3_) {
+ if (_tmp2_) {
#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 5136 "CollectionPage.c"
+#line 5419 "CollectionPage.c"
}
#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = view_collection_get_selected (_tmp5_);
+ _tmp5_ = view_collection_get_selected (_tmp4_);
#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = duplicate_multiple_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp7_ = duplicate_multiple_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = _tmp8_;
+ _tmp8_ = _tmp7_;
#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp7_);
+ _g_object_unref0 (_tmp6_);
#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp5_);
+ _data_collection_unref0 (_tmp4_);
#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- command = _tmp9_;
+ command = _tmp8_;
#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp11_ = _tmp10_;
+ _tmp10_ = _tmp9_;
#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp12_ = command;
+ _tmp11_ = command;
#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
+ command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _command_manager_unref0 (_tmp11_);
+ _command_manager_unref0 (_tmp10_);
#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (command);
-#line 5168 "CollectionPage.c"
+#line 5451 "CollectionPage.c"
}
-static void collection_page_on_adjust_date_time (CollectionPage* self) {
+static void
+collection_page_on_adjust_date_time (CollectionPage* self)
+{
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- gint _tmp2_;
- gboolean _tmp3_;
+ gboolean _tmp2_;
gboolean selected_has_videos = FALSE;
gboolean only_videos_selected = FALSE;
Dateable* photo_source = NULL;
+ ViewCollection* _tmp20_;
ViewCollection* _tmp21_;
- ViewCollection* _tmp22_;
+ DataView* _tmp22_;
DataView* _tmp23_;
- DataView* _tmp24_;
- DataSource* _tmp25_;
- Dateable* _tmp26_;
+ DataSource* _tmp24_;
+ Dateable* _tmp25_;
AdjustDateTimeDialog* dialog = NULL;
- Dateable* _tmp27_;
+ Dateable* _tmp26_;
+ ViewCollection* _tmp27_;
ViewCollection* _tmp28_;
- ViewCollection* _tmp29_;
- gint _tmp30_;
- gboolean _tmp31_;
- gboolean _tmp32_;
- AdjustDateTimeDialog* _tmp33_;
- AdjustDateTimeDialog* _tmp34_;
+ gboolean _tmp29_;
+ gboolean _tmp30_;
+ AdjustDateTimeDialog* _tmp31_;
+ AdjustDateTimeDialog* _tmp32_;
gint64 time_shift = 0LL;
gboolean keep_relativity = FALSE;
gboolean modify_originals = FALSE;
- AdjustDateTimeDialog* _tmp35_;
- gint64 _tmp36_ = 0LL;
- gboolean _tmp37_ = FALSE;
- gboolean _tmp38_ = FALSE;
- gboolean _tmp39_;
+ AdjustDateTimeDialog* _tmp33_;
+ gint64 _tmp34_ = 0LL;
+ gboolean _tmp35_ = FALSE;
+ gboolean _tmp36_ = FALSE;
+ gboolean _tmp37_;
#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (IS_COLLECTION_PAGE (self));
#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5206,243 +5489,240 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp1_ = _tmp0_;
#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = _tmp2_ == 0;
+ _tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_data_collection_unref0 (_tmp1_);
#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp3_) {
+ if (_tmp2_) {
#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 5219 "CollectionPage.c"
+#line 5500 "CollectionPage.c"
}
#line 596 "/home/jens/Source/shotwell/src/CollectionPage.vala"
selected_has_videos = FALSE;
#line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala"
only_videos_selected = TRUE;
-#line 5225 "CollectionPage.c"
+#line 5506 "CollectionPage.c"
{
GeeList* _dv_list = NULL;
+ ViewCollection* _tmp3_;
ViewCollection* _tmp4_;
- ViewCollection* _tmp5_;
+ GeeList* _tmp5_;
GeeList* _tmp6_;
- GeeList* _tmp7_;
gint _dv_size = 0;
- GeeList* _tmp8_;
+ GeeList* _tmp7_;
+ gint _tmp8_;
gint _tmp9_;
- gint _tmp10_;
gint _dv_index = 0;
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = view_collection_get_selected (_tmp5_);
+ _tmp5_ = view_collection_get_selected (_tmp4_);
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp5_);
+ _data_collection_unref0 (_tmp4_);
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _dv_list = _tmp7_;
+ _dv_list = _tmp6_;
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = _dv_list;
+ _tmp7_ = _dv_list;
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp10_ = _tmp9_;
+ _tmp9_ = _tmp8_;
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _dv_size = _tmp10_;
+ _dv_size = _tmp9_;
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_dv_index = -1;
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
while (TRUE) {
-#line 5261 "CollectionPage.c"
+#line 5542 "CollectionPage.c"
+ gint _tmp10_;
gint _tmp11_;
gint _tmp12_;
- gint _tmp13_;
DataView* dv = NULL;
- GeeList* _tmp14_;
- gint _tmp15_;
- gpointer _tmp16_;
- DataView* _tmp17_;
+ GeeList* _tmp13_;
+ gint _tmp14_;
+ gpointer _tmp15_;
+ DataView* _tmp16_;
+ DataSource* _tmp17_;
DataSource* _tmp18_;
- DataSource* _tmp19_;
- gboolean _tmp20_;
+ gboolean _tmp19_;
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp11_ = _dv_index;
+ _tmp10_ = _dv_index;
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _dv_index = _tmp11_ + 1;
+ _dv_index = _tmp10_ + 1;
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp12_ = _dv_index;
+ _tmp11_ = _dv_index;
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp13_ = _dv_size;
+ _tmp12_ = _dv_size;
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (!(_tmp12_ < _tmp13_)) {
+ if (!(_tmp11_ < _tmp12_)) {
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
break;
-#line 5285 "CollectionPage.c"
+#line 5566 "CollectionPage.c"
}
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp14_ = _dv_list;
+ _tmp13_ = _dv_list;
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp15_ = _dv_index;
+ _tmp14_ = _dv_index;
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp16_ = gee_list_get (_tmp14_, _tmp15_);
+ _tmp15_ = gee_list_get (_tmp13_, _tmp14_);
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- dv = (DataView*) _tmp16_;
+ dv = (DataView*) _tmp15_;
#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp17_ = dv;
+ _tmp16_ = dv;
#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp18_ = data_view_get_source (_tmp17_);
+ _tmp17_ = data_view_get_source (_tmp16_);
#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp19_ = _tmp18_;
+ _tmp18_ = _tmp17_;
#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_VIDEO);
+ _tmp19_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_VIDEO);
#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp19_);
+ _g_object_unref0 (_tmp18_);
#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp20_) {
+ if (_tmp19_) {
#line 601 "/home/jens/Source/shotwell/src/CollectionPage.vala"
selected_has_videos = TRUE;
-#line 5309 "CollectionPage.c"
+#line 5590 "CollectionPage.c"
} else {
#line 603 "/home/jens/Source/shotwell/src/CollectionPage.vala"
only_videos_selected = FALSE;
-#line 5313 "CollectionPage.c"
+#line 5594 "CollectionPage.c"
}
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (dv);
-#line 5317 "CollectionPage.c"
+#line 5598 "CollectionPage.c"
}
#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (_dv_list);
-#line 5321 "CollectionPage.c"
+#line 5602 "CollectionPage.c"
}
#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp22_ = _tmp21_;
+ _tmp21_ = _tmp20_;
#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp23_ = view_collection_get_selected_at (_tmp22_, 0);
+ _tmp22_ = view_collection_get_selected_at (_tmp21_, 0);
#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp24_ = _tmp23_;
+ _tmp23_ = _tmp22_;
#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp25_ = data_view_get_source (_tmp24_);
+ _tmp24_ = data_view_get_source (_tmp23_);
#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp26_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATEABLE, Dateable);
+ _tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATEABLE, Dateable);
#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp24_);
+ _g_object_unref0 (_tmp23_);
#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp22_);
+ _data_collection_unref0 (_tmp21_);
#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- photo_source = _tmp26_;
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp27_ = photo_source;
+ photo_source = _tmp25_;
#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp26_ = photo_source;
#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp29_ = _tmp28_;
+ _tmp27_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp30_ = view_collection_get_selected_count (_tmp29_);
+ _tmp28_ = _tmp27_;
#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp31_ = selected_has_videos;
+ _tmp29_ = selected_has_videos;
#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp32_ = only_videos_selected;
+ _tmp30_ = only_videos_selected;
#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp33_ = adjust_date_time_dialog_new (_tmp27_, _tmp30_, TRUE, _tmp31_, _tmp32_);
+ _tmp31_ = adjust_date_time_dialog_new (_tmp26_, view_collection_get_selected_count (_tmp28_), TRUE, _tmp29_, _tmp30_);
#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- g_object_ref_sink (_tmp33_);
+ g_object_ref_sink (_tmp31_);
#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp34_ = _tmp33_;
+ _tmp32_ = _tmp31_;
#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp29_);
+ _data_collection_unref0 (_tmp28_);
#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- dialog = _tmp34_;
+ dialog = _tmp32_;
#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp35_ = dialog;
+ _tmp33_ = dialog;
#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp39_ = adjust_date_time_dialog_execute (_tmp35_, &_tmp36_, &_tmp37_, &_tmp38_);
+ _tmp37_ = adjust_date_time_dialog_execute (_tmp33_, &_tmp34_, &_tmp35_, &_tmp36_);
#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- time_shift = _tmp36_;
+ time_shift = _tmp34_;
#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- keep_relativity = _tmp37_;
+ keep_relativity = _tmp35_;
#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- modify_originals = _tmp38_;
+ modify_originals = _tmp36_;
#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp39_) {
-#line 5375 "CollectionPage.c"
+ if (_tmp37_) {
+#line 5654 "CollectionPage.c"
AdjustDateTimePhotosCommand* command = NULL;
- ViewCollection* _tmp40_;
- ViewCollection* _tmp41_;
- GeeList* _tmp42_;
- GeeList* _tmp43_;
- gint64 _tmp44_;
- gboolean _tmp45_;
- gboolean _tmp46_;
- AdjustDateTimePhotosCommand* _tmp47_;
- AdjustDateTimePhotosCommand* _tmp48_;
- CommandManager* _tmp49_;
- CommandManager* _tmp50_;
- AdjustDateTimePhotosCommand* _tmp51_;
+ ViewCollection* _tmp38_;
+ ViewCollection* _tmp39_;
+ GeeList* _tmp40_;
+ GeeList* _tmp41_;
+ gint64 _tmp42_;
+ gboolean _tmp43_;
+ gboolean _tmp44_;
+ AdjustDateTimePhotosCommand* _tmp45_;
+ AdjustDateTimePhotosCommand* _tmp46_;
+ CommandManager* _tmp47_;
+ CommandManager* _tmp48_;
+ AdjustDateTimePhotosCommand* _tmp49_;
#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp40_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp38_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp41_ = _tmp40_;
+ _tmp39_ = _tmp38_;
#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp42_ = view_collection_get_selected (_tmp41_);
+ _tmp40_ = view_collection_get_selected (_tmp39_);
#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp43_ = _tmp42_;
+ _tmp41_ = _tmp40_;
#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp44_ = time_shift;
+ _tmp42_ = time_shift;
#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp45_ = keep_relativity;
+ _tmp43_ = keep_relativity;
#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp46_ = modify_originals;
+ _tmp44_ = modify_originals;
#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp47_ = adjust_date_time_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_ITERABLE, GeeIterable), _tmp44_, _tmp45_, _tmp46_);
+ _tmp45_ = adjust_date_time_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ITERABLE, GeeIterable), _tmp42_, _tmp43_, _tmp44_);
#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp48_ = _tmp47_;
+ _tmp46_ = _tmp45_;
#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp43_);
+ _g_object_unref0 (_tmp41_);
#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp41_);
+ _data_collection_unref0 (_tmp39_);
#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- command = _tmp48_;
+ command = _tmp46_;
#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp49_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp47_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp50_ = _tmp49_;
+ _tmp48_ = _tmp47_;
#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp51_ = command;
+ _tmp49_ = command;
#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- command_manager_execute (_tmp50_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_COMMAND, Command));
+ command_manager_execute (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_COMMAND, Command));
#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _command_manager_unref0 (_tmp50_);
+ _command_manager_unref0 (_tmp48_);
#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (command);
-#line 5425 "CollectionPage.c"
+#line 5704 "CollectionPage.c"
}
#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (dialog);
#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (photo_source);
-#line 5431 "CollectionPage.c"
+#line 5710 "CollectionPage.c"
}
-static void collection_page_on_external_edit (CollectionPage* self) {
+static void
+collection_page_on_external_edit (CollectionPage* self)
+{
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- gint _tmp2_;
- gboolean _tmp3_;
+ gboolean _tmp2_;
Photo* photo = NULL;
+ ViewCollection* _tmp3_;
ViewCollection* _tmp4_;
- ViewCollection* _tmp5_;
+ DataView* _tmp5_;
DataView* _tmp6_;
- DataView* _tmp7_;
- DataSource* _tmp8_;
- Photo* _tmp9_;
+ DataSource* _tmp7_;
+ Photo* _tmp8_;
GError * _inner_error_ = NULL;
#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (IS_COLLECTION_PAGE (self));
@@ -5451,98 +5731,96 @@ static void collection_page_on_external_edit (CollectionPage* self) {
#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp1_ = _tmp0_;
#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = _tmp2_ != 1;
+ _tmp2_ = view_collection_get_selected_count (_tmp1_) != 1;
#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_data_collection_unref0 (_tmp1_);
#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp3_) {
+ if (_tmp2_) {
#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 5464 "CollectionPage.c"
+#line 5742 "CollectionPage.c"
}
#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
+ _tmp5_ = view_collection_get_selected_at (_tmp4_, 0);
#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = data_view_get_source (_tmp7_);
+ _tmp7_ = data_view_get_source (_tmp6_);
#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
+ _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO, Photo);
#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp7_);
+ _g_object_unref0 (_tmp6_);
#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp5_);
+ _data_collection_unref0 (_tmp4_);
#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- photo = _tmp9_;
-#line 5484 "CollectionPage.c"
+ photo = _tmp8_;
+#line 5762 "CollectionPage.c"
{
+ AppWindow* _tmp9_;
AppWindow* _tmp10_;
- AppWindow* _tmp11_;
- Photo* _tmp12_;
+ Photo* _tmp11_;
+ AppWindow* _tmp12_;
AppWindow* _tmp13_;
- AppWindow* _tmp14_;
#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp10_ = app_window_get_instance ();
+ _tmp9_ = app_window_get_instance ();
#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp11_ = _tmp10_;
+ _tmp10_ = _tmp9_;
#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE_WINDOW, PageWindow));
+ page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE_WINDOW, PageWindow));
#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp11_);
+ _g_object_unref0 (_tmp10_);
#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp12_ = photo;
+ _tmp11_ = photo;
#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- photo_open_with_external_editor (_tmp12_, &_inner_error_);
+ photo_open_with_external_editor (_tmp11_, &_inner_error_);
#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5505 "CollectionPage.c"
+#line 5783 "CollectionPage.c"
goto __catch246_g_error;
}
#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp13_ = app_window_get_instance ();
+ _tmp12_ = app_window_get_instance ();
#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp14_ = _tmp13_;
+ _tmp13_ = _tmp12_;
#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE_WINDOW, PageWindow));
+ page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow));
#line 628 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp14_);
-#line 5516 "CollectionPage.c"
+ _g_object_unref0 (_tmp13_);
+#line 5794 "CollectionPage.c"
}
goto __finally246;
__catch246_g_error:
{
GError* err = NULL;
+ AppWindow* _tmp14_;
AppWindow* _tmp15_;
- AppWindow* _tmp16_;
- GError* _tmp17_;
- Photo* _tmp18_;
+ GError* _tmp16_;
+ Photo* _tmp17_;
#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
err = _inner_error_;
#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_inner_error_ = NULL;
#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp15_ = app_window_get_instance ();
+ _tmp14_ = app_window_get_instance ();
#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp16_ = _tmp15_;
+ _tmp15_ = _tmp14_;
#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow));
+ page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE_WINDOW, PageWindow));
#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp16_);
+ _g_object_unref0 (_tmp15_);
#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp17_ = err;
+ _tmp16_ = err;
#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp18_ = photo;
+ _tmp17_ = photo;
#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- open_external_editor_error_dialog (_tmp17_, _tmp18_);
+ open_external_editor_error_dialog (_tmp16_, _tmp17_);
#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_error_free0 (err);
-#line 5546 "CollectionPage.c"
+#line 5824 "CollectionPage.c"
}
__finally246:
#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5555,28 +5833,28 @@ static void collection_page_on_external_edit (CollectionPage* self) {
g_clear_error (&_inner_error_);
#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 5559 "CollectionPage.c"
+#line 5837 "CollectionPage.c"
}
#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (photo);
-#line 5563 "CollectionPage.c"
+#line 5841 "CollectionPage.c"
}
-static void collection_page_on_external_edit_raw (CollectionPage* self) {
+static void
+collection_page_on_external_edit_raw (CollectionPage* self)
+{
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- gint _tmp2_;
- gboolean _tmp3_;
+ gboolean _tmp2_;
Photo* photo = NULL;
+ ViewCollection* _tmp3_;
ViewCollection* _tmp4_;
- ViewCollection* _tmp5_;
+ DataView* _tmp5_;
DataView* _tmp6_;
- DataView* _tmp7_;
- DataSource* _tmp8_;
+ DataSource* _tmp7_;
+ Photo* _tmp8_;
Photo* _tmp9_;
- Photo* _tmp10_;
- PhotoFileFormat _tmp11_;
GError * _inner_error_ = NULL;
#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (IS_COLLECTION_PAGE (self));
@@ -5585,114 +5863,110 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp1_ = _tmp0_;
#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = _tmp2_ != 1;
+ _tmp2_ = view_collection_get_selected_count (_tmp1_) != 1;
#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_data_collection_unref0 (_tmp1_);
#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp3_) {
+ if (_tmp2_) {
#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 5598 "CollectionPage.c"
+#line 5874 "CollectionPage.c"
}
#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
+ _tmp5_ = view_collection_get_selected_at (_tmp4_, 0);
#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = _tmp6_;
+ _tmp6_ = _tmp5_;
#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = data_view_get_source (_tmp7_);
+ _tmp7_ = data_view_get_source (_tmp6_);
#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
+ _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO, Photo);
#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp7_);
+ _g_object_unref0 (_tmp6_);
#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp5_);
+ _data_collection_unref0 (_tmp4_);
#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- photo = _tmp9_;
-#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp10_ = photo;
+ photo = _tmp8_;
#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp11_ = photo_get_master_file_format (_tmp10_);
+ _tmp9_ = photo;
#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp11_ != PHOTO_FILE_FORMAT_RAW) {
+ if (photo_get_master_file_format (_tmp9_) != PHOTO_FILE_FORMAT_RAW) {
#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (photo);
#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 5628 "CollectionPage.c"
+#line 5902 "CollectionPage.c"
}
{
- AppWindow* _tmp12_;
+ AppWindow* _tmp10_;
+ AppWindow* _tmp11_;
+ Photo* _tmp12_;
AppWindow* _tmp13_;
- Photo* _tmp14_;
- AppWindow* _tmp15_;
- AppWindow* _tmp16_;
+ AppWindow* _tmp14_;
#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp12_ = app_window_get_instance ();
+ _tmp10_ = app_window_get_instance ();
#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp13_ = _tmp12_;
+ _tmp11_ = _tmp10_;
#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow));
+ page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE_WINDOW, PageWindow));
#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp13_);
+ _g_object_unref0 (_tmp11_);
#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp14_ = photo;
+ _tmp12_ = photo;
#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- photo_open_with_raw_external_editor (_tmp14_, &_inner_error_);
+ photo_open_with_raw_external_editor (_tmp12_, &_inner_error_);
#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5650 "CollectionPage.c"
+#line 5924 "CollectionPage.c"
goto __catch247_g_error;
}
#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp15_ = app_window_get_instance ();
+ _tmp13_ = app_window_get_instance ();
#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp16_ = _tmp15_;
+ _tmp14_ = _tmp13_;
#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow));
+ page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE_WINDOW, PageWindow));
#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp16_);
-#line 5661 "CollectionPage.c"
+ _g_object_unref0 (_tmp14_);
+#line 5935 "CollectionPage.c"
}
goto __finally247;
__catch247_g_error:
{
GError* err = NULL;
- AppWindow* _tmp17_;
- AppWindow* _tmp18_;
- GError* _tmp19_;
- gchar* _tmp20_;
- gchar* _tmp21_;
+ AppWindow* _tmp15_;
+ AppWindow* _tmp16_;
+ GError* _tmp17_;
+ gchar* _tmp18_;
+ gchar* _tmp19_;
#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
err = _inner_error_;
#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_inner_error_ = NULL;
#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp17_ = app_window_get_instance ();
+ _tmp15_ = app_window_get_instance ();
#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp18_ = _tmp17_;
+ _tmp16_ = _tmp15_;
#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PAGE_WINDOW, PageWindow));
+ page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow));
#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp18_);
+ _g_object_unref0 (_tmp16_);
#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp19_ = err;
+ _tmp17_ = err;
#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp20_ = resources_launch_editor_failed (_tmp19_);
+ _tmp18_ = resources_launch_editor_failed (_tmp17_);
#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp21_ = _tmp20_;
+ _tmp19_ = _tmp18_;
#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- app_window_error_message (_tmp21_, NULL);
+ app_window_error_message (_tmp19_, NULL);
#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_free0 (_tmp21_);
+ _g_free0 (_tmp19_);
#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_error_free0 (err);
-#line 5696 "CollectionPage.c"
+#line 5970 "CollectionPage.c"
}
__finally247:
#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5705,15 +5979,17 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
g_clear_error (&_inner_error_);
#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 5709 "CollectionPage.c"
+#line 5983 "CollectionPage.c"
}
#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (photo);
-#line 5713 "CollectionPage.c"
+#line 5987 "CollectionPage.c"
}
-void collection_page_on_set_background (CollectionPage* self) {
+void
+collection_page_on_set_background (CollectionPage* self)
+{
GeeArrayList* photos = NULL;
GeeArrayList* _tmp0_;
ViewCollection* _tmp1_;
@@ -5756,7 +6032,7 @@ void collection_page_on_set_background (CollectionPage* self) {
_tmp8_ = _tmp7_;
#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if (_tmp8_ == 1) {
-#line 5760 "CollectionPage.c"
+#line 6036 "CollectionPage.c"
SetBackgroundPhotoDialog* dialog = NULL;
SetBackgroundPhotoDialog* _tmp9_;
SetBackgroundPhotoDialog* _tmp10_;
@@ -5779,7 +6055,7 @@ void collection_page_on_set_background (CollectionPage* self) {
screensaver = _tmp12_;
#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if (_tmp13_) {
-#line 5783 "CollectionPage.c"
+#line 6059 "CollectionPage.c"
AppWindow* _tmp14_;
AppWindow* _tmp15_;
GeeArrayList* _tmp16_;
@@ -5819,11 +6095,11 @@ void collection_page_on_set_background (CollectionPage* self) {
page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE_WINDOW, PageWindow));
#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (_tmp22_);
-#line 5823 "CollectionPage.c"
+#line 6099 "CollectionPage.c"
}
#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (dialog);
-#line 5827 "CollectionPage.c"
+#line 6103 "CollectionPage.c"
} else {
GeeArrayList* _tmp23_;
gint _tmp24_;
@@ -5836,7 +6112,7 @@ void collection_page_on_set_background (CollectionPage* self) {
_tmp25_ = _tmp24_;
#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if (_tmp25_ > 1) {
-#line 5840 "CollectionPage.c"
+#line 6116 "CollectionPage.c"
SetBackgroundSlideshowDialog* dialog = NULL;
SetBackgroundSlideshowDialog* _tmp26_;
gint delay = 0;
@@ -5863,7 +6139,7 @@ void collection_page_on_set_background (CollectionPage* self) {
screensaver = _tmp30_;
#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if (_tmp31_) {
-#line 5867 "CollectionPage.c"
+#line 6143 "CollectionPage.c"
AppWindow* _tmp32_;
AppWindow* _tmp33_;
GeeArrayList* _tmp34_;
@@ -5898,55 +6174,55 @@ void collection_page_on_set_background (CollectionPage* self) {
page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PAGE_WINDOW, PageWindow));
#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (_tmp39_);
-#line 5902 "CollectionPage.c"
+#line 6178 "CollectionPage.c"
}
#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (dialog);
-#line 5906 "CollectionPage.c"
+#line 6182 "CollectionPage.c"
}
}
#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (photos);
-#line 5911 "CollectionPage.c"
+#line 6187 "CollectionPage.c"
}
-static void collection_page_on_slideshow (CollectionPage* self) {
+static void
+collection_page_on_slideshow (CollectionPage* self)
+{
ViewCollection* _tmp0_;
ViewCollection* _tmp1_;
- gint _tmp2_;
- gboolean _tmp3_;
- GeeList* _tmp4_ = NULL;
+ gboolean _tmp2_;
+ GeeList* _tmp3_ = NULL;
+ ViewCollection* _tmp4_;
ViewCollection* _tmp5_;
- ViewCollection* _tmp6_;
- gint _tmp7_;
- gboolean _tmp8_;
+ gboolean _tmp6_;
GeeList* sources = NULL;
+ GeeList* _tmp13_;
+ gboolean _tmp14_ = FALSE;
GeeList* _tmp15_;
- gboolean _tmp16_ = FALSE;
- GeeList* _tmp17_;
Thumbnail* thumbnail = NULL;
- ViewCollection* _tmp21_;
- ViewCollection* _tmp22_;
- GeeList* _tmp23_;
- gpointer _tmp24_;
- DataSource* _tmp25_;
- DataView* _tmp26_;
- Thumbnail* _tmp27_;
- Thumbnail* _tmp28_;
+ ViewCollection* _tmp19_;
+ ViewCollection* _tmp20_;
+ GeeList* _tmp21_;
+ gpointer _tmp22_;
+ DataSource* _tmp23_;
+ DataView* _tmp24_;
+ Thumbnail* _tmp25_;
+ Thumbnail* _tmp26_;
LibraryPhoto* photo = NULL;
- Thumbnail* _tmp29_;
- MediaSource* _tmp30_;
- LibraryPhoto* _tmp31_;
- LibraryPhoto* _tmp32_;
- AppWindow* _tmp33_;
- AppWindow* _tmp34_;
- LibraryPhotoSourceCollection* _tmp35_;
- ViewCollection* _tmp36_;
- ViewCollection* _tmp37_;
- LibraryPhoto* _tmp38_;
- SlideshowPage* _tmp39_;
- SlideshowPage* _tmp40_;
+ Thumbnail* _tmp27_;
+ MediaSource* _tmp28_;
+ LibraryPhoto* _tmp29_;
+ LibraryPhoto* _tmp30_;
+ AppWindow* _tmp31_;
+ AppWindow* _tmp32_;
+ LibraryPhotoSourceCollection* _tmp33_;
+ ViewCollection* _tmp34_;
+ ViewCollection* _tmp35_;
+ LibraryPhoto* _tmp36_;
+ SlideshowPage* _tmp37_;
+ SlideshowPage* _tmp38_;
#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
g_return_if_fail (IS_COLLECTION_PAGE (self));
#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -5954,151 +6230,147 @@ static void collection_page_on_slideshow (CollectionPage* self) {
#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp1_ = _tmp0_;
#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp3_ = _tmp2_ == 0;
+ _tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)) == 0;
#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_data_collection_unref0 (_tmp1_);
#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp3_) {
+ if (_tmp2_) {
#line 680 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 5967 "CollectionPage.c"
+#line 6241 "CollectionPage.c"
}
#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp6_ = _tmp5_;
+ _tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = view_collection_get_selected_count (_tmp6_);
+ _tmp5_ = _tmp4_;
#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = _tmp7_ > 0;
+ _tmp6_ = view_collection_get_selected_count (_tmp5_) > 0;
#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp6_);
+ _data_collection_unref0 (_tmp5_);
#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp8_) {
-#line 5981 "CollectionPage.c"
- ViewCollection* _tmp9_;
- ViewCollection* _tmp10_;
- GeeList* _tmp11_;
+ if (_tmp6_) {
+#line 6253 "CollectionPage.c"
+ ViewCollection* _tmp7_;
+ ViewCollection* _tmp8_;
+ GeeList* _tmp9_;
#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp10_ = _tmp9_;
+ _tmp8_ = _tmp7_;
#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp11_ = view_collection_get_selected_sources_of_type (_tmp10_, TYPE_LIBRARY_PHOTO);
+ _tmp9_ = view_collection_get_selected_sources_of_type (_tmp8_, TYPE_LIBRARY_PHOTO);
#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp4_);
+ _g_object_unref0 (_tmp3_);
#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = _tmp11_;
+ _tmp3_ = _tmp9_;
#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp10_);
-#line 5997 "CollectionPage.c"
+ _data_collection_unref0 (_tmp8_);
+#line 6269 "CollectionPage.c"
} else {
- ViewCollection* _tmp12_;
- ViewCollection* _tmp13_;
- GeeList* _tmp14_;
+ ViewCollection* _tmp10_;
+ ViewCollection* _tmp11_;
+ GeeList* _tmp12_;
#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp13_ = _tmp12_;
+ _tmp11_ = _tmp10_;
#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp14_ = view_collection_get_sources_of_type (_tmp13_, TYPE_LIBRARY_PHOTO);
+ _tmp12_ = view_collection_get_sources_of_type (_tmp11_, TYPE_LIBRARY_PHOTO);
#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp4_);
+ _g_object_unref0 (_tmp3_);
#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp4_ = _tmp14_;
+ _tmp3_ = _tmp12_;
#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp13_);
-#line 6014 "CollectionPage.c"
+ _data_collection_unref0 (_tmp11_);
+#line 6286 "CollectionPage.c"
}
#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp15_ = _g_object_ref0 (_tmp4_);
+ _tmp13_ = _g_object_ref0 (_tmp3_);
#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- sources = _tmp15_;
+ sources = _tmp13_;
#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp17_ = sources;
+ _tmp15_ = sources;
#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp17_ == NULL) {
+ if (_tmp15_ == NULL) {
#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp16_ = TRUE;
-#line 6026 "CollectionPage.c"
+ _tmp14_ = TRUE;
+#line 6298 "CollectionPage.c"
} else {
- GeeList* _tmp18_;
- gint _tmp19_;
- gint _tmp20_;
+ GeeList* _tmp16_;
+ gint _tmp17_;
+ gint _tmp18_;
#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp18_ = sources;
+ _tmp16_ = sources;
#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp17_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp20_ = _tmp19_;
+ _tmp18_ = _tmp17_;
#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp16_ = _tmp20_ == 0;
-#line 6039 "CollectionPage.c"
+ _tmp14_ = _tmp18_ == 0;
+#line 6311 "CollectionPage.c"
}
#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp16_) {
+ if (_tmp14_) {
#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (sources);
#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp4_);
+ _g_object_unref0 (_tmp3_);
#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 6049 "CollectionPage.c"
+#line 6321 "CollectionPage.c"
}
#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp22_ = _tmp21_;
+ _tmp20_ = _tmp19_;
#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp23_ = sources;
+ _tmp21_ = sources;
#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp24_ = gee_list_get (_tmp23_, 0);
+ _tmp22_ = gee_list_get (_tmp21_, 0);
#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp25_ = (DataSource*) _tmp24_;
+ _tmp23_ = (DataSource*) _tmp22_;
#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp26_ = view_collection_get_view_for_source (_tmp22_, _tmp25_);
+ _tmp24_ = view_collection_get_view_for_source (_tmp20_, _tmp23_);
#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_THUMBNAIL, Thumbnail);
+ _tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_THUMBNAIL, Thumbnail);
#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp25_);
+ _g_object_unref0 (_tmp23_);
#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp22_);
+ _data_collection_unref0 (_tmp20_);
#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- thumbnail = _tmp27_;
+ thumbnail = _tmp25_;
#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp28_ = thumbnail;
+ _tmp26_ = thumbnail;
#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp28_ == NULL) {
+ if (_tmp26_ == NULL) {
#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (thumbnail);
#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (sources);
#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp4_);
+ _g_object_unref0 (_tmp3_);
#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 6083 "CollectionPage.c"
+#line 6355 "CollectionPage.c"
}
#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp29_ = thumbnail;
+ _tmp27_ = thumbnail;
#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp30_ = thumbnail_get_media_source (_tmp29_);
+ _tmp28_ = thumbnail_get_media_source (_tmp27_);
#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp31_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp30_) : NULL;
+ _tmp29_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp28_) : NULL;
#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp31_ == NULL) {
+ if (_tmp29_ == NULL) {
#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp30_);
-#line 6095 "CollectionPage.c"
+ _g_object_unref0 (_tmp28_);
+#line 6367 "CollectionPage.c"
}
#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- photo = _tmp31_;
+ photo = _tmp29_;
#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp32_ = photo;
+ _tmp30_ = photo;
#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- if (_tmp32_ == NULL) {
+ if (_tmp30_ == NULL) {
#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (photo);
#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6106,37 +6378,37 @@ static void collection_page_on_slideshow (CollectionPage* self) {
#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (sources);
#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp4_);
+ _g_object_unref0 (_tmp3_);
#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return;
-#line 6113 "CollectionPage.c"
+#line 6385 "CollectionPage.c"
}
#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp33_ = app_window_get_instance ();
+ _tmp31_ = app_window_get_instance ();
#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp34_ = _tmp33_;
+ _tmp32_ = _tmp31_;
#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp35_ = library_photo_global;
+ _tmp33_ = library_photo_global;
#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp36_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+ _tmp34_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp37_ = _tmp36_;
+ _tmp35_ = _tmp34_;
#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp38_ = photo;
+ _tmp36_ = photo;
#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp39_ = slideshow_page_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PHOTO, Photo));
+ _tmp37_ = slideshow_page_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_PHOTO, Photo));
#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- g_object_ref_sink (_tmp39_);
+ g_object_ref_sink (_tmp37_);
#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp40_ = _tmp39_;
+ _tmp38_ = _tmp37_;
#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- app_window_go_fullscreen (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PAGE, Page));
+ app_window_go_fullscreen (_tmp32_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PAGE, Page));
#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp40_);
+ _g_object_unref0 (_tmp38_);
#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _data_collection_unref0 (_tmp37_);
+ _data_collection_unref0 (_tmp35_);
#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp34_);
+ _g_object_unref0 (_tmp32_);
#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (photo);
#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6144,12 +6416,15 @@ static void collection_page_on_slideshow (CollectionPage* self) {
#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (sources);
#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _g_object_unref0 (_tmp4_);
-#line 6149 "CollectionPage.c"
+ _g_object_unref0 (_tmp3_);
+#line 6421 "CollectionPage.c"
}
-static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* event) {
+static gboolean
+collection_page_real_on_ctrl_pressed (Page* base,
+ GdkEventKey* event)
+{
CollectionPage * self;
gboolean result = FALSE;
GtkToolButton* rotate_button = NULL;
@@ -6157,8 +6432,6 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e
GObject* _tmp1_;
GtkToolButton* _tmp2_;
GtkToolButton* _tmp3_;
- GdkEventKey* _tmp7_;
- gboolean _tmp8_;
#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6173,14 +6446,14 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e
_tmp3_ = rotate_button;
#line 703 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if (_tmp3_ != NULL) {
-#line 6177 "CollectionPage.c"
+#line 6450 "CollectionPage.c"
GtkToolButton* _tmp4_;
GtkToolButton* _tmp5_;
GtkToolButton* _tmp6_;
#line 704 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp4_ = rotate_button;
#line 704 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.RotateCounterclockwise");
+ gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_actionable_get_type (), GtkActionable), "win.RotateCounterclockwise");
#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp5_ = rotate_button;
#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6189,23 +6462,22 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e
_tmp6_ = rotate_button;
#line 706 "/home/jens/Source/shotwell/src/CollectionPage.vala"
gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CCW_TOOLTIP);
-#line 6193 "CollectionPage.c"
+#line 6466 "CollectionPage.c"
}
#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = event;
-#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = PAGE_CLASS (collection_page_parent_class)->on_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp7_);
-#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- result = _tmp8_;
+ result = PAGE_CLASS (collection_page_parent_class)->on_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), event);
#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (rotate_button);
#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 6205 "CollectionPage.c"
+#line 6474 "CollectionPage.c"
}
-static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey* event) {
+static gboolean
+collection_page_real_on_ctrl_released (Page* base,
+ GdkEventKey* event)
+{
CollectionPage * self;
gboolean result = FALSE;
GtkToolButton* rotate_button = NULL;
@@ -6213,8 +6485,6 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey*
GObject* _tmp1_;
GtkToolButton* _tmp2_;
GtkToolButton* _tmp3_;
- GdkEventKey* _tmp7_;
- gboolean _tmp8_;
#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
#line 713 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6229,14 +6499,14 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey*
_tmp3_ = rotate_button;
#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
if (_tmp3_ != NULL) {
-#line 6233 "CollectionPage.c"
+#line 6503 "CollectionPage.c"
GtkToolButton* _tmp4_;
GtkToolButton* _tmp5_;
GtkToolButton* _tmp6_;
#line 715 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp4_ = rotate_button;
#line 715 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.RotateClockwise");
+ gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_actionable_get_type (), GtkActionable), "win.RotateClockwise");
#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_tmp5_ = rotate_button;
#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6245,30 +6515,30 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey*
_tmp6_ = rotate_button;
#line 717 "/home/jens/Source/shotwell/src/CollectionPage.vala"
gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CW_TOOLTIP);
-#line 6249 "CollectionPage.c"
+#line 6519 "CollectionPage.c"
}
#line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp7_ = event;
-#line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- _tmp8_ = PAGE_CLASS (collection_page_parent_class)->on_ctrl_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp7_);
-#line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala"
- result = _tmp8_;
+ result = PAGE_CLASS (collection_page_parent_class)->on_ctrl_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), event);
#line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala"
_g_object_unref0 (rotate_button);
#line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 6261 "CollectionPage.c"
+#line 6527 "CollectionPage.c"
}
-static gpointer _view_filter_ref0 (gpointer self) {
+static gpointer
+_view_filter_ref0 (gpointer self)
+{
#line 724 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return self ? view_filter_ref (self) : NULL;
-#line 6268 "CollectionPage.c"
+#line 6536 "CollectionPage.c"
}
-static SearchViewFilter* collection_page_real_get_search_view_filter (CheckerboardPage* base) {
+static SearchViewFilter*
+collection_page_real_get_search_view_filter (CheckerboardPage* base)
+{
CollectionPage * self;
SearchViewFilter* result = NULL;
CollectionPageCollectionSearchViewFilter* _tmp0_;
@@ -6283,11 +6553,13 @@ static SearchViewFilter* collection_page_real_get_search_view_filter (Checkerboa
result = _tmp1_;
#line 724 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 6287 "CollectionPage.c"
+#line 6557 "CollectionPage.c"
}
-static guint collection_page_collection_search_view_filter_real_get_criteria (SearchViewFilter* base) {
+static guint
+collection_page_collection_search_view_filter_real_get_criteria (SearchViewFilter* base)
+{
CollectionPageCollectionSearchViewFilter * self;
guint result = 0U;
#line 23 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6296,41 +6568,51 @@ static guint collection_page_collection_search_view_filter_real_get_criteria (Se
result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH);
#line 24 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return result;
-#line 6300 "CollectionPage.c"
+#line 6572 "CollectionPage.c"
}
-CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_construct (GType object_type) {
+CollectionPageCollectionSearchViewFilter*
+collection_page_collection_search_view_filter_construct (GType object_type)
+{
CollectionPageCollectionSearchViewFilter* self = NULL;
#line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala"
self = (CollectionPageCollectionSearchViewFilter*) default_search_view_filter_construct (object_type);
#line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return self;
-#line 6310 "CollectionPage.c"
+#line 6584 "CollectionPage.c"
}
-CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_new (void) {
+CollectionPageCollectionSearchViewFilter*
+collection_page_collection_search_view_filter_new (void)
+{
#line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala"
return collection_page_collection_search_view_filter_construct (COLLECTION_PAGE_TYPE_COLLECTION_SEARCH_VIEW_FILTER);
-#line 6317 "CollectionPage.c"
+#line 6593 "CollectionPage.c"
}
-static void collection_page_collection_search_view_filter_class_init (CollectionPageCollectionSearchViewFilterClass * klass) {
+static void
+collection_page_collection_search_view_filter_class_init (CollectionPageCollectionSearchViewFilterClass * klass)
+{
#line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_collection_search_view_filter_parent_class = g_type_class_peek_parent (klass);
#line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala"
((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) collection_page_collection_search_view_filter_real_get_criteria;
-#line 6326 "CollectionPage.c"
+#line 6604 "CollectionPage.c"
}
-static void collection_page_collection_search_view_filter_instance_init (CollectionPageCollectionSearchViewFilter * self) {
+static void
+collection_page_collection_search_view_filter_instance_init (CollectionPageCollectionSearchViewFilter * self)
+{
}
-GType collection_page_collection_search_view_filter_get_type (void) {
+GType
+collection_page_collection_search_view_filter_get_type (void)
+{
static volatile gsize collection_page_collection_search_view_filter_type_id__volatile = 0;
if (g_once_init_enter (&collection_page_collection_search_view_filter_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (CollectionPageCollectionSearchViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) collection_page_collection_search_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CollectionPageCollectionSearchViewFilter), 0, (GInstanceInitFunc) collection_page_collection_search_view_filter_instance_init, NULL };
@@ -6342,7 +6624,9 @@ GType collection_page_collection_search_view_filter_get_type (void) {
}
-static void collection_page_class_init (CollectionPageClass * klass) {
+static void
+collection_page_class_init (CollectionPageClass * klass)
+{
#line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
collection_page_parent_class = g_type_class_peek_parent (klass);
#line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6375,11 +6659,13 @@ static void collection_page_class_init (CollectionPageClass * klass) {
((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) collection_page_real_get_search_view_filter;
#line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
G_OBJECT_CLASS (klass)->finalize = collection_page_finalize;
-#line 6379 "CollectionPage.c"
+#line 6663 "CollectionPage.c"
}
-static void collection_page_instance_init (CollectionPage * self) {
+static void
+collection_page_instance_init (CollectionPage * self)
+{
CollectionPageCollectionSearchViewFilter* _tmp0_;
#line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
self->priv = COLLECTION_PAGE_GET_PRIVATE (self);
@@ -6389,11 +6675,13 @@ static void collection_page_instance_init (CollectionPage * self) {
_tmp0_ = collection_page_collection_search_view_filter_new ();
#line 30 "/home/jens/Source/shotwell/src/CollectionPage.vala"
self->priv->search_filter = _tmp0_;
-#line 6393 "CollectionPage.c"
+#line 6679 "CollectionPage.c"
}
-static void collection_page_finalize (GObject * obj) {
+static void
+collection_page_finalize (GObject * obj)
+{
CollectionPage * self;
#line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_COLLECTION_PAGE, CollectionPage);
@@ -6403,11 +6691,13 @@ static void collection_page_finalize (GObject * obj) {
_view_filter_unref0 (self->priv->search_filter);
#line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
G_OBJECT_CLASS (collection_page_parent_class)->finalize (obj);
-#line 6407 "CollectionPage.c"
+#line 6695 "CollectionPage.c"
}
-GType collection_page_get_type (void) {
+GType
+collection_page_get_type (void)
+{
static volatile gsize collection_page_type_id__volatile = 0;
if (g_once_init_enter (&collection_page_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (CollectionPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) collection_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CollectionPage), 0, (GInstanceInitFunc) collection_page_instance_init, NULL };
@@ -6419,7 +6709,11 @@ GType collection_page_get_type (void) {
}
-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) {
@@ -6431,7 +6725,11 @@ 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);
}