From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- src/library/LastImportPage.c | 162 +++++++++++++++++++++---------------------- 1 file changed, 81 insertions(+), 81 deletions(-) (limited to 'src/library/LastImportPage.c') diff --git a/src/library/LastImportPage.c b/src/library/LastImportPage.c index 41a084f..fae86fe 100644 --- a/src/library/LastImportPage.c +++ b/src/library/LastImportPage.c @@ -1,4 +1,4 @@ -/* LastImportPage.c generated by valac 0.34.7, the Vala compiler +/* LastImportPage.c generated by valac 0.36.6, the Vala compiler * generated from LastImportPage.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -702,8 +702,8 @@ static gboolean last_import_page_last_import_view_manager_real_include_in_view ( 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); -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_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) { @@ -720,12 +720,12 @@ LastImportPage* last_import_page_construct (GType object_type) { #line 721 "LastImportPage.c" { GeeIterator* _col_it = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp0_ = media_collection_registry_get_instance (); #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -747,12 +747,12 @@ LastImportPage* last_import_page_construct (GType object_type) { #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" while (TRUE) { #line 750 "LastImportPage.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; MediaSourceCollection* col = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - MediaSourceCollection* _tmp10_ = NULL; + GeeIterator* _tmp8_; + gpointer _tmp9_; + MediaSourceCollection* _tmp10_; #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp6_ = _col_it; #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -798,20 +798,20 @@ LastImportPage* last_import_page_new (void) { static void last_import_page_on_import_rolls_altered (LastImportPage* self) { ImportID* current_last_import_id = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - ImportID* _tmp2_ = NULL; - ImportID* _tmp3_ = NULL; - ImportID* _tmp4_ = NULL; - ImportID* _tmp9_ = NULL; - gint64 _tmp10_ = 0LL; - ImportID _tmp11_ = {0}; - gint64 _tmp12_ = 0LL; - ImportID* _tmp13_ = NULL; - ViewCollection* _tmp14_ = NULL; - ViewCollection* _tmp15_ = NULL; - ViewCollection* _tmp16_ = NULL; - ViewCollection* _tmp17_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + ImportID* _tmp2_; + ImportID* _tmp3_; + ImportID* _tmp4_; + ImportID* _tmp9_; + gint64 _tmp10_; + ImportID _tmp11_; + gint64 _tmp12_; + ImportID* _tmp13_; + ViewCollection* _tmp14_; + ViewCollection* _tmp15_; + ViewCollection* _tmp16_; + ViewCollection* _tmp17_; #line 45 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" g_return_if_fail (IS_LAST_IMPORT_PAGE (self)); #line 47 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -831,10 +831,10 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { #line 50 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" if (_tmp4_ == NULL) { #line 834 "LastImportPage.c" - ViewCollection* _tmp5_ = NULL; - ViewCollection* _tmp6_ = NULL; - ViewCollection* _tmp7_ = NULL; - ViewCollection* _tmp8_ = NULL; + ViewCollection* _tmp5_; + ViewCollection* _tmp6_; + ViewCollection* _tmp7_; + ViewCollection* _tmp8_; #line 51 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); #line 51 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -896,12 +896,12 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { #line 897 "LastImportPage.c" { GeeIterator* _col_it = NULL; - MediaCollectionRegistry* _tmp18_ = NULL; - MediaCollectionRegistry* _tmp19_ = NULL; - GeeCollection* _tmp20_ = NULL; - GeeCollection* _tmp21_ = NULL; - GeeIterator* _tmp22_ = NULL; - GeeIterator* _tmp23_ = NULL; + MediaCollectionRegistry* _tmp18_; + MediaCollectionRegistry* _tmp19_; + GeeCollection* _tmp20_; + GeeCollection* _tmp21_; + GeeIterator* _tmp22_; + GeeIterator* _tmp23_; #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp18_ = media_collection_registry_get_instance (); #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -923,20 +923,20 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) { #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" while (TRUE) { #line 926 "LastImportPage.c" - GeeIterator* _tmp24_ = NULL; - gboolean _tmp25_ = FALSE; + GeeIterator* _tmp24_; + gboolean _tmp25_; MediaSourceCollection* col = NULL; - GeeIterator* _tmp26_ = NULL; - gpointer _tmp27_ = NULL; - ViewCollection* _tmp28_ = NULL; - ViewCollection* _tmp29_ = NULL; - MediaSourceCollection* _tmp30_ = NULL; - ImportID _tmp31_ = {0}; - LastImportPageLastImportViewManager* _tmp32_ = NULL; - LastImportPageLastImportViewManager* _tmp33_ = NULL; - Alteration* _tmp34_ = NULL; - ViewCollectionMonitor* _tmp35_ = NULL; - ViewCollectionMonitor* _tmp36_ = NULL; + GeeIterator* _tmp26_; + gpointer _tmp27_; + ViewCollection* _tmp28_; + ViewCollection* _tmp29_; + MediaSourceCollection* _tmp30_; + ImportID _tmp31_; + LastImportPageLastImportViewManager* _tmp32_; + LastImportPageLastImportViewManager* _tmp33_; + Alteration* _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" @@ -995,8 +995,8 @@ static void last_import_page_real_get_config_photos_sort (MediaPage* base, gbool LastImportPage * self; gboolean _vala_sort_order = FALSE; gint _vala_sort_by = 0; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; gboolean _tmp2_ = FALSE; gint _tmp3_ = 0; #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -1030,10 +1030,10 @@ static void last_import_page_real_get_config_photos_sort (MediaPage* base, gbool static void last_import_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { LastImportPage * self; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gint _tmp3_ = 0; + 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" @@ -1054,8 +1054,8 @@ static void last_import_page_real_set_config_photos_sort (MediaPage* base, gbool static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_construct (GType object_type, LastImportPage* owner, ImportID* import_id) { LastImportPageLastImportViewManager* self = NULL; - LastImportPage* _tmp0_ = NULL; - ImportID _tmp1_ = {0}; + LastImportPage* _tmp0_; + ImportID _tmp1_; #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" @@ -1084,11 +1084,11 @@ static LastImportPageLastImportViewManager* last_import_page_last_import_view_ma static gboolean last_import_page_last_import_view_manager_real_include_in_view (ViewManager* base, DataSource* source) { LastImportPageLastImportViewManager * self; gboolean result = FALSE; - DataSource* _tmp0_ = NULL; + DataSource* _tmp0_; ImportID _tmp1_ = {0}; - gint64 _tmp2_ = 0LL; - ImportID _tmp3_ = {0}; - gint64 _tmp4_ = 0LL; + gint64 _tmp2_; + ImportID _tmp3_; + gint64 _tmp4_; #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" @@ -1119,7 +1119,7 @@ static void last_import_page_last_import_view_manager_class_init (LastImportPage #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" 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; + ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) last_import_page_last_import_view_manager_real_include_in_view; #line 1124 "LastImportPage.c" } @@ -1131,7 +1131,7 @@ static void last_import_page_last_import_view_manager_instance_init (LastImportP } -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); @@ -1159,9 +1159,9 @@ static void last_import_page_class_init (LastImportPageClass * klass) { #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" g_type_class_add_private (klass, sizeof (LastImportPagePrivate)); #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - ((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) last_import_page_real_get_config_photos_sort; + ((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) last_import_page_real_get_config_photos_sort; #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" - ((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) last_import_page_real_set_config_photos_sort; + ((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" @@ -1169,7 +1169,7 @@ static void last_import_page_class_init (LastImportPageClass * klass) { static void last_import_page_instance_init (LastImportPage * self) { - Alteration* _tmp0_ = NULL; + Alteration* _tmp0_; #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" self->priv = LAST_IMPORT_PAGE_GET_PRIVATE (self); #line 24 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -1182,19 +1182,19 @@ static void last_import_page_instance_init (LastImportPage * self) { } -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" { GeeIterator* _col_it = NULL; - MediaCollectionRegistry* _tmp0_ = NULL; - MediaCollectionRegistry* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; - GeeIterator* _tmp5_ = NULL; + MediaCollectionRegistry* _tmp0_; + MediaCollectionRegistry* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; + GeeIterator* _tmp5_; #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp0_ = media_collection_registry_get_instance (); #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" @@ -1216,13 +1216,13 @@ static void last_import_page_finalize (GObject* obj) { #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" while (TRUE) { #line 1219 "LastImportPage.c" - GeeIterator* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + GeeIterator* _tmp6_; + gboolean _tmp7_; MediaSourceCollection* col = NULL; - GeeIterator* _tmp8_ = NULL; - gpointer _tmp9_ = NULL; - MediaSourceCollection* _tmp10_ = NULL; - guint _tmp11_ = 0U; + GeeIterator* _tmp8_; + gpointer _tmp9_; + MediaSourceCollection* _tmp10_; + guint _tmp11_; #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" _tmp6_ = _col_it; #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala" -- cgit v1.2.3