From 4a3f1fdfe1eb3743564adcee35d5513224339260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 25 Nov 2016 04:10:33 +0100 Subject: New upstream version 0.25.1 --- src/library/ImportQueuePage.c | 776 +++++++++++++++++++----------------------- 1 file changed, 346 insertions(+), 430 deletions(-) (limited to 'src/library/ImportQueuePage.c') diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c index 916c8b2..261796a 100644 --- a/src/library/ImportQueuePage.c +++ b/src/library/ImportQueuePage.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -111,6 +112,16 @@ typedef struct _BatchImport BatchImport; typedef struct _BatchImportClass BatchImportClass; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) +#define TYPE_APP_WINDOW (app_window_get_type ()) +#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow)) +#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass)) +#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW)) +#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW)) +#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass)) + +typedef struct _AppWindow AppWindow; +typedef struct _AppWindowClass AppWindowClass; + #define TYPE_DATA_OBJECT (data_object_get_type ()) #define DATA_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_OBJECT, DataObject)) #define DATA_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATA_OBJECT, DataObjectClass)) @@ -173,16 +184,6 @@ typedef struct _BatchImportRollClass BatchImportRollClass; #define TYPE_IMPORT_RESULT (import_result_get_type ()) -#define TYPE_APP_WINDOW (app_window_get_type ()) -#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow)) -#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass)) -#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW)) -#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW)) -#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass)) - -typedef struct _AppWindow AppWindow; -typedef struct _AppWindowClass AppWindowClass; - #define TYPE_DIRECTION (direction_get_type ()) #define TYPE_DATA_COLLECTION (data_collection_get_type ()) @@ -304,7 +305,7 @@ typedef struct _VideoViewClass VideoViewClass; struct _Page { GtkScrolledWindow parent_instance; PagePrivate * priv; - GtkUIManager* ui; + GtkBuilder* builder; GtkToolbar* toolbar; gboolean in_view; }; @@ -314,8 +315,6 @@ struct _PageClass { void (*set_page_name) (Page* self, const gchar* page_name); void (*set_container) (Page* self, GtkWindow* container); void (*clear_container) (Page* self); - GtkMenuBar* (*get_menubar) (Page* self); - GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path); GtkToolbar* (*get_toolbar) (Page* self); GtkMenu* (*get_page_context_menu) (Page* self); void (*switching_from) (Page* self); @@ -323,10 +322,8 @@ struct _PageClass { void (*ready) (Page* self); void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw); void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw); + void (*add_actions) (Page* self); void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); - GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1); - GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1); - void (*register_radio_actions) (Page* self, GtkActionGroup* action_group); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); void (*update_actions) (Page* self, gint selected_count, gint count); @@ -463,20 +460,18 @@ 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); 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); GtkToolbar* page_get_toolbar (Page* self); -GtkAction* page_get_action (Page* self, const gchar* name); 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 GtkActionEntry* import_queue_page_real_init_collect_action_entries (Page* base, int* result_length1); -GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1); -#define RESOURCES_STOP_LABEL _ ("_Stop") -#define TRANSLATABLE "translatable" -static void import_queue_page_on_stop (ImportQueuePage* self); -static void _import_queue_page_on_stop_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add87 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void import_queue_page_real_add_actions (Page* base); +void page_add_actions (Page* self); +GType app_window_get_type (void) G_GNUC_CONST; +AppWindow* app_window_get_instance (void); 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); @@ -513,8 +508,6 @@ 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); -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); @@ -551,6 +544,14 @@ void page_window_set_normal_cursor (PageWindow* self); 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) { +#line 62 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + import_queue_page_on_stop ((ImportQueuePage*) self); +#line 553 "ImportQueuePage.c" +} + ImportQueuePage* import_queue_page_construct (GType object_type) { ImportQueuePage * self = NULL; @@ -558,14 +559,12 @@ ImportQueuePage* import_queue_page_construct (GType object_type) { GtkToolbar* _tmp0_ = NULL; GtkToolButton* stop_button = NULL; GtkToolButton* _tmp1_ = NULL; - GtkAction* _tmp2_ = NULL; - GtkAction* _tmp3_ = NULL; GtkSeparatorToolItem* separator = NULL; - GtkSeparatorToolItem* _tmp4_ = NULL; + GtkSeparatorToolItem* _tmp2_ = NULL; GtkToolItem* progress_item = NULL; - GtkToolItem* _tmp5_ = NULL; - GtkProgressBar* _tmp6_ = NULL; - GtkProgressBar* _tmp7_ = NULL; + GtkToolItem* _tmp3_ = NULL; + GtkProgressBar* _tmp4_ = NULL; + GtkProgressBar* _tmp5_ = NULL; #line 25 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self = (ImportQueuePage*) single_photo_page_construct (object_type, IMPORT_QUEUE_PAGE_NAME, FALSE); #line 28 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -581,41 +580,35 @@ 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" - _tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Stop"); -#line 33 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp3_ = _tmp2_; -#line 33 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_activatable_set_related_action (G_TYPE_CHECK_INSTANCE_CAST (stop_button, GTK_TYPE_ACTIVATABLE, GtkActivatable), _tmp3_); -#line 33 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_object_unref0 (_tmp3_); + gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (stop_button, GTK_TYPE_ACTIONABLE, 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" - _tmp4_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); + _tmp2_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); #line 38 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_object_ref_sink (_tmp4_); + g_object_ref_sink (_tmp2_); #line 38 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - separator = _tmp4_; + separator = _tmp2_; #line 39 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_separator_tool_item_set_draw (separator, FALSE); #line 41 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (separator, gtk_tool_item_get_type (), GtkToolItem), -1); #line 44 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp5_ = gtk_tool_item_new (); + _tmp3_ = gtk_tool_item_new (); #line 44 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - g_object_ref_sink (_tmp5_); + g_object_ref_sink (_tmp3_); #line 44 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - progress_item = _tmp5_; + progress_item = _tmp3_; #line 45 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_tool_item_set_expand (progress_item, TRUE); #line 46 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp6_ = self->priv->progress_bar; + _tmp4_ = self->priv->progress_bar; #line 46 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (progress_item, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (progress_item, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); #line 47 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp7_ = self->priv->progress_bar; + _tmp5_ = self->priv->progress_bar; #line 47 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_progress_bar_set_show_text (_tmp7_, TRUE); + gtk_progress_bar_set_show_text (_tmp5_, TRUE); #line 49 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_toolbar_insert (toolbar, progress_item, -1); #line 24 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" @@ -628,14 +621,14 @@ 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 632 "ImportQueuePage.c" +#line 625 "ImportQueuePage.c" } 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 639 "ImportQueuePage.c" +#line 632 "ImportQueuePage.c" } @@ -655,146 +648,69 @@ static void import_queue_page_real_init_collect_ui_filenames (Page* base, GeeLis _tmp1_ = ui_filenames; #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 659 "ImportQueuePage.c" +#line 652 "ImportQueuePage.c" } -static void _import_queue_page_on_stop_gtk_action_callback (GtkAction* action, gpointer self) { -#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - import_queue_page_on_stop ((ImportQueuePage*) self); -#line 666 "ImportQueuePage.c" -} - - -static void _vala_array_add87 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if ((*length) == (*size)) { -#line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 677 "ImportQueuePage.c" - } -#line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - (*array)[(*length)++] = *value; -#line 681 "ImportQueuePage.c" -} - - -static GtkActionEntry* import_queue_page_real_init_collect_action_entries (Page* base, int* result_length1) { +static void import_queue_page_real_add_actions (Page* base) { ImportQueuePage * self; - GtkActionEntry* result = NULL; - GtkActionEntry* actions = NULL; - gint _tmp0_ = 0; - GtkActionEntry* _tmp1_ = NULL; - gint actions_length1 = 0; - gint _actions_size_ = 0; - GtkActionEntry stop = {0}; - GtkActionEntry _tmp2_ = {0}; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GtkActionEntry* _tmp5_ = NULL; - gint _tmp5__length1 = 0; - GtkActionEntry _tmp6_ = {0}; - GtkActionEntry* _tmp7_ = NULL; - gint _tmp7__length1 = 0; -#line 62 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + AppWindow* _tmp0_ = NULL; + AppWindow* _tmp1_ = NULL; +#line 66 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage); -#line 63 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = PAGE_CLASS (import_queue_page_parent_class)->init_collect_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp0_); -#line 63 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - actions = _tmp1_; -#line 63 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - actions_length1 = _tmp0_; -#line 63 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _actions_size_ = actions_length1; -#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_.name = "Stop"; -#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_.stock_id = RESOURCES_STOP_LABEL; -#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_.label = TRANSLATABLE; -#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_.accelerator = NULL; -#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_.tooltip = TRANSLATABLE; -#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp2_.callback = (GCallback) _import_queue_page_on_stop_gtk_action_callback; -#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - stop = _tmp2_; #line 67 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp3_ = _ ("_Stop Import"); -#line 67 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - stop.label = _tmp3_; -#line 68 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp4_ = _ ("Stop importing photos"); -#line 68 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - stop.tooltip = _tmp4_; + 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)); #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp5_ = actions; + _tmp0_ = app_window_get_instance (); #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp5__length1 = actions_length1; + _tmp1_ = _tmp0_; #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp6_ = stop; + g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), IMPORT_QUEUE_PAGE_entries, G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries), self); #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _vala_array_add87 (&actions, &actions_length1, &_actions_size_, &_tmp6_); -#line 71 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp7_ = actions; -#line 71 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp7__length1 = actions_length1; -#line 71 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - if (result_length1) { -#line 71 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - *result_length1 = _tmp7__length1; -#line 750 "ImportQueuePage.c" - } -#line 71 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - result = _tmp7_; -#line 71 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - return result; -#line 756 "ImportQueuePage.c" + _g_object_unref0 (_tmp1_); +#line 672 "ImportQueuePage.c" } static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, gpointer self) { -#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_starting ((ImportQueuePage*) self, _sender); -#line 763 "ImportQueuePage.c" +#line 679 "ImportQueuePage.c" } static void _import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender, gpointer self) { -#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 76 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_preparing ((ImportQueuePage*) self); -#line 770 "ImportQueuePage.c" +#line 686 "ImportQueuePage.c" } static void _import_queue_page_on_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) { -#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_progress ((ImportQueuePage*) self, completed_bytes, total_bytes); -#line 777 "ImportQueuePage.c" +#line 693 "ImportQueuePage.c" } static void _import_queue_page_on_imported_batch_import_imported (BatchImport* _sender, MediaSource* source, GdkPixbuf* pixbuf, gint to_follow, gpointer self) { -#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_imported ((ImportQueuePage*) self, source, pixbuf, to_follow); -#line 784 "ImportQueuePage.c" +#line 700 "ImportQueuePage.c" } static void _import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { -#line 81 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_import_complete ((ImportQueuePage*) self, _sender, manifest, import_roll); -#line 791 "ImportQueuePage.c" +#line 707 "ImportQueuePage.c" } static void _import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender, ImportResult _result_, const gchar* message, gpointer self) { -#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_fatal_error ((ImportQueuePage*) self, _result_, message); -#line 798 "ImportQueuePage.c" +#line 714 "ImportQueuePage.c" } @@ -815,86 +731,86 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* GeeArrayList* _tmp15_ = NULL; gint _tmp16_ = 0; gint _tmp17_ = 0; -#line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_BATCH_IMPORT (batch_import)); -#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->queue; -#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = batch_import; -#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 73 "/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 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (!_tmp2_, "!queue.contains(batch_import)"); -#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = batch_import; -#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 75 "/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 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 76 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = batch_import; -#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 76 "/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); -#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = batch_import; -#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 77 "/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 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp6_ = batch_import; -#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 78 "/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 81 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp7_ = batch_import; -#line 81 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 79 "/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); -#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp8_ = batch_import; -#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 80 "/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 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp9_ = allow_user_cancel; -#line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (!_tmp9_) { -#line 859 "ImportQueuePage.c" +#line 775 "ImportQueuePage.c" GeeHashSet* _tmp10_ = NULL; BatchImport* _tmp11_ = NULL; -#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp10_ = self->priv->cancel_unallowed; -#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp11_ = batch_import; -#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 83 "/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 868 "ImportQueuePage.c" +#line 784 "ImportQueuePage.c" } -#line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp12_ = self->priv->queue; -#line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp13_ = batch_import; -#line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_); -#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp14_ = batch_import; -#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_emit_by_name (self, "batch-added", _tmp14_); -#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp15_ = self->priv->queue; -#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp17_ = _tmp16_; -#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp17_ == 1) { -#line 888 "ImportQueuePage.c" +#line 804 "ImportQueuePage.c" BatchImport* _tmp18_ = NULL; -#line 91 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp18_ = batch_import; -#line 91 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" batch_import_schedule (_tmp18_); -#line 894 "ImportQueuePage.c" +#line 810 "ImportQueuePage.c" } -#line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 91 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); -#line 898 "ImportQueuePage.c" +#line 814 "ImportQueuePage.c" } @@ -903,19 +819,19 @@ gint import_queue_page_get_batch_count (ImportQueuePage* self) { GeeArrayList* _tmp0_ = NULL; gint _tmp1_ = 0; gint _tmp2_ = 0; -#line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 94 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_val_if_fail (IS_IMPORT_QUEUE_PAGE (self), 0); -#line 97 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->queue; -#line 97 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 97 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = _tmp1_; -#line 97 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" result = _tmp2_; -#line 97 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return result; -#line 919 "ImportQueuePage.c" +#line 835 "ImportQueuePage.c" } @@ -924,44 +840,44 @@ static void import_queue_page_update_stop_action (ImportQueuePage* self) { GeeHashSet* _tmp1_ = NULL; BatchImport* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 100 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 98 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = self->priv->cancel_unallowed; -#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = self->priv->current_batch; -#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/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 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (!_tmp3_) { -#line 938 "ImportQueuePage.c" +#line 854 "ImportQueuePage.c" GeeArrayList* _tmp4_ = NULL; gint _tmp5_ = 0; gint _tmp6_ = 0; -#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = self->priv->queue; -#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp6_ = _tmp5_; -#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = _tmp6_ > 0; -#line 950 "ImportQueuePage.c" +#line 866 "ImportQueuePage.c" } else { -#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = FALSE; -#line 954 "ImportQueuePage.c" +#line 870 "ImportQueuePage.c" } -#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Stop", _tmp0_); -#line 958 "ImportQueuePage.c" +#line 874 "ImportQueuePage.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return self ? g_object_ref (self) : NULL; -#line 965 "ImportQueuePage.c" +#line 881 "ImportQueuePage.c" } @@ -971,33 +887,33 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { gint _tmp2_ = 0; AppWindow* _tmp3_ = NULL; AppWindow* _tmp4_ = NULL; -#line 104 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 103 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); -#line 107 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->queue; -#line 107 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 107 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = _tmp1_; -#line 107 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp2_ == 0) { -#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return; -#line 989 "ImportQueuePage.c" +#line 905 "ImportQueuePage.c" } -#line 110 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = app_window_get_instance (); -#line 110 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = _tmp3_; -#line 110 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE_WINDOW, PageWindow)); -#line 110 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp4_); -#line 111 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 109 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->stopped = TRUE; -#line 1001 "ImportQueuePage.c" +#line 917 "ImportQueuePage.c" { GeeArrayList* _batch_import_list = NULL; GeeArrayList* _tmp5_ = NULL; @@ -1007,25 +923,25 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { gint _tmp8_ = 0; gint _tmp9_ = 0; gint _batch_import_index = 0; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = self->priv->queue; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp6_ = _g_object_ref0 (_tmp5_); -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _batch_import_list = _tmp6_; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp7_ = _batch_import_list; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp9_ = _tmp8_; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _batch_import_size = _tmp9_; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _batch_import_index = -1; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" while (TRUE) { -#line 1029 "ImportQueuePage.c" +#line 945 "ImportQueuePage.c" gint _tmp10_ = 0; gint _tmp11_ = 0; gint _tmp12_ = 0; @@ -1034,39 +950,39 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { gint _tmp14_ = 0; gpointer _tmp15_ = NULL; BatchImport* _tmp16_ = NULL; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp10_ = _batch_import_index; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _batch_import_index = _tmp10_ + 1; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp11_ = _batch_import_index; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp12_ = _batch_import_size; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (!(_tmp11_ < _tmp12_)) { -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" break; -#line 1050 "ImportQueuePage.c" +#line 966 "ImportQueuePage.c" } -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp13_ = _batch_import_list; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp14_ = _batch_import_index; -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp15_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp14_); -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" batch_import = (BatchImport*) _tmp15_; -#line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp16_ = batch_import; -#line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" batch_import_user_halt (_tmp16_); -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (batch_import); -#line 1066 "ImportQueuePage.c" +#line 982 "ImportQueuePage.c" } -#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_batch_import_list); -#line 1070 "ImportQueuePage.c" +#line 986 "ImportQueuePage.c" } } @@ -1074,21 +990,21 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* batch_import) { BatchImport* _tmp0_ = NULL; BatchImport* _tmp1_ = NULL; -#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_BATCH_IMPORT (batch_import)); -#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 117 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); -#line 120 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = batch_import; -#line 120 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 120 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (self->priv->current_batch); -#line 120 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->current_batch = _tmp1_; -#line 1092 "ImportQueuePage.c" +#line 1008 "ImportQueuePage.c" } @@ -1096,19 +1012,19 @@ static void import_queue_page_on_preparing (ImportQueuePage* self) { GtkProgressBar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; GtkProgressBar* _tmp2_ = NULL; -#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 121 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 122 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->progress_bar; -#line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 122 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = _ ("Preparing to import…"); -#line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 122 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_text (_tmp0_, _tmp1_); -#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = self->priv->progress_bar; -#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_pulse (_tmp2_); -#line 1112 "ImportQueuePage.c" +#line 1028 "ImportQueuePage.c" } @@ -1118,36 +1034,36 @@ static void import_queue_page_on_progress (ImportQueuePage* self, guint64 comple guint64 _tmp2_ = 0ULL; gdouble pct = 0.0; GtkProgressBar* _tmp5_ = NULL; -#line 128 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 126 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = completed_bytes; -#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = total_bytes; -#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp1_ <= _tmp2_) { -#line 1130 "ImportQueuePage.c" +#line 1046 "ImportQueuePage.c" guint64 _tmp3_ = 0ULL; guint64 _tmp4_ = 0ULL; -#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = completed_bytes; -#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = total_bytes; -#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = ((gdouble) _tmp3_) / ((gdouble) _tmp4_); -#line 1139 "ImportQueuePage.c" +#line 1055 "ImportQueuePage.c" } else { -#line 130 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 128 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = 0.0; -#line 1143 "ImportQueuePage.c" +#line 1059 "ImportQueuePage.c" } -#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" pct = _tmp0_; -#line 131 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = self->priv->progress_bar; -#line 131 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_fraction (_tmp5_, pct); -#line 1151 "ImportQueuePage.c" +#line 1067 "ImportQueuePage.c" } @@ -1169,79 +1085,79 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc gchar* _tmp27_ = NULL; gchar* _tmp28_ = NULL; gchar* _tmp29_ = NULL; -#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); -#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); -#line 140 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = to_follow; -#line 140 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp1_ > 0) { -#line 140 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = TRUE; -#line 1185 "ImportQueuePage.c" +#line 1101 "ImportQueuePage.c" } else { gboolean _tmp2_ = FALSE; -#line 140 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 140 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = !_tmp2_; -#line 1192 "ImportQueuePage.c" +#line 1108 "ImportQueuePage.c" } -#line 140 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp0_) { -#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 139 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return; -#line 1198 "ImportQueuePage.c" +#line 1114 "ImportQueuePage.c" } -#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = pixbuf; -#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = pixbuf; -#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" dimensions_for_pixbuf (_tmp4_, &_tmp5_); -#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 141 "/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); -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp7_ = _tmp6_; -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)); -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _data_collection_unref0 (_tmp7_); -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp9_ = source; -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO)) { -#line 1220 "ImportQueuePage.c" +#line 1136 "ImportQueuePage.c" ViewCollection* _tmp10_ = NULL; ViewCollection* _tmp11_ = NULL; ThumbnailSource* _tmp12_ = NULL; PhotoView* _tmp13_ = NULL; PhotoView* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp11_ = _tmp10_; -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp12_ = source; -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/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)); -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp14_ = _tmp13_; -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/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)); -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp8_ = _tmp15_; -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp14_); -#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _data_collection_unref0 (_tmp11_); -#line 1245 "ImportQueuePage.c" +#line 1161 "ImportQueuePage.c" } else { ViewCollection* _tmp16_ = NULL; ViewCollection* _tmp17_ = NULL; @@ -1249,51 +1165,51 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc VideoView* _tmp19_ = NULL; VideoView* _tmp20_ = NULL; gboolean _tmp21_ = FALSE; -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp17_ = _tmp16_; -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp18_ = source; -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/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)); -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp20_ = _tmp19_; -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/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)); -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp8_ = _tmp21_; -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp20_); -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _data_collection_unref0 (_tmp17_); -#line 1271 "ImportQueuePage.c" +#line 1187 "ImportQueuePage.c" } -#line 150 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp22_ = self->priv->progress_bar; -#line 150 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_ellipsize (_tmp22_, PANGO_ELLIPSIZE_MIDDLE); -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp23_ = self->priv->progress_bar; -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp24_ = _ ("Imported %s"); -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp25_ = source; -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp26_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject)); -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp27_ = _tmp26_; -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp28_ = g_strdup_printf (_tmp24_, _tmp27_); -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp29_ = _tmp28_; -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_text (_tmp23_, _tmp29_); -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_free0 (_tmp29_); -#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_free0 (_tmp27_); -#line 1297 "ImportQueuePage.c" +#line 1213 "ImportQueuePage.c" } @@ -1330,182 +1246,182 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm gint _tmp28_ = 0; gint _tmp29_ = 0; BatchImport* _tmp39_ = NULL; -#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_BATCH_IMPORT (batch_import)); -#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_MANIFEST (manifest)); -#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_BATCH_IMPORT_ROLL (import_roll)); -#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = batch_import; -#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = self->priv->current_batch; -#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (_tmp0_ == _tmp1_, "batch_import == current_batch"); -#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (self->priv->current_batch); -#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->current_batch = NULL; -#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = self->priv->queue; -#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = _tmp3_; -#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (_tmp4_ > 0, "queue.size > 0"); -#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = self->priv->queue; -#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 158 "/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); -#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp7_ = (BatchImport*) _tmp6_; -#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp8_ = batch_import; -#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (_tmp7_ == _tmp8_, "queue.get(0) == batch_import"); -#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp7_); -#line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp9_ = self->priv->queue; -#line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp10_ = batch_import; -#line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 160 "/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 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" removed = _tmp11_; -#line 163 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp12_ = removed; -#line 163 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (_tmp12_, "removed"); -#line 166 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp13_ = self->priv->cancel_unallowed; -#line 166 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp14_ = batch_import; -#line 166 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 164 "/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 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp15_ = batch_import; -#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("starting", TYPE_BATCH_IMPORT, &_tmp16_, NULL, FALSE); -#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 167 "/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); -#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp17_ = batch_import; -#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("preparing", TYPE_BATCH_IMPORT, &_tmp18_, NULL, FALSE); -#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 168 "/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 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp19_ = batch_import; -#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("progress", TYPE_BATCH_IMPORT, &_tmp20_, NULL, FALSE); -#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 169 "/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); -#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp21_ = batch_import; -#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("imported", TYPE_BATCH_IMPORT, &_tmp22_, NULL, FALSE); -#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 170 "/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 173 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp23_ = batch_import; -#line 173 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("import-complete", TYPE_BATCH_IMPORT, &_tmp24_, NULL, FALSE); -#line 173 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 171 "/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 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp25_ = batch_import; -#line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("fatal-error", TYPE_BATCH_IMPORT, &_tmp26_, NULL, FALSE); -#line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 172 "/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); -#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp27_ = self->priv->queue; -#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp29_ = _tmp28_; -#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp29_ > 0) { -#line 1434 "ImportQueuePage.c" +#line 1350 "ImportQueuePage.c" GeeArrayList* _tmp30_ = NULL; gpointer _tmp31_ = NULL; BatchImport* _tmp32_ = NULL; -#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp30_ = self->priv->queue; -#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 176 "/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); -#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp32_ = (BatchImport*) _tmp31_; -#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" batch_import_schedule (_tmp32_); -#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp32_); -#line 1448 "ImportQueuePage.c" +#line 1364 "ImportQueuePage.c" } else { GtkProgressBar* _tmp33_ = NULL; GtkProgressBar* _tmp34_ = NULL; GtkProgressBar* _tmp35_ = NULL; gboolean _tmp36_ = FALSE; -#line 181 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp33_ = self->priv->progress_bar; -#line 181 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_ellipsize (_tmp33_, PANGO_ELLIPSIZE_NONE); -#line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 180 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp34_ = self->priv->progress_bar; -#line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 180 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_text (_tmp34_, ""); -#line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 181 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp35_ = self->priv->progress_bar; -#line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 181 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_fraction (_tmp35_, 0.0); -#line 190 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 188 "/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 193 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 191 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp36_ = self->priv->stopped; -#line 193 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 191 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp36_) { -#line 1472 "ImportQueuePage.c" +#line 1388 "ImportQueuePage.c" AppWindow* _tmp37_ = NULL; AppWindow* _tmp38_ = NULL; -#line 194 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp37_ = app_window_get_instance (); -#line 194 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp38_ = _tmp37_; -#line 194 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PAGE_WINDOW, PageWindow)); -#line 194 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp38_); -#line 1483 "ImportQueuePage.c" +#line 1399 "ImportQueuePage.c" } -#line 196 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 194 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->stopped = FALSE; -#line 1487 "ImportQueuePage.c" +#line 1403 "ImportQueuePage.c" } -#line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 197 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); -#line 202 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 200 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp39_ = batch_import; -#line 202 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 200 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_emit_by_name (self, "batch-removed", _tmp39_); -#line 1495 "ImportQueuePage.c" +#line 1411 "ImportQueuePage.c" } static void import_queue_page_on_fatal_error (ImportQueuePage* self, ImportResult _result_, const gchar* message) { const gchar* _tmp0_ = NULL; -#line 205 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 203 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 205 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 203 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (message != NULL); -#line 206 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 204 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = message; -#line 206 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 204 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" app_window_error_message (_tmp0_, NULL); -#line 1509 "ImportQueuePage.c" +#line 1425 "ImportQueuePage.c" } @@ -1517,14 +1433,14 @@ static void import_queue_page_class_init (ImportQueuePageClass * klass) { #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" ((PageClass *) klass)->init_collect_ui_filenames = import_queue_page_real_init_collect_ui_filenames; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - ((PageClass *) klass)->init_collect_action_entries = import_queue_page_real_init_collect_action_entries; + ((PageClass *) klass)->add_actions = import_queue_page_real_add_actions; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" G_OBJECT_CLASS (klass)->finalize = import_queue_page_finalize; #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" 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" 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 1528 "ImportQueuePage.c" +#line 1444 "ImportQueuePage.c" } @@ -1552,7 +1468,7 @@ 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 1556 "ImportQueuePage.c" +#line 1472 "ImportQueuePage.c" } @@ -1570,7 +1486,7 @@ 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 1574 "ImportQueuePage.c" +#line 1490 "ImportQueuePage.c" } -- cgit v1.2.3