summaryrefslogtreecommitdiff
path: root/src/tags
diff options
context:
space:
mode:
Diffstat (limited to 'src/tags')
-rw-r--r--src/tags/Branch.c12
-rw-r--r--src/tags/HierarchicalTagIndex.c8
-rw-r--r--src/tags/HierarchicalTagUtilities.c8
-rw-r--r--src/tags/TagPage.c16
-rw-r--r--src/tags/Tags.c2
5 files changed, 23 insertions, 23 deletions
diff --git a/src/tags/Branch.c b/src/tags/Branch.c
index 7c51fba..9bad2d8 100644
--- a/src/tags/Branch.c
+++ b/src/tags/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.
@@ -1022,7 +1022,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
GeeSortedSet* added = NULL;
GeeTreeSet* _tmp1_ = NULL;
#line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala"
- _tmp1_ = gee_tree_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tag_compare_names_gcompare_data_func, NULL, NULL);
+ _tmp1_ = gee_tree_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, _tag_compare_names_gcompare_data_func, NULL, NULL);
#line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala"
added = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet);
#line 1029 "Branch.c"
@@ -1573,7 +1573,7 @@ static void tags_branch_instance_init (TagsBranch * self) {
#line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala"
self->priv = TAGS_BRANCH_GET_PRIVATE (self);
#line 8 "/home/jens/Source/shotwell/src/tags/Branch.vala"
- _tmp0_ = gee_hash_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, TAGS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp0_ = gee_hash_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, TAGS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 8 "/home/jens/Source/shotwell/src/tags/Branch.vala"
self->priv->entry_map = _tmp0_;
#line 1580 "Branch.c"
@@ -2929,11 +2929,11 @@ static void tags_sidebar_entry_class_init (TagsSidebarEntryClass * klass) {
#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
g_type_class_add_private (klass, sizeof (TagsSidebarEntryPrivate));
#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = tags_sidebar_entry_real_get_sidebar_name;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) tags_sidebar_entry_real_get_sidebar_name;
#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = tags_sidebar_entry_real_get_sidebar_icon;
+ ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) tags_sidebar_entry_real_get_sidebar_icon;
#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
- ((SidebarSimplePageEntryClass *) klass)->create_page = tags_sidebar_entry_real_create_page;
+ ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) tags_sidebar_entry_real_create_page;
#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
G_OBJECT_CLASS (klass)->finalize = tags_sidebar_entry_finalize;
#line 2940 "Branch.c"
diff --git a/src/tags/HierarchicalTagIndex.c b/src/tags/HierarchicalTagIndex.c
index 0a163d3..82dfdda 100644
--- a/src/tags/HierarchicalTagIndex.c
+++ b/src/tags/HierarchicalTagIndex.c
@@ -1,4 +1,4 @@
-/* HierarchicalTagIndex.c generated by valac 0.34.4, the Vala compiler
+/* HierarchicalTagIndex.c generated by valac 0.34.7, the Vala compiler
* generated from HierarchicalTagIndex.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -153,13 +153,13 @@ HierarchicalTagIndex* hierarchical_tag_index_construct (GType object_type) {
#line 11 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
self = (HierarchicalTagIndex*) g_type_create_instance (object_type);
#line 12 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
- _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GEE_TYPE_ARRAY_LIST, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_ARRAY_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 12 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
_g_object_unref0 (self->priv->tag_table);
#line 12 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
self->priv->tag_table = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap);
#line 13 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
- _tmp1_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+ _tmp1_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
#line 13 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
_g_object_unref0 (self->priv->known_paths);
#line 13 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -403,7 +403,7 @@ void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, const gchar* t
#line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
_tmp4_ = tag;
#line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
- _tmp5_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+ _tmp5_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
#line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
_tmp6_ = _tmp5_;
#line 42 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
diff --git a/src/tags/HierarchicalTagUtilities.c b/src/tags/HierarchicalTagUtilities.c
index 1945def..f213e17 100644
--- a/src/tags/HierarchicalTagUtilities.c
+++ b/src/tags/HierarchicalTagUtilities.c
@@ -1,4 +1,4 @@
-/* HierarchicalTagUtilities.c generated by valac 0.34.4, the Vala compiler
+/* HierarchicalTagUtilities.c generated by valac 0.34.7, the Vala compiler
* generated from HierarchicalTagUtilities.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -506,7 +506,7 @@ GeeList* hierarchical_tag_utilities_enumerate_parent_paths (const gchar* in_path
#line 44 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
path = _tmp1_;
#line 46 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
- _tmp2_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+ _tmp2_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
#line 46 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
_result_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_LIST, GeeList);
#line 48 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -664,7 +664,7 @@ GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_p
#line 65 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
path = _tmp1_;
#line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
- _tmp2_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+ _tmp2_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
#line 67 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
components = _tmp2_;
#line 69 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
@@ -727,7 +727,7 @@ GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_p
#line 76 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
_tmp11_ = components;
#line 76 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
- _tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 76 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
_tmp13_ = _tmp12_;
#line 76 "/home/jens/Source/shotwell/src/tags/HierarchicalTagUtilities.vala"
diff --git a/src/tags/TagPage.c b/src/tags/TagPage.c
index 9c8acc0..6e347f7 100644
--- a/src/tags/TagPage.c
+++ b/src/tags/TagPage.c
@@ -1,4 +1,4 @@
-/* TagPage.c generated by valac 0.34.4, the Vala compiler
+/* TagPage.c generated by valac 0.34.7, the Vala compiler
* generated from TagPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1411,19 +1411,19 @@ static void tag_page_class_init (TagPageClass * klass) {
#line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
g_type_class_add_private (klass, sizeof (TagPagePrivate));
#line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
- ((PageClass *) klass)->init_collect_ui_filenames = tag_page_real_init_collect_ui_filenames;
+ ((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) tag_page_real_init_collect_ui_filenames;
#line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
- ((MediaPageClass *) klass)->get_config_photos_sort = tag_page_real_get_config_photos_sort;
+ ((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) tag_page_real_get_config_photos_sort;
#line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
- ((MediaPageClass *) klass)->set_config_photos_sort = tag_page_real_set_config_photos_sort;
+ ((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) tag_page_real_set_config_photos_sort;
#line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
- ((PageClass *) klass)->add_actions = tag_page_real_add_actions;
+ ((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) tag_page_real_add_actions;
#line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
- ((PageClass *) klass)->remove_actions = tag_page_real_remove_actions;
+ ((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) tag_page_real_remove_actions;
#line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
- ((PageClass *) klass)->switched_to = tag_page_real_switched_to;
+ ((PageClass *) klass)->switched_to = (void (*)(Page*)) tag_page_real_switched_to;
#line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
- ((PageClass *) klass)->update_actions = tag_page_real_update_actions;
+ ((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) tag_page_real_update_actions;
#line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
G_OBJECT_CLASS (klass)->finalize = tag_page_finalize;
#line 1430 "TagPage.c"
diff --git a/src/tags/Tags.c b/src/tags/Tags.c
index 3cc2f18..d2d0690 100644
--- a/src/tags/Tags.c
+++ b/src/tags/Tags.c
@@ -1,4 +1,4 @@
-/* Tags.c generated by valac 0.34.4, the Vala compiler
+/* Tags.c generated by valac 0.34.7, the Vala compiler
* generated from Tags.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.