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/folders/Branch.c | 8 ++++---- src/folders/Folders.c | 2 +- src/folders/Page.c | 45 +++++++++++++++++++++++---------------------- 3 files changed, 28 insertions(+), 27 deletions(-) (limited to 'src/folders') diff --git a/src/folders/Branch.c b/src/folders/Branch.c index d44aff9..f5962f6 100644 --- a/src/folders/Branch.c +++ b/src/folders/Branch.c @@ -1,4 +1,4 @@ -/* Branch.c generated by valac 0.32.1, the Vala compiler +/* Branch.c generated by valac 0.34.4, the Vala compiler * generated from Branch.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -998,7 +998,7 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) { #line 73 "/home/jens/Source/shotwell/src/folders/Branch.vala" file = _tmp1_; #line 75 "/home/jens/Source/shotwell/src/folders/Branch.vala" - _tmp2_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp2_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); #line 75 "/home/jens/Source/shotwell/src/folders/Branch.vala" elements = _tmp2_; #line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala" @@ -1497,7 +1497,7 @@ static void folders_branch_instance_init (FoldersBranch * self) { #line 7 "/home/jens/Source/shotwell/src/folders/Branch.vala" self->priv = FOLDERS_BRANCH_GET_PRIVATE (self); #line 8 "/home/jens/Source/shotwell/src/folders/Branch.vala" - _tmp0_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, FOLDERS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, FOLDERS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL); #line 8 "/home/jens/Source/shotwell/src/folders/Branch.vala" self->priv->entries = _tmp0_; #line 1504 "Branch.c" @@ -1982,7 +1982,7 @@ static void folders_sidebar_entry_class_init (FoldersSidebarEntryClass * klass) #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" G_OBJECT_CLASS (klass)->finalize = folders_sidebar_entry_finalize; #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" - g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_DIR, g_param_spec_object ("dir", "dir", "dir", G_TYPE_FILE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_DIR, g_param_spec_object ("dir", "dir", "dir", g_file_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COLLATION, g_param_spec_string ("collation", "collation", "collation", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala" diff --git a/src/folders/Folders.c b/src/folders/Folders.c index d9af95a..ab4c085 100644 --- a/src/folders/Folders.c +++ b/src/folders/Folders.c @@ -1,4 +1,4 @@ -/* Folders.c generated by valac 0.32.1, the Vala compiler +/* Folders.c generated by valac 0.34.4, the Vala compiler * generated from Folders.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/src/folders/Page.c b/src/folders/Page.c index 03bbd48..c451234 100644 --- a/src/folders/Page.c +++ b/src/folders/Page.c @@ -1,4 +1,4 @@ -/* Page.c generated by valac 0.32.1, the Vala compiler +/* Page.c generated by valac 0.34.4, the Vala compiler * generated from Page.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -12,9 +12,9 @@ #include #include #include +#include #include #include -#include #define TYPE_PAGE (page_get_type ()) @@ -380,7 +380,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); @@ -705,7 +706,7 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) { _view_manager_unref0 (self->priv->view_manager); #line 27 "/home/jens/Source/shotwell/src/folders/Page.vala" self->priv->view_manager = _tmp4_; -#line 709 "Page.c" +#line 710 "Page.c" { GeeIterator* _sources_it = NULL; MediaCollectionRegistry* _tmp5_ = NULL; @@ -734,7 +735,7 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) { _sources_it = _tmp10_; #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala" while (TRUE) { -#line 738 "Page.c" +#line 739 "Page.c" GeeIterator* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; MediaSourceCollection* sources = NULL; @@ -754,7 +755,7 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) { if (!_tmp12_) { #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala" break; -#line 758 "Page.c" +#line 759 "Page.c" } #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala" _tmp13_ = _sources_it; @@ -780,22 +781,22 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) { _data_collection_unref0 (_tmp16_); #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala" _data_collection_unref0 (sources); -#line 784 "Page.c" +#line 785 "Page.c" } #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala" _g_object_unref0 (_sources_it); -#line 788 "Page.c" +#line 789 "Page.c" } #line 24 "/home/jens/Source/shotwell/src/folders/Page.vala" return self; -#line 792 "Page.c" +#line 793 "Page.c" } FoldersPage* folders_page_new (GFile* dir) { #line 24 "/home/jens/Source/shotwell/src/folders/Page.vala" return folders_page_construct (FOLDERS_TYPE_PAGE, dir); -#line 799 "Page.c" +#line 800 "Page.c" } @@ -825,13 +826,13 @@ static void folders_page_real_get_config_photos_sort (MediaPage* base, gboolean* if (sort_order) { #line 33 "/home/jens/Source/shotwell/src/folders/Page.vala" *sort_order = _vala_sort_order; -#line 829 "Page.c" +#line 830 "Page.c" } #line 33 "/home/jens/Source/shotwell/src/folders/Page.vala" if (sort_by) { #line 33 "/home/jens/Source/shotwell/src/folders/Page.vala" *sort_by = _vala_sort_by; -#line 835 "Page.c" +#line 836 "Page.c" } } @@ -856,14 +857,14 @@ static void folders_page_real_set_config_photos_sort (MediaPage* base, gboolean configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); #line 38 "/home/jens/Source/shotwell/src/folders/Page.vala" _g_object_unref0 (_tmp1_); -#line 860 "Page.c" +#line 861 "Page.c" } static gpointer _g_object_ref0 (gpointer self) { #line 14 "/home/jens/Source/shotwell/src/folders/Page.vala" return self ? g_object_ref (self) : NULL; -#line 867 "Page.c" +#line 868 "Page.c" } @@ -890,14 +891,14 @@ static FoldersPageFolderViewManager* folders_page_folder_view_manager_construct self->dir = _tmp2_; #line 11 "/home/jens/Source/shotwell/src/folders/Page.vala" return self; -#line 894 "Page.c" +#line 895 "Page.c" } static FoldersPageFolderViewManager* folders_page_folder_view_manager_new (FoldersPage* owner, GFile* dir) { #line 11 "/home/jens/Source/shotwell/src/folders/Page.vala" return folders_page_folder_view_manager_construct (FOLDERS_PAGE_TYPE_FOLDER_VIEW_MANAGER, owner, dir); -#line 901 "Page.c" +#line 902 "Page.c" } @@ -932,7 +933,7 @@ static gboolean folders_page_folder_view_manager_real_include_in_view (ViewManag result = _tmp5_; #line 18 "/home/jens/Source/shotwell/src/folders/Page.vala" return result; -#line 936 "Page.c" +#line 937 "Page.c" } @@ -943,7 +944,7 @@ static void folders_page_folder_view_manager_class_init (FoldersPageFolderViewMa ((ViewManagerClass *) klass)->finalize = folders_page_folder_view_manager_finalize; #line 8 "/home/jens/Source/shotwell/src/folders/Page.vala" ((ViewManagerClass *) klass)->include_in_view = folders_page_folder_view_manager_real_include_in_view; -#line 947 "Page.c" +#line 948 "Page.c" } @@ -959,7 +960,7 @@ static void folders_page_folder_view_manager_finalize (ViewManager* obj) { _g_object_unref0 (self->dir); #line 8 "/home/jens/Source/shotwell/src/folders/Page.vala" VIEW_MANAGER_CLASS (folders_page_folder_view_manager_parent_class)->finalize (obj); -#line 963 "Page.c" +#line 964 "Page.c" } @@ -986,14 +987,14 @@ static void folders_page_class_init (FoldersPageClass * klass) { ((MediaPageClass *) klass)->set_config_photos_sort = 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 990 "Page.c" +#line 991 "Page.c" } static void folders_page_instance_init (FoldersPage * self) { #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala" self->priv = FOLDERS_PAGE_GET_PRIVATE (self); -#line 997 "Page.c" +#line 998 "Page.c" } @@ -1005,7 +1006,7 @@ static void folders_page_finalize (GObject* obj) { _view_manager_unref0 (self->priv->view_manager); #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala" G_OBJECT_CLASS (folders_page_parent_class)->finalize (obj); -#line 1009 "Page.c" +#line 1010 "Page.c" } -- cgit v1.2.3