diff options
Diffstat (limited to 'src/direct/DirectPhoto.c')
| -rw-r--r-- | src/direct/DirectPhoto.c | 1469 |
1 files changed, 824 insertions, 645 deletions
diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c index 0a51b29..42b8670 100644 --- a/src/direct/DirectPhoto.c +++ b/src/direct/DirectPhoto.c @@ -1,4 +1,4 @@ -/* DirectPhoto.c generated by valac 0.36.6, the Vala compiler +/* DirectPhoto.c generated by valac 0.40.4, the Vala compiler * generated from DirectPhoto.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include <glib.h> #include <glib-object.h> #include <stdlib.h> @@ -232,6 +233,11 @@ typedef struct _BackingPhotoRowClass BackingPhotoRowClass; typedef struct _DirectPhoto DirectPhoto; typedef struct _DirectPhotoClass DirectPhotoClass; typedef struct _DirectPhotoPrivate DirectPhotoPrivate; +enum { + DIRECT_PHOTO_0_PROPERTY, + DIRECT_PHOTO_NUM_PROPERTIES +}; +static GParamSpec* direct_photo_properties[DIRECT_PHOTO_NUM_PROPERTIES]; #define TYPE_DATABASE_SOURCE_COLLECTION (database_source_collection_get_type ()) #define DATABASE_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection)) @@ -342,9 +348,9 @@ typedef struct _PhotoPreviewClass PhotoPreviewClass; #define _media_metadata_unref0(var) ((var == NULL) ? NULL : (var = (media_metadata_unref (var), NULL))) enum { DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL, - DIRECT_PHOTO_LAST_SIGNAL + DIRECT_PHOTO_NUM_SIGNALS }; -static guint direct_photo_signals[DIRECT_PHOTO_LAST_SIGNAL] = {0}; +static guint direct_photo_signals[DIRECT_PHOTO_NUM_SIGNALS] = {0}; typedef struct _DataCollectionPrivate DataCollectionPrivate; #define TYPE_MARKER (marker_get_type ()) @@ -860,32 +866,56 @@ static gpointer direct_photo_source_collection_parent_class = NULL; GType data_object_get_type (void) G_GNUC_CONST; 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; 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 data_source_get_type (void) G_GNUC_CONST; gpointer source_holding_tank_ref (gpointer instance); void source_holding_tank_unref (gpointer instance); -GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_holding_tank (GValue* value, gpointer v_object); -void value_take_source_holding_tank (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_holding_tank (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_holding_tank (GValue* value, + gpointer v_object); +void value_take_source_holding_tank (GValue* value, + gpointer v_object); gpointer value_get_source_holding_tank (const GValue* value); GType source_holding_tank_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; gpointer source_snapshot_ref (gpointer instance); void source_snapshot_unref (gpointer instance); -GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_snapshot (GValue* value, gpointer v_object); -void value_take_source_snapshot (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_snapshot (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_snapshot (GValue* value, + gpointer v_object); +void value_take_source_snapshot (GValue* value, + gpointer v_object); gpointer value_get_source_snapshot (const GValue* value); GType source_snapshot_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; @@ -897,9 +927,15 @@ EventID* event_id_dup (const EventID* self); void event_id_free (EventID* self); gpointer backing_file_state_ref (gpointer instance); void backing_file_state_unref (gpointer instance); -GParamSpec* param_spec_backing_file_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_file_state (GValue* value, gpointer v_object); -void value_take_backing_file_state (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_file_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_file_state (GValue* value, + gpointer v_object); +void value_take_backing_file_state (GValue* value, + gpointer v_object); gpointer value_get_backing_file_state (const GValue* value); GType backing_file_state_get_type (void) G_GNUC_CONST; GType rating_get_type (void) G_GNUC_CONST; @@ -917,9 +953,15 @@ void import_id_free (ImportID* self); GType photo_source_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -928,31 +970,43 @@ GType photo_get_type (void) G_GNUC_CONST; GType rotation_get_type (void) G_GNUC_CONST; gpointer photo_row_ref (gpointer instance); void photo_row_unref (gpointer instance); -GParamSpec* param_spec_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_row (GValue* value, gpointer v_object); -void value_take_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_row (GValue* value, + gpointer v_object); +void value_take_photo_row (GValue* value, + gpointer v_object); gpointer value_get_photo_row (const GValue* value); GType photo_row_get_type (void) G_GNUC_CONST; gpointer backing_photo_row_ref (gpointer instance); void backing_photo_row_unref (gpointer instance); -GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_photo_row (GValue* value, gpointer v_object); -void value_take_backing_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_photo_row (GValue* value, + gpointer v_object); +void value_take_backing_photo_row (GValue* value, + gpointer v_object); gpointer value_get_backing_photo_row (const GValue* value); GType backing_photo_row_get_type (void) G_GNUC_CONST; GType direct_photo_get_type (void) G_GNUC_CONST; #define DIRECT_PHOTO_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DIRECT_PHOTO, DirectPhotoPrivate)) -enum { - DIRECT_PHOTO_DUMMY_PROPERTY -}; GType database_source_collection_get_type (void) G_GNUC_CONST; GType direct_photo_source_collection_get_type (void) G_GNUC_CONST; #define DIRECT_PHOTO_PREVIEW_BEST_FIT 360 static DirectPhoto* direct_photo_new (PhotoRow* row); -static DirectPhoto* direct_photo_construct (GType object_type, PhotoRow* row); -Photo* photo_construct (GType object_type, PhotoRow* row); +static DirectPhoto* direct_photo_construct (GType object_type, + PhotoRow* row); +Photo* photo_construct (GType object_type, + PhotoRow* row); GType orientation_get_type (void) G_GNUC_CONST; -void direct_photo_fixup_orientation_after_reimport (DirectPhoto* self, Orientation dest); +void direct_photo_fixup_orientation_after_reimport (DirectPhoto* self, + Orientation dest); GType photo_id_get_type (void) G_GNUC_CONST; PhotoID* photo_id_dup (const PhotoID* self); void photo_id_free (PhotoID* self); @@ -963,85 +1017,157 @@ GType raw_developer_get_type (void) G_GNUC_CONST; void direct_photo_init (GFile* initial_file); void photo_init_photo (void); DirectPhotoSourceCollection* direct_photo_source_collection_new (GFile* initial_file); -DirectPhotoSourceCollection* direct_photo_source_collection_construct (GType object_type, GFile* initial_file); -gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto* * photo, gboolean reimport); -gboolean data_collection_add (DataCollection* self, DataObject* object); +DirectPhotoSourceCollection* direct_photo_source_collection_construct (GType object_type, + GFile* initial_file); +gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, + GFile* file, + DirectPhoto* * photo, + gboolean reimport); +gboolean data_collection_add (DataCollection* self, + DataObject* object); void direct_photo_terminate (void); void photo_terminate_photo (void); static void direct_photo_save_dims (DirectPhoto* self); GType backing_fetch_mode_get_type (void) G_GNUC_CONST; -GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error); +GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, + Scaling* scaling, + PhotoException exceptions, + BackingFetchMode fetch_mode, + GError** error); void scaling_for_original (Scaling* result); -void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result); +void dimensions_for_pixbuf (GdkPixbuf* pixbuf, + Dimensions* result); gchar* data_object_to_string (DataObject* self); GType import_result_get_type (void) G_GNUC_CONST; ImportResult direct_photo_demand_load (DirectPhoto* self); gpointer photo_reimport_master_state_ref (gpointer instance); void photo_reimport_master_state_unref (gpointer instance); -GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void photo_value_set_reimport_master_state (GValue* value, gpointer v_object); -void photo_value_take_reimport_master_state (GValue* value, gpointer v_object); +GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void photo_value_set_reimport_master_state (GValue* value, + gpointer v_object); +void photo_value_take_reimport_master_state (GValue* value, + gpointer v_object); gpointer photo_value_get_reimport_master_state (const GValue* value); GType photo_reimport_master_state_get_type (void) G_GNUC_CONST; -gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState* * reimport_state, GError** error); +gboolean photo_prepare_for_reimport_master (Photo* self, + PhotoReimportMasterState* * reimport_state, + GError** error); GQuark database_error_quark (void); -void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, GError** error); -ImportResult direct_photo_internal_import (GFile* file, DirectPhoto* * photo); +void photo_finish_reimport_master (Photo* self, + PhotoReimportMasterState* state, + GError** error); +ImportResult direct_photo_internal_import (GFile* file, + DirectPhoto* * photo); gpointer photo_import_params_ref (gpointer instance); void photo_import_params_unref (gpointer instance); -GParamSpec* param_spec_photo_import_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_import_params (GValue* value, gpointer v_object); -void value_take_photo_import_params (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_import_params (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_import_params (GValue* value, + gpointer v_object); +void value_take_photo_import_params (GValue* value, + gpointer v_object); gpointer value_get_photo_import_params (const GValue* value); GType photo_import_params_get_type (void) G_GNUC_CONST; void import_id_generate (ImportID* result); -PhotoImportParams* photo_import_params_new_create_placeholder (GFile* file, ImportID* import_id); -PhotoImportParams* photo_import_params_construct_create_placeholder (GType object_type, GFile* file, ImportID* import_id); +PhotoImportParams* photo_import_params_new_create_placeholder (GFile* file, + ImportID* import_id); +PhotoImportParams* photo_import_params_construct_create_placeholder (GType object_type, + GFile* file, + ImportID* import_id); void photo_create_pre_import (PhotoImportParams* params); gpointer database_table_ref (gpointer instance); void database_table_unref (gpointer instance); -GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_database_table (GValue* value, gpointer v_object); -void value_take_database_table (GValue* value, gpointer v_object); +GParamSpec* param_spec_database_table (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_database_table (GValue* value, + gpointer v_object); +void value_take_database_table (GValue* value, + gpointer v_object); gpointer value_get_database_table (const GValue* value); GType database_table_get_type (void) G_GNUC_CONST; GType photo_table_get_type (void) G_GNUC_CONST; PhotoTable* photo_table_get_instance (void); -void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result); +void photo_table_add (PhotoTable* self, + PhotoRow* photo_row, + PhotoID* result); GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; gpointer thumbnails_ref (gpointer instance); void thumbnails_unref (gpointer instance); -GParamSpec* param_spec_thumbnails (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_thumbnails (GValue* value, gpointer v_object); -void value_take_thumbnails (GValue* value, gpointer v_object); +GParamSpec* param_spec_thumbnails (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_thumbnails (GValue* value, + gpointer v_object); +void value_take_thumbnails (GValue* value, + gpointer v_object); gpointer value_get_thumbnails (const GValue* value); GType thumbnails_get_type (void) G_GNUC_CONST; -static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scaling* scaling, GError** error); -GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, gint scale, GError** error); -GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error); -GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInterpType interp, gboolean scale_up); -static void direct_photo_real_rotate (Photo* base, Rotation rotation); -void photo_rotate (Photo* self, Rotation rotation); -static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GError** error); -static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error); +static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, + Scaling* scaling, + GError** error); +GdkPixbuf* thumbnail_source_get_thumbnail (ThumbnailSource* self, + gint scale, + GError** error); +GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, + Scaling* scaling, + GError** error); +GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, + GdkPixbuf* pixbuf, + GdkInterpType interp, + gboolean scale_up); +static void direct_photo_real_rotate (Photo* base, + Rotation rotation); +void photo_rotate (Photo* self, + Rotation rotation); +static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, + Scaling* scaling, + GError** error); +static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, + gint scale, + GError** error); PhotoMetadata* photo_source_get_metadata (PhotoSource* self); guint photo_metadata_get_preview_count (PhotoMetadata* self); gpointer photo_preview_ref (gpointer instance); void photo_preview_unref (gpointer instance); -GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_preview (GValue* value, gpointer v_object); -void value_take_photo_preview (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_preview (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_preview (GValue* value, + gpointer v_object); +void value_take_photo_preview (GValue* value, + gpointer v_object); gpointer value_get_photo_preview (const GValue* value); GType photo_preview_get_type (void) G_GNUC_CONST; -PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number); -GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error); +PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, + guint number); +GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, + GError** error); Orientation photo_get_orientation (Photo* self); -GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf); -static void direct_photo_real_notify_altered (DataObject* base, Alteration* alteration); -void data_object_notify_altered (DataObject* self, Alteration* alteration); +GdkPixbuf* orientation_rotate_pixbuf (Orientation self, + GdkPixbuf* pixbuf); +static void direct_photo_real_notify_altered (DataObject* base, + Alteration* alteration); +void data_object_notify_altered (DataObject* self, + Alteration* alteration); static gboolean direct_photo_real_has_user_generated_metadata (Photo* base); -static void direct_photo_real_set_user_metadata_for_export (Photo* base, PhotoMetadata* metadata); -static void direct_photo_real_apply_user_metadata_for_reimport (Photo* base, PhotoMetadata* metadata); +static void direct_photo_real_set_user_metadata_for_export (Photo* base, + PhotoMetadata* metadata); +static void direct_photo_real_apply_user_metadata_for_reimport (Photo* base, + PhotoMetadata* metadata); static gboolean direct_photo_real_is_trashed (MediaSource* base); static gboolean direct_photo_real_is_offline (MediaSource* base); static void direct_photo_real_trash (MediaSource* base); @@ -1052,72 +1178,110 @@ static void direct_photo_finalize (GObject * obj); GType marker_get_type (void) G_GNUC_CONST; gpointer source_backlink_ref (gpointer instance); void source_backlink_unref (gpointer instance); -GParamSpec* param_spec_source_backlink (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_source_backlink (GValue* value, gpointer v_object); -void value_take_source_backlink (GValue* value, gpointer v_object); +GParamSpec* param_spec_source_backlink (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_source_backlink (GValue* value, + gpointer v_object); +void value_take_source_backlink (GValue* value, + gpointer v_object); gpointer value_get_source_backlink (const GValue* value); GType source_backlink_get_type (void) G_GNUC_CONST; GType directory_monitor_get_type (void) G_GNUC_CONST; #define DIRECT_PHOTO_SOURCE_COLLECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollectionPrivate)) -enum { - DIRECT_PHOTO_SOURCE_COLLECTION_DUMMY_PROPERTY -}; guint file_hash (GFile* file); -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self); -gboolean file_equal (GFile* a, GFile* b); -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); +static guint _file_hash_gee_hash_data_func (gconstpointer v, + gpointer self); +gboolean file_equal (GFile* a, + GFile* b); +static gboolean _file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self); #define DIRECT_PHOTO_SOURCE_COLLECTION_DISCOVERED_FILES_BATCH_ADD 500 static gint64 direct_photo_source_collection_get_direct_key (DataSource* source); -static gint64 _direct_photo_source_collection_get_direct_key_get_source_database_key (DataSource* source, gpointer self); -DatabaseSourceCollection* database_source_collection_construct (GType object_type, const gchar* name, GetSourceDatabaseKey source_key_func, void* source_key_func_target); -DirectoryMonitor* directory_monitor_new (GFile* root, gboolean recurse, gboolean monitoring); -DirectoryMonitor* directory_monitor_construct (GType object_type, GFile* root, gboolean recurse, gboolean monitoring); -static void direct_photo_source_collection_on_file_discovered (DirectPhotoSourceCollection* self, GFile* file, GFileInfo* info); -static void _direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered (DirectoryMonitor* _sender, GFile* file, GFileInfo* info, gpointer self); +static gint64 _direct_photo_source_collection_get_direct_key_get_source_database_key (DataSource* source, + gpointer self); +DatabaseSourceCollection* database_source_collection_construct (GType object_type, + const gchar* name, + GetSourceDatabaseKey source_key_func, + void* source_key_func_target); +DirectoryMonitor* directory_monitor_new (GFile* root, + gboolean recurse, + gboolean monitoring); +DirectoryMonitor* directory_monitor_construct (GType object_type, + GFile* root, + gboolean recurse, + gboolean monitoring); +static void direct_photo_source_collection_on_file_discovered (DirectPhotoSourceCollection* self, + GFile* file, + GFileInfo* info); +static void _direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered (DirectoryMonitor* _sender, + GFile* file, + GFileInfo* info, + gpointer self); static void direct_photo_source_collection_on_discovery_completed (DirectPhotoSourceCollection* self); -static void _direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self); +static void _direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, + gpointer self); void directory_monitor_start_discovery (DirectoryMonitor* self); -static gboolean direct_photo_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source); -void photo_get_photo_id (Photo* self, PhotoID* result); -static void direct_photo_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added); +static gboolean direct_photo_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source); +void photo_get_photo_id (Photo* self, + PhotoID* result); +static void direct_photo_source_collection_real_notify_items_added (DataCollection* base, + GeeIterable* added); GFile* media_source_get_file (MediaSource* self); -void data_collection_notify_items_added (DataCollection* self, GeeIterable* added); -static void direct_photo_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed); -void data_collection_notify_items_removed (DataCollection* self, GeeIterable* removed); -gboolean direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCollection* self, GFile* file); +void data_collection_notify_items_added (DataCollection* self, + GeeIterable* added); +static void direct_photo_source_collection_real_notify_items_removed (DataCollection* base, + GeeIterable* removed); +void data_collection_notify_items_removed (DataCollection* self, + GeeIterable* removed); +gboolean direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCollection* self, + GFile* file); gboolean photo_file_format_is_file_supported (GFile* file); static void direct_photo_source_collection_flush_prepared_photos (DirectPhotoSourceCollection* self); -GeeCollection* data_collection_add_many (DataCollection* self, GeeCollection* objects, ProgressMonitor monitor, void* monitor_target); -gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* self, GFile* file); -void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* self, DirectPhoto* photo); +GeeCollection* data_collection_add_many (DataCollection* self, + GeeCollection* objects, + ProgressMonitor monitor, + void* monitor_target); +gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* self, + GFile* file); +void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* self, + DirectPhoto* photo); void photo_discard_prefetched (Photo* self); gboolean photo_only_metadata_changed (Photo* self); PhotoFileFormat photo_get_file_format (Photo* self); gchar* import_result_to_string (ImportResult self); -gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollection* self, GFile* file); -DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self, GFile* file); +gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollection* self, + GFile* file); +DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self, + GFile* file); static void direct_photo_source_collection_finalize (DataCollection * obj); -static DirectPhoto* direct_photo_construct (GType object_type, PhotoRow* row) { +static DirectPhoto* +direct_photo_construct (GType object_type, + PhotoRow* row) +{ DirectPhoto * self = NULL; - PhotoRow* _tmp0_; #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_PHOTO_ROW (row), NULL); #line 18 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = row; -#line 18 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - self = (DirectPhoto*) photo_construct (object_type, _tmp0_); + self = (DirectPhoto*) photo_construct (object_type, row); #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return self; -#line 1114 "DirectPhoto.c" +#line 1276 "DirectPhoto.c" } -static DirectPhoto* direct_photo_new (PhotoRow* row) { +static DirectPhoto* +direct_photo_new (PhotoRow* row) +{ #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return direct_photo_construct (TYPE_DIRECT_PHOTO, row); -#line 1121 "DirectPhoto.c" +#line 1285 "DirectPhoto.c" } @@ -1135,103 +1299,100 @@ static DirectPhoto* direct_photo_new (PhotoRow* row) { * @param dest The orientation to set the photo to; usually, this should be a value * obtained by calling get_orientation() prior to export()ing a DirectPhoto. */ -void direct_photo_fixup_orientation_after_reimport (DirectPhoto* self, Orientation dest) { +void +direct_photo_fixup_orientation_after_reimport (DirectPhoto* self, + Orientation dest) +{ PhotoRow* _tmp0_; - Orientation _tmp1_; - BackingPhotoRow* _tmp2_; - Orientation _tmp3_; + BackingPhotoRow* _tmp1_; #line 35 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_DIRECT_PHOTO (self)); #line 36 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->row; #line 36 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = dest; -#line 36 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_->orientation = _tmp1_; -#line 37 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->backing_photo_row; + _tmp0_->orientation = dest; #line 37 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = dest; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->backing_photo_row; #line 37 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_->original_orientation = _tmp3_; -#line 1158 "DirectPhoto.c" + _tmp1_->original_orientation = dest; +#line 1319 "DirectPhoto.c" } -void direct_photo_init (GFile* initial_file) { - GFile* _tmp0_; - DirectPhotoSourceCollection* _tmp1_; +void +direct_photo_init (GFile* initial_file) +{ + DirectPhotoSourceCollection* _tmp0_; DirectPhoto* photo = NULL; gchar* reason = NULL; - DirectPhotoSourceCollection* _tmp2_; - GFile* _tmp3_; - DirectPhoto* _tmp4_ = NULL; - gchar* _tmp5_; - const gchar* _tmp6_; - DirectPhotoSourceCollection* _tmp8_; - DirectPhoto* _tmp9_; + DirectPhotoSourceCollection* _tmp1_; + DirectPhoto* _tmp2_ = NULL; + gchar* _tmp3_; + const gchar* _tmp4_; + DirectPhotoSourceCollection* _tmp6_; + DirectPhoto* _tmp7_; #line 40 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (G_IS_FILE (initial_file)); #line 41 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" photo_init_photo (); #line 43 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = initial_file; -#line 43 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = direct_photo_source_collection_new (_tmp0_); + _tmp0_ = direct_photo_source_collection_new (initial_file); #line 43 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _data_collection_unref0 (direct_photo_global); #line 43 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - direct_photo_global = _tmp1_; -#line 45 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = direct_photo_global; + direct_photo_global = _tmp0_; #line 45 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = initial_file; + _tmp1_ = direct_photo_global; #line 45 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp5_ = direct_photo_source_collection_fetch (_tmp2_, _tmp3_, &_tmp4_, FALSE); + _tmp3_ = direct_photo_source_collection_fetch (_tmp1_, initial_file, &_tmp2_, FALSE); #line 45 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (photo); #line 45 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo = _tmp4_; + photo = _tmp2_; #line 45 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - reason = _tmp5_; + reason = _tmp3_; #line 46 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp6_ = reason; + _tmp4_ = reason; #line 46 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp6_ != NULL) { -#line 1202 "DirectPhoto.c" - const gchar* _tmp7_; + if (_tmp4_ != NULL) { +#line 1359 "DirectPhoto.c" + const gchar* _tmp5_; #line 47 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp7_ = reason; + _tmp5_ = reason; #line 47 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - g_warning ("DirectPhoto.vala:47: fetch error: %s", _tmp7_); -#line 1208 "DirectPhoto.c" + g_warning ("DirectPhoto.vala:47: fetch error: %s", _tmp5_); +#line 1365 "DirectPhoto.c" } #line 48 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp8_ = direct_photo_global; + _tmp6_ = direct_photo_global; #line 48 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp9_ = photo; + _tmp7_ = photo; #line 48 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject)); + data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject)); #line 40 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_free0 (reason); #line 40 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (photo); -#line 1220 "DirectPhoto.c" +#line 1377 "DirectPhoto.c" } -void direct_photo_terminate (void) { +void +direct_photo_terminate (void) +{ #line 52 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" photo_terminate_photo (); -#line 1227 "DirectPhoto.c" +#line 1386 "DirectPhoto.c" } -static void direct_photo_save_dims (DirectPhoto* self) { +static void +direct_photo_save_dims (DirectPhoto* self) +{ GError * _inner_error_ = NULL; #line 57 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_DIRECT_PHOTO (self)); -#line 1235 "DirectPhoto.c" +#line 1396 "DirectPhoto.c" { GdkPixbuf* _tmp0_ = NULL; Scaling _tmp1_ = {0}; @@ -1246,7 +1407,7 @@ static void direct_photo_save_dims (DirectPhoto* self) { _tmp0_ = _tmp2_; #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1250 "DirectPhoto.c" +#line 1411 "DirectPhoto.c" goto __catch49_g_error; } #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1257,7 +1418,7 @@ static void direct_photo_save_dims (DirectPhoto* self) { _tmp3_->dim = _tmp4_; #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_tmp0_); -#line 1261 "DirectPhoto.c" +#line 1422 "DirectPhoto.c" } goto __finally49; __catch49_g_error: @@ -1279,7 +1440,7 @@ static void direct_photo_save_dims (DirectPhoto* self) { _g_free0 (_tmp6_); #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_error_free0 (e); -#line 1283 "DirectPhoto.c" +#line 1444 "DirectPhoto.c" } __finally49: #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1290,12 +1451,14 @@ static void direct_photo_save_dims (DirectPhoto* self) { g_clear_error (&_inner_error_); #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return; -#line 1294 "DirectPhoto.c" +#line 1455 "DirectPhoto.c" } } -ImportResult direct_photo_demand_load (DirectPhoto* self) { +ImportResult +direct_photo_demand_load (DirectPhoto* self) +{ ImportResult result = 0; gboolean _tmp0_; PhotoReimportMasterState* reimport_state = NULL; @@ -1312,7 +1475,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { result = IMPORT_RESULT_SUCCESS; #line 70 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1316 "DirectPhoto.c" +#line 1479 "DirectPhoto.c" } { PhotoReimportMasterState* _tmp1_ = NULL; @@ -1325,7 +1488,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { reimport_state = _tmp1_; #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1329 "DirectPhoto.c" +#line 1492 "DirectPhoto.c" goto __catch50_g_error; } #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1334,7 +1497,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { photo_finish_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp2_, &_inner_error_); #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1338 "DirectPhoto.c" +#line 1501 "DirectPhoto.c" goto __catch50_g_error; } } @@ -1362,7 +1525,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { _photo_reimport_master_state_unref0 (reimport_state); #line 79 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1366 "DirectPhoto.c" +#line 1529 "DirectPhoto.c" } __finally50: #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1375,7 +1538,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { g_clear_error (&_inner_error_); #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return 0; -#line 1379 "DirectPhoto.c" +#line 1542 "DirectPhoto.c" } #line 82 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->loaded = TRUE; @@ -1387,53 +1550,53 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) { _photo_reimport_master_state_unref0 (reimport_state); #line 84 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1391 "DirectPhoto.c" +#line 1554 "DirectPhoto.c" } -ImportResult direct_photo_internal_import (GFile* file, DirectPhoto* * photo) { +ImportResult +direct_photo_internal_import (GFile* file, + DirectPhoto* * photo) +{ DirectPhoto* _vala_photo = NULL; ImportResult result = 0; PhotoImportParams* params = NULL; - GFile* _tmp0_; - ImportID _tmp1_ = {0}; - PhotoImportParams* _tmp2_; + ImportID _tmp0_ = {0}; + PhotoImportParams* _tmp1_; + PhotoTable* _tmp2_; PhotoTable* _tmp3_; - PhotoTable* _tmp4_; - PhotoRow* _tmp5_; - PhotoID _tmp6_ = {0}; - PhotoRow* _tmp7_; - DirectPhoto* _tmp8_; + PhotoRow* _tmp4_; + PhotoID _tmp5_ = {0}; + PhotoRow* _tmp6_; + DirectPhoto* _tmp7_; #line 89 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (G_IS_FILE (file), 0); #line 90 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = file; -#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - import_id_generate (&_tmp1_); + import_id_generate (&_tmp0_); #line 90 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = photo_import_params_new_create_placeholder (_tmp0_, &_tmp1_); + _tmp1_ = photo_import_params_new_create_placeholder (file, &_tmp0_); #line 90 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - params = _tmp2_; + params = _tmp1_; #line 91 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" photo_create_pre_import (params); #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = photo_table_get_instance (); + _tmp2_ = photo_table_get_instance (); #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp5_ = params->row; + _tmp4_ = params->row; #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo_table_add (_tmp4_, _tmp5_, &_tmp6_); + photo_table_add (_tmp3_, _tmp4_, &_tmp5_); #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _database_table_unref0 (_tmp4_); + _database_table_unref0 (_tmp3_); #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp7_ = params->row; + _tmp6_ = params->row; #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp8_ = direct_photo_new (_tmp7_); + _tmp7_ = direct_photo_new (_tmp6_); #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_vala_photo); #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _vala_photo = _tmp8_; + _vala_photo = _tmp7_; #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" result = IMPORT_RESULT_SUCCESS; #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1442,19 +1605,23 @@ ImportResult direct_photo_internal_import (GFile* file, DirectPhoto* * photo) { if (photo) { #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" *photo = _vala_photo; -#line 1446 "DirectPhoto.c" +#line 1609 "DirectPhoto.c" } else { #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_vala_photo); -#line 1450 "DirectPhoto.c" +#line 1613 "DirectPhoto.c" } #line 96 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1454 "DirectPhoto.c" +#line 1617 "DirectPhoto.c" } -static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scaling* scaling, GError** error) { +static GdkPixbuf* +direct_photo_real_get_preview_pixbuf (MediaSource* base, + Scaling* scaling, + GError** error) +{ DirectPhoto * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_; @@ -1469,7 +1636,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali _tmp0_ = self->priv->preview; #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (_tmp0_ == NULL) { -#line 1473 "DirectPhoto.c" +#line 1640 "DirectPhoto.c" GdkPixbuf* _tmp1_ = NULL; GdkPixbuf* _tmp2_; GdkPixbuf* _tmp3_; @@ -1484,7 +1651,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali g_propagate_error (error, _inner_error_); #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return NULL; -#line 1488 "DirectPhoto.c" +#line 1655 "DirectPhoto.c" } #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp3_ = _tmp1_; @@ -1498,7 +1665,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali _tmp4_ = self->priv->preview; #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (_tmp4_ == NULL) { -#line 1502 "DirectPhoto.c" +#line 1669 "DirectPhoto.c" GdkPixbuf* _tmp5_ = NULL; Scaling _tmp6_; GdkPixbuf* _tmp7_; @@ -1517,7 +1684,7 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali _g_object_unref0 (_tmp1_); #line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return NULL; -#line 1521 "DirectPhoto.c" +#line 1688 "DirectPhoto.c" } #line 104 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp8_ = _tmp5_; @@ -1529,11 +1696,11 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali self->priv->preview = _tmp8_; #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_tmp5_); -#line 1533 "DirectPhoto.c" +#line 1700 "DirectPhoto.c" } #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_tmp1_); -#line 1537 "DirectPhoto.c" +#line 1704 "DirectPhoto.c" } #line 107 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp9_ = self->priv->preview; @@ -1543,13 +1710,15 @@ static GdkPixbuf* direct_photo_real_get_preview_pixbuf (MediaSource* base, Scali result = _tmp10_; #line 107 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1547 "DirectPhoto.c" +#line 1714 "DirectPhoto.c" } -static void direct_photo_real_rotate (Photo* base, Rotation rotation) { +static void +direct_photo_real_rotate (Photo* base, + Rotation rotation) +{ DirectPhoto * self; - Rotation _tmp0_; #line 110 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); #line 111 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1557,14 +1726,16 @@ static void direct_photo_real_rotate (Photo* base, Rotation rotation) { #line 112 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_signal_emit (self, direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL], 0, FALSE); #line 113 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = rotation; -#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - PHOTO_CLASS (direct_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_); -#line 1564 "DirectPhoto.c" + PHOTO_CLASS (direct_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), rotation); +#line 1731 "DirectPhoto.c" } -static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GError** error) { +static GdkPixbuf* +direct_photo_real_get_pixbuf (PhotoSource* base, + Scaling* scaling, + GError** error) +{ DirectPhoto * self; GdkPixbuf* result = NULL; GdkPixbuf* ret = NULL; @@ -1587,7 +1758,7 @@ static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scal g_propagate_error (error, _inner_error_); #line 117 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return NULL; -#line 1591 "DirectPhoto.c" +#line 1762 "DirectPhoto.c" } #line 118 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_signal_emit (self, direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL], 0, TRUE); @@ -1597,11 +1768,15 @@ static GdkPixbuf* direct_photo_real_get_pixbuf (PhotoSource* base, Scaling* scal result = ret; #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1601 "DirectPhoto.c" +#line 1772 "DirectPhoto.c" } -static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint scale, GError** error) { +static GdkPixbuf* +direct_photo_real_get_thumbnail (ThumbnailSource* base, + gint scale, + GError** error) +{ DirectPhoto * self; GdkPixbuf* result = NULL; PhotoMetadata* metadata = NULL; @@ -1622,17 +1797,14 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s if (_tmp3_ == NULL) { #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp2_ = TRUE; -#line 1626 "DirectPhoto.c" +#line 1801 "DirectPhoto.c" } else { PhotoMetadata* _tmp4_; - guint _tmp5_; #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp4_ = metadata; #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp5_ = photo_metadata_get_preview_count (_tmp4_); -#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = _tmp5_ == ((guint) 0); -#line 1636 "DirectPhoto.c" + _tmp2_ = photo_metadata_get_preview_count (_tmp4_) == ((guint) 0); +#line 1808 "DirectPhoto.c" } #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (_tmp2_) { @@ -1640,30 +1812,29 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s _g_object_unref0 (_tmp1_); #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp1_ = NULL; -#line 1644 "DirectPhoto.c" +#line 1816 "DirectPhoto.c" } else { - GdkPixbuf* _tmp6_ = NULL; - PhotoMetadata* _tmp7_; + GdkPixbuf* _tmp5_ = NULL; + PhotoMetadata* _tmp6_; + PhotoPreview* _tmp7_; PhotoPreview* _tmp8_; - PhotoPreview* _tmp9_; + GdkPixbuf* _tmp9_; GdkPixbuf* _tmp10_; GdkPixbuf* _tmp11_; - Orientation _tmp12_; - GdkPixbuf* _tmp13_; #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp7_ = metadata; + _tmp6_ = metadata; #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp8_ = photo_metadata_get_preview (_tmp7_, (guint) 0); + _tmp7_ = photo_metadata_get_preview (_tmp6_, (guint) 0); #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp9_ = _tmp8_; + _tmp8_ = _tmp7_; #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp10_ = photo_preview_get_pixbuf (_tmp9_, &_inner_error_); + _tmp9_ = photo_preview_get_pixbuf (_tmp8_, &_inner_error_); #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _photo_preview_unref0 (_tmp9_); + _photo_preview_unref0 (_tmp8_); #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp6_ = _tmp11_; + _tmp5_ = _tmp10_; #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1674,19 +1845,17 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s _media_metadata_unref0 (metadata); #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return NULL; -#line 1678 "DirectPhoto.c" +#line 1849 "DirectPhoto.c" } #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp12_ = photo_get_orientation (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)); -#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp13_ = orientation_rotate_pixbuf (_tmp12_, _tmp6_); + _tmp11_ = orientation_rotate_pixbuf (photo_get_orientation (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)), _tmp5_); #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_tmp1_); #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = _tmp13_; + _tmp1_ = _tmp11_; #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _g_object_unref0 (_tmp6_); -#line 1690 "DirectPhoto.c" + _g_object_unref0 (_tmp5_); +#line 1859 "DirectPhoto.c" } #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" result = _tmp1_; @@ -1694,13 +1863,15 @@ static GdkPixbuf* direct_photo_real_get_thumbnail (ThumbnailSource* base, gint s _media_metadata_unref0 (metadata); #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1698 "DirectPhoto.c" +#line 1867 "DirectPhoto.c" } -static void direct_photo_real_notify_altered (DataObject* base, Alteration* alteration) { +static void +direct_photo_real_notify_altered (DataObject* base, + Alteration* alteration) +{ DirectPhoto * self; - Alteration* _tmp0_; #line 130 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); #line 130 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1710,14 +1881,14 @@ static void direct_photo_real_notify_altered (DataObject* base, Alteration* alte #line 131 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->preview = NULL; #line 133 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = alteration; -#line 133 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - DATA_OBJECT_CLASS (direct_photo_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_OBJECT, DataObject), _tmp0_); -#line 1717 "DirectPhoto.c" + DATA_OBJECT_CLASS (direct_photo_parent_class)->notify_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), TYPE_DATA_OBJECT, DataObject), alteration); +#line 1886 "DirectPhoto.c" } -static gboolean direct_photo_real_has_user_generated_metadata (Photo* base) { +static gboolean +direct_photo_real_has_user_generated_metadata (Photo* base) +{ DirectPhoto * self; gboolean result = FALSE; #line 136 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1726,31 +1897,39 @@ static gboolean direct_photo_real_has_user_generated_metadata (Photo* base) { result = FALSE; #line 138 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1730 "DirectPhoto.c" +#line 1901 "DirectPhoto.c" } -static void direct_photo_real_set_user_metadata_for_export (Photo* base, PhotoMetadata* metadata) { +static void +direct_photo_real_set_user_metadata_for_export (Photo* base, + PhotoMetadata* metadata) +{ DirectPhoto * self; #line 141 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); #line 141 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_PHOTO_METADATA (metadata)); -#line 1740 "DirectPhoto.c" +#line 1914 "DirectPhoto.c" } -static void direct_photo_real_apply_user_metadata_for_reimport (Photo* base, PhotoMetadata* metadata) { +static void +direct_photo_real_apply_user_metadata_for_reimport (Photo* base, + PhotoMetadata* metadata) +{ DirectPhoto * self; #line 145 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); #line 145 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_PHOTO_METADATA (metadata)); -#line 1750 "DirectPhoto.c" +#line 1927 "DirectPhoto.c" } -static gboolean direct_photo_real_is_trashed (MediaSource* base) { +static gboolean +direct_photo_real_is_trashed (MediaSource* base) +{ DirectPhoto * self; gboolean result = FALSE; #line 148 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1759,11 +1938,13 @@ static gboolean direct_photo_real_is_trashed (MediaSource* base) { result = FALSE; #line 150 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1763 "DirectPhoto.c" +#line 1942 "DirectPhoto.c" } -static gboolean direct_photo_real_is_offline (MediaSource* base) { +static gboolean +direct_photo_real_is_offline (MediaSource* base) +{ DirectPhoto * self; gboolean result = FALSE; #line 153 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1772,43 +1953,53 @@ static gboolean direct_photo_real_is_offline (MediaSource* base) { result = FALSE; #line 155 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1776 "DirectPhoto.c" +#line 1957 "DirectPhoto.c" } -static void direct_photo_real_trash (MediaSource* base) { +static void +direct_photo_real_trash (MediaSource* base) +{ DirectPhoto * self; #line 158 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); -#line 1784 "DirectPhoto.c" +#line 1967 "DirectPhoto.c" } -static void direct_photo_real_untrash (MediaSource* base) { +static void +direct_photo_real_untrash (MediaSource* base) +{ DirectPhoto * self; #line 162 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); -#line 1792 "DirectPhoto.c" +#line 1977 "DirectPhoto.c" } -static void direct_photo_real_mark_offline (MediaSource* base) { +static void +direct_photo_real_mark_offline (MediaSource* base) +{ DirectPhoto * self; #line 166 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); -#line 1800 "DirectPhoto.c" +#line 1987 "DirectPhoto.c" } -static void direct_photo_real_mark_online (MediaSource* base) { +static void +direct_photo_real_mark_online (MediaSource* base) +{ DirectPhoto * self; #line 170 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO, DirectPhoto); -#line 1808 "DirectPhoto.c" +#line 1997 "DirectPhoto.c" } -static void direct_photo_class_init (DirectPhotoClass * klass) { +static void +direct_photo_class_init (DirectPhotoClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" direct_photo_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -1845,22 +2036,26 @@ static void direct_photo_class_init (DirectPhotoClass * klass) { G_OBJECT_CLASS (klass)->finalize = direct_photo_finalize; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" direct_photo_signals[DIRECT_PHOTO_CAN_ROTATE_CHANGED_SIGNAL] = g_signal_new ("can-rotate-changed", TYPE_DIRECT_PHOTO, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); -#line 1849 "DirectPhoto.c" +#line 2040 "DirectPhoto.c" } -static void direct_photo_instance_init (DirectPhoto * self) { +static void +direct_photo_instance_init (DirectPhoto * self) +{ #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv = DIRECT_PHOTO_GET_PRIVATE (self); #line 14 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->preview = NULL; #line 15 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->loaded = FALSE; -#line 1860 "DirectPhoto.c" +#line 2053 "DirectPhoto.c" } -static void direct_photo_finalize (GObject * obj) { +static void +direct_photo_finalize (GObject * obj) +{ DirectPhoto * self; #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_PHOTO, DirectPhoto); @@ -1868,11 +2063,13 @@ static void direct_photo_finalize (GObject * obj) { _g_object_unref0 (self->priv->preview); #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" G_OBJECT_CLASS (direct_photo_parent_class)->finalize (obj); -#line 1872 "DirectPhoto.c" +#line 2067 "DirectPhoto.c" } -GType direct_photo_get_type (void) { +GType +direct_photo_get_type (void) +{ static volatile gsize direct_photo_type_id__volatile = 0; if (g_once_init_enter (&direct_photo_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DirectPhotoClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_photo_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectPhoto), 0, (GInstanceInitFunc) direct_photo_instance_init, NULL }; @@ -1884,363 +2081,370 @@ GType direct_photo_get_type (void) { } -static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) { +static guint +_file_hash_gee_hash_data_func (gconstpointer v, + gpointer self) +{ guint result; result = file_hash ((GFile*) v); #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1893 "DirectPhoto.c" +#line 2093 "DirectPhoto.c" } -static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gboolean +_file_equal_gee_equal_data_func (gconstpointer a, + gconstpointer b, + gpointer self) +{ gboolean result; result = file_equal ((GFile*) a, (GFile*) b); #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1902 "DirectPhoto.c" +#line 2106 "DirectPhoto.c" } -static gint64 _direct_photo_source_collection_get_direct_key_get_source_database_key (DataSource* source, gpointer self) { +static gint64 +_direct_photo_source_collection_get_direct_key_get_source_database_key (DataSource* source, + gpointer self) +{ gint64 result; result = direct_photo_source_collection_get_direct_key (source); #line 183 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1911 "DirectPhoto.c" +#line 2118 "DirectPhoto.c" } -static void _direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered (DirectoryMonitor* _sender, GFile* file, GFileInfo* info, gpointer self) { +static void +_direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered (DirectoryMonitor* _sender, + GFile* file, + GFileInfo* info, + gpointer self) +{ #line 187 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" direct_photo_source_collection_on_file_discovered ((DirectPhotoSourceCollection*) self, file, info); -#line 1918 "DirectPhoto.c" +#line 2130 "DirectPhoto.c" } -static void _direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) { +static void +_direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, + gpointer self) +{ #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" direct_photo_source_collection_on_discovery_completed ((DirectPhotoSourceCollection*) self); -#line 1925 "DirectPhoto.c" +#line 2140 "DirectPhoto.c" } -DirectPhotoSourceCollection* direct_photo_source_collection_construct (GType object_type, GFile* initial_file) { +DirectPhotoSourceCollection* +direct_photo_source_collection_construct (GType object_type, + GFile* initial_file) +{ DirectPhotoSourceCollection* self = NULL; GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; + DirectoryMonitor* _tmp2_; DirectoryMonitor* _tmp3_; DirectoryMonitor* _tmp4_; DirectoryMonitor* _tmp5_; - DirectoryMonitor* _tmp6_; #line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (G_IS_FILE (initial_file), NULL); #line 183 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = (DirectPhotoSourceCollection*) database_source_collection_construct (object_type, "DirectPhotoSourceCollection", _direct_photo_source_collection_get_direct_key_get_source_database_key, NULL); #line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = initial_file; + _tmp0_ = g_file_get_parent (initial_file); #line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = g_file_get_parent (_tmp0_); -#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = directory_monitor_new (_tmp2_, FALSE, FALSE); + _tmp2_ = directory_monitor_new (_tmp1_, FALSE, FALSE); #line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (self->priv->monitor); #line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - self->priv->monitor = _tmp3_; + self->priv->monitor = _tmp2_; #line 186 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 187 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp4_ = self->priv->monitor; + _tmp3_ = self->priv->monitor; #line 187 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - g_signal_connect (_tmp4_, "file-discovered", (GCallback) _direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered, self); + g_signal_connect (_tmp3_, "file-discovered", (GCallback) _direct_photo_source_collection_on_file_discovered_directory_monitor_file_discovered, self); #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp5_ = self->priv->monitor; + _tmp4_ = self->priv->monitor; #line 188 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - g_signal_connect (_tmp5_, "discovery-completed", (GCallback) _direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed, self); + g_signal_connect (_tmp4_, "discovery-completed", (GCallback) _direct_photo_source_collection_on_discovery_completed_directory_monitor_discovery_completed, self); #line 190 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp6_ = self->priv->monitor; + _tmp5_ = self->priv->monitor; #line 190 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - directory_monitor_start_discovery (_tmp6_); + directory_monitor_start_discovery (_tmp5_); #line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return self; -#line 1970 "DirectPhoto.c" +#line 2185 "DirectPhoto.c" } -DirectPhotoSourceCollection* direct_photo_source_collection_new (GFile* initial_file) { +DirectPhotoSourceCollection* +direct_photo_source_collection_new (GFile* initial_file) +{ #line 182 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return direct_photo_source_collection_construct (TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, initial_file); -#line 1977 "DirectPhoto.c" +#line 2194 "DirectPhoto.c" } -static gboolean direct_photo_source_collection_real_holds_type_of_source (SourceCollection* base, DataSource* source) { +static gboolean +direct_photo_source_collection_real_holds_type_of_source (SourceCollection* base, + DataSource* source) +{ DirectPhotoSourceCollection * self; gboolean result = FALSE; - DataSource* _tmp0_; #line 193 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection); #line 193 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 194 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = source; -#line 194 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_DIRECT_PHOTO); + result = G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_DIRECT_PHOTO); #line 194 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 1995 "DirectPhoto.c" +#line 2212 "DirectPhoto.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 198 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return self ? g_object_ref (self) : NULL; -#line 2002 "DirectPhoto.c" +#line 2221 "DirectPhoto.c" } -static gint64 direct_photo_source_collection_get_direct_key (DataSource* source) { +static gint64 +direct_photo_source_collection_get_direct_key (DataSource* source) +{ gint64 result = 0LL; DirectPhoto* photo = NULL; - DataSource* _tmp0_; - DirectPhoto* _tmp1_; + DirectPhoto* _tmp0_; PhotoID photo_id = {0}; - PhotoID _tmp2_ = {0}; - PhotoID _tmp3_; - gint64 _tmp4_; + PhotoID _tmp1_ = {0}; + PhotoID _tmp2_; + gint64 _tmp3_; #line 197 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL); #line 198 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = source; -#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO, DirectPhoto)); + _tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DIRECT_PHOTO, DirectPhoto)); #line 198 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo = _tmp1_; + photo = _tmp0_; #line 199 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo), &_tmp2_); + photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo), &_tmp1_); #line 199 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo_id = _tmp2_; + photo_id = _tmp1_; #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = photo_id; + _tmp2_ = photo_id; #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp4_ = _tmp3_.id; + _tmp3_ = _tmp2_.id; #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - result = _tmp4_; + result = _tmp3_; #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (photo); #line 201 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2037 "DirectPhoto.c" +#line 2255 "DirectPhoto.c" } -static void direct_photo_source_collection_real_notify_items_added (DataCollection* base, GeeIterable* added) { +static void +direct_photo_source_collection_real_notify_items_added (DataCollection* base, + GeeIterable* added) +{ DirectPhotoSourceCollection * self; - GeeIterable* _tmp16_; #line 204 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection); #line 204 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (GEE_IS_ITERABLE (added)); -#line 2048 "DirectPhoto.c" +#line 2268 "DirectPhoto.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; + GeeIterator* _tmp0_; #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = added; + _tmp0_ = gee_iterable_iterator (added); #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); -#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" while (TRUE) { -#line 2061 "DirectPhoto.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 2278 "DirectPhoto.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; DirectPhoto* photo = NULL; - DataObject* _tmp6_; - DirectPhoto* _tmp7_; + DataObject* _tmp4_; + DirectPhoto* _tmp5_; GFile* file = NULL; - DirectPhoto* _tmp8_; + DirectPhoto* _tmp6_; + GFile* _tmp7_; + GeeHashMap* _tmp8_; GFile* _tmp9_; GeeHashMap* _tmp10_; GFile* _tmp11_; - gboolean _tmp12_; - GeeHashMap* _tmp13_; - GFile* _tmp14_; - DirectPhoto* _tmp15_; + DirectPhoto* _tmp12_; #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = _object_it; + _tmp1_ = _object_it; #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = gee_iterator_next (_tmp2_); -#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" break; -#line 2087 "DirectPhoto.c" +#line 2300 "DirectPhoto.c" } #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 206 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp6_ = object; + _tmp4_ = object; #line 206 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DIRECT_PHOTO, DirectPhoto)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DIRECT_PHOTO, DirectPhoto)); #line 206 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo = _tmp7_; + photo = _tmp5_; #line 207 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp8_ = photo; + _tmp6_ = photo; #line 207 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp9_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp7_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource)); #line 207 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - file = _tmp9_; + file = _tmp7_; #line 209 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp10_ = self->priv->file_map; + _tmp8_ = self->priv->file_map; #line 209 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp11_ = file; -#line 209 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp12_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_); + _tmp9_ = file; #line 209 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _vala_assert (!_tmp12_, "!file_map.has_key(file)"); + _vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_), "!file_map.has_key(file)"); #line 211 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp13_ = self->priv->file_map; + _tmp10_ = self->priv->file_map; #line 211 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp14_ = file; + _tmp11_ = file; #line 211 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp15_ = photo; + _tmp12_ = photo; #line 211 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp14_, _tmp15_); + gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, _tmp12_); #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (file); #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (photo); #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (object); -#line 2129 "DirectPhoto.c" +#line 2340 "DirectPhoto.c" } #line 205 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_object_it); -#line 2133 "DirectPhoto.c" +#line 2344 "DirectPhoto.c" } #line 214 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp16_ = added; -#line 214 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp16_); -#line 2139 "DirectPhoto.c" + DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_added (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), added); +#line 2348 "DirectPhoto.c" } -static void direct_photo_source_collection_real_notify_items_removed (DataCollection* base, GeeIterable* removed) { +static void +direct_photo_source_collection_real_notify_items_removed (DataCollection* base, + GeeIterable* removed) +{ DirectPhotoSourceCollection * self; - GeeIterable* _tmp14_; #line 217 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection); #line 217 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (GEE_IS_ITERABLE (removed)); -#line 2150 "DirectPhoto.c" +#line 2361 "DirectPhoto.c" { GeeIterator* _object_it = NULL; - GeeIterable* _tmp0_; - GeeIterator* _tmp1_; -#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = removed; + GeeIterator* _tmp0_; #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = gee_iterable_iterator (_tmp0_); + _tmp0_ = gee_iterable_iterator (removed); #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _object_it = _tmp1_; + _object_it = _tmp0_; #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" while (TRUE) { -#line 2163 "DirectPhoto.c" - GeeIterator* _tmp2_; - gboolean _tmp3_; +#line 2371 "DirectPhoto.c" + GeeIterator* _tmp1_; DataObject* object = NULL; - GeeIterator* _tmp4_; - gpointer _tmp5_; + GeeIterator* _tmp2_; + gpointer _tmp3_; DirectPhoto* photo = NULL; - DataObject* _tmp6_; - DirectPhoto* _tmp7_; + DataObject* _tmp4_; + DirectPhoto* _tmp5_; GFile* file = NULL; - DirectPhoto* _tmp8_; - GFile* _tmp9_; + DirectPhoto* _tmp6_; + GFile* _tmp7_; gboolean is_removed = FALSE; - GeeHashMap* _tmp10_; - GFile* _tmp11_; - gboolean _tmp12_; - gboolean _tmp13_; -#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = _object_it; + GeeHashMap* _tmp8_; + GFile* _tmp9_; + gboolean _tmp10_; + gboolean _tmp11_; #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = gee_iterator_next (_tmp2_); + _tmp1_ = _object_it; #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (!_tmp3_) { + if (!gee_iterator_next (_tmp1_)) { #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" break; -#line 2188 "DirectPhoto.c" +#line 2393 "DirectPhoto.c" } #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp4_ = _object_it; + _tmp2_ = _object_it; #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp5_ = gee_iterator_get (_tmp4_); + _tmp3_ = gee_iterator_get (_tmp2_); #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - object = (DataObject*) _tmp5_; + object = (DataObject*) _tmp3_; #line 219 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp6_ = object; + _tmp4_ = object; #line 219 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DIRECT_PHOTO, DirectPhoto)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DIRECT_PHOTO, DirectPhoto)); #line 219 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo = _tmp7_; + photo = _tmp5_; #line 220 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp8_ = photo; + _tmp6_ = photo; #line 220 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp9_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp7_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource)); #line 220 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - file = _tmp9_; + file = _tmp7_; #line 222 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp10_ = self->priv->file_map; + _tmp8_ = self->priv->file_map; #line 222 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp11_ = file; + _tmp9_ = file; #line 222 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp12_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL); + _tmp10_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, NULL); #line 222 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - is_removed = _tmp12_; + is_removed = _tmp10_; #line 223 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp13_ = is_removed; + _tmp11_ = is_removed; #line 223 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _vala_assert (_tmp13_, "is_removed"); + _vala_assert (_tmp11_, "is_removed"); #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (file); #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (photo); #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (object); -#line 2226 "DirectPhoto.c" +#line 2431 "DirectPhoto.c" } #line 218 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_object_it); -#line 2230 "DirectPhoto.c" +#line 2435 "DirectPhoto.c" } #line 226 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp14_ = removed; -#line 226 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp14_); -#line 2236 "DirectPhoto.c" + DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->notify_items_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_DATA_COLLECTION, DataCollection), removed); +#line 2439 "DirectPhoto.c" } -gboolean direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCollection* self, GFile* file) { +gboolean +direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCollection* self, + GFile* file) +{ gboolean result = FALSE; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gboolean _tmp2_; #line 229 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), FALSE); #line 229 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2248,33 +2452,28 @@ gboolean direct_photo_source_collection_has_source_for_file (DirectPhotoSourceCo #line 230 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp0_ = self->priv->file_map; #line 230 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = file; -#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - result = _tmp2_; + result = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 230 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2259 "DirectPhoto.c" +#line 2459 "DirectPhoto.c" } -static void direct_photo_source_collection_on_file_discovered (DirectPhotoSourceCollection* self, GFile* file, GFileInfo* info) { - GFile* _tmp0_; - gboolean _tmp1_; - GFile* _tmp2_; - gboolean _tmp3_; +static void +direct_photo_source_collection_on_file_discovered (DirectPhotoSourceCollection* self, + GFile* file, + GFileInfo* info) +{ DirectPhoto* photo = NULL; gchar* reason = NULL; - GFile* _tmp4_; - DirectPhoto* _tmp5_ = NULL; - gchar* _tmp6_; - const gchar* _tmp7_; - GeeCollection* _tmp9_; - DirectPhoto* _tmp10_; - GeeCollection* _tmp11_; - gint _tmp12_; - gint _tmp13_; + DirectPhoto* _tmp0_ = NULL; + gchar* _tmp1_; + const gchar* _tmp2_; + GeeCollection* _tmp4_; + DirectPhoto* _tmp5_; + GeeCollection* _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self)); #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2282,83 +2481,77 @@ static void direct_photo_source_collection_on_file_discovered (DirectPhotoSource #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (G_IS_FILE_INFO (info)); #line 235 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = file; -#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = direct_photo_source_collection_has_source_for_file (self, _tmp0_); -#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp1_) { + if (direct_photo_source_collection_has_source_for_file (self, file)) { #line 236 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return; -#line 2293 "DirectPhoto.c" +#line 2488 "DirectPhoto.c" } #line 239 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = file; -#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = photo_file_format_is_file_supported (_tmp2_); -#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (!_tmp3_) { + if (!photo_file_format_is_file_supported (file)) { #line 240 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return; -#line 2303 "DirectPhoto.c" +#line 2494 "DirectPhoto.c" } #line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp4_ = file; -#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp6_ = direct_photo_source_collection_fetch (self, _tmp4_, &_tmp5_, FALSE); + _tmp1_ = direct_photo_source_collection_fetch (self, file, &_tmp0_, FALSE); #line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (photo); #line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo = _tmp5_; + photo = _tmp0_; #line 243 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - reason = _tmp6_; + reason = _tmp1_; #line 244 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp7_ = reason; + _tmp2_ = reason; #line 244 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp7_ != NULL) { -#line 2319 "DirectPhoto.c" - const gchar* _tmp8_; + if (_tmp2_ != NULL) { +#line 2508 "DirectPhoto.c" + const gchar* _tmp3_; #line 245 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp8_ = reason; + _tmp3_ = reason; #line 245 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - g_warning ("DirectPhoto.vala:245: Error fetching file: %s", _tmp8_); -#line 2325 "DirectPhoto.c" + g_warning ("DirectPhoto.vala:245: Error fetching file: %s", _tmp3_); +#line 2514 "DirectPhoto.c" } #line 246 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp9_ = self->priv->prepared_photos; + _tmp4_ = self->priv->prepared_photos; #line 246 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp10_ = photo; + _tmp5_ = photo; #line 246 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - gee_collection_add (_tmp9_, _tmp10_); + gee_collection_add (_tmp4_, _tmp5_); #line 247 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp11_ = self->priv->prepared_photos; + _tmp6_ = self->priv->prepared_photos; #line 247 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp12_ = gee_collection_get_size (_tmp11_); + _tmp7_ = gee_collection_get_size (_tmp6_); #line 247 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp13_ = _tmp12_; + _tmp8_ = _tmp7_; #line 247 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp13_ >= DIRECT_PHOTO_SOURCE_COLLECTION_DISCOVERED_FILES_BATCH_ADD) { + if (_tmp8_ >= DIRECT_PHOTO_SOURCE_COLLECTION_DISCOVERED_FILES_BATCH_ADD) { #line 248 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" direct_photo_source_collection_flush_prepared_photos (self); -#line 2343 "DirectPhoto.c" +#line 2532 "DirectPhoto.c" } #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_free0 (reason); #line 233 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (photo); -#line 2349 "DirectPhoto.c" +#line 2538 "DirectPhoto.c" } -static void direct_photo_source_collection_on_discovery_completed (DirectPhotoSourceCollection* self) { +static void +direct_photo_source_collection_on_discovery_completed (DirectPhotoSourceCollection* self) +{ #line 251 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self)); #line 252 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" direct_photo_source_collection_flush_prepared_photos (self); -#line 2358 "DirectPhoto.c" +#line 2549 "DirectPhoto.c" } -static void direct_photo_source_collection_flush_prepared_photos (DirectPhotoSourceCollection* self) { +static void +direct_photo_source_collection_flush_prepared_photos (DirectPhotoSourceCollection* self) +{ GeeCollection* _tmp0_; GeeCollection* _tmp1_; GeeCollection* _tmp2_; @@ -2377,15 +2570,16 @@ static void direct_photo_source_collection_flush_prepared_photos (DirectPhotoSou _tmp3_ = self->priv->prepared_photos; #line 257 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" gee_collection_clear (_tmp3_); -#line 2381 "DirectPhoto.c" +#line 2574 "DirectPhoto.c" } -gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* self, GFile* file) { +gboolean +direct_photo_source_collection_has_file (DirectPhotoSourceCollection* self, + GFile* file) +{ gboolean result = FALSE; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gboolean _tmp2_; #line 260 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), FALSE); #line 260 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2393,71 +2587,67 @@ gboolean direct_photo_source_collection_has_file (DirectPhotoSourceCollection* s #line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp0_ = self->priv->file_map; #line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = file; -#line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - result = _tmp2_; + result = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 261 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2404 "DirectPhoto.c" +#line 2594 "DirectPhoto.c" } -void direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* self, DirectPhoto* photo) { - DirectPhoto* _tmp0_; +void +direct_photo_source_collection_reimport_photo (DirectPhotoSourceCollection* self, + DirectPhoto* photo) +{ DirectPhoto* reimported_photo = NULL; - DirectPhoto* _tmp1_; - GFile* _tmp2_; - GFile* _tmp3_; - DirectPhoto* _tmp4_ = NULL; - gchar* _tmp5_; - gchar* _tmp6_; + GFile* _tmp0_; + GFile* _tmp1_; + DirectPhoto* _tmp2_ = NULL; + gchar* _tmp3_; + gchar* _tmp4_; #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self)); #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_if_fail (IS_DIRECT_PHOTO (photo)); #line 265 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp0_ = photo; -#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo_discard_prefetched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo)); + photo_discard_prefetched (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo)); #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = photo; + _tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource)); #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource)); + _tmp1_ = _tmp0_; #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = _tmp2_; -#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp5_ = direct_photo_source_collection_fetch (self, _tmp3_, &_tmp4_, TRUE); + _tmp3_ = direct_photo_source_collection_fetch (self, _tmp1_, &_tmp2_, TRUE); #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (reimported_photo); #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - reimported_photo = _tmp4_; + reimported_photo = _tmp2_; #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp4_); #line 267 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _g_object_unref0 (_tmp3_); + _g_object_unref0 (_tmp1_); #line 264 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (reimported_photo); -#line 2445 "DirectPhoto.c" +#line 2632 "DirectPhoto.c" } -gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto* * photo, gboolean reimport) { +gchar* +direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, + GFile* file, + DirectPhoto* * photo, + gboolean reimport) +{ DirectPhoto* _vala_photo = NULL; gchar* result = NULL; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gpointer _tmp2_; - DirectPhoto* _tmp3_; + gpointer _tmp1_; + DirectPhoto* _tmp2_; ImportResult _result_ = 0; - GFile* _tmp25_; - DirectPhoto* _tmp26_ = NULL; - ImportResult _tmp27_; - gchar* _tmp28_ = NULL; - ImportResult _tmp29_; + DirectPhoto* _tmp20_ = NULL; + ImportResult _tmp21_; + gchar* _tmp22_ = NULL; + ImportResult _tmp23_; GError * _inner_error_ = NULL; #line 271 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), NULL); @@ -2466,166 +2656,152 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, #line 273 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp0_ = self->priv->file_map; #line 273 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = file; -#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 273 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_vala_photo); #line 273 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _vala_photo = (DirectPhoto*) _tmp2_; + _vala_photo = (DirectPhoto*) _tmp1_; #line 274 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp3_ = _vala_photo; + _tmp2_ = _vala_photo; #line 274 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp3_ != NULL) { -#line 2481 "DirectPhoto.c" + if (_tmp2_ != NULL) { +#line 2669 "DirectPhoto.c" gchar* reason = NULL; - gboolean _tmp4_; #line 275 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" reason = NULL; #line 277 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp4_ = reimport; -#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp4_) { -#line 2490 "DirectPhoto.c" + if (reimport) { +#line 2675 "DirectPhoto.c" { Orientation ori_tmp = 0; gboolean should_restore_ori = FALSE; - gboolean _tmp5_ = FALSE; - DirectPhoto* _tmp6_; - gboolean _tmp7_; + gboolean _tmp3_ = FALSE; + DirectPhoto* _tmp4_; PhotoReimportMasterState* reimport_state = NULL; - gboolean _tmp12_ = FALSE; - DirectPhoto* _tmp13_; - PhotoReimportMasterState* _tmp14_ = NULL; - gboolean _tmp15_; + gboolean _tmp7_ = FALSE; + DirectPhoto* _tmp8_; + PhotoReimportMasterState* _tmp9_ = NULL; + gboolean _tmp10_; #line 279 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" ori_tmp = ORIENTATION_TOP_LEFT; #line 280 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" should_restore_ori = FALSE; #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp6_ = _vala_photo; -#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp7_ = photo_only_metadata_changed (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo)); + _tmp4_ = _vala_photo; #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp7_) { + if (photo_only_metadata_changed (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO, Photo))) { #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp5_ = TRUE; -#line 2514 "DirectPhoto.c" + _tmp3_ = TRUE; +#line 2696 "DirectPhoto.c" } else { - DirectPhoto* _tmp8_; - PhotoFileFormat _tmp9_; -#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp8_ = _vala_photo; + DirectPhoto* _tmp5_; #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp9_ = photo_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo)); + _tmp5_ = _vala_photo; #line 283 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp5_ = _tmp9_ == PHOTO_FILE_FORMAT_JFIF; -#line 2524 "DirectPhoto.c" + _tmp3_ = photo_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO, Photo)) == PHOTO_FILE_FORMAT_JFIF; +#line 2703 "DirectPhoto.c" } #line 282 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp5_) { -#line 2528 "DirectPhoto.c" - DirectPhoto* _tmp10_; - Orientation _tmp11_; -#line 284 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp10_ = _vala_photo; + if (_tmp3_) { +#line 2707 "DirectPhoto.c" + DirectPhoto* _tmp6_; #line 284 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp11_ = photo_get_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PHOTO, Photo)); + _tmp6_ = _vala_photo; #line 284 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - ori_tmp = _tmp11_; + ori_tmp = photo_get_orientation (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo)); #line 285 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" should_restore_ori = TRUE; -#line 2539 "DirectPhoto.c" +#line 2715 "DirectPhoto.c" } #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp13_ = _vala_photo; + _tmp8_ = _vala_photo; #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp15_ = photo_prepare_for_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO, Photo), &_tmp14_, &_inner_error_); + _tmp10_ = photo_prepare_for_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo), &_tmp9_, &_inner_error_); #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _photo_reimport_master_state_unref0 (reimport_state); #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - reimport_state = _tmp14_; + reimport_state = _tmp9_; #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp12_ = _tmp15_; + _tmp7_ = _tmp10_; #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 2555 "DirectPhoto.c" +#line 2731 "DirectPhoto.c" goto __catch51_g_error; } #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp12_) { -#line 2560 "DirectPhoto.c" - DirectPhoto* _tmp16_; - PhotoReimportMasterState* _tmp17_; - gboolean _tmp18_; + if (_tmp7_) { +#line 2736 "DirectPhoto.c" + DirectPhoto* _tmp11_; + PhotoReimportMasterState* _tmp12_; + gboolean _tmp13_; #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp16_ = _vala_photo; + _tmp11_ = _vala_photo; #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp17_ = reimport_state; + _tmp12_ = reimport_state; #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - photo_finish_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO, Photo), _tmp17_, &_inner_error_); + photo_finish_reimport_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO, Photo), _tmp12_, &_inner_error_); #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 2574 "DirectPhoto.c" +#line 2750 "DirectPhoto.c" goto __catch51_g_error; } #line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp18_ = should_restore_ori; + _tmp13_ = should_restore_ori; #line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp18_) { -#line 2581 "DirectPhoto.c" - DirectPhoto* _tmp19_; - Orientation _tmp20_; + if (_tmp13_) { +#line 2757 "DirectPhoto.c" + DirectPhoto* _tmp14_; + Orientation _tmp15_; #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp19_ = _vala_photo; + _tmp14_ = _vala_photo; #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp20_ = ori_tmp; + _tmp15_ = ori_tmp; #line 292 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - direct_photo_fixup_orientation_after_reimport (_tmp19_, _tmp20_); -#line 2590 "DirectPhoto.c" + direct_photo_fixup_orientation_after_reimport (_tmp14_, _tmp15_); +#line 2766 "DirectPhoto.c" } } else { - gchar* _tmp21_; + gchar* _tmp16_; #line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp21_ = import_result_to_string (IMPORT_RESULT_FILE_ERROR); + _tmp16_ = import_result_to_string (IMPORT_RESULT_FILE_ERROR); #line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_free0 (reason); #line 296 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - reason = _tmp21_; -#line 2600 "DirectPhoto.c" + reason = _tmp16_; +#line 2776 "DirectPhoto.c" } #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _photo_reimport_master_state_unref0 (reimport_state); -#line 2604 "DirectPhoto.c" +#line 2780 "DirectPhoto.c" } goto __finally51; __catch51_g_error: { GError* err = NULL; - GError* _tmp22_; - const gchar* _tmp23_; - gchar* _tmp24_; + GError* _tmp17_; + const gchar* _tmp18_; + gchar* _tmp19_; #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" err = _inner_error_; #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _inner_error_ = NULL; #line 299 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp22_ = err; + _tmp17_ = err; #line 299 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp23_ = _tmp22_->message; + _tmp18_ = _tmp17_->message; #line 299 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp24_ = g_strdup (_tmp23_); + _tmp19_ = g_strdup (_tmp18_); #line 299 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_free0 (reason); #line 299 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - reason = _tmp24_; + reason = _tmp19_; #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_error_free0 (err); -#line 2629 "DirectPhoto.c" +#line 2805 "DirectPhoto.c" } __finally51: #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2638,7 +2814,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, g_clear_error (&_inner_error_); #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return NULL; -#line 2642 "DirectPhoto.c" +#line 2818 "DirectPhoto.c" } } #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2647,71 +2823,70 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, if (photo) { #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" *photo = _vala_photo; -#line 2651 "DirectPhoto.c" +#line 2827 "DirectPhoto.c" } else { #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_vala_photo); -#line 2655 "DirectPhoto.c" +#line 2831 "DirectPhoto.c" } #line 303 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2659 "DirectPhoto.c" +#line 2835 "DirectPhoto.c" } #line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp25_ = file; -#line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp27_ = direct_photo_internal_import (_tmp25_, &_tmp26_); + _tmp21_ = direct_photo_internal_import (file, &_tmp20_); #line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_vala_photo); #line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _vala_photo = _tmp26_; + _vala_photo = _tmp20_; #line 308 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _result_ = _tmp27_; + _result_ = _tmp21_; #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp29_ = _result_; + _tmp23_ = _result_; #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - if (_tmp29_ == IMPORT_RESULT_SUCCESS) { + if (_tmp23_ == IMPORT_RESULT_SUCCESS) { #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _g_free0 (_tmp28_); + _g_free0 (_tmp22_); #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp28_ = NULL; -#line 2679 "DirectPhoto.c" + _tmp22_ = NULL; +#line 2853 "DirectPhoto.c" } else { - ImportResult _tmp30_; - gchar* _tmp31_; + ImportResult _tmp24_; + gchar* _tmp25_; #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp30_ = _result_; + _tmp24_ = _result_; #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp31_ = import_result_to_string (_tmp30_); + _tmp25_ = import_result_to_string (_tmp24_); #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _g_free0 (_tmp28_); + _g_free0 (_tmp22_); #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp28_ = _tmp31_; -#line 2691 "DirectPhoto.c" + _tmp22_ = _tmp25_; +#line 2865 "DirectPhoto.c" } #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - result = _tmp28_; + result = _tmp22_; #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" if (photo) { #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" *photo = _vala_photo; -#line 2699 "DirectPhoto.c" +#line 2873 "DirectPhoto.c" } else { #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _g_object_unref0 (_vala_photo); -#line 2703 "DirectPhoto.c" +#line 2877 "DirectPhoto.c" } #line 310 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2707 "DirectPhoto.c" +#line 2881 "DirectPhoto.c" } -gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollection* self, GFile* file) { +gboolean +direct_photo_source_collection_has_file_source (DirectPhotoSourceCollection* self, + GFile* file) +{ gboolean result = FALSE; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gboolean _tmp2_; #line 313 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), FALSE); #line 313 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2719,22 +2894,20 @@ gboolean direct_photo_source_collection_has_file_source (DirectPhotoSourceCollec #line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp0_ = self->priv->file_map; #line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = file; -#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); -#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - result = _tmp2_; + result = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 314 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2730 "DirectPhoto.c" +#line 2901 "DirectPhoto.c" } -DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self, GFile* file) { +DirectPhoto* +direct_photo_source_collection_get_file_source (DirectPhotoSourceCollection* self, + GFile* file) +{ DirectPhoto* result = NULL; GeeHashMap* _tmp0_; - GFile* _tmp1_; - gpointer _tmp2_; + gpointer _tmp1_; #line 317 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" g_return_val_if_fail (IS_DIRECT_PHOTO_SOURCE_COLLECTION (self), NULL); #line 317 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2742,18 +2915,18 @@ DirectPhoto* direct_photo_source_collection_get_file_source (DirectPhotoSourceCo #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" _tmp0_ = self->priv->file_map; #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp1_ = file; -#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - _tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_); + _tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), file); #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" - result = (DirectPhoto*) _tmp2_; + result = (DirectPhoto*) _tmp1_; #line 318 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" return result; -#line 2753 "DirectPhoto.c" +#line 2924 "DirectPhoto.c" } -static void direct_photo_source_collection_class_init (DirectPhotoSourceCollectionClass * klass) { +static void +direct_photo_source_collection_class_init (DirectPhotoSourceCollectionClass * klass) +{ #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" direct_photo_source_collection_parent_class = g_type_class_peek_parent (klass); #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2766,11 +2939,13 @@ static void direct_photo_source_collection_class_init (DirectPhotoSourceCollecti ((DataCollectionClass *) klass)->notify_items_added = (void (*) (DataCollection *, GeeIterable*)) direct_photo_source_collection_real_notify_items_added; #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" ((DataCollectionClass *) klass)->notify_items_removed = (void (*) (DataCollection *, GeeIterable*)) direct_photo_source_collection_real_notify_items_removed; -#line 2770 "DirectPhoto.c" +#line 2943 "DirectPhoto.c" } -static void direct_photo_source_collection_instance_init (DirectPhotoSourceCollection * self) { +static void +direct_photo_source_collection_instance_init (DirectPhotoSourceCollection * self) +{ GeeArrayList* _tmp0_; GeeHashMap* _tmp1_; #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" @@ -2783,11 +2958,13 @@ static void direct_photo_source_collection_instance_init (DirectPhotoSourceColle _tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_DIRECT_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 178 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self->priv->file_map = _tmp1_; -#line 2787 "DirectPhoto.c" +#line 2962 "DirectPhoto.c" } -static void direct_photo_source_collection_finalize (DataCollection * obj) { +static void +direct_photo_source_collection_finalize (DataCollection * obj) +{ DirectPhotoSourceCollection * self; #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DIRECT_PHOTO_SOURCE_COLLECTION, DirectPhotoSourceCollection); @@ -2799,11 +2976,13 @@ static void direct_photo_source_collection_finalize (DataCollection * obj) { _g_object_unref0 (self->priv->monitor); #line 175 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala" DATA_COLLECTION_CLASS (direct_photo_source_collection_parent_class)->finalize (obj); -#line 2803 "DirectPhoto.c" +#line 2980 "DirectPhoto.c" } -GType direct_photo_source_collection_get_type (void) { +GType +direct_photo_source_collection_get_type (void) +{ static volatile gsize direct_photo_source_collection_type_id__volatile = 0; if (g_once_init_enter (&direct_photo_source_collection_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (DirectPhotoSourceCollectionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) direct_photo_source_collection_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DirectPhotoSourceCollection), 0, (GInstanceInitFunc) direct_photo_source_collection_instance_init, NULL }; |