From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 20:55:59 +0200 Subject: New upstream version 0.28.3 --- src/library/LastImportPage.c | 448 ++++++++++++++++++++++++++----------------- 1 file changed, 272 insertions(+), 176 deletions(-) (limited to 'src/library/LastImportPage.c') diff --git a/src/library/LastImportPage.c b/src/library/LastImportPage.c index fae86fe..6fdba61 100644 --- a/src/library/LastImportPage.c +++ b/src/library/LastImportPage.c @@ -1,4 +1,4 @@ -/* LastImportPage.c generated by valac 0.36.6, the Vala compiler +/* LastImportPage.c generated by valac 0.40.4, the Vala compiler * generated from LastImportPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -214,6 +215,11 @@ typedef struct _ImportID ImportID; typedef struct _Alteration Alteration; typedef struct _AlterationClass AlterationClass; +enum { + LAST_IMPORT_PAGE_0_PROPERTY, + LAST_IMPORT_PAGE_NUM_PROPERTIES +}; +static GParamSpec* last_import_page_properties[LAST_IMPORT_PAGE_NUM_PROPERTIES]; #define TYPE_DATA_COLLECTION (data_collection_get_type ()) #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection)) @@ -582,9 +588,15 @@ GType page_window_get_type (void) G_GNUC_CONST; GType fullscreen_window_get_type (void) G_GNUC_CONST; gpointer injection_group_ref (gpointer instance); void injection_group_unref (gpointer instance); -GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_injection_group (GValue* value, gpointer v_object); -void value_take_injection_group (GValue* value, gpointer v_object); +GParamSpec* param_spec_injection_group (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_injection_group (GValue* value, + gpointer v_object); +void value_take_injection_group (GValue* value, + gpointer v_object); gpointer value_get_injection_group (const GValue* value); GType injection_group_get_type (void) G_GNUC_CONST; GType checkerboard_page_get_type (void) G_GNUC_CONST; @@ -598,17 +610,29 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self); gpointer view_filter_ref (gpointer instance); void view_filter_unref (gpointer instance); -GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_filter (GValue* value, gpointer v_object); -void value_take_view_filter (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_filter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_filter (GValue* value, + gpointer v_object); +void value_take_view_filter (GValue* value, + gpointer v_object); gpointer value_get_view_filter (const GValue* value); GType view_filter_get_type (void) G_GNUC_CONST; GType search_view_filter_get_type (void) G_GNUC_CONST; gpointer core_tracker_ref (gpointer instance); void core_tracker_unref (gpointer instance); -GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void core_value_set_tracker (GValue* value, gpointer v_object); -void core_value_take_tracker (GValue* value, gpointer v_object); +GParamSpec* core_param_spec_tracker (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void core_value_set_tracker (GValue* value, + gpointer v_object); +void core_value_take_tracker (GValue* value, + gpointer v_object); gpointer core_value_get_tracker (const GValue* value); GType core_tracker_get_type (void) G_GNUC_CONST; GType core_view_tracker_get_type (void) G_GNUC_CONST; @@ -623,20 +647,29 @@ ImportID* import_id_dup (const ImportID* self); void import_id_free (ImportID* self); gpointer alteration_ref (gpointer instance); void alteration_unref (gpointer instance); -GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_alteration (GValue* value, gpointer v_object); -void value_take_alteration (GValue* value, gpointer v_object); +GParamSpec* param_spec_alteration (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_alteration (GValue* value, + gpointer v_object); +void value_take_alteration (GValue* value, + gpointer v_object); gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; #define LAST_IMPORT_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LAST_IMPORT_PAGE, LastImportPagePrivate)) -enum { - LAST_IMPORT_PAGE_DUMMY_PROPERTY -}; gpointer data_collection_ref (gpointer instance); void data_collection_unref (gpointer instance); -GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_data_collection (GValue* value, gpointer v_object); -void value_take_data_collection (GValue* value, gpointer v_object); +GParamSpec* param_spec_data_collection (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_data_collection (GValue* value, + gpointer v_object); +void value_take_data_collection (GValue* value, + gpointer v_object); gpointer value_get_data_collection (const GValue* value); GType data_collection_get_type (void) G_GNUC_CONST; GType source_collection_get_type (void) G_GNUC_CONST; @@ -644,23 +677,35 @@ GType database_source_collection_get_type (void) G_GNUC_CONST; GType media_source_collection_get_type (void) G_GNUC_CONST; gpointer media_collection_registry_ref (gpointer instance); void media_collection_registry_unref (gpointer instance); -GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_collection_registry (GValue* value, gpointer v_object); -void value_take_media_collection_registry (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_collection_registry (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_collection_registry (GValue* value, + gpointer v_object); +void value_take_media_collection_registry (GValue* value, + gpointer v_object); gpointer value_get_media_collection_registry (const GValue* value); GType media_collection_registry_get_type (void) G_GNUC_CONST; MediaCollectionRegistry* media_collection_registry_get_instance (void); GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self); static void last_import_page_on_import_rolls_altered (LastImportPage* self); -static void _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self); +static void _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, + gpointer self); #define IMPORT_ID_INVALID ((gint64) 0) -void import_id_init (ImportID *self, gint64 id); -Alteration* alteration_new (const gchar* subject, const gchar* detail); -Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail); +void import_id_init (ImportID *self, + gint64 id); +Alteration* alteration_new (const gchar* subject, + const gchar* detail); +Alteration* alteration_construct (GType object_type, + const gchar* subject, + const gchar* detail); #define LAST_IMPORT_PAGE_NAME _ ("Last Import") LastImportPage* last_import_page_new (void); LastImportPage* last_import_page_construct (GType object_type); -CollectionPage* collection_page_construct (GType object_type, const gchar* page_name); +CollectionPage* collection_page_construct (GType object_type, + const gchar* page_name); ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* self); GType view_collection_get_type (void) G_GNUC_CONST; ViewCollection* page_get_view (Page* self); @@ -668,56 +713,90 @@ void view_collection_halt_all_monitoring (ViewCollection* self); void data_collection_clear (DataCollection* self); gpointer view_manager_ref (gpointer instance); void view_manager_unref (gpointer instance); -GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_view_manager (GValue* value, gpointer v_object); -void value_take_view_manager (GValue* value, gpointer v_object); +GParamSpec* param_spec_view_manager (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_view_manager (GValue* value, + gpointer v_object); +void value_take_view_manager (GValue* value, + gpointer v_object); gpointer value_get_view_manager (const GValue* value); GType view_manager_get_type (void) G_GNUC_CONST; gpointer view_collection_monitor_ref (gpointer instance); void view_collection_monitor_unref (gpointer instance); -GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void view_collection_value_set_monitor (GValue* value, gpointer v_object); -void view_collection_value_take_monitor (GValue* value, gpointer v_object); +GParamSpec* view_collection_param_spec_monitor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void view_collection_value_set_monitor (GValue* value, + gpointer v_object); +void view_collection_value_take_monitor (GValue* value, + gpointer v_object); gpointer view_collection_value_get_monitor (const GValue* value); GType view_collection_monitor_get_type (void) G_GNUC_CONST; -ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target); -static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_new (LastImportPage* owner, ImportID* import_id); -static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_construct (GType object_type, LastImportPage* owner, ImportID* import_id); +ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, + SourceCollection* sources, + ViewManager* manager, + Alteration* prereq, + GeeCollection* initial, + ProgressMonitor progress_monitor, + void* progress_monitor_target); +static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_new (LastImportPage* owner, + ImportID* import_id); +static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_construct (GType object_type, + LastImportPage* owner, + ImportID* import_id); GType collection_view_manager_get_type (void) G_GNUC_CONST; static GType last_import_page_last_import_view_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; -static void last_import_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by); +static void last_import_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by); GType configuration_facade_get_type (void) G_GNUC_CONST; GType config_facade_get_type (void) G_GNUC_CONST; ConfigFacade* config_facade_get_instance (void); -void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by); -static void last_import_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by); -void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by); +void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, + gboolean* sort_order, + gint* sort_by); +static void last_import_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by); +void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, + gboolean sort_order, + gint sort_by); #define LAST_IMPORT_PAGE_LAST_IMPORT_VIEW_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, LastImportPageLastImportViewManagerPrivate)) -enum { - LAST_IMPORT_PAGE_LAST_IMPORT_VIEW_MANAGER_DUMMY_PROPERTY -}; CollectionViewManager* collection_view_manager_new (CollectionPage* page); -CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page); -static gboolean last_import_page_last_import_view_manager_real_include_in_view (ViewManager* base, DataSource* source); +CollectionViewManager* collection_view_manager_construct (GType object_type, + CollectionPage* page); +static gboolean last_import_page_last_import_view_manager_real_include_in_view (ViewManager* base, + DataSource* source); GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; -void media_source_get_import_id (MediaSource* self, ImportID* result); +void media_source_get_import_id (MediaSource* self, + ImportID* result); static void last_import_page_last_import_view_manager_finalize (ViewManager * obj); static void last_import_page_finalize (GObject * obj); -static void _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self) { +static void +_last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, + gpointer self) +{ #line 41 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" last_import_page_on_import_rolls_altered ((LastImportPage*) self); -#line 713 "LastImportPage.c" +#line 790 "LastImportPage.c" } -LastImportPage* last_import_page_construct (GType object_type) { +LastImportPage* +last_import_page_construct (GType object_type) +{ LastImportPage * self = NULL; #line 28 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self = (LastImportPage*) collection_page_construct (object_type, LAST_IMPORT_PAGE_NAME); -#line 721 "LastImportPage.c" +#line 800 "LastImportPage.c" { GeeIterator* _col_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -746,57 +825,58 @@ LastImportPage* last_import_page_construct (GType object_type) { _col_it = _tmp5_; #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" while (TRUE) { -#line 750 "LastImportPage.c" +#line 829 "LastImportPage.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSourceCollection* col = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - MediaSourceCollection* _tmp10_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + MediaSourceCollection* _tmp9_; #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp6_ = _col_it; #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" break; -#line 765 "LastImportPage.c" +#line 841 "LastImportPage.c" } #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp8_ = _col_it; + _tmp7_ = _col_it; #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - col = (MediaSourceCollection*) _tmp9_; + col = (MediaSourceCollection*) _tmp8_; #line 32 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp10_ = col; + _tmp9_ = col; #line 32 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - g_signal_connect_object (_tmp10_, "import-roll-altered", (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self, 0); + g_signal_connect_object (_tmp9_, "import-roll-altered", (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self, 0); #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _data_collection_unref0 (col); -#line 779 "LastImportPage.c" +#line 855 "LastImportPage.c" } #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _g_object_unref0 (_col_it); -#line 783 "LastImportPage.c" +#line 859 "LastImportPage.c" } #line 36 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" last_import_page_on_import_rolls_altered (self); #line 27 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return self; -#line 789 "LastImportPage.c" +#line 865 "LastImportPage.c" } -LastImportPage* last_import_page_new (void) { +LastImportPage* +last_import_page_new (void) +{ #line 27 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return last_import_page_construct (TYPE_LAST_IMPORT_PAGE); -#line 796 "LastImportPage.c" +#line 874 "LastImportPage.c" } -static void last_import_page_on_import_rolls_altered (LastImportPage* self) { +static void +last_import_page_on_import_rolls_altered (LastImportPage* self) +{ ImportID* current_last_import_id = NULL; MediaCollectionRegistry* _tmp0_; MediaCollectionRegistry* _tmp1_; @@ -830,7 +910,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { _tmp4_ = current_last_import_id; #line 50 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" if (_tmp4_ == NULL) { -#line 834 "LastImportPage.c" +#line 914 "LastImportPage.c" ViewCollection* _tmp5_; ViewCollection* _tmp6_; ViewCollection* _tmp7_; @@ -855,7 +935,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { _import_id_free0 (current_last_import_id); #line 54 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return; -#line 859 "LastImportPage.c" +#line 939 "LastImportPage.c" } #line 57 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp9_ = current_last_import_id; @@ -871,7 +951,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { _import_id_free0 (current_last_import_id); #line 58 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return; -#line 875 "LastImportPage.c" +#line 955 "LastImportPage.c" } #line 60 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp13_ = current_last_import_id; @@ -893,7 +973,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection)); #line 63 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _data_collection_unref0 (_tmp17_); -#line 897 "LastImportPage.c" +#line 977 "LastImportPage.c" { GeeIterator* _col_it = NULL; MediaCollectionRegistry* _tmp18_; @@ -922,76 +1002,77 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { _col_it = _tmp23_; #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" while (TRUE) { -#line 926 "LastImportPage.c" +#line 1006 "LastImportPage.c" GeeIterator* _tmp24_; - gboolean _tmp25_; MediaSourceCollection* col = NULL; - GeeIterator* _tmp26_; - gpointer _tmp27_; + GeeIterator* _tmp25_; + gpointer _tmp26_; + ViewCollection* _tmp27_; ViewCollection* _tmp28_; - ViewCollection* _tmp29_; - MediaSourceCollection* _tmp30_; - ImportID _tmp31_; + MediaSourceCollection* _tmp29_; + ImportID _tmp30_; + LastImportPageLastImportViewManager* _tmp31_; LastImportPageLastImportViewManager* _tmp32_; - LastImportPageLastImportViewManager* _tmp33_; - Alteration* _tmp34_; + Alteration* _tmp33_; + ViewCollectionMonitor* _tmp34_; ViewCollectionMonitor* _tmp35_; - ViewCollectionMonitor* _tmp36_; #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp24_ = _col_it; #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp25_ = gee_iterator_next (_tmp24_); -#line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - if (!_tmp25_) { + if (!gee_iterator_next (_tmp24_)) { #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" break; -#line 949 "LastImportPage.c" +#line 1026 "LastImportPage.c" } #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp26_ = _col_it; + _tmp25_ = _col_it; #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp27_ = gee_iterator_get (_tmp26_); + _tmp26_ = gee_iterator_get (_tmp25_); #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - col = (MediaSourceCollection*) _tmp27_; + col = (MediaSourceCollection*) _tmp26_; #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); + _tmp27_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp29_ = _tmp28_; + _tmp28_ = _tmp27_; #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp30_ = col; + _tmp29_ = col; #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp31_ = self->priv->last_import_id; + _tmp30_ = self->priv->last_import_id; #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp32_ = last_import_page_last_import_view_manager_new (self, &_tmp31_); + _tmp31_ = last_import_page_last_import_view_manager_new (self, &_tmp30_); #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp33_ = _tmp32_; + _tmp32_ = _tmp31_; #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp34_ = self->priv->last_import_alteration; + _tmp33_ = self->priv->last_import_alteration; #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp35_ = view_collection_monitor_source_collection (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_VIEW_MANAGER, ViewManager), _tmp34_, NULL, NULL, NULL); + _tmp34_ = view_collection_monitor_source_collection (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_VIEW_MANAGER, ViewManager), _tmp33_, NULL, NULL, NULL); #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp36_ = _tmp35_; + _tmp35_ = _tmp34_; #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _view_collection_monitor_unref0 (_tmp36_); + _view_collection_monitor_unref0 (_tmp35_); #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _view_manager_unref0 (_tmp33_); + _view_manager_unref0 (_tmp32_); #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _data_collection_unref0 (_tmp29_); + _data_collection_unref0 (_tmp28_); #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _data_collection_unref0 (col); -#line 983 "LastImportPage.c" +#line 1060 "LastImportPage.c" } #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _g_object_unref0 (_col_it); -#line 987 "LastImportPage.c" +#line 1064 "LastImportPage.c" } #line 45 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _import_id_free0 (current_last_import_id); -#line 991 "LastImportPage.c" +#line 1068 "LastImportPage.c" } -static void last_import_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) { +static void +last_import_page_real_get_config_photos_sort (MediaPage* base, + gboolean* sort_order, + gint* sort_by) +{ LastImportPage * self; gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; @@ -1017,23 +1098,25 @@ static void last_import_page_real_get_config_photos_sort (MediaPage* base, gbool if (sort_order) { #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" *sort_order = _vala_sort_order; -#line 1021 "LastImportPage.c" +#line 1102 "LastImportPage.c" } #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" if (sort_by) { #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" *sort_by = _vala_sort_by; -#line 1027 "LastImportPage.c" +#line 1108 "LastImportPage.c" } } -static void last_import_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { +static void +last_import_page_real_set_config_photos_sort (MediaPage* base, + gboolean sort_order, + gint sort_by) +{ LastImportPage * self; ConfigFacade* _tmp0_; ConfigFacade* _tmp1_; - gboolean _tmp2_; - gint _tmp3_; #line 75 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LAST_IMPORT_PAGE, LastImportPage); #line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -1041,77 +1124,79 @@ static void last_import_page_real_set_config_photos_sort (MediaPage* base, gbool #line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp1_ = _tmp0_; #line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp2_ = sort_order; -#line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp3_ = sort_by; -#line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); + configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), sort_order, sort_by); #line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _g_object_unref0 (_tmp1_); -#line 1052 "LastImportPage.c" +#line 1131 "LastImportPage.c" } -static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_construct (GType object_type, LastImportPage* owner, ImportID* import_id) { +static LastImportPageLastImportViewManager* +last_import_page_last_import_view_manager_construct (GType object_type, + LastImportPage* owner, + ImportID* import_id) +{ LastImportPageLastImportViewManager* self = NULL; - LastImportPage* _tmp0_; - ImportID _tmp1_; + ImportID _tmp0_; #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" g_return_val_if_fail (IS_LAST_IMPORT_PAGE (owner), NULL); #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" g_return_val_if_fail (import_id != NULL, NULL); #line 14 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp0_ = owner; -#line 14 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - self = (LastImportPageLastImportViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage)); + self = (LastImportPageLastImportViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, TYPE_COLLECTION_PAGE, CollectionPage)); #line 16 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp1_ = *import_id; + _tmp0_ = *import_id; #line 16 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - self->priv->import_id = _tmp1_; + self->priv->import_id = _tmp0_; #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return self; -#line 1074 "LastImportPage.c" +#line 1154 "LastImportPage.c" } -static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_new (LastImportPage* owner, ImportID* import_id) { +static LastImportPageLastImportViewManager* +last_import_page_last_import_view_manager_new (LastImportPage* owner, + ImportID* import_id) +{ #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return last_import_page_last_import_view_manager_construct (LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, owner, import_id); -#line 1081 "LastImportPage.c" +#line 1164 "LastImportPage.c" } -static gboolean last_import_page_last_import_view_manager_real_include_in_view (ViewManager* base, DataSource* source) { +static gboolean +last_import_page_last_import_view_manager_real_include_in_view (ViewManager* base, + DataSource* source) +{ LastImportPageLastImportViewManager * self; gboolean result = FALSE; - DataSource* _tmp0_; - ImportID _tmp1_ = {0}; - gint64 _tmp2_; - ImportID _tmp3_; - gint64 _tmp4_; + ImportID _tmp0_ = {0}; + gint64 _tmp1_; + ImportID _tmp2_; + gint64 _tmp3_; #line 19 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, LastImportPageLastImportViewManager); #line 19 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE); #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp0_ = source; + media_source_get_import_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource), &_tmp0_); #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - media_source_get_import_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp1_); + _tmp1_ = _tmp0_.id; #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp2_ = _tmp1_.id; + _tmp2_ = self->priv->import_id; #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp3_ = self->priv->import_id; + _tmp3_ = _tmp2_.id; #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp4_ = _tmp3_.id; -#line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - result = _tmp2_ == _tmp4_; + result = _tmp1_ == _tmp3_; #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" return result; -#line 1111 "LastImportPage.c" +#line 1194 "LastImportPage.c" } -static void last_import_page_last_import_view_manager_class_init (LastImportPageLastImportViewManagerClass * klass) { +static void +last_import_page_last_import_view_manager_class_init (LastImportPageLastImportViewManagerClass * klass) +{ #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" last_import_page_last_import_view_manager_parent_class = g_type_class_peek_parent (klass); #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -1120,28 +1205,34 @@ static void last_import_page_last_import_view_manager_class_init (LastImportPage g_type_class_add_private (klass, sizeof (LastImportPageLastImportViewManagerPrivate)); #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) last_import_page_last_import_view_manager_real_include_in_view; -#line 1124 "LastImportPage.c" +#line 1209 "LastImportPage.c" } -static void last_import_page_last_import_view_manager_instance_init (LastImportPageLastImportViewManager * self) { +static void +last_import_page_last_import_view_manager_instance_init (LastImportPageLastImportViewManager * self) +{ #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self->priv = LAST_IMPORT_PAGE_LAST_IMPORT_VIEW_MANAGER_GET_PRIVATE (self); -#line 1131 "LastImportPage.c" +#line 1218 "LastImportPage.c" } -static void last_import_page_last_import_view_manager_finalize (ViewManager * obj) { +static void +last_import_page_last_import_view_manager_finalize (ViewManager * obj) +{ LastImportPageLastImportViewManager * self; #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, LastImportPageLastImportViewManager); #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" VIEW_MANAGER_CLASS (last_import_page_last_import_view_manager_parent_class)->finalize (obj); -#line 1141 "LastImportPage.c" +#line 1230 "LastImportPage.c" } -static GType last_import_page_last_import_view_manager_get_type (void) { +static GType +last_import_page_last_import_view_manager_get_type (void) +{ static volatile gsize last_import_page_last_import_view_manager_type_id__volatile = 0; if (g_once_init_enter (&last_import_page_last_import_view_manager_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LastImportPageLastImportViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) last_import_page_last_import_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LastImportPageLastImportViewManager), 0, (GInstanceInitFunc) last_import_page_last_import_view_manager_instance_init, NULL }; @@ -1153,7 +1244,9 @@ static GType last_import_page_last_import_view_manager_get_type (void) { } -static void last_import_page_class_init (LastImportPageClass * klass) { +static void +last_import_page_class_init (LastImportPageClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" last_import_page_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -1164,11 +1257,13 @@ static void last_import_page_class_init (LastImportPageClass * klass) { ((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) last_import_page_real_set_config_photos_sort; #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" G_OBJECT_CLASS (klass)->finalize = last_import_page_finalize; -#line 1168 "LastImportPage.c" +#line 1261 "LastImportPage.c" } -static void last_import_page_instance_init (LastImportPage * self) { +static void +last_import_page_instance_init (LastImportPage * self) +{ Alteration* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self->priv = LAST_IMPORT_PAGE_GET_PRIVATE (self); @@ -1178,15 +1273,17 @@ static void last_import_page_instance_init (LastImportPage * self) { _tmp0_ = alteration_new ("metadata", "import-id"); #line 25 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self->priv->last_import_alteration = _tmp0_; -#line 1182 "LastImportPage.c" +#line 1277 "LastImportPage.c" } -static void last_import_page_finalize (GObject * obj) { +static void +last_import_page_finalize (GObject * obj) +{ LastImportPage * self; #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LAST_IMPORT_PAGE, LastImportPage); -#line 1190 "LastImportPage.c" +#line 1287 "LastImportPage.c" { GeeIterator* _col_it = NULL; MediaCollectionRegistry* _tmp0_; @@ -1215,53 +1312,52 @@ static void last_import_page_finalize (GObject * obj) { _col_it = _tmp5_; #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" while (TRUE) { -#line 1219 "LastImportPage.c" +#line 1316 "LastImportPage.c" GeeIterator* _tmp6_; - gboolean _tmp7_; MediaSourceCollection* col = NULL; - GeeIterator* _tmp8_; - gpointer _tmp9_; - MediaSourceCollection* _tmp10_; - guint _tmp11_; + GeeIterator* _tmp7_; + gpointer _tmp8_; + MediaSourceCollection* _tmp9_; + guint _tmp10_; #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp6_ = _col_it; #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp7_ = gee_iterator_next (_tmp6_); -#line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - if (!_tmp7_) { + if (!gee_iterator_next (_tmp6_)) { #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" break; -#line 1235 "LastImportPage.c" +#line 1329 "LastImportPage.c" } #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp8_ = _col_it; + _tmp7_ = _col_it; #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp9_ = gee_iterator_get (_tmp8_); + _tmp8_ = gee_iterator_get (_tmp7_); #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - col = (MediaSourceCollection*) _tmp9_; + col = (MediaSourceCollection*) _tmp8_; #line 41 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - _tmp10_ = col; + _tmp9_ = col; #line 41 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - g_signal_parse_name ("import-roll-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp11_, NULL, FALSE); + g_signal_parse_name ("import-roll-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp10_, NULL, FALSE); #line 41 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self); + g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self); #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _data_collection_unref0 (col); -#line 1251 "LastImportPage.c" +#line 1345 "LastImportPage.c" } #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _g_object_unref0 (_col_it); -#line 1255 "LastImportPage.c" +#line 1349 "LastImportPage.c" } #line 25 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _alteration_unref0 (self->priv->last_import_alteration); #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" G_OBJECT_CLASS (last_import_page_parent_class)->finalize (obj); -#line 1261 "LastImportPage.c" +#line 1355 "LastImportPage.c" } -GType last_import_page_get_type (void) { +GType +last_import_page_get_type (void) +{ static volatile gsize last_import_page_type_id__volatile = 0; if (g_once_init_enter (&last_import_page_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (LastImportPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) last_import_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LastImportPage), 0, (GInstanceInitFunc) last_import_page_instance_init, NULL }; -- cgit v1.2.3