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/folders/Page.c | 88 +++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) (limited to 'src/folders/Page.c') diff --git a/src/folders/Page.c b/src/folders/Page.c index 3c05b3e..49bb21a 100644 --- a/src/folders/Page.c +++ b/src/folders/Page.c @@ -1,4 +1,4 @@ -/* Page.c generated by valac 0.34.7, the Vala compiler +/* Page.c generated by valac 0.36.6, the Vala compiler * generated from Page.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -675,17 +675,17 @@ static gboolean folders_page_folder_view_manager_real_include_in_view (ViewManag GType thumbnail_source_get_type (void) G_GNUC_CONST; GType media_source_get_type (void) G_GNUC_CONST; GFile* media_source_get_file (MediaSource* self); -static void folders_page_folder_view_manager_finalize (ViewManager* obj); -static void folders_page_finalize (GObject* obj); +static void folders_page_folder_view_manager_finalize (ViewManager * obj); +static void folders_page_finalize (GObject * obj); FoldersPage* folders_page_construct (GType object_type, GFile* dir) { FoldersPage * self = NULL; - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - FoldersPageFolderViewManager* _tmp4_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + GFile* _tmp3_; + FoldersPageFolderViewManager* _tmp4_; #line 24 "/home/jens/Source/shotwell/src/folders/Page.vala" g_return_val_if_fail (G_IS_FILE (dir), NULL); #line 25 "/home/jens/Source/shotwell/src/folders/Page.vala" @@ -709,12 +709,12 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) { #line 710 "Page.c" { GeeIterator* _sources_it = NULL; - MediaCollectionRegistry* _tmp5_ = NULL; - MediaCollectionRegistry* _tmp6_ = NULL; - GeeCollection* _tmp7_ = NULL; - GeeCollection* _tmp8_ = NULL; - GeeIterator* _tmp9_ = NULL; - GeeIterator* _tmp10_ = NULL; + MediaCollectionRegistry* _tmp5_; + MediaCollectionRegistry* _tmp6_; + GeeCollection* _tmp7_; + GeeCollection* _tmp8_; + GeeIterator* _tmp9_; + GeeIterator* _tmp10_; #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala" _tmp5_ = media_collection_registry_get_instance (); #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala" @@ -736,17 +736,17 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) { #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala" while (TRUE) { #line 739 "Page.c" - GeeIterator* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; + GeeIterator* _tmp11_; + gboolean _tmp12_; MediaSourceCollection* sources = NULL; - GeeIterator* _tmp13_ = NULL; - gpointer _tmp14_ = NULL; - ViewCollection* _tmp15_ = NULL; - ViewCollection* _tmp16_ = NULL; - MediaSourceCollection* _tmp17_ = NULL; - FoldersPageFolderViewManager* _tmp18_ = NULL; - ViewCollectionMonitor* _tmp19_ = NULL; - ViewCollectionMonitor* _tmp20_ = NULL; + GeeIterator* _tmp13_; + gpointer _tmp14_; + ViewCollection* _tmp15_; + ViewCollection* _tmp16_; + MediaSourceCollection* _tmp17_; + FoldersPageFolderViewManager* _tmp18_; + ViewCollectionMonitor* _tmp19_; + ViewCollectionMonitor* _tmp20_; #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala" _tmp11_ = _sources_it; #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala" @@ -804,8 +804,8 @@ static void folders_page_real_get_config_photos_sort (MediaPage* base, gboolean* FoldersPage * 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 33 "/home/jens/Source/shotwell/src/folders/Page.vala" @@ -839,10 +839,10 @@ static void folders_page_real_get_config_photos_sort (MediaPage* base, gboolean* static void folders_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) { FoldersPage * self; - ConfigFacade* _tmp0_ = NULL; - ConfigFacade* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gint _tmp3_ = 0; + ConfigFacade* _tmp0_; + ConfigFacade* _tmp1_; + gboolean _tmp2_; + gint _tmp3_; #line 37 "/home/jens/Source/shotwell/src/folders/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_PAGE, FoldersPage); #line 38 "/home/jens/Source/shotwell/src/folders/Page.vala" @@ -870,9 +870,9 @@ static gpointer _g_object_ref0 (gpointer self) { static FoldersPageFolderViewManager* folders_page_folder_view_manager_construct (GType object_type, FoldersPage* owner, GFile* dir) { FoldersPageFolderViewManager* self = NULL; - FoldersPage* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; + FoldersPage* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; #line 11 "/home/jens/Source/shotwell/src/folders/Page.vala" g_return_val_if_fail (FOLDERS_IS_PAGE (owner), NULL); #line 11 "/home/jens/Source/shotwell/src/folders/Page.vala" @@ -905,12 +905,12 @@ static FoldersPageFolderViewManager* folders_page_folder_view_manager_new (Folde static gboolean folders_page_folder_view_manager_real_include_in_view (ViewManager* base, DataSource* source) { FoldersPageFolderViewManager * self; gboolean result = FALSE; - DataSource* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; + DataSource* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; + GFile* _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; #line 17 "/home/jens/Source/shotwell/src/folders/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_PAGE_TYPE_FOLDER_VIEW_MANAGER, FoldersPageFolderViewManager); #line 17 "/home/jens/Source/shotwell/src/folders/Page.vala" @@ -943,7 +943,7 @@ static void folders_page_folder_view_manager_class_init (FoldersPageFolderViewMa #line 8 "/home/jens/Source/shotwell/src/folders/Page.vala" ((ViewManagerClass *) klass)->finalize = folders_page_folder_view_manager_finalize; #line 8 "/home/jens/Source/shotwell/src/folders/Page.vala" - ((ViewManagerClass *) klass)->include_in_view = (gboolean (*)(ViewManager*, DataSource*)) folders_page_folder_view_manager_real_include_in_view; + ((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) folders_page_folder_view_manager_real_include_in_view; #line 948 "Page.c" } @@ -952,7 +952,7 @@ static void folders_page_folder_view_manager_instance_init (FoldersPageFolderVie } -static void folders_page_folder_view_manager_finalize (ViewManager* obj) { +static void folders_page_folder_view_manager_finalize (ViewManager * obj) { FoldersPageFolderViewManager * self; #line 8 "/home/jens/Source/shotwell/src/folders/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_PAGE_TYPE_FOLDER_VIEW_MANAGER, FoldersPageFolderViewManager); @@ -982,9 +982,9 @@ static void folders_page_class_init (FoldersPageClass * klass) { #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala" g_type_class_add_private (klass, sizeof (FoldersPagePrivate)); #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala" - ((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) folders_page_real_get_config_photos_sort; + ((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) folders_page_real_get_config_photos_sort; #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala" - ((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) folders_page_real_set_config_photos_sort; + ((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) folders_page_real_set_config_photos_sort; #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala" G_OBJECT_CLASS (klass)->finalize = folders_page_finalize; #line 991 "Page.c" @@ -998,7 +998,7 @@ static void folders_page_instance_init (FoldersPage * self) { } -static void folders_page_finalize (GObject* obj) { +static void folders_page_finalize (GObject * obj) { FoldersPage * self; #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_PAGE, FoldersPage); -- cgit v1.2.3