diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-21 19:19:04 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-21 19:19:04 +0100 |
| commit | f39ea21098340bd99c48669f152c9068046c2c99 (patch) | |
| tree | d1166fce1a4a8c470dfaf364816f767678c4729e /src/folders/Branch.c | |
| parent | bc48a4cff815ed156b603c92e684779c317417ba (diff) | |
| parent | a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e (diff) | |
Merge tag 'upstream/0.25.3'
Upstream version 0.25.3
Diffstat (limited to 'src/folders/Branch.c')
| -rw-r--r-- | src/folders/Branch.c | 8 |
1 files changed, 4 insertions, 4 deletions
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" |