From a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 21 Jan 2017 19:17:10 +0100 Subject: New upstream version 0.25.3 --- src/library/ImportQueuePage.c | 696 +++++++++++++++++++++++------------------- 1 file changed, 374 insertions(+), 322 deletions(-) (limited to 'src/library/ImportQueuePage.c') diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c index b46e179..b64083a 100644 --- a/src/library/ImportQueuePage.c +++ b/src/library/ImportQueuePage.c @@ -1,4 +1,4 @@ -/* ImportQueuePage.c generated by valac 0.32.1, the Vala compiler +/* ImportQueuePage.c generated by valac 0.34.4, the Vala compiler * generated from ImportQueuePage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -12,12 +12,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include @@ -112,16 +112,6 @@ 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)) @@ -184,6 +174,16 @@ 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 ()) @@ -322,7 +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 (*add_actions) (Page* self, GActionMap* map); + void (*remove_actions) (Page* self, GActionMap* map); void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); @@ -468,10 +469,10 @@ SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* pa 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); -void page_add_actions (Page* self); -GType app_window_get_type (void) G_GNUC_CONST; -AppWindow* app_window_get_instance (void); +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); @@ -508,6 +509,8 @@ 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); @@ -549,7 +552,7 @@ static const GActionEntry IMPORT_QUEUE_PAGE_entries[1] = {{"Stop", _import_queue 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" +#line 556 "ImportQueuePage.c" } @@ -621,14 +624,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 625 "ImportQueuePage.c" +#line 628 "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 632 "ImportQueuePage.c" +#line 635 "ImportQueuePage.c" } @@ -648,69 +651,116 @@ 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 652 "ImportQueuePage.c" +#line 655 "ImportQueuePage.c" } -static void import_queue_page_real_add_actions (Page* base) { +static void import_queue_page_real_add_actions (Page* base, GActionMap* map) { ImportQueuePage * self; - AppWindow* _tmp0_ = NULL; - AppWindow* _tmp1_ = NULL; + GActionMap* _tmp0_ = NULL; + GActionMap* _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 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" - 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" - _tmp0_ = app_window_get_instance (); -#line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _tmp1_ = _tmp0_; + _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" - 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); + _tmp1_ = map; #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - _g_object_unref0 (_tmp1_); -#line 672 "ImportQueuePage.c" + g_action_map_add_action_entries (_tmp1_, IMPORT_QUEUE_PAGE_entries, G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries), self); +#line 675 "ImportQueuePage.c" } -static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, gpointer self) { +static void import_queue_page_real_remove_actions (Page* base, GActionMap* map) { + ImportQueuePage * self; + GActionMap* _tmp0_ = NULL; +#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 690 "ImportQueuePage.c" + { + GActionEntry* entry_collection = NULL; + gint entry_collection_length1 = 0; + gint _entry_collection_size_ = 0; + gint entry_it = 0; +#line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + entry_collection = IMPORT_QUEUE_PAGE_entries; +#line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + 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 702 "ImportQueuePage.c" + GActionEntry entry = {0}; +#line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + entry = entry_collection[entry_it]; +#line 706 "ImportQueuePage.c" + { + GActionMap* _tmp1_ = NULL; + GActionEntry _tmp2_ = {0}; + const gchar* _tmp3_ = NULL; +#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + _tmp1_ = map; +#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + _tmp2_ = entry; +#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + _tmp3_ = _tmp2_.name; #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + g_action_map_remove_action (_tmp1_, _tmp3_); +#line 719 "ImportQueuePage.c" + } + } + } +} + + +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 679 "ImportQueuePage.c" +#line 729 "ImportQueuePage.c" } static void _import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender, gpointer self) { -#line 76 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_preparing ((ImportQueuePage*) self); -#line 686 "ImportQueuePage.c" +#line 736 "ImportQueuePage.c" } static void _import_queue_page_on_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) { -#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_progress ((ImportQueuePage*) self, completed_bytes, total_bytes); -#line 693 "ImportQueuePage.c" +#line 743 "ImportQueuePage.c" } static void _import_queue_page_on_imported_batch_import_imported (BatchImport* _sender, MediaSource* source, GdkPixbuf* pixbuf, gint to_follow, gpointer self) { -#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_imported ((ImportQueuePage*) self, source, pixbuf, to_follow); -#line 700 "ImportQueuePage.c" +#line 750 "ImportQueuePage.c" } static void _import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) { -#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_import_complete ((ImportQueuePage*) self, _sender, manifest, import_roll); -#line 707 "ImportQueuePage.c" +#line 757 "ImportQueuePage.c" } static void _import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender, ImportResult _result_, const gchar* message, gpointer self) { -#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_on_fatal_error ((ImportQueuePage*) self, _result_, message); -#line 714 "ImportQueuePage.c" +#line 764 "ImportQueuePage.c" } @@ -731,86 +781,86 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* GeeArrayList* _tmp15_ = NULL; gint _tmp16_ = 0; gint _tmp17_ = 0; -#line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_BATCH_IMPORT (batch_import)); -#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->queue; -#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = batch_import; -#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (!_tmp2_, "!queue.contains(batch_import)"); -#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = batch_import; -#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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 76 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = batch_import; -#line 76 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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); -#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = batch_import; -#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp6_ = batch_import; -#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp7_ = batch_import; -#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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); -#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp8_ = batch_import; -#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp9_ = allow_user_cancel; -#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (!_tmp9_) { -#line 775 "ImportQueuePage.c" +#line 825 "ImportQueuePage.c" GeeHashSet* _tmp10_ = NULL; BatchImport* _tmp11_ = NULL; -#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp10_ = self->priv->cancel_unallowed; -#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp11_ = batch_import; -#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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 784 "ImportQueuePage.c" +#line 834 "ImportQueuePage.c" } -#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp12_ = self->priv->queue; -#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 92 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp13_ = batch_import; -#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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_); -#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp14_ = batch_import; -#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_emit_by_name (self, "batch-added", _tmp14_); -#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp15_ = self->priv->queue; -#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 95 "/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 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp17_ = _tmp16_; -#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp17_ == 1) { -#line 804 "ImportQueuePage.c" +#line 854 "ImportQueuePage.c" BatchImport* _tmp18_ = NULL; -#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp18_ = batch_import; -#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" batch_import_schedule (_tmp18_); -#line 810 "ImportQueuePage.c" +#line 860 "ImportQueuePage.c" } -#line 91 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 98 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); -#line 814 "ImportQueuePage.c" +#line 864 "ImportQueuePage.c" } @@ -819,19 +869,19 @@ gint import_queue_page_get_batch_count (ImportQueuePage* self) { GeeArrayList* _tmp0_ = NULL; gint _tmp1_ = 0; gint _tmp2_ = 0; -#line 94 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_val_if_fail (IS_IMPORT_QUEUE_PAGE (self), 0); -#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->queue; -#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 102 "/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 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = _tmp1_; -#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" result = _tmp2_; -#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return result; -#line 835 "ImportQueuePage.c" +#line 885 "ImportQueuePage.c" } @@ -840,44 +890,44 @@ static void import_queue_page_update_stop_action (ImportQueuePage* self) { GeeHashSet* _tmp1_ = NULL; BatchImport* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 98 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = self->priv->cancel_unallowed; -#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = self->priv->current_batch; -#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (!_tmp3_) { -#line 854 "ImportQueuePage.c" +#line 904 "ImportQueuePage.c" GeeArrayList* _tmp4_ = NULL; gint _tmp5_ = 0; gint _tmp6_ = 0; -#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = self->priv->queue; -#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/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 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp6_ = _tmp5_; -#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = _tmp6_ > 0; -#line 866 "ImportQueuePage.c" +#line 916 "ImportQueuePage.c" } else { -#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = FALSE; -#line 870 "ImportQueuePage.c" +#line 920 "ImportQueuePage.c" } -#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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 874 "ImportQueuePage.c" +#line 924 "ImportQueuePage.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return self ? g_object_ref (self) : NULL; -#line 881 "ImportQueuePage.c" +#line 931 "ImportQueuePage.c" } @@ -887,33 +937,33 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { gint _tmp2_ = 0; AppWindow* _tmp3_ = NULL; AppWindow* _tmp4_ = NULL; -#line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 109 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 103 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 110 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); -#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->queue; -#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/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 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = _tmp1_; -#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp2_ == 0) { -#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return; -#line 905 "ImportQueuePage.c" +#line 955 "ImportQueuePage.c" } -#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = app_window_get_instance (); -#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = _tmp3_; -#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE_WINDOW, PageWindow)); -#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp4_); -#line 109 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->stopped = TRUE; -#line 917 "ImportQueuePage.c" +#line 967 "ImportQueuePage.c" { GeeArrayList* _batch_import_list = NULL; GeeArrayList* _tmp5_ = NULL; @@ -923,25 +973,25 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { gint _tmp8_ = 0; gint _tmp9_ = 0; gint _batch_import_index = 0; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = self->priv->queue; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp6_ = _g_object_ref0 (_tmp5_); -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _batch_import_list = _tmp6_; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp7_ = _batch_import_list; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/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 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp9_ = _tmp8_; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _batch_import_size = _tmp9_; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _batch_import_index = -1; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" while (TRUE) { -#line 945 "ImportQueuePage.c" +#line 995 "ImportQueuePage.c" gint _tmp10_ = 0; gint _tmp11_ = 0; gint _tmp12_ = 0; @@ -950,39 +1000,39 @@ static void import_queue_page_on_stop (ImportQueuePage* self) { gint _tmp14_ = 0; gpointer _tmp15_ = NULL; BatchImport* _tmp16_ = NULL; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp10_ = _batch_import_index; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _batch_import_index = _tmp10_ + 1; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp11_ = _batch_import_index; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp12_ = _batch_import_size; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (!(_tmp11_ < _tmp12_)) { -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" break; -#line 966 "ImportQueuePage.c" +#line 1016 "ImportQueuePage.c" } -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp13_ = _batch_import_list; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp14_ = _batch_import_index; -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/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 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" batch_import = (BatchImport*) _tmp15_; -#line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 120 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp16_ = batch_import; -#line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 120 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" batch_import_user_halt (_tmp16_); -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (batch_import); -#line 982 "ImportQueuePage.c" +#line 1032 "ImportQueuePage.c" } -#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_batch_import_list); -#line 986 "ImportQueuePage.c" +#line 1036 "ImportQueuePage.c" } } @@ -990,21 +1040,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 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_BATCH_IMPORT (batch_import)); -#line 117 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); -#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = batch_import; -#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (self->priv->current_batch); -#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->current_batch = _tmp1_; -#line 1008 "ImportQueuePage.c" +#line 1058 "ImportQueuePage.c" } @@ -1012,19 +1062,19 @@ static void import_queue_page_on_preparing (ImportQueuePage* self) { GtkProgressBar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; GtkProgressBar* _tmp2_ = NULL; -#line 121 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 128 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 122 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = self->priv->progress_bar; -#line 122 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = _ ("Preparing to import…"); -#line 122 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_text (_tmp0_, _tmp1_); -#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 130 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = self->priv->progress_bar; -#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 130 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_pulse (_tmp2_); -#line 1028 "ImportQueuePage.c" +#line 1078 "ImportQueuePage.c" } @@ -1034,36 +1084,36 @@ static void import_queue_page_on_progress (ImportQueuePage* self, guint64 comple guint64 _tmp2_ = 0ULL; gdouble pct = 0.0; GtkProgressBar* _tmp5_ = NULL; -#line 126 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 133 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = completed_bytes; -#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = total_bytes; -#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp1_ <= _tmp2_) { -#line 1046 "ImportQueuePage.c" +#line 1096 "ImportQueuePage.c" guint64 _tmp3_ = 0ULL; guint64 _tmp4_ = 0ULL; -#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = completed_bytes; -#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = total_bytes; -#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = ((gdouble) _tmp3_) / ((gdouble) _tmp4_); -#line 1055 "ImportQueuePage.c" +#line 1105 "ImportQueuePage.c" } else { -#line 128 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 135 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = 0.0; -#line 1059 "ImportQueuePage.c" +#line 1109 "ImportQueuePage.c" } -#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" pct = _tmp0_; -#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = self->priv->progress_bar; -#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_fraction (_tmp5_, pct); -#line 1067 "ImportQueuePage.c" +#line 1117 "ImportQueuePage.c" } @@ -1085,79 +1135,79 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc gchar* _tmp27_ = NULL; gchar* _tmp28_ = NULL; gchar* _tmp29_ = NULL; -#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_THUMBNAIL_SOURCE (source)); -#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); -#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = to_follow; -#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp1_ > 0) { -#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = TRUE; -#line 1101 "ImportQueuePage.c" +#line 1151 "ImportQueuePage.c" } else { gboolean _tmp2_ = FALSE; -#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = !_tmp2_; -#line 1108 "ImportQueuePage.c" +#line 1158 "ImportQueuePage.c" } -#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp0_) { -#line 139 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" return; -#line 1114 "ImportQueuePage.c" +#line 1164 "ImportQueuePage.c" } -#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp3_ = pixbuf; -#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = pixbuf; -#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" dimensions_for_pixbuf (_tmp4_, &_tmp5_); -#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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); -#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp7_ = _tmp6_; -#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)); -#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _data_collection_unref0 (_tmp7_); -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp9_ = source; -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO)) { -#line 1136 "ImportQueuePage.c" +#line 1186 "ImportQueuePage.c" ViewCollection* _tmp10_ = NULL; ViewCollection* _tmp11_ = NULL; ThumbnailSource* _tmp12_ = NULL; PhotoView* _tmp13_ = NULL; PhotoView* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp11_ = _tmp10_; -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp12_ = source; -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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)); -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp14_ = _tmp13_; -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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)); -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp8_ = _tmp15_; -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp14_); -#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _data_collection_unref0 (_tmp11_); -#line 1161 "ImportQueuePage.c" +#line 1211 "ImportQueuePage.c" } else { ViewCollection* _tmp16_ = NULL; ViewCollection* _tmp17_ = NULL; @@ -1165,51 +1215,51 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc VideoView* _tmp19_ = NULL; VideoView* _tmp20_ = NULL; gboolean _tmp21_ = FALSE; -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp17_ = _tmp16_; -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp18_ = source; -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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)); -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp20_ = _tmp19_; -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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)); -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp8_ = _tmp21_; -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp20_); -#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _data_collection_unref0 (_tmp17_); -#line 1187 "ImportQueuePage.c" +#line 1237 "ImportQueuePage.c" } -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp22_ = self->priv->progress_bar; -#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_ellipsize (_tmp22_, PANGO_ELLIPSIZE_MIDDLE); -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp23_ = self->priv->progress_bar; -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp24_ = _ ("Imported %s"); -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp25_ = source; -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp26_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject)); -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp27_ = _tmp26_; -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp28_ = g_strdup_printf (_tmp24_, _tmp27_); -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp29_ = _tmp28_; -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_text (_tmp23_, _tmp29_); -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_free0 (_tmp29_); -#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_free0 (_tmp27_); -#line 1213 "ImportQueuePage.c" +#line 1263 "ImportQueuePage.c" } @@ -1246,182 +1296,182 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm gint _tmp28_ = 0; gint _tmp29_ = 0; BatchImport* _tmp39_ = NULL; -#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_BATCH_IMPORT (batch_import)); -#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_MANIFEST (manifest)); -#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_BATCH_IMPORT_ROLL (import_roll)); -#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = batch_import; -#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp1_ = self->priv->current_batch; -#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (_tmp0_ == _tmp1_, "batch_import == current_batch"); -#line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (self->priv->current_batch); -#line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->current_batch = NULL; -#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp2_ = self->priv->queue; -#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 164 "/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 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp4_ = _tmp3_; -#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (_tmp4_ > 0, "queue.size > 0"); -#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp5_ = self->priv->queue; -#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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); -#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp7_ = (BatchImport*) _tmp6_; -#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp8_ = batch_import; -#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (_tmp7_ == _tmp8_, "queue.get(0) == batch_import"); -#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp7_); -#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp9_ = self->priv->queue; -#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp10_ = batch_import; -#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" removed = _tmp11_; -#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp12_ = removed; -#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _vala_assert (_tmp12_, "removed"); -#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp13_ = self->priv->cancel_unallowed; -#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp14_ = batch_import; -#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp15_ = batch_import; -#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("starting", TYPE_BATCH_IMPORT, &_tmp16_, NULL, FALSE); -#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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); -#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp17_ = batch_import; -#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("preparing", TYPE_BATCH_IMPORT, &_tmp18_, NULL, FALSE); -#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp19_ = batch_import; -#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("progress", TYPE_BATCH_IMPORT, &_tmp20_, NULL, FALSE); -#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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); -#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp21_ = batch_import; -#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("imported", TYPE_BATCH_IMPORT, &_tmp22_, NULL, FALSE); -#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp23_ = batch_import; -#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("import-complete", TYPE_BATCH_IMPORT, &_tmp24_, NULL, FALSE); -#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp25_ = batch_import; -#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_parse_name ("fatal-error", TYPE_BATCH_IMPORT, &_tmp26_, NULL, FALSE); -#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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); -#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp27_ = self->priv->queue; -#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 182 "/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 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp29_ = _tmp28_; -#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp29_ > 0) { -#line 1350 "ImportQueuePage.c" +#line 1400 "ImportQueuePage.c" GeeArrayList* _tmp30_ = NULL; gpointer _tmp31_ = NULL; BatchImport* _tmp32_ = NULL; -#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp30_ = self->priv->queue; -#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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); -#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp32_ = (BatchImport*) _tmp31_; -#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" batch_import_schedule (_tmp32_); -#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp32_); -#line 1364 "ImportQueuePage.c" +#line 1414 "ImportQueuePage.c" } else { GtkProgressBar* _tmp33_ = NULL; GtkProgressBar* _tmp34_ = NULL; GtkProgressBar* _tmp35_ = NULL; gboolean _tmp36_ = FALSE; -#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 186 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp33_ = self->priv->progress_bar; -#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 186 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_ellipsize (_tmp33_, PANGO_ELLIPSIZE_NONE); -#line 180 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 187 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp34_ = self->priv->progress_bar; -#line 180 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 187 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" gtk_progress_bar_set_text (_tmp34_, ""); -#line 181 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 188 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp35_ = self->priv->progress_bar; -#line 181 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" - gtk_progress_bar_set_fraction (_tmp35_, 0.0); #line 188 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + gtk_progress_bar_set_fraction (_tmp35_, 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 191 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 198 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp36_ = self->priv->stopped; -#line 191 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 198 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" if (_tmp36_) { -#line 1388 "ImportQueuePage.c" +#line 1438 "ImportQueuePage.c" AppWindow* _tmp37_ = NULL; AppWindow* _tmp38_ = NULL; -#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp37_ = app_window_get_instance (); -#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp38_ = _tmp37_; -#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#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)); -#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _g_object_unref0 (_tmp38_); -#line 1399 "ImportQueuePage.c" +#line 1449 "ImportQueuePage.c" } -#line 194 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 201 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" self->priv->stopped = FALSE; -#line 1403 "ImportQueuePage.c" +#line 1453 "ImportQueuePage.c" } -#line 197 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 204 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" import_queue_page_update_stop_action (self); -#line 200 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 207 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp39_ = batch_import; -#line 200 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 207 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_signal_emit_by_name (self, "batch-removed", _tmp39_); -#line 1411 "ImportQueuePage.c" +#line 1461 "ImportQueuePage.c" } static void import_queue_page_on_fatal_error (ImportQueuePage* self, ImportResult _result_, const gchar* message) { const gchar* _tmp0_ = NULL; -#line 203 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 210 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self)); -#line 203 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 210 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" g_return_if_fail (message != NULL); -#line 204 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 211 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" _tmp0_ = message; -#line 204 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" +#line 211 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" app_window_error_message (_tmp0_, NULL); -#line 1425 "ImportQueuePage.c" +#line 1475 "ImportQueuePage.c" } @@ -1434,13 +1484,15 @@ static void import_queue_page_class_init (ImportQueuePageClass * klass) { ((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)->add_actions = import_queue_page_real_add_actions; +#line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala" + ((PageClass *) klass)->remove_actions = import_queue_page_real_remove_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 1444 "ImportQueuePage.c" +#line 1496 "ImportQueuePage.c" } @@ -1468,7 +1520,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 1472 "ImportQueuePage.c" +#line 1524 "ImportQueuePage.c" } @@ -1486,7 +1538,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 1490 "ImportQueuePage.c" +#line 1542 "ImportQueuePage.c" } -- cgit v1.2.3