From 9e7cd144725a270e0460b21747619f447ca87684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Fri, 14 Apr 2017 18:51:46 +0200
Subject: New upstream version 0.26.1
---
src/folders/Branch.c | 16 ++++++++--------
src/folders/Folders.c | 2 +-
src/folders/Page.c | 8 ++++----
3 files changed, 13 insertions(+), 13 deletions(-)
(limited to 'src/folders')
diff --git a/src/folders/Branch.c b/src/folders/Branch.c
index f5962f6..5f20e23 100644
--- a/src/folders/Branch.c
+++ b/src/folders/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.4, the Vala compiler
+/* Branch.c generated by valac 0.34.7, 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_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+ _tmp2_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) 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"
@@ -1076,7 +1076,7 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
_tmp16_ = elements;
#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
_tmp18_ = _tmp17_;
#line 92 "/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_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);
+ _tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, FOLDERS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) 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"
@@ -1968,13 +1968,13 @@ static void folders_sidebar_entry_class_init (FoldersSidebarEntryClass * klass)
#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
g_type_class_add_private (klass, sizeof (FoldersSidebarEntryPrivate));
#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = folders_sidebar_entry_real_get_sidebar_name;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) folders_sidebar_entry_real_get_sidebar_name;
#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = folders_sidebar_entry_real_get_sidebar_icon;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) folders_sidebar_entry_real_get_sidebar_icon;
#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->to_string = folders_sidebar_entry_real_to_string;
+ ((SidebarSimplePageEntryClass *) klass)->to_string = (gchar* (*)(SidebarSimplePageEntry*)) folders_sidebar_entry_real_to_string;
#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->create_page = folders_sidebar_entry_real_create_page;
+ ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) folders_sidebar_entry_real_create_page;
#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
G_OBJECT_CLASS (klass)->get_property = _vala_folders_sidebar_entry_get_property;
#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
diff --git a/src/folders/Folders.c b/src/folders/Folders.c
index ab4c085..cae90dc 100644
--- a/src/folders/Folders.c
+++ b/src/folders/Folders.c
@@ -1,4 +1,4 @@
-/* Folders.c generated by valac 0.34.4, the Vala compiler
+/* Folders.c generated by valac 0.34.7, 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 c451234..3c05b3e 100644
--- a/src/folders/Page.c
+++ b/src/folders/Page.c
@@ -1,4 +1,4 @@
-/* Page.c generated by valac 0.34.4, the Vala compiler
+/* Page.c generated by valac 0.34.7, the Vala compiler
* generated from Page.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 = 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"
}
@@ -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 = 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 = 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"
--
cgit v1.2.3