From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 20:55:59 +0200 Subject: New upstream version 0.28.3 --- src/library/ImportQueuePage.c | 912 +++++++++++++++++++++--------------------- 1 file changed, 464 insertions(+), 448 deletions(-) (limited to 'src/library/ImportQueuePage.c') diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c index c8d1841..df6b6a0 100644 --- a/src/library/ImportQueuePage.c +++ b/src/library/ImportQueuePage.c @@ -1,4 +1,4 @@ -/* ImportQueuePage.c generated by valac 0.36.6, the Vala compiler +/* ImportQueuePage.c generated by valac 0.40.4, the Vala compiler * generated from ImportQueuePage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -110,6 +111,11 @@ typedef struct _ImportQueuePagePrivate ImportQueuePagePrivate; typedef struct _BatchImport BatchImport; typedef struct _BatchImportClass BatchImportClass; +enum { + IMPORT_QUEUE_PAGE_0_PROPERTY, + IMPORT_QUEUE_PAGE_NUM_PROPERTIES +}; +static GParamSpec* import_queue_page_properties[IMPORT_QUEUE_PAGE_NUM_PROPERTIES]; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define TYPE_DATA_OBJECT (data_object_get_type ()) @@ -300,9 +306,9 @@ typedef struct _VideoViewClass VideoViewClass; enum { IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL, IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL, - IMPORT_QUEUE_PAGE_LAST_SIGNAL + IMPORT_QUEUE_PAGE_NUM_SIGNALS }; -static guint import_queue_page_signals[IMPORT_QUEUE_PAGE_LAST_SIGNAL] = {0}; +static guint import_queue_page_signals[IMPORT_QUEUE_PAGE_NUM_SIGNALS] = {0}; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -449,9 +455,15 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType single_photo_page_get_type (void) G_GNUC_CONST; @@ -463,71 +475,130 @@ GType single_photo_page_update_reason_get_type (void) G_GNUC_CONST; GType import_queue_page_get_type (void) G_GNUC_CONST; GType batch_import_get_type (void) G_GNUC_CONST; #define IMPORT_QUEUE_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_IMPORT_QUEUE_PAGE, ImportQueuePagePrivate)) -enum { - IMPORT_QUEUE_PAGE_DUMMY_PROPERTY -}; #define IMPORT_QUEUE_PAGE_NAME _ ("Importing…") static void import_queue_page_on_stop (ImportQueuePage* self); -static void _import_queue_page_on_stop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void _import_queue_page_on_stop_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self); ImportQueuePage* import_queue_page_new (void); ImportQueuePage* import_queue_page_construct (GType object_type); -SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* page_name, gboolean scale_up_to_viewport); +SinglePhotoPage* single_photo_page_construct (GType object_type, + const gchar* page_name, + gboolean scale_up_to_viewport); GtkToolbar* page_get_toolbar (Page* self); -static void import_queue_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames); -void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames); -static void import_queue_page_real_add_actions (Page* base, GActionMap* map); -void page_add_actions (Page* self, GActionMap* map); -static void import_queue_page_real_remove_actions (Page* base, GActionMap* map); -void page_remove_actions (Page* self, GActionMap* map); -void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* batch_import, gboolean allow_user_cancel); -static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* batch_import); -static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, gpointer self); +static void import_queue_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames); +void page_init_collect_ui_filenames (Page* self, + GeeList* ui_filenames); +static void import_queue_page_real_add_actions (Page* base, + GActionMap* map); +void page_add_actions (Page* self, + GActionMap* map); +static void import_queue_page_real_remove_actions (Page* base, + GActionMap* map); +void page_remove_actions (Page* self, + GActionMap* map); +void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, + BatchImport* batch_import, + gboolean allow_user_cancel); +static void import_queue_page_on_starting (ImportQueuePage* self, + BatchImport* batch_import); +static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, + gpointer self); static void import_queue_page_on_preparing (ImportQueuePage* self); -static void _import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender, gpointer self); -static void import_queue_page_on_progress (ImportQueuePage* self, guint64 completed_bytes, guint64 total_bytes); -static void _import_queue_page_on_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self); +static void _import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender, + gpointer self); +static void import_queue_page_on_progress (ImportQueuePage* self, + guint64 completed_bytes, + guint64 total_bytes); +static void _import_queue_page_on_progress_batch_import_progress (BatchImport* _sender, + guint64 completed_bytes, + guint64 total_bytes, + gpointer self); GType data_object_get_type (void) G_GNUC_CONST; GType data_source_get_type (void) G_GNUC_CONST; GType thumbnail_source_get_type (void) G_GNUC_CONST; -static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSource* source, GdkPixbuf* pixbuf, gint to_follow); +static void import_queue_page_on_imported (ImportQueuePage* self, + ThumbnailSource* source, + GdkPixbuf* pixbuf, + gint to_follow); GType media_source_get_type (void) G_GNUC_CONST; -static void _import_queue_page_on_imported_batch_import_imported (BatchImport* _sender, MediaSource* source, GdkPixbuf* pixbuf, gint to_follow, gpointer self); +static void _import_queue_page_on_imported_batch_import_imported (BatchImport* _sender, + MediaSource* source, + GdkPixbuf* pixbuf, + gint to_follow, + gpointer self); gpointer import_manifest_ref (gpointer instance); void import_manifest_unref (gpointer instance); -GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_import_manifest (GValue* value, gpointer v_object); -void value_take_import_manifest (GValue* value, gpointer v_object); +GParamSpec* param_spec_import_manifest (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_import_manifest (GValue* value, + gpointer v_object); +void value_take_import_manifest (GValue* value, + gpointer v_object); gpointer value_get_import_manifest (const GValue* value); GType import_manifest_get_type (void) G_GNUC_CONST; gpointer batch_import_roll_ref (gpointer instance); void batch_import_roll_unref (gpointer instance); -GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_batch_import_roll (GValue* value, gpointer v_object); -void value_take_batch_import_roll (GValue* value, gpointer v_object); +GParamSpec* param_spec_batch_import_roll (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_batch_import_roll (GValue* value, + gpointer v_object); +void value_take_batch_import_roll (GValue* value, + gpointer v_object); gpointer value_get_batch_import_roll (const GValue* value); GType batch_import_roll_get_type (void) G_GNUC_CONST; -static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchImport* batch_import, ImportManifest* manifest, BatchImportRoll* import_roll); -static void _import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self); +static void import_queue_page_on_import_complete (ImportQueuePage* self, + BatchImport* batch_import, + ImportManifest* manifest, + BatchImportRoll* import_roll); +static void _import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender, + ImportManifest* manifest, + BatchImportRoll* import_roll, + gpointer self); GType import_result_get_type (void) G_GNUC_CONST; -static void import_queue_page_on_fatal_error (ImportQueuePage* self, ImportResult _result_, const gchar* message); -static void _import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender, ImportResult _result_, const gchar* message, gpointer self); +static void import_queue_page_on_fatal_error (ImportQueuePage* self, + ImportResult _result_, + const gchar* message); +static void _import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender, + ImportResult _result_, + const gchar* message, + gpointer self); void batch_import_schedule (BatchImport* self); static void import_queue_page_update_stop_action (ImportQueuePage* self); gint import_queue_page_get_batch_count (ImportQueuePage* self); -void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive); +void page_set_action_sensitive (Page* self, + const gchar* name, + gboolean sensitive); GType app_window_get_type (void) G_GNUC_CONST; AppWindow* app_window_get_instance (void); void page_window_set_busy_cursor (PageWindow* self); void batch_import_user_halt (BatchImport* self); gboolean page_is_in_view (Page* self); GType direction_get_type (void) G_GNUC_CONST; -void single_photo_page_set_pixbuf (SinglePhotoPage* self, GdkPixbuf* unscaled, Dimensions* max_dim, Direction* direction); -void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result); +void single_photo_page_set_pixbuf (SinglePhotoPage* self, + GdkPixbuf* unscaled, + Dimensions* max_dim, + Direction* direction); +void dimensions_for_pixbuf (GdkPixbuf* pixbuf, + Dimensions* result); gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType view_collection_get_type (void) G_GNUC_CONST; @@ -536,33 +607,43 @@ void data_collection_clear (DataCollection* self); GType photo_source_get_type (void) G_GNUC_CONST; GType photo_get_type (void) G_GNUC_CONST; GType library_photo_get_type (void) G_GNUC_CONST; -gboolean data_collection_add (DataCollection* self, DataObject* object); +gboolean data_collection_add (DataCollection* self, + DataObject* object); PhotoView* photo_view_new (PhotoSource* source); -PhotoView* photo_view_construct (GType object_type, PhotoSource* source); +PhotoView* photo_view_construct (GType object_type, + PhotoSource* source); GType data_view_get_type (void) G_GNUC_CONST; GType thumbnail_view_get_type (void) G_GNUC_CONST; GType photo_view_get_type (void) G_GNUC_CONST; GType video_source_get_type (void) G_GNUC_CONST; GType video_get_type (void) G_GNUC_CONST; VideoView* video_view_new (VideoSource* source); -VideoView* video_view_construct (GType object_type, VideoSource* source); +VideoView* video_view_construct (GType object_type, + VideoSource* source); GType video_view_get_type (void) G_GNUC_CONST; gchar* data_object_get_name (DataObject* self); void single_photo_page_blank_display (SinglePhotoPage* self); void page_window_set_normal_cursor (PageWindow* self); -void app_window_error_message (const gchar* message, GtkWindow* parent); +void app_window_error_message (const gchar* message, + GtkWindow* parent); static void import_queue_page_finalize (GObject * obj); static const GActionEntry IMPORT_QUEUE_PAGE_entries[1] = {{"Stop", _import_queue_page_on_stop_gsimple_action_activate_callback}}; -static void _import_queue_page_on_stop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +static void +_import_queue_page_on_stop_gsimple_action_activate_callback (GSimpleAction* action, + GVariant* parameter, + gpointer self) +{ #line 62 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_stop ((ImportQueuePage*) self); -#line 562 "ImportQueuePage.c" +#line 641 "ImportQueuePage.c" } -ImportQueuePage* import_queue_page_construct (GType object_type) { +ImportQueuePage* +import_queue_page_construct (GType object_type) +{ ImportQueuePage * self = NULL; GtkToolbar* toolbar = NULL; GtkToolbar* _tmp0_; @@ -589,7 +670,7 @@ ImportQueuePage* import_queue_page_construct (GType object_type) { #line 32 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_tool_button_set_icon_name (stop_button, "stop"); #line 33 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (stop_button, GTK_TYPE_ACTIONABLE, GtkActionable), "win.Stop"); + gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (stop_button, gtk_actionable_get_type (), GtkActionable), "win.Stop"); #line 35 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (stop_button, gtk_tool_item_get_type (), GtkToolItem), -1); #line 38 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -630,69 +711,65 @@ ImportQueuePage* import_queue_page_construct (GType object_type) { _g_object_unref0 (toolbar); #line 24 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return self; -#line 634 "ImportQueuePage.c" +#line 715 "ImportQueuePage.c" } -ImportQueuePage* import_queue_page_new (void) { +ImportQueuePage* +import_queue_page_new (void) +{ #line 24 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return import_queue_page_construct (TYPE_IMPORT_QUEUE_PAGE); -#line 641 "ImportQueuePage.c" +#line 724 "ImportQueuePage.c" } -static void import_queue_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) { +static void +import_queue_page_real_init_collect_ui_filenames (Page* base, + GeeList* ui_filenames) +{ ImportQueuePage * self; - GeeList* _tmp0_; - GeeList* _tmp1_; #line 56 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage); #line 56 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (GEE_IS_LIST (ui_filenames)); #line 57 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = ui_filenames; -#line 57 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "import_queue.ui"); -#line 59 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = ui_filenames; + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "import_queue.ui"); #line 59 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - PAGE_CLASS (import_queue_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_); -#line 661 "ImportQueuePage.c" + PAGE_CLASS (import_queue_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), ui_filenames); +#line 741 "ImportQueuePage.c" } -static void import_queue_page_real_add_actions (Page* base, GActionMap* map) { +static void +import_queue_page_real_add_actions (Page* base, + GActionMap* map) +{ ImportQueuePage * self; - GActionMap* _tmp0_; - GActionMap* _tmp1_; #line 66 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage); #line 66 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 67 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = map; -#line 67 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - PAGE_CLASS (import_queue_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_); -#line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = map; + PAGE_CLASS (import_queue_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), map); #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_action_map_add_action_entries (_tmp1_, IMPORT_QUEUE_PAGE_entries, G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries), self); -#line 681 "ImportQueuePage.c" + g_action_map_add_action_entries (map, IMPORT_QUEUE_PAGE_entries, G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries), self); +#line 758 "ImportQueuePage.c" } -static void import_queue_page_real_remove_actions (Page* base, GActionMap* map) { +static void +import_queue_page_real_remove_actions (Page* base, + GActionMap* map) +{ ImportQueuePage * self; - GActionMap* _tmp0_; #line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage); #line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (G_IS_ACTION_MAP (map)); #line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = map; -#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - PAGE_CLASS (import_queue_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_); -#line 696 "ImportQueuePage.c" + PAGE_CLASS (import_queue_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), map); +#line 773 "ImportQueuePage.c" { GActionEntry* entry_collection = NULL; gint entry_collection_length1 = 0; @@ -704,89 +781,106 @@ static void import_queue_page_real_remove_actions (Page* base, GActionMap* map) entry_collection_length1 = G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries); #line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries); entry_it = entry_it + 1) { -#line 708 "ImportQueuePage.c" +#line 785 "ImportQueuePage.c" GActionEntry entry = {0}; #line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" entry = entry_collection[entry_it]; -#line 712 "ImportQueuePage.c" +#line 789 "ImportQueuePage.c" { - GActionMap* _tmp1_; - GActionEntry _tmp2_; - const gchar* _tmp3_; -#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = map; + GActionEntry _tmp0_; + const gchar* _tmp1_; #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_ = entry; + _tmp0_ = entry; #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp3_ = _tmp2_.name; + _tmp1_ = _tmp0_.name; #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_action_map_remove_action (_tmp1_, _tmp3_); -#line 725 "ImportQueuePage.c" + g_action_map_remove_action (map, _tmp1_); +#line 799 "ImportQueuePage.c" } } } } -static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, gpointer self) { +static void +_import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, + gpointer self) +{ #line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_starting ((ImportQueuePage*) self, _sender); -#line 735 "ImportQueuePage.c" +#line 812 "ImportQueuePage.c" } -static void _import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender, gpointer self) { +static void +_import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender, + gpointer self) +{ #line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_preparing ((ImportQueuePage*) self); -#line 742 "ImportQueuePage.c" +#line 822 "ImportQueuePage.c" } -static void _import_queue_page_on_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) { +static void +_import_queue_page_on_progress_batch_import_progress (BatchImport* _sender, + guint64 completed_bytes, + guint64 total_bytes, + gpointer self) +{ #line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_progress ((ImportQueuePage*) self, completed_bytes, total_bytes); -#line 749 "ImportQueuePage.c" +#line 834 "ImportQueuePage.c" } -static void _import_queue_page_on_imported_batch_import_imported (BatchImport* _sender, MediaSource* source, GdkPixbuf* pixbuf, gint to_follow, gpointer self) { +static void +_import_queue_page_on_imported_batch_import_imported (BatchImport* _sender, + MediaSource* source, + GdkPixbuf* pixbuf, + gint to_follow, + gpointer self) +{ #line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_imported ((ImportQueuePage*) self, source, pixbuf, to_follow); -#line 756 "ImportQueuePage.c" +#line 847 "ImportQueuePage.c" } -static void _import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { +static void +_import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender, + ImportManifest* manifest, + BatchImportRoll* import_roll, + gpointer self) +{ #line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_import_complete ((ImportQueuePage*) self, _sender, manifest, import_roll); -#line 763 "ImportQueuePage.c" +#line 859 "ImportQueuePage.c" } -static void _import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender, ImportResult _result_, const gchar* message, gpointer self) { +static void +_import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender, + ImportResult _result_, + const gchar* message, + gpointer self) +{ #line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_fatal_error ((ImportQueuePage*) self, _result_, message); -#line 770 "ImportQueuePage.c" +#line 871 "ImportQueuePage.c" } -void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* batch_import, gboolean allow_user_cancel) { +void +import_queue_page_enqueue_and_schedule (ImportQueuePage* self, + BatchImport* batch_import, + gboolean allow_user_cancel) +{ GeeArrayList* _tmp0_; - BatchImport* _tmp1_; - gboolean _tmp2_; - BatchImport* _tmp3_; - BatchImport* _tmp4_; - BatchImport* _tmp5_; - BatchImport* _tmp6_; - BatchImport* _tmp7_; - BatchImport* _tmp8_; - gboolean _tmp9_; - GeeArrayList* _tmp12_; - BatchImport* _tmp13_; - BatchImport* _tmp14_; - GeeArrayList* _tmp15_; - gint _tmp16_; - gint _tmp17_; + GeeArrayList* _tmp2_; + GeeArrayList* _tmp3_; + gint _tmp4_; + gint _tmp5_; #line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -794,83 +888,56 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* #line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->queue; #line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = batch_import; -#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); -#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _vala_assert (!_tmp2_, "!queue.contains(batch_import)"); + _vala_assert (!gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), batch_import), "!queue.contains(batch_import)"); #line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp3_ = batch_import; -#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_connect_object (_tmp3_, "starting", (GCallback) _import_queue_page_on_starting_batch_import_starting, self, 0); -#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp4_ = batch_import; + g_signal_connect_object (batch_import, "starting", (GCallback) _import_queue_page_on_starting_batch_import_starting, self, 0); #line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_connect_object (_tmp4_, "preparing", (GCallback) _import_queue_page_on_preparing_batch_import_preparing, self, 0); + g_signal_connect_object (batch_import, "preparing", (GCallback) _import_queue_page_on_preparing_batch_import_preparing, self, 0); #line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp5_ = batch_import; -#line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_connect_object (_tmp5_, "progress", (GCallback) _import_queue_page_on_progress_batch_import_progress, self, 0); -#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp6_ = batch_import; + g_signal_connect_object (batch_import, "progress", (GCallback) _import_queue_page_on_progress_batch_import_progress, self, 0); #line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_connect_object (_tmp6_, "imported", (GCallback) _import_queue_page_on_imported_batch_import_imported, self, 0); -#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp7_ = batch_import; + g_signal_connect_object (batch_import, "imported", (GCallback) _import_queue_page_on_imported_batch_import_imported, self, 0); #line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_connect_object (_tmp7_, "import-complete", (GCallback) _import_queue_page_on_import_complete_batch_import_import_complete, self, 0); + g_signal_connect_object (batch_import, "import-complete", (GCallback) _import_queue_page_on_import_complete_batch_import_import_complete, self, 0); #line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp8_ = batch_import; -#line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_connect_object (_tmp8_, "fatal-error", (GCallback) _import_queue_page_on_fatal_error_batch_import_fatal_error, self, 0); -#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp9_ = allow_user_cancel; + g_signal_connect_object (batch_import, "fatal-error", (GCallback) _import_queue_page_on_fatal_error_batch_import_fatal_error, self, 0); #line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if (!_tmp9_) { -#line 831 "ImportQueuePage.c" - GeeHashSet* _tmp10_; - BatchImport* _tmp11_; + if (!allow_user_cancel) { +#line 907 "ImportQueuePage.c" + GeeHashSet* _tmp1_; #line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp10_ = self->priv->cancel_unallowed; + _tmp1_ = self->priv->cancel_unallowed; #line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp11_ = batch_import; -#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_); -#line 840 "ImportQueuePage.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), batch_import); +#line 913 "ImportQueuePage.c" } #line 92 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp12_ = self->priv->queue; -#line 92 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp13_ = batch_import; + _tmp2_ = self->priv->queue; #line 92 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), batch_import); #line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp14_ = batch_import; -#line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_emit (self, import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL], 0, _tmp14_); + g_signal_emit (self, import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL], 0, batch_import); #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp15_ = self->priv->queue; + _tmp3_ = self->priv->queue; #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp17_ = _tmp16_; + _tmp5_ = _tmp4_; #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if (_tmp17_ == 1) { -#line 860 "ImportQueuePage.c" - BatchImport* _tmp18_; -#line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp18_ = batch_import; + if (_tmp5_ == 1) { #line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - batch_import_schedule (_tmp18_); -#line 866 "ImportQueuePage.c" + batch_import_schedule (batch_import); +#line 931 "ImportQueuePage.c" } #line 98 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); -#line 870 "ImportQueuePage.c" +#line 935 "ImportQueuePage.c" } -gint import_queue_page_get_batch_count (ImportQueuePage* self) { +gint +import_queue_page_get_batch_count (ImportQueuePage* self) +{ gint result = 0; GeeArrayList* _tmp0_; gint _tmp1_; @@ -887,15 +954,16 @@ gint import_queue_page_get_batch_count (ImportQueuePage* self) { result = _tmp2_; #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return result; -#line 891 "ImportQueuePage.c" +#line 958 "ImportQueuePage.c" } -static void import_queue_page_update_stop_action (ImportQueuePage* self) { +static void +import_queue_page_update_stop_action (ImportQueuePage* self) +{ gboolean _tmp0_ = FALSE; GeeHashSet* _tmp1_; BatchImport* _tmp2_; - gboolean _tmp3_; #line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -903,41 +971,43 @@ static void import_queue_page_update_stop_action (ImportQueuePage* self) { #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = self->priv->current_batch; #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp3_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_); -#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if (!_tmp3_) { -#line 910 "ImportQueuePage.c" - GeeArrayList* _tmp4_; + if (!gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_)) { +#line 976 "ImportQueuePage.c" + GeeArrayList* _tmp3_; + gint _tmp4_; gint _tmp5_; - gint _tmp6_; #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp4_ = self->priv->queue; + _tmp3_ = self->priv->queue; #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = _tmp6_ > 0; -#line 922 "ImportQueuePage.c" + _tmp0_ = _tmp5_ > 0; +#line 988 "ImportQueuePage.c" } else { #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = FALSE; -#line 926 "ImportQueuePage.c" +#line 992 "ImportQueuePage.c" } #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Stop", _tmp0_); -#line 930 "ImportQueuePage.c" +#line 996 "ImportQueuePage.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return self ? g_object_ref (self) : NULL; -#line 937 "ImportQueuePage.c" +#line 1005 "ImportQueuePage.c" } -static void import_queue_page_on_stop (ImportQueuePage* self) { +static void +import_queue_page_on_stop (ImportQueuePage* self) +{ GeeArrayList* _tmp0_; gint _tmp1_; gint _tmp2_; @@ -957,7 +1027,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { if (_tmp2_ == 0) { #line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return; -#line 961 "ImportQueuePage.c" +#line 1031 "ImportQueuePage.c" } #line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = app_window_get_instance (); @@ -969,7 +1039,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { _g_object_unref0 (_tmp4_); #line 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->stopped = TRUE; -#line 973 "ImportQueuePage.c" +#line 1043 "ImportQueuePage.c" { GeeArrayList* _batch_import_list = NULL; GeeArrayList* _tmp5_; @@ -997,7 +1067,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { _batch_import_index = -1; #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" while (TRUE) { -#line 1001 "ImportQueuePage.c" +#line 1071 "ImportQueuePage.c" gint _tmp10_; gint _tmp11_; gint _tmp12_; @@ -1018,7 +1088,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { if (!(_tmp11_ < _tmp12_)) { #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" break; -#line 1022 "ImportQueuePage.c" +#line 1092 "ImportQueuePage.c" } #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp13_ = _batch_import_list; @@ -1034,18 +1104,20 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { batch_import_user_halt (_tmp16_); #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (batch_import); -#line 1038 "ImportQueuePage.c" +#line 1108 "ImportQueuePage.c" } #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_batch_import_list); -#line 1042 "ImportQueuePage.c" +#line 1112 "ImportQueuePage.c" } } -static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* batch_import) { +static void +import_queue_page_on_starting (ImportQueuePage* self, + BatchImport* batch_import) +{ BatchImport* _tmp0_; - BatchImport* _tmp1_; #line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1053,18 +1125,18 @@ static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* b #line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); #line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = batch_import; -#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (batch_import); #line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (self->priv->current_batch); #line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - self->priv->current_batch = _tmp1_; -#line 1064 "ImportQueuePage.c" + self->priv->current_batch = _tmp0_; +#line 1134 "ImportQueuePage.c" } -static void import_queue_page_on_preparing (ImportQueuePage* self) { +static void +import_queue_page_on_preparing (ImportQueuePage* self) +{ GtkProgressBar* _tmp0_; GtkProgressBar* _tmp1_; #line 128 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1077,66 +1149,57 @@ static void import_queue_page_on_preparing (ImportQueuePage* self) { _tmp1_ = self->priv->progress_bar; #line 130 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_pulse (_tmp1_); -#line 1081 "ImportQueuePage.c" +#line 1153 "ImportQueuePage.c" } -static void import_queue_page_on_progress (ImportQueuePage* self, guint64 completed_bytes, guint64 total_bytes) { +static void +import_queue_page_on_progress (ImportQueuePage* self, + guint64 completed_bytes, + guint64 total_bytes) +{ gdouble _tmp0_ = 0.0; - guint64 _tmp1_; - guint64 _tmp2_; gdouble pct = 0.0; - GtkProgressBar* _tmp5_; + GtkProgressBar* _tmp1_; #line 133 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = completed_bytes; -#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_ = total_bytes; -#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if (_tmp1_ <= _tmp2_) { -#line 1099 "ImportQueuePage.c" - guint64 _tmp3_; - guint64 _tmp4_; + if (completed_bytes <= total_bytes) { #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp3_ = completed_bytes; -#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp4_ = total_bytes; -#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = ((gdouble) _tmp3_) / ((gdouble) _tmp4_); -#line 1108 "ImportQueuePage.c" + _tmp0_ = ((gdouble) completed_bytes) / ((gdouble) total_bytes); +#line 1171 "ImportQueuePage.c" } else { #line 135 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = 0.0; -#line 1112 "ImportQueuePage.c" +#line 1175 "ImportQueuePage.c" } #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" pct = _tmp0_; #line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp5_ = self->priv->progress_bar; + _tmp1_ = self->priv->progress_bar; #line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_progress_bar_set_fraction (_tmp5_, pct); -#line 1120 "ImportQueuePage.c" + gtk_progress_bar_set_fraction (_tmp1_, pct); +#line 1183 "ImportQueuePage.c" } -static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSource* source, GdkPixbuf* pixbuf, gint to_follow) { +static void +import_queue_page_on_imported (ImportQueuePage* self, + ThumbnailSource* source, + GdkPixbuf* pixbuf, + gint to_follow) +{ gboolean _tmp0_ = FALSE; - gint _tmp1_; - GdkPixbuf* _tmp3_; - GdkPixbuf* _tmp4_; - Dimensions _tmp5_ = {0}; - ViewCollection* _tmp6_; - ViewCollection* _tmp7_; - gboolean _tmp8_ = FALSE; - ThumbnailSource* _tmp9_; - GtkProgressBar* _tmp22_; - GtkProgressBar* _tmp23_; - ThumbnailSource* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - gchar* _tmp27_; - gchar* _tmp28_; + Dimensions _tmp1_ = {0}; + ViewCollection* _tmp2_; + ViewCollection* _tmp3_; + gboolean _tmp4_ = FALSE; + GtkProgressBar* _tmp13_; + GtkProgressBar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; #line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1144,158 +1207,126 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc #line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = to_follow; -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if (_tmp1_ > 0) { + if (to_follow > 0) { #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = TRUE; -#line 1153 "ImportQueuePage.c" +#line 1214 "ImportQueuePage.c" } else { - gboolean _tmp2_; #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = !_tmp2_; -#line 1160 "ImportQueuePage.c" + _tmp0_ = !page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); +#line 1218 "ImportQueuePage.c" } #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp0_) { #line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return; -#line 1166 "ImportQueuePage.c" +#line 1224 "ImportQueuePage.c" } #line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp3_ = pixbuf; -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp4_ = pixbuf; + dimensions_for_pixbuf (pixbuf, &_tmp1_); #line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - dimensions_for_pixbuf (_tmp4_, &_tmp5_); -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp3_, &_tmp5_, NULL); + single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), pixbuf, &_tmp1_, NULL); #line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp7_ = _tmp6_; + _tmp3_ = _tmp2_; #line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)); + data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection)); #line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _data_collection_unref0 (_tmp7_); -#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp9_ = source; -#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO)) { -#line 1188 "ImportQueuePage.c" - ViewCollection* _tmp10_; - ViewCollection* _tmp11_; - ThumbnailSource* _tmp12_; - PhotoView* _tmp13_; - PhotoView* _tmp14_; - gboolean _tmp15_; -#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _data_collection_unref0 (_tmp3_); #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp11_ = _tmp10_; + if (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_LIBRARY_PHOTO)) { +#line 1240 "ImportQueuePage.c" + ViewCollection* _tmp5_; + ViewCollection* _tmp6_; + PhotoView* _tmp7_; + PhotoView* _tmp8_; #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp12_ = source; + _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp13_ = photo_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp12_) : NULL, TYPE_PHOTO_SOURCE, PhotoSource)); + _tmp6_ = _tmp5_; #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp14_ = _tmp13_; + _tmp7_ = photo_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) source) : NULL, TYPE_PHOTO_SOURCE, PhotoSource)); #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp15_ = data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject)); + _tmp8_ = _tmp7_; #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp8_ = _tmp15_; + _tmp4_ = data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject)); #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp8_); #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _data_collection_unref0 (_tmp11_); -#line 1213 "ImportQueuePage.c" + _data_collection_unref0 (_tmp6_); +#line 1259 "ImportQueuePage.c" } else { - ViewCollection* _tmp16_; - ViewCollection* _tmp17_; - ThumbnailSource* _tmp18_; - VideoView* _tmp19_; - VideoView* _tmp20_; - gboolean _tmp21_; -#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp17_ = _tmp16_; + ViewCollection* _tmp9_; + ViewCollection* _tmp10_; + VideoView* _tmp11_; + VideoView* _tmp12_; #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp18_ = source; + _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp19_ = video_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_VIDEO) ? ((Video*) _tmp18_) : NULL, TYPE_VIDEO_SOURCE, VideoSource)); + _tmp10_ = _tmp9_; #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp20_ = _tmp19_; + _tmp11_ = video_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_VIDEO) ? ((Video*) source) : NULL, TYPE_VIDEO_SOURCE, VideoSource)); #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp21_ = data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_OBJECT, DataObject)); + _tmp12_ = _tmp11_; #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp8_ = _tmp21_; + _tmp4_ = data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject)); #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_object_unref0 (_tmp20_); + _g_object_unref0 (_tmp12_); #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _data_collection_unref0 (_tmp17_); -#line 1239 "ImportQueuePage.c" + _data_collection_unref0 (_tmp10_); +#line 1279 "ImportQueuePage.c" } #line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp22_ = self->priv->progress_bar; + _tmp13_ = self->priv->progress_bar; #line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_progress_bar_set_ellipsize (_tmp22_, PANGO_ELLIPSIZE_MIDDLE); -#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp23_ = self->priv->progress_bar; + gtk_progress_bar_set_ellipsize (_tmp13_, PANGO_ELLIPSIZE_MIDDLE); #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp24_ = source; + _tmp14_ = self->priv->progress_bar; #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp25_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject)); + _tmp15_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject)); #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp26_ = _tmp25_; + _tmp16_ = _tmp15_; #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp27_ = g_strdup_printf (_ ("Imported %s"), _tmp26_); + _tmp17_ = g_strdup_printf (_ ("Imported %s"), _tmp16_); #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp28_ = _tmp27_; + _tmp18_ = _tmp17_; #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_progress_bar_set_text (_tmp23_, _tmp28_); + gtk_progress_bar_set_text (_tmp14_, _tmp18_); #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_free0 (_tmp28_); + _g_free0 (_tmp18_); #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_free0 (_tmp26_); -#line 1263 "ImportQueuePage.c" + _g_free0 (_tmp16_); +#line 1301 "ImportQueuePage.c" } -static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchImport* batch_import, ImportManifest* manifest, BatchImportRoll* import_roll) { +static void +import_queue_page_on_import_complete (ImportQueuePage* self, + BatchImport* batch_import, + ImportManifest* manifest, + BatchImportRoll* import_roll) +{ BatchImport* _tmp0_; - BatchImport* _tmp1_; - GeeArrayList* _tmp2_; + GeeArrayList* _tmp1_; + gint _tmp2_; gint _tmp3_; - gint _tmp4_; - GeeArrayList* _tmp5_; - gpointer _tmp6_; - BatchImport* _tmp7_; - BatchImport* _tmp8_; + GeeArrayList* _tmp4_; + gpointer _tmp5_; + BatchImport* _tmp6_; gboolean removed = FALSE; - GeeArrayList* _tmp9_; - BatchImport* _tmp10_; - gboolean _tmp11_; - gboolean _tmp12_; - GeeHashSet* _tmp13_; - BatchImport* _tmp14_; - BatchImport* _tmp15_; - guint _tmp16_; - BatchImport* _tmp17_; - guint _tmp18_; - BatchImport* _tmp19_; - guint _tmp20_; - BatchImport* _tmp21_; - guint _tmp22_; - BatchImport* _tmp23_; - guint _tmp24_; - BatchImport* _tmp25_; - guint _tmp26_; - GeeArrayList* _tmp27_; - gint _tmp28_; - gint _tmp29_; - BatchImport* _tmp39_; + GeeArrayList* _tmp7_; + gboolean _tmp8_; + GeeHashSet* _tmp9_; + guint _tmp10_; + guint _tmp11_; + guint _tmp12_; + guint _tmp13_; + guint _tmp14_; + guint _tmp15_; + GeeArrayList* _tmp16_; + gint _tmp17_; + gint _tmp18_; #line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1305,177 +1336,156 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm #line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_BATCH_IMPORT_ROLL (import_roll)); #line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = batch_import; + _tmp0_ = self->priv->current_batch; #line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = self->priv->current_batch; -#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _vala_assert (_tmp0_ == _tmp1_, "batch_import == current_batch"); + _vala_assert (batch_import == _tmp0_, "batch_import == current_batch"); #line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (self->priv->current_batch); #line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->current_batch = NULL; #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_ = self->priv->queue; + _tmp1_ = self->priv->queue; #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _vala_assert (_tmp4_ > 0, "queue.size > 0"); + _vala_assert (_tmp3_ > 0, "queue.size > 0"); #line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp5_ = self->priv->queue; + _tmp4_ = self->priv->queue; #line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp6_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); + _tmp5_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); #line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp7_ = (BatchImport*) _tmp6_; + _tmp6_ = (BatchImport*) _tmp5_; #line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp8_ = batch_import; + _vala_assert (_tmp6_ == batch_import, "queue.get(0) == batch_import"); #line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _vala_assert (_tmp7_ == _tmp8_, "queue.get(0) == batch_import"); -#line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_object_unref0 (_tmp7_); -#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp9_ = self->priv->queue; + _g_object_unref0 (_tmp6_); #line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp10_ = batch_import; + _tmp7_ = self->priv->queue; #line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp11_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_); -#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - removed = _tmp11_; + removed = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), batch_import); #line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp12_ = removed; + _tmp8_ = removed; #line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _vala_assert (_tmp12_, "removed"); -#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp13_ = self->priv->cancel_unallowed; + _vala_assert (_tmp8_, "removed"); #line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp14_ = batch_import; + _tmp9_ = self->priv->cancel_unallowed; #line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_); -#line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp15_ = batch_import; + gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), batch_import); #line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_parse_name ("starting", TYPE_BATCH_IMPORT, &_tmp16_, NULL, FALSE); + g_signal_parse_name ("starting", TYPE_BATCH_IMPORT, &_tmp10_, NULL, FALSE); #line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _import_queue_page_on_starting_batch_import_starting, self); + g_signal_handlers_disconnect_matched (batch_import, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _import_queue_page_on_starting_batch_import_starting, self); #line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp17_ = batch_import; + g_signal_parse_name ("preparing", TYPE_BATCH_IMPORT, &_tmp11_, NULL, FALSE); #line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_parse_name ("preparing", TYPE_BATCH_IMPORT, &_tmp18_, NULL, FALSE); -#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _import_queue_page_on_preparing_batch_import_preparing, self); -#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp19_ = batch_import; + g_signal_handlers_disconnect_matched (batch_import, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _import_queue_page_on_preparing_batch_import_preparing, self); #line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_parse_name ("progress", TYPE_BATCH_IMPORT, &_tmp20_, NULL, FALSE); + g_signal_parse_name ("progress", TYPE_BATCH_IMPORT, &_tmp12_, NULL, FALSE); #line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_handlers_disconnect_matched (_tmp19_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _import_queue_page_on_progress_batch_import_progress, self); + g_signal_handlers_disconnect_matched (batch_import, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _import_queue_page_on_progress_batch_import_progress, self); #line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp21_ = batch_import; + g_signal_parse_name ("imported", TYPE_BATCH_IMPORT, &_tmp13_, NULL, FALSE); #line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_parse_name ("imported", TYPE_BATCH_IMPORT, &_tmp22_, NULL, FALSE); -#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_handlers_disconnect_matched (_tmp21_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp22_, 0, NULL, (GCallback) _import_queue_page_on_imported_batch_import_imported, self); -#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp23_ = batch_import; + g_signal_handlers_disconnect_matched (batch_import, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _import_queue_page_on_imported_batch_import_imported, self); #line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_parse_name ("import-complete", TYPE_BATCH_IMPORT, &_tmp24_, NULL, FALSE); + g_signal_parse_name ("import-complete", TYPE_BATCH_IMPORT, &_tmp14_, NULL, FALSE); #line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_handlers_disconnect_matched (_tmp23_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp24_, 0, NULL, (GCallback) _import_queue_page_on_import_complete_batch_import_import_complete, self); -#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp25_ = batch_import; + g_signal_handlers_disconnect_matched (batch_import, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _import_queue_page_on_import_complete_batch_import_import_complete, self); #line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_parse_name ("fatal-error", TYPE_BATCH_IMPORT, &_tmp26_, NULL, FALSE); + g_signal_parse_name ("fatal-error", TYPE_BATCH_IMPORT, &_tmp15_, NULL, FALSE); #line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_handlers_disconnect_matched (_tmp25_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _import_queue_page_on_fatal_error_batch_import_fatal_error, self); + g_signal_handlers_disconnect_matched (batch_import, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _import_queue_page_on_fatal_error_batch_import_fatal_error, self); #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp27_ = self->priv->queue; + _tmp16_ = self->priv->queue; #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp29_ = _tmp28_; + _tmp18_ = _tmp17_; #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if (_tmp29_ > 0) { -#line 1400 "ImportQueuePage.c" - GeeArrayList* _tmp30_; - gpointer _tmp31_; - BatchImport* _tmp32_; + if (_tmp18_ > 0) { +#line 1409 "ImportQueuePage.c" + GeeArrayList* _tmp19_; + gpointer _tmp20_; + BatchImport* _tmp21_; #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp30_ = self->priv->queue; + _tmp19_ = self->priv->queue; #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp31_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); + _tmp20_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0); #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp32_ = (BatchImport*) _tmp31_; + _tmp21_ = (BatchImport*) _tmp20_; #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - batch_import_schedule (_tmp32_); + batch_import_schedule (_tmp21_); #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_object_unref0 (_tmp32_); -#line 1414 "ImportQueuePage.c" + _g_object_unref0 (_tmp21_); +#line 1423 "ImportQueuePage.c" } else { - GtkProgressBar* _tmp33_; - GtkProgressBar* _tmp34_; - GtkProgressBar* _tmp35_; - gboolean _tmp36_; + GtkProgressBar* _tmp22_; + GtkProgressBar* _tmp23_; + GtkProgressBar* _tmp24_; + gboolean _tmp25_; #line 186 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp33_ = self->priv->progress_bar; + _tmp22_ = self->priv->progress_bar; #line 186 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_progress_bar_set_ellipsize (_tmp33_, PANGO_ELLIPSIZE_NONE); + gtk_progress_bar_set_ellipsize (_tmp22_, PANGO_ELLIPSIZE_NONE); #line 187 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp34_ = self->priv->progress_bar; + _tmp23_ = self->priv->progress_bar; #line 187 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_progress_bar_set_text (_tmp34_, ""); + gtk_progress_bar_set_text (_tmp23_, ""); #line 188 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp35_ = self->priv->progress_bar; + _tmp24_ = self->priv->progress_bar; #line 188 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_progress_bar_set_fraction (_tmp35_, 0.0); + gtk_progress_bar_set_fraction (_tmp24_, 0.0); #line 195 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" single_photo_page_blank_display (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)); #line 198 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp36_ = self->priv->stopped; + _tmp25_ = self->priv->stopped; #line 198 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if (_tmp36_) { -#line 1438 "ImportQueuePage.c" - AppWindow* _tmp37_; - AppWindow* _tmp38_; + if (_tmp25_) { +#line 1447 "ImportQueuePage.c" + AppWindow* _tmp26_; + AppWindow* _tmp27_; #line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp37_ = app_window_get_instance (); + _tmp26_ = app_window_get_instance (); #line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp38_ = _tmp37_; + _tmp27_ = _tmp26_; #line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PAGE_WINDOW, PageWindow)); + page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_PAGE_WINDOW, PageWindow)); #line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_object_unref0 (_tmp38_); -#line 1449 "ImportQueuePage.c" + _g_object_unref0 (_tmp27_); +#line 1458 "ImportQueuePage.c" } #line 201 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->stopped = FALSE; -#line 1453 "ImportQueuePage.c" +#line 1462 "ImportQueuePage.c" } #line 204 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); #line 207 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp39_ = batch_import; -#line 207 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_signal_emit (self, import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL], 0, _tmp39_); -#line 1461 "ImportQueuePage.c" + g_signal_emit (self, import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL], 0, batch_import); +#line 1468 "ImportQueuePage.c" } -static void import_queue_page_on_fatal_error (ImportQueuePage* self, ImportResult _result_, const gchar* message) { - const gchar* _tmp0_; +static void +import_queue_page_on_fatal_error (ImportQueuePage* self, + ImportResult _result_, + const gchar* message) +{ #line 210 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); #line 210 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (message != NULL); #line 211 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp0_ = message; -#line 211 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - app_window_error_message (_tmp0_, NULL); -#line 1475 "ImportQueuePage.c" + app_window_error_message (message, NULL); +#line 1483 "ImportQueuePage.c" } -static void import_queue_page_class_init (ImportQueuePageClass * klass) { +static void +import_queue_page_class_init (ImportQueuePageClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -1492,11 +1502,13 @@ static void import_queue_page_class_init (ImportQueuePageClass * klass) { import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL] = g_signal_new ("batch-added", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT); #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL] = g_signal_new ("batch-removed", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT); -#line 1496 "ImportQueuePage.c" +#line 1506 "ImportQueuePage.c" } -static void import_queue_page_instance_init (ImportQueuePage * self) { +static void +import_queue_page_instance_init (ImportQueuePage * self) +{ GeeArrayList* _tmp0_; GeeHashSet* _tmp1_; GtkProgressBar* _tmp2_; @@ -1520,11 +1532,13 @@ static void import_queue_page_instance_init (ImportQueuePage * self) { self->priv->progress_bar = _tmp2_; #line 14 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->stopped = FALSE; -#line 1524 "ImportQueuePage.c" +#line 1536 "ImportQueuePage.c" } -static void import_queue_page_finalize (GObject * obj) { +static void +import_queue_page_finalize (GObject * obj) +{ ImportQueuePage * self; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage); @@ -1538,11 +1552,13 @@ static void import_queue_page_finalize (GObject * obj) { _g_object_unref0 (self->priv->progress_bar); #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" G_OBJECT_CLASS (import_queue_page_parent_class)->finalize (obj); -#line 1542 "ImportQueuePage.c" +#line 1556 "ImportQueuePage.c" } -GType import_queue_page_get_type (void) { +GType +import_queue_page_get_type (void) +{ static volatile gsize import_queue_page_type_id__volatile = 0; if (g_once_init_enter (&import_queue_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ImportQueuePageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) import_queue_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportQueuePage), 0, (GInstanceInitFunc) import_queue_page_instance_init, NULL }; -- cgit v1.2.3