summaryrefslogtreecommitdiff
path: root/src/Commands.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 16:48:02 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 16:48:02 +0100
commitabdaad68fb94e2d61448a6dfc14847df8a2c32b9 (patch)
tree26855c5dd3bfffdbf319d5ba4a38223a28de3e7c /src/Commands.c
parent0f67b3cc674377559e66c5a6729fd499049a992f (diff)
parentdd7f98a232efe86f6e6055119c9414a0f9d9e67b (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/Commands.c')
-rw-r--r--src/Commands.c8699
1 files changed, 4303 insertions, 4396 deletions
diff --git a/src/Commands.c b/src/Commands.c
index bab2c06..a8e7b47 100644
--- a/src/Commands.c
+++ b/src/Commands.c
@@ -1,4 +1,4 @@
-/* Commands.c generated by valac 0.34.7, the Vala compiler
+/* Commands.c generated by valac 0.36.6, the Vala compiler
* generated from Commands.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1986,7 +1986,7 @@ GType library_window_get_type (void) G_GNUC_CONST;
LibraryWindow* library_window_get_app (void);
void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* controller, Photo* current);
void page_window_set_current_page (PageWindow* self, Page* page);
-static void page_command_finalize (GObject* obj);
+static void page_command_finalize (GObject * obj);
GType single_data_source_command_get_type (void) G_GNUC_CONST;
enum {
SINGLE_DATA_SOURCE_COMMAND_DUMMY_PROPERTY
@@ -2004,7 +2004,7 @@ gpointer value_get_command_manager (const GValue* value);
GType command_manager_get_type (void) G_GNUC_CONST;
CommandManager* command_get_command_manager (Command* self);
void command_manager_reset (CommandManager* self);
-static void single_data_source_command_finalize (GObject* obj);
+static void single_data_source_command_finalize (GObject * obj);
GType simple_proxyable_command_get_type (void) G_GNUC_CONST;
gpointer source_proxy_ref (gpointer instance);
void source_proxy_unref (gpointer instance);
@@ -2031,7 +2031,7 @@ static void simple_proxyable_command_real_undo (Command* base);
void simple_proxyable_command_undo_on_source (SimpleProxyableCommand* self, DataSource* source);
static void simple_proxyable_command_real_undo_on_source (SimpleProxyableCommand* self, DataSource* source);
void simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, GeeCollection* proxyables);
-static void simple_proxyable_command_finalize (GObject* obj);
+static void simple_proxyable_command_finalize (GObject * obj);
GType single_photo_transformation_command_get_type (void) G_GNUC_CONST;
GType photo_transformation_state_get_type (void) G_GNUC_CONST;
#define SINGLE_PHOTO_TRANSFORMATION_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SINGLE_PHOTO_TRANSFORMATION_COMMAND, SinglePhotoTransformationCommandPrivate))
@@ -2044,7 +2044,7 @@ SinglePhotoTransformationCommand* single_photo_transformation_command_construct
PhotoTransformationState* photo_save_transformation_state (Photo* self);
static void single_photo_transformation_command_real_undo (Command* base);
gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState* state);
-static void single_photo_transformation_command_finalize (GObject* obj);
+static void single_photo_transformation_command_finalize (GObject * obj);
GType generic_photo_transformation_command_get_type (void) G_GNUC_CONST;
#define GENERIC_PHOTO_TRANSFORMATION_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_GENERIC_PHOTO_TRANSFORMATION_COMMAND, GenericPhotoTransformationCommandPrivate))
enum {
@@ -2062,7 +2062,7 @@ gboolean generic_photo_transformation_command_can_compress (GenericPhotoTransfor
static gboolean generic_photo_transformation_command_real_can_compress (GenericPhotoTransformationCommand* self, Command* command);
static gboolean generic_photo_transformation_command_real_compress (Command* base, Command* command);
void command_execute (Command* self);
-static void generic_photo_transformation_command_finalize (GObject* obj);
+static void generic_photo_transformation_command_finalize (GObject * obj);
GType multiple_data_source_command_get_type (void) G_GNUC_CONST;
GType source_collection_get_type (void) G_GNUC_CONST;
#define MULTIPLE_DATA_SOURCE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommandPrivate))
@@ -2106,7 +2106,7 @@ void progress_dialog_set_fraction (ProgressDialog* self, gint current, gint tota
void spin_event_loop (void);
void progress_dialog_close (ProgressDialog* self);
void page_window_set_normal_cursor (PageWindow* self);
-static void multiple_data_source_command_finalize (GObject* obj);
+static void multiple_data_source_command_finalize (GObject * obj);
GType multiple_data_source_at_once_command_get_type (void) G_GNUC_CONST;
#define MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND, MultipleDataSourceAtOnceCommandPrivate))
enum {
@@ -2135,7 +2135,7 @@ static void multiple_data_source_at_once_command_real_execute_on_all (MultipleDa
static void multiple_data_source_at_once_command_real_undo (Command* base);
void multiple_data_source_at_once_command_undo_on_all (MultipleDataSourceAtOnceCommand* self, GeeCollection* sources);
static void multiple_data_source_at_once_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* self, GeeCollection* sources);
-static void multiple_data_source_at_once_command_finalize (GObject* obj);
+static void multiple_data_source_at_once_command_finalize (GObject * obj);
GType multiple_photo_transformation_command_get_type (void) G_GNUC_CONST;
#define MULTIPLE_PHOTO_TRANSFORMATION_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MULTIPLE_PHOTO_TRANSFORMATION_COMMAND, MultiplePhotoTransformationCommandPrivate))
enum {
@@ -2145,7 +2145,7 @@ static void multiple_photo_transformation_command_on_state_broken (MultiplePhoto
static void _multiple_photo_transformation_command_on_state_broken_photo_transformation_state_broken (PhotoTransformationState* _sender, gpointer self);
MultiplePhotoTransformationCommand* multiple_photo_transformation_command_construct (GType object_type, GeeIterable* iter, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation);
static void multiple_photo_transformation_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source);
-static void multiple_photo_transformation_command_finalize (GObject* obj);
+static void multiple_photo_transformation_command_finalize (GObject * obj);
GType rotate_single_command_get_type (void) G_GNUC_CONST;
GType rotation_get_type (void) G_GNUC_CONST;
#define ROTATE_SINGLE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ROTATE_SINGLE_COMMAND, RotateSingleCommandPrivate))
@@ -2158,7 +2158,7 @@ static void rotate_single_command_real_execute (Command* base);
void photo_rotate (Photo* self, Rotation rotation);
static void rotate_single_command_real_undo (Command* base);
Rotation rotation_opposite (Rotation self);
-static void rotate_single_command_finalize (GObject* obj);
+static void rotate_single_command_finalize (GObject * obj);
GType rotate_multiple_command_get_type (void) G_GNUC_CONST;
#define ROTATE_MULTIPLE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ROTATE_MULTIPLE_COMMAND, RotateMultipleCommandPrivate))
enum {
@@ -2168,7 +2168,7 @@ RotateMultipleCommand* rotate_multiple_command_new (GeeIterable* iter, Rotation
RotateMultipleCommand* rotate_multiple_command_construct (GType object_type, GeeIterable* iter, Rotation rotation, const gchar* name, const gchar* explanation, const gchar* progress_text, const gchar* undo_progress_text);
static void rotate_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source);
static void rotate_multiple_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source);
-static void rotate_multiple_command_finalize (GObject* obj);
+static void rotate_multiple_command_finalize (GObject * obj);
GType edit_title_command_get_type (void) G_GNUC_CONST;
#define EDIT_TITLE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EDIT_TITLE_COMMAND, EditTitleCommandPrivate))
enum {
@@ -2176,12 +2176,12 @@ enum {
};
EditTitleCommand* edit_title_command_new (MediaSource* source, const gchar* new_title);
EditTitleCommand* edit_title_command_construct (GType object_type, MediaSource* source, const gchar* new_title);
-#define RESOURCES_EDIT_TITLE_LABEL "Edit Title"
+#define RESOURCES_EDIT_TITLE_LABEL NC_ ("Button Label", "Edit Title")
gchar* media_source_get_title (MediaSource* self);
static void edit_title_command_real_execute (Command* base);
void media_source_set_title (MediaSource* self, const gchar* title);
static void edit_title_command_real_undo (Command* base);
-static void edit_title_command_finalize (GObject* obj);
+static void edit_title_command_finalize (GObject * obj);
GType edit_comment_command_get_type (void) G_GNUC_CONST;
#define EDIT_COMMENT_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EDIT_COMMENT_COMMAND, EditCommentCommandPrivate))
enum {
@@ -2194,7 +2194,7 @@ gchar* media_source_get_comment (MediaSource* self);
static void edit_comment_command_real_execute (Command* base);
gboolean media_source_set_comment (MediaSource* self, const gchar* comment);
static void edit_comment_command_real_undo (Command* base);
-static void edit_comment_command_finalize (GObject* obj);
+static void edit_comment_command_finalize (GObject * obj);
GType edit_multiple_titles_command_get_type (void) G_GNUC_CONST;
enum {
EDIT_MULTIPLE_TITLES_COMMAND_DUMMY_PROPERTY
@@ -2203,7 +2203,7 @@ EditMultipleTitlesCommand* edit_multiple_titles_command_new (GeeCollection* medi
EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_type, GeeCollection* media_sources, const gchar* new_title);
static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources);
static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources);
-static void edit_multiple_titles_command_finalize (GObject* obj);
+static void edit_multiple_titles_command_finalize (GObject * obj);
GType edit_multiple_comments_command_get_type (void) G_GNUC_CONST;
enum {
EDIT_MULTIPLE_COMMENTS_COMMAND_DUMMY_PROPERTY
@@ -2212,7 +2212,7 @@ EditMultipleCommentsCommand* edit_multiple_comments_command_new (GeeCollection*
EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType object_type, GeeCollection* media_sources, const gchar* new_comment);
static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources);
static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources);
-static void edit_multiple_comments_command_finalize (GObject* obj);
+static void edit_multiple_comments_command_finalize (GObject * obj);
GType rename_event_command_get_type (void) G_GNUC_CONST;
#define RENAME_EVENT_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_RENAME_EVENT_COMMAND, RenameEventCommandPrivate))
enum {
@@ -2227,7 +2227,7 @@ gchar* event_get_raw_name (Event* self);
static void rename_event_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source);
gboolean event_rename (Event* self, const gchar* name);
static void rename_event_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source);
-static void rename_event_command_finalize (GObject* obj);
+static void rename_event_command_finalize (GObject * obj);
GType edit_event_comment_command_get_type (void) G_GNUC_CONST;
#define EDIT_EVENT_COMMENT_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EDIT_EVENT_COMMENT_COMMAND, EditEventCommentCommandPrivate))
enum {
@@ -2239,7 +2239,7 @@ gchar* event_source_get_comment (EventSource* self);
static void edit_event_comment_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source);
gboolean event_source_set_comment (EventSource* self, const gchar* comment);
static void edit_event_comment_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source);
-static void edit_event_comment_command_finalize (GObject* obj);
+static void edit_event_comment_command_finalize (GObject * obj);
GType set_key_photo_command_get_type (void) G_GNUC_CONST;
#define SET_KEY_PHOTO_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_KEY_PHOTO_COMMAND, SetKeyPhotoCommandPrivate))
enum {
@@ -2252,7 +2252,7 @@ MediaSource* event_get_primary_source (Event* self);
static void set_key_photo_command_real_execute (Command* base);
gboolean event_set_primary_source (Event* self, MediaSource* source);
static void set_key_photo_command_real_undo (Command* base);
-static void set_key_photo_command_finalize (GObject* obj);
+static void set_key_photo_command_finalize (GObject * obj);
GType revert_single_command_get_type (void) G_GNUC_CONST;
enum {
REVERT_SINGLE_COMMAND_DUMMY_PROPERTY
@@ -2303,7 +2303,7 @@ void data_collection_freeze_notifications (DataCollection* self);
void photo_set_straighten (Photo* self, gdouble theta);
void photo_set_crop (Photo* self, Box* crop);
void data_collection_thaw_notifications (DataCollection* self);
-static void straighten_command_finalize (GObject* obj);
+static void straighten_command_finalize (GObject * obj);
GType crop_command_get_type (void) G_GNUC_CONST;
#define CROP_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CROP_COMMAND, CropCommandPrivate))
enum {
@@ -2312,7 +2312,7 @@ enum {
CropCommand* crop_command_new (Photo* photo, Box* crop, const gchar* name, const gchar* explanation);
CropCommand* crop_command_construct (GType object_type, Photo* photo, Box* crop, const gchar* name, const gchar* explanation);
static void crop_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo);
-static void crop_command_finalize (GObject* obj);
+static void crop_command_finalize (GObject * obj);
GType adjust_colors_single_command_get_type (void) G_GNUC_CONST;
gpointer pixel_transformation_bundle_ref (gpointer instance);
void pixel_transformation_bundle_unref (gpointer instance);
@@ -2330,7 +2330,7 @@ AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_
static void adjust_colors_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo);
void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_adjustments);
static gboolean adjust_colors_single_command_real_can_compress (GenericPhotoTransformationCommand* base, Command* command);
-static void adjust_colors_single_command_finalize (GObject* obj);
+static void adjust_colors_single_command_finalize (GObject * obj);
GType adjust_colors_multiple_command_get_type (void) G_GNUC_CONST;
#define ADJUST_COLORS_MULTIPLE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADJUST_COLORS_MULTIPLE_COMMAND, AdjustColorsMultipleCommandPrivate))
enum {
@@ -2339,7 +2339,7 @@ enum {
AdjustColorsMultipleCommand* adjust_colors_multiple_command_new (GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation);
AdjustColorsMultipleCommand* adjust_colors_multiple_command_construct (GType object_type, GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation);
static void adjust_colors_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source);
-static void adjust_colors_multiple_command_finalize (GObject* obj);
+static void adjust_colors_multiple_command_finalize (GObject * obj);
GType redeye_command_get_type (void) G_GNUC_CONST;
GType editing_tools_redeye_instance_get_type (void) G_GNUC_CONST;
EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingToolsRedeyeInstance* self);
@@ -2352,7 +2352,7 @@ RedeyeCommand* redeye_command_new (Photo* photo, EditingToolsRedeyeInstance* red
RedeyeCommand* redeye_command_construct (GType object_type, Photo* photo, EditingToolsRedeyeInstance* redeye_instance, const gchar* name, const gchar* explanation);
static void redeye_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo);
void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye);
-static void redeye_command_finalize (GObject* obj);
+static void redeye_command_finalize (GObject * obj);
GType move_photos_command_get_type (void) G_GNUC_CONST;
GType move_photos_command_real_move_photos_command_get_type (void) G_GNUC_CONST;
enum {
@@ -2380,8 +2380,8 @@ void library_window_switch_to_event (LibraryWindow* self, Event* event);
static void move_photos_command_real_move_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source);
gboolean media_source_set_event (MediaSource* self, Event* new_event);
static void move_photos_command_real_move_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source);
-static void move_photos_command_real_move_photos_command_finalize (GObject* obj);
-static void move_photos_command_finalize (GObject* obj);
+static void move_photos_command_real_move_photos_command_finalize (GObject * obj);
+static void move_photos_command_finalize (GObject * obj);
GType new_event_command_get_type (void) G_GNUC_CONST;
enum {
NEW_EVENT_COMMAND_DUMMY_PROPERTY
@@ -2432,7 +2432,7 @@ static void duplicate_multiple_photos_command_real_undo_on_source (MultipleDataS
GType marker_get_type (void) G_GNUC_CONST;
Marker* data_collection_mark (DataCollection* self, DataObject* object);
gint source_collection_destroy_marked (SourceCollection* self, Marker* marker, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed);
-static void duplicate_multiple_photos_command_finalize (GObject* obj);
+static void duplicate_multiple_photos_command_finalize (GObject * obj);
GType set_rating_single_command_get_type (void) G_GNUC_CONST;
GType rating_get_type (void) G_GNUC_CONST;
#define SET_RATING_SINGLE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_RATING_SINGLE_COMMAND, SetRatingSingleCommandPrivate))
@@ -2452,7 +2452,7 @@ void media_source_set_rating (MediaSource* self, Rating rating);
void media_source_increase_rating (MediaSource* self);
void media_source_decrease_rating (MediaSource* self);
static void set_rating_single_command_real_undo (Command* base);
-static void set_rating_single_command_finalize (GObject* obj);
+static void set_rating_single_command_finalize (GObject * obj);
GType set_rating_command_get_type (void) G_GNUC_CONST;
#define SET_RATING_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_RATING_COMMAND, SetRatingCommandPrivate))
enum {
@@ -2468,7 +2468,7 @@ static void set_rating_command_real_execute (Command* base);
static void set_rating_command_real_undo (Command* base);
static void set_rating_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source);
static void set_rating_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source);
-static void set_rating_command_finalize (GObject* obj);
+static void set_rating_command_finalize (GObject * obj);
GType set_raw_developer_command_get_type (void) G_GNUC_CONST;
GType raw_developer_get_type (void) G_GNUC_CONST;
#define SET_RAW_DEVELOPER_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommandPrivate))
@@ -2488,7 +2488,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d);
static void set_raw_developer_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source);
GType photo_file_format_get_type (void) G_GNUC_CONST;
PhotoFileFormat photo_get_master_file_format (Photo* self);
-static void set_raw_developer_command_finalize (GObject* obj);
+static void set_raw_developer_command_finalize (GObject * obj);
GType adjust_date_time_photo_command_get_type (void) G_GNUC_CONST;
GType dateable_get_type (void) G_GNUC_CONST;
#define ADJUST_DATE_TIME_PHOTO_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADJUST_DATE_TIME_PHOTO_COMMAND, AdjustDateTimePhotoCommandPrivate))
@@ -2514,7 +2514,7 @@ void event_generate_single_event (MediaSource* media, ViewCollection* events_so_
static void adjust_date_time_photo_command_real_undo (Command* base);
void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** error);
void dateable_set_exposure_time (Dateable* self, time_t target_time);
-static void adjust_date_time_photo_command_finalize (GObject* obj);
+static void adjust_date_time_photo_command_finalize (GObject * obj);
GType adjust_date_time_photos_command_get_type (void) G_GNUC_CONST;
#define ADJUST_DATE_TIME_PHOTOS_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, AdjustDateTimePhotosCommandPrivate))
enum {
@@ -2529,7 +2529,7 @@ static void adjust_date_time_photos_command_real_undo (Command* base);
static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosCommand* self, Dateable* dateable, time_t exposure_time);
static void adjust_date_time_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source);
static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source);
-static void adjust_date_time_photos_command_finalize (GObject* obj);
+static void adjust_date_time_photos_command_finalize (GObject * obj);
GType add_tags_command_get_type (void) G_GNUC_CONST;
#define ADD_TAGS_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ADD_TAGS_COMMAND, AddTagsCommandPrivate))
enum {
@@ -2551,7 +2551,7 @@ static void add_tags_command_real_execute (Command* base);
void tag_attach_many (Tag* self, GeeCollection* sources);
static void add_tags_command_real_undo (Command* base);
GeeMultiMap* tag_detach_many (Tag* self, GeeCollection* sources);
-static void add_tags_command_finalize (GObject* obj);
+static void add_tags_command_finalize (GObject * obj);
GType rename_tag_command_get_type (void) G_GNUC_CONST;
#define RENAME_TAG_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_RENAME_TAG_COMMAND, RenameTagCommandPrivate))
enum {
@@ -2566,7 +2566,7 @@ static void rename_tag_command_real_execute_on_source (SimpleProxyableCommand* b
gboolean tag_rename (Tag* self, const gchar* name);
gchar* resources_rename_tag_exists_message (const gchar* name);
static void rename_tag_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source);
-static void rename_tag_command_finalize (GObject* obj);
+static void rename_tag_command_finalize (GObject * obj);
GType delete_tag_command_get_type (void) G_GNUC_CONST;
#define DELETE_TAG_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DELETE_TAG_COMMAND, DeleteTagCommandPrivate))
enum {
@@ -2581,7 +2581,7 @@ static void delete_tag_command_on_proxy_broken (DeleteTagCommand* self);
static void _delete_tag_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self);
GType tag_source_collection_get_type (void) G_GNUC_CONST;
static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source);
-static void delete_tag_command_finalize (GObject* obj);
+static void delete_tag_command_finalize (GObject * obj);
GType new_child_tag_command_get_type (void) G_GNUC_CONST;
#define NEW_CHILD_TAG_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_NEW_CHILD_TAG_COMMAND, NewChildTagCommandPrivate))
enum {
@@ -2593,7 +2593,7 @@ static void new_child_tag_command_real_execute_on_source (SimpleProxyableCommand
Tag* tag_create_new_child (Tag* self);
static void new_child_tag_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source);
Tag* new_child_tag_command_get_created_child (NewChildTagCommand* self);
-static void new_child_tag_command_finalize (GObject* obj);
+static void new_child_tag_command_finalize (GObject * obj);
GType new_root_tag_command_get_type (void) G_GNUC_CONST;
#define NEW_ROOT_TAG_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_NEW_ROOT_TAG_COMMAND, NewRootTagCommandPrivate))
enum {
@@ -2605,7 +2605,7 @@ static void new_root_tag_command_real_execute (Command* base);
Tag* tag_create_new_root (void);
static void new_root_tag_command_real_undo (Command* base);
Tag* new_root_tag_command_get_created_tag (NewRootTagCommand* self);
-static void new_root_tag_command_finalize (GObject* obj);
+static void new_root_tag_command_finalize (GObject * obj);
GType reparent_tag_command_get_type (void) G_GNUC_CONST;
#define REPARENT_TAG_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_REPARENT_TAG_COMMAND, ReparentTagCommandPrivate))
enum {
@@ -2642,7 +2642,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
static void reparent_tag_command_real_execute (Command* base);
static void reparent_tag_command_real_undo (Command* base);
void hierarchical_tag_utilities_cleanup_root_path (const gchar* path);
-static void reparent_tag_command_finalize (GObject* obj);
+static void reparent_tag_command_finalize (GObject * obj);
GType modify_tags_command_get_type (void) G_GNUC_CONST;
#define MODIFY_TAGS_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MODIFY_TAGS_COMMAND, ModifyTagsCommandPrivate))
enum {
@@ -2656,7 +2656,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, MediaSource* source);
static void modify_tags_command_real_execute (Command* base);
static void modify_tags_command_real_undo (Command* base);
-static void modify_tags_command_finalize (GObject* obj);
+static void modify_tags_command_finalize (GObject * obj);
GType tag_untag_photos_command_get_type (void) G_GNUC_CONST;
#define TAG_UNTAG_PHOTOS_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TAG_UNTAG_PHOTOS_COMMAND, TagUntagPhotosCommandPrivate))
enum {
@@ -2673,7 +2673,7 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag* tag);
static void tag_untag_photos_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source);
gchar* data_object_to_string (DataObject* self);
-static void tag_untag_photos_command_finalize (GObject* obj);
+static void tag_untag_photos_command_finalize (GObject * obj);
GType rename_saved_search_command_get_type (void) G_GNUC_CONST;
GType saved_search_get_type (void) G_GNUC_CONST;
#define RENAME_SAVED_SEARCH_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_RENAME_SAVED_SEARCH_COMMAND, RenameSavedSearchCommandPrivate))
@@ -2687,7 +2687,7 @@ static void rename_saved_search_command_real_execute (Command* base);
gboolean saved_search_rename (SavedSearch* self, const gchar* new_name);
gchar* resources_rename_search_exists_message (const gchar* name);
static void rename_saved_search_command_real_undo (Command* base);
-static void rename_saved_search_command_finalize (GObject* obj);
+static void rename_saved_search_command_finalize (GObject * obj);
GType delete_saved_search_command_get_type (void) G_GNUC_CONST;
#define DELETE_SAVED_SEARCH_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DELETE_SAVED_SEARCH_COMMAND, DeleteSavedSearchCommandPrivate))
enum {
@@ -2708,7 +2708,7 @@ SavedSearchTable* saved_search_table_get_instance (void);
void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search);
static void delete_saved_search_command_real_undo (Command* base);
void saved_search_reconstitute (SavedSearch* self);
-static void delete_saved_search_command_finalize (GObject* obj);
+static void delete_saved_search_command_finalize (GObject * obj);
GType trash_untrash_photos_command_get_type (void) G_GNUC_CONST;
#define TRASH_UNTRASH_PHOTOS_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TRASH_UNTRASH_PHOTOS_COMMAND, TrashUntrashPhotosCommandPrivate))
enum {
@@ -2728,7 +2728,7 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
static void trash_untrash_photos_command_real_undo (Command* base);
void media_source_trash (MediaSource* self);
void media_source_untrash (MediaSource* self);
-static void trash_untrash_photos_command_finalize (GObject* obj);
+static void trash_untrash_photos_command_finalize (GObject * obj);
GType flag_unflag_command_get_type (void) G_GNUC_CONST;
#define FLAG_UNFLAG_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_FLAG_UNFLAG_COMMAND, FlagUnflagCommandPrivate))
enum {
@@ -2747,7 +2747,7 @@ static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceComman
GType flaggable_get_type (void) G_GNUC_CONST;
void flaggable_mark_flagged (Flaggable* self);
void flaggable_mark_unflagged (Flaggable* self);
-static void flag_unflag_command_finalize (GObject* obj);
+static void flag_unflag_command_finalize (GObject * obj);
static void _page_command_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) {
@@ -2780,12 +2780,12 @@ static gpointer _g_object_ref0 (gpointer self) {
PageCommand* page_command_construct (GType object_type, const gchar* name, const gchar* explanation) {
PageCommand * self = NULL;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- AppWindow* _tmp2_ = NULL;
- AppWindow* _tmp3_ = NULL;
- Page* _tmp4_ = NULL;
- Page* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ AppWindow* _tmp2_;
+ AppWindow* _tmp3_;
+ Page* _tmp4_;
+ Page* _tmp5_;
#line 15 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 15 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2813,11 +2813,11 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
#line 20 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp5_ != NULL) {
#line 2816 "Commands.c"
- Page* _tmp6_ = NULL;
+ Page* _tmp6_;
LibraryPhotoPage* photo_page = NULL;
- Page* _tmp7_ = NULL;
- LibraryPhotoPage* _tmp8_ = NULL;
- LibraryPhotoPage* _tmp9_ = NULL;
+ Page* _tmp7_;
+ LibraryPhotoPage* _tmp8_;
+ LibraryPhotoPage* _tmp9_;
#line 21 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = self->priv->page;
#line 21 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2833,12 +2833,12 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
#line 28 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp9_ != NULL) {
#line 2836 "Commands.c"
- LibraryPhotoPage* _tmp10_ = NULL;
- Photo* _tmp11_ = NULL;
- LibraryPhotoPage* _tmp12_ = NULL;
- CollectionPage* _tmp13_ = NULL;
+ LibraryPhotoPage* _tmp10_;
+ Photo* _tmp11_;
+ LibraryPhotoPage* _tmp12_;
+ CollectionPage* _tmp13_;
gboolean _tmp14_ = FALSE;
- Photo* _tmp15_ = NULL;
+ Photo* _tmp15_;
#line 29 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp10_ = photo_page;
#line 29 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2860,7 +2860,7 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
#line 32 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp15_ != NULL) {
#line 2863 "Commands.c"
- CollectionPage* _tmp16_ = NULL;
+ CollectionPage* _tmp16_;
#line 32 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp16_ = self->priv->collection_page;
#line 32 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2874,8 +2874,8 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
#line 32 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp14_) {
#line 2877 "Commands.c"
- Photo* _tmp17_ = NULL;
- CollectionPage* _tmp18_ = NULL;
+ Photo* _tmp17_;
+ CollectionPage* _tmp18_;
#line 33 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp17_ = self->priv->library_photo;
#line 33 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2908,7 +2908,7 @@ PageCommand* page_command_construct (GType object_type, const gchar* name, const
void page_command_set_auto_return_to_page (PageCommand* self, gboolean auto_return) {
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 54 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_PAGE_COMMAND (self));
#line 55 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2921,7 +2921,7 @@ void page_command_set_auto_return_to_page (PageCommand* self, gboolean auto_retu
static void page_command_real_prepare (Command* base) {
PageCommand * self;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 58 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_COMMAND, PageCommand);
#line 59 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2940,9 +2940,9 @@ static void page_command_real_prepare (Command* base) {
void page_command_return_to_page (PageCommand* self) {
LibraryPhotoPage* photo_page = NULL;
- Page* _tmp0_ = NULL;
- LibraryPhotoPage* _tmp1_ = NULL;
- LibraryPhotoPage* _tmp2_ = NULL;
+ Page* _tmp0_;
+ LibraryPhotoPage* _tmp1_;
+ LibraryPhotoPage* _tmp2_;
#line 65 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_PAGE_COMMAND (self));
#line 66 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2957,13 +2957,13 @@ void page_command_return_to_page (PageCommand* self) {
if (_tmp2_ != NULL) {
#line 2959 "Commands.c"
gboolean _tmp3_ = FALSE;
- Photo* _tmp4_ = NULL;
+ Photo* _tmp4_;
#line 69 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = self->priv->library_photo;
#line 69 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp4_ != NULL) {
#line 2966 "Commands.c"
- CollectionPage* _tmp5_ = NULL;
+ CollectionPage* _tmp5_;
#line 69 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = self->priv->collection_page;
#line 69 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -2979,12 +2979,12 @@ void page_command_return_to_page (PageCommand* self) {
#line 2980 "Commands.c"
gboolean photo_in_collection = FALSE;
gint count = 0;
- CollectionPage* _tmp6_ = NULL;
- ViewCollection* _tmp7_ = NULL;
- ViewCollection* _tmp8_ = NULL;
- gint _tmp9_ = 0;
- gint _tmp10_ = 0;
- gboolean _tmp25_ = FALSE;
+ CollectionPage* _tmp6_;
+ ViewCollection* _tmp7_;
+ ViewCollection* _tmp8_;
+ gint _tmp9_;
+ gint _tmp10_;
+ gboolean _tmp25_;
#line 70 "/home/jens/Source/shotwell/src/Commands.vala"
photo_in_collection = FALSE;
#line 71 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3014,22 +3014,22 @@ void page_command_return_to_page (PageCommand* self) {
#line 72 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
#line 3017 "Commands.c"
- gint _tmp13_ = 0;
- gint _tmp14_ = 0;
- CollectionPage* _tmp15_ = NULL;
- ViewCollection* _tmp16_ = NULL;
- ViewCollection* _tmp17_ = NULL;
- gint _tmp18_ = 0;
- DataObject* _tmp19_ = NULL;
- Thumbnail* _tmp20_ = NULL;
- MediaSource* _tmp21_ = NULL;
- MediaSource* _tmp22_ = NULL;
- Photo* _tmp23_ = NULL;
- gboolean _tmp24_ = FALSE;
+ gint _tmp13_;
+ gint _tmp14_;
+ CollectionPage* _tmp15_;
+ ViewCollection* _tmp16_;
+ ViewCollection* _tmp17_;
+ gint _tmp18_;
+ DataObject* _tmp19_;
+ Thumbnail* _tmp20_;
+ MediaSource* _tmp21_;
+ MediaSource* _tmp22_;
+ Photo* _tmp23_;
+ gboolean _tmp24_;
#line 72 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp11_) {
#line 3032 "Commands.c"
- gint _tmp12_ = 0;
+ gint _tmp12_;
#line 72 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp12_ = i;
#line 72 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3090,10 +3090,10 @@ void page_command_return_to_page (PageCommand* self) {
#line 79 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp25_) {
#line 3093 "Commands.c"
- LibraryWindow* _tmp26_ = NULL;
- LibraryWindow* _tmp27_ = NULL;
- CollectionPage* _tmp28_ = NULL;
- Photo* _tmp29_ = NULL;
+ LibraryWindow* _tmp26_;
+ LibraryWindow* _tmp27_;
+ CollectionPage* _tmp28_;
+ Photo* _tmp29_;
#line 80 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp26_ = library_window_get_app ();
#line 80 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3110,15 +3110,15 @@ void page_command_return_to_page (PageCommand* self) {
}
}
} else {
- Page* _tmp30_ = NULL;
+ Page* _tmp30_;
#line 82 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp30_ = self->priv->page;
#line 82 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp30_ != NULL) {
#line 3119 "Commands.c"
- AppWindow* _tmp31_ = NULL;
- AppWindow* _tmp32_ = NULL;
- Page* _tmp33_ = NULL;
+ AppWindow* _tmp31_;
+ AppWindow* _tmp32_;
+ Page* _tmp33_;
#line 83 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp31_ = app_window_get_instance ();
#line 83 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3139,8 +3139,8 @@ void page_command_return_to_page (PageCommand* self) {
static void page_command_on_page_destroyed (PageCommand* self) {
- Page* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
+ Page* _tmp0_;
+ guint _tmp1_;
#line 86 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_PAGE_COMMAND (self));
#line 87 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3158,8 +3158,8 @@ static void page_command_on_page_destroyed (PageCommand* self) {
static void page_command_on_photo_destroyed (PageCommand* self) {
- Photo* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
+ Photo* _tmp0_;
+ guint _tmp1_;
#line 91 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_PAGE_COMMAND (self));
#line 92 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3177,8 +3177,8 @@ static void page_command_on_photo_destroyed (PageCommand* self) {
static void page_command_on_controller_destroyed (PageCommand* self) {
- CollectionPage* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
+ CollectionPage* _tmp0_;
+ guint _tmp1_;
#line 96 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_PAGE_COMMAND (self));
#line 97 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3201,7 +3201,7 @@ static void page_command_class_init (PageCommandClass * klass) {
#line 9 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (PageCommandPrivate));
#line 9 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->prepare = (void (*)(Command*)) page_command_real_prepare;
+ ((CommandClass *) klass)->prepare = (void (*) (Command *)) page_command_real_prepare;
#line 9 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = page_command_finalize;
#line 3208 "Commands.c"
@@ -3221,11 +3221,11 @@ static void page_command_instance_init (PageCommand * self) {
}
-static void page_command_finalize (GObject* obj) {
+static void page_command_finalize (GObject * obj) {
PageCommand * self;
- Page* _tmp0_ = NULL;
- Photo* _tmp3_ = NULL;
- CollectionPage* _tmp6_ = NULL;
+ Page* _tmp0_;
+ Photo* _tmp3_;
+ CollectionPage* _tmp6_;
#line 9 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_COMMAND, PageCommand);
#line 44 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3233,8 +3233,8 @@ static void page_command_finalize (GObject* obj) {
#line 44 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp0_ != NULL) {
#line 3236 "Commands.c"
- Page* _tmp1_ = NULL;
- guint _tmp2_ = 0U;
+ Page* _tmp1_;
+ guint _tmp2_;
#line 45 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = self->priv->page;
#line 45 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3248,8 +3248,8 @@ static void page_command_finalize (GObject* obj) {
#line 47 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp3_ != NULL) {
#line 3251 "Commands.c"
- Photo* _tmp4_ = NULL;
- guint _tmp5_ = 0U;
+ Photo* _tmp4_;
+ guint _tmp5_;
#line 48 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = self->priv->library_photo;
#line 48 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3263,8 +3263,8 @@ static void page_command_finalize (GObject* obj) {
#line 50 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp6_ != NULL) {
#line 3266 "Commands.c"
- CollectionPage* _tmp7_ = NULL;
- guint _tmp8_ = 0U;
+ CollectionPage* _tmp7_;
+ guint _tmp8_;
#line 51 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = self->priv->collection_page;
#line 51 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3306,11 +3306,11 @@ static void _single_data_source_command_on_source_destroyed_data_source_destroye
SingleDataSourceCommand* single_data_source_command_construct (GType object_type, DataSource* source, const gchar* name, const gchar* explanation) {
SingleDataSourceCommand * self = NULL;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- DataSource* _tmp2_ = NULL;
- DataSource* _tmp3_ = NULL;
- DataSource* _tmp4_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ DataSource* _tmp2_;
+ DataSource* _tmp3_;
+ DataSource* _tmp4_;
#line 106 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
#line 106 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3343,8 +3343,8 @@ SingleDataSourceCommand* single_data_source_command_construct (GType object_type
DataSource* single_data_source_command_get_source (SingleDataSourceCommand* self) {
DataSource* result = NULL;
- DataSource* _tmp0_ = NULL;
- DataSource* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ DataSource* _tmp1_;
#line 118 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_SINGLE_DATA_SOURCE_COMMAND (self), NULL);
#line 119 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3360,8 +3360,8 @@ DataSource* single_data_source_command_get_source (SingleDataSourceCommand* self
static void single_data_source_command_on_source_destroyed (SingleDataSourceCommand* self) {
- CommandManager* _tmp0_ = NULL;
- CommandManager* _tmp1_ = NULL;
+ CommandManager* _tmp0_;
+ CommandManager* _tmp1_;
#line 122 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_SINGLE_DATA_SOURCE_COMMAND (self));
#line 125 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3389,10 +3389,10 @@ static void single_data_source_command_instance_init (SingleDataSourceCommand *
}
-static void single_data_source_command_finalize (GObject* obj) {
+static void single_data_source_command_finalize (GObject * obj) {
SingleDataSourceCommand * self;
- DataSource* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
+ DataSource* _tmp0_;
+ guint _tmp1_;
#line 103 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand);
#line 115 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3430,11 +3430,11 @@ static void _simple_proxyable_command_on_proxy_broken_source_proxy_broken (Sourc
SimpleProxyableCommand* simple_proxyable_command_construct (GType object_type, Proxyable* proxyable, const gchar* name, const gchar* explanation) {
SimpleProxyableCommand * self = NULL;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- Proxyable* _tmp2_ = NULL;
- SourceProxy* _tmp3_ = NULL;
- SourceProxy* _tmp4_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ Proxyable* _tmp2_;
+ SourceProxy* _tmp3_;
+ SourceProxy* _tmp4_;
#line 133 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_PROXYABLE (proxyable), NULL);
#line 133 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3467,9 +3467,9 @@ SimpleProxyableCommand* simple_proxyable_command_construct (GType object_type, P
static void simple_proxyable_command_real_execute (Command* base) {
SimpleProxyableCommand * self;
- SourceProxy* _tmp0_ = NULL;
- DataSource* _tmp1_ = NULL;
- DataSource* _tmp2_ = NULL;
+ SourceProxy* _tmp0_;
+ DataSource* _tmp1_;
+ DataSource* _tmp2_;
#line 145 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SIMPLE_PROXYABLE_COMMAND, SimpleProxyableCommand);
#line 146 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3506,9 +3506,9 @@ void simple_proxyable_command_execute_on_source (SimpleProxyableCommand* self, D
static void simple_proxyable_command_real_undo (Command* base) {
SimpleProxyableCommand * self;
- SourceProxy* _tmp0_ = NULL;
- DataSource* _tmp1_ = NULL;
- DataSource* _tmp2_ = NULL;
+ SourceProxy* _tmp0_;
+ DataSource* _tmp1_;
+ DataSource* _tmp2_;
#line 151 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SIMPLE_PROXYABLE_COMMAND, SimpleProxyableCommand);
#line 152 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3551,8 +3551,8 @@ void simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, GeeC
#line 3552 "Commands.c"
{
GeeIterator* _proxyable_it = NULL;
- GeeCollection* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeIterator* _tmp1_;
#line 162 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = proxyables;
#line 162 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3562,17 +3562,17 @@ void simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, GeeC
#line 162 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
#line 3565 "Commands.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
Proxyable* proxyable = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
SourceProxy* added_proxy = NULL;
- Proxyable* _tmp6_ = NULL;
- SourceProxy* _tmp7_ = NULL;
- SourceProxy* _tmp8_ = NULL;
- GeeHashSet* _tmp9_ = NULL;
- SourceProxy* _tmp10_ = NULL;
+ Proxyable* _tmp6_;
+ SourceProxy* _tmp7_;
+ SourceProxy* _tmp8_;
+ GeeHashSet* _tmp9_;
+ SourceProxy* _tmp10_;
#line 162 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _proxyable_it;
#line 162 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3619,14 +3619,14 @@ void simple_proxyable_command_add_proxyables (SimpleProxyableCommand* self, GeeC
void simple_proxyable_command_clear_added_proxies (SimpleProxyableCommand* self) {
- GeeHashSet* _tmp8_ = NULL;
+ GeeHashSet* _tmp8_;
#line 170 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_SIMPLE_PROXYABLE_COMMAND (self));
#line 3626 "Commands.c"
{
GeeIterator* _added_proxy_it = NULL;
- GeeHashSet* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeHashSet* _tmp0_;
+ GeeIterator* _tmp1_;
#line 171 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->proxies;
#line 171 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3636,13 +3636,13 @@ void simple_proxyable_command_clear_added_proxies (SimpleProxyableCommand* self)
#line 171 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
#line 3639 "Commands.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
SourceProxy* added_proxy = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- SourceProxy* _tmp6_ = NULL;
- guint _tmp7_ = 0U;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ SourceProxy* _tmp6_;
+ guint _tmp7_;
#line 171 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _added_proxy_it;
#line 171 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3682,8 +3682,8 @@ void simple_proxyable_command_clear_added_proxies (SimpleProxyableCommand* self)
static void simple_proxyable_command_on_proxy_broken (SimpleProxyableCommand* self) {
- CommandManager* _tmp0_ = NULL;
- CommandManager* _tmp1_ = NULL;
+ CommandManager* _tmp0_;
+ CommandManager* _tmp1_;
#line 177 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_SIMPLE_PROXYABLE_COMMAND (self));
#line 178 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3706,13 +3706,13 @@ static void simple_proxyable_command_class_init (SimpleProxyableCommandClass * k
#line 129 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (SimpleProxyableCommandPrivate));
#line 129 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) simple_proxyable_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) simple_proxyable_command_real_execute;
#line 129 "/home/jens/Source/shotwell/src/Commands.vala"
- ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) simple_proxyable_command_real_execute_on_source;
+ ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) simple_proxyable_command_real_execute_on_source;
#line 129 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) simple_proxyable_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) simple_proxyable_command_real_undo;
#line 129 "/home/jens/Source/shotwell/src/Commands.vala"
- ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) simple_proxyable_command_real_undo_on_source;
+ ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) simple_proxyable_command_real_undo_on_source;
#line 129 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = simple_proxyable_command_finalize;
#line 3719 "Commands.c"
@@ -3720,7 +3720,7 @@ static void simple_proxyable_command_class_init (SimpleProxyableCommandClass * k
static void simple_proxyable_command_instance_init (SimpleProxyableCommand * self) {
- GeeHashSet* _tmp0_ = NULL;
+ GeeHashSet* _tmp0_;
#line 129 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = SIMPLE_PROXYABLE_COMMAND_GET_PRIVATE (self);
#line 131 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3731,10 +3731,10 @@ static void simple_proxyable_command_instance_init (SimpleProxyableCommand * sel
}
-static void simple_proxyable_command_finalize (GObject* obj) {
+static void simple_proxyable_command_finalize (GObject * obj) {
SimpleProxyableCommand * self;
- SourceProxy* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
+ SourceProxy* _tmp0_;
+ guint _tmp1_;
#line 129 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SIMPLE_PROXYABLE_COMMAND, SimpleProxyableCommand);
#line 141 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3776,12 +3776,12 @@ static void _single_photo_transformation_command_on_state_broken_photo_transform
SinglePhotoTransformationCommand* single_photo_transformation_command_construct (GType object_type, Photo* photo, const gchar* name, const gchar* explanation) {
SinglePhotoTransformationCommand * self = NULL;
- Photo* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- Photo* _tmp3_ = NULL;
- PhotoTransformationState* _tmp4_ = NULL;
- PhotoTransformationState* _tmp5_ = NULL;
+ Photo* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ Photo* _tmp3_;
+ PhotoTransformationState* _tmp4_;
+ PhotoTransformationState* _tmp5_;
#line 186 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_PHOTO (photo), NULL);
#line 186 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3816,8 +3816,8 @@ SinglePhotoTransformationCommand* single_photo_transformation_command_construct
static void single_photo_transformation_command_real_undo (Command* base) {
SinglePhotoTransformationCommand * self;
- DataSource* _tmp0_ = NULL;
- PhotoTransformationState* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ PhotoTransformationState* _tmp1_;
#line 197 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_TRANSFORMATION_COMMAND, SinglePhotoTransformationCommand);
#line 198 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3831,8 +3831,8 @@ static void single_photo_transformation_command_real_undo (Command* base) {
static void single_photo_transformation_command_on_state_broken (SinglePhotoTransformationCommand* self) {
- CommandManager* _tmp0_ = NULL;
- CommandManager* _tmp1_ = NULL;
+ CommandManager* _tmp0_;
+ CommandManager* _tmp1_;
#line 201 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_SINGLE_PHOTO_TRANSFORMATION_COMMAND (self));
#line 202 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3853,7 +3853,7 @@ static void single_photo_transformation_command_class_init (SinglePhotoTransform
#line 183 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (SinglePhotoTransformationCommandPrivate));
#line 183 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) single_photo_transformation_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) single_photo_transformation_command_real_undo;
#line 183 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = single_photo_transformation_command_finalize;
#line 3860 "Commands.c"
@@ -3867,10 +3867,10 @@ static void single_photo_transformation_command_instance_init (SinglePhotoTransf
}
-static void single_photo_transformation_command_finalize (GObject* obj) {
+static void single_photo_transformation_command_finalize (GObject * obj) {
SinglePhotoTransformationCommand * self;
- PhotoTransformationState* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
+ PhotoTransformationState* _tmp0_;
+ guint _tmp1_;
#line 183 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SINGLE_PHOTO_TRANSFORMATION_COMMAND, SinglePhotoTransformationCommand);
#line 194 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3908,9 +3908,9 @@ static void _generic_photo_transformation_command_on_state_broken_photo_transfor
GenericPhotoTransformationCommand* generic_photo_transformation_command_construct (GType object_type, Photo* photo, const gchar* name, const gchar* explanation) {
GenericPhotoTransformationCommand * self = NULL;
- Photo* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
+ Photo* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
#line 210 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_PHOTO (photo), NULL);
#line 210 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3934,12 +3934,12 @@ GenericPhotoTransformationCommand* generic_photo_transformation_command_construc
static void generic_photo_transformation_command_real_execute (Command* base) {
GenericPhotoTransformationCommand * self;
Photo* photo = NULL;
- DataSource* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- PhotoTransformationState* _tmp2_ = NULL;
- PhotoTransformationState* _tmp3_ = NULL;
- PhotoTransformationState* _tmp4_ = NULL;
- PhotoTransformationState* _tmp5_ = NULL;
+ DataSource* _tmp0_;
+ Photo* _tmp1_;
+ PhotoTransformationState* _tmp2_;
+ PhotoTransformationState* _tmp3_;
+ PhotoTransformationState* _tmp4_;
+ PhotoTransformationState* _tmp5_;
#line 222 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GENERIC_PHOTO_TRANSFORMATION_COMMAND, GenericPhotoTransformationCommand);
#line 223 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -3996,8 +3996,8 @@ void generic_photo_transformation_command_execute_on_photo (GenericPhotoTransfor
static void generic_photo_transformation_command_real_undo (Command* base) {
GenericPhotoTransformationCommand * self;
- DataSource* _tmp0_ = NULL;
- PhotoTransformationState* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ PhotoTransformationState* _tmp1_;
#line 236 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GENERIC_PHOTO_TRANSFORMATION_COMMAND, GenericPhotoTransformationCommand);
#line 238 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4012,8 +4012,8 @@ static void generic_photo_transformation_command_real_undo (Command* base) {
static void generic_photo_transformation_command_real_redo (Command* base) {
GenericPhotoTransformationCommand * self;
- DataSource* _tmp0_ = NULL;
- PhotoTransformationState* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ PhotoTransformationState* _tmp1_;
#line 241 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GENERIC_PHOTO_TRANSFORMATION_COMMAND, GenericPhotoTransformationCommand);
#line 243 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4050,19 +4050,19 @@ gboolean generic_photo_transformation_command_can_compress (GenericPhotoTransfor
static gboolean generic_photo_transformation_command_real_compress (Command* base, Command* command) {
GenericPhotoTransformationCommand * self;
gboolean result = FALSE;
- Command* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ Command* _tmp0_;
+ gboolean _tmp1_;
GenericPhotoTransformationCommand* generic = NULL;
- Command* _tmp2_ = NULL;
- GenericPhotoTransformationCommand* _tmp3_ = NULL;
- GenericPhotoTransformationCommand* _tmp4_ = NULL;
- GenericPhotoTransformationCommand* _tmp5_ = NULL;
- DataSource* _tmp6_ = NULL;
- DataSource* _tmp7_ = NULL;
- GenericPhotoTransformationCommand* _tmp8_ = NULL;
- GenericPhotoTransformationCommand* _tmp9_ = NULL;
- PhotoTransformationState* _tmp10_ = NULL;
- PhotoTransformationState* _tmp11_ = NULL;
+ Command* _tmp2_;
+ GenericPhotoTransformationCommand* _tmp3_;
+ GenericPhotoTransformationCommand* _tmp4_;
+ GenericPhotoTransformationCommand* _tmp5_;
+ DataSource* _tmp6_;
+ DataSource* _tmp7_;
+ GenericPhotoTransformationCommand* _tmp8_;
+ GenericPhotoTransformationCommand* _tmp9_;
+ PhotoTransformationState* _tmp10_;
+ PhotoTransformationState* _tmp11_;
#line 250 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GENERIC_PHOTO_TRANSFORMATION_COMMAND, GenericPhotoTransformationCommand);
#line 250 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4138,8 +4138,8 @@ static gboolean generic_photo_transformation_command_real_compress (Command* bas
static void generic_photo_transformation_command_on_state_broken (GenericPhotoTransformationCommand* self) {
- CommandManager* _tmp0_ = NULL;
- CommandManager* _tmp1_ = NULL;
+ CommandManager* _tmp0_;
+ CommandManager* _tmp1_;
#line 270 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_GENERIC_PHOTO_TRANSFORMATION_COMMAND (self));
#line 271 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4160,17 +4160,17 @@ static void generic_photo_transformation_command_class_init (GenericPhotoTransfo
#line 206 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (GenericPhotoTransformationCommandPrivate));
#line 206 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) generic_photo_transformation_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) generic_photo_transformation_command_real_execute;
#line 206 "/home/jens/Source/shotwell/src/Commands.vala"
- ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) generic_photo_transformation_command_real_execute_on_photo;
+ ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) generic_photo_transformation_command_real_execute_on_photo;
#line 206 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) generic_photo_transformation_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) generic_photo_transformation_command_real_undo;
#line 206 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->redo = (void (*)(Command*)) generic_photo_transformation_command_real_redo;
+ ((CommandClass *) klass)->redo = (void (*) (Command *)) generic_photo_transformation_command_real_redo;
#line 206 "/home/jens/Source/shotwell/src/Commands.vala"
- ((GenericPhotoTransformationCommandClass *) klass)->can_compress = (gboolean (*)(GenericPhotoTransformationCommand*, Command*)) generic_photo_transformation_command_real_can_compress;
+ ((GenericPhotoTransformationCommandClass *) klass)->can_compress = (gboolean (*) (GenericPhotoTransformationCommand *, Command*)) generic_photo_transformation_command_real_can_compress;
#line 206 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) generic_photo_transformation_command_real_compress;
+ ((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) generic_photo_transformation_command_real_compress;
#line 206 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = generic_photo_transformation_command_finalize;
#line 4177 "Commands.c"
@@ -4188,10 +4188,10 @@ static void generic_photo_transformation_command_instance_init (GenericPhotoTran
}
-static void generic_photo_transformation_command_finalize (GObject* obj) {
+static void generic_photo_transformation_command_finalize (GObject * obj) {
GenericPhotoTransformationCommand * self;
- PhotoTransformationState* _tmp0_ = NULL;
- PhotoTransformationState* _tmp3_ = NULL;
+ PhotoTransformationState* _tmp0_;
+ PhotoTransformationState* _tmp3_;
#line 206 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_GENERIC_PHOTO_TRANSFORMATION_COMMAND, GenericPhotoTransformationCommand);
#line 215 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4199,8 +4199,8 @@ static void generic_photo_transformation_command_finalize (GObject* obj) {
#line 215 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp0_ != NULL) {
#line 4202 "Commands.c"
- PhotoTransformationState* _tmp1_ = NULL;
- guint _tmp2_ = 0U;
+ PhotoTransformationState* _tmp1_;
+ guint _tmp2_;
#line 216 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = self->priv->original_state;
#line 216 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4214,8 +4214,8 @@ static void generic_photo_transformation_command_finalize (GObject* obj) {
#line 218 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp3_ != NULL) {
#line 4217 "Commands.c"
- PhotoTransformationState* _tmp4_ = NULL;
- guint _tmp5_ = 0U;
+ PhotoTransformationState* _tmp4_;
+ guint _tmp5_;
#line 219 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = self->priv->transformed_state;
#line 219 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4255,12 +4255,12 @@ static void _multiple_data_source_command_on_source_destroyed_source_collection_
MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_type, GeeIterable* iter, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation) {
MultipleDataSourceCommand * self = NULL;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
#line 285 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
#line 285 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4296,8 +4296,8 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
#line 4297 "Commands.c"
{
GeeIterator* _view_it = NULL;
- GeeIterable* _tmp6_ = NULL;
- GeeIterator* _tmp7_ = NULL;
+ GeeIterable* _tmp6_;
+ GeeIterator* _tmp7_;
#line 292 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = iter;
#line 292 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4307,20 +4307,20 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
#line 292 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
#line 4310 "Commands.c"
- GeeIterator* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+ GeeIterator* _tmp8_;
+ gboolean _tmp9_;
DataView* view = NULL;
- GeeIterator* _tmp10_ = NULL;
- gpointer _tmp11_ = NULL;
+ GeeIterator* _tmp10_;
+ gpointer _tmp11_;
DataSource* source = NULL;
- DataView* _tmp12_ = NULL;
- DataSource* _tmp13_ = NULL;
+ DataView* _tmp12_;
+ DataSource* _tmp13_;
SourceCollection* collection = NULL;
- DataSource* _tmp14_ = NULL;
- DataCollection* _tmp15_ = NULL;
- SourceCollection* _tmp16_ = NULL;
- GeeArrayList* _tmp19_ = NULL;
- DataSource* _tmp20_ = NULL;
+ DataSource* _tmp14_;
+ DataCollection* _tmp15_;
+ SourceCollection* _tmp16_;
+ GeeArrayList* _tmp19_;
+ DataSource* _tmp20_;
#line 292 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp8_ = _view_it;
#line 292 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4354,8 +4354,8 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
#line 296 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp16_ != NULL) {
#line 4357 "Commands.c"
- GeeHashSet* _tmp17_ = NULL;
- SourceCollection* _tmp18_ = NULL;
+ GeeHashSet* _tmp17_;
+ SourceCollection* _tmp18_;
#line 297 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp17_ = self->priv->hooked_collections;
#line 297 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4384,8 +4384,8 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
}
{
GeeIterator* _current_collection_it = NULL;
- GeeHashSet* _tmp21_ = NULL;
- GeeIterator* _tmp22_ = NULL;
+ GeeHashSet* _tmp21_;
+ GeeIterator* _tmp22_;
#line 302 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp21_ = self->priv->hooked_collections;
#line 302 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4395,12 +4395,12 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
#line 302 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
#line 4398 "Commands.c"
- GeeIterator* _tmp23_ = NULL;
- gboolean _tmp24_ = FALSE;
+ GeeIterator* _tmp23_;
+ gboolean _tmp24_;
SourceCollection* current_collection = NULL;
- GeeIterator* _tmp25_ = NULL;
- gpointer _tmp26_ = NULL;
- SourceCollection* _tmp27_ = NULL;
+ GeeIterator* _tmp25_;
+ gpointer _tmp26_;
+ SourceCollection* _tmp27_;
#line 302 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp23_ = _current_collection_it;
#line 302 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4437,8 +4437,8 @@ MultipleDataSourceCommand* multiple_data_source_command_construct (GType object_
GeeIterable* multiple_data_source_command_get_sources (MultipleDataSourceCommand* self) {
GeeIterable* result = NULL;
- GeeArrayList* _tmp0_ = NULL;
- GeeIterable* _tmp1_ = NULL;
+ GeeArrayList* _tmp0_;
+ GeeIterable* _tmp1_;
#line 313 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self), NULL);
#line 314 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4455,9 +4455,9 @@ GeeIterable* multiple_data_source_command_get_sources (MultipleDataSourceCommand
gint multiple_data_source_command_get_source_count (MultipleDataSourceCommand* self) {
gint result = 0;
- GeeArrayList* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
+ GeeArrayList* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
#line 317 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self), 0);
#line 318 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4475,9 +4475,9 @@ gint multiple_data_source_command_get_source_count (MultipleDataSourceCommand* s
static void multiple_data_source_command_on_source_destroyed (MultipleDataSourceCommand* self, DataSource* source) {
- GeeArrayList* _tmp0_ = NULL;
- DataSource* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ GeeArrayList* _tmp0_;
+ DataSource* _tmp1_;
+ gboolean _tmp2_;
#line 321 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self));
#line 321 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4491,8 +4491,8 @@ static void multiple_data_source_command_on_source_destroyed (MultipleDataSource
#line 324 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp2_) {
#line 4494 "Commands.c"
- CommandManager* _tmp3_ = NULL;
- CommandManager* _tmp4_ = NULL;
+ CommandManager* _tmp3_;
+ CommandManager* _tmp4_;
#line 325 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command));
#line 325 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4508,9 +4508,9 @@ static void multiple_data_source_command_on_source_destroyed (MultipleDataSource
static void multiple_data_source_command_real_execute (Command* base) {
MultipleDataSourceCommand * self;
- GeeArrayList* _tmp0_ = NULL;
- GeeArrayList* _tmp1_ = NULL;
- GeeArrayList* _tmp2_ = NULL;
+ GeeArrayList* _tmp0_;
+ GeeArrayList* _tmp1_;
+ GeeArrayList* _tmp2_;
#line 328 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand);
#line 329 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4551,9 +4551,9 @@ void multiple_data_source_command_execute_on_source (MultipleDataSourceCommand*
static void multiple_data_source_command_real_undo (Command* base) {
MultipleDataSourceCommand * self;
- GeeArrayList* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
+ GeeArrayList* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
#line 338 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand);
#line 339 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4565,8 +4565,8 @@ static void multiple_data_source_command_real_undo (Command* base) {
#line 339 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp2_ > 0) {
#line 4568 "Commands.c"
- GeeArrayList* _tmp3_ = NULL;
- GeeArrayList* _tmp4_ = NULL;
+ GeeArrayList* _tmp3_;
+ GeeArrayList* _tmp4_;
#line 340 "/home/jens/Source/shotwell/src/Commands.vala"
multiple_data_source_command_start_transaction (self);
#line 341 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4615,8 +4615,8 @@ static void multiple_data_source_command_start_transaction (MultipleDataSourceCo
#line 4616 "Commands.c"
{
GeeIterator* _sources_it = NULL;
- GeeHashSet* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeHashSet* _tmp0_;
+ GeeIterator* _tmp1_;
#line 351 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->hooked_collections;
#line 351 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4626,15 +4626,15 @@ static void multiple_data_source_command_start_transaction (MultipleDataSourceCo
#line 351 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
#line 4629 "Commands.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
SourceCollection* sources = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
MediaSourceCollection* media_collection = NULL;
- SourceCollection* _tmp6_ = NULL;
- MediaSourceCollection* _tmp7_ = NULL;
- MediaSourceCollection* _tmp8_ = NULL;
+ SourceCollection* _tmp6_;
+ MediaSourceCollection* _tmp7_;
+ MediaSourceCollection* _tmp8_;
#line 351 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _sources_it;
#line 351 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4662,9 +4662,9 @@ static void multiple_data_source_command_start_transaction (MultipleDataSourceCo
#line 353 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp8_ != NULL) {
#line 4665 "Commands.c"
- MediaSourceCollection* _tmp9_ = NULL;
- TransactionController* _tmp10_ = NULL;
- TransactionController* _tmp11_ = NULL;
+ MediaSourceCollection* _tmp9_;
+ TransactionController* _tmp10_;
+ TransactionController* _tmp11_;
#line 354 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp9_ = media_collection;
#line 354 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4694,8 +4694,8 @@ static void multiple_data_source_command_commit_transaction (MultipleDataSourceC
#line 4695 "Commands.c"
{
GeeIterator* _sources_it = NULL;
- GeeHashSet* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeHashSet* _tmp0_;
+ GeeIterator* _tmp1_;
#line 359 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->hooked_collections;
#line 359 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4705,15 +4705,15 @@ static void multiple_data_source_command_commit_transaction (MultipleDataSourceC
#line 359 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
#line 4708 "Commands.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
SourceCollection* sources = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
MediaSourceCollection* media_collection = NULL;
- SourceCollection* _tmp6_ = NULL;
- MediaSourceCollection* _tmp7_ = NULL;
- MediaSourceCollection* _tmp8_ = NULL;
+ SourceCollection* _tmp6_;
+ MediaSourceCollection* _tmp7_;
+ MediaSourceCollection* _tmp8_;
#line 359 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _sources_it;
#line 359 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4741,9 +4741,9 @@ static void multiple_data_source_command_commit_transaction (MultipleDataSourceC
#line 361 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp8_ != NULL) {
#line 4744 "Commands.c"
- MediaSourceCollection* _tmp9_ = NULL;
- TransactionController* _tmp10_ = NULL;
- TransactionController* _tmp11_ = NULL;
+ MediaSourceCollection* _tmp9_;
+ TransactionController* _tmp10_;
+ TransactionController* _tmp11_;
#line 362 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp9_ = media_collection;
#line 362 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4768,26 +4768,26 @@ static void multiple_data_source_command_commit_transaction (MultipleDataSourceC
static void multiple_data_source_command_execute_all (MultipleDataSourceCommand* self, gboolean exec, gboolean can_cancel, GeeArrayList* todo, GeeArrayList* completed) {
- AppWindow* _tmp0_ = NULL;
- AppWindow* _tmp1_ = NULL;
+ AppWindow* _tmp0_;
+ AppWindow* _tmp1_;
gint count = 0;
gint total = 0;
- GeeArrayList* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
+ GeeArrayList* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
gint two_percent = 0;
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
+ gint _tmp5_;
+ gint _tmp6_;
const gchar* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
+ gboolean _tmp8_;
gchar* text = NULL;
- gchar* _tmp11_ = NULL;
+ gchar* _tmp11_;
GCancellable* cancellable = NULL;
ProgressDialog* progress = NULL;
- gint _tmp12_ = 0;
- ProgressDialog* _tmp50_ = NULL;
- AppWindow* _tmp52_ = NULL;
- AppWindow* _tmp53_ = NULL;
+ gint _tmp12_;
+ ProgressDialog* _tmp50_;
+ AppWindow* _tmp52_;
+ AppWindow* _tmp53_;
#line 366 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_MULTIPLE_DATA_SOURCE_COMMAND (self));
#line 366 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4829,14 +4829,14 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
#line 376 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp8_) {
#line 4832 "Commands.c"
- const gchar* _tmp9_ = NULL;
+ const gchar* _tmp9_;
#line 376 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp9_ = self->priv->progress_text;
#line 376 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = _tmp9_;
#line 4838 "Commands.c"
} else {
- const gchar* _tmp10_ = NULL;
+ const gchar* _tmp10_;
#line 376 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp10_ = self->priv->undo_progress_text;
#line 376 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4857,19 +4857,19 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
if (_tmp12_ >= MULTIPLE_DATA_SOURCE_COMMAND_MIN_OPS_FOR_PROGRESS_WINDOW) {
#line 4859 "Commands.c"
GCancellable* _tmp13_ = NULL;
- gboolean _tmp14_ = FALSE;
- GCancellable* _tmp16_ = NULL;
- AppWindow* _tmp17_ = NULL;
- AppWindow* _tmp18_ = NULL;
- const gchar* _tmp19_ = NULL;
- GCancellable* _tmp20_ = NULL;
- ProgressDialog* _tmp21_ = NULL;
+ gboolean _tmp14_;
+ GCancellable* _tmp16_;
+ AppWindow* _tmp17_;
+ AppWindow* _tmp18_;
+ const gchar* _tmp19_;
+ GCancellable* _tmp20_;
+ ProgressDialog* _tmp21_;
#line 381 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp14_ = can_cancel;
#line 381 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp14_) {
#line 4872 "Commands.c"
- GCancellable* _tmp15_ = NULL;
+ GCancellable* _tmp15_;
#line 381 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp15_ = g_cancellable_new ();
#line 381 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4914,12 +4914,12 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
}
{
GeeArrayList* _source_list = NULL;
- GeeArrayList* _tmp22_ = NULL;
- GeeArrayList* _tmp23_ = NULL;
+ GeeArrayList* _tmp22_;
+ GeeArrayList* _tmp23_;
gint _source_size = 0;
- GeeArrayList* _tmp24_ = NULL;
- gint _tmp25_ = 0;
- gint _tmp26_ = 0;
+ GeeArrayList* _tmp24_;
+ gint _tmp25_;
+ gint _tmp26_;
gint _source_index = 0;
#line 385 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp22_ = todo;
@@ -4940,16 +4940,16 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
#line 385 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
#line 4943 "Commands.c"
- gint _tmp27_ = 0;
- gint _tmp28_ = 0;
- gint _tmp29_ = 0;
+ gint _tmp27_;
+ gint _tmp28_;
+ gint _tmp29_;
DataSource* source = NULL;
- GeeArrayList* _tmp30_ = NULL;
- gint _tmp31_ = 0;
- gpointer _tmp32_ = NULL;
- gboolean _tmp33_ = FALSE;
- GeeArrayList* _tmp36_ = NULL;
- ProgressDialog* _tmp39_ = NULL;
+ GeeArrayList* _tmp30_;
+ gint _tmp31_;
+ gpointer _tmp32_;
+ gboolean _tmp33_;
+ GeeArrayList* _tmp36_;
+ ProgressDialog* _tmp39_;
#line 385 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp27_ = _source_index;
#line 385 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4977,14 +4977,14 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
#line 386 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp33_) {
#line 4980 "Commands.c"
- DataSource* _tmp34_ = NULL;
+ DataSource* _tmp34_;
#line 387 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp34_ = source;
#line 387 "/home/jens/Source/shotwell/src/Commands.vala"
multiple_data_source_command_execute_on_source (self, _tmp34_);
#line 4986 "Commands.c"
} else {
- DataSource* _tmp35_ = NULL;
+ DataSource* _tmp35_;
#line 389 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp35_ = source;
#line 389 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -4996,8 +4996,8 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
#line 391 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp36_ != NULL) {
#line 4999 "Commands.c"
- GeeArrayList* _tmp37_ = NULL;
- DataSource* _tmp38_ = NULL;
+ GeeArrayList* _tmp37_;
+ DataSource* _tmp38_;
#line 392 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp37_ = completed;
#line 392 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5011,11 +5011,11 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
#line 394 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp39_ != NULL) {
#line 5014 "Commands.c"
- gint _tmp40_ = 0;
- gint _tmp41_ = 0;
- gint _tmp42_ = 0;
+ gint _tmp40_;
+ gint _tmp41_;
+ gint _tmp42_;
gboolean _tmp46_ = FALSE;
- GCancellable* _tmp47_ = NULL;
+ GCancellable* _tmp47_;
#line 395 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp40_ = count;
#line 395 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5027,9 +5027,9 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
#line 395 "/home/jens/Source/shotwell/src/Commands.vala"
if ((_tmp41_ % _tmp42_) == 0) {
#line 5030 "Commands.c"
- ProgressDialog* _tmp43_ = NULL;
- gint _tmp44_ = 0;
- gint _tmp45_ = 0;
+ ProgressDialog* _tmp43_;
+ gint _tmp44_;
+ gint _tmp45_;
#line 396 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp43_ = progress;
#line 396 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5047,8 +5047,8 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
#line 400 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp47_ != NULL) {
#line 5050 "Commands.c"
- GCancellable* _tmp48_ = NULL;
- gboolean _tmp49_ = FALSE;
+ GCancellable* _tmp48_;
+ gboolean _tmp49_;
#line 400 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp48_ = cancellable;
#line 400 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5083,7 +5083,7 @@ static void multiple_data_source_command_execute_all (MultipleDataSourceCommand*
#line 405 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp50_ != NULL) {
#line 5086 "Commands.c"
- ProgressDialog* _tmp51_ = NULL;
+ ProgressDialog* _tmp51_;
#line 406 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp51_ = progress;
#line 406 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5114,13 +5114,13 @@ static void multiple_data_source_command_class_init (MultipleDataSourceCommandCl
#line 275 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (MultipleDataSourceCommandPrivate));
#line 275 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) multiple_data_source_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) multiple_data_source_command_real_execute;
#line 275 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) multiple_data_source_command_real_execute_on_source;
+ ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) multiple_data_source_command_real_execute_on_source;
#line 275 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) multiple_data_source_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) multiple_data_source_command_real_undo;
#line 275 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) multiple_data_source_command_real_undo_on_source;
+ ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) multiple_data_source_command_real_undo_on_source;
#line 275 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = multiple_data_source_command_finalize;
#line 5127 "Commands.c"
@@ -5128,9 +5128,9 @@ static void multiple_data_source_command_class_init (MultipleDataSourceCommandCl
static void multiple_data_source_command_instance_init (MultipleDataSourceCommand * self) {
- GeeArrayList* _tmp0_ = NULL;
- GeeArrayList* _tmp1_ = NULL;
- GeeHashSet* _tmp2_ = NULL;
+ GeeArrayList* _tmp0_;
+ GeeArrayList* _tmp1_;
+ GeeHashSet* _tmp2_;
#line 275 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = MULTIPLE_DATA_SOURCE_COMMAND_GET_PRIVATE (self);
#line 278 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5149,15 +5149,15 @@ static void multiple_data_source_command_instance_init (MultipleDataSourceComman
}
-static void multiple_data_source_command_finalize (GObject* obj) {
+static void multiple_data_source_command_finalize (GObject * obj) {
MultipleDataSourceCommand * self;
#line 275 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand);
#line 5157 "Commands.c"
{
GeeIterator* _current_collection_it = NULL;
- GeeHashSet* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeHashSet* _tmp0_;
+ GeeIterator* _tmp1_;
#line 308 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->hooked_collections;
#line 308 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5167,13 +5167,13 @@ static void multiple_data_source_command_finalize (GObject* obj) {
#line 308 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
#line 5170 "Commands.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
SourceCollection* current_collection = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- SourceCollection* _tmp6_ = NULL;
- guint _tmp7_ = 0U;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ SourceCollection* _tmp6_;
+ guint _tmp7_;
#line 308 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _current_collection_it;
#line 308 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5241,10 +5241,10 @@ static void _multiple_data_source_at_once_command_on_sources_destroyed_source_co
MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct (GType object_type, GeeCollection* sources, const gchar* name, const gchar* explanation) {
MultipleDataSourceAtOnceCommand * self = NULL;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- GeeHashSet* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
+ GeeHashSet* _tmp2_;
+ GeeCollection* _tmp3_;
#line 417 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (sources), NULL);
#line 417 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5266,8 +5266,8 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
#line 5267 "Commands.c"
{
GeeIterator* _source_it = NULL;
- GeeHashSet* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ GeeHashSet* _tmp4_;
+ GeeIterator* _tmp5_;
#line 423 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = self->priv->sources;
#line 423 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5277,16 +5277,16 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
#line 423 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
#line 5280 "Commands.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
DataSource* source = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
SourceCollection* membership = NULL;
- DataSource* _tmp10_ = NULL;
- DataCollection* _tmp11_ = NULL;
- SourceCollection* _tmp12_ = NULL;
- SourceCollection* _tmp13_ = NULL;
+ DataSource* _tmp10_;
+ DataCollection* _tmp11_;
+ SourceCollection* _tmp12_;
+ SourceCollection* _tmp13_;
#line 423 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = _source_it;
#line 423 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5322,8 +5322,8 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
#line 425 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp13_ != NULL) {
#line 5325 "Commands.c"
- GeeHashSet* _tmp14_ = NULL;
- SourceCollection* _tmp15_ = NULL;
+ GeeHashSet* _tmp14_;
+ SourceCollection* _tmp15_;
#line 426 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp14_ = self->priv->hooked_collections;
#line 426 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5344,8 +5344,8 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
}
{
GeeIterator* _source_collection_it = NULL;
- GeeHashSet* _tmp16_ = NULL;
- GeeIterator* _tmp17_ = NULL;
+ GeeHashSet* _tmp16_;
+ GeeIterator* _tmp17_;
#line 429 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp16_ = self->priv->hooked_collections;
#line 429 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5355,12 +5355,12 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
#line 429 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
#line 5358 "Commands.c"
- GeeIterator* _tmp18_ = NULL;
- gboolean _tmp19_ = FALSE;
+ GeeIterator* _tmp18_;
+ gboolean _tmp19_;
SourceCollection* source_collection = NULL;
- GeeIterator* _tmp20_ = NULL;
- gpointer _tmp21_ = NULL;
- SourceCollection* _tmp22_ = NULL;
+ GeeIterator* _tmp20_;
+ gpointer _tmp21_;
+ SourceCollection* _tmp22_;
#line 429 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp18_ = _source_collection_it;
#line 429 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5397,13 +5397,13 @@ MultipleDataSourceAtOnceCommand* multiple_data_source_at_once_command_construct
static void multiple_data_source_at_once_command_real_execute (Command* base) {
MultipleDataSourceAtOnceCommand * self;
- AppWindow* _tmp0_ = NULL;
- AppWindow* _tmp1_ = NULL;
- MediaCollectionRegistry* _tmp2_ = NULL;
- MediaCollectionRegistry* _tmp3_ = NULL;
- GeeHashSet* _tmp4_ = NULL;
- MediaCollectionRegistry* _tmp5_ = NULL;
- MediaCollectionRegistry* _tmp6_ = NULL;
+ AppWindow* _tmp0_;
+ AppWindow* _tmp1_;
+ MediaCollectionRegistry* _tmp2_;
+ MediaCollectionRegistry* _tmp3_;
+ GeeHashSet* _tmp4_;
+ MediaCollectionRegistry* _tmp5_;
+ MediaCollectionRegistry* _tmp6_;
GError * _inner_error_ = NULL;
#line 438 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND, MultipleDataSourceAtOnceCommand);
@@ -5446,11 +5446,11 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
#line 448 "/home/jens/Source/shotwell/src/Commands.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 5449 "Commands.c"
- goto __catch455_database_error;
+ goto __catch456_database_error;
}
{
- AppWindow* _tmp7_ = NULL;
- AppWindow* _tmp8_ = NULL;
+ AppWindow* _tmp7_;
+ AppWindow* _tmp8_;
#line 452 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = app_window_get_instance ();
#line 452 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5470,11 +5470,11 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
#line 5471 "Commands.c"
}
}
- goto __finally455;
- __catch455_database_error:
+ goto __finally456;
+ __catch456_database_error:
{
GError* err = NULL;
- GError* _tmp9_ = NULL;
+ GError* _tmp9_;
#line 447 "/home/jens/Source/shotwell/src/Commands.vala"
err = _inner_error_;
#line 447 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5487,10 +5487,10 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
_g_error_free0 (err);
#line 5489 "Commands.c"
}
- __finally455:
+ __finally456:
{
- AppWindow* _tmp10_ = NULL;
- AppWindow* _tmp11_ = NULL;
+ AppWindow* _tmp10_;
+ AppWindow* _tmp11_;
#line 452 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp10_ = app_window_get_instance ();
#line 452 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5534,13 +5534,13 @@ void multiple_data_source_at_once_command_execute_on_all (MultipleDataSourceAtOn
static void multiple_data_source_at_once_command_real_undo (Command* base) {
MultipleDataSourceAtOnceCommand * self;
- AppWindow* _tmp0_ = NULL;
- AppWindow* _tmp1_ = NULL;
- MediaCollectionRegistry* _tmp2_ = NULL;
- MediaCollectionRegistry* _tmp3_ = NULL;
- GeeHashSet* _tmp4_ = NULL;
- MediaCollectionRegistry* _tmp5_ = NULL;
- MediaCollectionRegistry* _tmp6_ = NULL;
+ AppWindow* _tmp0_;
+ AppWindow* _tmp1_;
+ MediaCollectionRegistry* _tmp2_;
+ MediaCollectionRegistry* _tmp3_;
+ GeeHashSet* _tmp4_;
+ MediaCollectionRegistry* _tmp5_;
+ MediaCollectionRegistry* _tmp6_;
GError * _inner_error_ = NULL;
#line 458 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND, MultipleDataSourceAtOnceCommand);
@@ -5583,11 +5583,11 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
#line 468 "/home/jens/Source/shotwell/src/Commands.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
#line 5586 "Commands.c"
- goto __catch456_database_error;
+ goto __catch457_database_error;
}
{
- AppWindow* _tmp7_ = NULL;
- AppWindow* _tmp8_ = NULL;
+ AppWindow* _tmp7_;
+ AppWindow* _tmp8_;
#line 472 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = app_window_get_instance ();
#line 472 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5607,11 +5607,11 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
#line 5608 "Commands.c"
}
}
- goto __finally456;
- __catch456_database_error:
+ goto __finally457;
+ __catch457_database_error:
{
GError* err = NULL;
- GError* _tmp9_ = NULL;
+ GError* _tmp9_;
#line 467 "/home/jens/Source/shotwell/src/Commands.vala"
err = _inner_error_;
#line 467 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5624,10 +5624,10 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
_g_error_free0 (err);
#line 5626 "Commands.c"
}
- __finally456:
+ __finally457:
{
- AppWindow* _tmp10_ = NULL;
- AppWindow* _tmp11_ = NULL;
+ AppWindow* _tmp10_;
+ AppWindow* _tmp11_;
#line 472 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp10_ = app_window_get_instance ();
#line 472 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5677,8 +5677,8 @@ static void multiple_data_source_at_once_command_on_sources_destroyed (MultipleD
#line 5678 "Commands.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeIterator* _tmp1_;
#line 479 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = destroyed;
#line 479 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5688,14 +5688,14 @@ static void multiple_data_source_at_once_command_on_sources_destroyed (MultipleD
#line 479 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
#line 5691 "Commands.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataSource* source = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- GeeHashSet* _tmp6_ = NULL;
- DataSource* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ GeeHashSet* _tmp6_;
+ DataSource* _tmp7_;
+ gboolean _tmp8_;
#line 479 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _source_it;
#line 479 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5721,8 +5721,8 @@ static void multiple_data_source_at_once_command_on_sources_destroyed (MultipleD
#line 480 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp8_) {
#line 5724 "Commands.c"
- CommandManager* _tmp9_ = NULL;
- CommandManager* _tmp10_ = NULL;
+ CommandManager* _tmp9_;
+ CommandManager* _tmp10_;
#line 481 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp9_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command));
#line 481 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5754,13 +5754,13 @@ static void multiple_data_source_at_once_command_class_init (MultipleDataSourceA
#line 413 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (MultipleDataSourceAtOnceCommandPrivate));
#line 413 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) multiple_data_source_at_once_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) multiple_data_source_at_once_command_real_execute;
#line 413 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) multiple_data_source_at_once_command_real_execute_on_all;
+ ((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) multiple_data_source_at_once_command_real_execute_on_all;
#line 413 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) multiple_data_source_at_once_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) multiple_data_source_at_once_command_real_undo;
#line 413 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) multiple_data_source_at_once_command_real_undo_on_all;
+ ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) multiple_data_source_at_once_command_real_undo_on_all;
#line 413 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = multiple_data_source_at_once_command_finalize;
#line 5767 "Commands.c"
@@ -5768,8 +5768,8 @@ static void multiple_data_source_at_once_command_class_init (MultipleDataSourceA
static void multiple_data_source_at_once_command_instance_init (MultipleDataSourceAtOnceCommand * self) {
- GeeHashSet* _tmp0_ = NULL;
- GeeHashSet* _tmp1_ = NULL;
+ GeeHashSet* _tmp0_;
+ GeeHashSet* _tmp1_;
#line 413 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND_GET_PRIVATE (self);
#line 414 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5784,15 +5784,15 @@ static void multiple_data_source_at_once_command_instance_init (MultipleDataSour
}
-static void multiple_data_source_at_once_command_finalize (GObject* obj) {
+static void multiple_data_source_at_once_command_finalize (GObject * obj) {
MultipleDataSourceAtOnceCommand * self;
#line 413 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND, MultipleDataSourceAtOnceCommand);
#line 5792 "Commands.c"
{
GeeIterator* _source_collection_it = NULL;
- GeeHashSet* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeHashSet* _tmp0_;
+ GeeIterator* _tmp1_;
#line 434 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->hooked_collections;
#line 434 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5802,13 +5802,13 @@ static void multiple_data_source_at_once_command_finalize (GObject* obj) {
#line 434 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
#line 5805 "Commands.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
SourceCollection* source_collection = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- SourceCollection* _tmp6_ = NULL;
- guint _tmp7_ = 0U;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ SourceCollection* _tmp6_;
+ guint _tmp7_;
#line 434 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _source_collection_it;
#line 434 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5870,11 +5870,11 @@ static void _multiple_photo_transformation_command_on_state_broken_photo_transfo
MultiplePhotoTransformationCommand* multiple_photo_transformation_command_construct (GType object_type, GeeIterable* iter, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation) {
MultiplePhotoTransformationCommand * self = NULL;
- GeeIterable* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
+ GeeIterable* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
#line 493 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
#line 493 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -5900,12 +5900,12 @@ MultiplePhotoTransformationCommand* multiple_photo_transformation_command_constr
#line 5901 "Commands.c"
{
GeeArrayList* _source_list = NULL;
- GeeArrayList* _tmp5_ = NULL;
- GeeArrayList* _tmp6_ = NULL;
+ GeeArrayList* _tmp5_;
+ GeeArrayList* _tmp6_;
gint _source_size = 0;
- GeeArrayList* _tmp7_ = NULL;
- gint _tmp8_ = 0;
- gint _tmp9_ = 0;
+ GeeArrayList* _tmp7_;
+ gint _tmp8_;
+ gint _tmp9_;
gint _source_index = 0;
#line 497 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand)->source_list;
@@ -5926,23 +5926,23 @@ MultiplePhotoTransformationCommand* multiple_photo_transformation_command_constr
#line 497 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
#line 5929 "Commands.c"
- gint _tmp10_ = 0;
- gint _tmp11_ = 0;
- gint _tmp12_ = 0;
+ gint _tmp10_;
+ gint _tmp11_;
+ gint _tmp12_;
DataSource* source = NULL;
- GeeArrayList* _tmp13_ = NULL;
- gint _tmp14_ = 0;
- gpointer _tmp15_ = NULL;
+ GeeArrayList* _tmp13_;
+ gint _tmp14_;
+ gpointer _tmp15_;
Photo* photo = NULL;
- DataSource* _tmp16_ = NULL;
- Photo* _tmp17_ = NULL;
+ DataSource* _tmp16_;
+ Photo* _tmp17_;
PhotoTransformationState* state = NULL;
- Photo* _tmp18_ = NULL;
- PhotoTransformationState* _tmp19_ = NULL;
- PhotoTransformationState* _tmp20_ = NULL;
- GeeHashMap* _tmp21_ = NULL;
- Photo* _tmp22_ = NULL;
- PhotoTransformationState* _tmp23_ = NULL;
+ Photo* _tmp18_;
+ PhotoTransformationState* _tmp19_;
+ PhotoTransformationState* _tmp20_;
+ GeeHashMap* _tmp21_;
+ Photo* _tmp22_;
+ PhotoTransformationState* _tmp23_;
#line 497 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp10_ = _source_index;
#line 497 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6010,11 +6010,11 @@ MultiplePhotoTransformationCommand* multiple_photo_transformation_command_constr
static void multiple_photo_transformation_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) {
MultiplePhotoTransformationCommand * self;
Photo* photo = NULL;
- DataSource* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ Photo* _tmp1_;
PhotoTransformationState* state = NULL;
- GeeHashMap* _tmp2_ = NULL;
- gpointer _tmp3_ = NULL;
+ GeeHashMap* _tmp2_;
+ gpointer _tmp3_;
#line 511 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MULTIPLE_PHOTO_TRANSFORMATION_COMMAND, MultiplePhotoTransformationCommand);
#line 511 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6044,8 +6044,8 @@ static void multiple_photo_transformation_command_real_undo_on_source (MultipleD
static void multiple_photo_transformation_command_on_state_broken (MultiplePhotoTransformationCommand* self) {
- CommandManager* _tmp0_ = NULL;
- CommandManager* _tmp1_ = NULL;
+ CommandManager* _tmp0_;
+ CommandManager* _tmp1_;
#line 520 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_MULTIPLE_PHOTO_TRANSFORMATION_COMMAND (self));
#line 521 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6066,7 +6066,7 @@ static void multiple_photo_transformation_command_class_init (MultiplePhotoTrans
#line 489 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (MultiplePhotoTransformationCommandPrivate));
#line 489 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) multiple_photo_transformation_command_real_undo_on_source;
+ ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) multiple_photo_transformation_command_real_undo_on_source;
#line 489 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = multiple_photo_transformation_command_finalize;
#line 6073 "Commands.c"
@@ -6074,7 +6074,7 @@ static void multiple_photo_transformation_command_class_init (MultiplePhotoTrans
static void multiple_photo_transformation_command_instance_init (MultiplePhotoTransformationCommand * self) {
- GeeHashMap* _tmp0_ = NULL;
+ GeeHashMap* _tmp0_;
#line 489 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = MULTIPLE_PHOTO_TRANSFORMATION_COMMAND_GET_PRIVATE (self);
#line 490 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6085,19 +6085,19 @@ static void multiple_photo_transformation_command_instance_init (MultiplePhotoTr
}
-static void multiple_photo_transformation_command_finalize (GObject* obj) {
+static void multiple_photo_transformation_command_finalize (GObject * obj) {
MultiplePhotoTransformationCommand * self;
#line 489 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTIPLE_PHOTO_TRANSFORMATION_COMMAND, MultiplePhotoTransformationCommand);
#line 6093 "Commands.c"
{
GeeIterator* _state_it = NULL;
- GeeHashMap* _tmp0_ = NULL;
- GeeCollection* _tmp1_ = NULL;
- GeeCollection* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ GeeHashMap* _tmp0_;
+ GeeCollection* _tmp1_;
+ GeeCollection* _tmp2_;
+ GeeCollection* _tmp3_;
+ GeeIterator* _tmp4_;
+ GeeIterator* _tmp5_;
#line 507 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->map;
#line 507 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6117,13 +6117,13 @@ static void multiple_photo_transformation_command_finalize (GObject* obj) {
#line 507 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
#line 6120 "Commands.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
PhotoTransformationState* state = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
- PhotoTransformationState* _tmp10_ = NULL;
- guint _tmp11_ = 0U;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
+ PhotoTransformationState* _tmp10_;
+ guint _tmp11_;
#line 507 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = _state_it;
#line 507 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6176,10 +6176,10 @@ GType multiple_photo_transformation_command_get_type (void) {
RotateSingleCommand* rotate_single_command_construct (GType object_type, Photo* photo, Rotation rotation, const gchar* name, const gchar* explanation) {
RotateSingleCommand * self = NULL;
- Photo* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- Rotation _tmp3_ = 0;
+ Photo* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ Rotation _tmp3_;
#line 528 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_PHOTO (photo), NULL);
#line 528 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6213,8 +6213,8 @@ RotateSingleCommand* rotate_single_command_new (Photo* photo, Rotation rotation,
static void rotate_single_command_real_execute (Command* base) {
RotateSingleCommand * self;
- DataSource* _tmp0_ = NULL;
- Rotation _tmp1_ = 0;
+ DataSource* _tmp0_;
+ Rotation _tmp1_;
#line 534 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ROTATE_SINGLE_COMMAND, RotateSingleCommand);
#line 535 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6229,9 +6229,9 @@ static void rotate_single_command_real_execute (Command* base) {
static void rotate_single_command_real_undo (Command* base) {
RotateSingleCommand * self;
- DataSource* _tmp0_ = NULL;
- Rotation _tmp1_ = 0;
- Rotation _tmp2_ = 0;
+ DataSource* _tmp0_;
+ Rotation _tmp1_;
+ Rotation _tmp2_;
#line 538 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ROTATE_SINGLE_COMMAND, RotateSingleCommand);
#line 539 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6252,9 +6252,9 @@ static void rotate_single_command_class_init (RotateSingleCommandClass * klass)
#line 525 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (RotateSingleCommandPrivate));
#line 525 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) rotate_single_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) rotate_single_command_real_execute;
#line 525 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) rotate_single_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) rotate_single_command_real_undo;
#line 525 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = rotate_single_command_finalize;
#line 6261 "Commands.c"
@@ -6268,7 +6268,7 @@ static void rotate_single_command_instance_init (RotateSingleCommand * self) {
}
-static void rotate_single_command_finalize (GObject* obj) {
+static void rotate_single_command_finalize (GObject * obj) {
RotateSingleCommand * self;
#line 525 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ROTATE_SINGLE_COMMAND, RotateSingleCommand);
@@ -6292,12 +6292,12 @@ GType rotate_single_command_get_type (void) {
RotateMultipleCommand* rotate_multiple_command_construct (GType object_type, GeeIterable* iter, Rotation rotation, const gchar* name, const gchar* explanation, const gchar* progress_text, const gchar* undo_progress_text) {
RotateMultipleCommand * self = NULL;
- GeeIterable* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- Rotation _tmp5_ = 0;
+ GeeIterable* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
+ Rotation _tmp5_;
#line 546 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
#line 546 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6339,8 +6339,8 @@ RotateMultipleCommand* rotate_multiple_command_new (GeeIterable* iter, Rotation
static void rotate_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) {
RotateMultipleCommand * self;
- DataSource* _tmp0_ = NULL;
- Rotation _tmp1_ = 0;
+ DataSource* _tmp0_;
+ Rotation _tmp1_;
#line 553 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ROTATE_MULTIPLE_COMMAND, RotateMultipleCommand);
#line 553 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6357,9 +6357,9 @@ static void rotate_multiple_command_real_execute_on_source (MultipleDataSourceCo
static void rotate_multiple_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) {
RotateMultipleCommand * self;
- DataSource* _tmp0_ = NULL;
- Rotation _tmp1_ = 0;
- Rotation _tmp2_ = 0;
+ DataSource* _tmp0_;
+ Rotation _tmp1_;
+ Rotation _tmp2_;
#line 557 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ROTATE_MULTIPLE_COMMAND, RotateMultipleCommand);
#line 557 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6382,9 +6382,9 @@ static void rotate_multiple_command_class_init (RotateMultipleCommandClass * kla
#line 543 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (RotateMultipleCommandPrivate));
#line 543 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) rotate_multiple_command_real_execute_on_source;
+ ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) rotate_multiple_command_real_execute_on_source;
#line 543 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) rotate_multiple_command_real_undo_on_source;
+ ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) rotate_multiple_command_real_undo_on_source;
#line 543 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = rotate_multiple_command_finalize;
#line 6391 "Commands.c"
@@ -6398,7 +6398,7 @@ static void rotate_multiple_command_instance_init (RotateMultipleCommand * self)
}
-static void rotate_multiple_command_finalize (GObject* obj) {
+static void rotate_multiple_command_finalize (GObject * obj) {
RotateMultipleCommand * self;
#line 543 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ROTATE_MULTIPLE_COMMAND, RotateMultipleCommand);
@@ -6423,62 +6423,59 @@ GType rotate_multiple_command_get_type (void) {
EditTitleCommand* edit_title_command_construct (GType object_type, MediaSource* source, const gchar* new_title) {
EditTitleCommand * self = NULL;
gchar* title = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- MediaSource* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- MediaSource* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
+ gchar* _tmp0_;
+ MediaSource* _tmp1_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
+ MediaSource* _tmp4_;
+ gchar* _tmp5_;
#line 566 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
#line 566 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (new_title != NULL, NULL);
#line 567 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp0_ = g_dpgettext2 (NULL, "Button Label", RESOURCES_EDIT_TITLE_LABEL);
-#line 567 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp1_ = g_strdup (_tmp0_);
+ _tmp0_ = g_strdup (g_dpgettext2 (NULL, "Button Label", RESOURCES_EDIT_TITLE_LABEL));
#line 567 "/home/jens/Source/shotwell/src/Commands.vala"
- title = _tmp1_;
+ title = _tmp0_;
#line 569 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp2_ = source;
+ _tmp1_ = source;
#line 569 "/home/jens/Source/shotwell/src/Commands.vala"
- self = (EditTitleCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource), title, "");
+ self = (EditTitleCommand*) single_data_source_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource), title, "");
#line 571 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp3_ = new_title;
+ _tmp2_ = new_title;
#line 571 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp4_ = g_strdup (_tmp3_);
+ _tmp3_ = g_strdup (_tmp2_);
#line 571 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (self->priv->new_title);
#line 571 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->new_title = _tmp4_;
+ self->priv->new_title = _tmp3_;
#line 572 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp5_ = source;
+ _tmp4_ = source;
#line 572 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp6_ = media_source_get_title (_tmp5_);
+ _tmp5_ = media_source_get_title (_tmp4_);
#line 572 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (self->priv->old_title);
#line 572 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->old_title = _tmp6_;
+ self->priv->old_title = _tmp5_;
#line 566 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (title);
#line 566 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 6468 "Commands.c"
+#line 6465 "Commands.c"
}
EditTitleCommand* edit_title_command_new (MediaSource* source, const gchar* new_title) {
#line 566 "/home/jens/Source/shotwell/src/Commands.vala"
return edit_title_command_construct (TYPE_EDIT_TITLE_COMMAND, source, new_title);
-#line 6475 "Commands.c"
+#line 6472 "Commands.c"
}
static void edit_title_command_real_execute (Command* base) {
EditTitleCommand * self;
- DataSource* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ const gchar* _tmp1_;
#line 575 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_TITLE_COMMAND, EditTitleCommand);
#line 576 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6487,14 +6484,14 @@ static void edit_title_command_real_execute (Command* base) {
_tmp1_ = self->priv->new_title;
#line 576 "/home/jens/Source/shotwell/src/Commands.vala"
media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 6491 "Commands.c"
+#line 6488 "Commands.c"
}
static void edit_title_command_real_undo (Command* base) {
EditTitleCommand * self;
- DataSource* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ const gchar* _tmp1_;
#line 579 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_TITLE_COMMAND, EditTitleCommand);
#line 580 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6503,7 +6500,7 @@ static void edit_title_command_real_undo (Command* base) {
_tmp1_ = self->priv->old_title;
#line 580 "/home/jens/Source/shotwell/src/Commands.vala"
media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 6507 "Commands.c"
+#line 6504 "Commands.c"
}
@@ -6513,23 +6510,23 @@ static void edit_title_command_class_init (EditTitleCommandClass * klass) {
#line 562 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (EditTitleCommandPrivate));
#line 562 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) edit_title_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) edit_title_command_real_execute;
#line 562 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) edit_title_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) edit_title_command_real_undo;
#line 562 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = edit_title_command_finalize;
-#line 6522 "Commands.c"
+#line 6519 "Commands.c"
}
static void edit_title_command_instance_init (EditTitleCommand * self) {
#line 562 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = EDIT_TITLE_COMMAND_GET_PRIVATE (self);
-#line 6529 "Commands.c"
+#line 6526 "Commands.c"
}
-static void edit_title_command_finalize (GObject* obj) {
+static void edit_title_command_finalize (GObject * obj) {
EditTitleCommand * self;
#line 562 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDIT_TITLE_COMMAND, EditTitleCommand);
@@ -6539,7 +6536,7 @@ static void edit_title_command_finalize (GObject* obj) {
_g_free0 (self->priv->old_title);
#line 562 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (edit_title_command_parent_class)->finalize (obj);
-#line 6543 "Commands.c"
+#line 6540 "Commands.c"
}
@@ -6557,11 +6554,11 @@ GType edit_title_command_get_type (void) {
EditCommentCommand* edit_comment_command_construct (GType object_type, MediaSource* source, const gchar* new_comment) {
EditCommentCommand * self = NULL;
- MediaSource* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- MediaSource* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ MediaSource* _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ MediaSource* _tmp3_;
+ gchar* _tmp4_;
#line 588 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
#line 588 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6588,21 +6585,21 @@ EditCommentCommand* edit_comment_command_construct (GType object_type, MediaSour
self->priv->old_comment = _tmp4_;
#line 588 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 6592 "Commands.c"
+#line 6589 "Commands.c"
}
EditCommentCommand* edit_comment_command_new (MediaSource* source, const gchar* new_comment) {
#line 588 "/home/jens/Source/shotwell/src/Commands.vala"
return edit_comment_command_construct (TYPE_EDIT_COMMENT_COMMAND, source, new_comment);
-#line 6599 "Commands.c"
+#line 6596 "Commands.c"
}
static void edit_comment_command_real_execute (Command* base) {
EditCommentCommand * self;
- DataSource* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ const gchar* _tmp1_;
#line 595 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_COMMENT_COMMAND, EditCommentCommand);
#line 596 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6611,14 +6608,14 @@ static void edit_comment_command_real_execute (Command* base) {
_tmp1_ = self->priv->new_comment;
#line 596 "/home/jens/Source/shotwell/src/Commands.vala"
media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 6615 "Commands.c"
+#line 6612 "Commands.c"
}
static void edit_comment_command_real_undo (Command* base) {
EditCommentCommand * self;
- DataSource* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ const gchar* _tmp1_;
#line 599 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_COMMENT_COMMAND, EditCommentCommand);
#line 600 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6627,7 +6624,7 @@ static void edit_comment_command_real_undo (Command* base) {
_tmp1_ = self->priv->old_comment;
#line 600 "/home/jens/Source/shotwell/src/Commands.vala"
media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 6631 "Commands.c"
+#line 6628 "Commands.c"
}
@@ -6637,23 +6634,23 @@ static void edit_comment_command_class_init (EditCommentCommandClass * klass) {
#line 584 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (EditCommentCommandPrivate));
#line 584 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) edit_comment_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) edit_comment_command_real_execute;
#line 584 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) edit_comment_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) edit_comment_command_real_undo;
#line 584 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = edit_comment_command_finalize;
-#line 6646 "Commands.c"
+#line 6643 "Commands.c"
}
static void edit_comment_command_instance_init (EditCommentCommand * self) {
#line 584 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = EDIT_COMMENT_COMMAND_GET_PRIVATE (self);
-#line 6653 "Commands.c"
+#line 6650 "Commands.c"
}
-static void edit_comment_command_finalize (GObject* obj) {
+static void edit_comment_command_finalize (GObject * obj) {
EditCommentCommand * self;
#line 584 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDIT_COMMENT_COMMAND, EditCommentCommand);
@@ -6663,7 +6660,7 @@ static void edit_comment_command_finalize (GObject* obj) {
_g_free0 (self->priv->old_comment);
#line 584 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (edit_comment_command_parent_class)->finalize (obj);
-#line 6667 "Commands.c"
+#line 6664 "Commands.c"
}
@@ -6682,110 +6679,107 @@ GType edit_comment_command_get_type (void) {
EditMultipleTitlesCommand* edit_multiple_titles_command_construct (GType object_type, GeeCollection* media_sources, const gchar* new_title) {
EditMultipleTitlesCommand * self = NULL;
gchar* title = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- GeeCollection* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+ gchar* _tmp0_;
+ GeeCollection* _tmp1_;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
#line 608 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (media_sources), NULL);
#line 608 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (new_title != NULL, NULL);
#line 609 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp0_ = g_dpgettext2 (NULL, "Button Label", RESOURCES_EDIT_TITLE_LABEL);
+ _tmp0_ = g_strdup (g_dpgettext2 (NULL, "Button Label", RESOURCES_EDIT_TITLE_LABEL));
#line 609 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp1_ = g_strdup (_tmp0_);
-#line 609 "/home/jens/Source/shotwell/src/Commands.vala"
- title = _tmp1_;
+ title = _tmp0_;
#line 611 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp2_ = media_sources;
+ _tmp1_ = media_sources;
#line 611 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp3_ = title;
+ _tmp2_ = title;
#line 611 "/home/jens/Source/shotwell/src/Commands.vala"
- self = (EditMultipleTitlesCommand*) multiple_data_source_at_once_command_construct (object_type, _tmp2_, _tmp3_, "");
+ self = (EditMultipleTitlesCommand*) multiple_data_source_at_once_command_construct (object_type, _tmp1_, _tmp2_, "");
#line 613 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp4_ = new_title;
+ _tmp3_ = new_title;
#line 613 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp5_ = g_strdup (_tmp4_);
+ _tmp4_ = g_strdup (_tmp3_);
#line 613 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (self->new_title);
#line 613 "/home/jens/Source/shotwell/src/Commands.vala"
- self->new_title = _tmp5_;
-#line 6716 "Commands.c"
+ self->new_title = _tmp4_;
+#line 6710 "Commands.c"
{
GeeIterator* _media_it = NULL;
- GeeCollection* _tmp6_ = NULL;
- GeeIterator* _tmp7_ = NULL;
+ GeeCollection* _tmp5_;
+ GeeIterator* _tmp6_;
#line 614 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp6_ = media_sources;
+ _tmp5_ = media_sources;
#line 614 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
#line 614 "/home/jens/Source/shotwell/src/Commands.vala"
- _media_it = _tmp7_;
+ _media_it = _tmp6_;
#line 614 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 6729 "Commands.c"
- GeeIterator* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+#line 6723 "Commands.c"
+ GeeIterator* _tmp7_;
+ gboolean _tmp8_;
MediaSource* media = NULL;
- GeeIterator* _tmp10_ = NULL;
- gpointer _tmp11_ = NULL;
- GeeHashMap* _tmp12_ = NULL;
- MediaSource* _tmp13_ = NULL;
- MediaSource* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
+ GeeIterator* _tmp9_;
+ gpointer _tmp10_;
+ GeeHashMap* _tmp11_;
+ MediaSource* _tmp12_;
+ MediaSource* _tmp13_;
+ gchar* _tmp14_;
+ gchar* _tmp15_;
#line 614 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp8_ = _media_it;
+ _tmp7_ = _media_it;
#line 614 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp9_ = gee_iterator_next (_tmp8_);
+ _tmp8_ = gee_iterator_next (_tmp7_);
#line 614 "/home/jens/Source/shotwell/src/Commands.vala"
- if (!_tmp9_) {
+ if (!_tmp8_) {
#line 614 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 6748 "Commands.c"
+#line 6742 "Commands.c"
}
#line 614 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp10_ = _media_it;
+ _tmp9_ = _media_it;
#line 614 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp11_ = gee_iterator_get (_tmp10_);
+ _tmp10_ = gee_iterator_get (_tmp9_);
#line 614 "/home/jens/Source/shotwell/src/Commands.vala"
- media = (MediaSource*) _tmp11_;
+ media = (MediaSource*) _tmp10_;
#line 615 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp12_ = self->old_titles;
+ _tmp11_ = self->old_titles;
#line 615 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp13_ = media;
+ _tmp12_ = media;
#line 615 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp14_ = media;
+ _tmp13_ = media;
#line 615 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp15_ = media_source_get_title (_tmp14_);
+ _tmp14_ = media_source_get_title (_tmp13_);
#line 615 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp16_ = _tmp15_;
+ _tmp15_ = _tmp14_;
#line 615 "/home/jens/Source/shotwell/src/Commands.vala"
- gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_, _tmp16_);
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_, _tmp15_);
#line 615 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_free0 (_tmp16_);
+ _g_free0 (_tmp15_);
#line 614 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (media);
-#line 6772 "Commands.c"
+#line 6766 "Commands.c"
}
#line 614 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_media_it);
-#line 6776 "Commands.c"
+#line 6770 "Commands.c"
}
#line 608 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (title);
#line 608 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 6782 "Commands.c"
+#line 6776 "Commands.c"
}
EditMultipleTitlesCommand* edit_multiple_titles_command_new (GeeCollection* media_sources, const gchar* new_title) {
#line 608 "/home/jens/Source/shotwell/src/Commands.vala"
return edit_multiple_titles_command_construct (TYPE_EDIT_MULTIPLE_TITLES_COMMAND, media_sources, new_title);
-#line 6789 "Commands.c"
+#line 6783 "Commands.c"
}
@@ -6795,11 +6789,11 @@ static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSource
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_TITLES_COMMAND, EditMultipleTitlesCommand);
#line 618 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 6799 "Commands.c"
+#line 6793 "Commands.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeIterator* _tmp1_;
#line 619 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = sources;
#line 619 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6808,14 +6802,14 @@ static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSource
_source_it = _tmp1_;
#line 619 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 6812 "Commands.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 6806 "Commands.c"
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataSource* source = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- DataSource* _tmp6_ = NULL;
- const gchar* _tmp7_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ DataSource* _tmp6_;
+ const gchar* _tmp7_;
#line 619 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _source_it;
#line 619 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6824,7 +6818,7 @@ static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSource
if (!_tmp3_) {
#line 619 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 6828 "Commands.c"
+#line 6822 "Commands.c"
}
#line 619 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = _source_it;
@@ -6840,11 +6834,11 @@ static void edit_multiple_titles_command_real_execute_on_all (MultipleDataSource
media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_);
#line 619 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (source);
-#line 6844 "Commands.c"
+#line 6838 "Commands.c"
}
#line 619 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_source_it);
-#line 6848 "Commands.c"
+#line 6842 "Commands.c"
}
}
@@ -6855,11 +6849,11 @@ static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtO
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_TITLES_COMMAND, EditMultipleTitlesCommand);
#line 623 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 6859 "Commands.c"
+#line 6853 "Commands.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeIterator* _tmp1_;
#line 624 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = sources;
#line 624 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6868,17 +6862,17 @@ static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtO
_source_it = _tmp1_;
#line 624 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 6872 "Commands.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 6866 "Commands.c"
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataSource* source = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- DataSource* _tmp6_ = NULL;
- GeeHashMap* _tmp7_ = NULL;
- DataSource* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ DataSource* _tmp6_;
+ GeeHashMap* _tmp7_;
+ DataSource* _tmp8_;
+ gpointer _tmp9_;
+ gchar* _tmp10_;
#line 624 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _source_it;
#line 624 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6887,7 +6881,7 @@ static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtO
if (!_tmp3_) {
#line 624 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 6891 "Commands.c"
+#line 6885 "Commands.c"
}
#line 624 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = _source_it;
@@ -6911,11 +6905,11 @@ static void edit_multiple_titles_command_real_undo_on_all (MultipleDataSourceAtO
_g_free0 (_tmp10_);
#line 624 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (source);
-#line 6915 "Commands.c"
+#line 6909 "Commands.c"
}
#line 624 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_source_it);
-#line 6919 "Commands.c"
+#line 6913 "Commands.c"
}
}
@@ -6924,26 +6918,26 @@ static void edit_multiple_titles_command_class_init (EditMultipleTitlesCommandCl
#line 604 "/home/jens/Source/shotwell/src/Commands.vala"
edit_multiple_titles_command_parent_class = g_type_class_peek_parent (klass);
#line 604 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) edit_multiple_titles_command_real_execute_on_all;
+ ((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) edit_multiple_titles_command_real_execute_on_all;
#line 604 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) edit_multiple_titles_command_real_undo_on_all;
+ ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) edit_multiple_titles_command_real_undo_on_all;
#line 604 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = edit_multiple_titles_command_finalize;
-#line 6933 "Commands.c"
+#line 6927 "Commands.c"
}
static void edit_multiple_titles_command_instance_init (EditMultipleTitlesCommand * self) {
- GeeHashMap* _tmp0_ = NULL;
+ GeeHashMap* _tmp0_;
#line 606 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 606 "/home/jens/Source/shotwell/src/Commands.vala"
self->old_titles = _tmp0_;
-#line 6943 "Commands.c"
+#line 6937 "Commands.c"
}
-static void edit_multiple_titles_command_finalize (GObject* obj) {
+static void edit_multiple_titles_command_finalize (GObject * obj) {
EditMultipleTitlesCommand * self;
#line 604 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDIT_MULTIPLE_TITLES_COMMAND, EditMultipleTitlesCommand);
@@ -6953,7 +6947,7 @@ static void edit_multiple_titles_command_finalize (GObject* obj) {
_g_object_unref0 (self->old_titles);
#line 604 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (edit_multiple_titles_command_parent_class)->finalize (obj);
-#line 6957 "Commands.c"
+#line 6951 "Commands.c"
}
@@ -6971,9 +6965,9 @@ GType edit_multiple_titles_command_get_type (void) {
EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType object_type, GeeCollection* media_sources, const gchar* new_comment) {
EditMultipleCommentsCommand * self = NULL;
- GeeCollection* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
+ GeeCollection* _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
#line 633 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (media_sources), NULL);
#line 633 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -6990,11 +6984,11 @@ EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType obj
_g_free0 (self->new_comment);
#line 636 "/home/jens/Source/shotwell/src/Commands.vala"
self->new_comment = _tmp2_;
-#line 6994 "Commands.c"
+#line 6988 "Commands.c"
{
GeeIterator* _media_it = NULL;
- GeeCollection* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
+ GeeCollection* _tmp3_;
+ GeeIterator* _tmp4_;
#line 637 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = media_sources;
#line 637 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7003,17 +6997,17 @@ EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType obj
_media_it = _tmp4_;
#line 637 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 7007 "Commands.c"
- GeeIterator* _tmp5_ = NULL;
- gboolean _tmp6_ = FALSE;
+#line 7001 "Commands.c"
+ GeeIterator* _tmp5_;
+ gboolean _tmp6_;
MediaSource* media = NULL;
- GeeIterator* _tmp7_ = NULL;
- gpointer _tmp8_ = NULL;
- GeeHashMap* _tmp9_ = NULL;
- MediaSource* _tmp10_ = NULL;
- MediaSource* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
+ GeeIterator* _tmp7_;
+ gpointer _tmp8_;
+ GeeHashMap* _tmp9_;
+ MediaSource* _tmp10_;
+ MediaSource* _tmp11_;
+ gchar* _tmp12_;
+ gchar* _tmp13_;
#line 637 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = _media_it;
#line 637 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7022,7 +7016,7 @@ EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType obj
if (!_tmp6_) {
#line 637 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 7026 "Commands.c"
+#line 7020 "Commands.c"
}
#line 637 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = _media_it;
@@ -7046,22 +7040,22 @@ EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType obj
_g_free0 (_tmp13_);
#line 637 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (media);
-#line 7050 "Commands.c"
+#line 7044 "Commands.c"
}
#line 637 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_media_it);
-#line 7054 "Commands.c"
+#line 7048 "Commands.c"
}
#line 633 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 7058 "Commands.c"
+#line 7052 "Commands.c"
}
EditMultipleCommentsCommand* edit_multiple_comments_command_new (GeeCollection* media_sources, const gchar* new_comment) {
#line 633 "/home/jens/Source/shotwell/src/Commands.vala"
return edit_multiple_comments_command_construct (TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND, media_sources, new_comment);
-#line 7065 "Commands.c"
+#line 7059 "Commands.c"
}
@@ -7071,11 +7065,11 @@ static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSour
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND, EditMultipleCommentsCommand);
#line 641 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 7075 "Commands.c"
+#line 7069 "Commands.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeIterator* _tmp1_;
#line 642 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = sources;
#line 642 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7084,14 +7078,14 @@ static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSour
_source_it = _tmp1_;
#line 642 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 7088 "Commands.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 7082 "Commands.c"
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataSource* source = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- DataSource* _tmp6_ = NULL;
- const gchar* _tmp7_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ DataSource* _tmp6_;
+ const gchar* _tmp7_;
#line 642 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _source_it;
#line 642 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7100,7 +7094,7 @@ static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSour
if (!_tmp3_) {
#line 642 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 7104 "Commands.c"
+#line 7098 "Commands.c"
}
#line 642 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = _source_it;
@@ -7116,11 +7110,11 @@ static void edit_multiple_comments_command_real_execute_on_all (MultipleDataSour
media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_);
#line 642 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (source);
-#line 7120 "Commands.c"
+#line 7114 "Commands.c"
}
#line 642 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_source_it);
-#line 7124 "Commands.c"
+#line 7118 "Commands.c"
}
}
@@ -7131,11 +7125,11 @@ static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceA
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND, EditMultipleCommentsCommand);
#line 646 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 7135 "Commands.c"
+#line 7129 "Commands.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeIterator* _tmp1_;
#line 647 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = sources;
#line 647 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7144,17 +7138,17 @@ static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceA
_source_it = _tmp1_;
#line 647 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 7148 "Commands.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 7142 "Commands.c"
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataSource* source = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- DataSource* _tmp6_ = NULL;
- GeeHashMap* _tmp7_ = NULL;
- DataSource* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
- gchar* _tmp10_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ DataSource* _tmp6_;
+ GeeHashMap* _tmp7_;
+ DataSource* _tmp8_;
+ gpointer _tmp9_;
+ gchar* _tmp10_;
#line 647 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _source_it;
#line 647 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7163,7 +7157,7 @@ static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceA
if (!_tmp3_) {
#line 647 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 7167 "Commands.c"
+#line 7161 "Commands.c"
}
#line 647 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = _source_it;
@@ -7187,11 +7181,11 @@ static void edit_multiple_comments_command_real_undo_on_all (MultipleDataSourceA
_g_free0 (_tmp10_);
#line 647 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (source);
-#line 7191 "Commands.c"
+#line 7185 "Commands.c"
}
#line 647 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_source_it);
-#line 7195 "Commands.c"
+#line 7189 "Commands.c"
}
}
@@ -7200,26 +7194,26 @@ static void edit_multiple_comments_command_class_init (EditMultipleCommentsComma
#line 629 "/home/jens/Source/shotwell/src/Commands.vala"
edit_multiple_comments_command_parent_class = g_type_class_peek_parent (klass);
#line 629 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) edit_multiple_comments_command_real_execute_on_all;
+ ((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) edit_multiple_comments_command_real_execute_on_all;
#line 629 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) edit_multiple_comments_command_real_undo_on_all;
+ ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) edit_multiple_comments_command_real_undo_on_all;
#line 629 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = edit_multiple_comments_command_finalize;
-#line 7209 "Commands.c"
+#line 7203 "Commands.c"
}
static void edit_multiple_comments_command_instance_init (EditMultipleCommentsCommand * self) {
- GeeHashMap* _tmp0_ = NULL;
+ GeeHashMap* _tmp0_;
#line 631 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 631 "/home/jens/Source/shotwell/src/Commands.vala"
self->old_comments = _tmp0_;
-#line 7219 "Commands.c"
+#line 7213 "Commands.c"
}
-static void edit_multiple_comments_command_finalize (GObject* obj) {
+static void edit_multiple_comments_command_finalize (GObject * obj) {
EditMultipleCommentsCommand * self;
#line 629 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDIT_MULTIPLE_COMMENTS_COMMAND, EditMultipleCommentsCommand);
@@ -7229,7 +7223,7 @@ static void edit_multiple_comments_command_finalize (GObject* obj) {
_g_object_unref0 (self->old_comments);
#line 629 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (edit_multiple_comments_command_parent_class)->finalize (obj);
-#line 7233 "Commands.c"
+#line 7227 "Commands.c"
}
@@ -7247,11 +7241,11 @@ GType edit_multiple_comments_command_get_type (void) {
RenameEventCommand* rename_event_command_construct (GType object_type, Event* event, const gchar* new_name) {
RenameEventCommand * self = NULL;
- Event* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- Event* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ Event* _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ Event* _tmp3_;
+ gchar* _tmp4_;
#line 656 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_EVENT (event), NULL);
#line 656 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7278,21 +7272,21 @@ RenameEventCommand* rename_event_command_construct (GType object_type, Event* ev
self->priv->old_name = _tmp4_;
#line 656 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 7282 "Commands.c"
+#line 7276 "Commands.c"
}
RenameEventCommand* rename_event_command_new (Event* event, const gchar* new_name) {
#line 656 "/home/jens/Source/shotwell/src/Commands.vala"
return rename_event_command_construct (TYPE_RENAME_EVENT_COMMAND, event, new_name);
-#line 7289 "Commands.c"
+#line 7283 "Commands.c"
}
static void rename_event_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source) {
RenameEventCommand * self;
- DataSource* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ const gchar* _tmp1_;
#line 663 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RENAME_EVENT_COMMAND, RenameEventCommand);
#line 663 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7303,14 +7297,14 @@ static void rename_event_command_real_execute_on_source (SimpleProxyableCommand*
_tmp1_ = self->priv->new_name;
#line 664 "/home/jens/Source/shotwell/src/Commands.vala"
event_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_);
-#line 7307 "Commands.c"
+#line 7301 "Commands.c"
}
static void rename_event_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source) {
RenameEventCommand * self;
- DataSource* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ const gchar* _tmp1_;
#line 667 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RENAME_EVENT_COMMAND, RenameEventCommand);
#line 667 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7321,7 +7315,7 @@ static void rename_event_command_real_undo_on_source (SimpleProxyableCommand* ba
_tmp1_ = self->priv->old_name;
#line 668 "/home/jens/Source/shotwell/src/Commands.vala"
event_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_);
-#line 7325 "Commands.c"
+#line 7319 "Commands.c"
}
@@ -7331,23 +7325,23 @@ static void rename_event_command_class_init (RenameEventCommandClass * klass) {
#line 652 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (RenameEventCommandPrivate));
#line 652 "/home/jens/Source/shotwell/src/Commands.vala"
- ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) rename_event_command_real_execute_on_source;
+ ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) rename_event_command_real_execute_on_source;
#line 652 "/home/jens/Source/shotwell/src/Commands.vala"
- ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) rename_event_command_real_undo_on_source;
+ ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) rename_event_command_real_undo_on_source;
#line 652 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = rename_event_command_finalize;
-#line 7340 "Commands.c"
+#line 7334 "Commands.c"
}
static void rename_event_command_instance_init (RenameEventCommand * self) {
#line 652 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = RENAME_EVENT_COMMAND_GET_PRIVATE (self);
-#line 7347 "Commands.c"
+#line 7341 "Commands.c"
}
-static void rename_event_command_finalize (GObject* obj) {
+static void rename_event_command_finalize (GObject * obj) {
RenameEventCommand * self;
#line 652 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RENAME_EVENT_COMMAND, RenameEventCommand);
@@ -7357,7 +7351,7 @@ static void rename_event_command_finalize (GObject* obj) {
_g_free0 (self->priv->old_name);
#line 652 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (rename_event_command_parent_class)->finalize (obj);
-#line 7361 "Commands.c"
+#line 7355 "Commands.c"
}
@@ -7375,11 +7369,11 @@ GType rename_event_command_get_type (void) {
EditEventCommentCommand* edit_event_comment_command_construct (GType object_type, Event* event, const gchar* new_comment) {
EditEventCommentCommand * self = NULL;
- Event* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- Event* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ Event* _tmp0_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
+ Event* _tmp3_;
+ gchar* _tmp4_;
#line 676 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_EVENT (event), NULL);
#line 676 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7406,21 +7400,21 @@ EditEventCommentCommand* edit_event_comment_command_construct (GType object_type
self->priv->old_comment = _tmp4_;
#line 676 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 7410 "Commands.c"
+#line 7404 "Commands.c"
}
EditEventCommentCommand* edit_event_comment_command_new (Event* event, const gchar* new_comment) {
#line 676 "/home/jens/Source/shotwell/src/Commands.vala"
return edit_event_comment_command_construct (TYPE_EDIT_EVENT_COMMENT_COMMAND, event, new_comment);
-#line 7417 "Commands.c"
+#line 7411 "Commands.c"
}
static void edit_event_comment_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source) {
EditEventCommentCommand * self;
- DataSource* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ const gchar* _tmp1_;
#line 683 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_EVENT_COMMENT_COMMAND, EditEventCommentCommand);
#line 683 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7431,14 +7425,14 @@ static void edit_event_comment_command_real_execute_on_source (SimpleProxyableCo
_tmp1_ = self->priv->new_comment;
#line 684 "/home/jens/Source/shotwell/src/Commands.vala"
event_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), TYPE_EVENT_SOURCE, EventSource), _tmp1_);
-#line 7435 "Commands.c"
+#line 7429 "Commands.c"
}
static void edit_event_comment_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source) {
EditEventCommentCommand * self;
- DataSource* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ const gchar* _tmp1_;
#line 687 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_EVENT_COMMENT_COMMAND, EditEventCommentCommand);
#line 687 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7449,7 +7443,7 @@ static void edit_event_comment_command_real_undo_on_source (SimpleProxyableComma
_tmp1_ = self->priv->old_comment;
#line 688 "/home/jens/Source/shotwell/src/Commands.vala"
event_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), TYPE_EVENT_SOURCE, EventSource), _tmp1_);
-#line 7453 "Commands.c"
+#line 7447 "Commands.c"
}
@@ -7459,23 +7453,23 @@ static void edit_event_comment_command_class_init (EditEventCommentCommandClass
#line 672 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (EditEventCommentCommandPrivate));
#line 672 "/home/jens/Source/shotwell/src/Commands.vala"
- ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) edit_event_comment_command_real_execute_on_source;
+ ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) edit_event_comment_command_real_execute_on_source;
#line 672 "/home/jens/Source/shotwell/src/Commands.vala"
- ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) edit_event_comment_command_real_undo_on_source;
+ ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) edit_event_comment_command_real_undo_on_source;
#line 672 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = edit_event_comment_command_finalize;
-#line 7468 "Commands.c"
+#line 7462 "Commands.c"
}
static void edit_event_comment_command_instance_init (EditEventCommentCommand * self) {
#line 672 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = EDIT_EVENT_COMMENT_COMMAND_GET_PRIVATE (self);
-#line 7475 "Commands.c"
+#line 7469 "Commands.c"
}
-static void edit_event_comment_command_finalize (GObject* obj) {
+static void edit_event_comment_command_finalize (GObject * obj) {
EditEventCommentCommand * self;
#line 672 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDIT_EVENT_COMMENT_COMMAND, EditEventCommentCommand);
@@ -7485,7 +7479,7 @@ static void edit_event_comment_command_finalize (GObject* obj) {
_g_free0 (self->priv->old_comment);
#line 672 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (edit_event_comment_command_parent_class)->finalize (obj);
-#line 7489 "Commands.c"
+#line 7483 "Commands.c"
}
@@ -7503,11 +7497,11 @@ GType edit_event_comment_command_get_type (void) {
SetKeyPhotoCommand* set_key_photo_command_construct (GType object_type, Event* event, MediaSource* new_primary_source) {
SetKeyPhotoCommand * self = NULL;
- Event* _tmp0_ = NULL;
- MediaSource* _tmp1_ = NULL;
- MediaSource* _tmp2_ = NULL;
- Event* _tmp3_ = NULL;
- MediaSource* _tmp4_ = NULL;
+ Event* _tmp0_;
+ MediaSource* _tmp1_;
+ MediaSource* _tmp2_;
+ Event* _tmp3_;
+ MediaSource* _tmp4_;
#line 696 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_EVENT (event), NULL);
#line 696 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7534,21 +7528,21 @@ SetKeyPhotoCommand* set_key_photo_command_construct (GType object_type, Event* e
self->priv->old_primary_source = _tmp4_;
#line 696 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 7538 "Commands.c"
+#line 7532 "Commands.c"
}
SetKeyPhotoCommand* set_key_photo_command_new (Event* event, MediaSource* new_primary_source) {
#line 696 "/home/jens/Source/shotwell/src/Commands.vala"
return set_key_photo_command_construct (TYPE_SET_KEY_PHOTO_COMMAND, event, new_primary_source);
-#line 7545 "Commands.c"
+#line 7539 "Commands.c"
}
static void set_key_photo_command_real_execute (Command* base) {
SetKeyPhotoCommand * self;
- DataSource* _tmp0_ = NULL;
- MediaSource* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ MediaSource* _tmp1_;
#line 703 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_KEY_PHOTO_COMMAND, SetKeyPhotoCommand);
#line 704 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7557,14 +7551,14 @@ static void set_key_photo_command_real_execute (Command* base) {
_tmp1_ = self->priv->new_primary_source;
#line 704 "/home/jens/Source/shotwell/src/Commands.vala"
event_set_primary_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_);
-#line 7561 "Commands.c"
+#line 7555 "Commands.c"
}
static void set_key_photo_command_real_undo (Command* base) {
SetKeyPhotoCommand * self;
- DataSource* _tmp0_ = NULL;
- MediaSource* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ MediaSource* _tmp1_;
#line 707 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_KEY_PHOTO_COMMAND, SetKeyPhotoCommand);
#line 708 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7573,7 +7567,7 @@ static void set_key_photo_command_real_undo (Command* base) {
_tmp1_ = self->priv->old_primary_source;
#line 708 "/home/jens/Source/shotwell/src/Commands.vala"
event_set_primary_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT, Event), _tmp1_);
-#line 7577 "Commands.c"
+#line 7571 "Commands.c"
}
@@ -7583,23 +7577,23 @@ static void set_key_photo_command_class_init (SetKeyPhotoCommandClass * klass) {
#line 692 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (SetKeyPhotoCommandPrivate));
#line 692 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) set_key_photo_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) set_key_photo_command_real_execute;
#line 692 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) set_key_photo_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) set_key_photo_command_real_undo;
#line 692 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = set_key_photo_command_finalize;
-#line 7592 "Commands.c"
+#line 7586 "Commands.c"
}
static void set_key_photo_command_instance_init (SetKeyPhotoCommand * self) {
#line 692 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = SET_KEY_PHOTO_COMMAND_GET_PRIVATE (self);
-#line 7599 "Commands.c"
+#line 7593 "Commands.c"
}
-static void set_key_photo_command_finalize (GObject* obj) {
+static void set_key_photo_command_finalize (GObject * obj) {
SetKeyPhotoCommand * self;
#line 692 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_KEY_PHOTO_COMMAND, SetKeyPhotoCommand);
@@ -7609,7 +7603,7 @@ static void set_key_photo_command_finalize (GObject* obj) {
_g_object_unref0 (self->priv->old_primary_source);
#line 692 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (set_key_photo_command_parent_class)->finalize (obj);
-#line 7613 "Commands.c"
+#line 7607 "Commands.c"
}
@@ -7627,7 +7621,7 @@ GType set_key_photo_command_get_type (void) {
RevertSingleCommand* revert_single_command_construct (GType object_type, Photo* photo) {
RevertSingleCommand * self = NULL;
- Photo* _tmp0_ = NULL;
+ Photo* _tmp0_;
#line 713 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_PHOTO (photo), NULL);
#line 714 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7636,20 +7630,20 @@ RevertSingleCommand* revert_single_command_construct (GType object_type, Photo*
self = (RevertSingleCommand*) generic_photo_transformation_command_construct (object_type, _tmp0_, RESOURCES_REVERT_LABEL, "");
#line 713 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 7640 "Commands.c"
+#line 7634 "Commands.c"
}
RevertSingleCommand* revert_single_command_new (Photo* photo) {
#line 713 "/home/jens/Source/shotwell/src/Commands.vala"
return revert_single_command_construct (TYPE_REVERT_SINGLE_COMMAND, photo);
-#line 7647 "Commands.c"
+#line 7641 "Commands.c"
}
static void revert_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo) {
RevertSingleCommand * self;
- Photo* _tmp0_ = NULL;
+ Photo* _tmp0_;
#line 717 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_REVERT_SINGLE_COMMAND, RevertSingleCommand);
#line 717 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7658,7 +7652,7 @@ static void revert_single_command_real_execute_on_photo (GenericPhotoTransformat
_tmp0_ = photo;
#line 718 "/home/jens/Source/shotwell/src/Commands.vala"
photo_remove_all_transformations (_tmp0_);
-#line 7662 "Commands.c"
+#line 7656 "Commands.c"
}
@@ -7666,12 +7660,12 @@ static gboolean revert_single_command_real_compress (Command* base, Command* com
RevertSingleCommand * self;
gboolean result = FALSE;
RevertSingleCommand* revert_single_command = NULL;
- Command* _tmp0_ = NULL;
- RevertSingleCommand* _tmp1_ = NULL;
- RevertSingleCommand* _tmp2_ = NULL;
- RevertSingleCommand* _tmp3_ = NULL;
- DataSource* _tmp4_ = NULL;
- DataSource* _tmp5_ = NULL;
+ Command* _tmp0_;
+ RevertSingleCommand* _tmp1_;
+ RevertSingleCommand* _tmp2_;
+ RevertSingleCommand* _tmp3_;
+ DataSource* _tmp4_;
+ DataSource* _tmp5_;
#line 721 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_REVERT_SINGLE_COMMAND, RevertSingleCommand);
#line 721 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7692,7 +7686,7 @@ static gboolean revert_single_command_real_compress (Command* base, Command* com
_g_object_unref0 (revert_single_command);
#line 724 "/home/jens/Source/shotwell/src/Commands.vala"
return result;
-#line 7696 "Commands.c"
+#line 7690 "Commands.c"
}
#line 726 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = revert_single_command;
@@ -7708,7 +7702,7 @@ static gboolean revert_single_command_real_compress (Command* base, Command* com
_g_object_unref0 (revert_single_command);
#line 727 "/home/jens/Source/shotwell/src/Commands.vala"
return result;
-#line 7712 "Commands.c"
+#line 7706 "Commands.c"
}
#line 731 "/home/jens/Source/shotwell/src/Commands.vala"
result = TRUE;
@@ -7716,7 +7710,7 @@ static gboolean revert_single_command_real_compress (Command* base, Command* com
_g_object_unref0 (revert_single_command);
#line 731 "/home/jens/Source/shotwell/src/Commands.vala"
return result;
-#line 7720 "Commands.c"
+#line 7714 "Commands.c"
}
@@ -7724,10 +7718,10 @@ static void revert_single_command_class_init (RevertSingleCommandClass * klass)
#line 712 "/home/jens/Source/shotwell/src/Commands.vala"
revert_single_command_parent_class = g_type_class_peek_parent (klass);
#line 712 "/home/jens/Source/shotwell/src/Commands.vala"
- ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) revert_single_command_real_execute_on_photo;
+ ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) revert_single_command_real_execute_on_photo;
#line 712 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) revert_single_command_real_compress;
-#line 7731 "Commands.c"
+ ((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) revert_single_command_real_compress;
+#line 7725 "Commands.c"
}
@@ -7749,35 +7743,29 @@ GType revert_single_command_get_type (void) {
RevertMultipleCommand* revert_multiple_command_construct (GType object_type, GeeIterable* iter) {
RevertMultipleCommand * self = NULL;
- GeeIterable* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
+ GeeIterable* _tmp0_;
#line 736 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
#line 737 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = iter;
#line 737 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp1_ = _ ("Reverting");
-#line 737 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp2_ = _ ("Undoing Revert");
-#line 737 "/home/jens/Source/shotwell/src/Commands.vala"
- self = (RevertMultipleCommand*) multiple_photo_transformation_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, RESOURCES_REVERT_LABEL, "");
+ self = (RevertMultipleCommand*) multiple_photo_transformation_command_construct (object_type, _tmp0_, _ ("Reverting"), _ ("Undoing Revert"), RESOURCES_REVERT_LABEL, "");
#line 736 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 7768 "Commands.c"
+#line 7756 "Commands.c"
}
RevertMultipleCommand* revert_multiple_command_new (GeeIterable* iter) {
#line 736 "/home/jens/Source/shotwell/src/Commands.vala"
return revert_multiple_command_construct (TYPE_REVERT_MULTIPLE_COMMAND, iter);
-#line 7775 "Commands.c"
+#line 7763 "Commands.c"
}
static void revert_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) {
RevertMultipleCommand * self;
- DataSource* _tmp0_ = NULL;
+ DataSource* _tmp0_;
#line 741 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_REVERT_MULTIPLE_COMMAND, RevertMultipleCommand);
#line 741 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7786,7 +7774,7 @@ static void revert_multiple_command_real_execute_on_source (MultipleDataSourceCo
_tmp0_ = source;
#line 742 "/home/jens/Source/shotwell/src/Commands.vala"
photo_remove_all_transformations (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo));
-#line 7790 "Commands.c"
+#line 7778 "Commands.c"
}
@@ -7794,8 +7782,8 @@ static void revert_multiple_command_class_init (RevertMultipleCommandClass * kla
#line 735 "/home/jens/Source/shotwell/src/Commands.vala"
revert_multiple_command_parent_class = g_type_class_peek_parent (klass);
#line 735 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) revert_multiple_command_real_execute_on_source;
-#line 7799 "Commands.c"
+ ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) revert_multiple_command_real_execute_on_source;
+#line 7787 "Commands.c"
}
@@ -7817,7 +7805,7 @@ GType revert_multiple_command_get_type (void) {
EnhanceSingleCommand* enhance_single_command_construct (GType object_type, Photo* photo) {
EnhanceSingleCommand * self = NULL;
- Photo* _tmp0_ = NULL;
+ Photo* _tmp0_;
#line 747 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_PHOTO (photo), NULL);
#line 748 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7826,24 +7814,24 @@ EnhanceSingleCommand* enhance_single_command_construct (GType object_type, Photo
self = (EnhanceSingleCommand*) generic_photo_transformation_command_construct (object_type, _tmp0_, RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP);
#line 747 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 7830 "Commands.c"
+#line 7818 "Commands.c"
}
EnhanceSingleCommand* enhance_single_command_new (Photo* photo) {
#line 747 "/home/jens/Source/shotwell/src/Commands.vala"
return enhance_single_command_construct (TYPE_ENHANCE_SINGLE_COMMAND, photo);
-#line 7837 "Commands.c"
+#line 7825 "Commands.c"
}
static void enhance_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo) {
EnhanceSingleCommand * self;
- AppWindow* _tmp0_ = NULL;
- AppWindow* _tmp1_ = NULL;
- Photo* _tmp2_ = NULL;
- AppWindow* _tmp3_ = NULL;
- AppWindow* _tmp4_ = NULL;
+ AppWindow* _tmp0_;
+ AppWindow* _tmp1_;
+ Photo* _tmp2_;
+ AppWindow* _tmp3_;
+ AppWindow* _tmp4_;
#line 751 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ENHANCE_SINGLE_COMMAND, EnhanceSingleCommand);
#line 751 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7868,7 +7856,7 @@ static void enhance_single_command_real_execute_on_photo (GenericPhotoTransforma
page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE_WINDOW, PageWindow));
#line 763 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp4_);
-#line 7872 "Commands.c"
+#line 7860 "Commands.c"
}
@@ -7876,12 +7864,12 @@ static gboolean enhance_single_command_real_compress (Command* base, Command* co
EnhanceSingleCommand * self;
gboolean result = FALSE;
EnhanceSingleCommand* enhance_single_command = NULL;
- Command* _tmp0_ = NULL;
- EnhanceSingleCommand* _tmp1_ = NULL;
- EnhanceSingleCommand* _tmp2_ = NULL;
- EnhanceSingleCommand* _tmp3_ = NULL;
- DataSource* _tmp4_ = NULL;
- DataSource* _tmp5_ = NULL;
+ Command* _tmp0_;
+ EnhanceSingleCommand* _tmp1_;
+ EnhanceSingleCommand* _tmp2_;
+ EnhanceSingleCommand* _tmp3_;
+ DataSource* _tmp4_;
+ DataSource* _tmp5_;
#line 766 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ENHANCE_SINGLE_COMMAND, EnhanceSingleCommand);
#line 766 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7902,7 +7890,7 @@ static gboolean enhance_single_command_real_compress (Command* base, Command* co
_g_object_unref0 (enhance_single_command);
#line 769 "/home/jens/Source/shotwell/src/Commands.vala"
return result;
-#line 7906 "Commands.c"
+#line 7894 "Commands.c"
}
#line 771 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = enhance_single_command;
@@ -7918,7 +7906,7 @@ static gboolean enhance_single_command_real_compress (Command* base, Command* co
_g_object_unref0 (enhance_single_command);
#line 772 "/home/jens/Source/shotwell/src/Commands.vala"
return result;
-#line 7922 "Commands.c"
+#line 7910 "Commands.c"
}
#line 775 "/home/jens/Source/shotwell/src/Commands.vala"
result = TRUE;
@@ -7926,7 +7914,7 @@ static gboolean enhance_single_command_real_compress (Command* base, Command* co
_g_object_unref0 (enhance_single_command);
#line 775 "/home/jens/Source/shotwell/src/Commands.vala"
return result;
-#line 7930 "Commands.c"
+#line 7918 "Commands.c"
}
@@ -7934,10 +7922,10 @@ static void enhance_single_command_class_init (EnhanceSingleCommandClass * klass
#line 746 "/home/jens/Source/shotwell/src/Commands.vala"
enhance_single_command_parent_class = g_type_class_peek_parent (klass);
#line 746 "/home/jens/Source/shotwell/src/Commands.vala"
- ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) enhance_single_command_real_execute_on_photo;
+ ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) enhance_single_command_real_execute_on_photo;
#line 746 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->compress = (gboolean (*)(Command*, Command*)) enhance_single_command_real_compress;
-#line 7941 "Commands.c"
+ ((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) enhance_single_command_real_compress;
+#line 7929 "Commands.c"
}
@@ -7959,35 +7947,29 @@ GType enhance_single_command_get_type (void) {
EnhanceMultipleCommand* enhance_multiple_command_construct (GType object_type, GeeIterable* iter) {
EnhanceMultipleCommand * self = NULL;
- GeeIterable* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
+ GeeIterable* _tmp0_;
#line 780 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
#line 781 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = iter;
#line 781 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp1_ = _ ("Enhancing");
-#line 781 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp2_ = _ ("Undoing Enhance");
-#line 781 "/home/jens/Source/shotwell/src/Commands.vala"
- self = (EnhanceMultipleCommand*) multiple_photo_transformation_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP);
+ self = (EnhanceMultipleCommand*) multiple_photo_transformation_command_construct (object_type, _tmp0_, _ ("Enhancing"), _ ("Undoing Enhance"), RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP);
#line 780 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 7978 "Commands.c"
+#line 7960 "Commands.c"
}
EnhanceMultipleCommand* enhance_multiple_command_new (GeeIterable* iter) {
#line 780 "/home/jens/Source/shotwell/src/Commands.vala"
return enhance_multiple_command_construct (TYPE_ENHANCE_MULTIPLE_COMMAND, iter);
-#line 7985 "Commands.c"
+#line 7967 "Commands.c"
}
static void enhance_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) {
EnhanceMultipleCommand * self;
- DataSource* _tmp0_ = NULL;
+ DataSource* _tmp0_;
#line 785 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ENHANCE_MULTIPLE_COMMAND, EnhanceMultipleCommand);
#line 785 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -7996,7 +7978,7 @@ static void enhance_multiple_command_real_execute_on_source (MultipleDataSourceC
_tmp0_ = source;
#line 786 "/home/jens/Source/shotwell/src/Commands.vala"
photo_enhance (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo));
-#line 8000 "Commands.c"
+#line 7982 "Commands.c"
}
@@ -8004,8 +7986,8 @@ static void enhance_multiple_command_class_init (EnhanceMultipleCommandClass * k
#line 779 "/home/jens/Source/shotwell/src/Commands.vala"
enhance_multiple_command_parent_class = g_type_class_peek_parent (klass);
#line 779 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) enhance_multiple_command_real_execute_on_source;
-#line 8009 "Commands.c"
+ ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) enhance_multiple_command_real_execute_on_source;
+#line 7991 "Commands.c"
}
@@ -8027,11 +8009,11 @@ GType enhance_multiple_command_get_type (void) {
StraightenCommand* straighten_command_construct (GType object_type, Photo* photo, gdouble theta, Box* crop, const gchar* name, const gchar* explanation) {
StraightenCommand * self = NULL;
- Photo* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gdouble _tmp3_ = 0.0;
- Box _tmp4_ = {0};
+ Photo* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ gdouble _tmp3_;
+ Box _tmp4_;
#line 794 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_PHOTO (photo), NULL);
#line 794 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8058,28 +8040,28 @@ StraightenCommand* straighten_command_construct (GType object_type, Photo* photo
self->priv->crop = _tmp4_;
#line 794 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 8062 "Commands.c"
+#line 8044 "Commands.c"
}
StraightenCommand* straighten_command_new (Photo* photo, gdouble theta, Box* crop, const gchar* name, const gchar* explanation) {
#line 794 "/home/jens/Source/shotwell/src/Commands.vala"
return straighten_command_construct (TYPE_STRAIGHTEN_COMMAND, photo, theta, crop, name, explanation);
-#line 8069 "Commands.c"
+#line 8051 "Commands.c"
}
static void straighten_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo) {
StraightenCommand * self;
DataCollection* collection = NULL;
- Photo* _tmp0_ = NULL;
- DataCollection* _tmp1_ = NULL;
- DataCollection* _tmp2_ = NULL;
- Photo* _tmp4_ = NULL;
- gdouble _tmp5_ = 0.0;
- Photo* _tmp6_ = NULL;
- Box _tmp7_ = {0};
- DataCollection* _tmp8_ = NULL;
+ Photo* _tmp0_;
+ DataCollection* _tmp1_;
+ DataCollection* _tmp2_;
+ Photo* _tmp4_;
+ gdouble _tmp5_;
+ Photo* _tmp6_;
+ Box _tmp7_;
+ DataCollection* _tmp8_;
#line 801 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_STRAIGHTEN_COMMAND, StraightenCommand);
#line 801 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8094,13 +8076,13 @@ static void straighten_command_real_execute_on_photo (GenericPhotoTransformation
_tmp2_ = collection;
#line 804 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp2_ != NULL) {
-#line 8098 "Commands.c"
- DataCollection* _tmp3_ = NULL;
+#line 8080 "Commands.c"
+ DataCollection* _tmp3_;
#line 805 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = collection;
#line 805 "/home/jens/Source/shotwell/src/Commands.vala"
data_collection_freeze_notifications (_tmp3_);
-#line 8104 "Commands.c"
+#line 8086 "Commands.c"
}
#line 807 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = photo;
@@ -8118,17 +8100,17 @@ static void straighten_command_real_execute_on_photo (GenericPhotoTransformation
_tmp8_ = collection;
#line 810 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp8_ != NULL) {
-#line 8122 "Commands.c"
- DataCollection* _tmp9_ = NULL;
+#line 8104 "Commands.c"
+ DataCollection* _tmp9_;
#line 811 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp9_ = collection;
#line 811 "/home/jens/Source/shotwell/src/Commands.vala"
data_collection_thaw_notifications (_tmp9_);
-#line 8128 "Commands.c"
+#line 8110 "Commands.c"
}
#line 801 "/home/jens/Source/shotwell/src/Commands.vala"
_data_collection_unref0 (collection);
-#line 8132 "Commands.c"
+#line 8114 "Commands.c"
}
@@ -8138,27 +8120,27 @@ static void straighten_command_class_init (StraightenCommandClass * klass) {
#line 790 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (StraightenCommandPrivate));
#line 790 "/home/jens/Source/shotwell/src/Commands.vala"
- ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) straighten_command_real_execute_on_photo;
+ ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) straighten_command_real_execute_on_photo;
#line 790 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = straighten_command_finalize;
-#line 8145 "Commands.c"
+#line 8127 "Commands.c"
}
static void straighten_command_instance_init (StraightenCommand * self) {
#line 790 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = STRAIGHTEN_COMMAND_GET_PRIVATE (self);
-#line 8152 "Commands.c"
+#line 8134 "Commands.c"
}
-static void straighten_command_finalize (GObject* obj) {
+static void straighten_command_finalize (GObject * obj) {
StraightenCommand * self;
#line 790 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_STRAIGHTEN_COMMAND, StraightenCommand);
#line 790 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (straighten_command_parent_class)->finalize (obj);
-#line 8162 "Commands.c"
+#line 8144 "Commands.c"
}
@@ -8176,10 +8158,10 @@ GType straighten_command_get_type (void) {
CropCommand* crop_command_construct (GType object_type, Photo* photo, Box* crop, const gchar* name, const gchar* explanation) {
CropCommand * self = NULL;
- Photo* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- Box _tmp3_ = {0};
+ Photo* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ Box _tmp3_;
#line 818 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_PHOTO (photo), NULL);
#line 818 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8202,21 +8184,21 @@ CropCommand* crop_command_construct (GType object_type, Photo* photo, Box* crop,
self->priv->crop = _tmp3_;
#line 818 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 8206 "Commands.c"
+#line 8188 "Commands.c"
}
CropCommand* crop_command_new (Photo* photo, Box* crop, const gchar* name, const gchar* explanation) {
#line 818 "/home/jens/Source/shotwell/src/Commands.vala"
return crop_command_construct (TYPE_CROP_COMMAND, photo, crop, name, explanation);
-#line 8213 "Commands.c"
+#line 8195 "Commands.c"
}
static void crop_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo) {
CropCommand * self;
- Photo* _tmp0_ = NULL;
- Box _tmp1_ = {0};
+ Photo* _tmp0_;
+ Box _tmp1_;
#line 824 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CROP_COMMAND, CropCommand);
#line 824 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8227,7 +8209,7 @@ static void crop_command_real_execute_on_photo (GenericPhotoTransformationComman
_tmp1_ = self->priv->crop;
#line 825 "/home/jens/Source/shotwell/src/Commands.vala"
photo_set_crop (_tmp0_, &_tmp1_);
-#line 8231 "Commands.c"
+#line 8213 "Commands.c"
}
@@ -8237,27 +8219,27 @@ static void crop_command_class_init (CropCommandClass * klass) {
#line 815 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (CropCommandPrivate));
#line 815 "/home/jens/Source/shotwell/src/Commands.vala"
- ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) crop_command_real_execute_on_photo;
+ ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) crop_command_real_execute_on_photo;
#line 815 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = crop_command_finalize;
-#line 8244 "Commands.c"
+#line 8226 "Commands.c"
}
static void crop_command_instance_init (CropCommand * self) {
#line 815 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = CROP_COMMAND_GET_PRIVATE (self);
-#line 8251 "Commands.c"
+#line 8233 "Commands.c"
}
-static void crop_command_finalize (GObject* obj) {
+static void crop_command_finalize (GObject * obj) {
CropCommand * self;
#line 815 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CROP_COMMAND, CropCommand);
#line 815 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (crop_command_parent_class)->finalize (obj);
-#line 8261 "Commands.c"
+#line 8243 "Commands.c"
}
@@ -8276,17 +8258,17 @@ GType crop_command_get_type (void) {
static gpointer _pixel_transformation_bundle_ref0 (gpointer self) {
#line 836 "/home/jens/Source/shotwell/src/Commands.vala"
return self ? pixel_transformation_bundle_ref (self) : NULL;
-#line 8280 "Commands.c"
+#line 8262 "Commands.c"
}
AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_type, Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation) {
AdjustColorsSingleCommand * self = NULL;
- Photo* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- PixelTransformationBundle* _tmp3_ = NULL;
- PixelTransformationBundle* _tmp4_ = NULL;
+ Photo* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ PixelTransformationBundle* _tmp3_;
+ PixelTransformationBundle* _tmp4_;
#line 832 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_PHOTO (photo), NULL);
#line 832 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8313,25 +8295,25 @@ AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_
self->priv->transformations = _tmp4_;
#line 832 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 8317 "Commands.c"
+#line 8299 "Commands.c"
}
AdjustColorsSingleCommand* adjust_colors_single_command_new (Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation) {
#line 832 "/home/jens/Source/shotwell/src/Commands.vala"
return adjust_colors_single_command_construct (TYPE_ADJUST_COLORS_SINGLE_COMMAND, photo, transformations, name, explanation);
-#line 8324 "Commands.c"
+#line 8306 "Commands.c"
}
static void adjust_colors_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo) {
AdjustColorsSingleCommand * self;
- AppWindow* _tmp0_ = NULL;
- AppWindow* _tmp1_ = NULL;
- Photo* _tmp2_ = NULL;
- PixelTransformationBundle* _tmp3_ = NULL;
- AppWindow* _tmp4_ = NULL;
- AppWindow* _tmp5_ = NULL;
+ AppWindow* _tmp0_;
+ AppWindow* _tmp1_;
+ Photo* _tmp2_;
+ PixelTransformationBundle* _tmp3_;
+ AppWindow* _tmp4_;
+ AppWindow* _tmp5_;
#line 839 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_COLORS_SINGLE_COMMAND, AdjustColorsSingleCommand);
#line 839 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8358,14 +8340,14 @@ static void adjust_colors_single_command_real_execute_on_photo (GenericPhotoTran
page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE_WINDOW, PageWindow));
#line 844 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp5_);
-#line 8362 "Commands.c"
+#line 8344 "Commands.c"
}
static gboolean adjust_colors_single_command_real_can_compress (GenericPhotoTransformationCommand* base, Command* command) {
AdjustColorsSingleCommand * self;
gboolean result = FALSE;
- Command* _tmp0_ = NULL;
+ Command* _tmp0_;
#line 847 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_COLORS_SINGLE_COMMAND, AdjustColorsSingleCommand);
#line 847 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8376,7 +8358,7 @@ static gboolean adjust_colors_single_command_real_can_compress (GenericPhotoTran
result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_ADJUST_COLORS_SINGLE_COMMAND);
#line 848 "/home/jens/Source/shotwell/src/Commands.vala"
return result;
-#line 8380 "Commands.c"
+#line 8362 "Commands.c"
}
@@ -8386,23 +8368,23 @@ static void adjust_colors_single_command_class_init (AdjustColorsSingleCommandCl
#line 829 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (AdjustColorsSingleCommandPrivate));
#line 829 "/home/jens/Source/shotwell/src/Commands.vala"
- ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) adjust_colors_single_command_real_execute_on_photo;
+ ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) adjust_colors_single_command_real_execute_on_photo;
#line 829 "/home/jens/Source/shotwell/src/Commands.vala"
- ((GenericPhotoTransformationCommandClass *) klass)->can_compress = (gboolean (*)(GenericPhotoTransformationCommand*, Command*)) adjust_colors_single_command_real_can_compress;
+ ((GenericPhotoTransformationCommandClass *) klass)->can_compress = (gboolean (*) (GenericPhotoTransformationCommand *, Command*)) adjust_colors_single_command_real_can_compress;
#line 829 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = adjust_colors_single_command_finalize;
-#line 8395 "Commands.c"
+#line 8377 "Commands.c"
}
static void adjust_colors_single_command_instance_init (AdjustColorsSingleCommand * self) {
#line 829 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = ADJUST_COLORS_SINGLE_COMMAND_GET_PRIVATE (self);
-#line 8402 "Commands.c"
+#line 8384 "Commands.c"
}
-static void adjust_colors_single_command_finalize (GObject* obj) {
+static void adjust_colors_single_command_finalize (GObject * obj) {
AdjustColorsSingleCommand * self;
#line 829 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_COLORS_SINGLE_COMMAND, AdjustColorsSingleCommand);
@@ -8410,7 +8392,7 @@ static void adjust_colors_single_command_finalize (GObject* obj) {
_pixel_transformation_bundle_unref0 (self->priv->transformations);
#line 829 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (adjust_colors_single_command_parent_class)->finalize (obj);
-#line 8414 "Commands.c"
+#line 8396 "Commands.c"
}
@@ -8428,13 +8410,11 @@ GType adjust_colors_single_command_get_type (void) {
AdjustColorsMultipleCommand* adjust_colors_multiple_command_construct (GType object_type, GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation) {
AdjustColorsMultipleCommand * self = NULL;
- GeeIterable* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- PixelTransformationBundle* _tmp5_ = NULL;
- PixelTransformationBundle* _tmp6_ = NULL;
+ GeeIterable* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ PixelTransformationBundle* _tmp3_;
+ PixelTransformationBundle* _tmp4_;
#line 855 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
#line 855 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8446,40 +8426,36 @@ AdjustColorsMultipleCommand* adjust_colors_multiple_command_construct (GType obj
#line 857 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = iter;
#line 857 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp1_ = _ ("Applying Color Transformations");
-#line 857 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp2_ = _ ("Undoing Color Transformations");
-#line 857 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp3_ = name;
+ _tmp1_ = name;
#line 857 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp4_ = explanation;
+ _tmp2_ = explanation;
#line 857 "/home/jens/Source/shotwell/src/Commands.vala"
- self = (AdjustColorsMultipleCommand*) multiple_photo_transformation_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
+ self = (AdjustColorsMultipleCommand*) multiple_photo_transformation_command_construct (object_type, _tmp0_, _ ("Applying Color Transformations"), _ ("Undoing Color Transformations"), _tmp1_, _tmp2_);
#line 860 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp5_ = transformations;
+ _tmp3_ = transformations;
#line 860 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp6_ = _pixel_transformation_bundle_ref0 (_tmp5_);
+ _tmp4_ = _pixel_transformation_bundle_ref0 (_tmp3_);
#line 860 "/home/jens/Source/shotwell/src/Commands.vala"
_pixel_transformation_bundle_unref0 (self->priv->transformations);
#line 860 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->transformations = _tmp6_;
+ self->priv->transformations = _tmp4_;
#line 855 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 8469 "Commands.c"
+#line 8445 "Commands.c"
}
AdjustColorsMultipleCommand* adjust_colors_multiple_command_new (GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation) {
#line 855 "/home/jens/Source/shotwell/src/Commands.vala"
return adjust_colors_multiple_command_construct (TYPE_ADJUST_COLORS_MULTIPLE_COMMAND, iter, transformations, name, explanation);
-#line 8476 "Commands.c"
+#line 8452 "Commands.c"
}
static void adjust_colors_multiple_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) {
AdjustColorsMultipleCommand * self;
- DataSource* _tmp0_ = NULL;
- PixelTransformationBundle* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ PixelTransformationBundle* _tmp1_;
#line 863 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_COLORS_MULTIPLE_COMMAND, AdjustColorsMultipleCommand);
#line 863 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8490,7 +8466,7 @@ static void adjust_colors_multiple_command_real_execute_on_source (MultipleDataS
_tmp1_ = self->priv->transformations;
#line 864 "/home/jens/Source/shotwell/src/Commands.vala"
photo_set_color_adjustments (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo), _tmp1_);
-#line 8494 "Commands.c"
+#line 8470 "Commands.c"
}
@@ -8500,21 +8476,21 @@ static void adjust_colors_multiple_command_class_init (AdjustColorsMultipleComma
#line 852 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (AdjustColorsMultipleCommandPrivate));
#line 852 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) adjust_colors_multiple_command_real_execute_on_source;
+ ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) adjust_colors_multiple_command_real_execute_on_source;
#line 852 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = adjust_colors_multiple_command_finalize;
-#line 8507 "Commands.c"
+#line 8483 "Commands.c"
}
static void adjust_colors_multiple_command_instance_init (AdjustColorsMultipleCommand * self) {
#line 852 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = ADJUST_COLORS_MULTIPLE_COMMAND_GET_PRIVATE (self);
-#line 8514 "Commands.c"
+#line 8490 "Commands.c"
}
-static void adjust_colors_multiple_command_finalize (GObject* obj) {
+static void adjust_colors_multiple_command_finalize (GObject * obj) {
AdjustColorsMultipleCommand * self;
#line 852 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_COLORS_MULTIPLE_COMMAND, AdjustColorsMultipleCommand);
@@ -8522,7 +8498,7 @@ static void adjust_colors_multiple_command_finalize (GObject* obj) {
_pixel_transformation_bundle_unref0 (self->priv->transformations);
#line 852 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (adjust_colors_multiple_command_parent_class)->finalize (obj);
-#line 8526 "Commands.c"
+#line 8502 "Commands.c"
}
@@ -8540,10 +8516,10 @@ GType adjust_colors_multiple_command_get_type (void) {
RedeyeCommand* redeye_command_construct (GType object_type, Photo* photo, EditingToolsRedeyeInstance* redeye_instance, const gchar* name, const gchar* explanation) {
RedeyeCommand * self = NULL;
- Photo* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- EditingToolsRedeyeInstance _tmp3_ = {0};
+ Photo* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ EditingToolsRedeyeInstance _tmp3_;
#line 871 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_PHOTO (photo), NULL);
#line 871 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8566,21 +8542,21 @@ RedeyeCommand* redeye_command_construct (GType object_type, Photo* photo, Editin
self->priv->redeye_instance = _tmp3_;
#line 871 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 8570 "Commands.c"
+#line 8546 "Commands.c"
}
RedeyeCommand* redeye_command_new (Photo* photo, EditingToolsRedeyeInstance* redeye_instance, const gchar* name, const gchar* explanation) {
#line 871 "/home/jens/Source/shotwell/src/Commands.vala"
return redeye_command_construct (TYPE_REDEYE_COMMAND, photo, redeye_instance, name, explanation);
-#line 8577 "Commands.c"
+#line 8553 "Commands.c"
}
static void redeye_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo) {
RedeyeCommand * self;
- Photo* _tmp0_ = NULL;
- EditingToolsRedeyeInstance _tmp1_ = {0};
+ Photo* _tmp0_;
+ EditingToolsRedeyeInstance _tmp1_;
#line 878 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_REDEYE_COMMAND, RedeyeCommand);
#line 878 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8591,7 +8567,7 @@ static void redeye_command_real_execute_on_photo (GenericPhotoTransformationComm
_tmp1_ = self->priv->redeye_instance;
#line 879 "/home/jens/Source/shotwell/src/Commands.vala"
photo_add_redeye_instance (_tmp0_, &_tmp1_);
-#line 8595 "Commands.c"
+#line 8571 "Commands.c"
}
@@ -8601,27 +8577,27 @@ static void redeye_command_class_init (RedeyeCommandClass * klass) {
#line 868 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (RedeyeCommandPrivate));
#line 868 "/home/jens/Source/shotwell/src/Commands.vala"
- ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*)(GenericPhotoTransformationCommand*, Photo*)) redeye_command_real_execute_on_photo;
+ ((GenericPhotoTransformationCommandClass *) klass)->execute_on_photo = (void (*) (GenericPhotoTransformationCommand *, Photo*)) redeye_command_real_execute_on_photo;
#line 868 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = redeye_command_finalize;
-#line 8608 "Commands.c"
+#line 8584 "Commands.c"
}
static void redeye_command_instance_init (RedeyeCommand * self) {
#line 868 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = REDEYE_COMMAND_GET_PRIVATE (self);
-#line 8615 "Commands.c"
+#line 8591 "Commands.c"
}
-static void redeye_command_finalize (GObject* obj) {
+static void redeye_command_finalize (GObject * obj) {
RedeyeCommand * self;
#line 868 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_REDEYE_COMMAND, RedeyeCommand);
#line 868 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (redeye_command_parent_class)->finalize (obj);
-#line 8625 "Commands.c"
+#line 8601 "Commands.c"
}
@@ -8639,8 +8615,8 @@ GType redeye_command_get_type (void) {
MovePhotosCommand* move_photos_command_construct (GType object_type, const gchar* name, const gchar* explanation) {
MovePhotosCommand * self = NULL;
- const gchar* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ const gchar* _tmp1_;
#line 967 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 967 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8653,14 +8629,14 @@ MovePhotosCommand* move_photos_command_construct (GType object_type, const gchar
self = (MovePhotosCommand*) command_construct (object_type, _tmp0_, _tmp1_);
#line 967 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 8657 "Commands.c"
+#line 8633 "Commands.c"
}
static void move_photos_command_real_prepare (Command* base) {
MovePhotosCommand * self;
- MovePhotosCommandRealMovePhotosCommand* _tmp0_ = NULL;
- MovePhotosCommandRealMovePhotosCommand* _tmp1_ = NULL;
+ MovePhotosCommandRealMovePhotosCommand* _tmp0_;
+ MovePhotosCommandRealMovePhotosCommand* _tmp1_;
#line 971 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand);
#line 972 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8671,14 +8647,14 @@ static void move_photos_command_real_prepare (Command* base) {
_tmp1_ = self->real_command;
#line 973 "/home/jens/Source/shotwell/src/Commands.vala"
command_prepare (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND, Command));
-#line 8675 "Commands.c"
+#line 8651 "Commands.c"
}
static void move_photos_command_real_execute (Command* base) {
MovePhotosCommand * self;
- MovePhotosCommandRealMovePhotosCommand* _tmp0_ = NULL;
- MovePhotosCommandRealMovePhotosCommand* _tmp1_ = NULL;
+ MovePhotosCommandRealMovePhotosCommand* _tmp0_;
+ MovePhotosCommandRealMovePhotosCommand* _tmp1_;
#line 976 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand);
#line 977 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8689,14 +8665,14 @@ static void move_photos_command_real_execute (Command* base) {
_tmp1_ = self->real_command;
#line 978 "/home/jens/Source/shotwell/src/Commands.vala"
command_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND, Command));
-#line 8693 "Commands.c"
+#line 8669 "Commands.c"
}
static void move_photos_command_real_undo (Command* base) {
MovePhotosCommand * self;
- MovePhotosCommandRealMovePhotosCommand* _tmp0_ = NULL;
- MovePhotosCommandRealMovePhotosCommand* _tmp1_ = NULL;
+ MovePhotosCommandRealMovePhotosCommand* _tmp0_;
+ MovePhotosCommandRealMovePhotosCommand* _tmp1_;
#line 981 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand);
#line 982 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8707,34 +8683,34 @@ static void move_photos_command_real_undo (Command* base) {
_tmp1_ = self->real_command;
#line 983 "/home/jens/Source/shotwell/src/Commands.vala"
command_undo (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COMMAND, Command));
-#line 8711 "Commands.c"
+#line 8687 "Commands.c"
}
static void _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) {
#line 914 "/home/jens/Source/shotwell/src/Commands.vala"
move_photos_command_real_move_photos_command_on_proxy_broken ((MovePhotosCommandRealMovePhotosCommand*) self);
-#line 8718 "Commands.c"
+#line 8694 "Commands.c"
}
static gpointer _source_proxy_ref0 (gpointer self) {
#line 899 "/home/jens/Source/shotwell/src/Commands.vala"
return self ? source_proxy_ref (self) : NULL;
-#line 8725 "Commands.c"
+#line 8701 "Commands.c"
}
MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_command_construct (GType object_type, Event* new_event, GeeIterable* source_views, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation) {
MovePhotosCommandRealMovePhotosCommand * self = NULL;
- GeeIterable* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- Event* _tmp30_ = NULL;
- SourceProxy* _tmp31_ = NULL;
- SourceProxy* _tmp32_ = NULL;
+ GeeIterable* _tmp0_;
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
+ Event* _tmp30_;
+ SourceProxy* _tmp31_;
+ SourceProxy* _tmp32_;
#line 891 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail ((new_event == NULL) || IS_EVENT (new_event), NULL);
#line 891 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8759,15 +8735,15 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
_tmp4_ = explanation;
#line 893 "/home/jens/Source/shotwell/src/Commands.vala"
self = (MovePhotosCommandRealMovePhotosCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 8763 "Commands.c"
+#line 8739 "Commands.c"
{
GeeArrayList* _source_list = NULL;
- GeeArrayList* _tmp5_ = NULL;
- GeeArrayList* _tmp6_ = NULL;
+ GeeArrayList* _tmp5_;
+ GeeArrayList* _tmp6_;
gint _source_size = 0;
- GeeArrayList* _tmp7_ = NULL;
- gint _tmp8_ = 0;
- gint _tmp9_ = 0;
+ GeeArrayList* _tmp7_;
+ gint _tmp8_;
+ gint _tmp9_;
gint _source_index = 0;
#line 896 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand)->source_list;
@@ -8787,28 +8763,28 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
_source_index = -1;
#line 896 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 8791 "Commands.c"
- gint _tmp10_ = 0;
- gint _tmp11_ = 0;
- gint _tmp12_ = 0;
+#line 8767 "Commands.c"
+ gint _tmp10_;
+ gint _tmp11_;
+ gint _tmp12_;
DataSource* source = NULL;
- GeeArrayList* _tmp13_ = NULL;
- gint _tmp14_ = 0;
- gpointer _tmp15_ = NULL;
+ GeeArrayList* _tmp13_;
+ gint _tmp14_;
+ gpointer _tmp15_;
MediaSource* current_media = NULL;
- DataSource* _tmp16_ = NULL;
- MediaSource* _tmp17_ = NULL;
+ DataSource* _tmp16_;
+ MediaSource* _tmp17_;
Event* old_event = NULL;
- MediaSource* _tmp18_ = NULL;
- Event* _tmp19_ = NULL;
+ MediaSource* _tmp18_;
+ Event* _tmp19_;
SourceProxy* _tmp20_ = NULL;
- Event* _tmp21_ = NULL;
+ Event* _tmp21_;
SourceProxy* old_event_proxy = NULL;
- SourceProxy* _tmp24_ = NULL;
- SourceProxy* _tmp25_ = NULL;
- GeeHashMap* _tmp27_ = NULL;
- MediaSource* _tmp28_ = NULL;
- SourceProxy* _tmp29_ = NULL;
+ SourceProxy* _tmp24_;
+ SourceProxy* _tmp25_;
+ GeeHashMap* _tmp27_;
+ MediaSource* _tmp28_;
+ SourceProxy* _tmp29_;
#line 896 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp10_ = _source_index;
#line 896 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8821,7 +8797,7 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
if (!(_tmp11_ < _tmp12_)) {
#line 896 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 8825 "Commands.c"
+#line 8801 "Commands.c"
}
#line 896 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp13_ = _source_list;
@@ -8847,9 +8823,9 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
_tmp21_ = old_event;
#line 899 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp21_ != NULL) {
-#line 8851 "Commands.c"
- Event* _tmp22_ = NULL;
- SourceProxy* _tmp23_ = NULL;
+#line 8827 "Commands.c"
+ Event* _tmp22_;
+ SourceProxy* _tmp23_;
#line 899 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp22_ = old_event;
#line 899 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8858,13 +8834,13 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
_source_proxy_unref0 (_tmp20_);
#line 899 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp20_ = _tmp23_;
-#line 8862 "Commands.c"
+#line 8838 "Commands.c"
} else {
#line 899 "/home/jens/Source/shotwell/src/Commands.vala"
_source_proxy_unref0 (_tmp20_);
#line 899 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp20_ = NULL;
-#line 8868 "Commands.c"
+#line 8844 "Commands.c"
}
#line 899 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp24_ = _source_proxy_ref0 (_tmp20_);
@@ -8874,13 +8850,13 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
_tmp25_ = old_event_proxy;
#line 902 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp25_ != NULL) {
-#line 8878 "Commands.c"
- SourceProxy* _tmp26_ = NULL;
+#line 8854 "Commands.c"
+ SourceProxy* _tmp26_;
#line 903 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp26_ = old_event_proxy;
#line 903 "/home/jens/Source/shotwell/src/Commands.vala"
g_signal_connect_object (_tmp26_, "broken", (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self, 0);
-#line 8884 "Commands.c"
+#line 8860 "Commands.c"
}
#line 905 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp27_ = self->priv->old_events;
@@ -8900,11 +8876,11 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
_g_object_unref0 (current_media);
#line 896 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (source);
-#line 8904 "Commands.c"
+#line 8880 "Commands.c"
}
#line 896 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_source_list);
-#line 8908 "Commands.c"
+#line 8884 "Commands.c"
}
#line 909 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp30_ = new_event;
@@ -8920,24 +8896,24 @@ MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_com
g_signal_connect_object (_tmp32_, "broken", (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self, 0);
#line 891 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 8924 "Commands.c"
+#line 8900 "Commands.c"
}
MovePhotosCommandRealMovePhotosCommand* move_photos_command_real_move_photos_command_new (Event* new_event, GeeIterable* source_views, const gchar* progress_text, const gchar* undo_progress_text, const gchar* name, const gchar* explanation) {
#line 891 "/home/jens/Source/shotwell/src/Commands.vala"
return move_photos_command_real_move_photos_command_construct (MOVE_PHOTOS_COMMAND_TYPE_REAL_MOVE_PHOTOS_COMMAND, new_event, source_views, progress_text, undo_progress_text, name, explanation);
-#line 8931 "Commands.c"
+#line 8907 "Commands.c"
}
static void move_photos_command_real_move_photos_command_real_execute (Command* base) {
MovePhotosCommandRealMovePhotosCommand * self;
- LibraryWindow* _tmp0_ = NULL;
- LibraryWindow* _tmp1_ = NULL;
- Page* _tmp2_ = NULL;
- Page* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ LibraryWindow* _tmp0_;
+ LibraryWindow* _tmp1_;
+ Page* _tmp2_;
+ Page* _tmp3_;
+ gboolean _tmp4_;
#line 922 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, MOVE_PHOTOS_COMMAND_TYPE_REAL_MOVE_PHOTOS_COMMAND, MovePhotosCommandRealMovePhotosCommand);
#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8956,19 +8932,19 @@ static void move_photos_command_real_move_photos_command_real_execute (Command*
_g_object_unref0 (_tmp1_);
#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp4_) {
-#line 8960 "Commands.c"
+#line 8936 "Commands.c"
Event* evt = NULL;
- LibraryWindow* _tmp5_ = NULL;
- LibraryWindow* _tmp6_ = NULL;
- Page* _tmp7_ = NULL;
- EventPage* _tmp8_ = NULL;
- Event* _tmp9_ = NULL;
- Event* _tmp10_ = NULL;
- Event* _tmp11_ = NULL;
- gint _tmp12_ = 0;
- GeeArrayList* _tmp13_ = NULL;
- gint _tmp14_ = 0;
- gint _tmp15_ = 0;
+ LibraryWindow* _tmp5_;
+ LibraryWindow* _tmp6_;
+ Page* _tmp7_;
+ EventPage* _tmp8_;
+ Event* _tmp9_;
+ Event* _tmp10_;
+ Event* _tmp11_;
+ gint _tmp12_;
+ GeeArrayList* _tmp13_;
+ gint _tmp14_;
+ gint _tmp15_;
#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = library_window_get_app ();
#line 925 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -8999,12 +8975,12 @@ static void move_photos_command_real_move_photos_command_real_execute (Command*
_tmp15_ = _tmp14_;
#line 928 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp12_ == _tmp15_) {
-#line 9003 "Commands.c"
- LibraryWindow* _tmp16_ = NULL;
- LibraryWindow* _tmp17_ = NULL;
- SourceProxy* _tmp18_ = NULL;
- DataSource* _tmp19_ = NULL;
- Event* _tmp20_ = NULL;
+#line 8979 "Commands.c"
+ LibraryWindow* _tmp16_;
+ LibraryWindow* _tmp17_;
+ SourceProxy* _tmp18_;
+ DataSource* _tmp19_;
+ Event* _tmp20_;
#line 931 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp16_ = library_window_get_app ();
#line 931 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9021,17 +8997,17 @@ static void move_photos_command_real_move_photos_command_real_execute (Command*
_g_object_unref0 (_tmp20_);
#line 931 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp17_);
-#line 9025 "Commands.c"
+#line 9001 "Commands.c"
}
#line 924 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (evt);
-#line 9029 "Commands.c"
+#line 9005 "Commands.c"
} else {
- SourceProxy* _tmp21_ = NULL;
- DataSource* _tmp22_ = NULL;
- Event* _tmp23_ = NULL;
- gint _tmp24_ = 0;
- gboolean _tmp25_ = FALSE;
+ SourceProxy* _tmp21_;
+ DataSource* _tmp22_;
+ Event* _tmp23_;
+ gint _tmp24_;
+ gboolean _tmp25_;
#line 937 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp21_ = self->priv->new_event_proxy;
#line 937 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9046,12 +9022,12 @@ static void move_photos_command_real_move_photos_command_real_execute (Command*
_g_object_unref0 (_tmp23_);
#line 937 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp25_) {
-#line 9050 "Commands.c"
- LibraryWindow* _tmp26_ = NULL;
- LibraryWindow* _tmp27_ = NULL;
- SourceProxy* _tmp28_ = NULL;
- DataSource* _tmp29_ = NULL;
- Event* _tmp30_ = NULL;
+#line 9026 "Commands.c"
+ LibraryWindow* _tmp26_;
+ LibraryWindow* _tmp27_;
+ SourceProxy* _tmp28_;
+ DataSource* _tmp29_;
+ Event* _tmp30_;
#line 939 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp26_ = library_window_get_app ();
#line 939 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9068,21 +9044,21 @@ static void move_photos_command_real_move_photos_command_real_execute (Command*
_g_object_unref0 (_tmp30_);
#line 939 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp27_);
-#line 9072 "Commands.c"
+#line 9048 "Commands.c"
}
}
#line 946 "/home/jens/Source/shotwell/src/Commands.vala"
COMMAND_CLASS (move_photos_command_real_move_photos_command_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 9077 "Commands.c"
+#line 9053 "Commands.c"
}
static void move_photos_command_real_move_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) {
MovePhotosCommandRealMovePhotosCommand * self;
- DataSource* _tmp0_ = NULL;
- SourceProxy* _tmp1_ = NULL;
- DataSource* _tmp2_ = NULL;
- Event* _tmp3_ = NULL;
+ DataSource* _tmp0_;
+ SourceProxy* _tmp1_;
+ DataSource* _tmp2_;
+ Event* _tmp3_;
#line 949 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, MOVE_PHOTOS_COMMAND_TYPE_REAL_MOVE_PHOTOS_COMMAND, MovePhotosCommandRealMovePhotosCommand);
#line 949 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9099,22 +9075,22 @@ static void move_photos_command_real_move_photos_command_real_execute_on_source
media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
#line 950 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp3_);
-#line 9103 "Commands.c"
+#line 9079 "Commands.c"
}
static void move_photos_command_real_move_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) {
MovePhotosCommandRealMovePhotosCommand * self;
MediaSource* current_media = NULL;
- DataSource* _tmp0_ = NULL;
- MediaSource* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ MediaSource* _tmp1_;
SourceProxy* event_proxy = NULL;
- GeeHashMap* _tmp2_ = NULL;
- MediaSource* _tmp3_ = NULL;
- gpointer _tmp4_ = NULL;
+ GeeHashMap* _tmp2_;
+ MediaSource* _tmp3_;
+ gpointer _tmp4_;
Event* _tmp5_ = NULL;
- SourceProxy* _tmp6_ = NULL;
- MediaSource* _tmp9_ = NULL;
+ SourceProxy* _tmp6_;
+ MediaSource* _tmp9_;
#line 953 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, MOVE_PHOTOS_COMMAND_TYPE_REAL_MOVE_PHOTOS_COMMAND, MovePhotosCommandRealMovePhotosCommand);
#line 953 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9137,9 +9113,9 @@ static void move_photos_command_real_move_photos_command_real_undo_on_source (Mu
_tmp6_ = event_proxy;
#line 957 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp6_ != NULL) {
-#line 9141 "Commands.c"
- SourceProxy* _tmp7_ = NULL;
- DataSource* _tmp8_ = NULL;
+#line 9117 "Commands.c"
+ SourceProxy* _tmp7_;
+ DataSource* _tmp8_;
#line 957 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = event_proxy;
#line 957 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9148,13 +9124,13 @@ static void move_photos_command_real_move_photos_command_real_undo_on_source (Mu
_g_object_unref0 (_tmp5_);
#line 957 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_EVENT, Event);
-#line 9152 "Commands.c"
+#line 9128 "Commands.c"
} else {
#line 957 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp5_);
#line 957 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = NULL;
-#line 9158 "Commands.c"
+#line 9134 "Commands.c"
}
#line 957 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp9_ = current_media;
@@ -9166,13 +9142,13 @@ static void move_photos_command_real_move_photos_command_real_undo_on_source (Mu
_source_proxy_unref0 (event_proxy);
#line 953 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (current_media);
-#line 9170 "Commands.c"
+#line 9146 "Commands.c"
}
static void move_photos_command_real_move_photos_command_on_proxy_broken (MovePhotosCommandRealMovePhotosCommand* self) {
- CommandManager* _tmp0_ = NULL;
- CommandManager* _tmp1_ = NULL;
+ CommandManager* _tmp0_;
+ CommandManager* _tmp1_;
#line 960 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (MOVE_PHOTOS_COMMAND_IS_REAL_MOVE_PHOTOS_COMMAND (self));
#line 961 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9183,7 +9159,7 @@ static void move_photos_command_real_move_photos_command_on_proxy_broken (MovePh
command_manager_reset (_tmp1_);
#line 961 "/home/jens/Source/shotwell/src/Commands.vala"
_command_manager_unref0 (_tmp1_);
-#line 9187 "Commands.c"
+#line 9163 "Commands.c"
}
@@ -9193,19 +9169,19 @@ static void move_photos_command_real_move_photos_command_class_init (MovePhotosC
#line 886 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (MovePhotosCommandRealMovePhotosCommandPrivate));
#line 886 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) move_photos_command_real_move_photos_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) move_photos_command_real_move_photos_command_real_execute;
#line 886 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) move_photos_command_real_move_photos_command_real_execute_on_source;
+ ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) move_photos_command_real_move_photos_command_real_execute_on_source;
#line 886 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) move_photos_command_real_move_photos_command_real_undo_on_source;
+ ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) move_photos_command_real_move_photos_command_real_undo_on_source;
#line 886 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = move_photos_command_real_move_photos_command_finalize;
-#line 9204 "Commands.c"
+#line 9180 "Commands.c"
}
static void move_photos_command_real_move_photos_command_instance_init (MovePhotosCommandRealMovePhotosCommand * self) {
- GeeHashMap* _tmp0_ = NULL;
+ GeeHashMap* _tmp0_;
#line 886 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = MOVE_PHOTOS_COMMAND_REAL_MOVE_PHOTOS_COMMAND_GET_PRIVATE (self);
#line 887 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9214,14 +9190,14 @@ static void move_photos_command_real_move_photos_command_instance_init (MovePhot
_tmp0_ = gee_hash_map_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 888 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->old_events = _tmp0_;
-#line 9218 "Commands.c"
+#line 9194 "Commands.c"
}
-static void move_photos_command_real_move_photos_command_finalize (GObject* obj) {
+static void move_photos_command_real_move_photos_command_finalize (GObject * obj) {
MovePhotosCommandRealMovePhotosCommand * self;
- SourceProxy* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
+ SourceProxy* _tmp0_;
+ guint _tmp1_;
#line 886 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, MOVE_PHOTOS_COMMAND_TYPE_REAL_MOVE_PHOTOS_COMMAND, MovePhotosCommandRealMovePhotosCommand);
#line 914 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9230,15 +9206,15 @@ static void move_photos_command_real_move_photos_command_finalize (GObject* obj)
g_signal_parse_name ("broken", TYPE_SOURCE_PROXY, &_tmp1_, NULL, FALSE);
#line 914 "/home/jens/Source/shotwell/src/Commands.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self);
-#line 9234 "Commands.c"
+#line 9210 "Commands.c"
{
GeeIterator* _proxy_it = NULL;
- GeeHashMap* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
- GeeCollection* _tmp4_ = NULL;
- GeeCollection* _tmp5_ = NULL;
- GeeIterator* _tmp6_ = NULL;
- GeeIterator* _tmp7_ = NULL;
+ GeeHashMap* _tmp2_;
+ GeeCollection* _tmp3_;
+ GeeCollection* _tmp4_;
+ GeeCollection* _tmp5_;
+ GeeIterator* _tmp6_;
+ GeeIterator* _tmp7_;
#line 916 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = self->priv->old_events;
#line 916 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9257,13 +9233,13 @@ static void move_photos_command_real_move_photos_command_finalize (GObject* obj)
_proxy_it = _tmp7_;
#line 916 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 9261 "Commands.c"
- GeeIterator* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+#line 9237 "Commands.c"
+ GeeIterator* _tmp8_;
+ gboolean _tmp9_;
SourceProxy* proxy = NULL;
- GeeIterator* _tmp10_ = NULL;
- gpointer _tmp11_ = NULL;
- SourceProxy* _tmp12_ = NULL;
+ GeeIterator* _tmp10_;
+ gpointer _tmp11_;
+ SourceProxy* _tmp12_;
#line 916 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp8_ = _proxy_it;
#line 916 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9272,7 +9248,7 @@ static void move_photos_command_real_move_photos_command_finalize (GObject* obj)
if (!_tmp9_) {
#line 916 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 9276 "Commands.c"
+#line 9252 "Commands.c"
}
#line 916 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp10_ = _proxy_it;
@@ -9284,24 +9260,24 @@ static void move_photos_command_real_move_photos_command_finalize (GObject* obj)
_tmp12_ = proxy;
#line 917 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp12_ != NULL) {
-#line 9288 "Commands.c"
- SourceProxy* _tmp13_ = NULL;
- guint _tmp14_ = 0U;
+#line 9264 "Commands.c"
+ SourceProxy* _tmp13_;
+ guint _tmp14_;
#line 918 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp13_ = proxy;
#line 918 "/home/jens/Source/shotwell/src/Commands.vala"
g_signal_parse_name ("broken", TYPE_SOURCE_PROXY, &_tmp14_, NULL, FALSE);
#line 918 "/home/jens/Source/shotwell/src/Commands.vala"
g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _move_photos_command_real_move_photos_command_on_proxy_broken_source_proxy_broken, self);
-#line 9297 "Commands.c"
+#line 9273 "Commands.c"
}
#line 916 "/home/jens/Source/shotwell/src/Commands.vala"
_source_proxy_unref0 (proxy);
-#line 9301 "Commands.c"
+#line 9277 "Commands.c"
}
#line 916 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_proxy_it);
-#line 9305 "Commands.c"
+#line 9281 "Commands.c"
}
#line 887 "/home/jens/Source/shotwell/src/Commands.vala"
_source_proxy_unref0 (self->priv->new_event_proxy);
@@ -9309,7 +9285,7 @@ static void move_photos_command_real_move_photos_command_finalize (GObject* obj)
_g_object_unref0 (self->priv->old_events);
#line 886 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (move_photos_command_real_move_photos_command_parent_class)->finalize (obj);
-#line 9313 "Commands.c"
+#line 9289 "Commands.c"
}
@@ -9329,14 +9305,14 @@ static void move_photos_command_class_init (MovePhotosCommandClass * klass) {
#line 883 "/home/jens/Source/shotwell/src/Commands.vala"
move_photos_command_parent_class = g_type_class_peek_parent (klass);
#line 883 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->prepare = (void (*)(Command*)) move_photos_command_real_prepare;
+ ((CommandClass *) klass)->prepare = (void (*) (Command *)) move_photos_command_real_prepare;
#line 883 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) move_photos_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) move_photos_command_real_execute;
#line 883 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) move_photos_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) move_photos_command_real_undo;
#line 883 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = move_photos_command_finalize;
-#line 9340 "Commands.c"
+#line 9316 "Commands.c"
}
@@ -9344,7 +9320,7 @@ static void move_photos_command_instance_init (MovePhotosCommand * self) {
}
-static void move_photos_command_finalize (GObject* obj) {
+static void move_photos_command_finalize (GObject * obj) {
MovePhotosCommand * self;
#line 883 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand);
@@ -9352,7 +9328,7 @@ static void move_photos_command_finalize (GObject* obj) {
_g_object_unref0 (self->real_command);
#line 883 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (move_photos_command_parent_class)->finalize (obj);
-#line 9356 "Commands.c"
+#line 9332 "Commands.c"
}
@@ -9371,25 +9347,23 @@ GType move_photos_command_get_type (void) {
NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* iter) {
NewEventCommand * self = NULL;
MediaSource* key_source = NULL;
- MediaSource* _tmp11_ = NULL;
+ MediaSource* _tmp11_;
Event* new_event = NULL;
- MediaSource* _tmp12_ = NULL;
- Event* _tmp13_ = NULL;
- GeeIterable* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
- const gchar* _tmp16_ = NULL;
- MovePhotosCommandRealMovePhotosCommand* _tmp17_ = NULL;
+ MediaSource* _tmp12_;
+ Event* _tmp13_;
+ GeeIterable* _tmp14_;
+ MovePhotosCommandRealMovePhotosCommand* _tmp15_;
#line 988 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
#line 989 "/home/jens/Source/shotwell/src/Commands.vala"
self = (NewEventCommand*) move_photos_command_construct (object_type, RESOURCES_NEW_EVENT_LABEL, "");
#line 992 "/home/jens/Source/shotwell/src/Commands.vala"
key_source = NULL;
-#line 9389 "Commands.c"
+#line 9363 "Commands.c"
{
GeeIterator* _view_it = NULL;
- GeeIterable* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeIterable* _tmp0_;
+ GeeIterator* _tmp1_;
#line 993 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = iter;
#line 993 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9398,16 +9372,16 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
_view_it = _tmp1_;
#line 993 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 9402 "Commands.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 9376 "Commands.c"
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataView* view = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
MediaSource* current_source = NULL;
- DataView* _tmp6_ = NULL;
- DataSource* _tmp7_ = NULL;
- MediaSource* _tmp8_ = NULL;
+ DataView* _tmp6_;
+ DataSource* _tmp7_;
+ MediaSource* _tmp8_;
#line 993 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _view_it;
#line 993 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9416,7 +9390,7 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
if (!_tmp3_) {
#line 993 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 9420 "Commands.c"
+#line 9394 "Commands.c"
}
#line 993 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = _view_it;
@@ -9434,9 +9408,9 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
_tmp8_ = key_source;
#line 996 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp8_ == NULL) {
-#line 9438 "Commands.c"
- MediaSource* _tmp9_ = NULL;
- MediaSource* _tmp10_ = NULL;
+#line 9412 "Commands.c"
+ MediaSource* _tmp9_;
+ MediaSource* _tmp10_;
#line 997 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp9_ = current_source;
#line 997 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9451,17 +9425,17 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
_g_object_unref0 (view);
#line 998 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 9455 "Commands.c"
+#line 9429 "Commands.c"
}
#line 993 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (current_source);
#line 993 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (view);
-#line 9461 "Commands.c"
+#line 9435 "Commands.c"
}
#line 993 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_view_it);
-#line 9465 "Commands.c"
+#line 9439 "Commands.c"
}
#line 1003 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp11_ = key_source;
@@ -9476,36 +9450,32 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
#line 1007 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp14_ = iter;
#line 1007 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp15_ = _ ("Creating New Event");
-#line 1007 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp16_ = _ ("Removing Event");
-#line 1007 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp17_ = move_photos_command_real_move_photos_command_new (new_event, _tmp14_, _tmp15_, _tmp16_, RESOURCES_NEW_EVENT_LABEL, "");
+ _tmp15_ = move_photos_command_real_move_photos_command_new (new_event, _tmp14_, _ ("Creating New Event"), _ ("Removing Event"), RESOURCES_NEW_EVENT_LABEL, "");
#line 1007 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command);
#line 1007 "/home/jens/Source/shotwell/src/Commands.vala"
- G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp17_;
+ G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp15_;
#line 988 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (new_event);
#line 988 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (key_source);
#line 988 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 9495 "Commands.c"
+#line 9465 "Commands.c"
}
NewEventCommand* new_event_command_new (GeeIterable* iter) {
#line 988 "/home/jens/Source/shotwell/src/Commands.vala"
return new_event_command_construct (TYPE_NEW_EVENT_COMMAND, iter);
-#line 9502 "Commands.c"
+#line 9472 "Commands.c"
}
static void new_event_command_class_init (NewEventCommandClass * klass) {
#line 987 "/home/jens/Source/shotwell/src/Commands.vala"
new_event_command_parent_class = g_type_class_peek_parent (klass);
-#line 9509 "Commands.c"
+#line 9479 "Commands.c"
}
@@ -9527,11 +9497,9 @@ GType new_event_command_get_type (void) {
SetEventCommand* set_event_command_construct (GType object_type, GeeIterable* iter, Event* new_event) {
SetEventCommand * self = NULL;
- Event* _tmp0_ = NULL;
- GeeIterable* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- MovePhotosCommandRealMovePhotosCommand* _tmp4_ = NULL;
+ Event* _tmp0_;
+ GeeIterable* _tmp1_;
+ MovePhotosCommandRealMovePhotosCommand* _tmp2_;
#line 1014 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
#line 1014 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9543,32 +9511,28 @@ SetEventCommand* set_event_command_construct (GType object_type, GeeIterable* it
#line 1017 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = iter;
#line 1017 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp2_ = _ ("Moving Photos to New Event");
-#line 1017 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp3_ = _ ("Setting Photos to Previous Event");
-#line 1017 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp4_ = move_photos_command_real_move_photos_command_new (_tmp0_, _tmp1_, _tmp2_, _tmp3_, RESOURCES_SET_PHOTO_EVENT_LABEL, "");
+ _tmp2_ = move_photos_command_real_move_photos_command_new (_tmp0_, _tmp1_, _ ("Moving Photos to New Event"), _ ("Setting Photos to Previous Event"), RESOURCES_SET_PHOTO_EVENT_LABEL, "");
#line 1017 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command);
#line 1017 "/home/jens/Source/shotwell/src/Commands.vala"
- G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp4_;
+ G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp2_;
#line 1014 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 9558 "Commands.c"
+#line 9522 "Commands.c"
}
SetEventCommand* set_event_command_new (GeeIterable* iter, Event* new_event) {
#line 1014 "/home/jens/Source/shotwell/src/Commands.vala"
return set_event_command_construct (TYPE_SET_EVENT_COMMAND, iter, new_event);
-#line 9565 "Commands.c"
+#line 9529 "Commands.c"
}
static void set_event_command_class_init (SetEventCommandClass * klass) {
#line 1013 "/home/jens/Source/shotwell/src/Commands.vala"
set_event_command_parent_class = g_type_class_peek_parent (klass);
-#line 9572 "Commands.c"
+#line 9536 "Commands.c"
}
@@ -9594,16 +9558,14 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
gint named_evt_src_count = 0;
gint unnamed_evt_src_count = 0;
GeeArrayList* media_thumbs = NULL;
- GeeArrayList* _tmp0_ = NULL;
- Event* _tmp48_ = NULL;
- GeeArrayList* _tmp49_ = NULL;
- gint _tmp50_ = 0;
- gint _tmp51_ = 0;
- Event* _tmp52_ = NULL;
- GeeArrayList* _tmp53_ = NULL;
- const gchar* _tmp54_ = NULL;
- const gchar* _tmp55_ = NULL;
- MovePhotosCommandRealMovePhotosCommand* _tmp56_ = NULL;
+ GeeArrayList* _tmp0_;
+ Event* _tmp48_;
+ GeeArrayList* _tmp49_;
+ gint _tmp50_;
+ gint _tmp51_;
+ Event* _tmp52_;
+ GeeArrayList* _tmp53_;
+ MovePhotosCommandRealMovePhotosCommand* _tmp54_;
#line 1024 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
#line 1025 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9618,11 +9580,11 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
_tmp0_ = gee_array_list_new (TYPE_THUMBNAIL_VIEW, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 1034 "/home/jens/Source/shotwell/src/Commands.vala"
media_thumbs = _tmp0_;
-#line 9622 "Commands.c"
+#line 9584 "Commands.c"
{
GeeIterator* _view_it = NULL;
- GeeIterable* _tmp1_ = NULL;
- GeeIterator* _tmp2_ = NULL;
+ GeeIterable* _tmp1_;
+ GeeIterator* _tmp2_;
#line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = iter;
#line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9631,16 +9593,16 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
_view_it = _tmp2_;
#line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 9635 "Commands.c"
- GeeIterator* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+#line 9597 "Commands.c"
+ GeeIterator* _tmp3_;
+ gboolean _tmp4_;
DataView* view = NULL;
- GeeIterator* _tmp5_ = NULL;
- gpointer _tmp6_ = NULL;
+ GeeIterator* _tmp5_;
+ gpointer _tmp6_;
Event* event = NULL;
- DataView* _tmp7_ = NULL;
- DataSource* _tmp8_ = NULL;
- Event* _tmp9_ = NULL;
+ DataView* _tmp7_;
+ DataSource* _tmp8_;
+ Event* _tmp9_;
#line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = _view_it;
#line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9649,7 +9611,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
if (!_tmp4_) {
#line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 9653 "Commands.c"
+#line 9615 "Commands.c"
}
#line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = _view_it;
@@ -9667,13 +9629,13 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
_tmp9_ = master_event;
#line 1040 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp9_ == NULL) {
-#line 9671 "Commands.c"
- Event* _tmp10_ = NULL;
- Event* _tmp11_ = NULL;
- Event* _tmp12_ = NULL;
- gint _tmp13_ = 0;
- Event* _tmp14_ = NULL;
- gboolean _tmp15_ = FALSE;
+#line 9633 "Commands.c"
+ Event* _tmp10_;
+ Event* _tmp11_;
+ Event* _tmp12_;
+ gint _tmp13_;
+ Event* _tmp14_;
+ gboolean _tmp15_;
#line 1043 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp10_ = event;
#line 1043 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9694,30 +9656,30 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
_tmp15_ = event_has_name (_tmp14_);
#line 1045 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp15_) {
-#line 9698 "Commands.c"
- Event* _tmp16_ = NULL;
- gint _tmp17_ = 0;
+#line 9660 "Commands.c"
+ Event* _tmp16_;
+ gint _tmp17_;
#line 1046 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp16_ = master_event;
#line 1046 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp17_ = event_source_get_media_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_EVENT_SOURCE, EventSource));
#line 1046 "/home/jens/Source/shotwell/src/Commands.vala"
named_evt_src_count = _tmp17_;
-#line 9707 "Commands.c"
+#line 9669 "Commands.c"
}
} else {
- Event* _tmp18_ = NULL;
- gboolean _tmp19_ = FALSE;
+ Event* _tmp18_;
+ gboolean _tmp19_;
#line 1050 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp18_ = event;
#line 1050 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp19_ = event_has_name (_tmp18_);
#line 1050 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp19_) {
-#line 9718 "Commands.c"
- Event* _tmp20_ = NULL;
- gint _tmp21_ = 0;
- gint _tmp22_ = 0;
+#line 9680 "Commands.c"
+ Event* _tmp20_;
+ gint _tmp21_;
+ gint _tmp22_;
#line 1051 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp20_ = event;
#line 1051 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9726,11 +9688,11 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
_tmp22_ = named_evt_src_count;
#line 1051 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp21_ > _tmp22_) {
-#line 9730 "Commands.c"
- Event* _tmp23_ = NULL;
- gint _tmp24_ = 0;
- Event* _tmp25_ = NULL;
- Event* _tmp26_ = NULL;
+#line 9692 "Commands.c"
+ Event* _tmp23_;
+ gint _tmp24_;
+ Event* _tmp25_;
+ Event* _tmp26_;
#line 1052 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp23_ = event;
#line 1052 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9745,18 +9707,18 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
_g_object_unref0 (master_event);
#line 1053 "/home/jens/Source/shotwell/src/Commands.vala"
master_event = _tmp26_;
-#line 9749 "Commands.c"
+#line 9711 "Commands.c"
}
} else {
- gint _tmp27_ = 0;
+ gint _tmp27_;
#line 1055 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp27_ = named_evt_src_count;
#line 1055 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp27_ == 0) {
-#line 9757 "Commands.c"
- Event* _tmp28_ = NULL;
- gint _tmp29_ = 0;
- gint _tmp30_ = 0;
+#line 9719 "Commands.c"
+ Event* _tmp28_;
+ gint _tmp29_;
+ gint _tmp30_;
#line 1059 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp28_ = event;
#line 1059 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9765,11 +9727,11 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
_tmp30_ = unnamed_evt_src_count;
#line 1059 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp29_ > _tmp30_) {
-#line 9769 "Commands.c"
- Event* _tmp31_ = NULL;
- gint _tmp32_ = 0;
- Event* _tmp33_ = NULL;
- Event* _tmp34_ = NULL;
+#line 9731 "Commands.c"
+ Event* _tmp31_;
+ gint _tmp32_;
+ Event* _tmp33_;
+ Event* _tmp34_;
#line 1060 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp31_ = event;
#line 1060 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9784,18 +9746,18 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
_g_object_unref0 (master_event);
#line 1061 "/home/jens/Source/shotwell/src/Commands.vala"
master_event = _tmp34_;
-#line 9788 "Commands.c"
+#line 9750 "Commands.c"
}
}
}
}
{
GeeIterator* _media_source_it = NULL;
- Event* _tmp35_ = NULL;
- GeeCollection* _tmp36_ = NULL;
- GeeCollection* _tmp37_ = NULL;
- GeeIterator* _tmp38_ = NULL;
- GeeIterator* _tmp39_ = NULL;
+ Event* _tmp35_;
+ GeeCollection* _tmp36_;
+ GeeCollection* _tmp37_;
+ GeeIterator* _tmp38_;
+ GeeIterator* _tmp39_;
#line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp35_ = event;
#line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9812,16 +9774,16 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
_media_source_it = _tmp39_;
#line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 9816 "Commands.c"
- GeeIterator* _tmp40_ = NULL;
- gboolean _tmp41_ = FALSE;
+#line 9778 "Commands.c"
+ GeeIterator* _tmp40_;
+ gboolean _tmp41_;
MediaSource* media_source = NULL;
- GeeIterator* _tmp42_ = NULL;
- gpointer _tmp43_ = NULL;
- GeeArrayList* _tmp44_ = NULL;
- MediaSource* _tmp45_ = NULL;
- ThumbnailView* _tmp46_ = NULL;
- ThumbnailView* _tmp47_ = NULL;
+ GeeIterator* _tmp42_;
+ gpointer _tmp43_;
+ GeeArrayList* _tmp44_;
+ MediaSource* _tmp45_;
+ ThumbnailView* _tmp46_;
+ ThumbnailView* _tmp47_;
#line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp40_ = _media_source_it;
#line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -9830,7 +9792,7 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
if (!_tmp41_) {
#line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 9834 "Commands.c"
+#line 9796 "Commands.c"
}
#line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp42_ = _media_source_it;
@@ -9852,21 +9814,21 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
_g_object_unref0 (_tmp47_);
#line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (media_source);
-#line 9856 "Commands.c"
+#line 9818 "Commands.c"
}
#line 1068 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_media_source_it);
-#line 9860 "Commands.c"
+#line 9822 "Commands.c"
}
#line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (event);
#line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (view);
-#line 9866 "Commands.c"
+#line 9828 "Commands.c"
}
#line 1036 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_view_it);
-#line 9870 "Commands.c"
+#line 9832 "Commands.c"
}
#line 1072 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp48_ = master_event;
@@ -9885,36 +9847,32 @@ MergeEventsCommand* merge_events_command_construct (GType object_type, GeeIterab
#line 1075 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp53_ = media_thumbs;
#line 1075 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp54_ = _ ("Merging");
-#line 1075 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp55_ = _ ("Unmerging");
-#line 1075 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp56_ = move_photos_command_real_move_photos_command_new (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ITERABLE, GeeIterable), _tmp54_, _tmp55_, RESOURCES_MERGE_LABEL, "");
+ _tmp54_ = move_photos_command_real_move_photos_command_new (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ITERABLE, GeeIterable), _ ("Merging"), _ ("Unmerging"), RESOURCES_MERGE_LABEL, "");
#line 1075 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command);
#line 1075 "/home/jens/Source/shotwell/src/Commands.vala"
- G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp56_;
+ G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MOVE_PHOTOS_COMMAND, MovePhotosCommand)->real_command = _tmp54_;
#line 1024 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (media_thumbs);
#line 1024 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (master_event);
#line 1024 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 9904 "Commands.c"
+#line 9862 "Commands.c"
}
MergeEventsCommand* merge_events_command_new (GeeIterable* iter) {
#line 1024 "/home/jens/Source/shotwell/src/Commands.vala"
return merge_events_command_construct (TYPE_MERGE_EVENTS_COMMAND, iter);
-#line 9911 "Commands.c"
+#line 9869 "Commands.c"
}
static void merge_events_command_class_init (MergeEventsCommandClass * klass) {
#line 1023 "/home/jens/Source/shotwell/src/Commands.vala"
merge_events_command_parent_class = g_type_class_peek_parent (klass);
-#line 9918 "Commands.c"
+#line 9876 "Commands.c"
}
@@ -9937,51 +9895,45 @@ GType merge_events_command_get_type (void) {
static void _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
#line 1092 "/home/jens/Source/shotwell/src/Commands.vala"
duplicate_multiple_photos_command_on_photo_destroyed ((DuplicateMultiplePhotosCommand*) self, source);
-#line 9941 "Commands.c"
+#line 9899 "Commands.c"
}
DuplicateMultiplePhotosCommand* duplicate_multiple_photos_command_construct (GType object_type, GeeIterable* iter) {
DuplicateMultiplePhotosCommand * self = NULL;
- GeeIterable* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- LibraryPhotoSourceCollection* _tmp3_ = NULL;
+ GeeIterable* _tmp0_;
+ LibraryPhotoSourceCollection* _tmp1_;
#line 1084 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
#line 1085 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = iter;
#line 1085 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp1_ = _ ("Duplicating photos");
-#line 1085 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp2_ = _ ("Removing duplicated photos");
-#line 1085 "/home/jens/Source/shotwell/src/Commands.vala"
- self = (DuplicateMultiplePhotosCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, RESOURCES_DUPLICATE_PHOTO_LABEL, RESOURCES_DUPLICATE_PHOTO_TOOLTIP);
+ self = (DuplicateMultiplePhotosCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _ ("Duplicating photos"), _ ("Removing duplicated photos"), RESOURCES_DUPLICATE_PHOTO_LABEL, RESOURCES_DUPLICATE_PHOTO_TOOLTIP);
#line 1088 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp3_ = library_photo_global;
+ _tmp1_ = library_photo_global;
#line 1088 "/home/jens/Source/shotwell/src/Commands.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
#line 1084 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 9967 "Commands.c"
+#line 9919 "Commands.c"
}
DuplicateMultiplePhotosCommand* duplicate_multiple_photos_command_new (GeeIterable* iter) {
#line 1084 "/home/jens/Source/shotwell/src/Commands.vala"
return duplicate_multiple_photos_command_construct (TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND, iter);
-#line 9974 "Commands.c"
+#line 9926 "Commands.c"
}
static void duplicate_multiple_photos_command_on_photo_destroyed (DuplicateMultiplePhotosCommand* self, DataSource* source) {
- GeeHashMap* _tmp0_ = NULL;
- GeeCollection* _tmp1_ = NULL;
- GeeCollection* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
- DataSource* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- gboolean _tmp6_ = FALSE;
+ GeeHashMap* _tmp0_;
+ GeeCollection* _tmp1_;
+ GeeCollection* _tmp2_;
+ GeeCollection* _tmp3_;
+ DataSource* _tmp4_;
+ gboolean _tmp5_;
+ gboolean _tmp6_;
#line 1095 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_DUPLICATE_MULTIPLE_PHOTOS_COMMAND (self));
#line 1095 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10004,9 +9956,9 @@ static void duplicate_multiple_photos_command_on_photo_destroyed (DuplicateMulti
_g_object_unref0 (_tmp3_);
#line 1097 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp6_) {
-#line 10008 "Commands.c"
- CommandManager* _tmp7_ = NULL;
- CommandManager* _tmp8_ = NULL;
+#line 9960 "Commands.c"
+ CommandManager* _tmp7_;
+ CommandManager* _tmp8_;
#line 1098 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command));
#line 1098 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10015,15 +9967,15 @@ static void duplicate_multiple_photos_command_on_photo_destroyed (DuplicateMulti
command_manager_reset (_tmp8_);
#line 1098 "/home/jens/Source/shotwell/src/Commands.vala"
_command_manager_unref0 (_tmp8_);
-#line 10019 "Commands.c"
+#line 9971 "Commands.c"
}
}
static void duplicate_multiple_photos_command_real_execute (Command* base) {
DuplicateMultiplePhotosCommand * self;
- GeeHashMap* _tmp0_ = NULL;
- gint _tmp1_ = 0;
+ GeeHashMap* _tmp0_;
+ gint _tmp1_;
#line 1101 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND, DuplicateMultiplePhotosCommand);
#line 1102 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10038,30 +9990,27 @@ static void duplicate_multiple_photos_command_real_execute (Command* base) {
_tmp1_ = self->priv->failed;
#line 1107 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp1_ > 0) {
-#line 10042 "Commands.c"
+#line 9994 "Commands.c"
gchar* error_string = NULL;
- gint _tmp2_ = 0;
- const gchar* _tmp3_ = NULL;
- gint _tmp4_ = 0;
- gchar* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
+ gint _tmp2_;
+ gint _tmp3_;
+ gchar* _tmp4_;
+ const gchar* _tmp5_;
#line 1108 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = self->priv->failed;
#line 1108 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp3_ = ngettext ("Unable to duplicate one photo due to a file error", "Unable to duplicate %d photos due to file errors", (gulong) _tmp2_);
+ _tmp3_ = self->priv->failed;
#line 1108 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp4_ = self->priv->failed;
+ _tmp4_ = g_strdup_printf (ngettext ("Unable to duplicate one photo due to a file error", "Unable to duplicate %d photos due to file errors", (gulong) _tmp2_), _tmp3_);
#line 1108 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp5_ = g_strdup_printf (_tmp3_, _tmp4_);
-#line 1108 "/home/jens/Source/shotwell/src/Commands.vala"
- error_string = _tmp5_;
+ error_string = _tmp4_;
#line 1110 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp6_ = error_string;
+ _tmp5_ = error_string;
#line 1110 "/home/jens/Source/shotwell/src/Commands.vala"
- app_window_error_message (_tmp6_, NULL);
+ app_window_error_message (_tmp5_, NULL);
#line 1107 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (error_string);
-#line 10065 "Commands.c"
+#line 10014 "Commands.c"
}
}
@@ -10069,8 +10018,8 @@ static void duplicate_multiple_photos_command_real_execute (Command* base) {
static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) {
DuplicateMultiplePhotosCommand * self;
LibraryPhoto* photo = NULL;
- DataSource* _tmp0_ = NULL;
- LibraryPhoto* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ LibraryPhoto* _tmp1_;
GError * _inner_error_ = NULL;
#line 1114 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND, DuplicateMultiplePhotosCommand);
@@ -10082,19 +10031,19 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
#line 1115 "/home/jens/Source/shotwell/src/Commands.vala"
photo = _tmp1_;
-#line 10086 "Commands.c"
+#line 10035 "Commands.c"
{
LibraryPhoto* dupe = NULL;
- LibraryPhoto* _tmp2_ = NULL;
- GeeHashMap* _tmp3_ = NULL;
+ LibraryPhoto* _tmp2_;
+ GeeHashMap* _tmp3_;
#line 1118 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = library_photo_duplicate (photo, &_inner_error_);
#line 1118 "/home/jens/Source/shotwell/src/Commands.vala"
dupe = _tmp2_;
#line 1118 "/home/jens/Source/shotwell/src/Commands.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10097 "Commands.c"
- goto __catch457_g_error;
+#line 10046 "Commands.c"
+ goto __catch458_g_error;
}
#line 1119 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = self->priv->dupes;
@@ -10102,19 +10051,19 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), photo, dupe);
#line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (dupe);
-#line 10106 "Commands.c"
+#line 10055 "Commands.c"
}
- goto __finally457;
- __catch457_g_error:
+ goto __finally458;
+ __catch458_g_error:
{
GError* err = NULL;
- GFile* _tmp4_ = NULL;
- GFile* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- GError* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
- gint _tmp10_ = 0;
+ GFile* _tmp4_;
+ GFile* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ GError* _tmp8_;
+ const gchar* _tmp9_;
+ gint _tmp10_;
#line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
err = _inner_error_;
#line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10143,9 +10092,9 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
self->priv->failed = _tmp10_ + 1;
#line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
_g_error_free0 (err);
-#line 10147 "Commands.c"
+#line 10096 "Commands.c"
}
- __finally457:
+ __finally458:
#line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10156,20 +10105,20 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
g_clear_error (&_inner_error_);
#line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
return;
-#line 10160 "Commands.c"
+#line 10109 "Commands.c"
}
#line 1114 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (photo);
-#line 10164 "Commands.c"
+#line 10113 "Commands.c"
}
static void duplicate_multiple_photos_command_real_undo (Command* base) {
DuplicateMultiplePhotosCommand * self;
- LibraryPhotoSourceCollection* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- GeeHashMap* _tmp2_ = NULL;
- LibraryPhotoSourceCollection* _tmp3_ = NULL;
+ LibraryPhotoSourceCollection* _tmp0_;
+ guint _tmp1_;
+ GeeHashMap* _tmp2_;
+ LibraryPhotoSourceCollection* _tmp3_;
#line 1126 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND, DuplicateMultiplePhotosCommand);
#line 1128 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10190,23 +10139,23 @@ static void duplicate_multiple_photos_command_real_undo (Command* base) {
_tmp3_ = library_photo_global;
#line 1137 "/home/jens/Source/shotwell/src/Commands.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _duplicate_multiple_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
-#line 10194 "Commands.c"
+#line 10143 "Commands.c"
}
static void duplicate_multiple_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) {
DuplicateMultiplePhotosCommand * self;
LibraryPhoto* photo = NULL;
- DataSource* _tmp0_ = NULL;
- LibraryPhoto* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ LibraryPhoto* _tmp1_;
Marker* marker = NULL;
- LibraryPhotoSourceCollection* _tmp2_ = NULL;
- GeeHashMap* _tmp3_ = NULL;
- gpointer _tmp4_ = NULL;
- LibraryPhoto* _tmp5_ = NULL;
- Marker* _tmp6_ = NULL;
- Marker* _tmp7_ = NULL;
- LibraryPhotoSourceCollection* _tmp8_ = NULL;
+ LibraryPhotoSourceCollection* _tmp2_;
+ GeeHashMap* _tmp3_;
+ gpointer _tmp4_;
+ LibraryPhoto* _tmp5_;
+ Marker* _tmp6_;
+ Marker* _tmp7_;
+ LibraryPhotoSourceCollection* _tmp8_;
#line 1140 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND, DuplicateMultiplePhotosCommand);
#line 1140 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10241,7 +10190,7 @@ static void duplicate_multiple_photos_command_real_undo_on_source (MultipleDataS
_g_object_unref0 (marker);
#line 1140 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (photo);
-#line 10245 "Commands.c"
+#line 10194 "Commands.c"
}
@@ -10251,21 +10200,21 @@ static void duplicate_multiple_photos_command_class_init (DuplicateMultiplePhoto
#line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (DuplicateMultiplePhotosCommandPrivate));
#line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) duplicate_multiple_photos_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) duplicate_multiple_photos_command_real_execute;
#line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) duplicate_multiple_photos_command_real_execute_on_source;
+ ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) duplicate_multiple_photos_command_real_execute_on_source;
#line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) duplicate_multiple_photos_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) duplicate_multiple_photos_command_real_undo;
#line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) duplicate_multiple_photos_command_real_undo_on_source;
+ ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) duplicate_multiple_photos_command_real_undo_on_source;
#line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = duplicate_multiple_photos_command_finalize;
-#line 10264 "Commands.c"
+#line 10213 "Commands.c"
}
static void duplicate_multiple_photos_command_instance_init (DuplicateMultiplePhotosCommand * self) {
- GeeHashMap* _tmp0_ = NULL;
+ GeeHashMap* _tmp0_;
#line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = DUPLICATE_MULTIPLE_PHOTOS_COMMAND_GET_PRIVATE (self);
#line 1081 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10274,14 +10223,14 @@ static void duplicate_multiple_photos_command_instance_init (DuplicateMultiplePh
self->priv->dupes = _tmp0_;
#line 1082 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->failed = 0;
-#line 10278 "Commands.c"
+#line 10227 "Commands.c"
}
-static void duplicate_multiple_photos_command_finalize (GObject* obj) {
+static void duplicate_multiple_photos_command_finalize (GObject * obj) {
DuplicateMultiplePhotosCommand * self;
- LibraryPhotoSourceCollection* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
+ LibraryPhotoSourceCollection* _tmp0_;
+ guint _tmp1_;
#line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DUPLICATE_MULTIPLE_PHOTOS_COMMAND, DuplicateMultiplePhotosCommand);
#line 1092 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10294,7 +10243,7 @@ static void duplicate_multiple_photos_command_finalize (GObject* obj) {
_g_object_unref0 (self->priv->dupes);
#line 1080 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (duplicate_multiple_photos_command_parent_class)->finalize (obj);
-#line 10298 "Commands.c"
+#line 10247 "Commands.c"
}
@@ -10312,12 +10261,12 @@ GType duplicate_multiple_photos_command_get_type (void) {
SetRatingSingleCommand* set_rating_single_command_construct (GType object_type, DataSource* source, Rating rating) {
SetRatingSingleCommand * self = NULL;
- DataSource* _tmp0_ = NULL;
- Rating _tmp1_ = 0;
- const gchar* _tmp2_ = NULL;
- Rating _tmp3_ = 0;
- DataSource* _tmp4_ = NULL;
- Rating _tmp5_ = 0;
+ DataSource* _tmp0_;
+ Rating _tmp1_;
+ const gchar* _tmp2_;
+ Rating _tmp3_;
+ DataSource* _tmp4_;
+ Rating _tmp5_;
#line 1154 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
#line 1155 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10342,25 +10291,25 @@ SetRatingSingleCommand* set_rating_single_command_construct (GType object_type,
self->priv->last_rating = _tmp5_;
#line 1154 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 10346 "Commands.c"
+#line 10295 "Commands.c"
}
SetRatingSingleCommand* set_rating_single_command_new (DataSource* source, Rating rating) {
#line 1154 "/home/jens/Source/shotwell/src/Commands.vala"
return set_rating_single_command_construct (TYPE_SET_RATING_SINGLE_COMMAND, source, rating);
-#line 10353 "Commands.c"
+#line 10302 "Commands.c"
}
SetRatingSingleCommand* set_rating_single_command_construct_inc_dec (GType object_type, DataSource* source, gboolean is_incrementing) {
SetRatingSingleCommand * self = NULL;
const gchar* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- DataSource* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- DataSource* _tmp4_ = NULL;
- Rating _tmp5_ = 0;
+ gboolean _tmp1_;
+ DataSource* _tmp2_;
+ gboolean _tmp3_;
+ DataSource* _tmp4_;
+ Rating _tmp5_;
#line 1162 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
#line 1163 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10369,11 +10318,11 @@ SetRatingSingleCommand* set_rating_single_command_construct_inc_dec (GType objec
if (_tmp1_) {
#line 1163 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = RESOURCES_INCREASE_RATING_LABEL;
-#line 10373 "Commands.c"
+#line 10322 "Commands.c"
} else {
#line 1164 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = RESOURCES_DECREASE_RATING_LABEL;
-#line 10377 "Commands.c"
+#line 10326 "Commands.c"
}
#line 1163 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = source;
@@ -10393,56 +10342,56 @@ SetRatingSingleCommand* set_rating_single_command_construct_inc_dec (GType objec
self->priv->last_rating = _tmp5_;
#line 1162 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 10397 "Commands.c"
+#line 10346 "Commands.c"
}
SetRatingSingleCommand* set_rating_single_command_new_inc_dec (DataSource* source, gboolean is_incrementing) {
#line 1162 "/home/jens/Source/shotwell/src/Commands.vala"
return set_rating_single_command_construct_inc_dec (TYPE_SET_RATING_SINGLE_COMMAND, source, is_incrementing);
-#line 10404 "Commands.c"
+#line 10353 "Commands.c"
}
static void set_rating_single_command_real_execute (Command* base) {
SetRatingSingleCommand * self;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 1171 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RATING_SINGLE_COMMAND, SetRatingSingleCommand);
#line 1172 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->set_direct;
#line 1172 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp0_) {
-#line 10417 "Commands.c"
- DataSource* _tmp1_ = NULL;
- Rating _tmp2_ = 0;
+#line 10366 "Commands.c"
+ DataSource* _tmp1_;
+ Rating _tmp2_;
#line 1173 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source;
#line 1173 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = self->priv->new_rating;
#line 1173 "/home/jens/Source/shotwell/src/Commands.vala"
media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), _tmp2_);
-#line 10426 "Commands.c"
+#line 10375 "Commands.c"
} else {
- gboolean _tmp3_ = FALSE;
+ gboolean _tmp3_;
#line 1175 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = self->priv->incrementing;
#line 1175 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp3_) {
-#line 10433 "Commands.c"
- DataSource* _tmp4_ = NULL;
+#line 10382 "Commands.c"
+ DataSource* _tmp4_;
#line 1176 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source;
#line 1176 "/home/jens/Source/shotwell/src/Commands.vala"
media_source_increase_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 10439 "Commands.c"
+#line 10388 "Commands.c"
} else {
- DataSource* _tmp5_ = NULL;
+ DataSource* _tmp5_;
#line 1178 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand)->source;
#line 1178 "/home/jens/Source/shotwell/src/Commands.vala"
media_source_decrease_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 10446 "Commands.c"
+#line 10395 "Commands.c"
}
}
}
@@ -10450,8 +10399,8 @@ static void set_rating_single_command_real_execute (Command* base) {
static void set_rating_single_command_real_undo (Command* base) {
SetRatingSingleCommand * self;
- DataSource* _tmp0_ = NULL;
- Rating _tmp1_ = 0;
+ DataSource* _tmp0_;
+ Rating _tmp1_;
#line 1182 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RATING_SINGLE_COMMAND, SetRatingSingleCommand);
#line 1183 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10460,7 +10409,7 @@ static void set_rating_single_command_real_undo (Command* base) {
_tmp1_ = self->priv->last_rating;
#line 1183 "/home/jens/Source/shotwell/src/Commands.vala"
media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 10464 "Commands.c"
+#line 10413 "Commands.c"
}
@@ -10470,29 +10419,29 @@ static void set_rating_single_command_class_init (SetRatingSingleCommandClass *
#line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (SetRatingSingleCommandPrivate));
#line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) set_rating_single_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) set_rating_single_command_real_execute;
#line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) set_rating_single_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) set_rating_single_command_real_undo;
#line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = set_rating_single_command_finalize;
-#line 10479 "Commands.c"
+#line 10428 "Commands.c"
}
static void set_rating_single_command_instance_init (SetRatingSingleCommand * self) {
#line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = SET_RATING_SINGLE_COMMAND_GET_PRIVATE (self);
-#line 10486 "Commands.c"
+#line 10435 "Commands.c"
}
-static void set_rating_single_command_finalize (GObject* obj) {
+static void set_rating_single_command_finalize (GObject * obj) {
SetRatingSingleCommand * self;
#line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_RATING_SINGLE_COMMAND, SetRatingSingleCommand);
#line 1148 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (set_rating_single_command_parent_class)->finalize (obj);
-#line 10496 "Commands.c"
+#line 10445 "Commands.c"
}
@@ -10510,15 +10459,14 @@ GType set_rating_single_command_get_type (void) {
SetRatingCommand* set_rating_command_construct (GType object_type, GeeIterable* iter, Rating rating) {
SetRatingCommand * self = NULL;
- GeeIterable* _tmp0_ = NULL;
- Rating _tmp1_ = 0;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- Rating _tmp5_ = 0;
- const gchar* _tmp6_ = NULL;
- Rating _tmp7_ = 0;
- GeeIterable* _tmp8_ = NULL;
+ GeeIterable* _tmp0_;
+ Rating _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ Rating _tmp4_;
+ const gchar* _tmp5_;
+ Rating _tmp6_;
+ GeeIterable* _tmp7_;
#line 1194 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
#line 1195 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10530,130 +10478,114 @@ SetRatingCommand* set_rating_command_construct (GType object_type, GeeIterable*
#line 1195 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = _tmp2_;
#line 1195 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp4_ = _ ("Restoring previous rating");
+ _tmp4_ = rating;
#line 1195 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp5_ = rating;
+ _tmp5_ = resources_rating_label (_tmp4_);
#line 1195 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp6_ = resources_rating_label (_tmp5_);
-#line 1195 "/home/jens/Source/shotwell/src/Commands.vala"
- self = (SetRatingCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp3_, _tmp4_, _tmp6_, "");
+ self = (SetRatingCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp3_, _ ("Restoring previous rating"), _tmp5_, "");
#line 1195 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (_tmp3_);
#line 1197 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->set_direct = TRUE;
#line 1198 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp7_ = rating;
+ _tmp6_ = rating;
#line 1198 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->new_rating = _tmp7_;
+ self->priv->new_rating = _tmp6_;
#line 1200 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp8_ = iter;
+ _tmp7_ = iter;
#line 1200 "/home/jens/Source/shotwell/src/Commands.vala"
- set_rating_command_save_source_states (self, _tmp8_);
+ set_rating_command_save_source_states (self, _tmp7_);
#line 1194 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 10555 "Commands.c"
+#line 10501 "Commands.c"
}
SetRatingCommand* set_rating_command_new (GeeIterable* iter, Rating rating) {
#line 1194 "/home/jens/Source/shotwell/src/Commands.vala"
return set_rating_command_construct (TYPE_SET_RATING_COMMAND, iter, rating);
-#line 10562 "Commands.c"
+#line 10508 "Commands.c"
}
SetRatingCommand* set_rating_command_construct_inc_dec (GType object_type, GeeIterable* iter, gboolean is_incrementing) {
SetRatingCommand * self = NULL;
const gchar* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
+ const gchar* _tmp2_ = NULL;
+ gboolean _tmp3_;
const gchar* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- const gchar* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
- GeeIterable* _tmp10_ = NULL;
- gboolean _tmp11_ = FALSE;
- GeeIterable* _tmp12_ = NULL;
+ gboolean _tmp5_;
+ GeeIterable* _tmp6_;
+ gboolean _tmp7_;
+ GeeIterable* _tmp8_;
#line 1203 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
#line 1205 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = is_incrementing;
#line 1205 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp1_) {
-#line 10583 "Commands.c"
- const gchar* _tmp2_ = NULL;
#line 1205 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp2_ = _ ("Increasing ratings");
-#line 1205 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp0_ = _tmp2_;
-#line 10589 "Commands.c"
+ _tmp0_ = _ ("Increasing ratings");
+#line 10531 "Commands.c"
} else {
- const gchar* _tmp3_ = NULL;
-#line 1205 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp3_ = _ ("Decreasing ratings");
#line 1205 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp0_ = _tmp3_;
-#line 10596 "Commands.c"
+ _tmp0_ = _ ("Decreasing ratings");
+#line 10535 "Commands.c"
}
#line 1206 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp5_ = is_incrementing;
-#line 1206 "/home/jens/Source/shotwell/src/Commands.vala"
- if (_tmp5_) {
-#line 10602 "Commands.c"
- const gchar* _tmp6_ = NULL;
+ _tmp3_ = is_incrementing;
#line 1206 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp6_ = _ ("Decreasing ratings");
+ if (_tmp3_) {
#line 1206 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp4_ = _tmp6_;
-#line 10608 "Commands.c"
+ _tmp2_ = _ ("Decreasing ratings");
+#line 10543 "Commands.c"
} else {
- const gchar* _tmp7_ = NULL;
-#line 1206 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp7_ = _ ("Increasing ratings");
#line 1206 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp4_ = _tmp7_;
-#line 10615 "Commands.c"
+ _tmp2_ = _ ("Increasing ratings");
+#line 10547 "Commands.c"
}
#line 1207 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp9_ = is_incrementing;
+ _tmp5_ = is_incrementing;
#line 1207 "/home/jens/Source/shotwell/src/Commands.vala"
- if (_tmp9_) {
+ if (_tmp5_) {
#line 1207 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp8_ = RESOURCES_INCREASE_RATING_LABEL;
-#line 10623 "Commands.c"
+ _tmp4_ = RESOURCES_INCREASE_RATING_LABEL;
+#line 10555 "Commands.c"
} else {
#line 1207 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp8_ = RESOURCES_DECREASE_RATING_LABEL;
-#line 10627 "Commands.c"
+ _tmp4_ = RESOURCES_DECREASE_RATING_LABEL;
+#line 10559 "Commands.c"
}
#line 1204 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp10_ = iter;
+ _tmp6_ = iter;
#line 1204 "/home/jens/Source/shotwell/src/Commands.vala"
- self = (SetRatingCommand*) multiple_data_source_command_construct (object_type, _tmp10_, _tmp0_, _tmp4_, _tmp8_, "");
+ self = (SetRatingCommand*) multiple_data_source_command_construct (object_type, _tmp6_, _tmp0_, _tmp2_, _tmp4_, "");
#line 1209 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->set_direct = FALSE;
#line 1210 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp11_ = is_incrementing;
+ _tmp7_ = is_incrementing;
#line 1210 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->incrementing = _tmp11_;
+ self->priv->incrementing = _tmp7_;
#line 1212 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp12_ = iter;
+ _tmp8_ = iter;
#line 1212 "/home/jens/Source/shotwell/src/Commands.vala"
- set_rating_command_save_source_states (self, _tmp12_);
+ set_rating_command_save_source_states (self, _tmp8_);
#line 1203 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 10645 "Commands.c"
+#line 10577 "Commands.c"
}
SetRatingCommand* set_rating_command_new_inc_dec (GeeIterable* iter, gboolean is_incrementing) {
#line 1203 "/home/jens/Source/shotwell/src/Commands.vala"
return set_rating_command_construct_inc_dec (TYPE_SET_RATING_COMMAND, iter, is_incrementing);
-#line 10652 "Commands.c"
+#line 10584 "Commands.c"
}
static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIterable* iter) {
- GeeHashMap* _tmp0_ = NULL;
+ GeeHashMap* _tmp0_;
#line 1215 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_SET_RATING_COMMAND (self));
#line 1215 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10664,11 +10596,11 @@ static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIt
_g_object_unref0 (self->priv->last_rating_map);
#line 1216 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->last_rating_map = _tmp0_;
-#line 10668 "Commands.c"
+#line 10600 "Commands.c"
{
GeeIterator* _view_it = NULL;
- GeeIterable* _tmp1_ = NULL;
- GeeIterator* _tmp2_ = NULL;
+ GeeIterable* _tmp1_;
+ GeeIterator* _tmp2_;
#line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = iter;
#line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10677,19 +10609,19 @@ static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIt
_view_it = _tmp2_;
#line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 10681 "Commands.c"
- GeeIterator* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+#line 10613 "Commands.c"
+ GeeIterator* _tmp3_;
+ gboolean _tmp4_;
DataView* view = NULL;
- GeeIterator* _tmp5_ = NULL;
- gpointer _tmp6_ = NULL;
+ GeeIterator* _tmp5_;
+ gpointer _tmp6_;
DataSource* source = NULL;
- DataView* _tmp7_ = NULL;
- DataSource* _tmp8_ = NULL;
- GeeHashMap* _tmp9_ = NULL;
- DataSource* _tmp10_ = NULL;
- DataSource* _tmp11_ = NULL;
- Rating _tmp12_ = 0;
+ DataView* _tmp7_;
+ DataSource* _tmp8_;
+ GeeHashMap* _tmp9_;
+ DataSource* _tmp10_;
+ DataSource* _tmp11_;
+ Rating _tmp12_;
#line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = _view_it;
#line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10698,7 +10630,7 @@ static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIt
if (!_tmp4_) {
#line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 10702 "Commands.c"
+#line 10634 "Commands.c"
}
#line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = _view_it;
@@ -10726,11 +10658,11 @@ static void set_rating_command_save_source_states (SetRatingCommand* self, GeeIt
_g_object_unref0 (source);
#line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (view);
-#line 10730 "Commands.c"
+#line 10662 "Commands.c"
}
#line 1218 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_view_it);
-#line 10734 "Commands.c"
+#line 10666 "Commands.c"
}
}
@@ -10743,7 +10675,7 @@ static void set_rating_command_real_execute (Command* base) {
self->priv->action_count = 0;
#line 1226 "/home/jens/Source/shotwell/src/Commands.vala"
COMMAND_CLASS (set_rating_command_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 10747 "Commands.c"
+#line 10679 "Commands.c"
}
@@ -10755,13 +10687,13 @@ static void set_rating_command_real_undo (Command* base) {
self->priv->action_count = 0;
#line 1231 "/home/jens/Source/shotwell/src/Commands.vala"
COMMAND_CLASS (set_rating_command_parent_class)->undo (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 10759 "Commands.c"
+#line 10691 "Commands.c"
}
static void set_rating_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) {
SetRatingCommand * self;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 1234 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RATING_COMMAND, SetRatingCommand);
#line 1234 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10770,36 +10702,36 @@ static void set_rating_command_real_execute_on_source (MultipleDataSourceCommand
_tmp0_ = self->priv->set_direct;
#line 1235 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp0_) {
-#line 10774 "Commands.c"
- DataSource* _tmp1_ = NULL;
- Rating _tmp2_ = 0;
+#line 10706 "Commands.c"
+ DataSource* _tmp1_;
+ Rating _tmp2_;
#line 1236 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = source;
#line 1236 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = self->priv->new_rating;
#line 1236 "/home/jens/Source/shotwell/src/Commands.vala"
media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), _tmp2_);
-#line 10783 "Commands.c"
+#line 10715 "Commands.c"
} else {
- gboolean _tmp3_ = FALSE;
+ gboolean _tmp3_;
#line 1238 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = self->priv->incrementing;
#line 1238 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp3_) {
-#line 10790 "Commands.c"
- DataSource* _tmp4_ = NULL;
+#line 10722 "Commands.c"
+ DataSource* _tmp4_;
#line 1239 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = source;
#line 1239 "/home/jens/Source/shotwell/src/Commands.vala"
media_source_increase_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 10796 "Commands.c"
+#line 10728 "Commands.c"
} else {
- DataSource* _tmp5_ = NULL;
+ DataSource* _tmp5_;
#line 1241 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = source;
#line 1241 "/home/jens/Source/shotwell/src/Commands.vala"
media_source_decrease_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 10803 "Commands.c"
+#line 10735 "Commands.c"
}
}
}
@@ -10807,10 +10739,10 @@ static void set_rating_command_real_execute_on_source (MultipleDataSourceCommand
static void set_rating_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) {
SetRatingCommand * self;
- DataSource* _tmp0_ = NULL;
- GeeHashMap* _tmp1_ = NULL;
- DataSource* _tmp2_ = NULL;
- gpointer _tmp3_ = NULL;
+ DataSource* _tmp0_;
+ GeeHashMap* _tmp1_;
+ DataSource* _tmp2_;
+ gpointer _tmp3_;
#line 1245 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RATING_COMMAND, SetRatingCommand);
#line 1245 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10825,7 +10757,7 @@ static void set_rating_command_real_undo_on_source (MultipleDataSourceCommand* b
_tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_);
#line 1246 "/home/jens/Source/shotwell/src/Commands.vala"
media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), (Rating) ((gintptr) _tmp3_));
-#line 10829 "Commands.c"
+#line 10761 "Commands.c"
}
@@ -10835,16 +10767,16 @@ static void set_rating_command_class_init (SetRatingCommandClass * klass) {
#line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (SetRatingCommandPrivate));
#line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) set_rating_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) set_rating_command_real_execute;
#line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) set_rating_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) set_rating_command_real_undo;
#line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) set_rating_command_real_execute_on_source;
+ ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) set_rating_command_real_execute_on_source;
#line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) set_rating_command_real_undo_on_source;
+ ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) set_rating_command_real_undo_on_source;
#line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = set_rating_command_finalize;
-#line 10848 "Commands.c"
+#line 10780 "Commands.c"
}
@@ -10853,11 +10785,11 @@ static void set_rating_command_instance_init (SetRatingCommand * self) {
self->priv = SET_RATING_COMMAND_GET_PRIVATE (self);
#line 1192 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->action_count = 0;
-#line 10857 "Commands.c"
+#line 10789 "Commands.c"
}
-static void set_rating_command_finalize (GObject* obj) {
+static void set_rating_command_finalize (GObject * obj) {
SetRatingCommand * self;
#line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_RATING_COMMAND, SetRatingCommand);
@@ -10865,7 +10797,7 @@ static void set_rating_command_finalize (GObject* obj) {
_g_object_unref0 (self->priv->last_rating_map);
#line 1187 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (set_rating_command_parent_class)->finalize (obj);
-#line 10869 "Commands.c"
+#line 10801 "Commands.c"
}
@@ -10883,48 +10815,39 @@ GType set_rating_command_get_type (void) {
SetRawDeveloperCommand* set_raw_developer_command_construct (GType object_type, GeeIterable* iter, RawDeveloper developer) {
SetRawDeveloperCommand * self = NULL;
- GeeIterable* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- RawDeveloper _tmp4_ = 0;
- GeeIterable* _tmp5_ = NULL;
+ GeeIterable* _tmp0_;
+ RawDeveloper _tmp1_;
+ GeeIterable* _tmp2_;
#line 1255 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
#line 1256 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = iter;
#line 1256 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp1_ = _ ("Setting RAW developer");
-#line 1256 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp2_ = _ ("Restoring previous RAW developer");
-#line 1256 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp3_ = _ ("Set Developer");
-#line 1256 "/home/jens/Source/shotwell/src/Commands.vala"
- self = (SetRawDeveloperCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, "");
+ self = (SetRawDeveloperCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _ ("Setting RAW developer"), _ ("Restoring previous RAW developer"), _ ("Set Developer"), "");
#line 1258 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp4_ = developer;
+ _tmp1_ = developer;
#line 1258 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->new_developer = _tmp4_;
+ self->priv->new_developer = _tmp1_;
#line 1259 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp5_ = iter;
+ _tmp2_ = iter;
#line 1259 "/home/jens/Source/shotwell/src/Commands.vala"
- set_raw_developer_command_save_source_states (self, _tmp5_);
+ set_raw_developer_command_save_source_states (self, _tmp2_);
#line 1255 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 10915 "Commands.c"
+#line 10838 "Commands.c"
}
SetRawDeveloperCommand* set_raw_developer_command_new (GeeIterable* iter, RawDeveloper developer) {
#line 1255 "/home/jens/Source/shotwell/src/Commands.vala"
return set_raw_developer_command_construct (TYPE_SET_RAW_DEVELOPER_COMMAND, iter, developer);
-#line 10922 "Commands.c"
+#line 10845 "Commands.c"
}
static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand* self, GeeIterable* iter) {
- GeeHashMap* _tmp0_ = NULL;
- GeeHashMap* _tmp1_ = NULL;
+ GeeHashMap* _tmp0_;
+ GeeHashMap* _tmp1_;
#line 1262 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_SET_RAW_DEVELOPER_COMMAND (self));
#line 1262 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10941,11 +10864,11 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
_g_object_unref0 (self->priv->last_transformation_map);
#line 1264 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->last_transformation_map = _tmp1_;
-#line 10945 "Commands.c"
+#line 10868 "Commands.c"
{
GeeIterator* _view_it = NULL;
- GeeIterable* _tmp2_ = NULL;
- GeeIterator* _tmp3_ = NULL;
+ GeeIterable* _tmp2_;
+ GeeIterator* _tmp3_;
#line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = iter;
#line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10954,18 +10877,18 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
_view_it = _tmp3_;
#line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 10958 "Commands.c"
- GeeIterator* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+#line 10881 "Commands.c"
+ GeeIterator* _tmp4_;
+ gboolean _tmp5_;
DataView* view = NULL;
- GeeIterator* _tmp6_ = NULL;
- gpointer _tmp7_ = NULL;
+ GeeIterator* _tmp6_;
+ gpointer _tmp7_;
Photo* photo = NULL;
- DataView* _tmp8_ = NULL;
- DataSource* _tmp9_ = NULL;
- Photo* _tmp10_ = NULL;
- Photo* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
+ DataView* _tmp8_;
+ DataSource* _tmp9_;
+ Photo* _tmp10_;
+ Photo* _tmp11_;
+ gboolean _tmp12_;
#line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = _view_it;
#line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -10974,7 +10897,7 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
if (!_tmp5_) {
#line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 10978 "Commands.c"
+#line 10901 "Commands.c"
}
#line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = _view_it;
@@ -10992,7 +10915,7 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
if (_tmp10_ == NULL) {
#line 1267 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp9_);
-#line 10996 "Commands.c"
+#line 10919 "Commands.c"
}
#line 1267 "/home/jens/Source/shotwell/src/Commands.vala"
photo = _tmp10_;
@@ -11002,16 +10925,16 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
_tmp12_ = set_raw_developer_command_is_raw_photo (self, _tmp11_);
#line 1268 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp12_) {
-#line 11006 "Commands.c"
- GeeHashMap* _tmp13_ = NULL;
- Photo* _tmp14_ = NULL;
- Photo* _tmp15_ = NULL;
- RawDeveloper _tmp16_ = 0;
- GeeHashMap* _tmp17_ = NULL;
- Photo* _tmp18_ = NULL;
- Photo* _tmp19_ = NULL;
- PhotoTransformationState* _tmp20_ = NULL;
- PhotoTransformationState* _tmp21_ = NULL;
+#line 10929 "Commands.c"
+ GeeHashMap* _tmp13_;
+ Photo* _tmp14_;
+ Photo* _tmp15_;
+ RawDeveloper _tmp16_;
+ GeeHashMap* _tmp17_;
+ Photo* _tmp18_;
+ Photo* _tmp19_;
+ PhotoTransformationState* _tmp20_;
+ PhotoTransformationState* _tmp21_;
#line 1269 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp13_ = self->priv->last_developer_map;
#line 1269 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11036,17 +10959,17 @@ static void set_raw_developer_command_save_source_states (SetRawDeveloperCommand
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp18_, _tmp21_);
#line 1270 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp21_);
-#line 11040 "Commands.c"
+#line 10963 "Commands.c"
}
#line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (photo);
#line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (view);
-#line 11046 "Commands.c"
+#line 10969 "Commands.c"
}
#line 1266 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_view_it);
-#line 11050 "Commands.c"
+#line 10973 "Commands.c"
}
}
@@ -11057,7 +10980,7 @@ static void set_raw_developer_command_real_execute (Command* base) {
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand);
#line 1276 "/home/jens/Source/shotwell/src/Commands.vala"
COMMAND_CLASS (set_raw_developer_command_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 11061 "Commands.c"
+#line 10984 "Commands.c"
}
@@ -11067,17 +10990,17 @@ static void set_raw_developer_command_real_undo (Command* base) {
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand);
#line 1280 "/home/jens/Source/shotwell/src/Commands.vala"
COMMAND_CLASS (set_raw_developer_command_parent_class)->undo (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTIPLE_DATA_SOURCE_COMMAND, MultipleDataSourceCommand), TYPE_COMMAND, Command));
-#line 11071 "Commands.c"
+#line 10994 "Commands.c"
}
static void set_raw_developer_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) {
SetRawDeveloperCommand * self;
Photo* photo = NULL;
- DataSource* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- Photo* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ DataSource* _tmp0_;
+ Photo* _tmp1_;
+ Photo* _tmp2_;
+ gboolean _tmp3_;
#line 1283 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand);
#line 1283 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11094,62 +11017,62 @@ static void set_raw_developer_command_real_execute_on_source (MultipleDataSource
_tmp3_ = set_raw_developer_command_is_raw_photo (self, _tmp2_);
#line 1285 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp3_) {
-#line 11098 "Commands.c"
+#line 11021 "Commands.c"
gboolean _tmp4_ = FALSE;
- RawDeveloper _tmp5_ = 0;
+ RawDeveloper _tmp5_;
#line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = self->priv->new_developer;
#line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp5_ == RAW_DEVELOPER_CAMERA) {
-#line 11105 "Commands.c"
- Photo* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 11028 "Commands.c"
+ Photo* _tmp6_;
+ gboolean _tmp7_;
#line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = photo;
#line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = photo_is_raw_developer_available (_tmp6_, RAW_DEVELOPER_CAMERA);
#line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = !_tmp7_;
-#line 11114 "Commands.c"
+#line 11037 "Commands.c"
} else {
#line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = FALSE;
-#line 11118 "Commands.c"
+#line 11041 "Commands.c"
}
#line 1286 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp4_) {
-#line 11122 "Commands.c"
- Photo* _tmp8_ = NULL;
+#line 11045 "Commands.c"
+ Photo* _tmp8_;
#line 1287 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp8_ = photo;
#line 1287 "/home/jens/Source/shotwell/src/Commands.vala"
photo_set_raw_developer (_tmp8_, RAW_DEVELOPER_EMBEDDED);
-#line 11128 "Commands.c"
+#line 11051 "Commands.c"
} else {
- Photo* _tmp9_ = NULL;
- RawDeveloper _tmp10_ = 0;
+ Photo* _tmp9_;
+ RawDeveloper _tmp10_;
#line 1289 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp9_ = photo;
#line 1289 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp10_ = self->priv->new_developer;
#line 1289 "/home/jens/Source/shotwell/src/Commands.vala"
photo_set_raw_developer (_tmp9_, _tmp10_);
-#line 11138 "Commands.c"
+#line 11061 "Commands.c"
}
}
#line 1283 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (photo);
-#line 11143 "Commands.c"
+#line 11066 "Commands.c"
}
static void set_raw_developer_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) {
SetRawDeveloperCommand * self;
Photo* photo = NULL;
- DataSource* _tmp0_ = NULL;
- Photo* _tmp1_ = NULL;
- Photo* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+ DataSource* _tmp0_;
+ Photo* _tmp1_;
+ Photo* _tmp2_;
+ gboolean _tmp3_;
#line 1293 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand);
#line 1293 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11166,16 +11089,16 @@ static void set_raw_developer_command_real_undo_on_source (MultipleDataSourceCom
_tmp3_ = set_raw_developer_command_is_raw_photo (self, _tmp2_);
#line 1295 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp3_) {
-#line 11170 "Commands.c"
- Photo* _tmp4_ = NULL;
- GeeHashMap* _tmp5_ = NULL;
- Photo* _tmp6_ = NULL;
- gpointer _tmp7_ = NULL;
- Photo* _tmp8_ = NULL;
- GeeHashMap* _tmp9_ = NULL;
- Photo* _tmp10_ = NULL;
- gpointer _tmp11_ = NULL;
- PhotoTransformationState* _tmp12_ = NULL;
+#line 11093 "Commands.c"
+ Photo* _tmp4_;
+ GeeHashMap* _tmp5_;
+ Photo* _tmp6_;
+ gpointer _tmp7_;
+ Photo* _tmp8_;
+ GeeHashMap* _tmp9_;
+ Photo* _tmp10_;
+ gpointer _tmp11_;
+ PhotoTransformationState* _tmp12_;
#line 1296 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = photo;
#line 1296 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11200,18 +11123,18 @@ static void set_raw_developer_command_real_undo_on_source (MultipleDataSourceCom
photo_load_transformation_state (_tmp8_, _tmp12_);
#line 1297 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp12_);
-#line 11204 "Commands.c"
+#line 11127 "Commands.c"
}
#line 1293 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (photo);
-#line 11208 "Commands.c"
+#line 11131 "Commands.c"
}
static gboolean set_raw_developer_command_is_raw_photo (SetRawDeveloperCommand* self, Photo* photo) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
- Photo* _tmp1_ = NULL;
+ Photo* _tmp1_;
#line 1301 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_SET_RAW_DEVELOPER_COMMAND (self), FALSE);
#line 1301 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11220,26 +11143,26 @@ static gboolean set_raw_developer_command_is_raw_photo (SetRawDeveloperCommand*
_tmp1_ = photo;
#line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp1_ != NULL) {
-#line 11224 "Commands.c"
- Photo* _tmp2_ = NULL;
- PhotoFileFormat _tmp3_ = 0;
+#line 11147 "Commands.c"
+ Photo* _tmp2_;
+ PhotoFileFormat _tmp3_;
#line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = photo;
#line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = photo_get_master_file_format (_tmp2_);
#line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = _tmp3_ == PHOTO_FILE_FORMAT_RAW;
-#line 11233 "Commands.c"
+#line 11156 "Commands.c"
} else {
#line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = FALSE;
-#line 11237 "Commands.c"
+#line 11160 "Commands.c"
}
#line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
result = _tmp0_;
#line 1302 "/home/jens/Source/shotwell/src/Commands.vala"
return result;
-#line 11243 "Commands.c"
+#line 11166 "Commands.c"
}
@@ -11249,27 +11172,27 @@ static void set_raw_developer_command_class_init (SetRawDeveloperCommandClass *
#line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (SetRawDeveloperCommandPrivate));
#line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) set_raw_developer_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) set_raw_developer_command_real_execute;
#line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) set_raw_developer_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) set_raw_developer_command_real_undo;
#line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) set_raw_developer_command_real_execute_on_source;
+ ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) set_raw_developer_command_real_execute_on_source;
#line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) set_raw_developer_command_real_undo_on_source;
+ ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) set_raw_developer_command_real_undo_on_source;
#line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = set_raw_developer_command_finalize;
-#line 11262 "Commands.c"
+#line 11185 "Commands.c"
}
static void set_raw_developer_command_instance_init (SetRawDeveloperCommand * self) {
#line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = SET_RAW_DEVELOPER_COMMAND_GET_PRIVATE (self);
-#line 11269 "Commands.c"
+#line 11192 "Commands.c"
}
-static void set_raw_developer_command_finalize (GObject* obj) {
+static void set_raw_developer_command_finalize (GObject * obj) {
SetRawDeveloperCommand * self;
#line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_RAW_DEVELOPER_COMMAND, SetRawDeveloperCommand);
@@ -11279,7 +11202,7 @@ static void set_raw_developer_command_finalize (GObject* obj) {
_g_object_unref0 (self->priv->last_transformation_map);
#line 1250 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (set_raw_developer_command_parent_class)->finalize (obj);
-#line 11283 "Commands.c"
+#line 11206 "Commands.c"
}
@@ -11297,11 +11220,11 @@ GType set_raw_developer_command_get_type (void) {
AdjustDateTimePhotoCommand* adjust_date_time_photo_command_construct (GType object_type, Dateable* dateable, gint64 time_shift, gboolean modify_original) {
AdjustDateTimePhotoCommand * self = NULL;
- Dateable* _tmp0_ = NULL;
- Dateable* _tmp1_ = NULL;
- Dateable* _tmp2_ = NULL;
- gint64 _tmp3_ = 0LL;
- gboolean _tmp4_ = FALSE;
+ Dateable* _tmp0_;
+ Dateable* _tmp1_;
+ Dateable* _tmp2_;
+ gint64 _tmp3_;
+ gboolean _tmp4_;
#line 1312 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_DATEABLE (dateable), NULL);
#line 1313 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11326,29 +11249,29 @@ AdjustDateTimePhotoCommand* adjust_date_time_photo_command_construct (GType obje
self->priv->modify_original = _tmp4_;
#line 1312 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 11330 "Commands.c"
+#line 11253 "Commands.c"
}
AdjustDateTimePhotoCommand* adjust_date_time_photo_command_new (Dateable* dateable, gint64 time_shift, gboolean modify_original) {
#line 1312 "/home/jens/Source/shotwell/src/Commands.vala"
return adjust_date_time_photo_command_construct (TYPE_ADJUST_DATE_TIME_PHOTO_COMMAND, dateable, time_shift, modify_original);
-#line 11337 "Commands.c"
+#line 11260 "Commands.c"
}
static void adjust_date_time_photo_command_real_execute (Command* base) {
AdjustDateTimePhotoCommand * self;
- Dateable* _tmp0_ = NULL;
- Dateable* _tmp1_ = NULL;
- time_t _tmp2_ = 0;
- gint64 _tmp3_ = 0LL;
- Dateable* _tmp4_ = NULL;
- Event* _tmp5_ = NULL;
+ Dateable* _tmp0_;
+ Dateable* _tmp1_;
+ time_t _tmp2_;
+ gint64 _tmp3_;
+ Dateable* _tmp4_;
+ Event* _tmp5_;
ViewCollection* all_events = NULL;
- ViewCollection* _tmp6_ = NULL;
- Dateable* _tmp23_ = NULL;
- ViewCollection* _tmp24_ = NULL;
+ ViewCollection* _tmp6_;
+ Dateable* _tmp23_;
+ ViewCollection* _tmp24_;
#line 1320 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_DATE_TIME_PHOTO_COMMAND, AdjustDateTimePhotoCommand);
#line 1321 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11373,14 +11296,14 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
_tmp6_ = view_collection_new ("tmp");
#line 1325 "/home/jens/Source/shotwell/src/Commands.vala"
all_events = _tmp6_;
-#line 11377 "Commands.c"
+#line 11300 "Commands.c"
{
GeeIterator* _dobj_it = NULL;
- EventSourceCollection* _tmp7_ = NULL;
- GeeCollection* _tmp8_ = NULL;
- GeeCollection* _tmp9_ = NULL;
- GeeIterator* _tmp10_ = NULL;
- GeeIterator* _tmp11_ = NULL;
+ EventSourceCollection* _tmp7_;
+ GeeCollection* _tmp8_;
+ GeeCollection* _tmp9_;
+ GeeIterator* _tmp10_;
+ GeeIterator* _tmp11_;
#line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = event_global;
#line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11397,16 +11320,16 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
_dobj_it = _tmp11_;
#line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 11401 "Commands.c"
- GeeIterator* _tmp12_ = NULL;
- gboolean _tmp13_ = FALSE;
+#line 11324 "Commands.c"
+ GeeIterator* _tmp12_;
+ gboolean _tmp13_;
DataObject* dobj = NULL;
- GeeIterator* _tmp14_ = NULL;
- gpointer _tmp15_ = NULL;
+ GeeIterator* _tmp14_;
+ gpointer _tmp15_;
Event* event = NULL;
- DataObject* _tmp16_ = NULL;
- Event* _tmp17_ = NULL;
- Event* _tmp18_ = NULL;
+ DataObject* _tmp16_;
+ Event* _tmp17_;
+ Event* _tmp18_;
#line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp12_ = _dobj_it;
#line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11415,7 +11338,7 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
if (!_tmp13_) {
#line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 11419 "Commands.c"
+#line 11342 "Commands.c"
}
#line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp14_ = _dobj_it;
@@ -11433,11 +11356,11 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
_tmp18_ = event;
#line 1329 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp18_ != NULL) {
-#line 11437 "Commands.c"
- ViewCollection* _tmp19_ = NULL;
- Event* _tmp20_ = NULL;
- EventView* _tmp21_ = NULL;
- EventView* _tmp22_ = NULL;
+#line 11360 "Commands.c"
+ ViewCollection* _tmp19_;
+ Event* _tmp20_;
+ EventView* _tmp21_;
+ EventView* _tmp22_;
#line 1330 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp19_ = all_events;
#line 1330 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11450,17 +11373,17 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject));
#line 1330 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp22_);
-#line 11454 "Commands.c"
+#line 11377 "Commands.c"
}
#line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (event);
#line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (dobj);
-#line 11460 "Commands.c"
+#line 11383 "Commands.c"
}
#line 1327 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_dobj_it);
-#line 11464 "Commands.c"
+#line 11387 "Commands.c"
}
#line 1333 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp23_ = self->priv->dateable;
@@ -11470,18 +11393,18 @@ static void adjust_date_time_photo_command_real_execute (Command* base) {
event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_MEDIA_SOURCE, MediaSource), _tmp24_, NULL);
#line 1320 "/home/jens/Source/shotwell/src/Commands.vala"
_data_collection_unref0 (all_events);
-#line 11474 "Commands.c"
+#line 11397 "Commands.c"
}
static void adjust_date_time_photo_command_real_undo (Command* base) {
AdjustDateTimePhotoCommand * self;
- Dateable* _tmp0_ = NULL;
- Dateable* _tmp1_ = NULL;
- time_t _tmp2_ = 0;
- gint64 _tmp3_ = 0LL;
- Dateable* _tmp4_ = NULL;
- Event* _tmp5_ = NULL;
+ Dateable* _tmp0_;
+ Dateable* _tmp1_;
+ time_t _tmp2_;
+ gint64 _tmp3_;
+ Dateable* _tmp4_;
+ Event* _tmp5_;
#line 1336 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_DATE_TIME_PHOTO_COMMAND, AdjustDateTimePhotoCommand);
#line 1337 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11500,13 +11423,13 @@ static void adjust_date_time_photo_command_real_undo (Command* base) {
_tmp5_ = self->priv->prev_event;
#line 1339 "/home/jens/Source/shotwell/src/Commands.vala"
media_source_set_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource), _tmp5_);
-#line 11504 "Commands.c"
+#line 11427 "Commands.c"
}
static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand* self, Dateable* dateable, time_t exposure_time) {
gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
GError * _inner_error_ = NULL;
#line 1342 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_ADJUST_DATE_TIME_PHOTO_COMMAND (self));
@@ -11516,24 +11439,24 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
_tmp1_ = self->priv->modify_original;
#line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp1_) {
-#line 11520 "Commands.c"
- Dateable* _tmp2_ = NULL;
+#line 11443 "Commands.c"
+ Dateable* _tmp2_;
#line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = dateable;
#line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_PHOTO);
-#line 11526 "Commands.c"
+#line 11449 "Commands.c"
} else {
#line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = FALSE;
-#line 11530 "Commands.c"
+#line 11453 "Commands.c"
}
#line 1343 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp0_) {
-#line 11534 "Commands.c"
+#line 11457 "Commands.c"
{
- Dateable* _tmp3_ = NULL;
- time_t _tmp4_ = 0;
+ Dateable* _tmp3_;
+ time_t _tmp4_;
#line 1345 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = dateable;
#line 1345 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11542,28 +11465,25 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
photo_set_exposure_time_persistent (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO, Photo), _tmp4_, &_inner_error_);
#line 1345 "/home/jens/Source/shotwell/src/Commands.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11546 "Commands.c"
- goto __catch458_g_error;
+#line 11469 "Commands.c"
+ goto __catch459_g_error;
}
}
- goto __finally458;
- __catch458_g_error:
+ goto __finally459;
+ __catch459_g_error:
{
GError* err = NULL;
- const gchar* _tmp5_ = NULL;
#line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
err = _inner_error_;
#line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
_inner_error_ = NULL;
#line 1347 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp5_ = _ ("Original photo could not be adjusted.");
-#line 1347 "/home/jens/Source/shotwell/src/Commands.vala"
- app_window_error_message (_tmp5_, NULL);
+ app_window_error_message (_ ("Original photo could not be adjusted."), NULL);
#line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
_g_error_free0 (err);
-#line 11565 "Commands.c"
+#line 11485 "Commands.c"
}
- __finally458:
+ __finally459:
#line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11572,18 +11492,18 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
g_clear_error (&_inner_error_);
#line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
return;
-#line 11576 "Commands.c"
+#line 11496 "Commands.c"
}
} else {
- Dateable* _tmp6_ = NULL;
- time_t _tmp7_ = 0;
+ Dateable* _tmp5_;
+ time_t _tmp6_;
#line 1350 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp6_ = dateable;
+ _tmp5_ = dateable;
#line 1350 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp7_ = exposure_time;
+ _tmp6_ = exposure_time;
#line 1350 "/home/jens/Source/shotwell/src/Commands.vala"
- dateable_set_exposure_time (_tmp6_, _tmp7_);
-#line 11587 "Commands.c"
+ dateable_set_exposure_time (_tmp5_, _tmp6_);
+#line 11507 "Commands.c"
}
}
@@ -11594,23 +11514,23 @@ static void adjust_date_time_photo_command_class_init (AdjustDateTimePhotoComman
#line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (AdjustDateTimePhotoCommandPrivate));
#line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) adjust_date_time_photo_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) adjust_date_time_photo_command_real_execute;
#line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) adjust_date_time_photo_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) adjust_date_time_photo_command_real_undo;
#line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = adjust_date_time_photo_command_finalize;
-#line 11603 "Commands.c"
+#line 11523 "Commands.c"
}
static void adjust_date_time_photo_command_instance_init (AdjustDateTimePhotoCommand * self) {
#line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = ADJUST_DATE_TIME_PHOTO_COMMAND_GET_PRIVATE (self);
-#line 11610 "Commands.c"
+#line 11530 "Commands.c"
}
-static void adjust_date_time_photo_command_finalize (GObject* obj) {
+static void adjust_date_time_photo_command_finalize (GObject * obj) {
AdjustDateTimePhotoCommand * self;
#line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_DATE_TIME_PHOTO_COMMAND, AdjustDateTimePhotoCommand);
@@ -11620,7 +11540,7 @@ static void adjust_date_time_photo_command_finalize (GObject* obj) {
_g_object_unref0 (self->priv->prev_event);
#line 1306 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (adjust_date_time_photo_command_parent_class)->finalize (obj);
-#line 11624 "Commands.c"
+#line 11544 "Commands.c"
}
@@ -11644,217 +11564,211 @@ static time_t* _time_t_dup (time_t* self) {
memcpy (dup, self, sizeof (time_t));
#line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
return dup;
-#line 11648 "Commands.c"
+#line 11568 "Commands.c"
}
static gpointer __time_t_dup0 (gpointer self) {
#line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
return self ? _time_t_dup (self) : NULL;
-#line 11655 "Commands.c"
+#line 11575 "Commands.c"
}
AdjustDateTimePhotosCommand* adjust_date_time_photos_command_construct (GType object_type, GeeIterable* iter, gint64 time_shift, gboolean keep_relativity, gboolean modify_originals) {
AdjustDateTimePhotosCommand * self = NULL;
- GeeIterable* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- gint64 _tmp3_ = 0LL;
- gboolean _tmp4_ = FALSE;
- gboolean _tmp5_ = FALSE;
- GeeHashMap* _tmp6_ = NULL;
- GeeHashMap* _tmp32_ = NULL;
+ GeeIterable* _tmp0_;
+ gint64 _tmp1_;
+ gboolean _tmp2_;
+ gboolean _tmp3_;
+ GeeHashMap* _tmp4_;
+ GeeHashMap* _tmp30_;
#line 1366 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_ITERABLE (iter), NULL);
#line 1368 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = iter;
#line 1368 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp1_ = _ ("Adjusting Date and Time");
-#line 1368 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp2_ = _ ("Undoing Date and Time Adjustment");
-#line 1368 "/home/jens/Source/shotwell/src/Commands.vala"
- self = (AdjustDateTimePhotosCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_, RESOURCES_ADJUST_DATE_TIME_LABEL, "");
+ self = (AdjustDateTimePhotosCommand*) multiple_data_source_command_construct (object_type, _tmp0_, _ ("Adjusting Date and Time"), _ ("Undoing Date and Time Adjustment"), RESOURCES_ADJUST_DATE_TIME_LABEL, "");
#line 1371 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp3_ = time_shift;
+ _tmp1_ = time_shift;
#line 1371 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->time_shift = _tmp3_;
+ self->priv->time_shift = _tmp1_;
#line 1372 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp4_ = keep_relativity;
+ _tmp2_ = keep_relativity;
#line 1372 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->keep_relativity = _tmp4_;
+ self->priv->keep_relativity = _tmp2_;
#line 1373 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp5_ = modify_originals;
+ _tmp3_ = modify_originals;
#line 1373 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->modify_originals = _tmp5_;
+ self->priv->modify_originals = _tmp3_;
#line 1377 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp6_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp4_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 1377 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (self->priv->prev_events);
#line 1377 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->prev_events = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_MAP, GeeMap);
-#line 11697 "Commands.c"
+ self->priv->prev_events = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MAP, GeeMap);
+#line 11611 "Commands.c"
{
GeeIterator* _view_it = NULL;
- GeeIterable* _tmp7_ = NULL;
- GeeIterator* _tmp8_ = NULL;
+ GeeIterable* _tmp5_;
+ GeeIterator* _tmp6_;
#line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp7_ = iter;
+ _tmp5_ = iter;
#line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp8_ = gee_iterable_iterator (_tmp7_);
+ _tmp6_ = gee_iterable_iterator (_tmp5_);
#line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
- _view_it = _tmp8_;
+ _view_it = _tmp6_;
#line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 11710 "Commands.c"
- GeeIterator* _tmp9_ = NULL;
- gboolean _tmp10_ = FALSE;
+#line 11624 "Commands.c"
+ GeeIterator* _tmp7_;
+ gboolean _tmp8_;
DataView* view = NULL;
- GeeIterator* _tmp11_ = NULL;
- gpointer _tmp12_ = NULL;
- GeeMap* _tmp13_ = NULL;
- DataView* _tmp14_ = NULL;
- DataSource* _tmp15_ = NULL;
- Dateable* _tmp16_ = NULL;
- Dateable* _tmp17_ = NULL;
- DataView* _tmp18_ = NULL;
- DataSource* _tmp19_ = NULL;
- MediaSource* _tmp20_ = NULL;
- MediaSource* _tmp21_ = NULL;
- Event* _tmp22_ = NULL;
- Event* _tmp23_ = NULL;
- time_t* _tmp24_ = NULL;
+ GeeIterator* _tmp9_;
+ gpointer _tmp10_;
+ GeeMap* _tmp11_;
+ DataView* _tmp12_;
+ DataSource* _tmp13_;
+ Dateable* _tmp14_;
+ Dateable* _tmp15_;
+ DataView* _tmp16_;
+ DataSource* _tmp17_;
+ MediaSource* _tmp18_;
+ MediaSource* _tmp19_;
+ Event* _tmp20_;
+ Event* _tmp21_;
+ time_t* _tmp22_;
#line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp9_ = _view_it;
+ _tmp7_ = _view_it;
#line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp10_ = gee_iterator_next (_tmp9_);
+ _tmp8_ = gee_iterator_next (_tmp7_);
#line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
- if (!_tmp10_) {
+ if (!_tmp8_) {
#line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 11736 "Commands.c"
+#line 11650 "Commands.c"
}
#line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp11_ = _view_it;
+ _tmp9_ = _view_it;
#line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp12_ = gee_iterator_get (_tmp11_);
+ _tmp10_ = gee_iterator_get (_tmp9_);
#line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
- view = (DataView*) _tmp12_;
+ view = (DataView*) _tmp10_;
#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp13_ = self->priv->prev_events;
+ _tmp11_ = self->priv->prev_events;
#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp14_ = view;
+ _tmp12_ = view;
#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp15_ = data_view_get_source (_tmp14_);
+ _tmp13_ = data_view_get_source (_tmp12_);
#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_DATEABLE) ? ((Dateable*) _tmp15_) : NULL;
+ _tmp14_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_DATEABLE) ? ((Dateable*) _tmp13_) : NULL;
#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
- if (_tmp16_ == NULL) {
+ if (_tmp14_ == NULL) {
#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_object_unref0 (_tmp15_);
-#line 11756 "Commands.c"
+ _g_object_unref0 (_tmp13_);
+#line 11670 "Commands.c"
}
#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp17_ = _tmp16_;
+ _tmp15_ = _tmp14_;
#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp18_ = view;
+ _tmp16_ = view;
#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp19_ = data_view_get_source (_tmp18_);
+ _tmp17_ = data_view_get_source (_tmp16_);
#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp19_) : NULL;
+ _tmp18_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp17_) : NULL;
#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
- if (_tmp20_ == NULL) {
+ if (_tmp18_ == NULL) {
#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_object_unref0 (_tmp19_);
-#line 11770 "Commands.c"
+ _g_object_unref0 (_tmp17_);
+#line 11684 "Commands.c"
}
#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp21_ = _tmp20_;
-#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp22_ = media_source_get_event (_tmp21_);
+ _tmp19_ = _tmp18_;
#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp23_ = _tmp22_;
+ _tmp20_ = media_source_get_event (_tmp19_);
#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
- gee_map_set (_tmp13_, _tmp17_, _tmp23_);
+ _tmp21_ = _tmp20_;
#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_object_unref0 (_tmp23_);
+ gee_map_set (_tmp11_, _tmp15_, _tmp21_);
#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp21_);
#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_object_unref0 (_tmp17_);
+ _g_object_unref0 (_tmp19_);
+#line 1381 "/home/jens/Source/shotwell/src/Commands.vala"
+ _g_object_unref0 (_tmp15_);
#line 1383 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp24_ = self->priv->new_time;
+ _tmp22_ = self->priv->new_time;
#line 1383 "/home/jens/Source/shotwell/src/Commands.vala"
- if (_tmp24_ == NULL) {
-#line 11790 "Commands.c"
- DataView* _tmp25_ = NULL;
- DataSource* _tmp26_ = NULL;
- Dateable* _tmp27_ = NULL;
- time_t _tmp28_ = 0;
- gint64 _tmp29_ = 0LL;
- time_t _tmp30_ = 0;
- time_t* _tmp31_ = NULL;
+ if (_tmp22_ == NULL) {
+#line 11704 "Commands.c"
+ DataView* _tmp23_;
+ DataSource* _tmp24_;
+ Dateable* _tmp25_;
+ time_t _tmp26_;
+ gint64 _tmp27_;
+ time_t _tmp28_;
+ time_t* _tmp29_;
#line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp25_ = view;
+ _tmp23_ = view;
#line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp26_ = data_view_get_source (_tmp25_);
+ _tmp24_ = data_view_get_source (_tmp23_);
#line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATEABLE, Dateable);
+ _tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATEABLE, Dateable);
#line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp28_ = dateable_get_exposure_time (_tmp27_);
+ _tmp26_ = dateable_get_exposure_time (_tmp25_);
#line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp29_ = time_shift;
+ _tmp27_ = time_shift;
#line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp30_ = _tmp28_ + ((time_t) _tmp29_);
+ _tmp28_ = _tmp26_ + ((time_t) _tmp27_);
#line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp31_ = __time_t_dup0 (&_tmp30_);
+ _tmp29_ = __time_t_dup0 (&_tmp28_);
#line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (self->priv->new_time);
#line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->new_time = _tmp31_;
+ self->priv->new_time = _tmp29_;
#line 1384 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_object_unref0 (_tmp27_);
+ _g_object_unref0 (_tmp25_);
#line 1386 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (view);
#line 1386 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 11822 "Commands.c"
+#line 11736 "Commands.c"
}
#line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (view);
-#line 11826 "Commands.c"
+#line 11740 "Commands.c"
}
#line 1380 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_view_it);
-#line 11830 "Commands.c"
+#line 11744 "Commands.c"
}
#line 1390 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp32_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INVALID, (GBoxedCopyFunc) _time_t_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp30_ = gee_hash_map_new (TYPE_DATEABLE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, G_TYPE_INVALID, (GBoxedCopyFunc) _time_t_dup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 1390 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (self->priv->old_times);
#line 1390 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->old_times = _tmp32_;
+ self->priv->old_times = _tmp30_;
#line 1366 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 11840 "Commands.c"
+#line 11754 "Commands.c"
}
AdjustDateTimePhotosCommand* adjust_date_time_photos_command_new (GeeIterable* iter, gint64 time_shift, gboolean keep_relativity, gboolean modify_originals) {
#line 1366 "/home/jens/Source/shotwell/src/Commands.vala"
return adjust_date_time_photos_command_construct (TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, iter, time_shift, keep_relativity, modify_originals);
-#line 11847 "Commands.c"
+#line 11761 "Commands.c"
}
static void adjust_date_time_photos_command_real_execute (Command* base) {
AdjustDateTimePhotosCommand * self;
- GeeArrayList* _tmp0_ = NULL;
- GeeArrayList* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
+ GeeArrayList* _tmp0_;
+ GeeArrayList* _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
ViewCollection* all_events = NULL;
- ViewCollection* _tmp10_ = NULL;
+ ViewCollection* _tmp8_;
#line 1393 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, AdjustDateTimePhotosCommand);
#line 1394 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11873,13 +11787,11 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
_tmp3_ = _tmp2_;
#line 1397 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp3_ > 0) {
-#line 11877 "Commands.c"
- GeeArrayList* _tmp4_ = NULL;
- GeeArrayList* _tmp5_ = NULL;
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
- const gchar* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
+#line 11791 "Commands.c"
+ GeeArrayList* _tmp4_;
+ GeeArrayList* _tmp5_;
+ gint _tmp6_;
+ gint _tmp7_;
#line 1398 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = self->priv->error_list;
#line 1398 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11889,183 +11801,179 @@ static void adjust_date_time_photos_command_real_execute (Command* base) {
#line 1398 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = _tmp6_;
#line 1398 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp8_ = ngettext ("One original photo could not be adjusted.", "The following original photos could not be adjusted.", (gulong) _tmp7_);
-#line 1398 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp9_ = _ ("Time Adjustment Error");
-#line 1398 "/home/jens/Source/shotwell/src/Commands.vala"
- multiple_object_error_dialog (_tmp4_, _tmp8_, _tmp9_);
-#line 11898 "Commands.c"
+ multiple_object_error_dialog (_tmp4_, ngettext ("One original photo could not be adjusted.", "The following original photos could not be adjusted.", (gulong) _tmp7_), _ ("Time Adjustment Error"));
+#line 11806 "Commands.c"
}
#line 1404 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp10_ = view_collection_new ("tmp");
+ _tmp8_ = view_collection_new ("tmp");
#line 1404 "/home/jens/Source/shotwell/src/Commands.vala"
- all_events = _tmp10_;
-#line 11904 "Commands.c"
+ all_events = _tmp8_;
+#line 11812 "Commands.c"
{
GeeIterator* _d_it = NULL;
- GeeMap* _tmp11_ = NULL;
- GeeSet* _tmp12_ = NULL;
- GeeSet* _tmp13_ = NULL;
- GeeSet* _tmp14_ = NULL;
- GeeIterator* _tmp15_ = NULL;
- GeeIterator* _tmp16_ = NULL;
+ GeeMap* _tmp9_;
+ GeeSet* _tmp10_;
+ GeeSet* _tmp11_;
+ GeeSet* _tmp12_;
+ GeeIterator* _tmp13_;
+ GeeIterator* _tmp14_;
#line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp11_ = self->priv->prev_events;
+ _tmp9_ = self->priv->prev_events;
#line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp12_ = gee_map_get_keys (_tmp11_);
+ _tmp10_ = gee_map_get_keys (_tmp9_);
#line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp13_ = _tmp12_;
+ _tmp11_ = _tmp10_;
#line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp14_ = _tmp13_;
+ _tmp12_ = _tmp11_;
#line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
#line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp16_ = _tmp15_;
+ _tmp14_ = _tmp13_;
#line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_object_unref0 (_tmp14_);
+ _g_object_unref0 (_tmp12_);
#line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
- _d_it = _tmp16_;
+ _d_it = _tmp14_;
#line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 11931 "Commands.c"
- GeeIterator* _tmp17_ = NULL;
- gboolean _tmp18_ = FALSE;
+#line 11839 "Commands.c"
+ GeeIterator* _tmp15_;
+ gboolean _tmp16_;
Dateable* d = NULL;
- GeeIterator* _tmp19_ = NULL;
- gpointer _tmp20_ = NULL;
- Dateable* _tmp37_ = NULL;
- ViewCollection* _tmp38_ = NULL;
+ GeeIterator* _tmp17_;
+ gpointer _tmp18_;
+ Dateable* _tmp35_;
+ ViewCollection* _tmp36_;
#line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp17_ = _d_it;
+ _tmp15_ = _d_it;
#line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp18_ = gee_iterator_next (_tmp17_);
+ _tmp16_ = gee_iterator_next (_tmp15_);
#line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
- if (!_tmp18_) {
+ if (!_tmp16_) {
#line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 11947 "Commands.c"
+#line 11855 "Commands.c"
}
#line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp19_ = _d_it;
+ _tmp17_ = _d_it;
#line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp20_ = gee_iterator_get (_tmp19_);
+ _tmp18_ = gee_iterator_get (_tmp17_);
#line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
- d = (Dateable*) _tmp20_;
-#line 11955 "Commands.c"
+ d = (Dateable*) _tmp18_;
+#line 11863 "Commands.c"
{
GeeIterator* _dobj_it = NULL;
- EventSourceCollection* _tmp21_ = NULL;
- GeeCollection* _tmp22_ = NULL;
- GeeCollection* _tmp23_ = NULL;
- GeeIterator* _tmp24_ = NULL;
- GeeIterator* _tmp25_ = NULL;
+ EventSourceCollection* _tmp19_;
+ GeeCollection* _tmp20_;
+ GeeCollection* _tmp21_;
+ GeeIterator* _tmp22_;
+ GeeIterator* _tmp23_;
#line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp21_ = event_global;
+ _tmp19_ = event_global;
#line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp22_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection));
+ _tmp20_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_COLLECTION, DataCollection));
#line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp23_ = _tmp22_;
+ _tmp21_ = _tmp20_;
#line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp24_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable));
+ _tmp22_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ITERABLE, GeeIterable));
#line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp25_ = _tmp24_;
+ _tmp23_ = _tmp22_;
#line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_object_unref0 (_tmp23_);
+ _g_object_unref0 (_tmp21_);
#line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
- _dobj_it = _tmp25_;
+ _dobj_it = _tmp23_;
#line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 11979 "Commands.c"
- GeeIterator* _tmp26_ = NULL;
- gboolean _tmp27_ = FALSE;
+#line 11887 "Commands.c"
+ GeeIterator* _tmp24_;
+ gboolean _tmp25_;
DataObject* dobj = NULL;
- GeeIterator* _tmp28_ = NULL;
- gpointer _tmp29_ = NULL;
+ GeeIterator* _tmp26_;
+ gpointer _tmp27_;
Event* event = NULL;
- DataObject* _tmp30_ = NULL;
- Event* _tmp31_ = NULL;
- Event* _tmp32_ = NULL;
+ DataObject* _tmp28_;
+ Event* _tmp29_;
+ Event* _tmp30_;
#line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp26_ = _dobj_it;
+ _tmp24_ = _dobj_it;
#line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp27_ = gee_iterator_next (_tmp26_);
+ _tmp25_ = gee_iterator_next (_tmp24_);
#line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
- if (!_tmp27_) {
+ if (!_tmp25_) {
#line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 11997 "Commands.c"
+#line 11905 "Commands.c"
}
#line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp28_ = _dobj_it;
+ _tmp26_ = _dobj_it;
#line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp29_ = gee_iterator_get (_tmp28_);
+ _tmp27_ = gee_iterator_get (_tmp26_);
#line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
- dobj = (DataObject*) _tmp29_;
+ dobj = (DataObject*) _tmp27_;
#line 1408 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp30_ = dobj;
+ _tmp28_ = dobj;
#line 1408 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_EVENT) ? ((Event*) _tmp30_) : NULL);
+ _tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, TYPE_EVENT) ? ((Event*) _tmp28_) : NULL);
#line 1408 "/home/jens/Source/shotwell/src/Commands.vala"
- event = _tmp31_;
+ event = _tmp29_;
#line 1409 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp32_ = event;
+ _tmp30_ = event;
#line 1409 "/home/jens/Source/shotwell/src/Commands.vala"
- if (_tmp32_ != NULL) {
-#line 12015 "Commands.c"
- ViewCollection* _tmp33_ = NULL;
- Event* _tmp34_ = NULL;
- EventView* _tmp35_ = NULL;
- EventView* _tmp36_ = NULL;
+ if (_tmp30_ != NULL) {
+#line 11923 "Commands.c"
+ ViewCollection* _tmp31_;
+ Event* _tmp32_;
+ EventView* _tmp33_;
+ EventView* _tmp34_;
#line 1410 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp33_ = all_events;
+ _tmp31_ = all_events;
#line 1410 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp34_ = event;
+ _tmp32_ = event;
#line 1410 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp35_ = event_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_EVENT_SOURCE, EventSource));
+ _tmp33_ = event_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_EVENT_SOURCE, EventSource));
#line 1410 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp36_ = _tmp35_;
+ _tmp34_ = _tmp33_;
#line 1410 "/home/jens/Source/shotwell/src/Commands.vala"
- data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_DATA_OBJECT, DataObject));
+ data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_DATA_OBJECT, DataObject));
#line 1410 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_object_unref0 (_tmp36_);
-#line 12032 "Commands.c"
+ _g_object_unref0 (_tmp34_);
+#line 11940 "Commands.c"
}
#line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (event);
#line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (dobj);
-#line 12038 "Commands.c"
+#line 11946 "Commands.c"
}
#line 1407 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_dobj_it);
-#line 12042 "Commands.c"
+#line 11950 "Commands.c"
}
#line 1413 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp37_ = d;
+ _tmp35_ = d;
#line 1413 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp38_ = all_events;
+ _tmp36_ = all_events;
#line 1413 "/home/jens/Source/shotwell/src/Commands.vala"
- event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_MEDIA_SOURCE, MediaSource), _tmp38_, NULL);
+ event_generate_single_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE, MediaSource), _tmp36_, NULL);
#line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (d);
-#line 12052 "Commands.c"
+#line 11960 "Commands.c"
}
#line 1406 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_d_it);
-#line 12056 "Commands.c"
+#line 11964 "Commands.c"
}
#line 1393 "/home/jens/Source/shotwell/src/Commands.vala"
_data_collection_unref0 (all_events);
-#line 12060 "Commands.c"
+#line 11968 "Commands.c"
}
static void adjust_date_time_photos_command_real_undo (Command* base) {
AdjustDateTimePhotosCommand * self;
- GeeArrayList* _tmp0_ = NULL;
- GeeArrayList* _tmp1_ = NULL;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
+ GeeArrayList* _tmp0_;
+ GeeArrayList* _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
#line 1417 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, AdjustDateTimePhotosCommand);
#line 1418 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12084,13 +11992,11 @@ static void adjust_date_time_photos_command_real_undo (Command* base) {
_tmp3_ = _tmp2_;
#line 1421 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp3_ > 0) {
-#line 12088 "Commands.c"
- GeeArrayList* _tmp4_ = NULL;
- GeeArrayList* _tmp5_ = NULL;
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
- const gchar* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
+#line 11996 "Commands.c"
+ GeeArrayList* _tmp4_;
+ GeeArrayList* _tmp5_;
+ gint _tmp6_;
+ gint _tmp7_;
#line 1422 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = self->priv->error_list;
#line 1422 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12100,19 +12006,15 @@ static void adjust_date_time_photos_command_real_undo (Command* base) {
#line 1422 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = _tmp6_;
#line 1422 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp8_ = ngettext ("Time adjustments could not be undone on the following photo file.", "Time adjustments could not be undone on the following photo files.", (gulong) _tmp7_);
-#line 1422 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp9_ = _ ("Time Adjustment Error");
-#line 1422 "/home/jens/Source/shotwell/src/Commands.vala"
- multiple_object_error_dialog (_tmp4_, _tmp8_, _tmp9_);
-#line 12109 "Commands.c"
+ multiple_object_error_dialog (_tmp4_, ngettext ("Time adjustments could not be undone on the following photo file.", "Time adjustments could not be undone on the following photo files.", (gulong) _tmp7_), _ ("Time Adjustment Error"));
+#line 12011 "Commands.c"
}
}
static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosCommand* self, Dateable* dateable, time_t exposure_time) {
gboolean _tmp0_ = FALSE;
- gboolean _tmp1_ = FALSE;
+ gboolean _tmp1_;
GError * _inner_error_ = NULL;
#line 1429 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_ADJUST_DATE_TIME_PHOTOS_COMMAND (self));
@@ -12122,24 +12024,24 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
_tmp1_ = self->priv->modify_originals;
#line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp1_) {
-#line 12126 "Commands.c"
- Dateable* _tmp2_ = NULL;
+#line 12028 "Commands.c"
+ Dateable* _tmp2_;
#line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = dateable;
#line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_PHOTO);
-#line 12132 "Commands.c"
+#line 12034 "Commands.c"
} else {
#line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = FALSE;
-#line 12136 "Commands.c"
+#line 12038 "Commands.c"
}
#line 1433 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp0_) {
-#line 12140 "Commands.c"
+#line 12042 "Commands.c"
{
- Dateable* _tmp3_ = NULL;
- time_t _tmp4_ = 0;
+ Dateable* _tmp3_;
+ time_t _tmp4_;
#line 1435 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = dateable;
#line 1435 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12148,16 +12050,16 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
photo_set_exposure_time_persistent (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO, Photo), _tmp4_, &_inner_error_);
#line 1435 "/home/jens/Source/shotwell/src/Commands.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12152 "Commands.c"
- goto __catch459_g_error;
+#line 12054 "Commands.c"
+ goto __catch460_g_error;
}
}
- goto __finally459;
- __catch459_g_error:
+ goto __finally460;
+ __catch460_g_error:
{
GError* err = NULL;
- GeeArrayList* _tmp5_ = NULL;
- Dateable* _tmp6_ = NULL;
+ GeeArrayList* _tmp5_;
+ Dateable* _tmp6_;
#line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
err = _inner_error_;
#line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12170,9 +12072,9 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp6_);
#line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
_g_error_free0 (err);
-#line 12174 "Commands.c"
+#line 12076 "Commands.c"
}
- __finally459:
+ __finally460:
#line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12181,18 +12083,18 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
g_clear_error (&_inner_error_);
#line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
return;
-#line 12185 "Commands.c"
+#line 12087 "Commands.c"
}
} else {
- Dateable* _tmp7_ = NULL;
- time_t _tmp8_ = 0;
+ Dateable* _tmp7_;
+ time_t _tmp8_;
#line 1442 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = dateable;
#line 1442 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp8_ = exposure_time;
#line 1442 "/home/jens/Source/shotwell/src/Commands.vala"
dateable_set_exposure_time (_tmp7_, _tmp8_);
-#line 12196 "Commands.c"
+#line 12098 "Commands.c"
}
}
@@ -12200,14 +12102,14 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
static void adjust_date_time_photos_command_real_execute_on_source (MultipleDataSourceCommand* base, DataSource* source) {
AdjustDateTimePhotosCommand * self;
Dateable* dateable = NULL;
- DataSource* _tmp0_ = NULL;
- Dateable* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ Dateable* _tmp1_;
gboolean _tmp2_ = FALSE;
- gboolean _tmp3_ = FALSE;
+ gboolean _tmp3_;
ViewCollection* all_events = NULL;
- ViewCollection* _tmp16_ = NULL;
- Dateable* _tmp33_ = NULL;
- ViewCollection* _tmp34_ = NULL;
+ ViewCollection* _tmp16_;
+ Dateable* _tmp33_;
+ ViewCollection* _tmp34_;
#line 1446 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, AdjustDateTimePhotosCommand);
#line 1446 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12222,28 +12124,28 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
_tmp3_ = self->priv->keep_relativity;
#line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp3_) {
-#line 12226 "Commands.c"
- Dateable* _tmp4_ = NULL;
- time_t _tmp5_ = 0;
+#line 12128 "Commands.c"
+ Dateable* _tmp4_;
+ time_t _tmp5_;
#line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = dateable;
#line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = dateable_get_exposure_time (_tmp4_);
#line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _tmp5_ != ((time_t) 0);
-#line 12235 "Commands.c"
+#line 12137 "Commands.c"
} else {
#line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = FALSE;
-#line 12239 "Commands.c"
+#line 12141 "Commands.c"
}
#line 1449 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp2_) {
-#line 12243 "Commands.c"
- Dateable* _tmp6_ = NULL;
- Dateable* _tmp7_ = NULL;
- time_t _tmp8_ = 0;
- gint64 _tmp9_ = 0LL;
+#line 12145 "Commands.c"
+ Dateable* _tmp6_;
+ Dateable* _tmp7_;
+ time_t _tmp8_;
+ gint64 _tmp9_;
#line 1450 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = dateable;
#line 1450 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12254,14 +12156,14 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
_tmp9_ = self->priv->time_shift;
#line 1450 "/home/jens/Source/shotwell/src/Commands.vala"
adjust_date_time_photos_command_set_time (self, _tmp6_, _tmp8_ + ((time_t) _tmp9_));
-#line 12258 "Commands.c"
+#line 12160 "Commands.c"
} else {
- GeeHashMap* _tmp10_ = NULL;
- Dateable* _tmp11_ = NULL;
- Dateable* _tmp12_ = NULL;
- time_t _tmp13_ = 0;
- Dateable* _tmp14_ = NULL;
- time_t* _tmp15_ = NULL;
+ GeeHashMap* _tmp10_;
+ Dateable* _tmp11_;
+ Dateable* _tmp12_;
+ time_t _tmp13_;
+ Dateable* _tmp14_;
+ time_t* _tmp15_;
#line 1452 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp10_ = self->priv->old_times;
#line 1452 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12278,20 +12180,20 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
_tmp15_ = self->priv->new_time;
#line 1453 "/home/jens/Source/shotwell/src/Commands.vala"
adjust_date_time_photos_command_set_time (self, _tmp14_, *_tmp15_);
-#line 12282 "Commands.c"
+#line 12184 "Commands.c"
}
#line 1456 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp16_ = view_collection_new ("tmp");
#line 1456 "/home/jens/Source/shotwell/src/Commands.vala"
all_events = _tmp16_;
-#line 12288 "Commands.c"
+#line 12190 "Commands.c"
{
GeeIterator* _dobj_it = NULL;
- EventSourceCollection* _tmp17_ = NULL;
- GeeCollection* _tmp18_ = NULL;
- GeeCollection* _tmp19_ = NULL;
- GeeIterator* _tmp20_ = NULL;
- GeeIterator* _tmp21_ = NULL;
+ EventSourceCollection* _tmp17_;
+ GeeCollection* _tmp18_;
+ GeeCollection* _tmp19_;
+ GeeIterator* _tmp20_;
+ GeeIterator* _tmp21_;
#line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp17_ = event_global;
#line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12308,16 +12210,16 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
_dobj_it = _tmp21_;
#line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 12312 "Commands.c"
- GeeIterator* _tmp22_ = NULL;
- gboolean _tmp23_ = FALSE;
+#line 12214 "Commands.c"
+ GeeIterator* _tmp22_;
+ gboolean _tmp23_;
DataObject* dobj = NULL;
- GeeIterator* _tmp24_ = NULL;
- gpointer _tmp25_ = NULL;
+ GeeIterator* _tmp24_;
+ gpointer _tmp25_;
Event* event = NULL;
- DataObject* _tmp26_ = NULL;
- Event* _tmp27_ = NULL;
- Event* _tmp28_ = NULL;
+ DataObject* _tmp26_;
+ Event* _tmp27_;
+ Event* _tmp28_;
#line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp22_ = _dobj_it;
#line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12326,7 +12228,7 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
if (!_tmp23_) {
#line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 12330 "Commands.c"
+#line 12232 "Commands.c"
}
#line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp24_ = _dobj_it;
@@ -12344,11 +12246,11 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
_tmp28_ = event;
#line 1460 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp28_ != NULL) {
-#line 12348 "Commands.c"
- ViewCollection* _tmp29_ = NULL;
- Event* _tmp30_ = NULL;
- EventView* _tmp31_ = NULL;
- EventView* _tmp32_ = NULL;
+#line 12250 "Commands.c"
+ ViewCollection* _tmp29_;
+ Event* _tmp30_;
+ EventView* _tmp31_;
+ EventView* _tmp32_;
#line 1461 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp29_ = all_events;
#line 1461 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12361,17 +12263,17 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject));
#line 1461 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp32_);
-#line 12365 "Commands.c"
+#line 12267 "Commands.c"
}
#line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (event);
#line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (dobj);
-#line 12371 "Commands.c"
+#line 12273 "Commands.c"
}
#line 1458 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_dobj_it);
-#line 12375 "Commands.c"
+#line 12277 "Commands.c"
}
#line 1464 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp33_ = dateable;
@@ -12383,23 +12285,23 @@ static void adjust_date_time_photos_command_real_execute_on_source (MultipleData
_data_collection_unref0 (all_events);
#line 1446 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (dateable);
-#line 12387 "Commands.c"
+#line 12289 "Commands.c"
}
static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSourceCommand* base, DataSource* source) {
AdjustDateTimePhotosCommand * self;
Dateable* photo = NULL;
- DataSource* _tmp0_ = NULL;
- Dateable* _tmp1_ = NULL;
- GeeHashMap* _tmp2_ = NULL;
- Dateable* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
- DataSource* _tmp16_ = NULL;
- GeeMap* _tmp17_ = NULL;
- DataSource* _tmp18_ = NULL;
- gpointer _tmp19_ = NULL;
- Event* _tmp20_ = NULL;
+ DataSource* _tmp0_;
+ Dateable* _tmp1_;
+ GeeHashMap* _tmp2_;
+ Dateable* _tmp3_;
+ gboolean _tmp4_;
+ DataSource* _tmp16_;
+ GeeMap* _tmp17_;
+ DataSource* _tmp18_;
+ gpointer _tmp19_;
+ Event* _tmp20_;
#line 1467 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, AdjustDateTimePhotosCommand);
#line 1467 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12418,14 +12320,14 @@ static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSou
_tmp4_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_);
#line 1470 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp4_) {
-#line 12422 "Commands.c"
- Dateable* _tmp5_ = NULL;
- GeeHashMap* _tmp6_ = NULL;
- Dateable* _tmp7_ = NULL;
- gpointer _tmp8_ = NULL;
- time_t* _tmp9_ = NULL;
- GeeHashMap* _tmp10_ = NULL;
- Dateable* _tmp11_ = NULL;
+#line 12324 "Commands.c"
+ Dateable* _tmp5_;
+ GeeHashMap* _tmp6_;
+ Dateable* _tmp7_;
+ gpointer _tmp8_;
+ time_t* _tmp9_;
+ GeeHashMap* _tmp10_;
+ Dateable* _tmp11_;
#line 1471 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = photo;
#line 1471 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12446,12 +12348,12 @@ static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSou
_tmp11_ = photo;
#line 1472 "/home/jens/Source/shotwell/src/Commands.vala"
gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL);
-#line 12450 "Commands.c"
+#line 12352 "Commands.c"
} else {
- Dateable* _tmp12_ = NULL;
- Dateable* _tmp13_ = NULL;
- time_t _tmp14_ = 0;
- gint64 _tmp15_ = 0LL;
+ Dateable* _tmp12_;
+ Dateable* _tmp13_;
+ time_t _tmp14_;
+ gint64 _tmp15_;
#line 1474 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp12_ = photo;
#line 1474 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12462,7 +12364,7 @@ static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSou
_tmp15_ = self->priv->time_shift;
#line 1474 "/home/jens/Source/shotwell/src/Commands.vala"
adjust_date_time_photos_command_set_time (self, _tmp12_, _tmp14_ - ((time_t) _tmp15_));
-#line 12466 "Commands.c"
+#line 12368 "Commands.c"
}
#line 1477 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp16_ = source;
@@ -12480,7 +12382,7 @@ static void adjust_date_time_photos_command_real_undo_on_source (MultipleDataSou
_g_object_unref0 (_tmp20_);
#line 1467 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (photo);
-#line 12484 "Commands.c"
+#line 12386 "Commands.c"
}
@@ -12490,16 +12392,16 @@ static void adjust_date_time_photos_command_class_init (AdjustDateTimePhotosComm
#line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (AdjustDateTimePhotosCommandPrivate));
#line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) adjust_date_time_photos_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) adjust_date_time_photos_command_real_execute;
#line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) adjust_date_time_photos_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) adjust_date_time_photos_command_real_undo;
#line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) adjust_date_time_photos_command_real_execute_on_source;
+ ((MultipleDataSourceCommandClass *) klass)->execute_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) adjust_date_time_photos_command_real_execute_on_source;
#line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*)(MultipleDataSourceCommand*, DataSource*)) adjust_date_time_photos_command_real_undo_on_source;
+ ((MultipleDataSourceCommandClass *) klass)->undo_on_source = (void (*) (MultipleDataSourceCommand *, DataSource*)) adjust_date_time_photos_command_real_undo_on_source;
#line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = adjust_date_time_photos_command_finalize;
-#line 12503 "Commands.c"
+#line 12405 "Commands.c"
}
@@ -12508,11 +12410,11 @@ static void adjust_date_time_photos_command_instance_init (AdjustDateTimePhotosC
self->priv = ADJUST_DATE_TIME_PHOTOS_COMMAND_GET_PRIVATE (self);
#line 1362 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->new_time = NULL;
-#line 12512 "Commands.c"
+#line 12414 "Commands.c"
}
-static void adjust_date_time_photos_command_finalize (GObject* obj) {
+static void adjust_date_time_photos_command_finalize (GObject * obj) {
AdjustDateTimePhotosCommand * self;
#line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_DATE_TIME_PHOTOS_COMMAND, AdjustDateTimePhotosCommand);
@@ -12526,7 +12428,7 @@ static void adjust_date_time_photos_command_finalize (GObject* obj) {
_g_object_unref0 (self->priv->error_list);
#line 1355 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (adjust_date_time_photos_command_parent_class)->finalize (obj);
-#line 12530 "Commands.c"
+#line 12432 "Commands.c"
}
@@ -12545,27 +12447,27 @@ GType adjust_date_time_photos_command_get_type (void) {
static void _add_tags_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) {
#line 1521 "/home/jens/Source/shotwell/src/Commands.vala"
add_tags_command_on_proxy_broken ((AddTagsCommand*) self);
-#line 12549 "Commands.c"
+#line 12451 "Commands.c"
}
static void _add_tags_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
#line 1523 "/home/jens/Source/shotwell/src/Commands.vala"
add_tags_command_on_source_destroyed ((AddTagsCommand*) self, source);
-#line 12556 "Commands.c"
+#line 12458 "Commands.c"
}
AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, int paths_length1, GeeCollection* sources) {
AddTagsCommand * self = NULL;
- gchar** _tmp0_ = NULL;
- gint _tmp0__length1 = 0;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar** _tmp3_ = NULL;
- gint _tmp3__length1 = 0;
- LibraryPhotoSourceCollection* _tmp43_ = NULL;
- VideoSourceCollection* _tmp44_ = NULL;
+ gchar** _tmp0_;
+ gint _tmp0__length1;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar** _tmp3_;
+ gint _tmp3__length1;
+ LibraryPhotoSourceCollection* _tmp43_;
+ VideoSourceCollection* _tmp44_;
#line 1485 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (sources), NULL);
#line 1486 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12584,7 +12486,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
_tmp3_ = paths;
#line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3__length1 = paths_length1;
-#line 12588 "Commands.c"
+#line 12490 "Commands.c"
{
gchar** path_collection = NULL;
gint path_collection_length1 = 0;
@@ -12596,20 +12498,20 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
path_collection_length1 = _tmp3__length1;
#line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
for (path_it = 0; path_it < _tmp3__length1; path_it = path_it + 1) {
-#line 12600 "Commands.c"
- gchar* _tmp4_ = NULL;
+#line 12502 "Commands.c"
+ gchar* _tmp4_;
gchar* path = NULL;
#line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = g_strdup (path_collection[path_it]);
#line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
path = _tmp4_;
-#line 12607 "Commands.c"
+#line 12509 "Commands.c"
{
GeeList* paths_to_create = NULL;
- const gchar* _tmp5_ = NULL;
- GeeList* _tmp6_ = NULL;
- GeeList* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
+ const gchar* _tmp5_;
+ GeeList* _tmp6_;
+ GeeList* _tmp7_;
+ const gchar* _tmp8_;
#line 1492 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = path;
#line 1492 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12622,15 +12524,15 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
_tmp8_ = path;
#line 1494 "/home/jens/Source/shotwell/src/Commands.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp8_);
-#line 12626 "Commands.c"
+#line 12528 "Commands.c"
{
GeeList* _create_path_list = NULL;
- GeeList* _tmp9_ = NULL;
- GeeList* _tmp10_ = NULL;
+ GeeList* _tmp9_;
+ GeeList* _tmp10_;
gint _create_path_size = 0;
- GeeList* _tmp11_ = NULL;
- gint _tmp12_ = 0;
- gint _tmp13_ = 0;
+ GeeList* _tmp11_;
+ gint _tmp12_;
+ gint _tmp13_;
gint _create_path_index = 0;
#line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp9_ = paths_to_create;
@@ -12650,25 +12552,25 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
_create_path_index = -1;
#line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 12654 "Commands.c"
- gint _tmp14_ = 0;
- gint _tmp15_ = 0;
- gint _tmp16_ = 0;
+#line 12556 "Commands.c"
+ gint _tmp14_;
+ gint _tmp15_;
+ gint _tmp16_;
gchar* create_path = NULL;
- GeeList* _tmp17_ = NULL;
- gint _tmp18_ = 0;
- gpointer _tmp19_ = NULL;
+ GeeList* _tmp17_;
+ gint _tmp18_;
+ gpointer _tmp19_;
Tag* tag = NULL;
- const gchar* _tmp20_ = NULL;
- Tag* _tmp21_ = NULL;
+ const gchar* _tmp20_;
+ Tag* _tmp21_;
SourceProxy* tag_proxy = NULL;
- Tag* _tmp22_ = NULL;
- SourceProxy* _tmp23_ = NULL;
+ Tag* _tmp22_;
+ SourceProxy* _tmp23_;
GeeArrayList* add_sources = NULL;
- GeeArrayList* _tmp24_ = NULL;
- GeeArrayList* _tmp36_ = NULL;
- gint _tmp37_ = 0;
- gint _tmp38_ = 0;
+ GeeArrayList* _tmp24_;
+ GeeArrayList* _tmp36_;
+ gint _tmp37_;
+ gint _tmp38_;
#line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp14_ = _create_path_index;
#line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12681,7 +12583,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
if (!(_tmp15_ < _tmp16_)) {
#line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 12685 "Commands.c"
+#line 12587 "Commands.c"
}
#line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp17_ = _create_path_list;
@@ -12707,11 +12609,11 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
_tmp24_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
#line 1502 "/home/jens/Source/shotwell/src/Commands.vala"
add_sources = _tmp24_;
-#line 12711 "Commands.c"
+#line 12613 "Commands.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp25_ = NULL;
- GeeIterator* _tmp26_ = NULL;
+ GeeCollection* _tmp25_;
+ GeeIterator* _tmp26_;
#line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp25_ = sources;
#line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12720,15 +12622,15 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
_source_it = _tmp26_;
#line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 12724 "Commands.c"
- GeeIterator* _tmp27_ = NULL;
- gboolean _tmp28_ = FALSE;
+#line 12626 "Commands.c"
+ GeeIterator* _tmp27_;
+ gboolean _tmp28_;
MediaSource* source = NULL;
- GeeIterator* _tmp29_ = NULL;
- gpointer _tmp30_ = NULL;
- Tag* _tmp31_ = NULL;
- MediaSource* _tmp32_ = NULL;
- gboolean _tmp33_ = FALSE;
+ GeeIterator* _tmp29_;
+ gpointer _tmp30_;
+ Tag* _tmp31_;
+ MediaSource* _tmp32_;
+ gboolean _tmp33_;
#line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp27_ = _source_it;
#line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12737,7 +12639,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
if (!_tmp28_) {
#line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 12741 "Commands.c"
+#line 12643 "Commands.c"
}
#line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp29_ = _source_it;
@@ -12753,24 +12655,24 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
_tmp33_ = tag_contains (_tmp31_, _tmp32_);
#line 1504 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp33_) {
-#line 12757 "Commands.c"
- GeeArrayList* _tmp34_ = NULL;
- MediaSource* _tmp35_ = NULL;
+#line 12659 "Commands.c"
+ GeeArrayList* _tmp34_;
+ MediaSource* _tmp35_;
#line 1505 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp34_ = add_sources;
#line 1505 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp35_ = source;
#line 1505 "/home/jens/Source/shotwell/src/Commands.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp35_);
-#line 12766 "Commands.c"
+#line 12668 "Commands.c"
}
#line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (source);
-#line 12770 "Commands.c"
+#line 12672 "Commands.c"
}
#line 1503 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_source_it);
-#line 12774 "Commands.c"
+#line 12676 "Commands.c"
}
#line 1508 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp36_ = add_sources;
@@ -12780,11 +12682,11 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
_tmp38_ = _tmp37_;
#line 1508 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp38_ > 0) {
-#line 12784 "Commands.c"
- SourceProxy* _tmp39_ = NULL;
- GeeHashMap* _tmp40_ = NULL;
- SourceProxy* _tmp41_ = NULL;
- GeeArrayList* _tmp42_ = NULL;
+#line 12686 "Commands.c"
+ SourceProxy* _tmp39_;
+ GeeHashMap* _tmp40_;
+ SourceProxy* _tmp41_;
+ GeeArrayList* _tmp42_;
#line 1509 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp39_ = tag_proxy;
#line 1509 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12797,7 +12699,7 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
_tmp42_ = add_sources;
#line 1510 "/home/jens/Source/shotwell/src/Commands.vala"
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp41_, _tmp42_);
-#line 12801 "Commands.c"
+#line 12703 "Commands.c"
}
#line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (add_sources);
@@ -12807,17 +12709,17 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
_g_object_unref0 (tag);
#line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (create_path);
-#line 12811 "Commands.c"
+#line 12713 "Commands.c"
}
#line 1496 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_create_path_list);
-#line 12815 "Commands.c"
+#line 12717 "Commands.c"
}
#line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (paths_to_create);
#line 1491 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (path);
-#line 12821 "Commands.c"
+#line 12723 "Commands.c"
}
}
}
@@ -12831,14 +12733,14 @@ AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, in
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _add_tags_command_on_source_destroyed_source_collection_item_destroyed, self, 0);
#line 1485 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 12835 "Commands.c"
+#line 12737 "Commands.c"
}
AddTagsCommand* add_tags_command_new (gchar** paths, int paths_length1, GeeCollection* sources) {
#line 1485 "/home/jens/Source/shotwell/src/Commands.vala"
return add_tags_command_construct (TYPE_ADD_TAGS_COMMAND, paths, paths_length1, sources);
-#line 12842 "Commands.c"
+#line 12744 "Commands.c"
}
@@ -12846,15 +12748,15 @@ static void add_tags_command_real_execute (Command* base) {
AddTagsCommand * self;
#line 1527 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADD_TAGS_COMMAND, AddTagsCommand);
-#line 12850 "Commands.c"
+#line 12752 "Commands.c"
{
GeeIterator* _tag_proxy_it = NULL;
- GeeHashMap* _tmp0_ = NULL;
- GeeSet* _tmp1_ = NULL;
- GeeSet* _tmp2_ = NULL;
- GeeSet* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ GeeHashMap* _tmp0_;
+ GeeSet* _tmp1_;
+ GeeSet* _tmp2_;
+ GeeSet* _tmp3_;
+ GeeIterator* _tmp4_;
+ GeeIterator* _tmp5_;
#line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->map;
#line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12873,19 +12775,19 @@ static void add_tags_command_real_execute (Command* base) {
_tag_proxy_it = _tmp5_;
#line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 12877 "Commands.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 12779 "Commands.c"
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
SourceProxy* tag_proxy = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
- SourceProxy* _tmp10_ = NULL;
- DataSource* _tmp11_ = NULL;
- Tag* _tmp12_ = NULL;
- GeeHashMap* _tmp13_ = NULL;
- SourceProxy* _tmp14_ = NULL;
- gpointer _tmp15_ = NULL;
- GeeArrayList* _tmp16_ = NULL;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
+ SourceProxy* _tmp10_;
+ DataSource* _tmp11_;
+ Tag* _tmp12_;
+ GeeHashMap* _tmp13_;
+ SourceProxy* _tmp14_;
+ gpointer _tmp15_;
+ GeeArrayList* _tmp16_;
#line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = _tag_proxy_it;
#line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12894,7 +12796,7 @@ static void add_tags_command_real_execute (Command* base) {
if (!_tmp7_) {
#line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 12898 "Commands.c"
+#line 12800 "Commands.c"
}
#line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp8_ = _tag_proxy_it;
@@ -12924,11 +12826,11 @@ static void add_tags_command_real_execute (Command* base) {
_g_object_unref0 (_tmp12_);
#line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
_source_proxy_unref0 (tag_proxy);
-#line 12928 "Commands.c"
+#line 12830 "Commands.c"
}
#line 1528 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tag_proxy_it);
-#line 12932 "Commands.c"
+#line 12834 "Commands.c"
}
}
@@ -12937,15 +12839,15 @@ static void add_tags_command_real_undo (Command* base) {
AddTagsCommand * self;
#line 1532 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADD_TAGS_COMMAND, AddTagsCommand);
-#line 12941 "Commands.c"
+#line 12843 "Commands.c"
{
GeeIterator* _tag_proxy_it = NULL;
- GeeHashMap* _tmp0_ = NULL;
- GeeSet* _tmp1_ = NULL;
- GeeSet* _tmp2_ = NULL;
- GeeSet* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ GeeHashMap* _tmp0_;
+ GeeSet* _tmp1_;
+ GeeSet* _tmp2_;
+ GeeSet* _tmp3_;
+ GeeIterator* _tmp4_;
+ GeeIterator* _tmp5_;
#line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->map;
#line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12964,22 +12866,22 @@ static void add_tags_command_real_undo (Command* base) {
_tag_proxy_it = _tmp5_;
#line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 12968 "Commands.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 12870 "Commands.c"
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
SourceProxy* tag_proxy = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
Tag* tag = NULL;
- SourceProxy* _tmp10_ = NULL;
- DataSource* _tmp11_ = NULL;
- Tag* _tmp12_ = NULL;
- GeeHashMap* _tmp13_ = NULL;
- SourceProxy* _tmp14_ = NULL;
- gpointer _tmp15_ = NULL;
- GeeArrayList* _tmp16_ = NULL;
- GeeMultiMap* _tmp17_ = NULL;
- GeeMultiMap* _tmp18_ = NULL;
+ SourceProxy* _tmp10_;
+ DataSource* _tmp11_;
+ Tag* _tmp12_;
+ GeeHashMap* _tmp13_;
+ SourceProxy* _tmp14_;
+ gpointer _tmp15_;
+ GeeArrayList* _tmp16_;
+ GeeMultiMap* _tmp17_;
+ GeeMultiMap* _tmp18_;
#line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = _tag_proxy_it;
#line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12988,7 +12890,7 @@ static void add_tags_command_real_undo (Command* base) {
if (!_tmp7_) {
#line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 12992 "Commands.c"
+#line 12894 "Commands.c"
}
#line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp8_ = _tag_proxy_it;
@@ -13024,11 +12926,11 @@ static void add_tags_command_real_undo (Command* base) {
_g_object_unref0 (tag);
#line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
_source_proxy_unref0 (tag_proxy);
-#line 13028 "Commands.c"
+#line 12930 "Commands.c"
}
#line 1533 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tag_proxy_it);
-#line 13032 "Commands.c"
+#line 12934 "Commands.c"
}
}
@@ -13038,15 +12940,15 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
g_return_if_fail (IS_ADD_TAGS_COMMAND (self));
#line 1540 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_DATA_SOURCE (source));
-#line 13042 "Commands.c"
+#line 12944 "Commands.c"
{
GeeIterator* _sources_it = NULL;
- GeeHashMap* _tmp0_ = NULL;
- GeeCollection* _tmp1_ = NULL;
- GeeCollection* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ GeeHashMap* _tmp0_;
+ GeeCollection* _tmp1_;
+ GeeCollection* _tmp2_;
+ GeeCollection* _tmp3_;
+ GeeIterator* _tmp4_;
+ GeeIterator* _tmp5_;
#line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->map;
#line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13065,15 +12967,15 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
_sources_it = _tmp5_;
#line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 13069 "Commands.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 12971 "Commands.c"
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
GeeArrayList* sources = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
- GeeArrayList* _tmp10_ = NULL;
- DataSource* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
+ GeeArrayList* _tmp10_;
+ DataSource* _tmp11_;
+ gboolean _tmp12_;
#line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = _sources_it;
#line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13082,7 +12984,7 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
if (!_tmp7_) {
#line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 13086 "Commands.c"
+#line 12988 "Commands.c"
}
#line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp8_ = _sources_it;
@@ -13098,9 +13000,9 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
_tmp12_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource));
#line 1542 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp12_) {
-#line 13102 "Commands.c"
- CommandManager* _tmp13_ = NULL;
- CommandManager* _tmp14_ = NULL;
+#line 13004 "Commands.c"
+ CommandManager* _tmp13_;
+ CommandManager* _tmp14_;
#line 1543 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp13_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command));
#line 1543 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13115,22 +13017,22 @@ static void add_tags_command_on_source_destroyed (AddTagsCommand* self, DataSour
_g_object_unref0 (_sources_it);
#line 1545 "/home/jens/Source/shotwell/src/Commands.vala"
return;
-#line 13119 "Commands.c"
+#line 13021 "Commands.c"
}
#line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (sources);
-#line 13123 "Commands.c"
+#line 13025 "Commands.c"
}
#line 1541 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_sources_it);
-#line 13127 "Commands.c"
+#line 13029 "Commands.c"
}
}
static void add_tags_command_on_proxy_broken (AddTagsCommand* self) {
- CommandManager* _tmp0_ = NULL;
- CommandManager* _tmp1_ = NULL;
+ CommandManager* _tmp0_;
+ CommandManager* _tmp1_;
#line 1550 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_ADD_TAGS_COMMAND (self));
#line 1551 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13141,7 +13043,7 @@ static void add_tags_command_on_proxy_broken (AddTagsCommand* self) {
command_manager_reset (_tmp1_);
#line 1551 "/home/jens/Source/shotwell/src/Commands.vala"
_command_manager_unref0 (_tmp1_);
-#line 13145 "Commands.c"
+#line 13047 "Commands.c"
}
@@ -13151,44 +13053,44 @@ static void add_tags_command_class_init (AddTagsCommandClass * klass) {
#line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (AddTagsCommandPrivate));
#line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) add_tags_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) add_tags_command_real_execute;
#line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) add_tags_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) add_tags_command_real_undo;
#line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = add_tags_command_finalize;
-#line 13160 "Commands.c"
+#line 13062 "Commands.c"
}
static void add_tags_command_instance_init (AddTagsCommand * self) {
- GeeHashMap* _tmp0_ = NULL;
+ GeeHashMap* _tmp0_;
#line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = ADD_TAGS_COMMAND_GET_PRIVATE (self);
#line 1482 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = gee_hash_map_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, GEE_TYPE_ARRAY_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 1482 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->map = _tmp0_;
-#line 13172 "Commands.c"
+#line 13074 "Commands.c"
}
-static void add_tags_command_finalize (GObject* obj) {
+static void add_tags_command_finalize (GObject * obj) {
AddTagsCommand * self;
- LibraryPhotoSourceCollection* _tmp12_ = NULL;
- guint _tmp13_ = 0U;
- VideoSourceCollection* _tmp14_ = NULL;
- guint _tmp15_ = 0U;
+ LibraryPhotoSourceCollection* _tmp12_;
+ guint _tmp13_;
+ VideoSourceCollection* _tmp14_;
+ guint _tmp15_;
#line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADD_TAGS_COMMAND, AddTagsCommand);
-#line 13184 "Commands.c"
+#line 13086 "Commands.c"
{
GeeIterator* _tag_proxy_it = NULL;
- GeeHashMap* _tmp0_ = NULL;
- GeeSet* _tmp1_ = NULL;
- GeeSet* _tmp2_ = NULL;
- GeeSet* _tmp3_ = NULL;
- GeeIterator* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
+ GeeHashMap* _tmp0_;
+ GeeSet* _tmp1_;
+ GeeSet* _tmp2_;
+ GeeSet* _tmp3_;
+ GeeIterator* _tmp4_;
+ GeeIterator* _tmp5_;
#line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->map;
#line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13207,14 +13109,14 @@ static void add_tags_command_finalize (GObject* obj) {
_tag_proxy_it = _tmp5_;
#line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 13211 "Commands.c"
- GeeIterator* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+#line 13113 "Commands.c"
+ GeeIterator* _tmp6_;
+ gboolean _tmp7_;
SourceProxy* tag_proxy = NULL;
- GeeIterator* _tmp8_ = NULL;
- gpointer _tmp9_ = NULL;
- SourceProxy* _tmp10_ = NULL;
- guint _tmp11_ = 0U;
+ GeeIterator* _tmp8_;
+ gpointer _tmp9_;
+ SourceProxy* _tmp10_;
+ guint _tmp11_;
#line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = _tag_proxy_it;
#line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13223,7 +13125,7 @@ static void add_tags_command_finalize (GObject* obj) {
if (!_tmp7_) {
#line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 13227 "Commands.c"
+#line 13129 "Commands.c"
}
#line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp8_ = _tag_proxy_it;
@@ -13239,11 +13141,11 @@ static void add_tags_command_finalize (GObject* obj) {
g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _add_tags_command_on_proxy_broken_source_proxy_broken, self);
#line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
_source_proxy_unref0 (tag_proxy);
-#line 13243 "Commands.c"
+#line 13145 "Commands.c"
}
#line 1520 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tag_proxy_it);
-#line 13247 "Commands.c"
+#line 13149 "Commands.c"
}
#line 1523 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp12_ = library_photo_global;
@@ -13261,7 +13163,7 @@ static void add_tags_command_finalize (GObject* obj) {
_g_object_unref0 (self->priv->map);
#line 1481 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (add_tags_command_parent_class)->finalize (obj);
-#line 13265 "Commands.c"
+#line 13167 "Commands.c"
}
@@ -13279,20 +13181,20 @@ GType add_tags_command_get_type (void) {
RenameTagCommand* rename_tag_command_construct (GType object_type, Tag* tag, const gchar* new_name) {
RenameTagCommand * self = NULL;
- Tag* _tmp0_ = NULL;
- Tag* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- Tag* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- Tag* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
+ Tag* _tmp0_;
+ Tag* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ Tag* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ Tag* _tmp10_;
+ gchar* _tmp11_;
+ const gchar* _tmp12_;
+ gchar* _tmp13_;
#line 1560 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_TAG (tag), NULL);
#line 1560 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13343,22 +13245,22 @@ RenameTagCommand* rename_tag_command_construct (GType object_type, Tag* tag, con
self->priv->new_name = _tmp13_;
#line 1560 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 13347 "Commands.c"
+#line 13249 "Commands.c"
}
RenameTagCommand* rename_tag_command_new (Tag* tag, const gchar* new_name) {
#line 1560 "/home/jens/Source/shotwell/src/Commands.vala"
return rename_tag_command_construct (TYPE_RENAME_TAG_COMMAND, tag, new_name);
-#line 13354 "Commands.c"
+#line 13256 "Commands.c"
}
static void rename_tag_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source) {
RenameTagCommand * self;
- DataSource* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ DataSource* _tmp0_;
+ const gchar* _tmp1_;
+ gboolean _tmp2_;
#line 1568 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RENAME_TAG_COMMAND, RenameTagCommand);
#line 1568 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13371,10 +13273,10 @@ static void rename_tag_command_real_execute_on_source (SimpleProxyableCommand* b
_tmp2_ = tag_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TAG, Tag), _tmp1_);
#line 1569 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp2_) {
-#line 13375 "Commands.c"
- const gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+#line 13277 "Commands.c"
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
#line 1570 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = self->priv->new_name;
#line 1570 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13385,16 +13287,16 @@ static void rename_tag_command_real_execute_on_source (SimpleProxyableCommand* b
app_window_error_message (_tmp5_, NULL);
#line 1570 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (_tmp5_);
-#line 13389 "Commands.c"
+#line 13291 "Commands.c"
}
}
static void rename_tag_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source) {
RenameTagCommand * self;
- DataSource* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ DataSource* _tmp0_;
+ const gchar* _tmp1_;
+ gboolean _tmp2_;
#line 1573 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RENAME_TAG_COMMAND, RenameTagCommand);
#line 1573 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13407,10 +13309,10 @@ static void rename_tag_command_real_undo_on_source (SimpleProxyableCommand* base
_tmp2_ = tag_rename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_TAG, Tag), _tmp1_);
#line 1574 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp2_) {
-#line 13411 "Commands.c"
- const gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+#line 13313 "Commands.c"
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
#line 1575 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = self->priv->old_name;
#line 1575 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13421,7 +13323,7 @@ static void rename_tag_command_real_undo_on_source (SimpleProxyableCommand* base
app_window_error_message (_tmp5_, NULL);
#line 1575 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (_tmp5_);
-#line 13425 "Commands.c"
+#line 13327 "Commands.c"
}
}
@@ -13432,23 +13334,23 @@ static void rename_tag_command_class_init (RenameTagCommandClass * klass) {
#line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (RenameTagCommandPrivate));
#line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
- ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) rename_tag_command_real_execute_on_source;
+ ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) rename_tag_command_real_execute_on_source;
#line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
- ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) rename_tag_command_real_undo_on_source;
+ ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) rename_tag_command_real_undo_on_source;
#line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = rename_tag_command_finalize;
-#line 13441 "Commands.c"
+#line 13343 "Commands.c"
}
static void rename_tag_command_instance_init (RenameTagCommand * self) {
#line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = RENAME_TAG_COMMAND_GET_PRIVATE (self);
-#line 13448 "Commands.c"
+#line 13350 "Commands.c"
}
-static void rename_tag_command_finalize (GObject* obj) {
+static void rename_tag_command_finalize (GObject * obj) {
RenameTagCommand * self;
#line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RENAME_TAG_COMMAND, RenameTagCommand);
@@ -13458,7 +13360,7 @@ static void rename_tag_command_finalize (GObject* obj) {
_g_free0 (self->priv->new_name);
#line 1555 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (rename_tag_command_parent_class)->finalize (obj);
-#line 13462 "Commands.c"
+#line 13364 "Commands.c"
}
@@ -13476,15 +13378,15 @@ GType rename_tag_command_get_type (void) {
DeleteTagCommand* delete_tag_command_construct (GType object_type, Tag* tag) {
DeleteTagCommand * self = NULL;
- Tag* _tmp0_ = NULL;
- Tag* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- Tag* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
+ Tag* _tmp0_;
+ Tag* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ Tag* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
#line 1582 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_TAG (tag), NULL);
#line 1583 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13515,40 +13417,40 @@ DeleteTagCommand* delete_tag_command_construct (GType object_type, Tag* tag) {
_g_free0 (_tmp3_);
#line 1582 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 13519 "Commands.c"
+#line 13421 "Commands.c"
}
DeleteTagCommand* delete_tag_command_new (Tag* tag) {
#line 1582 "/home/jens/Source/shotwell/src/Commands.vala"
return delete_tag_command_construct (TYPE_DELETE_TAG_COMMAND, tag);
-#line 13526 "Commands.c"
+#line 13428 "Commands.c"
}
static void _delete_tag_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) {
#line 1597 "/home/jens/Source/shotwell/src/Commands.vala"
delete_tag_command_on_proxy_broken ((DeleteTagCommand*) self);
-#line 13533 "Commands.c"
+#line 13435 "Commands.c"
}
static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source) {
DeleteTagCommand * self;
Tag* tag = NULL;
- DataSource* _tmp0_ = NULL;
- Tag* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ Tag* _tmp1_;
GeeList* recursive_victims = NULL;
- Tag* _tmp2_ = NULL;
- GeeList* _tmp3_ = NULL;
- GeeList* _tmp4_ = NULL;
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- TagSourceCollection* _tmp29_ = NULL;
- TagSourceCollection* _tmp30_ = NULL;
- DataSource* _tmp31_ = NULL;
- Marker* _tmp32_ = NULL;
- Marker* _tmp33_ = NULL;
+ Tag* _tmp2_;
+ GeeList* _tmp3_;
+ GeeList* _tmp4_;
+ gint _tmp5_;
+ gint _tmp6_;
+ TagSourceCollection* _tmp29_;
+ TagSourceCollection* _tmp30_;
+ DataSource* _tmp31_;
+ Marker* _tmp32_;
+ Marker* _tmp33_;
#line 1586 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DELETE_TAG_COMMAND, DeleteTagCommand);
#line 1586 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13573,23 +13475,23 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
_tmp6_ = _tmp5_;
#line 1591 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp6_ > 0) {
-#line 13577 "Commands.c"
- GeeArrayList* _tmp7_ = NULL;
+#line 13479 "Commands.c"
+ GeeArrayList* _tmp7_;
#line 1594 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL);
#line 1594 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (self->priv->recursive_victim_proxies);
#line 1594 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->recursive_victim_proxies = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_LIST, GeeList);
-#line 13585 "Commands.c"
+#line 13487 "Commands.c"
{
GeeList* _victim_list = NULL;
- GeeList* _tmp8_ = NULL;
- GeeList* _tmp9_ = NULL;
+ GeeList* _tmp8_;
+ GeeList* _tmp9_;
gint _victim_size = 0;
- GeeList* _tmp10_ = NULL;
- gint _tmp11_ = 0;
- gint _tmp12_ = 0;
+ GeeList* _tmp10_;
+ gint _tmp11_;
+ gint _tmp12_;
gint _victim_index = 0;
#line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp8_ = recursive_victims;
@@ -13609,25 +13511,25 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
_victim_index = -1;
#line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 13613 "Commands.c"
- gint _tmp13_ = 0;
- gint _tmp14_ = 0;
- gint _tmp15_ = 0;
+#line 13515 "Commands.c"
+ gint _tmp13_;
+ gint _tmp14_;
+ gint _tmp15_;
Tag* victim = NULL;
- GeeList* _tmp16_ = NULL;
- gint _tmp17_ = 0;
- gpointer _tmp18_ = NULL;
+ GeeList* _tmp16_;
+ gint _tmp17_;
+ gpointer _tmp18_;
SourceProxy* proxy = NULL;
- Tag* _tmp19_ = NULL;
- SourceProxy* _tmp20_ = NULL;
- SourceProxy* _tmp21_ = NULL;
- GeeList* _tmp22_ = NULL;
- SourceProxy* _tmp23_ = NULL;
- TagSourceCollection* _tmp24_ = NULL;
- TagSourceCollection* _tmp25_ = NULL;
- Tag* _tmp26_ = NULL;
- Marker* _tmp27_ = NULL;
- Marker* _tmp28_ = NULL;
+ Tag* _tmp19_;
+ SourceProxy* _tmp20_;
+ SourceProxy* _tmp21_;
+ GeeList* _tmp22_;
+ SourceProxy* _tmp23_;
+ TagSourceCollection* _tmp24_;
+ TagSourceCollection* _tmp25_;
+ Tag* _tmp26_;
+ Marker* _tmp27_;
+ Marker* _tmp28_;
#line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp13_ = _victim_index;
#line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13640,7 +13542,7 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
if (!(_tmp14_ < _tmp15_)) {
#line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 13644 "Commands.c"
+#line 13546 "Commands.c"
}
#line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp16_ = _victim_list;
@@ -13684,11 +13586,11 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
_source_proxy_unref0 (proxy);
#line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (victim);
-#line 13688 "Commands.c"
+#line 13590 "Commands.c"
}
#line 1595 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_victim_list);
-#line 13692 "Commands.c"
+#line 13594 "Commands.c"
}
}
#line 1605 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13709,14 +13611,14 @@ static void delete_tag_command_real_execute_on_source (SimpleProxyableCommand* b
_g_object_unref0 (recursive_victims);
#line 1586 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (tag);
-#line 13713 "Commands.c"
+#line 13615 "Commands.c"
}
static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source) {
DeleteTagCommand * self;
- DataSource* _tmp0_ = NULL;
- GeeList* _tmp1_ = NULL;
+ DataSource* _tmp0_;
+ GeeList* _tmp1_;
#line 1608 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DELETE_TAG_COMMAND, DeleteTagCommand);
#line 1608 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13729,12 +13631,12 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
_tmp1_ = self->priv->recursive_victim_proxies;
#line 1614 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp1_ != NULL) {
-#line 13733 "Commands.c"
+#line 13635 "Commands.c"
{
gint i = 0;
- GeeList* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
+ GeeList* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
#line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = self->priv->recursive_victim_proxies;
#line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13743,34 +13645,34 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
_tmp4_ = _tmp3_;
#line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
i = _tmp4_ - 1;
-#line 13747 "Commands.c"
+#line 13649 "Commands.c"
{
gboolean _tmp5_ = FALSE;
#line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = TRUE;
#line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 13754 "Commands.c"
- gint _tmp7_ = 0;
+#line 13656 "Commands.c"
+ gint _tmp7_;
SourceProxy* proxy = NULL;
- GeeList* _tmp8_ = NULL;
- gint _tmp9_ = 0;
- gpointer _tmp10_ = NULL;
+ GeeList* _tmp8_;
+ gint _tmp9_;
+ gpointer _tmp10_;
DataSource* victim_source = NULL;
- SourceProxy* _tmp11_ = NULL;
- DataSource* _tmp12_ = NULL;
- DataSource* _tmp13_ = NULL;
- SourceProxy* _tmp14_ = NULL;
- guint _tmp15_ = 0U;
+ SourceProxy* _tmp11_;
+ DataSource* _tmp12_;
+ DataSource* _tmp13_;
+ SourceProxy* _tmp14_;
+ guint _tmp15_;
#line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp5_) {
-#line 13768 "Commands.c"
- gint _tmp6_ = 0;
+#line 13670 "Commands.c"
+ gint _tmp6_;
#line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = i;
#line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
i = _tmp6_ - 1;
-#line 13774 "Commands.c"
+#line 13676 "Commands.c"
}
#line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = FALSE;
@@ -13780,7 +13682,7 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
if (!(_tmp7_ >= 0)) {
#line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 13784 "Commands.c"
+#line 13686 "Commands.c"
}
#line 1616 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp8_ = self->priv->recursive_victim_proxies;
@@ -13810,7 +13712,7 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
_g_object_unref0 (victim_source);
#line 1615 "/home/jens/Source/shotwell/src/Commands.vala"
_source_proxy_unref0 (proxy);
-#line 13814 "Commands.c"
+#line 13716 "Commands.c"
}
}
}
@@ -13818,14 +13720,14 @@ static void delete_tag_command_real_undo_on_source (SimpleProxyableCommand* base
_g_object_unref0 (self->priv->recursive_victim_proxies);
#line 1624 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->recursive_victim_proxies = NULL;
-#line 13822 "Commands.c"
+#line 13724 "Commands.c"
}
}
static void delete_tag_command_on_proxy_broken (DeleteTagCommand* self) {
- CommandManager* _tmp0_ = NULL;
- CommandManager* _tmp1_ = NULL;
+ CommandManager* _tmp0_;
+ CommandManager* _tmp1_;
#line 1628 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_DELETE_TAG_COMMAND (self));
#line 1629 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13836,7 +13738,7 @@ static void delete_tag_command_on_proxy_broken (DeleteTagCommand* self) {
command_manager_reset (_tmp1_);
#line 1629 "/home/jens/Source/shotwell/src/Commands.vala"
_command_manager_unref0 (_tmp1_);
-#line 13840 "Commands.c"
+#line 13742 "Commands.c"
}
@@ -13846,12 +13748,12 @@ static void delete_tag_command_class_init (DeleteTagCommandClass * klass) {
#line 1579 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (DeleteTagCommandPrivate));
#line 1579 "/home/jens/Source/shotwell/src/Commands.vala"
- ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) delete_tag_command_real_execute_on_source;
+ ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) delete_tag_command_real_execute_on_source;
#line 1579 "/home/jens/Source/shotwell/src/Commands.vala"
- ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) delete_tag_command_real_undo_on_source;
+ ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) delete_tag_command_real_undo_on_source;
#line 1579 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = delete_tag_command_finalize;
-#line 13855 "Commands.c"
+#line 13757 "Commands.c"
}
@@ -13860,11 +13762,11 @@ static void delete_tag_command_instance_init (DeleteTagCommand * self) {
self->priv = DELETE_TAG_COMMAND_GET_PRIVATE (self);
#line 1580 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->recursive_victim_proxies = NULL;
-#line 13864 "Commands.c"
+#line 13766 "Commands.c"
}
-static void delete_tag_command_finalize (GObject* obj) {
+static void delete_tag_command_finalize (GObject * obj) {
DeleteTagCommand * self;
#line 1579 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DELETE_TAG_COMMAND, DeleteTagCommand);
@@ -13872,7 +13774,7 @@ static void delete_tag_command_finalize (GObject* obj) {
_g_object_unref0 (self->priv->recursive_victim_proxies);
#line 1579 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (delete_tag_command_parent_class)->finalize (obj);
-#line 13876 "Commands.c"
+#line 13778 "Commands.c"
}
@@ -13890,46 +13792,43 @@ GType delete_tag_command_get_type (void) {
NewChildTagCommand* new_child_tag_command_construct (GType object_type, Tag* tag) {
NewChildTagCommand * self = NULL;
- Tag* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- Tag* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ Tag* _tmp0_;
+ Tag* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
#line 1636 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_TAG (tag), NULL);
#line 1637 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = tag;
#line 1637 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp1_ = _ ("Create Tag");
-#line 1637 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp2_ = tag;
+ _tmp1_ = tag;
#line 1637 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp3_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
+ _tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
#line 1637 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp4_ = _tmp3_;
+ _tmp3_ = _tmp2_;
#line 1637 "/home/jens/Source/shotwell/src/Commands.vala"
- self = (NewChildTagCommand*) simple_proxyable_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PROXYABLE, Proxyable), _tmp1_, _tmp4_);
+ self = (NewChildTagCommand*) simple_proxyable_command_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PROXYABLE, Proxyable), _ ("Create Tag"), _tmp3_);
#line 1637 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_free0 (_tmp4_);
+ _g_free0 (_tmp3_);
#line 1636 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 13917 "Commands.c"
+#line 13816 "Commands.c"
}
NewChildTagCommand* new_child_tag_command_new (Tag* tag) {
#line 1636 "/home/jens/Source/shotwell/src/Commands.vala"
return new_child_tag_command_construct (TYPE_NEW_CHILD_TAG_COMMAND, tag);
-#line 13924 "Commands.c"
+#line 13823 "Commands.c"
}
static void new_child_tag_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source) {
NewChildTagCommand * self;
Tag* tag = NULL;
- DataSource* _tmp0_ = NULL;
- Tag* _tmp1_ = NULL;
- Tag* _tmp2_ = NULL;
+ DataSource* _tmp0_;
+ Tag* _tmp1_;
+ Tag* _tmp2_;
#line 1640 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NEW_CHILD_TAG_COMMAND, NewChildTagCommand);
#line 1640 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13948,17 +13847,17 @@ static void new_child_tag_command_real_execute_on_source (SimpleProxyableCommand
self->priv->created_child = _tmp2_;
#line 1640 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (tag);
-#line 13952 "Commands.c"
+#line 13851 "Commands.c"
}
static void new_child_tag_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source) {
NewChildTagCommand * self;
- TagSourceCollection* _tmp0_ = NULL;
- TagSourceCollection* _tmp1_ = NULL;
- Tag* _tmp2_ = NULL;
- Marker* _tmp3_ = NULL;
- Marker* _tmp4_ = NULL;
+ TagSourceCollection* _tmp0_;
+ TagSourceCollection* _tmp1_;
+ Tag* _tmp2_;
+ Marker* _tmp3_;
+ Marker* _tmp4_;
#line 1645 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NEW_CHILD_TAG_COMMAND, NewChildTagCommand);
#line 1645 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -13977,15 +13876,15 @@ static void new_child_tag_command_real_undo_on_source (SimpleProxyableCommand* b
source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp4_, TRUE, NULL, NULL, NULL);
#line 1646 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp4_);
-#line 13981 "Commands.c"
+#line 13880 "Commands.c"
}
Tag* new_child_tag_command_get_created_child (NewChildTagCommand* self) {
Tag* result = NULL;
- Tag* _tmp0_ = NULL;
- Tag* _tmp1_ = NULL;
- Tag* _tmp2_ = NULL;
+ Tag* _tmp0_;
+ Tag* _tmp1_;
+ Tag* _tmp2_;
#line 1649 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_NEW_CHILD_TAG_COMMAND (self), NULL);
#line 1650 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14000,7 +13899,7 @@ Tag* new_child_tag_command_get_created_child (NewChildTagCommand* self) {
result = _tmp2_;
#line 1652 "/home/jens/Source/shotwell/src/Commands.vala"
return result;
-#line 14004 "Commands.c"
+#line 13903 "Commands.c"
}
@@ -14010,12 +13909,12 @@ static void new_child_tag_command_class_init (NewChildTagCommandClass * klass) {
#line 1633 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (NewChildTagCommandPrivate));
#line 1633 "/home/jens/Source/shotwell/src/Commands.vala"
- ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) new_child_tag_command_real_execute_on_source;
+ ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) new_child_tag_command_real_execute_on_source;
#line 1633 "/home/jens/Source/shotwell/src/Commands.vala"
- ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) new_child_tag_command_real_undo_on_source;
+ ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) new_child_tag_command_real_undo_on_source;
#line 1633 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = new_child_tag_command_finalize;
-#line 14019 "Commands.c"
+#line 13918 "Commands.c"
}
@@ -14024,11 +13923,11 @@ static void new_child_tag_command_instance_init (NewChildTagCommand * self) {
self->priv = NEW_CHILD_TAG_COMMAND_GET_PRIVATE (self);
#line 1634 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->created_child = NULL;
-#line 14028 "Commands.c"
+#line 13927 "Commands.c"
}
-static void new_child_tag_command_finalize (GObject* obj) {
+static void new_child_tag_command_finalize (GObject * obj) {
NewChildTagCommand * self;
#line 1633 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NEW_CHILD_TAG_COMMAND, NewChildTagCommand);
@@ -14036,7 +13935,7 @@ static void new_child_tag_command_finalize (GObject* obj) {
_g_object_unref0 (self->priv->created_child);
#line 1633 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (new_child_tag_command_parent_class)->finalize (obj);
-#line 14040 "Commands.c"
+#line 13939 "Commands.c"
}
@@ -14054,37 +13953,34 @@ GType new_child_tag_command_get_type (void) {
NewRootTagCommand* new_root_tag_command_construct (GType object_type) {
NewRootTagCommand * self = NULL;
- const gchar* _tmp0_ = NULL;
-#line 1660 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp0_ = _ ("Create Tag");
#line 1660 "/home/jens/Source/shotwell/src/Commands.vala"
- self = (NewRootTagCommand*) page_command_construct (object_type, _tmp0_, "");
+ self = (NewRootTagCommand*) page_command_construct (object_type, _ ("Create Tag"), "");
#line 1659 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 14065 "Commands.c"
+#line 13961 "Commands.c"
}
NewRootTagCommand* new_root_tag_command_new (void) {
#line 1659 "/home/jens/Source/shotwell/src/Commands.vala"
return new_root_tag_command_construct (TYPE_NEW_ROOT_TAG_COMMAND);
-#line 14072 "Commands.c"
+#line 13968 "Commands.c"
}
static void new_root_tag_command_real_execute (Command* base) {
NewRootTagCommand * self;
- SourceProxy* _tmp0_ = NULL;
+ SourceProxy* _tmp0_;
#line 1663 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NEW_ROOT_TAG_COMMAND, NewRootTagCommand);
#line 1664 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->created_proxy;
#line 1664 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp0_ == NULL) {
-#line 14085 "Commands.c"
- Tag* _tmp1_ = NULL;
- Tag* _tmp2_ = NULL;
- SourceProxy* _tmp3_ = NULL;
+#line 13981 "Commands.c"
+ Tag* _tmp1_;
+ Tag* _tmp2_;
+ SourceProxy* _tmp3_;
#line 1665 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = tag_create_new_root ();
#line 1665 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14097,11 +13993,11 @@ static void new_root_tag_command_real_execute (Command* base) {
self->priv->created_proxy = _tmp3_;
#line 1665 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp2_);
-#line 14101 "Commands.c"
+#line 13997 "Commands.c"
} else {
- SourceProxy* _tmp4_ = NULL;
- DataSource* _tmp5_ = NULL;
- DataSource* _tmp6_ = NULL;
+ SourceProxy* _tmp4_;
+ DataSource* _tmp5_;
+ DataSource* _tmp6_;
#line 1667 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = self->priv->created_proxy;
#line 1667 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14110,20 +14006,20 @@ static void new_root_tag_command_real_execute (Command* base) {
_tmp6_ = _tmp5_;
#line 1667 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp6_);
-#line 14114 "Commands.c"
+#line 14010 "Commands.c"
}
}
static void new_root_tag_command_real_undo (Command* base) {
NewRootTagCommand * self;
- TagSourceCollection* _tmp0_ = NULL;
- TagSourceCollection* _tmp1_ = NULL;
- SourceProxy* _tmp2_ = NULL;
- DataSource* _tmp3_ = NULL;
- DataSource* _tmp4_ = NULL;
- Marker* _tmp5_ = NULL;
- Marker* _tmp6_ = NULL;
+ TagSourceCollection* _tmp0_;
+ TagSourceCollection* _tmp1_;
+ SourceProxy* _tmp2_;
+ DataSource* _tmp3_;
+ DataSource* _tmp4_;
+ Marker* _tmp5_;
+ Marker* _tmp6_;
#line 1670 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NEW_ROOT_TAG_COMMAND, NewRootTagCommand);
#line 1671 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14146,14 +14042,14 @@ static void new_root_tag_command_real_undo (Command* base) {
_g_object_unref0 (_tmp6_);
#line 1671 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp4_);
-#line 14150 "Commands.c"
+#line 14046 "Commands.c"
}
Tag* new_root_tag_command_get_created_tag (NewRootTagCommand* self) {
Tag* result = NULL;
- SourceProxy* _tmp0_ = NULL;
- DataSource* _tmp1_ = NULL;
+ SourceProxy* _tmp0_;
+ DataSource* _tmp1_;
#line 1674 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_NEW_ROOT_TAG_COMMAND (self), NULL);
#line 1675 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14164,7 +14060,7 @@ Tag* new_root_tag_command_get_created_tag (NewRootTagCommand* self) {
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TAG, Tag);
#line 1675 "/home/jens/Source/shotwell/src/Commands.vala"
return result;
-#line 14168 "Commands.c"
+#line 14064 "Commands.c"
}
@@ -14174,12 +14070,12 @@ static void new_root_tag_command_class_init (NewRootTagCommandClass * klass) {
#line 1656 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (NewRootTagCommandPrivate));
#line 1656 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) new_root_tag_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) new_root_tag_command_real_execute;
#line 1656 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) new_root_tag_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) new_root_tag_command_real_undo;
#line 1656 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = new_root_tag_command_finalize;
-#line 14183 "Commands.c"
+#line 14079 "Commands.c"
}
@@ -14188,11 +14084,11 @@ static void new_root_tag_command_instance_init (NewRootTagCommand * self) {
self->priv = NEW_ROOT_TAG_COMMAND_GET_PRIVATE (self);
#line 1657 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->created_proxy = NULL;
-#line 14192 "Commands.c"
+#line 14088 "Commands.c"
}
-static void new_root_tag_command_finalize (GObject* obj) {
+static void new_root_tag_command_finalize (GObject * obj) {
NewRootTagCommand * self;
#line 1656 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NEW_ROOT_TAG_COMMAND, NewRootTagCommand);
@@ -14200,7 +14096,7 @@ static void new_root_tag_command_finalize (GObject* obj) {
_source_proxy_unref0 (self->priv->created_proxy);
#line 1656 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (new_root_tag_command_parent_class)->finalize (obj);
-#line 14204 "Commands.c"
+#line 14100 "Commands.c"
}
@@ -14219,276 +14115,273 @@ GType new_root_tag_command_get_type (void) {
static void _reparent_tag_command_on_items_destroyed_source_collection_items_destroyed (SourceCollection* _sender, GeeCollection* destroyed, gpointer self) {
#line 1724 "/home/jens/Source/shotwell/src/Commands.vala"
reparent_tag_command_on_items_destroyed ((ReparentTagCommand*) self, destroyed);
-#line 14223 "Commands.c"
+#line 14119 "Commands.c"
}
ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag, const gchar* new_parent_path) {
ReparentTagCommand * self = NULL;
- const gchar* _tmp0_ = NULL;
- Tag* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- Tag* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
+ Tag* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ Tag* _tmp5_;
+ gchar* _tmp6_;
gboolean has_children = FALSE;
- Tag* _tmp8_ = NULL;
- GeeList* _tmp9_ = NULL;
- GeeList* _tmp10_ = NULL;
- gint _tmp11_ = 0;
- gint _tmp12_ = 0;
- gboolean _tmp13_ = FALSE;
+ Tag* _tmp7_;
+ GeeList* _tmp8_;
+ GeeList* _tmp9_;
+ gint _tmp10_;
+ gint _tmp11_;
+ gboolean _tmp12_;
gchar* basename = NULL;
- Tag* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- const gchar* _tmp16_ = NULL;
+ Tag* _tmp13_;
+ gchar* _tmp14_;
+ const gchar* _tmp15_;
gchar* new_to_path = NULL;
- const gchar* _tmp38_ = NULL;
- gchar* _tmp39_ = NULL;
- const gchar* _tmp40_ = NULL;
- TagSourceCollection* _tmp43_ = NULL;
- const gchar* _tmp44_ = NULL;
- gboolean _tmp45_ = FALSE;
- GeeHashSet* _tmp46_ = NULL;
- Tag* _tmp47_ = NULL;
- GeeCollection* _tmp48_ = NULL;
- GeeCollection* _tmp49_ = NULL;
- LibraryPhotoSourceCollection* _tmp50_ = NULL;
- VideoSourceCollection* _tmp51_ = NULL;
+ const gchar* _tmp37_;
+ gchar* _tmp38_;
+ const gchar* _tmp39_;
+ TagSourceCollection* _tmp42_;
+ const gchar* _tmp43_;
+ gboolean _tmp44_;
+ GeeHashSet* _tmp45_;
+ Tag* _tmp46_;
+ GeeCollection* _tmp47_;
+ GeeCollection* _tmp48_;
+ LibraryPhotoSourceCollection* _tmp49_;
+ VideoSourceCollection* _tmp50_;
#line 1694 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_TAG (tag), NULL);
#line 1694 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (new_parent_path != NULL, NULL);
#line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp0_ = _ ("Move Tag “%s”");
+ _tmp0_ = tag;
#line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp1_ = tag;
+ _tmp1_ = tag_get_user_visible_name (_tmp0_);
#line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp2_ = tag_get_user_visible_name (_tmp1_);
-#line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp3_ = _tmp2_;
+ _tmp2_ = _tmp1_;
#line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp4_ = g_strdup_printf (_tmp0_, _tmp3_);
+ _tmp3_ = g_strdup_printf (_ ("Move Tag “%s”"), _tmp2_);
#line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp5_ = _tmp4_;
+ _tmp4_ = _tmp3_;
#line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
- self = (ReparentTagCommand*) page_command_construct (object_type, _tmp5_, "");
+ self = (ReparentTagCommand*) page_command_construct (object_type, _tmp4_, "");
#line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_free0 (_tmp5_);
+ _g_free0 (_tmp4_);
#line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_free0 (_tmp3_);
+ _g_free0 (_tmp2_);
#line 1697 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp6_ = tag;
+ _tmp5_ = tag;
#line 1697 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp7_ = tag_get_path (_tmp6_);
+ _tmp6_ = tag_get_path (_tmp5_);
#line 1697 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (self->priv->from_path);
#line 1697 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->from_path = _tmp7_;
+ self->priv->from_path = _tmp6_;
#line 1699 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp8_ = tag;
+ _tmp7_ = tag;
#line 1699 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp9_ = tag_get_hierarchical_children (_tmp8_);
+ _tmp8_ = tag_get_hierarchical_children (_tmp7_);
#line 1699 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp10_ = _tmp9_;
+ _tmp9_ = _tmp8_;
#line 1699 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp11_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1699 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp12_ = _tmp11_;
+ _tmp11_ = _tmp10_;
#line 1699 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp13_ = _tmp12_ > 0;
+ _tmp12_ = _tmp11_ > 0;
#line 1699 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_object_unref0 (_tmp10_);
+ _g_object_unref0 (_tmp9_);
#line 1699 "/home/jens/Source/shotwell/src/Commands.vala"
- has_children = _tmp13_;
+ has_children = _tmp12_;
#line 1700 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp14_ = tag;
+ _tmp13_ = tag;
#line 1700 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp15_ = tag_get_user_visible_name (_tmp14_);
+ _tmp14_ = tag_get_user_visible_name (_tmp13_);
#line 1700 "/home/jens/Source/shotwell/src/Commands.vala"
- basename = _tmp15_;
+ basename = _tmp14_;
#line 1702 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp16_ = new_parent_path;
+ _tmp15_ = new_parent_path;
#line 1702 "/home/jens/Source/shotwell/src/Commands.vala"
- if (g_strcmp0 (_tmp16_, TAG_PATH_SEPARATOR_STRING) == 0) {
-#line 14317 "Commands.c"
- gchar* _tmp17_ = NULL;
- gboolean _tmp18_ = FALSE;
- gchar* _tmp23_ = NULL;
+ if (g_strcmp0 (_tmp15_, TAG_PATH_SEPARATOR_STRING) == 0) {
+#line 14210 "Commands.c"
+ gchar* _tmp16_ = NULL;
+ gboolean _tmp17_;
+ gchar* _tmp22_;
#line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp18_ = has_children;
+ _tmp17_ = has_children;
#line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
- if (_tmp18_) {
-#line 14325 "Commands.c"
- const gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
+ if (_tmp17_) {
+#line 14218 "Commands.c"
+ const gchar* _tmp18_;
+ gchar* _tmp19_;
#line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp19_ = basename;
+ _tmp18_ = basename;
#line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp20_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp19_, NULL);
+ _tmp19_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp18_, NULL);
#line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_free0 (_tmp17_);
+ _g_free0 (_tmp16_);
#line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp17_ = _tmp20_;
-#line 14336 "Commands.c"
+ _tmp16_ = _tmp19_;
+#line 14229 "Commands.c"
} else {
- const gchar* _tmp21_ = NULL;
- gchar* _tmp22_ = NULL;
+ const gchar* _tmp20_;
+ gchar* _tmp21_;
#line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp21_ = basename;
+ _tmp20_ = basename;
#line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp22_ = g_strdup (_tmp21_);
+ _tmp21_ = g_strdup (_tmp20_);
#line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_free0 (_tmp17_);
+ _g_free0 (_tmp16_);
#line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp17_ = _tmp22_;
-#line 14348 "Commands.c"
+ _tmp16_ = _tmp21_;
+#line 14241 "Commands.c"
}
#line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp23_ = g_strdup (_tmp17_);
+ _tmp22_ = g_strdup (_tmp16_);
#line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (self->priv->to_path);
#line 1703 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->to_path = _tmp23_;
+ self->priv->to_path = _tmp22_;
#line 1702 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_free0 (_tmp17_);
-#line 14358 "Commands.c"
+ _g_free0 (_tmp16_);
+#line 14251 "Commands.c"
} else {
- const gchar* _tmp24_ = NULL;
- gboolean _tmp25_ = FALSE;
+ const gchar* _tmp23_;
+ gboolean _tmp24_;
#line 1704 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp24_ = new_parent_path;
+ _tmp23_ = new_parent_path;
#line 1704 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp25_ = g_str_has_prefix (_tmp24_, TAG_PATH_SEPARATOR_STRING);
+ _tmp24_ = g_str_has_prefix (_tmp23_, TAG_PATH_SEPARATOR_STRING);
#line 1704 "/home/jens/Source/shotwell/src/Commands.vala"
- if (_tmp25_) {
-#line 14368 "Commands.c"
- const gchar* _tmp26_ = NULL;
- gchar* _tmp27_ = NULL;
- gchar* _tmp28_ = NULL;
- const gchar* _tmp29_ = NULL;
- gchar* _tmp30_ = NULL;
+ if (_tmp24_) {
+#line 14261 "Commands.c"
+ const gchar* _tmp25_;
+ gchar* _tmp26_;
+ gchar* _tmp27_;
+ const gchar* _tmp28_;
+ gchar* _tmp29_;
#line 1705 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp26_ = new_parent_path;
+ _tmp25_ = new_parent_path;
#line 1705 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp27_ = g_strconcat (_tmp26_, TAG_PATH_SEPARATOR_STRING, NULL);
+ _tmp26_ = g_strconcat (_tmp25_, TAG_PATH_SEPARATOR_STRING, NULL);
#line 1705 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp28_ = _tmp27_;
+ _tmp27_ = _tmp26_;
#line 1705 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp29_ = basename;
+ _tmp28_ = basename;
#line 1705 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp30_ = g_strconcat (_tmp28_, _tmp29_, NULL);
+ _tmp29_ = g_strconcat (_tmp27_, _tmp28_, NULL);
#line 1705 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (self->priv->to_path);
#line 1705 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->to_path = _tmp30_;
+ self->priv->to_path = _tmp29_;
#line 1705 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_free0 (_tmp28_);
-#line 14390 "Commands.c"
+ _g_free0 (_tmp27_);
+#line 14283 "Commands.c"
} else {
- const gchar* _tmp31_ = NULL;
- gchar* _tmp32_ = NULL;
- gchar* _tmp33_ = NULL;
- gchar* _tmp34_ = NULL;
- gchar* _tmp35_ = NULL;
- const gchar* _tmp36_ = NULL;
- gchar* _tmp37_ = NULL;
+ const gchar* _tmp30_;
+ gchar* _tmp31_;
+ gchar* _tmp32_;
+ gchar* _tmp33_;
+ gchar* _tmp34_;
+ const gchar* _tmp35_;
+ gchar* _tmp36_;
#line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp31_ = new_parent_path;
+ _tmp30_ = new_parent_path;
#line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp32_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp31_, NULL);
+ _tmp31_ = g_strconcat (TAG_PATH_SEPARATOR_STRING, _tmp30_, NULL);
#line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp33_ = _tmp32_;
+ _tmp32_ = _tmp31_;
#line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp34_ = g_strconcat (_tmp33_, TAG_PATH_SEPARATOR_STRING, NULL);
+ _tmp33_ = g_strconcat (_tmp32_, TAG_PATH_SEPARATOR_STRING, NULL);
#line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp35_ = _tmp34_;
+ _tmp34_ = _tmp33_;
#line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp36_ = basename;
+ _tmp35_ = basename;
#line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp37_ = g_strconcat (_tmp35_, _tmp36_, NULL);
+ _tmp36_ = g_strconcat (_tmp34_, _tmp35_, NULL);
#line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (self->priv->to_path);
#line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->to_path = _tmp37_;
+ self->priv->to_path = _tmp36_;
#line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_free0 (_tmp35_);
+ _g_free0 (_tmp34_);
#line 1707 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_free0 (_tmp33_);
-#line 14421 "Commands.c"
+ _g_free0 (_tmp32_);
+#line 14314 "Commands.c"
}
}
#line 1710 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp38_ = self->priv->to_path;
+ _tmp37_ = self->priv->to_path;
#line 1710 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp39_ = hierarchical_tag_utilities_get_root_path_form (_tmp38_);
+ _tmp38_ = hierarchical_tag_utilities_get_root_path_form (_tmp37_);
#line 1710 "/home/jens/Source/shotwell/src/Commands.vala"
- new_to_path = _tmp39_;
+ new_to_path = _tmp38_;
#line 1711 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp40_ = new_to_path;
+ _tmp39_ = new_to_path;
#line 1711 "/home/jens/Source/shotwell/src/Commands.vala"
- if (_tmp40_ != NULL) {
-#line 14434 "Commands.c"
- const gchar* _tmp41_ = NULL;
- gchar* _tmp42_ = NULL;
+ if (_tmp39_ != NULL) {
+#line 14327 "Commands.c"
+ const gchar* _tmp40_;
+ gchar* _tmp41_;
#line 1712 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp41_ = new_to_path;
+ _tmp40_ = new_to_path;
#line 1712 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp42_ = g_strdup (_tmp41_);
+ _tmp41_ = g_strdup (_tmp40_);
#line 1712 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (self->priv->to_path);
#line 1712 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->to_path = _tmp42_;
-#line 14445 "Commands.c"
+ self->priv->to_path = _tmp41_;
+#line 14338 "Commands.c"
}
#line 1714 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp43_ = tag_global;
+ _tmp42_ = tag_global;
#line 1714 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp44_ = self->priv->to_path;
+ _tmp43_ = self->priv->to_path;
#line 1714 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp45_ = tag_source_collection_exists (_tmp43_, _tmp44_, FALSE);
+ _tmp44_ = tag_source_collection_exists (_tmp42_, _tmp43_, FALSE);
#line 1714 "/home/jens/Source/shotwell/src/Commands.vala"
- if (_tmp45_) {
+ if (_tmp44_) {
#line 1715 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->to_path_exists = TRUE;
-#line 14457 "Commands.c"
+#line 14350 "Commands.c"
}
#line 1717 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp46_ = self->priv->sources_in_play;
+ _tmp45_ = self->priv->sources_in_play;
#line 1717 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp47_ = tag;
+ _tmp46_ = tag;
#line 1717 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp48_ = tag_get_sources (_tmp47_);
+ _tmp47_ = tag_get_sources (_tmp46_);
#line 1717 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp49_ = _tmp48_;
+ _tmp48_ = _tmp47_;
#line 1717 "/home/jens/Source/shotwell/src/Commands.vala"
- gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_COLLECTION, GeeCollection), _tmp49_);
+ gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_COLLECTION, GeeCollection), _tmp48_);
#line 1717 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_object_unref0 (_tmp49_);
+ _g_object_unref0 (_tmp48_);
#line 1719 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp50_ = library_photo_global;
+ _tmp49_ = library_photo_global;
#line 1719 "/home/jens/Source/shotwell/src/Commands.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-destroyed", (GCallback) _reparent_tag_command_on_items_destroyed_source_collection_items_destroyed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-destroyed", (GCallback) _reparent_tag_command_on_items_destroyed_source_collection_items_destroyed, self, 0);
#line 1720 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp51_ = video_global;
+ _tmp50_ = video_global;
#line 1720 "/home/jens/Source/shotwell/src/Commands.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-destroyed", (GCallback) _reparent_tag_command_on_items_destroyed_source_collection_items_destroyed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-destroyed", (GCallback) _reparent_tag_command_on_items_destroyed_source_collection_items_destroyed, self, 0);
#line 1694 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (new_to_path);
#line 1694 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (basename);
#line 1694 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 14485 "Commands.c"
+#line 14378 "Commands.c"
}
ReparentTagCommand* reparent_tag_command_new (Tag* tag, const gchar* new_parent_path) {
#line 1694 "/home/jens/Source/shotwell/src/Commands.vala"
return reparent_tag_command_construct (TYPE_REPARENT_TAG_COMMAND, tag, new_parent_path);
-#line 14492 "Commands.c"
+#line 14385 "Commands.c"
}
@@ -14497,11 +14390,11 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
#line 1728 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (GEE_IS_COLLECTION (destroyed));
-#line 14501 "Commands.c"
+#line 14394 "Commands.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeIterator* _tmp1_;
#line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = destroyed;
#line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14510,15 +14403,15 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
_source_it = _tmp1_;
#line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 14514 "Commands.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 14407 "Commands.c"
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataSource* source = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- GeeHashSet* _tmp6_ = NULL;
- DataSource* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ GeeHashSet* _tmp6_;
+ DataSource* _tmp7_;
+ gboolean _tmp8_;
#line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _source_it;
#line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14527,7 +14420,7 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
if (!_tmp3_) {
#line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 14531 "Commands.c"
+#line 14424 "Commands.c"
}
#line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = _source_it;
@@ -14543,9 +14436,9 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
_tmp8_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource));
#line 1730 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp8_) {
-#line 14547 "Commands.c"
- CommandManager* _tmp9_ = NULL;
- CommandManager* _tmp10_ = NULL;
+#line 14440 "Commands.c"
+ CommandManager* _tmp9_;
+ CommandManager* _tmp10_;
#line 1731 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp9_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command));
#line 1731 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14554,135 +14447,177 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
command_manager_reset (_tmp10_);
#line 1731 "/home/jens/Source/shotwell/src/Commands.vala"
_command_manager_unref0 (_tmp10_);
-#line 14558 "Commands.c"
+#line 14451 "Commands.c"
}
#line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (source);
-#line 14562 "Commands.c"
+#line 14455 "Commands.c"
}
#line 1729 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_source_it);
-#line 14566 "Commands.c"
+#line 14459 "Commands.c"
}
}
static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
gchar* result = NULL;
+ gboolean _tmp0_ = FALSE;
+ gboolean _tmp1_ = FALSE;
GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
-#line 14580 "Commands.c"
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp1_ = TRUE;
+#line 14479 "Commands.c"
+ } else {
+ const gchar* _tmp2_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp2_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp1_ = (*((gchar*) _tmp2_)) == '\0';
+#line 14486 "Commands.c"
+ }
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ if (_tmp1_) {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp0_ = TRUE;
+#line 14492 "Commands.c"
+ } else {
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp3_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp4_ = replacement;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
+#line 14502 "Commands.c"
+ }
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ if (_tmp0_) {
+#line 14506 "Commands.c"
+ gchar* _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp5_ = g_strdup (self);
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ result = _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ return result;
+#line 14514 "Commands.c"
+ }
{
GRegex* regex = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- GRegex* _tmp3_ = NULL;
- GRegex* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- GRegex* _tmp6_ = NULL;
- const gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+ GRegex* _tmp9_;
+ GRegex* _tmp10_;
+ gchar* _tmp11_ = NULL;
+ GRegex* _tmp12_;
+ const gchar* _tmp13_;
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp6_ = old;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp7_ = g_regex_escape_string (_tmp6_, -1);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp8_ = _tmp7_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp10_ = _tmp9_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _g_free0 (_tmp8_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ regex = _tmp10_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 14611 "Commands.c"
- goto __catch460_g_regex_error;
+#line 14546 "Commands.c"
+ goto __catch461_g_regex_error;
}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return NULL;
-#line 14620 "Commands.c"
+#line 14555 "Commands.c"
}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp12_ = regex;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp13_ = replacement;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp11_ = _tmp14_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 14636 "Commands.c"
- goto __catch460_g_regex_error;
+#line 14571 "Commands.c"
+ goto __catch461_g_regex_error;
}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return NULL;
-#line 14647 "Commands.c"
+#line 14582 "Commands.c"
}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp15_ = _tmp11_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _tmp11_ = NULL;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ result = _tmp15_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ _g_free0 (_tmp11_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 14661 "Commands.c"
+#line 14596 "Commands.c"
}
- goto __finally460;
- __catch460_g_regex_error:
+ goto __finally461;
+ __catch461_g_regex_error:
{
GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_g_error_free0 (e);
-#line 14675 "Commands.c"
+#line 14610 "Commands.c"
}
- __finally460:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ __finally461:
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return NULL;
-#line 14686 "Commands.c"
+#line 14621 "Commands.c"
}
}
@@ -14690,25 +14625,25 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand* self, const gchar* client_path) {
GeeMap* result = NULL;
gchar* path = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- gchar* _tmp6_ = NULL;
+ const gchar* _tmp3_;
+ gchar* _tmp6_;
GeeMap* _result_ = NULL;
- GeeHashMap* _tmp7_ = NULL;
- TagSourceCollection* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
- gboolean _tmp10_ = FALSE;
+ GeeHashMap* _tmp7_;
+ TagSourceCollection* _tmp8_;
+ const gchar* _tmp9_;
+ gboolean _tmp10_;
Tag* tag = NULL;
- const gchar* _tmp11_ = NULL;
- Tag* _tmp12_ = NULL;
+ const gchar* _tmp11_;
+ Tag* _tmp12_;
gchar* path_prefix = NULL;
- Tag* _tmp13_ = NULL;
- gchar* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
+ Tag* _tmp13_;
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+ gchar* _tmp16_;
+ gchar* _tmp17_;
#line 1735 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_REPARENT_TAG_COMMAND (self), NULL);
#line 1735 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14723,20 +14658,20 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
_tmp3_ = path;
#line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp3_ != NULL) {
-#line 14727 "Commands.c"
- const gchar* _tmp4_ = NULL;
+#line 14662 "Commands.c"
+ const gchar* _tmp4_;
#line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = path;
#line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _tmp4_;
-#line 14733 "Commands.c"
+#line 14668 "Commands.c"
} else {
- const gchar* _tmp5_ = NULL;
+ const gchar* _tmp5_;
#line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = client_path;
#line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _tmp5_;
-#line 14740 "Commands.c"
+#line 14675 "Commands.c"
}
#line 1737 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = g_strdup (_tmp2_);
@@ -14762,7 +14697,7 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
_g_free0 (path);
#line 1743 "/home/jens/Source/shotwell/src/Commands.vala"
return result;
-#line 14766 "Commands.c"
+#line 14701 "Commands.c"
}
#line 1745 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp11_ = path;
@@ -14784,15 +14719,15 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
_g_free0 (_tmp15_);
#line 1747 "/home/jens/Source/shotwell/src/Commands.vala"
path_prefix = _tmp17_;
-#line 14788 "Commands.c"
+#line 14723 "Commands.c"
{
GeeList* _t_list = NULL;
- Tag* _tmp18_ = NULL;
- GeeList* _tmp19_ = NULL;
+ Tag* _tmp18_;
+ GeeList* _tmp19_;
gint _t_size = 0;
- GeeList* _tmp20_ = NULL;
- gint _tmp21_ = 0;
- gint _tmp22_ = 0;
+ GeeList* _tmp20_;
+ gint _tmp21_;
+ gint _tmp22_;
gint _t_index = 0;
#line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp18_ = tag;
@@ -14812,32 +14747,32 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
_t_index = -1;
#line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 14816 "Commands.c"
- gint _tmp23_ = 0;
- gint _tmp24_ = 0;
- gint _tmp25_ = 0;
+#line 14751 "Commands.c"
+ gint _tmp23_;
+ gint _tmp24_;
+ gint _tmp25_;
Tag* t = NULL;
- GeeList* _tmp26_ = NULL;
- gint _tmp27_ = 0;
- gpointer _tmp28_ = NULL;
+ GeeList* _tmp26_;
+ gint _tmp27_;
+ gpointer _tmp28_;
gchar* child_subpath = NULL;
- Tag* _tmp29_ = NULL;
- gchar* _tmp30_ = NULL;
- gchar* _tmp31_ = NULL;
- const gchar* _tmp32_ = NULL;
- gchar* _tmp33_ = NULL;
- gchar* _tmp34_ = NULL;
- GeeMap* _tmp35_ = NULL;
- const gchar* _tmp36_ = NULL;
- GeeHashSet* _tmp37_ = NULL;
- GeeHashSet* _tmp38_ = NULL;
- GeeMap* _tmp39_ = NULL;
- const gchar* _tmp40_ = NULL;
- gpointer _tmp41_ = NULL;
- GeeSet* _tmp42_ = NULL;
- Tag* _tmp43_ = NULL;
- GeeCollection* _tmp44_ = NULL;
- GeeCollection* _tmp45_ = NULL;
+ Tag* _tmp29_;
+ gchar* _tmp30_;
+ gchar* _tmp31_;
+ const gchar* _tmp32_;
+ gchar* _tmp33_;
+ gchar* _tmp34_;
+ GeeMap* _tmp35_;
+ const gchar* _tmp36_;
+ GeeHashSet* _tmp37_;
+ GeeHashSet* _tmp38_;
+ GeeMap* _tmp39_;
+ const gchar* _tmp40_;
+ gpointer _tmp41_;
+ GeeSet* _tmp42_;
+ Tag* _tmp43_;
+ GeeCollection* _tmp44_;
+ GeeCollection* _tmp45_;
#line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp23_ = _t_index;
#line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14850,7 +14785,7 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
if (!(_tmp24_ < _tmp25_)) {
#line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 14854 "Commands.c"
+#line 14789 "Commands.c"
}
#line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp26_ = _t_list;
@@ -14912,11 +14847,11 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
_g_free0 (child_subpath);
#line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (t);
-#line 14916 "Commands.c"
+#line 14851 "Commands.c"
}
#line 1748 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_t_list);
-#line 14920 "Commands.c"
+#line 14855 "Commands.c"
}
#line 1755 "/home/jens/Source/shotwell/src/Commands.vala"
result = _result_;
@@ -14928,24 +14863,24 @@ static GeeMap* reparent_tag_command_get_child_structure_at (ReparentTagCommand*
_g_free0 (path);
#line 1755 "/home/jens/Source/shotwell/src/Commands.vala"
return result;
-#line 14932 "Commands.c"
+#line 14867 "Commands.c"
}
static void reparent_tag_command_restore_child_attachments_at (ReparentTagCommand* self, const gchar* client_path, GeeMap* child_structure) {
gchar* new_path = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
+ const gchar* _tmp3_;
gchar* path = NULL;
- gchar* _tmp6_ = NULL;
- TagSourceCollection* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+ gchar* _tmp6_;
+ TagSourceCollection* _tmp7_;
+ const gchar* _tmp8_;
+ gboolean _tmp9_;
Tag* tag = NULL;
- const gchar* _tmp10_ = NULL;
- Tag* _tmp11_ = NULL;
+ const gchar* _tmp10_;
+ Tag* _tmp11_;
#line 1758 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
#line 1758 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14962,20 +14897,20 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
_tmp3_ = new_path;
#line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp3_ != NULL) {
-#line 14966 "Commands.c"
- const gchar* _tmp4_ = NULL;
+#line 14901 "Commands.c"
+ const gchar* _tmp4_;
#line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = new_path;
#line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _tmp4_;
-#line 14972 "Commands.c"
+#line 14907 "Commands.c"
} else {
- const gchar* _tmp5_ = NULL;
+ const gchar* _tmp5_;
#line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = client_path;
#line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _tmp5_;
-#line 14979 "Commands.c"
+#line 14914 "Commands.c"
}
#line 1762 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = g_strdup (_tmp2_);
@@ -14995,15 +14930,15 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
_tmp11_ = tag_for_path (_tmp10_);
#line 1765 "/home/jens/Source/shotwell/src/Commands.vala"
tag = _tmp11_;
-#line 14999 "Commands.c"
+#line 14934 "Commands.c"
{
GeeIterator* _child_subpath_it = NULL;
- GeeMap* _tmp12_ = NULL;
- GeeSet* _tmp13_ = NULL;
- GeeSet* _tmp14_ = NULL;
- GeeSet* _tmp15_ = NULL;
- GeeIterator* _tmp16_ = NULL;
- GeeIterator* _tmp17_ = NULL;
+ GeeMap* _tmp12_;
+ GeeSet* _tmp13_;
+ GeeSet* _tmp14_;
+ GeeSet* _tmp15_;
+ GeeIterator* _tmp16_;
+ GeeIterator* _tmp17_;
#line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp12_ = child_structure;
#line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15022,29 +14957,29 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
_child_subpath_it = _tmp17_;
#line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 15026 "Commands.c"
- GeeIterator* _tmp18_ = NULL;
- gboolean _tmp19_ = FALSE;
+#line 14961 "Commands.c"
+ GeeIterator* _tmp18_;
+ gboolean _tmp19_;
gchar* child_subpath = NULL;
- GeeIterator* _tmp20_ = NULL;
- gpointer _tmp21_ = NULL;
+ GeeIterator* _tmp20_;
+ gpointer _tmp21_;
gchar* child_path = NULL;
- Tag* _tmp22_ = NULL;
- gchar* _tmp23_ = NULL;
- gchar* _tmp24_ = NULL;
- gchar* _tmp25_ = NULL;
- gchar* _tmp26_ = NULL;
- const gchar* _tmp27_ = NULL;
- gchar* _tmp28_ = NULL;
- gchar* _tmp29_ = NULL;
- Tag* _tmp30_ = NULL;
- gchar* _tmp31_ = NULL;
- gchar* _tmp32_ = NULL;
- gboolean _tmp33_ = FALSE;
- gboolean _tmp34_ = FALSE;
- TagSourceCollection* _tmp43_ = NULL;
- const gchar* _tmp44_ = NULL;
- gboolean _tmp45_ = FALSE;
+ Tag* _tmp22_;
+ gchar* _tmp23_;
+ gchar* _tmp24_;
+ gchar* _tmp25_;
+ gchar* _tmp26_;
+ const gchar* _tmp27_;
+ gchar* _tmp28_;
+ gchar* _tmp29_;
+ Tag* _tmp30_;
+ gchar* _tmp31_;
+ gchar* _tmp32_;
+ gboolean _tmp33_;
+ gboolean _tmp34_;
+ TagSourceCollection* _tmp43_;
+ const gchar* _tmp44_;
+ gboolean _tmp45_;
#line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp18_ = _child_subpath_it;
#line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15053,7 +14988,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
if (!_tmp19_) {
#line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 15057 "Commands.c"
+#line 14992 "Commands.c"
}
#line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp20_ = _child_subpath_it;
@@ -15097,15 +15032,15 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
_g_free0 (_tmp32_);
#line 1770 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp34_) {
-#line 15101 "Commands.c"
- Tag* _tmp35_ = NULL;
- Tag* _tmp36_ = NULL;
- gchar* _tmp37_ = NULL;
- gchar* _tmp38_ = NULL;
- gchar* _tmp39_ = NULL;
- gchar* _tmp40_ = NULL;
- const gchar* _tmp41_ = NULL;
- gchar* _tmp42_ = NULL;
+#line 15036 "Commands.c"
+ Tag* _tmp35_;
+ Tag* _tmp36_;
+ gchar* _tmp37_;
+ gchar* _tmp38_;
+ gchar* _tmp39_;
+ gchar* _tmp40_;
+ const gchar* _tmp41_;
+ gchar* _tmp42_;
#line 1771 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp35_ = tag;
#line 1771 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15132,7 +15067,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
_g_free0 (_tmp40_);
#line 1772 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (_tmp38_);
-#line 15136 "Commands.c"
+#line 15071 "Commands.c"
}
#line 1775 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp43_ = tag_global;
@@ -15142,15 +15077,15 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
_tmp45_ = tag_source_collection_exists (_tmp43_, _tmp44_, FALSE);
#line 1775 "/home/jens/Source/shotwell/src/Commands.vala"
_vala_assert (_tmp45_, "Tag.global.exists(child_path)");
-#line 15146 "Commands.c"
+#line 15081 "Commands.c"
{
GeeIterator* _s_it = NULL;
- GeeMap* _tmp46_ = NULL;
- const gchar* _tmp47_ = NULL;
- gpointer _tmp48_ = NULL;
- GeeSet* _tmp49_ = NULL;
- GeeIterator* _tmp50_ = NULL;
- GeeIterator* _tmp51_ = NULL;
+ GeeMap* _tmp46_;
+ const gchar* _tmp47_;
+ gpointer _tmp48_;
+ GeeSet* _tmp49_;
+ GeeIterator* _tmp50_;
+ GeeIterator* _tmp51_;
#line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp46_ = child_structure;
#line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15169,16 +15104,16 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
_s_it = _tmp51_;
#line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 15173 "Commands.c"
- GeeIterator* _tmp52_ = NULL;
- gboolean _tmp53_ = FALSE;
+#line 15108 "Commands.c"
+ GeeIterator* _tmp52_;
+ gboolean _tmp53_;
MediaSource* s = NULL;
- GeeIterator* _tmp54_ = NULL;
- gpointer _tmp55_ = NULL;
- const gchar* _tmp56_ = NULL;
- Tag* _tmp57_ = NULL;
- Tag* _tmp58_ = NULL;
- MediaSource* _tmp59_ = NULL;
+ GeeIterator* _tmp54_;
+ gpointer _tmp55_;
+ const gchar* _tmp56_;
+ Tag* _tmp57_;
+ Tag* _tmp58_;
+ MediaSource* _tmp59_;
#line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp52_ = _s_it;
#line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15187,7 +15122,7 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
if (!_tmp53_) {
#line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 15191 "Commands.c"
+#line 15126 "Commands.c"
}
#line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp54_ = _s_it;
@@ -15209,21 +15144,21 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
_g_object_unref0 (_tmp58_);
#line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (s);
-#line 15213 "Commands.c"
+#line 15148 "Commands.c"
}
#line 1777 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_s_it);
-#line 15217 "Commands.c"
+#line 15152 "Commands.c"
}
#line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (child_path);
#line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (child_subpath);
-#line 15223 "Commands.c"
+#line 15158 "Commands.c"
}
#line 1767 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_child_subpath_it);
-#line 15227 "Commands.c"
+#line 15162 "Commands.c"
}
#line 1758 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (tag);
@@ -15231,24 +15166,24 @@ static void reparent_tag_command_restore_child_attachments_at (ReparentTagComman
_g_free0 (path);
#line 1758 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (new_path);
-#line 15235 "Commands.c"
+#line 15170 "Commands.c"
}
static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand* self, const gchar* client_path) {
gchar* new_path = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
+ const gchar* _tmp3_;
gchar* path = NULL;
- gchar* _tmp6_ = NULL;
- TagSourceCollection* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+ gchar* _tmp6_;
+ TagSourceCollection* _tmp7_;
+ const gchar* _tmp8_;
+ gboolean _tmp9_;
Tag* tag = NULL;
- const gchar* _tmp10_ = NULL;
- Tag* _tmp11_ = NULL;
+ const gchar* _tmp10_;
+ Tag* _tmp11_;
#line 1782 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
#line 1782 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15263,20 +15198,20 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
_tmp3_ = new_path;
#line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp3_ != NULL) {
-#line 15267 "Commands.c"
- const gchar* _tmp4_ = NULL;
+#line 15202 "Commands.c"
+ const gchar* _tmp4_;
#line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = new_path;
#line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _tmp4_;
-#line 15273 "Commands.c"
+#line 15208 "Commands.c"
} else {
- const gchar* _tmp5_ = NULL;
+ const gchar* _tmp5_;
#line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = client_path;
#line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _tmp5_;
-#line 15280 "Commands.c"
+#line 15215 "Commands.c"
}
#line 1784 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = g_strdup (_tmp2_);
@@ -15296,11 +15231,11 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
_tmp11_ = tag_for_path (_tmp10_);
#line 1788 "/home/jens/Source/shotwell/src/Commands.vala"
tag = _tmp11_;
-#line 15300 "Commands.c"
+#line 15235 "Commands.c"
{
GeeIterator* _s_it = NULL;
- GeeHashSet* _tmp12_ = NULL;
- GeeIterator* _tmp13_ = NULL;
+ GeeHashSet* _tmp12_;
+ GeeIterator* _tmp13_;
#line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp12_ = self->priv->sources_in_play;
#line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15309,14 +15244,14 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
_s_it = _tmp13_;
#line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 15313 "Commands.c"
- GeeIterator* _tmp14_ = NULL;
- gboolean _tmp15_ = FALSE;
+#line 15248 "Commands.c"
+ GeeIterator* _tmp14_;
+ gboolean _tmp15_;
MediaSource* s = NULL;
- GeeIterator* _tmp16_ = NULL;
- gpointer _tmp17_ = NULL;
- Tag* _tmp18_ = NULL;
- MediaSource* _tmp19_ = NULL;
+ GeeIterator* _tmp16_;
+ gpointer _tmp17_;
+ Tag* _tmp18_;
+ MediaSource* _tmp19_;
#line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp14_ = _s_it;
#line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15325,7 +15260,7 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
if (!_tmp15_) {
#line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 15329 "Commands.c"
+#line 15264 "Commands.c"
}
#line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp16_ = _s_it;
@@ -15341,11 +15276,11 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
tag_attach (_tmp18_, _tmp19_);
#line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (s);
-#line 15345 "Commands.c"
+#line 15280 "Commands.c"
}
#line 1790 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_s_it);
-#line 15349 "Commands.c"
+#line 15284 "Commands.c"
}
#line 1782 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (tag);
@@ -15353,43 +15288,43 @@ static void reparent_tag_command_reattach_in_play_sources_at (ReparentTagCommand
_g_free0 (path);
#line 1782 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (new_path);
-#line 15357 "Commands.c"
+#line 15292 "Commands.c"
}
static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
- GeeList* _tmp0_ = NULL;
- GeeList* _tmp1_ = NULL;
- GeeArrayList* _tmp2_ = NULL;
- GeeArrayList* _tmp3_ = NULL;
- GeeMap* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
- GeeMap* _tmp6_ = NULL;
- TagSourceCollection* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- gboolean _tmp9_ = FALSE;
+ GeeList* _tmp0_;
+ GeeList* _tmp1_;
+ GeeArrayList* _tmp2_;
+ GeeArrayList* _tmp3_;
+ GeeMap* _tmp4_;
+ const gchar* _tmp5_;
+ GeeMap* _tmp6_;
+ TagSourceCollection* _tmp7_;
+ const gchar* _tmp8_;
+ gboolean _tmp9_;
Tag* from_tag = NULL;
- const gchar* _tmp10_ = NULL;
- Tag* _tmp11_ = NULL;
- GeeList* _tmp12_ = NULL;
- Tag* _tmp13_ = NULL;
- SourceProxy* _tmp14_ = NULL;
- SourceProxy* _tmp15_ = NULL;
+ const gchar* _tmp10_;
+ Tag* _tmp11_;
+ GeeList* _tmp12_;
+ Tag* _tmp13_;
+ SourceProxy* _tmp14_;
+ SourceProxy* _tmp15_;
GeeList* parent_paths = NULL;
- const gchar* _tmp16_ = NULL;
- GeeList* _tmp17_ = NULL;
- GeeList* _tmp18_ = NULL;
- gint _tmp19_ = 0;
- gint _tmp20_ = 0;
- const gchar* _tmp26_ = NULL;
- const gchar* _tmp30_ = NULL;
- const gchar* _tmp42_ = NULL;
- const gchar* _tmp59_ = NULL;
+ const gchar* _tmp16_;
+ GeeList* _tmp17_;
+ GeeList* _tmp18_;
+ gint _tmp19_;
+ gint _tmp20_;
+ const gchar* _tmp26_;
+ const gchar* _tmp30_;
+ const gchar* _tmp42_;
+ const gchar* _tmp59_;
GeeList* from_children = NULL;
- Tag* _tmp66_ = NULL;
- GeeList* _tmp67_ = NULL;
- const gchar* _tmp81_ = NULL;
- const gchar* _tmp100_ = NULL;
+ Tag* _tmp66_;
+ GeeList* _tmp67_;
+ const gchar* _tmp81_;
+ const gchar* _tmp100_;
#line 1794 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
#line 1795 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15464,12 +15399,12 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
_tmp20_ = _tmp19_;
#line 1812 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp20_ > 0) {
-#line 15468 "Commands.c"
- GeeList* _tmp21_ = NULL;
- GeeList* _tmp22_ = NULL;
- gint _tmp23_ = 0;
- gint _tmp24_ = 0;
- gpointer _tmp25_ = NULL;
+#line 15403 "Commands.c"
+ GeeList* _tmp21_;
+ GeeList* _tmp22_;
+ gint _tmp23_;
+ gint _tmp24_;
+ gpointer _tmp25_;
#line 1813 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp21_ = parent_paths;
#line 1813 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15484,16 +15419,16 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
_g_free0 (self->priv->to_path_parent_path);
#line 1813 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->to_path_parent_path = (gchar*) _tmp25_;
-#line 15488 "Commands.c"
+#line 15423 "Commands.c"
}
#line 1814 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp26_ = self->priv->to_path_parent_path;
#line 1814 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp26_ != NULL) {
-#line 15494 "Commands.c"
- GeeMap* _tmp27_ = NULL;
- const gchar* _tmp28_ = NULL;
- GeeMap* _tmp29_ = NULL;
+#line 15429 "Commands.c"
+ GeeMap* _tmp27_;
+ const gchar* _tmp28_;
+ GeeMap* _tmp29_;
#line 1815 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp27_ = self->priv->existing_dest_child_structure;
#line 1815 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15506,24 +15441,24 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
_g_object_unref0 (self->priv->existing_dest_child_structure);
#line 1816 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->existing_dest_child_structure = _tmp29_;
-#line 15510 "Commands.c"
+#line 15445 "Commands.c"
}
#line 1820 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp30_ = self->priv->to_path_parent_path;
#line 1820 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp30_ == NULL) {
-#line 15516 "Commands.c"
- GeeMap* _tmp31_ = NULL;
- GeeSet* _tmp32_ = NULL;
- const gchar* _tmp33_ = NULL;
- GeeMap* _tmp34_ = NULL;
- GeeHashSet* _tmp35_ = NULL;
- GeeSet* _tmp36_ = NULL;
- const gchar* _tmp37_ = NULL;
- Tag* _tmp38_ = NULL;
- Tag* _tmp39_ = NULL;
- GeeCollection* _tmp40_ = NULL;
- GeeCollection* _tmp41_ = NULL;
+#line 15451 "Commands.c"
+ GeeMap* _tmp31_;
+ GeeSet* _tmp32_;
+ const gchar* _tmp33_;
+ GeeMap* _tmp34_;
+ GeeHashSet* _tmp35_;
+ GeeSet* _tmp36_;
+ const gchar* _tmp37_;
+ Tag* _tmp38_;
+ Tag* _tmp39_;
+ GeeCollection* _tmp40_;
+ GeeCollection* _tmp41_;
#line 1821 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp31_ = self->priv->existing_dest_child_structure;
#line 1821 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15564,28 +15499,28 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
_g_object_unref0 (_tmp41_);
#line 1825 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp39_);
-#line 15568 "Commands.c"
+#line 15503 "Commands.c"
}
#line 1829 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp42_ = self->priv->to_path_parent_path;
#line 1829 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp42_ != NULL) {
-#line 15574 "Commands.c"
+#line 15509 "Commands.c"
gchar* new_tpp = NULL;
- const gchar* _tmp43_ = NULL;
- gchar* _tmp44_ = NULL;
+ const gchar* _tmp43_;
+ gchar* _tmp44_;
const gchar* _tmp45_ = NULL;
- const gchar* _tmp46_ = NULL;
- gchar* _tmp49_ = NULL;
- TagSourceCollection* _tmp50_ = NULL;
- const gchar* _tmp51_ = NULL;
- gboolean _tmp52_ = FALSE;
- GeeList* _tmp53_ = NULL;
- const gchar* _tmp54_ = NULL;
- Tag* _tmp55_ = NULL;
- Tag* _tmp56_ = NULL;
- SourceProxy* _tmp57_ = NULL;
- SourceProxy* _tmp58_ = NULL;
+ const gchar* _tmp46_;
+ gchar* _tmp49_;
+ TagSourceCollection* _tmp50_;
+ const gchar* _tmp51_;
+ gboolean _tmp52_;
+ GeeList* _tmp53_;
+ const gchar* _tmp54_;
+ Tag* _tmp55_;
+ Tag* _tmp56_;
+ SourceProxy* _tmp57_;
+ SourceProxy* _tmp58_;
#line 1830 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp43_ = self->priv->to_path_parent_path;
#line 1830 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15596,20 +15531,20 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
_tmp46_ = new_tpp;
#line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp46_ != NULL) {
-#line 15600 "Commands.c"
- const gchar* _tmp47_ = NULL;
+#line 15535 "Commands.c"
+ const gchar* _tmp47_;
#line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp47_ = new_tpp;
#line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp45_ = _tmp47_;
-#line 15606 "Commands.c"
+#line 15541 "Commands.c"
} else {
- const gchar* _tmp48_ = NULL;
+ const gchar* _tmp48_;
#line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp48_ = self->priv->to_path_parent_path;
#line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp45_ = _tmp48_;
-#line 15613 "Commands.c"
+#line 15548 "Commands.c"
}
#line 1831 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp49_ = g_strdup (_tmp45_);
@@ -15645,19 +15580,19 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
_g_object_unref0 (_tmp56_);
#line 1829 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (new_tpp);
-#line 15649 "Commands.c"
+#line 15584 "Commands.c"
}
#line 1837 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp59_ = self->priv->to_path_parent_path;
#line 1837 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp59_ == NULL) {
-#line 15655 "Commands.c"
- GeeList* _tmp60_ = NULL;
- const gchar* _tmp61_ = NULL;
- Tag* _tmp62_ = NULL;
- Tag* _tmp63_ = NULL;
- SourceProxy* _tmp64_ = NULL;
- SourceProxy* _tmp65_ = NULL;
+#line 15590 "Commands.c"
+ GeeList* _tmp60_;
+ const gchar* _tmp61_;
+ Tag* _tmp62_;
+ Tag* _tmp63_;
+ SourceProxy* _tmp64_;
+ SourceProxy* _tmp65_;
#line 1838 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp60_ = self->priv->dest_before_state;
#line 1838 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15676,7 +15611,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
_source_proxy_unref0 (_tmp65_);
#line 1838 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp63_);
-#line 15680 "Commands.c"
+#line 15615 "Commands.c"
}
#line 1842 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp66_ = from_tag;
@@ -15684,12 +15619,12 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
_tmp67_ = tag_get_hierarchical_children (_tmp66_);
#line 1842 "/home/jens/Source/shotwell/src/Commands.vala"
from_children = _tmp67_;
-#line 15688 "Commands.c"
+#line 15623 "Commands.c"
{
gint i = 0;
- GeeList* _tmp68_ = NULL;
- gint _tmp69_ = 0;
- gint _tmp70_ = 0;
+ GeeList* _tmp68_;
+ gint _tmp69_;
+ gint _tmp70_;
#line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp68_ = from_children;
#line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15698,31 +15633,31 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
_tmp70_ = _tmp69_;
#line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
i = _tmp70_ - 1;
-#line 15702 "Commands.c"
+#line 15637 "Commands.c"
{
gboolean _tmp71_ = FALSE;
#line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp71_ = TRUE;
#line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 15709 "Commands.c"
- gint _tmp73_ = 0;
- GeeList* _tmp74_ = NULL;
- GeeList* _tmp75_ = NULL;
- gint _tmp76_ = 0;
- gpointer _tmp77_ = NULL;
- Tag* _tmp78_ = NULL;
- SourceProxy* _tmp79_ = NULL;
- SourceProxy* _tmp80_ = NULL;
+#line 15644 "Commands.c"
+ gint _tmp73_;
+ GeeList* _tmp74_;
+ GeeList* _tmp75_;
+ gint _tmp76_;
+ gpointer _tmp77_;
+ Tag* _tmp78_;
+ SourceProxy* _tmp79_;
+ SourceProxy* _tmp80_;
#line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp71_) {
-#line 15720 "Commands.c"
- gint _tmp72_ = 0;
+#line 15655 "Commands.c"
+ gint _tmp72_;
#line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp72_ = i;
#line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
i = _tmp72_ - 1;
-#line 15726 "Commands.c"
+#line 15661 "Commands.c"
}
#line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp71_ = FALSE;
@@ -15732,7 +15667,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
if (!(_tmp73_ >= 0)) {
#line 1843 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 15736 "Commands.c"
+#line 15671 "Commands.c"
}
#line 1844 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp74_ = self->priv->src_before_state;
@@ -15754,7 +15689,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
_source_proxy_unref0 (_tmp80_);
#line 1844 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp78_);
-#line 15758 "Commands.c"
+#line 15693 "Commands.c"
}
}
}
@@ -15762,13 +15697,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
_tmp81_ = self->priv->to_path_parent_path;
#line 1848 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp81_ != NULL) {
-#line 15766 "Commands.c"
+#line 15701 "Commands.c"
GeeList* to_children = NULL;
- const gchar* _tmp82_ = NULL;
- Tag* _tmp83_ = NULL;
- Tag* _tmp84_ = NULL;
- GeeList* _tmp85_ = NULL;
- GeeList* _tmp86_ = NULL;
+ const gchar* _tmp82_;
+ Tag* _tmp83_;
+ Tag* _tmp84_;
+ GeeList* _tmp85_;
+ GeeList* _tmp86_;
#line 1849 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp82_ = self->priv->to_path_parent_path;
#line 1849 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15783,12 +15718,12 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
_g_object_unref0 (_tmp84_);
#line 1849 "/home/jens/Source/shotwell/src/Commands.vala"
to_children = _tmp86_;
-#line 15787 "Commands.c"
+#line 15722 "Commands.c"
{
gint i = 0;
- GeeList* _tmp87_ = NULL;
- gint _tmp88_ = 0;
- gint _tmp89_ = 0;
+ GeeList* _tmp87_;
+ gint _tmp88_;
+ gint _tmp89_;
#line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp87_ = to_children;
#line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15797,31 +15732,31 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
_tmp89_ = _tmp88_;
#line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
i = _tmp89_ - 1;
-#line 15801 "Commands.c"
+#line 15736 "Commands.c"
{
gboolean _tmp90_ = FALSE;
#line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp90_ = TRUE;
#line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 15808 "Commands.c"
- gint _tmp92_ = 0;
- GeeList* _tmp93_ = NULL;
- GeeList* _tmp94_ = NULL;
- gint _tmp95_ = 0;
- gpointer _tmp96_ = NULL;
- Tag* _tmp97_ = NULL;
- SourceProxy* _tmp98_ = NULL;
- SourceProxy* _tmp99_ = NULL;
+#line 15743 "Commands.c"
+ gint _tmp92_;
+ GeeList* _tmp93_;
+ GeeList* _tmp94_;
+ gint _tmp95_;
+ gpointer _tmp96_;
+ Tag* _tmp97_;
+ SourceProxy* _tmp98_;
+ SourceProxy* _tmp99_;
#line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp90_) {
-#line 15819 "Commands.c"
- gint _tmp91_ = 0;
+#line 15754 "Commands.c"
+ gint _tmp91_;
#line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp91_ = i;
#line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
i = _tmp91_ - 1;
-#line 15825 "Commands.c"
+#line 15760 "Commands.c"
}
#line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp90_ = FALSE;
@@ -15831,7 +15766,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
if (!(_tmp92_ >= 0)) {
#line 1850 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 15835 "Commands.c"
+#line 15770 "Commands.c"
}
#line 1851 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp93_ = self->priv->dest_before_state;
@@ -15853,25 +15788,25 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
_source_proxy_unref0 (_tmp99_);
#line 1851 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp97_);
-#line 15857 "Commands.c"
+#line 15792 "Commands.c"
}
}
}
#line 1848 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (to_children);
-#line 15863 "Commands.c"
+#line 15798 "Commands.c"
}
#line 1856 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp100_ = self->priv->to_path_parent_path;
#line 1856 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp100_ == NULL) {
-#line 15869 "Commands.c"
+#line 15804 "Commands.c"
GeeList* to_children = NULL;
- const gchar* _tmp101_ = NULL;
- Tag* _tmp102_ = NULL;
- Tag* _tmp103_ = NULL;
- GeeList* _tmp104_ = NULL;
- GeeList* _tmp105_ = NULL;
+ const gchar* _tmp101_;
+ Tag* _tmp102_;
+ Tag* _tmp103_;
+ GeeList* _tmp104_;
+ GeeList* _tmp105_;
#line 1857 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp101_ = self->priv->to_path;
#line 1857 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15886,12 +15821,12 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
_g_object_unref0 (_tmp103_);
#line 1857 "/home/jens/Source/shotwell/src/Commands.vala"
to_children = _tmp105_;
-#line 15890 "Commands.c"
+#line 15825 "Commands.c"
{
gint i = 0;
- GeeList* _tmp106_ = NULL;
- gint _tmp107_ = 0;
- gint _tmp108_ = 0;
+ GeeList* _tmp106_;
+ gint _tmp107_;
+ gint _tmp108_;
#line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp106_ = to_children;
#line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -15900,31 +15835,31 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
_tmp108_ = _tmp107_;
#line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
i = _tmp108_ - 1;
-#line 15904 "Commands.c"
+#line 15839 "Commands.c"
{
gboolean _tmp109_ = FALSE;
#line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp109_ = TRUE;
#line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 15911 "Commands.c"
- gint _tmp111_ = 0;
- GeeList* _tmp112_ = NULL;
- GeeList* _tmp113_ = NULL;
- gint _tmp114_ = 0;
- gpointer _tmp115_ = NULL;
- Tag* _tmp116_ = NULL;
- SourceProxy* _tmp117_ = NULL;
- SourceProxy* _tmp118_ = NULL;
+#line 15846 "Commands.c"
+ gint _tmp111_;
+ GeeList* _tmp112_;
+ GeeList* _tmp113_;
+ gint _tmp114_;
+ gpointer _tmp115_;
+ Tag* _tmp116_;
+ SourceProxy* _tmp117_;
+ SourceProxy* _tmp118_;
#line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp109_) {
-#line 15922 "Commands.c"
- gint _tmp110_ = 0;
+#line 15857 "Commands.c"
+ gint _tmp110_;
#line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp110_ = i;
#line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
i = _tmp110_ - 1;
-#line 15928 "Commands.c"
+#line 15863 "Commands.c"
}
#line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp109_ = FALSE;
@@ -15934,7 +15869,7 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
if (!(_tmp111_ >= 0)) {
#line 1858 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 15938 "Commands.c"
+#line 15873 "Commands.c"
}
#line 1859 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp112_ = self->priv->dest_before_state;
@@ -15956,13 +15891,13 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
_source_proxy_unref0 (_tmp118_);
#line 1859 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp116_);
-#line 15960 "Commands.c"
+#line 15895 "Commands.c"
}
}
}
#line 1856 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (to_children);
-#line 15966 "Commands.c"
+#line 15901 "Commands.c"
}
#line 1794 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (from_children);
@@ -15970,50 +15905,50 @@ static void reparent_tag_command_save_before_state (ReparentTagCommand* self) {
_g_object_unref0 (parent_paths);
#line 1794 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (from_tag);
-#line 15974 "Commands.c"
+#line 15909 "Commands.c"
}
static glong string_strnlen (gchar* str, glong maxlen) {
glong result = 0L;
gchar* end = NULL;
- gchar* _tmp0_ = NULL;
- glong _tmp1_ = 0L;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ glong _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
-#line 15997 "Commands.c"
- glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 15932 "Commands.c"
+ glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 16005 "Commands.c"
+#line 15940 "Commands.c"
} else {
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 16017 "Commands.c"
+#line 15952 "Commands.c"
}
}
@@ -16022,135 +15957,135 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
gchar* result = NULL;
glong string_length = 0L;
gboolean _tmp0_ = FALSE;
- glong _tmp1_ = 0L;
- glong _tmp8_ = 0L;
- glong _tmp14_ = 0L;
- glong _tmp17_ = 0L;
- glong _tmp18_ = 0L;
- glong _tmp19_ = 0L;
- glong _tmp20_ = 0L;
- glong _tmp21_ = 0L;
- gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp1_;
+ glong _tmp8_;
+ glong _tmp14_;
+ glong _tmp17_;
+ glong _tmp18_;
+ glong _tmp19_;
+ glong _tmp20_;
+ glong _tmp21_;
+ gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
-#line 16041 "Commands.c"
- glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 15976 "Commands.c"
+ glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 16047 "Commands.c"
+#line 15982 "Commands.c"
} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 16051 "Commands.c"
+#line 15986 "Commands.c"
}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 16055 "Commands.c"
- glong _tmp3_ = 0L;
- glong _tmp4_ = 0L;
- glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 15990 "Commands.c"
+ glong _tmp3_;
+ glong _tmp4_;
+ glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = _tmp5_;
-#line 16067 "Commands.c"
+#line 16002 "Commands.c"
} else {
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ gint _tmp6_;
+ gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
-#line 16077 "Commands.c"
+#line 16012 "Commands.c"
}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
-#line 16083 "Commands.c"
- glong _tmp9_ = 0L;
- glong _tmp10_ = 0L;
- glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 16018 "Commands.c"
+ glong _tmp9_;
+ glong _tmp10_;
+ glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 16097 "Commands.c"
+#line 16032 "Commands.c"
} else {
- glong _tmp12_ = 0L;
- glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+ glong _tmp12_;
+ glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 16107 "Commands.c"
+#line 16042 "Commands.c"
}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
-#line 16113 "Commands.c"
- glong _tmp15_ = 0L;
- glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 16048 "Commands.c"
+ glong _tmp15_;
+ glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
-#line 16122 "Commands.c"
+#line 16057 "Commands.c"
}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 16142 "Commands.c"
+#line 16077 "Commands.c"
}
static void reparent_tag_command_restore_before_state (ReparentTagCommand* self) {
- GeeList* _tmp0_ = NULL;
- GeeMap* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
+ GeeList* _tmp0_;
+ GeeMap* _tmp1_;
+ const gchar* _tmp2_;
const gchar* _tmp10_ = NULL;
- const gchar* _tmp11_ = NULL;
+ const gchar* _tmp11_;
gchar* unwind_target = NULL;
- gchar* _tmp14_ = NULL;
- const gchar* _tmp93_ = NULL;
+ gchar* _tmp14_;
+ const gchar* _tmp93_;
#line 1863 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
#line 1864 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16165,13 +16100,13 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_tmp2_ = self->priv->to_path_parent_path;
#line 1868 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp2_ != NULL) {
-#line 16169 "Commands.c"
+#line 16104 "Commands.c"
gchar* new_tpp = NULL;
- const gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
const gchar* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- gchar* _tmp9_ = NULL;
+ const gchar* _tmp6_;
+ gchar* _tmp9_;
#line 1869 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = self->priv->to_path_parent_path;
#line 1869 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16182,20 +16117,20 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_tmp6_ = new_tpp;
#line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp6_ != NULL) {
-#line 16186 "Commands.c"
- const gchar* _tmp7_ = NULL;
+#line 16121 "Commands.c"
+ const gchar* _tmp7_;
#line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = new_tpp;
#line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = _tmp7_;
-#line 16192 "Commands.c"
+#line 16127 "Commands.c"
} else {
- const gchar* _tmp8_ = NULL;
+ const gchar* _tmp8_;
#line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp8_ = self->priv->to_path_parent_path;
#line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = _tmp8_;
-#line 16199 "Commands.c"
+#line 16134 "Commands.c"
}
#line 1870 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp9_ = g_strdup (_tmp5_);
@@ -16205,43 +16140,43 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
self->priv->to_path_parent_path = _tmp9_;
#line 1868 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (new_tpp);
-#line 16209 "Commands.c"
+#line 16144 "Commands.c"
}
#line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp11_ = self->priv->to_path_parent_path;
#line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp11_ != NULL) {
-#line 16215 "Commands.c"
- const gchar* _tmp12_ = NULL;
+#line 16150 "Commands.c"
+ const gchar* _tmp12_;
#line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp12_ = self->priv->to_path_parent_path;
#line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp10_ = _tmp12_;
-#line 16221 "Commands.c"
+#line 16156 "Commands.c"
} else {
- const gchar* _tmp13_ = NULL;
+ const gchar* _tmp13_;
#line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp13_ = self->priv->to_path;
#line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp10_ = _tmp13_;
-#line 16228 "Commands.c"
+#line 16163 "Commands.c"
}
#line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp14_ = g_strdup (_tmp10_);
#line 1873 "/home/jens/Source/shotwell/src/Commands.vala"
unwind_target = _tmp14_;
-#line 16234 "Commands.c"
+#line 16169 "Commands.c"
{
GeeList* _t_list = NULL;
- const gchar* _tmp15_ = NULL;
- Tag* _tmp16_ = NULL;
- Tag* _tmp17_ = NULL;
- GeeList* _tmp18_ = NULL;
- GeeList* _tmp19_ = NULL;
+ const gchar* _tmp15_;
+ Tag* _tmp16_;
+ Tag* _tmp17_;
+ GeeList* _tmp18_;
+ GeeList* _tmp19_;
gint _t_size = 0;
- GeeList* _tmp20_ = NULL;
- gint _tmp21_ = 0;
- gint _tmp22_ = 0;
+ GeeList* _tmp20_;
+ gint _tmp21_;
+ gint _tmp22_;
gint _t_index = 0;
#line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp15_ = unwind_target;
@@ -16269,26 +16204,26 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_t_index = -1;
#line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 16273 "Commands.c"
- gint _tmp23_ = 0;
- gint _tmp24_ = 0;
- gint _tmp25_ = 0;
+#line 16208 "Commands.c"
+ gint _tmp23_;
+ gint _tmp24_;
+ gint _tmp25_;
Tag* t = NULL;
- GeeList* _tmp26_ = NULL;
- gint _tmp27_ = 0;
- gpointer _tmp28_ = NULL;
+ GeeList* _tmp26_;
+ gint _tmp27_;
+ gpointer _tmp28_;
gchar* child_subpath = NULL;
- Tag* _tmp29_ = NULL;
- gchar* _tmp30_ = NULL;
- gchar* _tmp31_ = NULL;
- const gchar* _tmp32_ = NULL;
- gchar* _tmp33_ = NULL;
- gchar* _tmp34_ = NULL;
- const gchar* _tmp35_ = NULL;
- gboolean _tmp36_ = FALSE;
- GeeMap* _tmp39_ = NULL;
- const gchar* _tmp40_ = NULL;
- gboolean _tmp41_ = FALSE;
+ Tag* _tmp29_;
+ gchar* _tmp30_;
+ gchar* _tmp31_;
+ const gchar* _tmp32_;
+ gchar* _tmp33_;
+ gchar* _tmp34_;
+ const gchar* _tmp35_;
+ gboolean _tmp36_;
+ GeeMap* _tmp39_;
+ const gchar* _tmp40_;
+ gboolean _tmp41_;
#line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp23_ = _t_index;
#line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16301,7 +16236,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
if (!(_tmp24_ < _tmp25_)) {
#line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 16305 "Commands.c"
+#line 16240 "Commands.c"
}
#line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp26_ = _t_list;
@@ -16333,9 +16268,9 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_tmp36_ = g_str_has_prefix (_tmp35_, TAG_PATH_SEPARATOR_STRING);
#line 1876 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp36_) {
-#line 16337 "Commands.c"
- const gchar* _tmp37_ = NULL;
- gchar* _tmp38_ = NULL;
+#line 16272 "Commands.c"
+ const gchar* _tmp37_;
+ gchar* _tmp38_;
#line 1877 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp37_ = child_subpath;
#line 1877 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16344,7 +16279,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_g_free0 (child_subpath);
#line 1877 "/home/jens/Source/shotwell/src/Commands.vala"
child_subpath = _tmp38_;
-#line 16348 "Commands.c"
+#line 16283 "Commands.c"
}
#line 1879 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp39_ = self->priv->existing_dest_child_structure;
@@ -16354,12 +16289,12 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_tmp41_ = gee_map_has_key (_tmp39_, _tmp40_);
#line 1879 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp41_) {
-#line 16358 "Commands.c"
- TagSourceCollection* _tmp42_ = NULL;
- TagSourceCollection* _tmp43_ = NULL;
- Tag* _tmp44_ = NULL;
- Marker* _tmp45_ = NULL;
- Marker* _tmp46_ = NULL;
+#line 16293 "Commands.c"
+ TagSourceCollection* _tmp42_;
+ TagSourceCollection* _tmp43_;
+ Tag* _tmp44_;
+ Marker* _tmp45_;
+ Marker* _tmp46_;
#line 1880 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp42_ = tag_global;
#line 1880 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16374,14 +16309,14 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp46_, TRUE, NULL, NULL, NULL);
#line 1880 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp46_);
-#line 16378 "Commands.c"
+#line 16313 "Commands.c"
} else {
GeeSet* starting_sources = NULL;
- GeeHashSet* _tmp47_ = NULL;
- GeeSet* _tmp48_ = NULL;
- Tag* _tmp49_ = NULL;
- GeeCollection* _tmp50_ = NULL;
- GeeCollection* _tmp51_ = NULL;
+ GeeHashSet* _tmp47_;
+ GeeSet* _tmp48_;
+ Tag* _tmp49_;
+ GeeCollection* _tmp50_;
+ GeeCollection* _tmp51_;
#line 1882 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp47_ = gee_hash_set_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
#line 1882 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16398,11 +16333,11 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection), _tmp51_);
#line 1883 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp51_);
-#line 16402 "Commands.c"
+#line 16337 "Commands.c"
{
GeeIterator* _source_it = NULL;
- GeeSet* _tmp52_ = NULL;
- GeeIterator* _tmp53_ = NULL;
+ GeeSet* _tmp52_;
+ GeeIterator* _tmp53_;
#line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp52_ = starting_sources;
#line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16411,19 +16346,19 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_source_it = _tmp53_;
#line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 16415 "Commands.c"
- GeeIterator* _tmp54_ = NULL;
- gboolean _tmp55_ = FALSE;
+#line 16350 "Commands.c"
+ GeeIterator* _tmp54_;
+ gboolean _tmp55_;
MediaSource* source = NULL;
- GeeIterator* _tmp56_ = NULL;
- gpointer _tmp57_ = NULL;
- GeeMap* _tmp58_ = NULL;
- const gchar* _tmp59_ = NULL;
- gpointer _tmp60_ = NULL;
- GeeSet* _tmp61_ = NULL;
- MediaSource* _tmp62_ = NULL;
- gboolean _tmp63_ = FALSE;
- gboolean _tmp64_ = FALSE;
+ GeeIterator* _tmp56_;
+ gpointer _tmp57_;
+ GeeMap* _tmp58_;
+ const gchar* _tmp59_;
+ gpointer _tmp60_;
+ GeeSet* _tmp61_;
+ MediaSource* _tmp62_;
+ gboolean _tmp63_;
+ gboolean _tmp64_;
#line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp54_ = _source_it;
#line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16432,7 +16367,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
if (!_tmp55_) {
#line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 16436 "Commands.c"
+#line 16371 "Commands.c"
}
#line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp56_ = _source_it;
@@ -16458,11 +16393,11 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_g_object_unref0 (_tmp61_);
#line 1885 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp64_) {
-#line 16462 "Commands.c"
- Tag* _tmp65_ = NULL;
- MediaSource* _tmp66_ = NULL;
- GeeList* _tmp67_ = NULL;
- GeeList* _tmp68_ = NULL;
+#line 16397 "Commands.c"
+ Tag* _tmp65_;
+ MediaSource* _tmp66_;
+ GeeList* _tmp67_;
+ GeeList* _tmp68_;
#line 1886 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp65_ = t;
#line 1886 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16473,61 +16408,61 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_tmp68_ = _tmp67_;
#line 1886 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp68_);
-#line 16477 "Commands.c"
+#line 16412 "Commands.c"
}
#line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (source);
-#line 16481 "Commands.c"
+#line 16416 "Commands.c"
}
#line 1884 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_source_it);
-#line 16485 "Commands.c"
+#line 16420 "Commands.c"
}
#line 1879 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (starting_sources);
-#line 16489 "Commands.c"
+#line 16424 "Commands.c"
}
#line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (child_subpath);
#line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (t);
-#line 16495 "Commands.c"
+#line 16430 "Commands.c"
}
#line 1874 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_t_list);
-#line 16499 "Commands.c"
+#line 16434 "Commands.c"
}
{
gint i = 0;
#line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
i = 0;
-#line 16505 "Commands.c"
+#line 16440 "Commands.c"
{
gboolean _tmp69_ = FALSE;
#line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp69_ = TRUE;
#line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 16512 "Commands.c"
- gint _tmp71_ = 0;
- GeeList* _tmp72_ = NULL;
- gint _tmp73_ = 0;
- gint _tmp74_ = 0;
- GeeList* _tmp75_ = NULL;
- gint _tmp76_ = 0;
- gpointer _tmp77_ = NULL;
- SourceProxy* _tmp78_ = NULL;
- DataSource* _tmp79_ = NULL;
- DataSource* _tmp80_ = NULL;
+#line 16447 "Commands.c"
+ gint _tmp71_;
+ GeeList* _tmp72_;
+ gint _tmp73_;
+ gint _tmp74_;
+ GeeList* _tmp75_;
+ gint _tmp76_;
+ gpointer _tmp77_;
+ SourceProxy* _tmp78_;
+ DataSource* _tmp79_;
+ DataSource* _tmp80_;
#line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp69_) {
-#line 16525 "Commands.c"
- gint _tmp70_ = 0;
+#line 16460 "Commands.c"
+ gint _tmp70_;
#line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp70_ = i;
#line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
i = _tmp70_ + 1;
-#line 16531 "Commands.c"
+#line 16466 "Commands.c"
}
#line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp69_ = FALSE;
@@ -16543,7 +16478,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
if (!(_tmp71_ < _tmp74_)) {
#line 1890 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 16547 "Commands.c"
+#line 16482 "Commands.c"
}
#line 1891 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp75_ = self->priv->src_before_state;
@@ -16561,7 +16496,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_g_object_unref0 (_tmp80_);
#line 1891 "/home/jens/Source/shotwell/src/Commands.vala"
_source_proxy_unref0 (_tmp78_);
-#line 16565 "Commands.c"
+#line 16500 "Commands.c"
}
}
}
@@ -16569,33 +16504,33 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
gint i = 0;
#line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
i = 0;
-#line 16573 "Commands.c"
+#line 16508 "Commands.c"
{
gboolean _tmp81_ = FALSE;
#line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp81_ = TRUE;
#line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 16580 "Commands.c"
- gint _tmp83_ = 0;
- GeeList* _tmp84_ = NULL;
- gint _tmp85_ = 0;
- gint _tmp86_ = 0;
- GeeList* _tmp87_ = NULL;
- gint _tmp88_ = 0;
- gpointer _tmp89_ = NULL;
- SourceProxy* _tmp90_ = NULL;
- DataSource* _tmp91_ = NULL;
- DataSource* _tmp92_ = NULL;
+#line 16515 "Commands.c"
+ gint _tmp83_;
+ GeeList* _tmp84_;
+ gint _tmp85_;
+ gint _tmp86_;
+ GeeList* _tmp87_;
+ gint _tmp88_;
+ gpointer _tmp89_;
+ SourceProxy* _tmp90_;
+ DataSource* _tmp91_;
+ DataSource* _tmp92_;
#line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp81_) {
-#line 16593 "Commands.c"
- gint _tmp82_ = 0;
+#line 16528 "Commands.c"
+ gint _tmp82_;
#line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp82_ = i;
#line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
i = _tmp82_ + 1;
-#line 16599 "Commands.c"
+#line 16534 "Commands.c"
}
#line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp81_ = FALSE;
@@ -16611,7 +16546,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
if (!(_tmp83_ < _tmp86_)) {
#line 1893 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 16615 "Commands.c"
+#line 16550 "Commands.c"
}
#line 1894 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp87_ = self->priv->dest_before_state;
@@ -16629,7 +16564,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_g_object_unref0 (_tmp92_);
#line 1894 "/home/jens/Source/shotwell/src/Commands.vala"
_source_proxy_unref0 (_tmp90_);
-#line 16633 "Commands.c"
+#line 16568 "Commands.c"
}
}
}
@@ -16637,25 +16572,25 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_tmp93_ = self->priv->to_path_parent_path;
#line 1896 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp93_ != NULL) {
-#line 16641 "Commands.c"
+#line 16576 "Commands.c"
gchar* new_path = NULL;
- const gchar* _tmp94_ = NULL;
- gchar* _tmp95_ = NULL;
+ const gchar* _tmp94_;
+ gchar* _tmp95_;
const gchar* _tmp96_ = NULL;
- const gchar* _tmp97_ = NULL;
+ const gchar* _tmp97_;
gchar* path = NULL;
- gchar* _tmp100_ = NULL;
- TagSourceCollection* _tmp101_ = NULL;
- const gchar* _tmp102_ = NULL;
- gboolean _tmp103_ = FALSE;
+ gchar* _tmp100_;
+ TagSourceCollection* _tmp101_;
+ const gchar* _tmp102_;
+ gboolean _tmp103_;
Tag* t = NULL;
- const gchar* _tmp104_ = NULL;
- Tag* _tmp105_ = NULL;
+ const gchar* _tmp104_;
+ Tag* _tmp105_;
GeeList* kids = NULL;
- Tag* _tmp106_ = NULL;
- GeeList* _tmp107_ = NULL;
- const gchar* _tmp125_ = NULL;
- GeeMap* _tmp126_ = NULL;
+ Tag* _tmp106_;
+ GeeList* _tmp107_;
+ const gchar* _tmp125_;
+ GeeMap* _tmp126_;
#line 1897 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp94_ = self->priv->to_path_parent_path;
#line 1897 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16666,20 +16601,20 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_tmp97_ = new_path;
#line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp97_ != NULL) {
-#line 16670 "Commands.c"
- const gchar* _tmp98_ = NULL;
+#line 16605 "Commands.c"
+ const gchar* _tmp98_;
#line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp98_ = new_path;
#line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp96_ = _tmp98_;
-#line 16676 "Commands.c"
+#line 16611 "Commands.c"
} else {
- const gchar* _tmp99_ = NULL;
+ const gchar* _tmp99_;
#line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp99_ = self->priv->to_path_parent_path;
#line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp96_ = _tmp99_;
-#line 16683 "Commands.c"
+#line 16618 "Commands.c"
}
#line 1898 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp100_ = g_strdup (_tmp96_);
@@ -16705,15 +16640,15 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_tmp107_ = tag_get_hierarchical_children (_tmp106_);
#line 1904 "/home/jens/Source/shotwell/src/Commands.vala"
kids = _tmp107_;
-#line 16709 "Commands.c"
+#line 16644 "Commands.c"
{
GeeList* _kidtag_list = NULL;
- GeeList* _tmp108_ = NULL;
- GeeList* _tmp109_ = NULL;
+ GeeList* _tmp108_;
+ GeeList* _tmp109_;
gint _kidtag_size = 0;
- GeeList* _tmp110_ = NULL;
- gint _tmp111_ = 0;
- gint _tmp112_ = 0;
+ GeeList* _tmp110_;
+ gint _tmp111_;
+ gint _tmp112_;
gint _kidtag_index = 0;
#line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp108_ = kids;
@@ -16733,20 +16668,20 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_kidtag_index = -1;
#line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 16737 "Commands.c"
- gint _tmp113_ = 0;
- gint _tmp114_ = 0;
- gint _tmp115_ = 0;
+#line 16672 "Commands.c"
+ gint _tmp113_;
+ gint _tmp114_;
+ gint _tmp115_;
Tag* kidtag = NULL;
- GeeList* _tmp116_ = NULL;
- gint _tmp117_ = 0;
- gpointer _tmp118_ = NULL;
- Tag* _tmp119_ = NULL;
- Tag* _tmp120_ = NULL;
- GeeCollection* _tmp121_ = NULL;
- GeeCollection* _tmp122_ = NULL;
- GeeMultiMap* _tmp123_ = NULL;
- GeeMultiMap* _tmp124_ = NULL;
+ GeeList* _tmp116_;
+ gint _tmp117_;
+ gpointer _tmp118_;
+ Tag* _tmp119_;
+ Tag* _tmp120_;
+ GeeCollection* _tmp121_;
+ GeeCollection* _tmp122_;
+ GeeMultiMap* _tmp123_;
+ GeeMultiMap* _tmp124_;
#line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp113_ = _kidtag_index;
#line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16759,7 +16694,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
if (!(_tmp114_ < _tmp115_)) {
#line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 16763 "Commands.c"
+#line 16698 "Commands.c"
}
#line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp116_ = _kidtag_list;
@@ -16787,11 +16722,11 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_g_object_unref0 (_tmp122_);
#line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (kidtag);
-#line 16791 "Commands.c"
+#line 16726 "Commands.c"
}
#line 1905 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_kidtag_list);
-#line 16795 "Commands.c"
+#line 16730 "Commands.c"
}
#line 1908 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp125_ = path;
@@ -16807,31 +16742,31 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_g_free0 (path);
#line 1896 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (new_path);
-#line 16811 "Commands.c"
+#line 16746 "Commands.c"
} else {
- GeeSet* _tmp127_ = NULL;
- const gchar* _tmp128_ = NULL;
- Tag* _tmp129_ = NULL;
- Tag* _tmp130_ = NULL;
- const gchar* _tmp131_ = NULL;
- Tag* _tmp132_ = NULL;
- Tag* _tmp133_ = NULL;
- GeeCollection* _tmp134_ = NULL;
- GeeCollection* _tmp135_ = NULL;
- GeeMultiMap* _tmp136_ = NULL;
- GeeMultiMap* _tmp137_ = NULL;
- const gchar* _tmp138_ = NULL;
- Tag* _tmp139_ = NULL;
- Tag* _tmp140_ = NULL;
- GeeSet* _tmp141_ = NULL;
+ GeeSet* _tmp127_;
+ const gchar* _tmp128_;
+ Tag* _tmp129_;
+ Tag* _tmp130_;
+ const gchar* _tmp131_;
+ Tag* _tmp132_;
+ Tag* _tmp133_;
+ GeeCollection* _tmp134_;
+ GeeCollection* _tmp135_;
+ GeeMultiMap* _tmp136_;
+ GeeMultiMap* _tmp137_;
+ const gchar* _tmp138_;
+ Tag* _tmp139_;
+ Tag* _tmp140_;
+ GeeSet* _tmp141_;
GeeList* kids = NULL;
- const gchar* _tmp142_ = NULL;
- Tag* _tmp143_ = NULL;
- Tag* _tmp144_ = NULL;
- GeeList* _tmp145_ = NULL;
- GeeList* _tmp146_ = NULL;
- const gchar* _tmp164_ = NULL;
- GeeMap* _tmp165_ = NULL;
+ const gchar* _tmp142_;
+ Tag* _tmp143_;
+ Tag* _tmp144_;
+ GeeList* _tmp145_;
+ GeeList* _tmp146_;
+ const gchar* _tmp164_;
+ GeeMap* _tmp165_;
#line 1910 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp127_ = self->priv->existing_dest_membership;
#line 1910 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16890,15 +16825,15 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_g_object_unref0 (_tmp144_);
#line 1914 "/home/jens/Source/shotwell/src/Commands.vala"
kids = _tmp146_;
-#line 16894 "Commands.c"
+#line 16829 "Commands.c"
{
GeeList* _kidtag_list = NULL;
- GeeList* _tmp147_ = NULL;
- GeeList* _tmp148_ = NULL;
+ GeeList* _tmp147_;
+ GeeList* _tmp148_;
gint _kidtag_size = 0;
- GeeList* _tmp149_ = NULL;
- gint _tmp150_ = 0;
- gint _tmp151_ = 0;
+ GeeList* _tmp149_;
+ gint _tmp150_;
+ gint _tmp151_;
gint _kidtag_index = 0;
#line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp147_ = kids;
@@ -16918,20 +16853,20 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_kidtag_index = -1;
#line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 16922 "Commands.c"
- gint _tmp152_ = 0;
- gint _tmp153_ = 0;
- gint _tmp154_ = 0;
+#line 16857 "Commands.c"
+ gint _tmp152_;
+ gint _tmp153_;
+ gint _tmp154_;
Tag* kidtag = NULL;
- GeeList* _tmp155_ = NULL;
- gint _tmp156_ = 0;
- gpointer _tmp157_ = NULL;
- Tag* _tmp158_ = NULL;
- Tag* _tmp159_ = NULL;
- GeeCollection* _tmp160_ = NULL;
- GeeCollection* _tmp161_ = NULL;
- GeeMultiMap* _tmp162_ = NULL;
- GeeMultiMap* _tmp163_ = NULL;
+ GeeList* _tmp155_;
+ gint _tmp156_;
+ gpointer _tmp157_;
+ Tag* _tmp158_;
+ Tag* _tmp159_;
+ GeeCollection* _tmp160_;
+ GeeCollection* _tmp161_;
+ GeeMultiMap* _tmp162_;
+ GeeMultiMap* _tmp163_;
#line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp152_ = _kidtag_index;
#line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -16944,7 +16879,7 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
if (!(_tmp153_ < _tmp154_)) {
#line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 16948 "Commands.c"
+#line 16883 "Commands.c"
}
#line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp155_ = _kidtag_list;
@@ -16972,11 +16907,11 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
_g_object_unref0 (_tmp161_);
#line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (kidtag);
-#line 16976 "Commands.c"
+#line 16911 "Commands.c"
}
#line 1915 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_kidtag_list);
-#line 16980 "Commands.c"
+#line 16915 "Commands.c"
}
#line 1918 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp164_ = self->priv->to_path;
@@ -16986,30 +16921,30 @@ static void reparent_tag_command_restore_before_state (ReparentTagCommand* self)
reparent_tag_command_restore_child_attachments_at (self, _tmp164_, _tmp165_);
#line 1896 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (kids);
-#line 16990 "Commands.c"
+#line 16925 "Commands.c"
}
#line 1863 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (unwind_target);
-#line 16994 "Commands.c"
+#line 16929 "Commands.c"
}
static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
- GeeList* _tmp0_ = NULL;
- GeeArrayList* _tmp1_ = NULL;
- TagSourceCollection* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ GeeList* _tmp0_;
+ GeeArrayList* _tmp1_;
+ TagSourceCollection* _tmp2_;
+ const gchar* _tmp3_;
+ gboolean _tmp4_;
Tag* to_tag = NULL;
- const gchar* _tmp5_ = NULL;
- Tag* _tmp6_ = NULL;
- GeeList* _tmp7_ = NULL;
- Tag* _tmp8_ = NULL;
- SourceProxy* _tmp9_ = NULL;
- SourceProxy* _tmp10_ = NULL;
+ const gchar* _tmp5_;
+ Tag* _tmp6_;
+ GeeList* _tmp7_;
+ Tag* _tmp8_;
+ SourceProxy* _tmp9_;
+ SourceProxy* _tmp10_;
GeeList* to_children = NULL;
- Tag* _tmp11_ = NULL;
- GeeList* _tmp12_ = NULL;
+ Tag* _tmp11_;
+ GeeList* _tmp12_;
#line 1922 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
#line 1923 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17054,12 +16989,12 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
_tmp12_ = tag_get_hierarchical_children (_tmp11_);
#line 1933 "/home/jens/Source/shotwell/src/Commands.vala"
to_children = _tmp12_;
-#line 17058 "Commands.c"
+#line 16993 "Commands.c"
{
gint i = 0;
- GeeList* _tmp13_ = NULL;
- gint _tmp14_ = 0;
- gint _tmp15_ = 0;
+ GeeList* _tmp13_;
+ gint _tmp14_;
+ gint _tmp15_;
#line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp13_ = to_children;
#line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17068,31 +17003,31 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
_tmp15_ = _tmp14_;
#line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
i = _tmp15_ - 1;
-#line 17072 "Commands.c"
+#line 17007 "Commands.c"
{
gboolean _tmp16_ = FALSE;
#line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp16_ = TRUE;
#line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 17079 "Commands.c"
- gint _tmp18_ = 0;
- GeeList* _tmp19_ = NULL;
- GeeList* _tmp20_ = NULL;
- gint _tmp21_ = 0;
- gpointer _tmp22_ = NULL;
- Tag* _tmp23_ = NULL;
- SourceProxy* _tmp24_ = NULL;
- SourceProxy* _tmp25_ = NULL;
+#line 17014 "Commands.c"
+ gint _tmp18_;
+ GeeList* _tmp19_;
+ GeeList* _tmp20_;
+ gint _tmp21_;
+ gpointer _tmp22_;
+ Tag* _tmp23_;
+ SourceProxy* _tmp24_;
+ SourceProxy* _tmp25_;
#line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp16_) {
-#line 17090 "Commands.c"
- gint _tmp17_ = 0;
+#line 17025 "Commands.c"
+ gint _tmp17_;
#line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp17_ = i;
#line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
i = _tmp17_ - 1;
-#line 17096 "Commands.c"
+#line 17031 "Commands.c"
}
#line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp16_ = FALSE;
@@ -17102,7 +17037,7 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
if (!(_tmp18_ >= 0)) {
#line 1934 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 17106 "Commands.c"
+#line 17041 "Commands.c"
}
#line 1935 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp19_ = self->priv->after_state;
@@ -17124,7 +17059,7 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
_source_proxy_unref0 (_tmp25_);
#line 1935 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp23_);
-#line 17128 "Commands.c"
+#line 17063 "Commands.c"
}
}
}
@@ -17132,50 +17067,50 @@ static void reparent_tag_command_save_after_state (ReparentTagCommand* self) {
_g_object_unref0 (to_children);
#line 1922 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (to_tag);
-#line 17136 "Commands.c"
+#line 17071 "Commands.c"
}
static void reparent_tag_command_restore_after_state (ReparentTagCommand* self) {
- GeeList* _tmp0_ = NULL;
+ GeeList* _tmp0_;
#line 1938 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
#line 1939 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->after_state;
#line 1939 "/home/jens/Source/shotwell/src/Commands.vala"
_vala_assert (_tmp0_ != NULL, "after_state != null");
-#line 17148 "Commands.c"
+#line 17083 "Commands.c"
{
gint i = 0;
#line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
i = 0;
-#line 17153 "Commands.c"
+#line 17088 "Commands.c"
{
gboolean _tmp1_ = FALSE;
#line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = TRUE;
#line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 17160 "Commands.c"
- gint _tmp3_ = 0;
- GeeList* _tmp4_ = NULL;
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- GeeList* _tmp7_ = NULL;
- gint _tmp8_ = 0;
- gpointer _tmp9_ = NULL;
- SourceProxy* _tmp10_ = NULL;
- DataSource* _tmp11_ = NULL;
- DataSource* _tmp12_ = NULL;
+#line 17095 "Commands.c"
+ gint _tmp3_;
+ GeeList* _tmp4_;
+ gint _tmp5_;
+ gint _tmp6_;
+ GeeList* _tmp7_;
+ gint _tmp8_;
+ gpointer _tmp9_;
+ SourceProxy* _tmp10_;
+ DataSource* _tmp11_;
+ DataSource* _tmp12_;
#line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp1_) {
-#line 17173 "Commands.c"
- gint _tmp2_ = 0;
+#line 17108 "Commands.c"
+ gint _tmp2_;
#line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = i;
#line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
i = _tmp2_ + 1;
-#line 17179 "Commands.c"
+#line 17114 "Commands.c"
}
#line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = FALSE;
@@ -17191,7 +17126,7 @@ static void reparent_tag_command_restore_after_state (ReparentTagCommand* self)
if (!(_tmp3_ < _tmp6_)) {
#line 1941 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 17195 "Commands.c"
+#line 17130 "Commands.c"
}
#line 1942 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = self->priv->after_state;
@@ -17209,7 +17144,7 @@ static void reparent_tag_command_restore_after_state (ReparentTagCommand* self)
_g_object_unref0 (_tmp12_);
#line 1942 "/home/jens/Source/shotwell/src/Commands.vala"
_source_proxy_unref0 (_tmp10_);
-#line 17213 "Commands.c"
+#line 17148 "Commands.c"
}
}
}
@@ -17218,9 +17153,9 @@ static void reparent_tag_command_restore_after_state (ReparentTagCommand* self)
static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const gchar* path) {
Tag* new_parent = NULL;
- const gchar* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- Tag* _tmp27_ = NULL;
+ const gchar* _tmp0_;
+ gboolean _tmp1_;
+ Tag* _tmp27_;
#line 1945 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
#line 1945 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17233,13 +17168,13 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
_tmp1_ = g_str_has_prefix (_tmp0_, TAG_PATH_SEPARATOR_STRING);
#line 1948 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp1_) {
-#line 17237 "Commands.c"
+#line 17172 "Commands.c"
GeeList* parent_paths = NULL;
- const gchar* _tmp2_ = NULL;
- GeeList* _tmp3_ = NULL;
- GeeList* _tmp4_ = NULL;
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
+ const gchar* _tmp2_;
+ GeeList* _tmp3_;
+ GeeList* _tmp4_;
+ gint _tmp5_;
+ gint _tmp6_;
#line 1949 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = path;
#line 1949 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17254,16 +17189,16 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
_tmp6_ = _tmp5_;
#line 1950 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp6_ > 0) {
-#line 17258 "Commands.c"
+#line 17193 "Commands.c"
gchar* immediate_parent_path = NULL;
- GeeList* _tmp7_ = NULL;
- GeeList* _tmp8_ = NULL;
- gint _tmp9_ = 0;
- gint _tmp10_ = 0;
- gpointer _tmp11_ = NULL;
- TagSourceCollection* _tmp12_ = NULL;
- const gchar* _tmp13_ = NULL;
- gboolean _tmp14_ = FALSE;
+ GeeList* _tmp7_;
+ GeeList* _tmp8_;
+ gint _tmp9_;
+ gint _tmp10_;
+ gpointer _tmp11_;
+ TagSourceCollection* _tmp12_;
+ const gchar* _tmp13_;
+ gboolean _tmp14_;
#line 1951 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = parent_paths;
#line 1951 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17284,9 +17219,9 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
_tmp14_ = tag_source_collection_exists (_tmp12_, _tmp13_, FALSE);
#line 1952 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp14_) {
-#line 17288 "Commands.c"
- const gchar* _tmp15_ = NULL;
- Tag* _tmp16_ = NULL;
+#line 17223 "Commands.c"
+ const gchar* _tmp15_;
+ Tag* _tmp16_;
#line 1953 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp15_ = immediate_parent_path;
#line 1953 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17295,14 +17230,14 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
_g_object_unref0 (new_parent);
#line 1953 "/home/jens/Source/shotwell/src/Commands.vala"
new_parent = _tmp16_;
-#line 17299 "Commands.c"
+#line 17234 "Commands.c"
} else {
- TagSourceCollection* _tmp17_ = NULL;
- const gchar* _tmp18_ = NULL;
- gchar* _tmp19_ = NULL;
- gchar* _tmp20_ = NULL;
- gboolean _tmp21_ = FALSE;
- gboolean _tmp22_ = FALSE;
+ TagSourceCollection* _tmp17_;
+ const gchar* _tmp18_;
+ gchar* _tmp19_;
+ gchar* _tmp20_;
+ gboolean _tmp21_;
+ gboolean _tmp22_;
#line 1954 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp17_ = tag_global;
#line 1954 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17319,11 +17254,11 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
_g_free0 (_tmp20_);
#line 1954 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp22_) {
-#line 17323 "Commands.c"
- const gchar* _tmp23_ = NULL;
- gchar* _tmp24_ = NULL;
- gchar* _tmp25_ = NULL;
- Tag* _tmp26_ = NULL;
+#line 17258 "Commands.c"
+ const gchar* _tmp23_;
+ gchar* _tmp24_;
+ gchar* _tmp25_;
+ Tag* _tmp26_;
#line 1955 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp23_ = immediate_parent_path;
#line 1955 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17338,47 +17273,47 @@ static void reparent_tag_command_prepare_parent (ReparentTagCommand* self, const
new_parent = _tmp26_;
#line 1955 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (_tmp25_);
-#line 17342 "Commands.c"
+#line 17277 "Commands.c"
} else {
#line 1957 "/home/jens/Source/shotwell/src/Commands.vala"
g_assert_not_reached ();
-#line 17346 "Commands.c"
+#line 17281 "Commands.c"
}
}
#line 1950 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (immediate_parent_path);
-#line 17351 "Commands.c"
+#line 17286 "Commands.c"
}
#line 1948 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (parent_paths);
-#line 17355 "Commands.c"
+#line 17290 "Commands.c"
}
#line 1960 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp27_ = new_parent;
#line 1960 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp27_ != NULL) {
-#line 17361 "Commands.c"
- Tag* _tmp28_ = NULL;
+#line 17296 "Commands.c"
+ Tag* _tmp28_;
#line 1961 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp28_ = new_parent;
#line 1961 "/home/jens/Source/shotwell/src/Commands.vala"
tag_promote (_tmp28_);
-#line 17367 "Commands.c"
+#line 17302 "Commands.c"
}
#line 1945 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (new_parent);
-#line 17371 "Commands.c"
+#line 17306 "Commands.c"
}
static void reparent_tag_command_do_source_parent_detachments (ReparentTagCommand* self) {
- TagSourceCollection* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ TagSourceCollection* _tmp0_;
+ const gchar* _tmp1_;
+ gboolean _tmp2_;
Tag* from_tag = NULL;
- const gchar* _tmp3_ = NULL;
- Tag* _tmp4_ = NULL;
- GeeMap* _tmp5_ = NULL;
+ const gchar* _tmp3_;
+ Tag* _tmp4_;
+ GeeMap* _tmp5_;
#line 1964 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
#line 1965 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17399,22 +17334,22 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
_tmp5_ = self->priv->src_parent_detachments;
#line 1969 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp5_ == NULL) {
-#line 17403 "Commands.c"
- GeeHashMap* _tmp6_ = NULL;
+#line 17338 "Commands.c"
+ GeeHashMap* _tmp6_;
#line 1970 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_SET, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 1970 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (self->priv->src_parent_detachments);
#line 1970 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->src_parent_detachments = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_MAP, GeeMap);
-#line 17411 "Commands.c"
+#line 17346 "Commands.c"
{
GeeIterator* _source_it = NULL;
- Tag* _tmp7_ = NULL;
- GeeCollection* _tmp8_ = NULL;
- GeeCollection* _tmp9_ = NULL;
- GeeIterator* _tmp10_ = NULL;
- GeeIterator* _tmp11_ = NULL;
+ Tag* _tmp7_;
+ GeeCollection* _tmp8_;
+ GeeCollection* _tmp9_;
+ GeeIterator* _tmp10_;
+ GeeIterator* _tmp11_;
#line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = from_tag;
#line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17431,19 +17366,19 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
_source_it = _tmp11_;
#line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 17435 "Commands.c"
- GeeIterator* _tmp12_ = NULL;
- gboolean _tmp13_ = FALSE;
+#line 17370 "Commands.c"
+ GeeIterator* _tmp12_;
+ gboolean _tmp13_;
MediaSource* source = NULL;
- GeeIterator* _tmp14_ = NULL;
- gpointer _tmp15_ = NULL;
+ GeeIterator* _tmp14_;
+ gpointer _tmp15_;
Tag* current_parent = NULL;
- Tag* _tmp16_ = NULL;
- Tag* _tmp17_ = NULL;
+ Tag* _tmp16_;
+ Tag* _tmp17_;
gint running_attach_count = 0;
- Tag* _tmp18_ = NULL;
- MediaSource* _tmp19_ = NULL;
- gint _tmp20_ = 0;
+ Tag* _tmp18_;
+ MediaSource* _tmp19_;
+ gint _tmp20_;
#line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp12_ = _source_it;
#line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17452,7 +17387,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
if (!_tmp13_) {
#line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 17456 "Commands.c"
+#line 17391 "Commands.c"
}
#line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp14_ = _source_it;
@@ -17476,32 +17411,32 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
running_attach_count = _tmp20_ + 1;
#line 1974 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 17480 "Commands.c"
- Tag* _tmp21_ = NULL;
+#line 17415 "Commands.c"
+ Tag* _tmp21_;
gchar* current_parent_path = NULL;
- Tag* _tmp22_ = NULL;
- gchar* _tmp23_ = NULL;
- GeeMap* _tmp24_ = NULL;
- const gchar* _tmp25_ = NULL;
- gboolean _tmp26_ = FALSE;
+ Tag* _tmp22_;
+ gchar* _tmp23_;
+ GeeMap* _tmp24_;
+ const gchar* _tmp25_;
+ gboolean _tmp26_;
gint curr_parent_attach_count = 0;
- Tag* _tmp31_ = NULL;
- MediaSource* _tmp32_ = NULL;
- gint _tmp33_ = 0;
- gint _tmp34_ = 0;
- gint _tmp35_ = 0;
- gint _tmp36_ = 0;
- gint _tmp37_ = 0;
- gint _tmp43_ = 0;
- Tag* _tmp44_ = NULL;
- Tag* _tmp45_ = NULL;
+ Tag* _tmp31_;
+ MediaSource* _tmp32_;
+ gint _tmp33_;
+ gint _tmp34_;
+ gint _tmp35_;
+ gint _tmp36_;
+ gint _tmp37_;
+ gint _tmp43_;
+ Tag* _tmp44_;
+ Tag* _tmp45_;
#line 1974 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp21_ = current_parent;
#line 1974 "/home/jens/Source/shotwell/src/Commands.vala"
if (!(_tmp21_ != NULL)) {
#line 1974 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 17505 "Commands.c"
+#line 17440 "Commands.c"
}
#line 1975 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp22_ = current_parent;
@@ -17517,11 +17452,11 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
_tmp26_ = gee_map_has_key (_tmp24_, _tmp25_);
#line 1976 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp26_) {
-#line 17521 "Commands.c"
- GeeMap* _tmp27_ = NULL;
- const gchar* _tmp28_ = NULL;
- GeeHashSet* _tmp29_ = NULL;
- GeeHashSet* _tmp30_ = NULL;
+#line 17456 "Commands.c"
+ GeeMap* _tmp27_;
+ const gchar* _tmp28_;
+ GeeHashSet* _tmp29_;
+ GeeHashSet* _tmp30_;
#line 1977 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp27_ = self->priv->src_parent_detachments;
#line 1977 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17534,7 +17469,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
gee_map_set (_tmp27_, _tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_SET, GeeSet));
#line 1977 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp30_);
-#line 17538 "Commands.c"
+#line 17473 "Commands.c"
}
#line 1979 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp31_ = current_parent;
@@ -17556,12 +17491,12 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
_tmp37_ = running_attach_count;
#line 1985 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp36_ == _tmp37_) {
-#line 17560 "Commands.c"
- GeeMap* _tmp38_ = NULL;
- const gchar* _tmp39_ = NULL;
- gpointer _tmp40_ = NULL;
- GeeSet* _tmp41_ = NULL;
- MediaSource* _tmp42_ = NULL;
+#line 17495 "Commands.c"
+ GeeMap* _tmp38_;
+ const gchar* _tmp39_;
+ gpointer _tmp40_;
+ GeeSet* _tmp41_;
+ MediaSource* _tmp42_;
#line 1986 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp38_ = self->priv->src_parent_detachments;
#line 1986 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17576,7 +17511,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), _tmp42_);
#line 1986 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp41_);
-#line 17580 "Commands.c"
+#line 17515 "Commands.c"
}
#line 1988 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp43_ = running_attach_count;
@@ -17592,27 +17527,27 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
current_parent = _tmp45_;
#line 1974 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (current_parent_path);
-#line 17596 "Commands.c"
+#line 17531 "Commands.c"
}
#line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (current_parent);
#line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (source);
-#line 17602 "Commands.c"
+#line 17537 "Commands.c"
}
#line 1971 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_source_it);
-#line 17606 "Commands.c"
+#line 17541 "Commands.c"
}
}
{
GeeIterator* _p_it = NULL;
- GeeMap* _tmp46_ = NULL;
- GeeSet* _tmp47_ = NULL;
- GeeSet* _tmp48_ = NULL;
- GeeSet* _tmp49_ = NULL;
- GeeIterator* _tmp50_ = NULL;
- GeeIterator* _tmp51_ = NULL;
+ GeeMap* _tmp46_;
+ GeeSet* _tmp47_;
+ GeeSet* _tmp48_;
+ GeeSet* _tmp49_;
+ GeeIterator* _tmp50_;
+ GeeIterator* _tmp51_;
#line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp46_ = self->priv->src_parent_detachments;
#line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17631,12 +17566,12 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
_p_it = _tmp51_;
#line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 17635 "Commands.c"
- GeeIterator* _tmp52_ = NULL;
- gboolean _tmp53_ = FALSE;
+#line 17570 "Commands.c"
+ GeeIterator* _tmp52_;
+ gboolean _tmp53_;
gchar* p = NULL;
- GeeIterator* _tmp54_ = NULL;
- gpointer _tmp55_ = NULL;
+ GeeIterator* _tmp54_;
+ gpointer _tmp55_;
#line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp52_ = _p_it;
#line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17645,7 +17580,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
if (!_tmp53_) {
#line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 17649 "Commands.c"
+#line 17584 "Commands.c"
}
#line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp54_ = _p_it;
@@ -17653,15 +17588,15 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
_tmp55_ = gee_iterator_get (_tmp54_);
#line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
p = (gchar*) _tmp55_;
-#line 17657 "Commands.c"
+#line 17592 "Commands.c"
{
GeeIterator* _s_it = NULL;
- GeeMap* _tmp56_ = NULL;
- const gchar* _tmp57_ = NULL;
- gpointer _tmp58_ = NULL;
- GeeSet* _tmp59_ = NULL;
- GeeIterator* _tmp60_ = NULL;
- GeeIterator* _tmp61_ = NULL;
+ GeeMap* _tmp56_;
+ const gchar* _tmp57_;
+ gpointer _tmp58_;
+ GeeSet* _tmp59_;
+ GeeIterator* _tmp60_;
+ GeeIterator* _tmp61_;
#line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp56_ = self->priv->src_parent_detachments;
#line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17680,18 +17615,18 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
_s_it = _tmp61_;
#line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 17684 "Commands.c"
- GeeIterator* _tmp62_ = NULL;
- gboolean _tmp63_ = FALSE;
+#line 17619 "Commands.c"
+ GeeIterator* _tmp62_;
+ gboolean _tmp63_;
MediaSource* s = NULL;
- GeeIterator* _tmp64_ = NULL;
- gpointer _tmp65_ = NULL;
- const gchar* _tmp66_ = NULL;
- Tag* _tmp67_ = NULL;
- Tag* _tmp68_ = NULL;
- MediaSource* _tmp69_ = NULL;
- GeeList* _tmp70_ = NULL;
- GeeList* _tmp71_ = NULL;
+ GeeIterator* _tmp64_;
+ gpointer _tmp65_;
+ const gchar* _tmp66_;
+ Tag* _tmp67_;
+ Tag* _tmp68_;
+ MediaSource* _tmp69_;
+ GeeList* _tmp70_;
+ GeeList* _tmp71_;
#line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp62_ = _s_it;
#line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17700,7 +17635,7 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
if (!_tmp63_) {
#line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 17704 "Commands.c"
+#line 17639 "Commands.c"
}
#line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp64_ = _s_it;
@@ -17726,43 +17661,43 @@ static void reparent_tag_command_do_source_parent_detachments (ReparentTagComman
_g_object_unref0 (_tmp68_);
#line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (s);
-#line 17730 "Commands.c"
+#line 17665 "Commands.c"
}
#line 1996 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_s_it);
-#line 17734 "Commands.c"
+#line 17669 "Commands.c"
}
#line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (p);
-#line 17738 "Commands.c"
+#line 17673 "Commands.c"
}
#line 1995 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_p_it);
-#line 17742 "Commands.c"
+#line 17677 "Commands.c"
}
#line 1964 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (from_tag);
-#line 17746 "Commands.c"
+#line 17681 "Commands.c"
}
static void reparent_tag_command_do_source_parent_reattachments (ReparentTagCommand* self) {
- GeeMap* _tmp0_ = NULL;
+ GeeMap* _tmp0_;
#line 2000 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
#line 2001 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->src_parent_detachments;
#line 2001 "/home/jens/Source/shotwell/src/Commands.vala"
_vala_assert (_tmp0_ != NULL, "src_parent_detachments != null");
-#line 17758 "Commands.c"
+#line 17693 "Commands.c"
{
GeeIterator* _p_it = NULL;
- GeeMap* _tmp1_ = NULL;
- GeeSet* _tmp2_ = NULL;
- GeeSet* _tmp3_ = NULL;
- GeeSet* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
- GeeIterator* _tmp6_ = NULL;
+ GeeMap* _tmp1_;
+ GeeSet* _tmp2_;
+ GeeSet* _tmp3_;
+ GeeSet* _tmp4_;
+ GeeIterator* _tmp5_;
+ GeeIterator* _tmp6_;
#line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = self->priv->src_parent_detachments;
#line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17781,12 +17716,12 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
_p_it = _tmp6_;
#line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 17785 "Commands.c"
- GeeIterator* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
+#line 17720 "Commands.c"
+ GeeIterator* _tmp7_;
+ gboolean _tmp8_;
gchar* p = NULL;
- GeeIterator* _tmp9_ = NULL;
- gpointer _tmp10_ = NULL;
+ GeeIterator* _tmp9_;
+ gpointer _tmp10_;
#line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = _p_it;
#line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17795,7 +17730,7 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
if (!_tmp8_) {
#line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 17799 "Commands.c"
+#line 17734 "Commands.c"
}
#line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp9_ = _p_it;
@@ -17803,15 +17738,15 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
_tmp10_ = gee_iterator_get (_tmp9_);
#line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
p = (gchar*) _tmp10_;
-#line 17807 "Commands.c"
+#line 17742 "Commands.c"
{
GeeIterator* _s_it = NULL;
- GeeMap* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- gpointer _tmp13_ = NULL;
- GeeSet* _tmp14_ = NULL;
- GeeIterator* _tmp15_ = NULL;
- GeeIterator* _tmp16_ = NULL;
+ GeeMap* _tmp11_;
+ const gchar* _tmp12_;
+ gpointer _tmp13_;
+ GeeSet* _tmp14_;
+ GeeIterator* _tmp15_;
+ GeeIterator* _tmp16_;
#line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp11_ = self->priv->src_parent_detachments;
#line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17830,16 +17765,16 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
_s_it = _tmp16_;
#line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 17834 "Commands.c"
- GeeIterator* _tmp17_ = NULL;
- gboolean _tmp18_ = FALSE;
+#line 17769 "Commands.c"
+ GeeIterator* _tmp17_;
+ gboolean _tmp18_;
MediaSource* s = NULL;
- GeeIterator* _tmp19_ = NULL;
- gpointer _tmp20_ = NULL;
- const gchar* _tmp21_ = NULL;
- Tag* _tmp22_ = NULL;
- Tag* _tmp23_ = NULL;
- MediaSource* _tmp24_ = NULL;
+ GeeIterator* _tmp19_;
+ gpointer _tmp20_;
+ const gchar* _tmp21_;
+ Tag* _tmp22_;
+ Tag* _tmp23_;
+ MediaSource* _tmp24_;
#line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp17_ = _s_it;
#line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17848,7 +17783,7 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
if (!_tmp18_) {
#line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 17852 "Commands.c"
+#line 17787 "Commands.c"
}
#line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp19_ = _s_it;
@@ -17870,40 +17805,40 @@ static void reparent_tag_command_do_source_parent_reattachments (ReparentTagComm
_g_object_unref0 (_tmp23_);
#line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (s);
-#line 17874 "Commands.c"
+#line 17809 "Commands.c"
}
#line 2004 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_s_it);
-#line 17878 "Commands.c"
+#line 17813 "Commands.c"
}
#line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (p);
-#line 17882 "Commands.c"
+#line 17817 "Commands.c"
}
#line 2003 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_p_it);
-#line 17886 "Commands.c"
+#line 17821 "Commands.c"
}
}
static void reparent_tag_command_do_destination_parent_detachments (ReparentTagCommand* self) {
- GeeMap* _tmp0_ = NULL;
+ GeeMap* _tmp0_;
#line 2008 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
#line 2009 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->dest_parent_attachments;
#line 2009 "/home/jens/Source/shotwell/src/Commands.vala"
_vala_assert (_tmp0_ != NULL, "dest_parent_attachments != null");
-#line 17899 "Commands.c"
+#line 17834 "Commands.c"
{
GeeIterator* _p_it = NULL;
- GeeMap* _tmp1_ = NULL;
- GeeSet* _tmp2_ = NULL;
- GeeSet* _tmp3_ = NULL;
- GeeSet* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
- GeeIterator* _tmp6_ = NULL;
+ GeeMap* _tmp1_;
+ GeeSet* _tmp2_;
+ GeeSet* _tmp3_;
+ GeeSet* _tmp4_;
+ GeeIterator* _tmp5_;
+ GeeIterator* _tmp6_;
#line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = self->priv->dest_parent_attachments;
#line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17922,12 +17857,12 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
_p_it = _tmp6_;
#line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 17926 "Commands.c"
- GeeIterator* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
+#line 17861 "Commands.c"
+ GeeIterator* _tmp7_;
+ gboolean _tmp8_;
gchar* p = NULL;
- GeeIterator* _tmp9_ = NULL;
- gpointer _tmp10_ = NULL;
+ GeeIterator* _tmp9_;
+ gpointer _tmp10_;
#line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = _p_it;
#line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17936,7 +17871,7 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
if (!_tmp8_) {
#line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 17940 "Commands.c"
+#line 17875 "Commands.c"
}
#line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp9_ = _p_it;
@@ -17944,15 +17879,15 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
_tmp10_ = gee_iterator_get (_tmp9_);
#line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
p = (gchar*) _tmp10_;
-#line 17948 "Commands.c"
+#line 17883 "Commands.c"
{
GeeIterator* _s_it = NULL;
- GeeMap* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- gpointer _tmp13_ = NULL;
- GeeSet* _tmp14_ = NULL;
- GeeIterator* _tmp15_ = NULL;
- GeeIterator* _tmp16_ = NULL;
+ GeeMap* _tmp11_;
+ const gchar* _tmp12_;
+ gpointer _tmp13_;
+ GeeSet* _tmp14_;
+ GeeIterator* _tmp15_;
+ GeeIterator* _tmp16_;
#line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp11_ = self->priv->dest_parent_attachments;
#line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17971,18 +17906,18 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
_s_it = _tmp16_;
#line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 17975 "Commands.c"
- GeeIterator* _tmp17_ = NULL;
- gboolean _tmp18_ = FALSE;
+#line 17910 "Commands.c"
+ GeeIterator* _tmp17_;
+ gboolean _tmp18_;
MediaSource* s = NULL;
- GeeIterator* _tmp19_ = NULL;
- gpointer _tmp20_ = NULL;
- const gchar* _tmp21_ = NULL;
- Tag* _tmp22_ = NULL;
- Tag* _tmp23_ = NULL;
- MediaSource* _tmp24_ = NULL;
- GeeList* _tmp25_ = NULL;
- GeeList* _tmp26_ = NULL;
+ GeeIterator* _tmp19_;
+ gpointer _tmp20_;
+ const gchar* _tmp21_;
+ Tag* _tmp22_;
+ Tag* _tmp23_;
+ MediaSource* _tmp24_;
+ GeeList* _tmp25_;
+ GeeList* _tmp26_;
#line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp17_ = _s_it;
#line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -17991,7 +17926,7 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
if (!_tmp18_) {
#line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 17995 "Commands.c"
+#line 17930 "Commands.c"
}
#line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp19_ = _s_it;
@@ -18017,40 +17952,40 @@ static void reparent_tag_command_do_destination_parent_detachments (ReparentTagC
_g_object_unref0 (_tmp23_);
#line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (s);
-#line 18021 "Commands.c"
+#line 17956 "Commands.c"
}
#line 2012 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_s_it);
-#line 18025 "Commands.c"
+#line 17960 "Commands.c"
}
#line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (p);
-#line 18029 "Commands.c"
+#line 17964 "Commands.c"
}
#line 2011 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_p_it);
-#line 18033 "Commands.c"
+#line 17968 "Commands.c"
}
}
static void reparent_tag_command_do_destination_parent_reattachments (ReparentTagCommand* self) {
- GeeMap* _tmp0_ = NULL;
+ GeeMap* _tmp0_;
#line 2016 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
#line 2017 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->dest_parent_attachments;
#line 2017 "/home/jens/Source/shotwell/src/Commands.vala"
_vala_assert (_tmp0_ != NULL, "dest_parent_attachments != null");
-#line 18046 "Commands.c"
+#line 17981 "Commands.c"
{
GeeIterator* _p_it = NULL;
- GeeMap* _tmp1_ = NULL;
- GeeSet* _tmp2_ = NULL;
- GeeSet* _tmp3_ = NULL;
- GeeSet* _tmp4_ = NULL;
- GeeIterator* _tmp5_ = NULL;
- GeeIterator* _tmp6_ = NULL;
+ GeeMap* _tmp1_;
+ GeeSet* _tmp2_;
+ GeeSet* _tmp3_;
+ GeeSet* _tmp4_;
+ GeeIterator* _tmp5_;
+ GeeIterator* _tmp6_;
#line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = self->priv->dest_parent_attachments;
#line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18069,12 +18004,12 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
_p_it = _tmp6_;
#line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 18073 "Commands.c"
- GeeIterator* _tmp7_ = NULL;
- gboolean _tmp8_ = FALSE;
+#line 18008 "Commands.c"
+ GeeIterator* _tmp7_;
+ gboolean _tmp8_;
gchar* p = NULL;
- GeeIterator* _tmp9_ = NULL;
- gpointer _tmp10_ = NULL;
+ GeeIterator* _tmp9_;
+ gpointer _tmp10_;
#line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = _p_it;
#line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18083,7 +18018,7 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
if (!_tmp8_) {
#line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 18087 "Commands.c"
+#line 18022 "Commands.c"
}
#line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp9_ = _p_it;
@@ -18091,15 +18026,15 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
_tmp10_ = gee_iterator_get (_tmp9_);
#line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
p = (gchar*) _tmp10_;
-#line 18095 "Commands.c"
+#line 18030 "Commands.c"
{
GeeIterator* _s_it = NULL;
- GeeMap* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- gpointer _tmp13_ = NULL;
- GeeSet* _tmp14_ = NULL;
- GeeIterator* _tmp15_ = NULL;
- GeeIterator* _tmp16_ = NULL;
+ GeeMap* _tmp11_;
+ const gchar* _tmp12_;
+ gpointer _tmp13_;
+ GeeSet* _tmp14_;
+ GeeIterator* _tmp15_;
+ GeeIterator* _tmp16_;
#line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp11_ = self->priv->dest_parent_attachments;
#line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18118,16 +18053,16 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
_s_it = _tmp16_;
#line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 18122 "Commands.c"
- GeeIterator* _tmp17_ = NULL;
- gboolean _tmp18_ = FALSE;
+#line 18057 "Commands.c"
+ GeeIterator* _tmp17_;
+ gboolean _tmp18_;
MediaSource* s = NULL;
- GeeIterator* _tmp19_ = NULL;
- gpointer _tmp20_ = NULL;
- const gchar* _tmp21_ = NULL;
- Tag* _tmp22_ = NULL;
- Tag* _tmp23_ = NULL;
- MediaSource* _tmp24_ = NULL;
+ GeeIterator* _tmp19_;
+ gpointer _tmp20_;
+ const gchar* _tmp21_;
+ Tag* _tmp22_;
+ Tag* _tmp23_;
+ MediaSource* _tmp24_;
#line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp17_ = _s_it;
#line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18136,7 +18071,7 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
if (!_tmp18_) {
#line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 18140 "Commands.c"
+#line 18075 "Commands.c"
}
#line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp19_ = _s_it;
@@ -18158,37 +18093,37 @@ static void reparent_tag_command_do_destination_parent_reattachments (ReparentTa
_g_object_unref0 (_tmp23_);
#line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (s);
-#line 18162 "Commands.c"
+#line 18097 "Commands.c"
}
#line 2020 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_s_it);
-#line 18166 "Commands.c"
+#line 18101 "Commands.c"
}
#line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (p);
-#line 18170 "Commands.c"
+#line 18105 "Commands.c"
}
#line 2019 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_p_it);
-#line 18174 "Commands.c"
+#line 18109 "Commands.c"
}
}
static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const gchar* from, const gchar* to) {
- TagSourceCollection* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ TagSourceCollection* _tmp0_;
+ const gchar* _tmp1_;
+ gboolean _tmp2_;
Tag* from_tag = NULL;
- const gchar* _tmp3_ = NULL;
- Tag* _tmp4_ = NULL;
+ const gchar* _tmp3_;
+ Tag* _tmp4_;
Tag* to_tag = NULL;
- const gchar* _tmp5_ = NULL;
- Tag* _tmp6_ = NULL;
- GeeHashMap* _tmp7_ = NULL;
+ const gchar* _tmp5_;
+ Tag* _tmp6_;
+ GeeHashMap* _tmp7_;
GeeList* from_children = NULL;
- Tag* _tmp50_ = NULL;
- GeeList* _tmp51_ = NULL;
+ Tag* _tmp50_;
+ GeeList* _tmp51_;
#line 2024 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
#line 2024 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18221,14 +18156,14 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
_g_object_unref0 (self->priv->dest_parent_attachments);
#line 2033 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->dest_parent_attachments = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_MAP, GeeMap);
-#line 18225 "Commands.c"
+#line 18160 "Commands.c"
{
GeeIterator* _source_it = NULL;
- Tag* _tmp8_ = NULL;
- GeeCollection* _tmp9_ = NULL;
- GeeCollection* _tmp10_ = NULL;
- GeeIterator* _tmp11_ = NULL;
- GeeIterator* _tmp12_ = NULL;
+ Tag* _tmp8_;
+ GeeCollection* _tmp9_;
+ GeeCollection* _tmp10_;
+ GeeIterator* _tmp11_;
+ GeeIterator* _tmp12_;
#line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp8_ = from_tag;
#line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18245,15 +18180,15 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
_source_it = _tmp12_;
#line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 18249 "Commands.c"
- GeeIterator* _tmp13_ = NULL;
- gboolean _tmp14_ = FALSE;
+#line 18184 "Commands.c"
+ GeeIterator* _tmp13_;
+ gboolean _tmp14_;
MediaSource* source = NULL;
- GeeIterator* _tmp15_ = NULL;
- gpointer _tmp16_ = NULL;
+ GeeIterator* _tmp15_;
+ gpointer _tmp16_;
Tag* current_parent = NULL;
- Tag* _tmp17_ = NULL;
- Tag* _tmp18_ = NULL;
+ Tag* _tmp17_;
+ Tag* _tmp18_;
#line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp13_ = _source_it;
#line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18262,7 +18197,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
if (!_tmp14_) {
#line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 18266 "Commands.c"
+#line 18201 "Commands.c"
}
#line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp15_ = _source_it;
@@ -18278,26 +18213,26 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
current_parent = _tmp18_;
#line 2036 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 18282 "Commands.c"
- Tag* _tmp19_ = NULL;
+#line 18217 "Commands.c"
+ Tag* _tmp19_;
gchar* current_parent_path = NULL;
- Tag* _tmp20_ = NULL;
- gchar* _tmp21_ = NULL;
- GeeMap* _tmp22_ = NULL;
- const gchar* _tmp23_ = NULL;
- gboolean _tmp24_ = FALSE;
- Tag* _tmp29_ = NULL;
- MediaSource* _tmp30_ = NULL;
- gboolean _tmp31_ = FALSE;
- Tag* _tmp37_ = NULL;
- Tag* _tmp38_ = NULL;
+ Tag* _tmp20_;
+ gchar* _tmp21_;
+ GeeMap* _tmp22_;
+ const gchar* _tmp23_;
+ gboolean _tmp24_;
+ Tag* _tmp29_;
+ MediaSource* _tmp30_;
+ gboolean _tmp31_;
+ Tag* _tmp37_;
+ Tag* _tmp38_;
#line 2036 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp19_ = current_parent;
#line 2036 "/home/jens/Source/shotwell/src/Commands.vala"
if (!(_tmp19_ != NULL)) {
#line 2036 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 18301 "Commands.c"
+#line 18236 "Commands.c"
}
#line 2037 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp20_ = current_parent;
@@ -18313,11 +18248,11 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
_tmp24_ = gee_map_has_key (_tmp22_, _tmp23_);
#line 2038 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp24_) {
-#line 18317 "Commands.c"
- GeeMap* _tmp25_ = NULL;
- const gchar* _tmp26_ = NULL;
- GeeHashSet* _tmp27_ = NULL;
- GeeHashSet* _tmp28_ = NULL;
+#line 18252 "Commands.c"
+ GeeMap* _tmp25_;
+ const gchar* _tmp26_;
+ GeeHashSet* _tmp27_;
+ GeeHashSet* _tmp28_;
#line 2039 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp25_ = self->priv->dest_parent_attachments;
#line 2039 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18330,7 +18265,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
gee_map_set (_tmp25_, _tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_SET, GeeSet));
#line 2039 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp28_);
-#line 18334 "Commands.c"
+#line 18269 "Commands.c"
}
#line 2041 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp29_ = current_parent;
@@ -18340,12 +18275,12 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
_tmp31_ = tag_contains (_tmp29_, _tmp30_);
#line 2041 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp31_) {
-#line 18344 "Commands.c"
- GeeMap* _tmp32_ = NULL;
- const gchar* _tmp33_ = NULL;
- gpointer _tmp34_ = NULL;
- GeeSet* _tmp35_ = NULL;
- MediaSource* _tmp36_ = NULL;
+#line 18279 "Commands.c"
+ GeeMap* _tmp32_;
+ const gchar* _tmp33_;
+ gpointer _tmp34_;
+ GeeSet* _tmp35_;
+ MediaSource* _tmp36_;
#line 2042 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp32_ = self->priv->dest_parent_attachments;
#line 2042 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18360,7 +18295,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), _tmp36_);
#line 2042 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp35_);
-#line 18364 "Commands.c"
+#line 18299 "Commands.c"
}
#line 2044 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp37_ = current_parent;
@@ -18372,25 +18307,25 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
current_parent = _tmp38_;
#line 2036 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (current_parent_path);
-#line 18376 "Commands.c"
+#line 18311 "Commands.c"
}
#line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (current_parent);
#line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (source);
-#line 18382 "Commands.c"
+#line 18317 "Commands.c"
}
#line 2034 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_source_it);
-#line 18386 "Commands.c"
+#line 18321 "Commands.c"
}
{
GeeIterator* _source_it = NULL;
- Tag* _tmp39_ = NULL;
- GeeCollection* _tmp40_ = NULL;
- GeeCollection* _tmp41_ = NULL;
- GeeIterator* _tmp42_ = NULL;
- GeeIterator* _tmp43_ = NULL;
+ Tag* _tmp39_;
+ GeeCollection* _tmp40_;
+ GeeCollection* _tmp41_;
+ GeeIterator* _tmp42_;
+ GeeIterator* _tmp43_;
#line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp39_ = from_tag;
#line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18407,14 +18342,14 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
_source_it = _tmp43_;
#line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 18411 "Commands.c"
- GeeIterator* _tmp44_ = NULL;
- gboolean _tmp45_ = FALSE;
+#line 18346 "Commands.c"
+ GeeIterator* _tmp44_;
+ gboolean _tmp45_;
MediaSource* source = NULL;
- GeeIterator* _tmp46_ = NULL;
- gpointer _tmp47_ = NULL;
- Tag* _tmp48_ = NULL;
- MediaSource* _tmp49_ = NULL;
+ GeeIterator* _tmp46_;
+ gpointer _tmp47_;
+ Tag* _tmp48_;
+ MediaSource* _tmp49_;
#line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp44_ = _source_it;
#line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18423,7 +18358,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
if (!_tmp45_) {
#line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 18427 "Commands.c"
+#line 18362 "Commands.c"
}
#line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp46_ = _source_it;
@@ -18439,11 +18374,11 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
tag_attach (_tmp48_, _tmp49_);
#line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (source);
-#line 18443 "Commands.c"
+#line 18378 "Commands.c"
}
#line 2048 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_source_it);
-#line 18447 "Commands.c"
+#line 18382 "Commands.c"
}
#line 2053 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp50_ = from_tag;
@@ -18451,12 +18386,12 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
_tmp51_ = tag_get_hierarchical_children (_tmp50_);
#line 2053 "/home/jens/Source/shotwell/src/Commands.vala"
from_children = _tmp51_;
-#line 18455 "Commands.c"
+#line 18390 "Commands.c"
{
gint i = 0;
- GeeList* _tmp52_ = NULL;
- gint _tmp53_ = 0;
- gint _tmp54_ = 0;
+ GeeList* _tmp52_;
+ gint _tmp53_;
+ gint _tmp54_;
#line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp52_ = from_children;
#line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18465,48 +18400,48 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
_tmp54_ = _tmp53_;
#line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
i = _tmp54_ - 1;
-#line 18469 "Commands.c"
+#line 18404 "Commands.c"
{
gboolean _tmp55_ = FALSE;
#line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp55_ = TRUE;
#line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 18476 "Commands.c"
- gint _tmp57_ = 0;
+#line 18411 "Commands.c"
+ gint _tmp57_;
Tag* from_child = NULL;
- GeeList* _tmp58_ = NULL;
- gint _tmp59_ = 0;
- gpointer _tmp60_ = NULL;
+ GeeList* _tmp58_;
+ gint _tmp59_;
+ gpointer _tmp60_;
gchar* child_subpath = NULL;
- Tag* _tmp61_ = NULL;
- gchar* _tmp62_ = NULL;
- gchar* _tmp63_ = NULL;
- const gchar* _tmp64_ = NULL;
- gchar* _tmp65_ = NULL;
- gchar* _tmp66_ = NULL;
- gchar* _tmp67_ = NULL;
- gchar* _tmp68_ = NULL;
+ Tag* _tmp61_;
+ gchar* _tmp62_;
+ gchar* _tmp63_;
+ const gchar* _tmp64_;
+ gchar* _tmp65_;
+ gchar* _tmp66_;
+ gchar* _tmp67_;
+ gchar* _tmp68_;
Tag* to_child = NULL;
- Tag* _tmp69_ = NULL;
- gchar* _tmp70_ = NULL;
- gchar* _tmp71_ = NULL;
- gchar* _tmp72_ = NULL;
- gchar* _tmp73_ = NULL;
- const gchar* _tmp74_ = NULL;
- gchar* _tmp75_ = NULL;
- gchar* _tmp76_ = NULL;
- Tag* _tmp77_ = NULL;
- Tag* _tmp78_ = NULL;
+ Tag* _tmp69_;
+ gchar* _tmp70_;
+ gchar* _tmp71_;
+ gchar* _tmp72_;
+ gchar* _tmp73_;
+ const gchar* _tmp74_;
+ gchar* _tmp75_;
+ gchar* _tmp76_;
+ Tag* _tmp77_;
+ Tag* _tmp78_;
#line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp55_) {
-#line 18504 "Commands.c"
- gint _tmp56_ = 0;
+#line 18439 "Commands.c"
+ gint _tmp56_;
#line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp56_ = i;
#line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
i = _tmp56_ - 1;
-#line 18510 "Commands.c"
+#line 18445 "Commands.c"
}
#line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp55_ = FALSE;
@@ -18516,7 +18451,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
if (!(_tmp57_ >= 0)) {
#line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 18520 "Commands.c"
+#line 18455 "Commands.c"
}
#line 2055 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp58_ = from_children;
@@ -18576,14 +18511,14 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
_g_free0 (_tmp71_);
#line 2060 "/home/jens/Source/shotwell/src/Commands.vala"
to_child = _tmp78_;
-#line 18580 "Commands.c"
+#line 18515 "Commands.c"
{
GeeIterator* _source_it = NULL;
- Tag* _tmp79_ = NULL;
- GeeCollection* _tmp80_ = NULL;
- GeeCollection* _tmp81_ = NULL;
- GeeIterator* _tmp82_ = NULL;
- GeeIterator* _tmp83_ = NULL;
+ Tag* _tmp79_;
+ GeeCollection* _tmp80_;
+ GeeCollection* _tmp81_;
+ GeeIterator* _tmp82_;
+ GeeIterator* _tmp83_;
#line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp79_ = from_child;
#line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18600,14 +18535,14 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
_source_it = _tmp83_;
#line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 18604 "Commands.c"
- GeeIterator* _tmp84_ = NULL;
- gboolean _tmp85_ = FALSE;
+#line 18539 "Commands.c"
+ GeeIterator* _tmp84_;
+ gboolean _tmp85_;
MediaSource* source = NULL;
- GeeIterator* _tmp86_ = NULL;
- gpointer _tmp87_ = NULL;
- Tag* _tmp88_ = NULL;
- MediaSource* _tmp89_ = NULL;
+ GeeIterator* _tmp86_;
+ gpointer _tmp87_;
+ Tag* _tmp88_;
+ MediaSource* _tmp89_;
#line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp84_ = _source_it;
#line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18616,7 +18551,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
if (!_tmp85_) {
#line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 18620 "Commands.c"
+#line 18555 "Commands.c"
}
#line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp86_ = _source_it;
@@ -18632,11 +18567,11 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
tag_attach (_tmp88_, _tmp89_);
#line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (source);
-#line 18636 "Commands.c"
+#line 18571 "Commands.c"
}
#line 2063 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_source_it);
-#line 18640 "Commands.c"
+#line 18575 "Commands.c"
}
#line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (to_child);
@@ -18644,7 +18579,7 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
_g_free0 (child_subpath);
#line 2054 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (from_child);
-#line 18648 "Commands.c"
+#line 18583 "Commands.c"
}
}
}
@@ -18654,29 +18589,29 @@ static void reparent_tag_command_copy_subtree (ReparentTagCommand* self, const g
_g_object_unref0 (to_tag);
#line 2024 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (from_tag);
-#line 18658 "Commands.c"
+#line 18593 "Commands.c"
}
static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, const gchar* client_path) {
gchar* victim_path = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- TagSourceCollection* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ const gchar* _tmp2_;
+ TagSourceCollection* _tmp5_;
+ const gchar* _tmp6_;
+ gboolean _tmp7_;
Tag* victim = NULL;
- const gchar* _tmp8_ = NULL;
- Tag* _tmp9_ = NULL;
+ const gchar* _tmp8_;
+ Tag* _tmp9_;
GeeList* victim_children = NULL;
- Tag* _tmp10_ = NULL;
- GeeList* _tmp11_ = NULL;
- TagSourceCollection* _tmp26_ = NULL;
- TagSourceCollection* _tmp27_ = NULL;
- Tag* _tmp28_ = NULL;
- Marker* _tmp29_ = NULL;
- Marker* _tmp30_ = NULL;
+ Tag* _tmp10_;
+ GeeList* _tmp11_;
+ TagSourceCollection* _tmp26_;
+ TagSourceCollection* _tmp27_;
+ Tag* _tmp28_;
+ Marker* _tmp29_;
+ Marker* _tmp30_;
#line 2068 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_REPARENT_TAG_COMMAND (self));
#line 2068 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18691,9 +18626,9 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
_tmp2_ = victim_path;
#line 2070 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp2_ == NULL) {
-#line 18695 "Commands.c"
- const gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
+#line 18630 "Commands.c"
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
#line 2071 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = client_path;
#line 2071 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18702,7 +18637,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
_g_free0 (victim_path);
#line 2071 "/home/jens/Source/shotwell/src/Commands.vala"
victim_path = _tmp4_;
-#line 18706 "Commands.c"
+#line 18641 "Commands.c"
}
#line 2073 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = tag_global;
@@ -18716,7 +18651,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
_g_free0 (victim_path);
#line 2074 "/home/jens/Source/shotwell/src/Commands.vala"
return;
-#line 18720 "Commands.c"
+#line 18655 "Commands.c"
}
#line 2076 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp8_ = victim_path;
@@ -18730,40 +18665,40 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
_tmp11_ = tag_get_hierarchical_children (_tmp10_);
#line 2079 "/home/jens/Source/shotwell/src/Commands.vala"
victim_children = _tmp11_;
-#line 18734 "Commands.c"
+#line 18669 "Commands.c"
{
gint i = 0;
#line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
i = 0;
-#line 18739 "Commands.c"
+#line 18674 "Commands.c"
{
gboolean _tmp12_ = FALSE;
#line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp12_ = TRUE;
#line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 18746 "Commands.c"
- gint _tmp14_ = 0;
- GeeList* _tmp15_ = NULL;
- gint _tmp16_ = 0;
- gint _tmp17_ = 0;
- TagSourceCollection* _tmp18_ = NULL;
- TagSourceCollection* _tmp19_ = NULL;
- GeeList* _tmp20_ = NULL;
- gint _tmp21_ = 0;
- gpointer _tmp22_ = NULL;
- Tag* _tmp23_ = NULL;
- Marker* _tmp24_ = NULL;
- Marker* _tmp25_ = NULL;
+#line 18681 "Commands.c"
+ gint _tmp14_;
+ GeeList* _tmp15_;
+ gint _tmp16_;
+ gint _tmp17_;
+ TagSourceCollection* _tmp18_;
+ TagSourceCollection* _tmp19_;
+ GeeList* _tmp20_;
+ gint _tmp21_;
+ gpointer _tmp22_;
+ Tag* _tmp23_;
+ Marker* _tmp24_;
+ Marker* _tmp25_;
#line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp12_) {
-#line 18761 "Commands.c"
- gint _tmp13_ = 0;
+#line 18696 "Commands.c"
+ gint _tmp13_;
#line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp13_ = i;
#line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
i = _tmp13_ + 1;
-#line 18767 "Commands.c"
+#line 18702 "Commands.c"
}
#line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp12_ = FALSE;
@@ -18779,7 +18714,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
if (!(_tmp14_ < _tmp17_)) {
#line 2080 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 18783 "Commands.c"
+#line 18718 "Commands.c"
}
#line 2081 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp18_ = tag_global;
@@ -18803,7 +18738,7 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
_g_object_unref0 (_tmp25_);
#line 2081 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp23_);
-#line 18807 "Commands.c"
+#line 18742 "Commands.c"
}
}
}
@@ -18827,24 +18762,24 @@ static void reparent_tag_command_destroy_subtree (ReparentTagCommand* self, cons
_g_object_unref0 (victim);
#line 2068 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (victim_path);
-#line 18831 "Commands.c"
+#line 18766 "Commands.c"
}
static void reparent_tag_command_real_execute (Command* base) {
ReparentTagCommand * self;
- GeeList* _tmp0_ = NULL;
+ GeeList* _tmp0_;
#line 2087 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_REPARENT_TAG_COMMAND, ReparentTagCommand);
#line 2088 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->after_state;
#line 2088 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp0_ == NULL) {
-#line 18844 "Commands.c"
- const gchar* _tmp1_ = NULL;
- const gchar* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
+#line 18779 "Commands.c"
+ const gchar* _tmp1_;
+ const gchar* _tmp2_;
+ const gchar* _tmp3_;
+ const gchar* _tmp4_;
#line 2089 "/home/jens/Source/shotwell/src/Commands.vala"
reparent_tag_command_save_before_state (self);
#line 2091 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18865,13 +18800,13 @@ static void reparent_tag_command_real_execute (Command* base) {
_tmp4_ = self->priv->from_path;
#line 2099 "/home/jens/Source/shotwell/src/Commands.vala"
reparent_tag_command_destroy_subtree (self, _tmp4_);
-#line 18869 "Commands.c"
+#line 18804 "Commands.c"
} else {
- const gchar* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- GeeMap* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
+ const gchar* _tmp5_;
+ const gchar* _tmp6_;
+ GeeMap* _tmp7_;
+ const gchar* _tmp8_;
+ const gchar* _tmp9_;
#line 2101 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = self->priv->to_path;
#line 2101 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18896,22 +18831,22 @@ static void reparent_tag_command_real_execute (Command* base) {
_tmp9_ = self->priv->from_path;
#line 2111 "/home/jens/Source/shotwell/src/Commands.vala"
reparent_tag_command_destroy_subtree (self, _tmp9_);
-#line 18900 "Commands.c"
+#line 18835 "Commands.c"
}
}
static void reparent_tag_command_real_undo (Command* base) {
ReparentTagCommand * self;
- GeeList* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
- const gchar* _tmp4_ = NULL;
- GeeMap* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- const gchar* _tmp7_ = NULL;
- const gchar* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
+ GeeList* _tmp0_;
+ const gchar* _tmp1_;
+ gboolean _tmp2_;
+ const gchar* _tmp4_;
+ GeeMap* _tmp5_;
+ const gchar* _tmp6_;
+ const gchar* _tmp7_;
+ const gchar* _tmp8_;
+ const gchar* _tmp9_;
#line 2115 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_REPARENT_TAG_COMMAND, ReparentTagCommand);
#line 2116 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -18928,13 +18863,13 @@ static void reparent_tag_command_real_undo (Command* base) {
_tmp2_ = self->priv->to_path_exists;
#line 2122 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp2_) {
-#line 18932 "Commands.c"
- const gchar* _tmp3_ = NULL;
+#line 18867 "Commands.c"
+ const gchar* _tmp3_;
#line 2123 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = self->priv->to_path;
#line 2123 "/home/jens/Source/shotwell/src/Commands.vala"
reparent_tag_command_destroy_subtree (self, _tmp3_);
-#line 18938 "Commands.c"
+#line 18873 "Commands.c"
}
#line 2125 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = self->priv->from_path;
@@ -18962,13 +18897,13 @@ static void reparent_tag_command_real_undo (Command* base) {
_tmp9_ = self->priv->to_path_parent_path;
#line 2133 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp9_ != NULL) {
-#line 18966 "Commands.c"
- const gchar* _tmp10_ = NULL;
+#line 18901 "Commands.c"
+ const gchar* _tmp10_;
#line 2134 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp10_ = self->priv->to_path_parent_path;
#line 2134 "/home/jens/Source/shotwell/src/Commands.vala"
hierarchical_tag_utilities_cleanup_root_path (_tmp10_);
-#line 18972 "Commands.c"
+#line 18907 "Commands.c"
}
}
@@ -18979,17 +18914,17 @@ static void reparent_tag_command_class_init (ReparentTagCommandClass * klass) {
#line 1679 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (ReparentTagCommandPrivate));
#line 1679 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) reparent_tag_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) reparent_tag_command_real_execute;
#line 1679 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) reparent_tag_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) reparent_tag_command_real_undo;
#line 1679 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = reparent_tag_command_finalize;
-#line 18988 "Commands.c"
+#line 18923 "Commands.c"
}
static void reparent_tag_command_instance_init (ReparentTagCommand * self) {
- GeeHashSet* _tmp0_ = NULL;
+ GeeHashSet* _tmp0_;
#line 1679 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = REPARENT_TAG_COMMAND_GET_PRIVATE (self);
#line 1683 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19014,16 +18949,16 @@ static void reparent_tag_command_instance_init (ReparentTagCommand * self) {
self->priv->existing_dest_membership = NULL;
#line 1692 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->to_path_exists = FALSE;
-#line 19018 "Commands.c"
+#line 18953 "Commands.c"
}
-static void reparent_tag_command_finalize (GObject* obj) {
+static void reparent_tag_command_finalize (GObject * obj) {
ReparentTagCommand * self;
- LibraryPhotoSourceCollection* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- VideoSourceCollection* _tmp2_ = NULL;
- guint _tmp3_ = 0U;
+ LibraryPhotoSourceCollection* _tmp0_;
+ guint _tmp1_;
+ VideoSourceCollection* _tmp2_;
+ guint _tmp3_;
#line 1679 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_REPARENT_TAG_COMMAND, ReparentTagCommand);
#line 1724 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19064,7 +18999,7 @@ static void reparent_tag_command_finalize (GObject* obj) {
_g_object_unref0 (self->priv->existing_dest_membership);
#line 1679 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (reparent_tag_command_parent_class)->finalize (obj);
-#line 19068 "Commands.c"
+#line 19003 "Commands.c"
}
@@ -19083,22 +19018,22 @@ GType reparent_tag_command_get_type (void) {
static void _modify_tags_command_on_proxy_broken_source_proxy_broken (SourceProxy* _sender, gpointer self) {
#line 2179 "/home/jens/Source/shotwell/src/Commands.vala"
modify_tags_command_on_proxy_broken ((ModifyTagsCommand*) self);
-#line 19087 "Commands.c"
+#line 19022 "Commands.c"
}
ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource* media, GeeCollection* new_tag_list) {
ModifyTagsCommand * self = NULL;
- MediaSource* _tmp0_ = NULL;
- MediaSource* _tmp1_ = NULL;
- MediaSource* _tmp2_ = NULL;
+ MediaSource* _tmp0_;
+ MediaSource* _tmp1_;
+ MediaSource* _tmp2_;
GeeList* original_tags = NULL;
- TagSourceCollection* _tmp3_ = NULL;
- MediaSource* _tmp4_ = NULL;
- GeeList* _tmp5_ = NULL;
- GeeList* _tmp6_ = NULL;
+ TagSourceCollection* _tmp3_;
+ MediaSource* _tmp4_;
+ GeeList* _tmp5_;
+ GeeList* _tmp6_;
GeeSortedSet* new_paths = NULL;
- GeeTreeSet* _tmp23_ = NULL;
+ GeeTreeSet* _tmp23_;
#line 2143 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_MEDIA_SOURCE (media), NULL);
#line 2143 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19127,15 +19062,15 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
_tmp6_ = original_tags;
#line 2150 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp6_ != NULL) {
-#line 19131 "Commands.c"
+#line 19066 "Commands.c"
{
GeeList* _tag_list = NULL;
- GeeList* _tmp7_ = NULL;
- GeeList* _tmp8_ = NULL;
+ GeeList* _tmp7_;
+ GeeList* _tmp8_;
gint _tag_size = 0;
- GeeList* _tmp9_ = NULL;
- gint _tmp10_ = 0;
- gint _tmp11_ = 0;
+ GeeList* _tmp9_;
+ gint _tmp10_;
+ gint _tmp11_;
gint _tag_index = 0;
#line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = original_tags;
@@ -19155,20 +19090,20 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
_tag_index = -1;
#line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 19159 "Commands.c"
- gint _tmp12_ = 0;
- gint _tmp13_ = 0;
- gint _tmp14_ = 0;
+#line 19094 "Commands.c"
+ gint _tmp12_;
+ gint _tmp13_;
+ gint _tmp14_;
Tag* tag = NULL;
- GeeList* _tmp15_ = NULL;
- gint _tmp16_ = 0;
- gpointer _tmp17_ = NULL;
+ GeeList* _tmp15_;
+ gint _tmp16_;
+ gpointer _tmp17_;
SourceProxy* proxy = NULL;
- Tag* _tmp18_ = NULL;
- SourceProxy* _tmp19_ = NULL;
- GeeArrayList* _tmp20_ = NULL;
- SourceProxy* _tmp21_ = NULL;
- SourceProxy* _tmp22_ = NULL;
+ Tag* _tmp18_;
+ SourceProxy* _tmp19_;
+ GeeArrayList* _tmp20_;
+ SourceProxy* _tmp21_;
+ SourceProxy* _tmp22_;
#line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp12_ = _tag_index;
#line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19181,7 +19116,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
if (!(_tmp13_ < _tmp14_)) {
#line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 19185 "Commands.c"
+#line 19120 "Commands.c"
}
#line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp15_ = _tag_list;
@@ -19211,22 +19146,22 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
_source_proxy_unref0 (proxy);
#line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (tag);
-#line 19215 "Commands.c"
+#line 19150 "Commands.c"
}
#line 2151 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tag_list);
-#line 19219 "Commands.c"
+#line 19154 "Commands.c"
}
}
#line 2160 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp23_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
#line 2160 "/home/jens/Source/shotwell/src/Commands.vala"
new_paths = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_SORTED_SET, GeeSortedSet);
-#line 19226 "Commands.c"
+#line 19161 "Commands.c"
{
GeeIterator* _new_tag_it = NULL;
- GeeCollection* _tmp24_ = NULL;
- GeeIterator* _tmp25_ = NULL;
+ GeeCollection* _tmp24_;
+ GeeIterator* _tmp25_;
#line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp24_ = new_tag_list;
#line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19235,21 +19170,21 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
_new_tag_it = _tmp25_;
#line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 19239 "Commands.c"
- GeeIterator* _tmp26_ = NULL;
- gboolean _tmp27_ = FALSE;
+#line 19174 "Commands.c"
+ GeeIterator* _tmp26_;
+ gboolean _tmp27_;
Tag* new_tag = NULL;
- GeeIterator* _tmp28_ = NULL;
- gpointer _tmp29_ = NULL;
+ GeeIterator* _tmp28_;
+ gpointer _tmp29_;
gchar* new_tag_path = NULL;
- Tag* _tmp30_ = NULL;
- gchar* _tmp31_ = NULL;
- GeeSortedSet* _tmp32_ = NULL;
- const gchar* _tmp33_ = NULL;
- GeeSortedSet* _tmp34_ = NULL;
- const gchar* _tmp35_ = NULL;
- GeeList* _tmp36_ = NULL;
- GeeList* _tmp37_ = NULL;
+ Tag* _tmp30_;
+ gchar* _tmp31_;
+ GeeSortedSet* _tmp32_;
+ const gchar* _tmp33_;
+ GeeSortedSet* _tmp34_;
+ const gchar* _tmp35_;
+ GeeList* _tmp36_;
+ GeeList* _tmp37_;
#line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp26_ = _new_tag_it;
#line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19258,7 +19193,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
if (!_tmp27_) {
#line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 19262 "Commands.c"
+#line 19197 "Commands.c"
}
#line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp28_ = _new_tag_it;
@@ -19294,16 +19229,16 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
_g_free0 (new_tag_path);
#line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (new_tag);
-#line 19298 "Commands.c"
+#line 19233 "Commands.c"
}
#line 2161 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_new_tag_it);
-#line 19302 "Commands.c"
+#line 19237 "Commands.c"
}
{
GeeIterator* _path_it = NULL;
- GeeSortedSet* _tmp38_ = NULL;
- GeeIterator* _tmp39_ = NULL;
+ GeeSortedSet* _tmp38_;
+ GeeIterator* _tmp39_;
#line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp38_ = new_paths;
#line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19312,24 +19247,24 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
_path_it = _tmp39_;
#line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 19316 "Commands.c"
- GeeIterator* _tmp40_ = NULL;
- gboolean _tmp41_ = FALSE;
+#line 19251 "Commands.c"
+ GeeIterator* _tmp40_;
+ gboolean _tmp41_;
gchar* path = NULL;
- GeeIterator* _tmp42_ = NULL;
- gpointer _tmp43_ = NULL;
- TagSourceCollection* _tmp44_ = NULL;
- const gchar* _tmp45_ = NULL;
- gboolean _tmp46_ = FALSE;
+ GeeIterator* _tmp42_;
+ gpointer _tmp43_;
+ TagSourceCollection* _tmp44_;
+ const gchar* _tmp45_;
+ gboolean _tmp46_;
SourceProxy* proxy = NULL;
- const gchar* _tmp47_ = NULL;
- Tag* _tmp48_ = NULL;
- Tag* _tmp49_ = NULL;
- SourceProxy* _tmp50_ = NULL;
- SourceProxy* _tmp51_ = NULL;
- GeeArrayList* _tmp52_ = NULL;
- SourceProxy* _tmp53_ = NULL;
- SourceProxy* _tmp54_ = NULL;
+ const gchar* _tmp47_;
+ Tag* _tmp48_;
+ Tag* _tmp49_;
+ SourceProxy* _tmp50_;
+ SourceProxy* _tmp51_;
+ GeeArrayList* _tmp52_;
+ SourceProxy* _tmp53_;
+ SourceProxy* _tmp54_;
#line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp40_ = _path_it;
#line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19338,7 +19273,7 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
if (!_tmp41_) {
#line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 19342 "Commands.c"
+#line 19277 "Commands.c"
}
#line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp42_ = _path_it;
@@ -19382,11 +19317,11 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
_source_proxy_unref0 (proxy);
#line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (path);
-#line 19386 "Commands.c"
+#line 19321 "Commands.c"
}
#line 2168 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_path_it);
-#line 19390 "Commands.c"
+#line 19325 "Commands.c"
}
#line 2143 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (new_paths);
@@ -19394,14 +19329,14 @@ ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource
_g_object_unref0 (original_tags);
#line 2143 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 19398 "Commands.c"
+#line 19333 "Commands.c"
}
ModifyTagsCommand* modify_tags_command_new (MediaSource* media, GeeCollection* new_tag_list) {
#line 2143 "/home/jens/Source/shotwell/src/Commands.vala"
return modify_tags_command_construct (TYPE_MODIFY_TAGS_COMMAND, media, new_tag_list);
-#line 19405 "Commands.c"
+#line 19340 "Commands.c"
}
@@ -19409,15 +19344,15 @@ static void modify_tags_command_real_execute (Command* base) {
ModifyTagsCommand * self;
#line 2185 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MODIFY_TAGS_COMMAND, ModifyTagsCommand);
-#line 19413 "Commands.c"
+#line 19348 "Commands.c"
{
GeeArrayList* _proxy_list = NULL;
- GeeArrayList* _tmp0_ = NULL;
- GeeArrayList* _tmp1_ = NULL;
+ GeeArrayList* _tmp0_;
+ GeeArrayList* _tmp1_;
gint _proxy_size = 0;
- GeeArrayList* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
+ GeeArrayList* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
gint _proxy_index = 0;
#line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->to_remove;
@@ -19437,20 +19372,20 @@ static void modify_tags_command_real_execute (Command* base) {
_proxy_index = -1;
#line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 19441 "Commands.c"
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
+#line 19376 "Commands.c"
+ gint _tmp5_;
+ gint _tmp6_;
+ gint _tmp7_;
SourceProxy* proxy = NULL;
- GeeArrayList* _tmp8_ = NULL;
- gint _tmp9_ = 0;
- gpointer _tmp10_ = NULL;
- SourceProxy* _tmp11_ = NULL;
- DataSource* _tmp12_ = NULL;
- Tag* _tmp13_ = NULL;
- MediaSource* _tmp14_ = NULL;
- GeeList* _tmp15_ = NULL;
- GeeList* _tmp16_ = NULL;
+ GeeArrayList* _tmp8_;
+ gint _tmp9_;
+ gpointer _tmp10_;
+ SourceProxy* _tmp11_;
+ DataSource* _tmp12_;
+ Tag* _tmp13_;
+ MediaSource* _tmp14_;
+ GeeList* _tmp15_;
+ GeeList* _tmp16_;
#line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = _proxy_index;
#line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19463,7 +19398,7 @@ static void modify_tags_command_real_execute (Command* base) {
if (!(_tmp6_ < _tmp7_)) {
#line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 19467 "Commands.c"
+#line 19402 "Commands.c"
}
#line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp8_ = _proxy_list;
@@ -19491,20 +19426,20 @@ static void modify_tags_command_real_execute (Command* base) {
_g_object_unref0 (_tmp13_);
#line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
_source_proxy_unref0 (proxy);
-#line 19495 "Commands.c"
+#line 19430 "Commands.c"
}
#line 2186 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_proxy_list);
-#line 19499 "Commands.c"
+#line 19434 "Commands.c"
}
{
GeeArrayList* _proxy_list = NULL;
- GeeArrayList* _tmp17_ = NULL;
- GeeArrayList* _tmp18_ = NULL;
+ GeeArrayList* _tmp17_;
+ GeeArrayList* _tmp18_;
gint _proxy_size = 0;
- GeeArrayList* _tmp19_ = NULL;
- gint _tmp20_ = 0;
- gint _tmp21_ = 0;
+ GeeArrayList* _tmp19_;
+ gint _tmp20_;
+ gint _tmp21_;
gint _proxy_index = 0;
#line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp17_ = self->priv->to_add;
@@ -19524,18 +19459,18 @@ static void modify_tags_command_real_execute (Command* base) {
_proxy_index = -1;
#line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 19528 "Commands.c"
- gint _tmp22_ = 0;
- gint _tmp23_ = 0;
- gint _tmp24_ = 0;
+#line 19463 "Commands.c"
+ gint _tmp22_;
+ gint _tmp23_;
+ gint _tmp24_;
SourceProxy* proxy = NULL;
- GeeArrayList* _tmp25_ = NULL;
- gint _tmp26_ = 0;
- gpointer _tmp27_ = NULL;
- SourceProxy* _tmp28_ = NULL;
- DataSource* _tmp29_ = NULL;
- Tag* _tmp30_ = NULL;
- MediaSource* _tmp31_ = NULL;
+ GeeArrayList* _tmp25_;
+ gint _tmp26_;
+ gpointer _tmp27_;
+ SourceProxy* _tmp28_;
+ DataSource* _tmp29_;
+ Tag* _tmp30_;
+ MediaSource* _tmp31_;
#line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp22_ = _proxy_index;
#line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19548,7 +19483,7 @@ static void modify_tags_command_real_execute (Command* base) {
if (!(_tmp23_ < _tmp24_)) {
#line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 19552 "Commands.c"
+#line 19487 "Commands.c"
}
#line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp25_ = _proxy_list;
@@ -19572,11 +19507,11 @@ static void modify_tags_command_real_execute (Command* base) {
_g_object_unref0 (_tmp30_);
#line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
_source_proxy_unref0 (proxy);
-#line 19576 "Commands.c"
+#line 19511 "Commands.c"
}
#line 2189 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_proxy_list);
-#line 19580 "Commands.c"
+#line 19515 "Commands.c"
}
}
@@ -19585,15 +19520,15 @@ static void modify_tags_command_real_undo (Command* base) {
ModifyTagsCommand * self;
#line 2193 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MODIFY_TAGS_COMMAND, ModifyTagsCommand);
-#line 19589 "Commands.c"
+#line 19524 "Commands.c"
{
GeeArrayList* _proxy_list = NULL;
- GeeArrayList* _tmp0_ = NULL;
- GeeArrayList* _tmp1_ = NULL;
+ GeeArrayList* _tmp0_;
+ GeeArrayList* _tmp1_;
gint _proxy_size = 0;
- GeeArrayList* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
+ GeeArrayList* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
gint _proxy_index = 0;
#line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->to_add;
@@ -19613,20 +19548,20 @@ static void modify_tags_command_real_undo (Command* base) {
_proxy_index = -1;
#line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 19617 "Commands.c"
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
+#line 19552 "Commands.c"
+ gint _tmp5_;
+ gint _tmp6_;
+ gint _tmp7_;
SourceProxy* proxy = NULL;
- GeeArrayList* _tmp8_ = NULL;
- gint _tmp9_ = 0;
- gpointer _tmp10_ = NULL;
- SourceProxy* _tmp11_ = NULL;
- DataSource* _tmp12_ = NULL;
- Tag* _tmp13_ = NULL;
- MediaSource* _tmp14_ = NULL;
- GeeList* _tmp15_ = NULL;
- GeeList* _tmp16_ = NULL;
+ GeeArrayList* _tmp8_;
+ gint _tmp9_;
+ gpointer _tmp10_;
+ SourceProxy* _tmp11_;
+ DataSource* _tmp12_;
+ Tag* _tmp13_;
+ MediaSource* _tmp14_;
+ GeeList* _tmp15_;
+ GeeList* _tmp16_;
#line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = _proxy_index;
#line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19639,7 +19574,7 @@ static void modify_tags_command_real_undo (Command* base) {
if (!(_tmp6_ < _tmp7_)) {
#line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 19643 "Commands.c"
+#line 19578 "Commands.c"
}
#line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp8_ = _proxy_list;
@@ -19667,20 +19602,20 @@ static void modify_tags_command_real_undo (Command* base) {
_g_object_unref0 (_tmp13_);
#line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
_source_proxy_unref0 (proxy);
-#line 19671 "Commands.c"
+#line 19606 "Commands.c"
}
#line 2194 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_proxy_list);
-#line 19675 "Commands.c"
+#line 19610 "Commands.c"
}
{
GeeArrayList* _proxy_list = NULL;
- GeeArrayList* _tmp17_ = NULL;
- GeeArrayList* _tmp18_ = NULL;
+ GeeArrayList* _tmp17_;
+ GeeArrayList* _tmp18_;
gint _proxy_size = 0;
- GeeArrayList* _tmp19_ = NULL;
- gint _tmp20_ = 0;
- gint _tmp21_ = 0;
+ GeeArrayList* _tmp19_;
+ gint _tmp20_;
+ gint _tmp21_;
gint _proxy_index = 0;
#line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp17_ = self->priv->to_remove;
@@ -19700,18 +19635,18 @@ static void modify_tags_command_real_undo (Command* base) {
_proxy_index = -1;
#line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 19704 "Commands.c"
- gint _tmp22_ = 0;
- gint _tmp23_ = 0;
- gint _tmp24_ = 0;
+#line 19639 "Commands.c"
+ gint _tmp22_;
+ gint _tmp23_;
+ gint _tmp24_;
SourceProxy* proxy = NULL;
- GeeArrayList* _tmp25_ = NULL;
- gint _tmp26_ = 0;
- gpointer _tmp27_ = NULL;
- SourceProxy* _tmp28_ = NULL;
- DataSource* _tmp29_ = NULL;
- Tag* _tmp30_ = NULL;
- MediaSource* _tmp31_ = NULL;
+ GeeArrayList* _tmp25_;
+ gint _tmp26_;
+ gpointer _tmp27_;
+ SourceProxy* _tmp28_;
+ DataSource* _tmp29_;
+ Tag* _tmp30_;
+ MediaSource* _tmp31_;
#line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp22_ = _proxy_index;
#line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19724,7 +19659,7 @@ static void modify_tags_command_real_undo (Command* base) {
if (!(_tmp23_ < _tmp24_)) {
#line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 19728 "Commands.c"
+#line 19663 "Commands.c"
}
#line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp25_ = _proxy_list;
@@ -19748,18 +19683,18 @@ static void modify_tags_command_real_undo (Command* base) {
_g_object_unref0 (_tmp30_);
#line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
_source_proxy_unref0 (proxy);
-#line 19752 "Commands.c"
+#line 19687 "Commands.c"
}
#line 2197 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_proxy_list);
-#line 19756 "Commands.c"
+#line 19691 "Commands.c"
}
}
static void modify_tags_command_on_proxy_broken (ModifyTagsCommand* self) {
- CommandManager* _tmp0_ = NULL;
- CommandManager* _tmp1_ = NULL;
+ CommandManager* _tmp0_;
+ CommandManager* _tmp1_;
#line 2201 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_MODIFY_TAGS_COMMAND (self));
#line 2202 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19770,7 +19705,7 @@ static void modify_tags_command_on_proxy_broken (ModifyTagsCommand* self) {
command_manager_reset (_tmp1_);
#line 2202 "/home/jens/Source/shotwell/src/Commands.vala"
_command_manager_unref0 (_tmp1_);
-#line 19774 "Commands.c"
+#line 19709 "Commands.c"
}
@@ -19780,18 +19715,18 @@ static void modify_tags_command_class_init (ModifyTagsCommandClass * klass) {
#line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (ModifyTagsCommandPrivate));
#line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) modify_tags_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) modify_tags_command_real_execute;
#line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) modify_tags_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) modify_tags_command_real_undo;
#line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = modify_tags_command_finalize;
-#line 19789 "Commands.c"
+#line 19724 "Commands.c"
}
static void modify_tags_command_instance_init (ModifyTagsCommand * self) {
- GeeArrayList* _tmp0_ = NULL;
- GeeArrayList* _tmp1_ = NULL;
+ GeeArrayList* _tmp0_;
+ GeeArrayList* _tmp1_;
#line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = MODIFY_TAGS_COMMAND_GET_PRIVATE (self);
#line 2140 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19802,23 +19737,23 @@ static void modify_tags_command_instance_init (ModifyTagsCommand * self) {
_tmp1_ = gee_array_list_new (TYPE_SOURCE_PROXY, (GBoxedCopyFunc) source_proxy_ref, (GDestroyNotify) source_proxy_unref, NULL, NULL, NULL);
#line 2141 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->to_remove = _tmp1_;
-#line 19806 "Commands.c"
+#line 19741 "Commands.c"
}
-static void modify_tags_command_finalize (GObject* obj) {
+static void modify_tags_command_finalize (GObject * obj) {
ModifyTagsCommand * self;
#line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MODIFY_TAGS_COMMAND, ModifyTagsCommand);
-#line 19814 "Commands.c"
+#line 19749 "Commands.c"
{
GeeArrayList* _proxy_list = NULL;
- GeeArrayList* _tmp0_ = NULL;
- GeeArrayList* _tmp1_ = NULL;
+ GeeArrayList* _tmp0_;
+ GeeArrayList* _tmp1_;
gint _proxy_size = 0;
- GeeArrayList* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
+ GeeArrayList* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
gint _proxy_index = 0;
#line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->to_add;
@@ -19838,16 +19773,16 @@ static void modify_tags_command_finalize (GObject* obj) {
_proxy_index = -1;
#line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 19842 "Commands.c"
- gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- gint _tmp7_ = 0;
+#line 19777 "Commands.c"
+ gint _tmp5_;
+ gint _tmp6_;
+ gint _tmp7_;
SourceProxy* proxy = NULL;
- GeeArrayList* _tmp8_ = NULL;
- gint _tmp9_ = 0;
- gpointer _tmp10_ = NULL;
- SourceProxy* _tmp11_ = NULL;
- guint _tmp12_ = 0U;
+ GeeArrayList* _tmp8_;
+ gint _tmp9_;
+ gpointer _tmp10_;
+ SourceProxy* _tmp11_;
+ guint _tmp12_;
#line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = _proxy_index;
#line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19860,7 +19795,7 @@ static void modify_tags_command_finalize (GObject* obj) {
if (!(_tmp6_ < _tmp7_)) {
#line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 19864 "Commands.c"
+#line 19799 "Commands.c"
}
#line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp8_ = _proxy_list;
@@ -19878,20 +19813,20 @@ static void modify_tags_command_finalize (GObject* obj) {
g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _modify_tags_command_on_proxy_broken_source_proxy_broken, self);
#line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
_source_proxy_unref0 (proxy);
-#line 19882 "Commands.c"
+#line 19817 "Commands.c"
}
#line 2178 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_proxy_list);
-#line 19886 "Commands.c"
+#line 19821 "Commands.c"
}
{
GeeArrayList* _proxy_list = NULL;
- GeeArrayList* _tmp13_ = NULL;
- GeeArrayList* _tmp14_ = NULL;
+ GeeArrayList* _tmp13_;
+ GeeArrayList* _tmp14_;
gint _proxy_size = 0;
- GeeArrayList* _tmp15_ = NULL;
- gint _tmp16_ = 0;
- gint _tmp17_ = 0;
+ GeeArrayList* _tmp15_;
+ gint _tmp16_;
+ gint _tmp17_;
gint _proxy_index = 0;
#line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp13_ = self->priv->to_remove;
@@ -19911,16 +19846,16 @@ static void modify_tags_command_finalize (GObject* obj) {
_proxy_index = -1;
#line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 19915 "Commands.c"
- gint _tmp18_ = 0;
- gint _tmp19_ = 0;
- gint _tmp20_ = 0;
+#line 19850 "Commands.c"
+ gint _tmp18_;
+ gint _tmp19_;
+ gint _tmp20_;
SourceProxy* proxy = NULL;
- GeeArrayList* _tmp21_ = NULL;
- gint _tmp22_ = 0;
- gpointer _tmp23_ = NULL;
- SourceProxy* _tmp24_ = NULL;
- guint _tmp25_ = 0U;
+ GeeArrayList* _tmp21_;
+ gint _tmp22_;
+ gpointer _tmp23_;
+ SourceProxy* _tmp24_;
+ guint _tmp25_;
#line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp18_ = _proxy_index;
#line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -19933,7 +19868,7 @@ static void modify_tags_command_finalize (GObject* obj) {
if (!(_tmp19_ < _tmp20_)) {
#line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 19937 "Commands.c"
+#line 19872 "Commands.c"
}
#line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp21_ = _proxy_list;
@@ -19951,11 +19886,11 @@ static void modify_tags_command_finalize (GObject* obj) {
g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _modify_tags_command_on_proxy_broken_source_proxy_broken, self);
#line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
_source_proxy_unref0 (proxy);
-#line 19955 "Commands.c"
+#line 19890 "Commands.c"
}
#line 2181 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_proxy_list);
-#line 19959 "Commands.c"
+#line 19894 "Commands.c"
}
#line 2139 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (self->priv->media);
@@ -19965,7 +19900,7 @@ static void modify_tags_command_finalize (GObject* obj) {
_g_object_unref0 (self->priv->to_remove);
#line 2138 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (modify_tags_command_parent_class)->finalize (obj);
-#line 19969 "Commands.c"
+#line 19904 "Commands.c"
}
@@ -19984,23 +19919,23 @@ GType modify_tags_command_get_type (void) {
static void _tag_untag_photos_command_on_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
#line 2226 "/home/jens/Source/shotwell/src/Commands.vala"
tag_untag_photos_command_on_source_destroyed ((TagUntagPhotosCommand*) self, source);
-#line 19988 "Commands.c"
+#line 19923 "Commands.c"
}
TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Tag* tag, GeeCollection* sources, gint count, gboolean attach) {
TagUntagPhotosCommand * self = NULL;
gchar* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- Tag* _tmp12_ = NULL;
- Tag* _tmp13_ = NULL;
- gchar* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
- GeeCollection* _tmp16_ = NULL;
- GeeCollection* _tmp17_ = NULL;
- gboolean _tmp18_ = FALSE;
- LibraryPhotoSourceCollection* _tmp19_ = NULL;
- VideoSourceCollection* _tmp20_ = NULL;
+ gboolean _tmp1_;
+ Tag* _tmp12_;
+ Tag* _tmp13_;
+ gchar* _tmp14_;
+ gchar* _tmp15_;
+ GeeCollection* _tmp16_;
+ GeeCollection* _tmp17_;
+ gboolean _tmp18_;
+ LibraryPhotoSourceCollection* _tmp19_;
+ VideoSourceCollection* _tmp20_;
#line 2212 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_TAG (tag), NULL);
#line 2212 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20009,12 +19944,12 @@ TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Ta
_tmp1_ = attach;
#line 2214 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp1_) {
-#line 20013 "Commands.c"
- Tag* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gint _tmp5_ = 0;
- gchar* _tmp6_ = NULL;
+#line 19948 "Commands.c"
+ Tag* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gint _tmp5_;
+ gchar* _tmp6_;
#line 2214 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = tag;
#line 2214 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20031,13 +19966,13 @@ TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Ta
_tmp0_ = _tmp6_;
#line 2214 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (_tmp4_);
-#line 20035 "Commands.c"
+#line 19970 "Commands.c"
} else {
- Tag* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- gint _tmp10_ = 0;
- gchar* _tmp11_ = NULL;
+ Tag* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ gint _tmp10_;
+ gchar* _tmp11_;
#line 2215 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = tag;
#line 2215 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20054,7 +19989,7 @@ TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Ta
_tmp0_ = _tmp11_;
#line 2215 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (_tmp9_);
-#line 20058 "Commands.c"
+#line 19993 "Commands.c"
}
#line 2213 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp12_ = tag;
@@ -20092,20 +20027,20 @@ TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Ta
_g_free0 (_tmp0_);
#line 2212 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 20096 "Commands.c"
+#line 20031 "Commands.c"
}
TagUntagPhotosCommand* tag_untag_photos_command_new (Tag* tag, GeeCollection* sources, gint count, gboolean attach) {
#line 2212 "/home/jens/Source/shotwell/src/Commands.vala"
return tag_untag_photos_command_construct (TYPE_TAG_UNTAG_PHOTOS_COMMAND, tag, sources, count, attach);
-#line 20103 "Commands.c"
+#line 20038 "Commands.c"
}
static void tag_untag_photos_command_real_execute_on_source (SimpleProxyableCommand* base, DataSource* source) {
TagUntagPhotosCommand * self;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 2230 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_UNTAG_PHOTOS_COMMAND, TagUntagPhotosCommand);
#line 2230 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20114,27 +20049,27 @@ static void tag_untag_photos_command_real_execute_on_source (SimpleProxyableComm
_tmp0_ = self->priv->attach;
#line 2231 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp0_) {
-#line 20118 "Commands.c"
- DataSource* _tmp1_ = NULL;
+#line 20053 "Commands.c"
+ DataSource* _tmp1_;
#line 2232 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = source;
#line 2232 "/home/jens/Source/shotwell/src/Commands.vala"
tag_untag_photos_command_do_attach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TAG, Tag));
-#line 20124 "Commands.c"
+#line 20059 "Commands.c"
} else {
- DataSource* _tmp2_ = NULL;
+ DataSource* _tmp2_;
#line 2234 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = source;
#line 2234 "/home/jens/Source/shotwell/src/Commands.vala"
tag_untag_photos_command_do_detach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_TAG, Tag));
-#line 20131 "Commands.c"
+#line 20066 "Commands.c"
}
}
static void tag_untag_photos_command_real_undo_on_source (SimpleProxyableCommand* base, DataSource* source) {
TagUntagPhotosCommand * self;
- gboolean _tmp0_ = FALSE;
+ gboolean _tmp0_;
#line 2237 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_UNTAG_PHOTOS_COMMAND, TagUntagPhotosCommand);
#line 2237 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20143,26 +20078,26 @@ static void tag_untag_photos_command_real_undo_on_source (SimpleProxyableCommand
_tmp0_ = self->priv->attach;
#line 2238 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp0_) {
-#line 20147 "Commands.c"
- DataSource* _tmp1_ = NULL;
+#line 20082 "Commands.c"
+ DataSource* _tmp1_;
#line 2239 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = source;
#line 2239 "/home/jens/Source/shotwell/src/Commands.vala"
tag_untag_photos_command_do_detach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TAG, Tag));
-#line 20153 "Commands.c"
+#line 20088 "Commands.c"
} else {
- DataSource* _tmp2_ = NULL;
+ DataSource* _tmp2_;
#line 2241 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = source;
#line 2241 "/home/jens/Source/shotwell/src/Commands.vala"
tag_untag_photos_command_do_attach (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_TAG, Tag));
-#line 20160 "Commands.c"
+#line 20095 "Commands.c"
}
}
static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag* tag) {
- GeeMultiMap* _tmp0_ = NULL;
+ GeeMultiMap* _tmp0_;
#line 2244 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_TAG_UNTAG_PHOTOS_COMMAND (self));
#line 2244 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20171,13 +20106,13 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
_tmp0_ = self->priv->detached_from;
#line 2246 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp0_ == NULL) {
-#line 20175 "Commands.c"
- Tag* _tmp1_ = NULL;
- GeeCollection* _tmp2_ = NULL;
- GeeArrayList* _tmp3_ = NULL;
+#line 20110 "Commands.c"
+ Tag* _tmp1_;
+ GeeCollection* _tmp2_;
+ GeeArrayList* _tmp3_;
Tag* curr_tmp = NULL;
- Tag* _tmp4_ = NULL;
- Tag* _tmp5_ = NULL;
+ Tag* _tmp4_;
+ Tag* _tmp5_;
#line 2247 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = tag;
#line 2247 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20198,19 +20133,19 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
curr_tmp = _tmp5_;
#line 2253 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 20202 "Commands.c"
- Tag* _tmp6_ = NULL;
- GeeList* _tmp7_ = NULL;
- Tag* _tmp8_ = NULL;
- Tag* _tmp9_ = NULL;
- Tag* _tmp10_ = NULL;
+#line 20137 "Commands.c"
+ Tag* _tmp6_;
+ GeeList* _tmp7_;
+ Tag* _tmp8_;
+ Tag* _tmp9_;
+ Tag* _tmp10_;
#line 2253 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = curr_tmp;
#line 2253 "/home/jens/Source/shotwell/src/Commands.vala"
if (!(_tmp6_ != NULL)) {
#line 2253 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 20214 "Commands.c"
+#line 20149 "Commands.c"
}
#line 2254 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = self->priv->attached_to;
@@ -20226,21 +20161,21 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
_g_object_unref0 (curr_tmp);
#line 2255 "/home/jens/Source/shotwell/src/Commands.vala"
curr_tmp = _tmp10_;
-#line 20230 "Commands.c"
+#line 20165 "Commands.c"
}
#line 2258 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (curr_tmp);
#line 2258 "/home/jens/Source/shotwell/src/Commands.vala"
return;
-#line 20236 "Commands.c"
+#line 20171 "Commands.c"
}
{
GeeIterator* _detached_tag_it = NULL;
- GeeMultiMap* _tmp11_ = NULL;
- GeeMultiSet* _tmp12_ = NULL;
- GeeMultiSet* _tmp13_ = NULL;
- GeeIterator* _tmp14_ = NULL;
- GeeIterator* _tmp15_ = NULL;
+ GeeMultiMap* _tmp11_;
+ GeeMultiSet* _tmp12_;
+ GeeMultiSet* _tmp13_;
+ GeeIterator* _tmp14_;
+ GeeIterator* _tmp15_;
#line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp11_ = self->priv->detached_from;
#line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20257,17 +20192,17 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
_detached_tag_it = _tmp15_;
#line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 20261 "Commands.c"
- GeeIterator* _tmp16_ = NULL;
- gboolean _tmp17_ = FALSE;
+#line 20196 "Commands.c"
+ GeeIterator* _tmp16_;
+ gboolean _tmp17_;
Tag* detached_tag = NULL;
- GeeIterator* _tmp18_ = NULL;
- gpointer _tmp19_ = NULL;
- Tag* _tmp20_ = NULL;
- GeeMultiMap* _tmp21_ = NULL;
- Tag* _tmp22_ = NULL;
- GeeCollection* _tmp23_ = NULL;
- GeeCollection* _tmp24_ = NULL;
+ GeeIterator* _tmp18_;
+ gpointer _tmp19_;
+ Tag* _tmp20_;
+ GeeMultiMap* _tmp21_;
+ Tag* _tmp22_;
+ GeeCollection* _tmp23_;
+ GeeCollection* _tmp24_;
#line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp16_ = _detached_tag_it;
#line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20276,7 +20211,7 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
if (!_tmp17_) {
#line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 20280 "Commands.c"
+#line 20215 "Commands.c"
}
#line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp18_ = _detached_tag_it;
@@ -20300,11 +20235,11 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
_g_object_unref0 (_tmp24_);
#line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (detached_tag);
-#line 20304 "Commands.c"
+#line 20239 "Commands.c"
}
#line 2262 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_detached_tag_it);
-#line 20308 "Commands.c"
+#line 20243 "Commands.c"
}
#line 2265 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (self->priv->detached_from);
@@ -20312,12 +20247,12 @@ static void tag_untag_photos_command_do_attach (TagUntagPhotosCommand* self, Tag
self->priv->detached_from = NULL;
#line 2266 "/home/jens/Source/shotwell/src/Commands.vala"
simple_proxyable_command_clear_added_proxies (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SIMPLE_PROXYABLE_COMMAND, SimpleProxyableCommand));
-#line 20316 "Commands.c"
+#line 20251 "Commands.c"
}
static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag* tag) {
- GeeList* _tmp0_ = NULL;
+ GeeList* _tmp0_;
#line 2269 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_TAG_UNTAG_PHOTOS_COMMAND (self));
#line 2269 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20326,13 +20261,13 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
_tmp0_ = self->priv->attached_to;
#line 2270 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp0_ == NULL) {
-#line 20330 "Commands.c"
- Tag* _tmp1_ = NULL;
- GeeCollection* _tmp2_ = NULL;
- GeeMultiMap* _tmp3_ = NULL;
- GeeMultiMap* _tmp4_ = NULL;
- GeeSet* _tmp5_ = NULL;
- GeeSet* _tmp6_ = NULL;
+#line 20265 "Commands.c"
+ Tag* _tmp1_;
+ GeeCollection* _tmp2_;
+ GeeMultiMap* _tmp3_;
+ GeeMultiMap* _tmp4_;
+ GeeSet* _tmp5_;
+ GeeSet* _tmp6_;
#line 2274 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = tag;
#line 2274 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20353,16 +20288,16 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
simple_proxyable_command_add_proxyables (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SIMPLE_PROXYABLE_COMMAND, SimpleProxyableCommand), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
#line 2278 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp6_);
-#line 20357 "Commands.c"
+#line 20292 "Commands.c"
} else {
{
GeeList* _t_list = NULL;
- GeeList* _tmp7_ = NULL;
- GeeList* _tmp8_ = NULL;
+ GeeList* _tmp7_;
+ GeeList* _tmp8_;
gint _t_size = 0;
- GeeList* _tmp9_ = NULL;
- gint _tmp10_ = 0;
- gint _tmp11_ = 0;
+ GeeList* _tmp9_;
+ gint _tmp10_;
+ gint _tmp11_;
gint _t_index = 0;
#line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = self->priv->attached_to;
@@ -20382,14 +20317,14 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
_t_index = -1;
#line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 20386 "Commands.c"
- gint _tmp12_ = 0;
- gint _tmp13_ = 0;
- gint _tmp14_ = 0;
+#line 20321 "Commands.c"
+ gint _tmp12_;
+ gint _tmp13_;
+ gint _tmp14_;
Tag* t = NULL;
- GeeList* _tmp15_ = NULL;
- gint _tmp16_ = 0;
- gpointer _tmp17_ = NULL;
+ GeeList* _tmp15_;
+ gint _tmp16_;
+ gpointer _tmp17_;
#line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp12_ = _t_index;
#line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20402,7 +20337,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
if (!(_tmp13_ < _tmp14_)) {
#line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 20406 "Commands.c"
+#line 20341 "Commands.c"
}
#line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp15_ = _t_list;
@@ -20412,11 +20347,11 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
_tmp17_ = gee_list_get (_tmp15_, _tmp16_);
#line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
t = (Tag*) _tmp17_;
-#line 20416 "Commands.c"
+#line 20351 "Commands.c"
{
GeeIterator* _ms_it = NULL;
- GeeCollection* _tmp18_ = NULL;
- GeeIterator* _tmp19_ = NULL;
+ GeeCollection* _tmp18_;
+ GeeIterator* _tmp19_;
#line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp18_ = self->priv->sources;
#line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20425,15 +20360,15 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
_ms_it = _tmp19_;
#line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 20429 "Commands.c"
- GeeIterator* _tmp20_ = NULL;
- gboolean _tmp21_ = FALSE;
+#line 20364 "Commands.c"
+ GeeIterator* _tmp20_;
+ gboolean _tmp21_;
MediaSource* ms = NULL;
- GeeIterator* _tmp22_ = NULL;
- gpointer _tmp23_ = NULL;
- Tag* _tmp24_ = NULL;
- MediaSource* _tmp25_ = NULL;
- gint _tmp26_ = 0;
+ GeeIterator* _tmp22_;
+ gpointer _tmp23_;
+ Tag* _tmp24_;
+ MediaSource* _tmp25_;
+ gint _tmp26_;
#line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp20_ = _ms_it;
#line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20442,7 +20377,7 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
if (!_tmp21_) {
#line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 20446 "Commands.c"
+#line 20381 "Commands.c"
}
#line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp22_ = _ms_it;
@@ -20458,11 +20393,11 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
_tmp26_ = tag_get_attachment_count (_tmp24_, _tmp25_);
#line 2283 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp26_ < 2) {
-#line 20462 "Commands.c"
- Tag* _tmp27_ = NULL;
- MediaSource* _tmp28_ = NULL;
- GeeList* _tmp29_ = NULL;
- GeeList* _tmp30_ = NULL;
+#line 20397 "Commands.c"
+ Tag* _tmp27_;
+ MediaSource* _tmp28_;
+ GeeList* _tmp29_;
+ GeeList* _tmp30_;
#line 2285 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp27_ = t;
#line 2285 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20473,35 +20408,35 @@ static void tag_untag_photos_command_do_detach (TagUntagPhotosCommand* self, Tag
_tmp30_ = _tmp29_;
#line 2285 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_tmp30_);
-#line 20477 "Commands.c"
+#line 20412 "Commands.c"
}
#line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (ms);
-#line 20481 "Commands.c"
+#line 20416 "Commands.c"
}
#line 2281 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_ms_it);
-#line 20485 "Commands.c"
+#line 20420 "Commands.c"
}
#line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (t);
-#line 20489 "Commands.c"
+#line 20424 "Commands.c"
}
#line 2280 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_t_list);
-#line 20493 "Commands.c"
+#line 20428 "Commands.c"
}
}
}
static void tag_untag_photos_command_on_source_destroyed (TagUntagPhotosCommand* self, DataSource* source) {
- DataSource* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- GeeCollection* _tmp3_ = NULL;
- DataSource* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
+ DataSource* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
+ GeeCollection* _tmp3_;
+ DataSource* _tmp4_;
+ gboolean _tmp5_;
#line 2292 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_TAG_UNTAG_PHOTOS_COMMAND (self));
#line 2292 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20524,9 +20459,9 @@ static void tag_untag_photos_command_on_source_destroyed (TagUntagPhotosCommand*
_tmp5_ = gee_collection_contains (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
#line 2294 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp5_) {
-#line 20528 "Commands.c"
- CommandManager* _tmp6_ = NULL;
- CommandManager* _tmp7_ = NULL;
+#line 20463 "Commands.c"
+ CommandManager* _tmp6_;
+ CommandManager* _tmp7_;
#line 2295 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command));
#line 2295 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20535,7 +20470,7 @@ static void tag_untag_photos_command_on_source_destroyed (TagUntagPhotosCommand*
command_manager_reset (_tmp7_);
#line 2295 "/home/jens/Source/shotwell/src/Commands.vala"
_command_manager_unref0 (_tmp7_);
-#line 20539 "Commands.c"
+#line 20474 "Commands.c"
}
}
@@ -20546,12 +20481,12 @@ static void tag_untag_photos_command_class_init (TagUntagPhotosCommandClass * kl
#line 2206 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (TagUntagPhotosCommandPrivate));
#line 2206 "/home/jens/Source/shotwell/src/Commands.vala"
- ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) tag_untag_photos_command_real_execute_on_source;
+ ((SimpleProxyableCommandClass *) klass)->execute_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) tag_untag_photos_command_real_execute_on_source;
#line 2206 "/home/jens/Source/shotwell/src/Commands.vala"
- ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*)(SimpleProxyableCommand*, DataSource*)) tag_untag_photos_command_real_undo_on_source;
+ ((SimpleProxyableCommandClass *) klass)->undo_on_source = (void (*) (SimpleProxyableCommand *, DataSource*)) tag_untag_photos_command_real_undo_on_source;
#line 2206 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = tag_untag_photos_command_finalize;
-#line 20555 "Commands.c"
+#line 20490 "Commands.c"
}
@@ -20562,16 +20497,16 @@ static void tag_untag_photos_command_instance_init (TagUntagPhotosCommand * self
self->priv->detached_from = NULL;
#line 2210 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->attached_to = NULL;
-#line 20566 "Commands.c"
+#line 20501 "Commands.c"
}
-static void tag_untag_photos_command_finalize (GObject* obj) {
+static void tag_untag_photos_command_finalize (GObject * obj) {
TagUntagPhotosCommand * self;
- LibraryPhotoSourceCollection* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- VideoSourceCollection* _tmp2_ = NULL;
- guint _tmp3_ = 0U;
+ LibraryPhotoSourceCollection* _tmp0_;
+ guint _tmp1_;
+ VideoSourceCollection* _tmp2_;
+ guint _tmp3_;
#line 2206 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TAG_UNTAG_PHOTOS_COMMAND, TagUntagPhotosCommand);
#line 2226 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20594,7 +20529,7 @@ static void tag_untag_photos_command_finalize (GObject* obj) {
_g_object_unref0 (self->priv->attached_to);
#line 2206 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (tag_untag_photos_command_parent_class)->finalize (obj);
-#line 20598 "Commands.c"
+#line 20533 "Commands.c"
}
@@ -20612,22 +20547,22 @@ GType tag_untag_photos_command_get_type (void) {
RenameSavedSearchCommand* rename_saved_search_command_construct (GType object_type, SavedSearch* search, const gchar* new_name) {
RenameSavedSearchCommand * self = NULL;
- SavedSearch* _tmp0_ = NULL;
- SavedSearch* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- SavedSearch* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- gchar* _tmp9_ = NULL;
- SavedSearch* _tmp10_ = NULL;
- SavedSearch* _tmp11_ = NULL;
- SavedSearch* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
- gchar* _tmp15_ = NULL;
+ SavedSearch* _tmp0_;
+ SavedSearch* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
+ gchar* _tmp6_;
+ SavedSearch* _tmp7_;
+ gchar* _tmp8_;
+ gchar* _tmp9_;
+ SavedSearch* _tmp10_;
+ SavedSearch* _tmp11_;
+ SavedSearch* _tmp12_;
+ gchar* _tmp13_;
+ const gchar* _tmp14_;
+ gchar* _tmp15_;
#line 2304 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
#line 2304 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20686,22 +20621,22 @@ RenameSavedSearchCommand* rename_saved_search_command_construct (GType object_ty
self->priv->new_name = _tmp15_;
#line 2304 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 20690 "Commands.c"
+#line 20625 "Commands.c"
}
RenameSavedSearchCommand* rename_saved_search_command_new (SavedSearch* search, const gchar* new_name) {
#line 2304 "/home/jens/Source/shotwell/src/Commands.vala"
return rename_saved_search_command_construct (TYPE_RENAME_SAVED_SEARCH_COMMAND, search, new_name);
-#line 20697 "Commands.c"
+#line 20632 "Commands.c"
}
static void rename_saved_search_command_real_execute (Command* base) {
RenameSavedSearchCommand * self;
- SavedSearch* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ SavedSearch* _tmp0_;
+ const gchar* _tmp1_;
+ gboolean _tmp2_;
#line 2312 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RENAME_SAVED_SEARCH_COMMAND, RenameSavedSearchCommand);
#line 2313 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20712,10 +20647,10 @@ static void rename_saved_search_command_real_execute (Command* base) {
_tmp2_ = saved_search_rename (_tmp0_, _tmp1_);
#line 2313 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp2_) {
-#line 20716 "Commands.c"
- const gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+#line 20651 "Commands.c"
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
#line 2314 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = self->priv->new_name;
#line 2314 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20726,16 +20661,16 @@ static void rename_saved_search_command_real_execute (Command* base) {
app_window_error_message (_tmp5_, NULL);
#line 2314 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (_tmp5_);
-#line 20730 "Commands.c"
+#line 20665 "Commands.c"
}
}
static void rename_saved_search_command_real_undo (Command* base) {
RenameSavedSearchCommand * self;
- SavedSearch* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
- gboolean _tmp2_ = FALSE;
+ SavedSearch* _tmp0_;
+ const gchar* _tmp1_;
+ gboolean _tmp2_;
#line 2317 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RENAME_SAVED_SEARCH_COMMAND, RenameSavedSearchCommand);
#line 2318 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20746,10 +20681,10 @@ static void rename_saved_search_command_real_undo (Command* base) {
_tmp2_ = saved_search_rename (_tmp0_, _tmp1_);
#line 2318 "/home/jens/Source/shotwell/src/Commands.vala"
if (!_tmp2_) {
-#line 20750 "Commands.c"
- const gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
+#line 20685 "Commands.c"
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
#line 2319 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = self->priv->old_name;
#line 2319 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20760,7 +20695,7 @@ static void rename_saved_search_command_real_undo (Command* base) {
app_window_error_message (_tmp5_, NULL);
#line 2319 "/home/jens/Source/shotwell/src/Commands.vala"
_g_free0 (_tmp5_);
-#line 20764 "Commands.c"
+#line 20699 "Commands.c"
}
}
@@ -20771,23 +20706,23 @@ static void rename_saved_search_command_class_init (RenameSavedSearchCommandClas
#line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (RenameSavedSearchCommandPrivate));
#line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) rename_saved_search_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) rename_saved_search_command_real_execute;
#line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) rename_saved_search_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) rename_saved_search_command_real_undo;
#line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = rename_saved_search_command_finalize;
-#line 20780 "Commands.c"
+#line 20715 "Commands.c"
}
static void rename_saved_search_command_instance_init (RenameSavedSearchCommand * self) {
#line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = RENAME_SAVED_SEARCH_COMMAND_GET_PRIVATE (self);
-#line 20787 "Commands.c"
+#line 20722 "Commands.c"
}
-static void rename_saved_search_command_finalize (GObject* obj) {
+static void rename_saved_search_command_finalize (GObject * obj) {
RenameSavedSearchCommand * self;
#line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RENAME_SAVED_SEARCH_COMMAND, RenameSavedSearchCommand);
@@ -20799,7 +20734,7 @@ static void rename_saved_search_command_finalize (GObject* obj) {
_g_free0 (self->priv->new_name);
#line 2299 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (rename_saved_search_command_parent_class)->finalize (obj);
-#line 20803 "Commands.c"
+#line 20738 "Commands.c"
}
@@ -20817,17 +20752,17 @@ GType rename_saved_search_command_get_type (void) {
DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_type, SavedSearch* search) {
DeleteSavedSearchCommand * self = NULL;
- SavedSearch* _tmp0_ = NULL;
- SavedSearch* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- SavedSearch* _tmp6_ = NULL;
- gchar* _tmp7_ = NULL;
- gchar* _tmp8_ = NULL;
- SavedSearch* _tmp9_ = NULL;
- SavedSearch* _tmp10_ = NULL;
+ SavedSearch* _tmp0_;
+ SavedSearch* _tmp1_;
+ gchar* _tmp2_;
+ gchar* _tmp3_;
+ gchar* _tmp4_;
+ gchar* _tmp5_;
+ SavedSearch* _tmp6_;
+ gchar* _tmp7_;
+ gchar* _tmp8_;
+ SavedSearch* _tmp9_;
+ SavedSearch* _tmp10_;
#line 2326 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
#line 2327 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20866,22 +20801,22 @@ DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_ty
self->priv->search = _tmp10_;
#line 2326 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 20870 "Commands.c"
+#line 20805 "Commands.c"
}
DeleteSavedSearchCommand* delete_saved_search_command_new (SavedSearch* search) {
#line 2326 "/home/jens/Source/shotwell/src/Commands.vala"
return delete_saved_search_command_construct (TYPE_DELETE_SAVED_SEARCH_COMMAND, search);
-#line 20877 "Commands.c"
+#line 20812 "Commands.c"
}
static void delete_saved_search_command_real_execute (Command* base) {
DeleteSavedSearchCommand * self;
- SavedSearchTable* _tmp0_ = NULL;
- SavedSearchTable* _tmp1_ = NULL;
- SavedSearch* _tmp2_ = NULL;
+ SavedSearchTable* _tmp0_;
+ SavedSearchTable* _tmp1_;
+ SavedSearch* _tmp2_;
#line 2332 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DELETE_SAVED_SEARCH_COMMAND, DeleteSavedSearchCommand);
#line 2333 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -20894,20 +20829,20 @@ static void delete_saved_search_command_real_execute (Command* base) {
saved_search_table_remove (_tmp1_, _tmp2_);
#line 2333 "/home/jens/Source/shotwell/src/Commands.vala"
_saved_search_table_unref0 (_tmp1_);
-#line 20898 "Commands.c"
+#line 20833 "Commands.c"
}
static void delete_saved_search_command_real_undo (Command* base) {
DeleteSavedSearchCommand * self;
- SavedSearch* _tmp0_ = NULL;
+ SavedSearch* _tmp0_;
#line 2336 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DELETE_SAVED_SEARCH_COMMAND, DeleteSavedSearchCommand);
#line 2337 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = self->priv->search;
#line 2337 "/home/jens/Source/shotwell/src/Commands.vala"
saved_search_reconstitute (_tmp0_);
-#line 20911 "Commands.c"
+#line 20846 "Commands.c"
}
@@ -20917,23 +20852,23 @@ static void delete_saved_search_command_class_init (DeleteSavedSearchCommandClas
#line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (DeleteSavedSearchCommandPrivate));
#line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) delete_saved_search_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) delete_saved_search_command_real_execute;
#line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) delete_saved_search_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) delete_saved_search_command_real_undo;
#line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = delete_saved_search_command_finalize;
-#line 20926 "Commands.c"
+#line 20861 "Commands.c"
}
static void delete_saved_search_command_instance_init (DeleteSavedSearchCommand * self) {
#line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = DELETE_SAVED_SEARCH_COMMAND_GET_PRIVATE (self);
-#line 20933 "Commands.c"
+#line 20868 "Commands.c"
}
-static void delete_saved_search_command_finalize (GObject* obj) {
+static void delete_saved_search_command_finalize (GObject * obj) {
DeleteSavedSearchCommand * self;
#line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DELETE_SAVED_SEARCH_COMMAND, DeleteSavedSearchCommand);
@@ -20941,7 +20876,7 @@ static void delete_saved_search_command_finalize (GObject* obj) {
_g_object_unref0 (self->priv->search);
#line 2323 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (delete_saved_search_command_parent_class)->finalize (obj);
-#line 20945 "Commands.c"
+#line 20880 "Commands.c"
}
@@ -20960,113 +20895,99 @@ GType delete_saved_search_command_get_type (void) {
static void _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
#line 2358 "/home/jens/Source/shotwell/src/Commands.vala"
trash_untrash_photos_command_on_photo_destroyed ((TrashUntrashPhotosCommand*) self, source);
-#line 20964 "Commands.c"
+#line 20899 "Commands.c"
}
TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type, GeeCollection* sources, gboolean to_trash) {
TrashUntrashPhotosCommand * self = NULL;
const gchar* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- const gchar* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- GeeCollection* _tmp8_ = NULL;
- GeeCollection* _tmp9_ = NULL;
- gboolean _tmp10_ = FALSE;
- LibraryPhotoSourceCollection* _tmp11_ = NULL;
- VideoSourceCollection* _tmp12_ = NULL;
+ gboolean _tmp1_;
+ const gchar* _tmp2_ = NULL;
+ gboolean _tmp3_;
+ GeeCollection* _tmp4_;
+ GeeCollection* _tmp5_;
+ gboolean _tmp6_;
+ LibraryPhotoSourceCollection* _tmp7_;
+ VideoSourceCollection* _tmp8_;
#line 2345 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (sources), NULL);
#line 2347 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = to_trash;
#line 2347 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp1_) {
-#line 20985 "Commands.c"
- const gchar* _tmp2_ = NULL;
#line 2347 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp2_ = _ ("Move Photos to Trash");
-#line 2347 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp0_ = _tmp2_;
-#line 20991 "Commands.c"
+ _tmp0_ = _ ("Move Photos to Trash");
+#line 20922 "Commands.c"
} else {
- const gchar* _tmp3_ = NULL;
-#line 2347 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp3_ = _ ("Restore Photos from Trash");
#line 2347 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp0_ = _tmp3_;
-#line 20998 "Commands.c"
+ _tmp0_ = _ ("Restore Photos from Trash");
+#line 20926 "Commands.c"
}
#line 2348 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp5_ = to_trash;
+ _tmp3_ = to_trash;
#line 2348 "/home/jens/Source/shotwell/src/Commands.vala"
- if (_tmp5_) {
-#line 21004 "Commands.c"
- const gchar* _tmp6_ = NULL;
-#line 2348 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp6_ = _ ("Move the photos to the Shotwell trash");
+ if (_tmp3_) {
#line 2348 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp4_ = _tmp6_;
-#line 21010 "Commands.c"
+ _tmp2_ = _ ("Move the photos to the Shotwell trash");
+#line 20934 "Commands.c"
} else {
- const gchar* _tmp7_ = NULL;
-#line 2348 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp7_ = _ ("Restore the photos back to the Shotwell library");
#line 2348 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp4_ = _tmp7_;
-#line 21017 "Commands.c"
+ _tmp2_ = _ ("Restore the photos back to the Shotwell library");
+#line 20938 "Commands.c"
}
#line 2346 "/home/jens/Source/shotwell/src/Commands.vala"
- self = (TrashUntrashPhotosCommand*) page_command_construct (object_type, _tmp0_, _tmp4_);
+ self = (TrashUntrashPhotosCommand*) page_command_construct (object_type, _tmp0_, _tmp2_);
#line 2350 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp8_ = sources;
+ _tmp4_ = sources;
#line 2350 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp9_ = _g_object_ref0 (_tmp8_);
+ _tmp5_ = _g_object_ref0 (_tmp4_);
#line 2350 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (self->priv->sources);
#line 2350 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->sources = _tmp9_;
+ self->priv->sources = _tmp5_;
#line 2351 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp10_ = to_trash;
+ _tmp6_ = to_trash;
#line 2351 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->to_trash = _tmp10_;
+ self->priv->to_trash = _tmp6_;
#line 2353 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp11_ = library_photo_global;
+ _tmp7_ = library_photo_global;
#line 2353 "/home/jens/Source/shotwell/src/Commands.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
#line 2354 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp12_ = video_global;
+ _tmp8_ = video_global;
#line 2354 "/home/jens/Source/shotwell/src/Commands.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _trash_untrash_photos_command_on_photo_destroyed_source_collection_item_destroyed, self, 0);
#line 2345 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 21043 "Commands.c"
+#line 20964 "Commands.c"
}
TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, gboolean to_trash) {
#line 2345 "/home/jens/Source/shotwell/src/Commands.vala"
return trash_untrash_photos_command_construct (TYPE_TRASH_UNTRASH_PHOTOS_COMMAND, sources, to_trash);
-#line 21050 "Commands.c"
+#line 20971 "Commands.c"
}
static ProgressDialog* trash_untrash_photos_command_get_progress_dialog (TrashUntrashPhotosCommand* self, gboolean to_trash) {
ProgressDialog* result = NULL;
- GeeCollection* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
+ GeeCollection* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
const gchar* _tmp3_ = NULL;
- gboolean _tmp4_ = FALSE;
+ gboolean _tmp4_;
ProgressDialog* dialog = NULL;
- AppWindow* _tmp7_ = NULL;
- AppWindow* _tmp8_ = NULL;
- ProgressDialog* _tmp9_ = NULL;
- ProgressDialog* _tmp10_ = NULL;
- ProgressDialog* _tmp11_ = NULL;
- GeeCollection* _tmp12_ = NULL;
- gint _tmp13_ = 0;
- gint _tmp14_ = 0;
- gint _tmp15_ = 0;
+ AppWindow* _tmp5_;
+ AppWindow* _tmp6_;
+ ProgressDialog* _tmp7_;
+ ProgressDialog* _tmp8_;
+ ProgressDialog* _tmp9_;
+ GeeCollection* _tmp10_;
+ gint _tmp11_;
+ gint _tmp12_;
+ gint _tmp13_;
#line 2362 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (IS_TRASH_UNTRASH_PHOTOS_COMMAND (self), NULL);
#line 2363 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21081,58 +21002,51 @@ static ProgressDialog* trash_untrash_photos_command_get_progress_dialog (TrashUn
result = NULL;
#line 2364 "/home/jens/Source/shotwell/src/Commands.vala"
return result;
-#line 21085 "Commands.c"
+#line 21006 "Commands.c"
}
#line 2367 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = to_trash;
#line 2367 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp4_) {
-#line 21091 "Commands.c"
- const gchar* _tmp5_ = NULL;
#line 2367 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp5_ = _ ("Moving Photos to Trash");
-#line 2367 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp3_ = _tmp5_;
-#line 21097 "Commands.c"
+ _tmp3_ = _ ("Moving Photos to Trash");
+#line 21014 "Commands.c"
} else {
- const gchar* _tmp6_ = NULL;
-#line 2367 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp6_ = _ ("Restoring Photos From Trash");
#line 2367 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp3_ = _tmp6_;
-#line 21104 "Commands.c"
+ _tmp3_ = _ ("Restoring Photos From Trash");
+#line 21018 "Commands.c"
}
#line 2366 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp7_ = app_window_get_instance ();
+ _tmp5_ = app_window_get_instance ();
#line 2366 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp8_ = _tmp7_;
+ _tmp6_ = _tmp5_;
#line 2366 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp9_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), _tmp3_, NULL);
+ _tmp7_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp3_, NULL);
#line 2366 "/home/jens/Source/shotwell/src/Commands.vala"
- g_object_ref_sink (_tmp9_);
+ g_object_ref_sink (_tmp7_);
#line 2366 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp10_ = _tmp9_;
+ _tmp8_ = _tmp7_;
#line 2366 "/home/jens/Source/shotwell/src/Commands.vala"
- _g_object_unref0 (_tmp8_);
+ _g_object_unref0 (_tmp6_);
#line 2366 "/home/jens/Source/shotwell/src/Commands.vala"
- dialog = _tmp10_;
+ dialog = _tmp8_;
#line 2368 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp11_ = dialog;
+ _tmp9_ = dialog;
#line 2368 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp12_ = self->priv->sources;
+ _tmp10_ = self->priv->sources;
#line 2368 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp13_ = gee_collection_get_size (_tmp12_);
+ _tmp11_ = gee_collection_get_size (_tmp10_);
#line 2368 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp14_ = _tmp13_;
+ _tmp12_ = _tmp11_;
#line 2368 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp15_ = CLAMP (_tmp14_ / 5, 2, 10);
+ _tmp13_ = CLAMP (_tmp12_ / 5, 2, 10);
#line 2368 "/home/jens/Source/shotwell/src/Commands.vala"
- progress_dialog_update_display_every (_tmp11_, _tmp15_);
+ progress_dialog_update_display_every (_tmp9_, _tmp13_);
#line 2370 "/home/jens/Source/shotwell/src/Commands.vala"
result = dialog;
#line 2370 "/home/jens/Source/shotwell/src/Commands.vala"
return result;
-#line 21136 "Commands.c"
+#line 21050 "Commands.c"
}
@@ -21141,21 +21055,21 @@ static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guin
result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
#line 2378 "/home/jens/Source/shotwell/src/Commands.vala"
return result;
-#line 21145 "Commands.c"
+#line 21059 "Commands.c"
}
static void trash_untrash_photos_command_real_execute (Command* base) {
TrashUntrashPhotosCommand * self;
ProgressDialog* dialog = NULL;
- gboolean _tmp0_ = FALSE;
- ProgressDialog* _tmp1_ = NULL;
+ gboolean _tmp0_;
+ ProgressDialog* _tmp1_;
ProgressMonitor monitor = NULL;
- void* monitor_target = NULL;
- GDestroyNotify monitor_target_destroy_notify = NULL;
- ProgressDialog* _tmp2_ = NULL;
- gboolean _tmp4_ = FALSE;
- ProgressDialog* _tmp7_ = NULL;
+ void* monitor_target;
+ GDestroyNotify monitor_target_destroy_notify;
+ ProgressDialog* _tmp2_;
+ gboolean _tmp4_;
+ ProgressDialog* _tmp7_;
#line 2373 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_UNTRASH_PHOTOS_COMMAND, TrashUntrashPhotosCommand);
#line 2374 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21174,8 +21088,8 @@ static void trash_untrash_photos_command_real_execute (Command* base) {
_tmp2_ = dialog;
#line 2377 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp2_ != NULL) {
-#line 21178 "Commands.c"
- ProgressDialog* _tmp3_ = NULL;
+#line 21092 "Commands.c"
+ ProgressDialog* _tmp3_;
#line 2378 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = dialog;
#line 2378 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21192,44 +21106,44 @@ static void trash_untrash_photos_command_real_execute (Command* base) {
monitor_target = g_object_ref (_tmp3_);
#line 2378 "/home/jens/Source/shotwell/src/Commands.vala"
monitor_target_destroy_notify = g_object_unref;
-#line 21196 "Commands.c"
+#line 21110 "Commands.c"
}
#line 2380 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = self->priv->to_trash;
#line 2380 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp4_) {
-#line 21202 "Commands.c"
- ProgressMonitor _tmp5_ = NULL;
- void* _tmp5__target = NULL;
+#line 21116 "Commands.c"
+ ProgressMonitor _tmp5_;
+ void* _tmp5__target;
#line 2381 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = monitor;
#line 2381 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5__target = monitor_target;
#line 2381 "/home/jens/Source/shotwell/src/Commands.vala"
trash_untrash_photos_command_trash (self, _tmp5_, _tmp5__target);
-#line 21211 "Commands.c"
+#line 21125 "Commands.c"
} else {
- ProgressMonitor _tmp6_ = NULL;
- void* _tmp6__target = NULL;
+ ProgressMonitor _tmp6_;
+ void* _tmp6__target;
#line 2383 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = monitor;
#line 2383 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6__target = monitor_target;
#line 2383 "/home/jens/Source/shotwell/src/Commands.vala"
trash_untrash_photos_command_untrash (self, _tmp6_, _tmp6__target);
-#line 21221 "Commands.c"
+#line 21135 "Commands.c"
}
#line 2385 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = dialog;
#line 2385 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp7_ != NULL) {
-#line 21227 "Commands.c"
- ProgressDialog* _tmp8_ = NULL;
+#line 21141 "Commands.c"
+ ProgressDialog* _tmp8_;
#line 2386 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp8_ = dialog;
#line 2386 "/home/jens/Source/shotwell/src/Commands.vala"
progress_dialog_close (_tmp8_);
-#line 21233 "Commands.c"
+#line 21147 "Commands.c"
}
#line 2373 "/home/jens/Source/shotwell/src/Commands.vala"
(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
@@ -21241,21 +21155,21 @@ static void trash_untrash_photos_command_real_execute (Command* base) {
monitor_target_destroy_notify = NULL;
#line 2373 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (dialog);
-#line 21245 "Commands.c"
+#line 21159 "Commands.c"
}
static void trash_untrash_photos_command_real_undo (Command* base) {
TrashUntrashPhotosCommand * self;
ProgressDialog* dialog = NULL;
- gboolean _tmp0_ = FALSE;
- ProgressDialog* _tmp1_ = NULL;
+ gboolean _tmp0_;
+ ProgressDialog* _tmp1_;
ProgressMonitor monitor = NULL;
- void* monitor_target = NULL;
- GDestroyNotify monitor_target_destroy_notify = NULL;
- ProgressDialog* _tmp2_ = NULL;
- gboolean _tmp4_ = FALSE;
- ProgressDialog* _tmp7_ = NULL;
+ void* monitor_target;
+ GDestroyNotify monitor_target_destroy_notify;
+ ProgressDialog* _tmp2_;
+ gboolean _tmp4_;
+ ProgressDialog* _tmp7_;
#line 2389 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_UNTRASH_PHOTOS_COMMAND, TrashUntrashPhotosCommand);
#line 2390 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21274,8 +21188,8 @@ static void trash_untrash_photos_command_real_undo (Command* base) {
_tmp2_ = dialog;
#line 2393 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp2_ != NULL) {
-#line 21278 "Commands.c"
- ProgressDialog* _tmp3_ = NULL;
+#line 21192 "Commands.c"
+ ProgressDialog* _tmp3_;
#line 2394 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = dialog;
#line 2394 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21292,44 +21206,44 @@ static void trash_untrash_photos_command_real_undo (Command* base) {
monitor_target = g_object_ref (_tmp3_);
#line 2394 "/home/jens/Source/shotwell/src/Commands.vala"
monitor_target_destroy_notify = g_object_unref;
-#line 21296 "Commands.c"
+#line 21210 "Commands.c"
}
#line 2396 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = self->priv->to_trash;
#line 2396 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp4_) {
-#line 21302 "Commands.c"
- ProgressMonitor _tmp5_ = NULL;
- void* _tmp5__target = NULL;
+#line 21216 "Commands.c"
+ ProgressMonitor _tmp5_;
+ void* _tmp5__target;
#line 2397 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = monitor;
#line 2397 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5__target = monitor_target;
#line 2397 "/home/jens/Source/shotwell/src/Commands.vala"
trash_untrash_photos_command_untrash (self, _tmp5_, _tmp5__target);
-#line 21311 "Commands.c"
+#line 21225 "Commands.c"
} else {
- ProgressMonitor _tmp6_ = NULL;
- void* _tmp6__target = NULL;
+ ProgressMonitor _tmp6_;
+ void* _tmp6__target;
#line 2399 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6_ = monitor;
#line 2399 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp6__target = monitor_target;
#line 2399 "/home/jens/Source/shotwell/src/Commands.vala"
trash_untrash_photos_command_trash (self, _tmp6_, _tmp6__target);
-#line 21321 "Commands.c"
+#line 21235 "Commands.c"
}
#line 2401 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp7_ = dialog;
#line 2401 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp7_ != NULL) {
-#line 21327 "Commands.c"
- ProgressDialog* _tmp8_ = NULL;
+#line 21241 "Commands.c"
+ ProgressDialog* _tmp8_;
#line 2402 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp8_ = dialog;
#line 2402 "/home/jens/Source/shotwell/src/Commands.vala"
progress_dialog_close (_tmp8_);
-#line 21333 "Commands.c"
+#line 21247 "Commands.c"
}
#line 2389 "/home/jens/Source/shotwell/src/Commands.vala"
(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
@@ -21341,28 +21255,28 @@ static void trash_untrash_photos_command_real_undo (Command* base) {
monitor_target_destroy_notify = NULL;
#line 2389 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (dialog);
-#line 21345 "Commands.c"
+#line 21259 "Commands.c"
}
static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self, ProgressMonitor monitor, void* monitor_target) {
gint ctr = 0;
gint count = 0;
- GeeCollection* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
- LibraryPhotoSourceCollection* _tmp3_ = NULL;
- TransactionController* _tmp4_ = NULL;
- TransactionController* _tmp5_ = NULL;
- VideoSourceCollection* _tmp6_ = NULL;
- TransactionController* _tmp7_ = NULL;
- TransactionController* _tmp8_ = NULL;
- LibraryPhotoSourceCollection* _tmp21_ = NULL;
- TransactionController* _tmp22_ = NULL;
- TransactionController* _tmp23_ = NULL;
- VideoSourceCollection* _tmp24_ = NULL;
- TransactionController* _tmp25_ = NULL;
- TransactionController* _tmp26_ = NULL;
+ GeeCollection* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
+ LibraryPhotoSourceCollection* _tmp3_;
+ TransactionController* _tmp4_;
+ TransactionController* _tmp5_;
+ VideoSourceCollection* _tmp6_;
+ TransactionController* _tmp7_;
+ TransactionController* _tmp8_;
+ LibraryPhotoSourceCollection* _tmp21_;
+ TransactionController* _tmp22_;
+ TransactionController* _tmp23_;
+ VideoSourceCollection* _tmp24_;
+ TransactionController* _tmp25_;
+ TransactionController* _tmp26_;
#line 2405 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_TRASH_UNTRASH_PHOTOS_COMMAND (self));
#line 2406 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21391,11 +21305,11 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
_tmp8_ = _tmp7_;
#line 2410 "/home/jens/Source/shotwell/src/Commands.vala"
transaction_controller_begin (_tmp8_);
-#line 21395 "Commands.c"
+#line 21309 "Commands.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp9_ = NULL;
- GeeIterator* _tmp10_ = NULL;
+ GeeCollection* _tmp9_;
+ GeeIterator* _tmp10_;
#line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp9_ = self->priv->sources;
#line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21404,15 +21318,15 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
_source_it = _tmp10_;
#line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 21408 "Commands.c"
- GeeIterator* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
+#line 21322 "Commands.c"
+ GeeIterator* _tmp11_;
+ gboolean _tmp12_;
MediaSource* source = NULL;
- GeeIterator* _tmp13_ = NULL;
- gpointer _tmp14_ = NULL;
- MediaSource* _tmp15_ = NULL;
- ProgressMonitor _tmp16_ = NULL;
- void* _tmp16__target = NULL;
+ GeeIterator* _tmp13_;
+ gpointer _tmp14_;
+ MediaSource* _tmp15_;
+ ProgressMonitor _tmp16_;
+ void* _tmp16__target;
#line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp11_ = _source_it;
#line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21421,7 +21335,7 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
if (!_tmp12_) {
#line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 21425 "Commands.c"
+#line 21339 "Commands.c"
}
#line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp13_ = _source_it;
@@ -21439,12 +21353,12 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
_tmp16__target = monitor_target;
#line 2414 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp16_ != NULL) {
-#line 21443 "Commands.c"
- ProgressMonitor _tmp17_ = NULL;
- void* _tmp17__target = NULL;
- gint _tmp18_ = 0;
- gint _tmp19_ = 0;
- gint _tmp20_ = 0;
+#line 21357 "Commands.c"
+ ProgressMonitor _tmp17_;
+ void* _tmp17__target;
+ gint _tmp18_;
+ gint _tmp19_;
+ gint _tmp20_;
#line 2415 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp17_ = monitor;
#line 2415 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21459,15 +21373,15 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
_tmp20_ = count;
#line 2415 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp17_ ((guint64) _tmp19_, (guint64) _tmp20_, TRUE, _tmp17__target);
-#line 21463 "Commands.c"
+#line 21377 "Commands.c"
}
#line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (source);
-#line 21467 "Commands.c"
+#line 21381 "Commands.c"
}
#line 2412 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_source_it);
-#line 21471 "Commands.c"
+#line 21385 "Commands.c"
}
#line 2418 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp21_ = library_photo_global;
@@ -21485,28 +21399,28 @@ static void trash_untrash_photos_command_trash (TrashUntrashPhotosCommand* self,
_tmp26_ = _tmp25_;
#line 2419 "/home/jens/Source/shotwell/src/Commands.vala"
transaction_controller_commit (_tmp26_);
-#line 21489 "Commands.c"
+#line 21403 "Commands.c"
}
static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* self, ProgressMonitor monitor, void* monitor_target) {
gint ctr = 0;
gint count = 0;
- GeeCollection* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
- LibraryPhotoSourceCollection* _tmp3_ = NULL;
- TransactionController* _tmp4_ = NULL;
- TransactionController* _tmp5_ = NULL;
- VideoSourceCollection* _tmp6_ = NULL;
- TransactionController* _tmp7_ = NULL;
- TransactionController* _tmp8_ = NULL;
- LibraryPhotoSourceCollection* _tmp21_ = NULL;
- TransactionController* _tmp22_ = NULL;
- TransactionController* _tmp23_ = NULL;
- VideoSourceCollection* _tmp24_ = NULL;
- TransactionController* _tmp25_ = NULL;
- TransactionController* _tmp26_ = NULL;
+ GeeCollection* _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
+ LibraryPhotoSourceCollection* _tmp3_;
+ TransactionController* _tmp4_;
+ TransactionController* _tmp5_;
+ VideoSourceCollection* _tmp6_;
+ TransactionController* _tmp7_;
+ TransactionController* _tmp8_;
+ LibraryPhotoSourceCollection* _tmp21_;
+ TransactionController* _tmp22_;
+ TransactionController* _tmp23_;
+ VideoSourceCollection* _tmp24_;
+ TransactionController* _tmp25_;
+ TransactionController* _tmp26_;
#line 2422 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_TRASH_UNTRASH_PHOTOS_COMMAND (self));
#line 2423 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21535,11 +21449,11 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
_tmp8_ = _tmp7_;
#line 2427 "/home/jens/Source/shotwell/src/Commands.vala"
transaction_controller_begin (_tmp8_);
-#line 21539 "Commands.c"
+#line 21453 "Commands.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp9_ = NULL;
- GeeIterator* _tmp10_ = NULL;
+ GeeCollection* _tmp9_;
+ GeeIterator* _tmp10_;
#line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp9_ = self->priv->sources;
#line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21548,15 +21462,15 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
_source_it = _tmp10_;
#line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 21552 "Commands.c"
- GeeIterator* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
+#line 21466 "Commands.c"
+ GeeIterator* _tmp11_;
+ gboolean _tmp12_;
MediaSource* source = NULL;
- GeeIterator* _tmp13_ = NULL;
- gpointer _tmp14_ = NULL;
- MediaSource* _tmp15_ = NULL;
- ProgressMonitor _tmp16_ = NULL;
- void* _tmp16__target = NULL;
+ GeeIterator* _tmp13_;
+ gpointer _tmp14_;
+ MediaSource* _tmp15_;
+ ProgressMonitor _tmp16_;
+ void* _tmp16__target;
#line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp11_ = _source_it;
#line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21565,7 +21479,7 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
if (!_tmp12_) {
#line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 21569 "Commands.c"
+#line 21483 "Commands.c"
}
#line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp13_ = _source_it;
@@ -21583,12 +21497,12 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
_tmp16__target = monitor_target;
#line 2431 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp16_ != NULL) {
-#line 21587 "Commands.c"
- ProgressMonitor _tmp17_ = NULL;
- void* _tmp17__target = NULL;
- gint _tmp18_ = 0;
- gint _tmp19_ = 0;
- gint _tmp20_ = 0;
+#line 21501 "Commands.c"
+ ProgressMonitor _tmp17_;
+ void* _tmp17__target;
+ gint _tmp18_;
+ gint _tmp19_;
+ gint _tmp20_;
#line 2432 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp17_ = monitor;
#line 2432 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21603,15 +21517,15 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
_tmp20_ = count;
#line 2432 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp17_ ((guint64) _tmp19_, (guint64) _tmp20_, TRUE, _tmp17__target);
-#line 21607 "Commands.c"
+#line 21521 "Commands.c"
}
#line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (source);
-#line 21611 "Commands.c"
+#line 21525 "Commands.c"
}
#line 2429 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_source_it);
-#line 21615 "Commands.c"
+#line 21529 "Commands.c"
}
#line 2435 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp21_ = library_photo_global;
@@ -21629,16 +21543,16 @@ static void trash_untrash_photos_command_untrash (TrashUntrashPhotosCommand* sel
_tmp26_ = _tmp25_;
#line 2436 "/home/jens/Source/shotwell/src/Commands.vala"
transaction_controller_commit (_tmp26_);
-#line 21633 "Commands.c"
+#line 21547 "Commands.c"
}
static void trash_untrash_photos_command_on_photo_destroyed (TrashUntrashPhotosCommand* self, DataSource* source) {
- GeeCollection* _tmp0_ = NULL;
- DataSource* _tmp1_ = NULL;
- GeeCollection* _tmp2_ = NULL;
- gint _tmp3_ = 0;
- gint _tmp4_ = 0;
+ GeeCollection* _tmp0_;
+ DataSource* _tmp1_;
+ GeeCollection* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
#line 2439 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_TRASH_UNTRASH_PHOTOS_COMMAND (self));
#line 2439 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21657,9 +21571,9 @@ static void trash_untrash_photos_command_on_photo_destroyed (TrashUntrashPhotosC
_tmp4_ = _tmp3_;
#line 2446 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp4_ == 0) {
-#line 21661 "Commands.c"
- CommandManager* _tmp5_ = NULL;
- CommandManager* _tmp6_ = NULL;
+#line 21575 "Commands.c"
+ CommandManager* _tmp5_;
+ CommandManager* _tmp6_;
#line 2447 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = command_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COMMAND, Command));
#line 2447 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21668,7 +21582,7 @@ static void trash_untrash_photos_command_on_photo_destroyed (TrashUntrashPhotosC
command_manager_reset (_tmp6_);
#line 2447 "/home/jens/Source/shotwell/src/Commands.vala"
_command_manager_unref0 (_tmp6_);
-#line 21672 "Commands.c"
+#line 21586 "Commands.c"
}
}
@@ -21679,28 +21593,28 @@ static void trash_untrash_photos_command_class_init (TrashUntrashPhotosCommandCl
#line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (TrashUntrashPhotosCommandPrivate));
#line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->execute = (void (*)(Command*)) trash_untrash_photos_command_real_execute;
+ ((CommandClass *) klass)->execute = (void (*) (Command *)) trash_untrash_photos_command_real_execute;
#line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
- ((CommandClass *) klass)->undo = (void (*)(Command*)) trash_untrash_photos_command_real_undo;
+ ((CommandClass *) klass)->undo = (void (*) (Command *)) trash_untrash_photos_command_real_undo;
#line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = trash_untrash_photos_command_finalize;
-#line 21688 "Commands.c"
+#line 21602 "Commands.c"
}
static void trash_untrash_photos_command_instance_init (TrashUntrashPhotosCommand * self) {
#line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv = TRASH_UNTRASH_PHOTOS_COMMAND_GET_PRIVATE (self);
-#line 21695 "Commands.c"
+#line 21609 "Commands.c"
}
-static void trash_untrash_photos_command_finalize (GObject* obj) {
+static void trash_untrash_photos_command_finalize (GObject * obj) {
TrashUntrashPhotosCommand * self;
- LibraryPhotoSourceCollection* _tmp0_ = NULL;
- guint _tmp1_ = 0U;
- VideoSourceCollection* _tmp2_ = NULL;
- guint _tmp3_ = 0U;
+ LibraryPhotoSourceCollection* _tmp0_;
+ guint _tmp1_;
+ VideoSourceCollection* _tmp2_;
+ guint _tmp3_;
#line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TRASH_UNTRASH_PHOTOS_COMMAND, TrashUntrashPhotosCommand);
#line 2358 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21719,7 +21633,7 @@ static void trash_untrash_photos_command_finalize (GObject* obj) {
_g_object_unref0 (self->priv->sources);
#line 2341 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (trash_untrash_photos_command_parent_class)->finalize (obj);
-#line 21723 "Commands.c"
+#line 21637 "Commands.c"
}
@@ -21738,122 +21652,115 @@ GType trash_untrash_photos_command_get_type (void) {
FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollection* sources, gboolean flag) {
FlagUnflagCommand * self = NULL;
const gchar* _tmp0_ = NULL;
- gboolean _tmp1_ = FALSE;
- const gchar* _tmp4_ = NULL;
- gboolean _tmp5_ = FALSE;
- GeeCollection* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
- GeeCollection* _tmp8_ = NULL;
- gint _tmp9_ = 0;
- gint _tmp10_ = 0;
+ gboolean _tmp1_;
+ const gchar* _tmp2_ = NULL;
+ gboolean _tmp3_;
+ GeeCollection* _tmp4_;
+ gboolean _tmp5_;
+ GeeCollection* _tmp6_;
+ gint _tmp7_;
+ gint _tmp8_;
#line 2461 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_val_if_fail (GEE_IS_COLLECTION (sources), NULL);
#line 2463 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp1_ = flag;
#line 2463 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp1_) {
-#line 21756 "Commands.c"
- const gchar* _tmp2_ = NULL;
-#line 2463 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp2_ = _ ("Flag");
#line 2463 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp0_ = _tmp2_;
-#line 21762 "Commands.c"
+ _tmp0_ = _ ("Flag");
+#line 21672 "Commands.c"
} else {
- const gchar* _tmp3_ = NULL;
-#line 2463 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp3_ = _ ("Unflag");
#line 2463 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp0_ = _tmp3_;
-#line 21769 "Commands.c"
+ _tmp0_ = _ ("Unflag");
+#line 21676 "Commands.c"
}
#line 2464 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp5_ = flag;
+ _tmp3_ = flag;
#line 2464 "/home/jens/Source/shotwell/src/Commands.vala"
- if (_tmp5_) {
+ if (_tmp3_) {
#line 2464 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp4_ = FLAG_UNFLAG_COMMAND_FLAG_SELECTED_STRING;
-#line 21777 "Commands.c"
+ _tmp2_ = FLAG_UNFLAG_COMMAND_FLAG_SELECTED_STRING;
+#line 21684 "Commands.c"
} else {
#line 2464 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp4_ = FLAG_UNFLAG_COMMAND_UNFLAG_SELECTED_STRING;
-#line 21781 "Commands.c"
+ _tmp2_ = FLAG_UNFLAG_COMMAND_UNFLAG_SELECTED_STRING;
+#line 21688 "Commands.c"
}
#line 2462 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp6_ = sources;
+ _tmp4_ = sources;
#line 2462 "/home/jens/Source/shotwell/src/Commands.vala"
- self = (FlagUnflagCommand*) multiple_data_source_at_once_command_construct (object_type, _tmp6_, _tmp0_, _tmp4_);
+ self = (FlagUnflagCommand*) multiple_data_source_at_once_command_construct (object_type, _tmp4_, _tmp0_, _tmp2_);
#line 2466 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp7_ = flag;
+ _tmp5_ = flag;
#line 2466 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->flag = _tmp7_;
+ self->priv->flag = _tmp5_;
#line 2468 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp8_ = sources;
+ _tmp6_ = sources;
#line 2468 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp9_ = gee_collection_get_size (_tmp8_);
+ _tmp7_ = gee_collection_get_size (_tmp6_);
#line 2468 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp10_ = _tmp9_;
+ _tmp8_ = _tmp7_;
#line 2468 "/home/jens/Source/shotwell/src/Commands.vala"
- if (_tmp10_ >= FLAG_UNFLAG_COMMAND_MIN_PROGRESS_BAR_THRESHOLD) {
-#line 21799 "Commands.c"
- const gchar* _tmp11_ = NULL;
- gboolean _tmp12_ = FALSE;
- ProgressDialog* _tmp13_ = NULL;
- ProgressDialog* _tmp14_ = NULL;
+ if (_tmp8_ >= FLAG_UNFLAG_COMMAND_MIN_PROGRESS_BAR_THRESHOLD) {
+#line 21706 "Commands.c"
+ const gchar* _tmp9_ = NULL;
+ gboolean _tmp10_;
+ ProgressDialog* _tmp11_;
+ ProgressDialog* _tmp12_;
#line 2470 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp12_ = flag;
+ _tmp10_ = flag;
#line 2470 "/home/jens/Source/shotwell/src/Commands.vala"
- if (_tmp12_) {
+ if (_tmp10_) {
#line 2470 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp11_ = FLAG_UNFLAG_COMMAND_FLAG_PROGRESS;
-#line 21810 "Commands.c"
+ _tmp9_ = FLAG_UNFLAG_COMMAND_FLAG_PROGRESS;
+#line 21717 "Commands.c"
} else {
#line 2470 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp11_ = FLAG_UNFLAG_COMMAND_UNFLAG_PROGRESS;
-#line 21814 "Commands.c"
+ _tmp9_ = FLAG_UNFLAG_COMMAND_UNFLAG_PROGRESS;
+#line 21721 "Commands.c"
}
#line 2469 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp13_ = progress_dialog_new (NULL, _tmp11_, NULL);
+ _tmp11_ = progress_dialog_new (NULL, _tmp9_, NULL);
#line 2469 "/home/jens/Source/shotwell/src/Commands.vala"
- g_object_ref_sink (_tmp13_);
+ g_object_ref_sink (_tmp11_);
#line 2469 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (self->priv->progress_dialog);
#line 2469 "/home/jens/Source/shotwell/src/Commands.vala"
- self->priv->progress_dialog = _tmp13_;
+ self->priv->progress_dialog = _tmp11_;
#line 2472 "/home/jens/Source/shotwell/src/Commands.vala"
- _tmp14_ = self->priv->progress_dialog;
+ _tmp12_ = self->priv->progress_dialog;
#line 2472 "/home/jens/Source/shotwell/src/Commands.vala"
- gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 21828 "Commands.c"
+ gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
+#line 21735 "Commands.c"
}
#line 2461 "/home/jens/Source/shotwell/src/Commands.vala"
return self;
-#line 21832 "Commands.c"
+#line 21739 "Commands.c"
}
FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources, gboolean flag) {
#line 2461 "/home/jens/Source/shotwell/src/Commands.vala"
return flag_unflag_command_construct (TYPE_FLAG_UNFLAG_COMMAND, sources, flag);
-#line 21839 "Commands.c"
+#line 21746 "Commands.c"
}
static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCommand* base, GeeCollection* sources) {
FlagUnflagCommand * self;
gint num_processed = 0;
- ProgressDialog* _tmp16_ = NULL;
+ ProgressDialog* _tmp16_;
#line 2476 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLAG_UNFLAG_COMMAND, FlagUnflagCommand);
#line 2476 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (GEE_IS_COLLECTION (sources));
#line 2477 "/home/jens/Source/shotwell/src/Commands.vala"
num_processed = 0;
-#line 21853 "Commands.c"
+#line 21760 "Commands.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeIterator* _tmp1_;
#line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = sources;
#line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21862,16 +21769,16 @@ static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCom
_source_it = _tmp1_;
#line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 21866 "Commands.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 21773 "Commands.c"
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataSource* source = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- DataSource* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
- gint _tmp8_ = 0;
- ProgressDialog* _tmp9_ = NULL;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ DataSource* _tmp6_;
+ gboolean _tmp7_;
+ gint _tmp8_;
+ ProgressDialog* _tmp9_;
#line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _source_it;
#line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21880,7 +21787,7 @@ static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCom
if (!_tmp3_) {
#line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 21884 "Commands.c"
+#line 21791 "Commands.c"
}
#line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = _source_it;
@@ -21902,13 +21809,13 @@ static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCom
_tmp9_ = self->priv->progress_dialog;
#line 2484 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp9_ != NULL) {
-#line 21906 "Commands.c"
- ProgressDialog* _tmp10_ = NULL;
- gint _tmp11_ = 0;
- GeeCollection* _tmp12_ = NULL;
- gint _tmp13_ = 0;
- gint _tmp14_ = 0;
- ProgressDialog* _tmp15_ = NULL;
+#line 21813 "Commands.c"
+ ProgressDialog* _tmp10_;
+ gint _tmp11_;
+ GeeCollection* _tmp12_;
+ gint _tmp13_;
+ gint _tmp14_;
+ ProgressDialog* _tmp15_;
#line 2485 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp10_ = self->priv->progress_dialog;
#line 2485 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21927,27 +21834,27 @@ static void flag_unflag_command_real_execute_on_all (MultipleDataSourceAtOnceCom
gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget));
#line 2487 "/home/jens/Source/shotwell/src/Commands.vala"
spin_event_loop ();
-#line 21931 "Commands.c"
+#line 21838 "Commands.c"
}
#line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (source);
-#line 21935 "Commands.c"
+#line 21842 "Commands.c"
}
#line 2479 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_source_it);
-#line 21939 "Commands.c"
+#line 21846 "Commands.c"
}
#line 2491 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp16_ = self->priv->progress_dialog;
#line 2491 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp16_ != NULL) {
-#line 21945 "Commands.c"
- ProgressDialog* _tmp17_ = NULL;
+#line 21852 "Commands.c"
+ ProgressDialog* _tmp17_;
#line 2492 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp17_ = self->priv->progress_dialog;
#line 2492 "/home/jens/Source/shotwell/src/Commands.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget));
-#line 21951 "Commands.c"
+#line 21858 "Commands.c"
}
}
@@ -21958,11 +21865,11 @@ static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceComman
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLAG_UNFLAG_COMMAND, FlagUnflagCommand);
#line 2495 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 21962 "Commands.c"
+#line 21869 "Commands.c"
{
GeeIterator* _source_it = NULL;
- GeeCollection* _tmp0_ = NULL;
- GeeIterator* _tmp1_ = NULL;
+ GeeCollection* _tmp0_;
+ GeeIterator* _tmp1_;
#line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp0_ = sources;
#line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21971,14 +21878,14 @@ static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceComman
_source_it = _tmp1_;
#line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
while (TRUE) {
-#line 21975 "Commands.c"
- GeeIterator* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
+#line 21882 "Commands.c"
+ GeeIterator* _tmp2_;
+ gboolean _tmp3_;
DataSource* source = NULL;
- GeeIterator* _tmp4_ = NULL;
- gpointer _tmp5_ = NULL;
- DataSource* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
+ GeeIterator* _tmp4_;
+ gpointer _tmp5_;
+ DataSource* _tmp6_;
+ gboolean _tmp7_;
#line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp2_ = _source_it;
#line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -21987,7 +21894,7 @@ static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceComman
if (!_tmp3_) {
#line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
break;
-#line 21991 "Commands.c"
+#line 21898 "Commands.c"
}
#line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = _source_it;
@@ -22003,20 +21910,20 @@ static void flag_unflag_command_real_undo_on_all (MultipleDataSourceAtOnceComman
flag_unflag_command_flag_unflag (self, _tmp6_, !_tmp7_);
#line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (source);
-#line 22007 "Commands.c"
+#line 21914 "Commands.c"
}
#line 2496 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (_source_it);
-#line 22011 "Commands.c"
+#line 21918 "Commands.c"
}
}
static void flag_unflag_command_flag_unflag (FlagUnflagCommand* self, DataSource* source, gboolean flag) {
Flaggable* flaggable = NULL;
- DataSource* _tmp0_ = NULL;
- Flaggable* _tmp1_ = NULL;
- Flaggable* _tmp2_ = NULL;
+ DataSource* _tmp0_;
+ Flaggable* _tmp1_;
+ Flaggable* _tmp2_;
#line 2500 "/home/jens/Source/shotwell/src/Commands.vala"
g_return_if_fail (IS_FLAG_UNFLAG_COMMAND (self));
#line 2500 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -22031,31 +21938,31 @@ static void flag_unflag_command_flag_unflag (FlagUnflagCommand* self, DataSource
_tmp2_ = flaggable;
#line 2502 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp2_ != NULL) {
-#line 22035 "Commands.c"
- gboolean _tmp3_ = FALSE;
+#line 21942 "Commands.c"
+ gboolean _tmp3_;
#line 2503 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp3_ = flag;
#line 2503 "/home/jens/Source/shotwell/src/Commands.vala"
if (_tmp3_) {
-#line 22041 "Commands.c"
- Flaggable* _tmp4_ = NULL;
+#line 21948 "Commands.c"
+ Flaggable* _tmp4_;
#line 2504 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp4_ = flaggable;
#line 2504 "/home/jens/Source/shotwell/src/Commands.vala"
flaggable_mark_flagged (_tmp4_);
-#line 22047 "Commands.c"
+#line 21954 "Commands.c"
} else {
- Flaggable* _tmp5_ = NULL;
+ Flaggable* _tmp5_;
#line 2506 "/home/jens/Source/shotwell/src/Commands.vala"
_tmp5_ = flaggable;
#line 2506 "/home/jens/Source/shotwell/src/Commands.vala"
flaggable_mark_unflagged (_tmp5_);
-#line 22054 "Commands.c"
+#line 21961 "Commands.c"
}
}
#line 2500 "/home/jens/Source/shotwell/src/Commands.vala"
_g_object_unref0 (flaggable);
-#line 22059 "Commands.c"
+#line 21966 "Commands.c"
}
@@ -22065,12 +21972,12 @@ static void flag_unflag_command_class_init (FlagUnflagCommandClass * klass) {
#line 2451 "/home/jens/Source/shotwell/src/Commands.vala"
g_type_class_add_private (klass, sizeof (FlagUnflagCommandPrivate));
#line 2451 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) flag_unflag_command_real_execute_on_all;
+ ((MultipleDataSourceAtOnceCommandClass *) klass)->execute_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) flag_unflag_command_real_execute_on_all;
#line 2451 "/home/jens/Source/shotwell/src/Commands.vala"
- ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*)(MultipleDataSourceAtOnceCommand*, GeeCollection*)) flag_unflag_command_real_undo_on_all;
+ ((MultipleDataSourceAtOnceCommandClass *) klass)->undo_on_all = (void (*) (MultipleDataSourceAtOnceCommand *, GeeCollection*)) flag_unflag_command_real_undo_on_all;
#line 2451 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (klass)->finalize = flag_unflag_command_finalize;
-#line 22074 "Commands.c"
+#line 21981 "Commands.c"
}
@@ -22079,11 +21986,11 @@ static void flag_unflag_command_instance_init (FlagUnflagCommand * self) {
self->priv = FLAG_UNFLAG_COMMAND_GET_PRIVATE (self);
#line 2459 "/home/jens/Source/shotwell/src/Commands.vala"
self->priv->progress_dialog = NULL;
-#line 22083 "Commands.c"
+#line 21990 "Commands.c"
}
-static void flag_unflag_command_finalize (GObject* obj) {
+static void flag_unflag_command_finalize (GObject * obj) {
FlagUnflagCommand * self;
#line 2451 "/home/jens/Source/shotwell/src/Commands.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FLAG_UNFLAG_COMMAND, FlagUnflagCommand);
@@ -22091,7 +21998,7 @@ static void flag_unflag_command_finalize (GObject* obj) {
_g_object_unref0 (self->priv->progress_dialog);
#line 2451 "/home/jens/Source/shotwell/src/Commands.vala"
G_OBJECT_CLASS (flag_unflag_command_parent_class)->finalize (obj);
-#line 22095 "Commands.c"
+#line 22002 "Commands.c"
}