diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:53:12 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:53:12 +0200 |
| commit | dfdb61e578cccb4b7ec2e9ccfa16a66ec481fab5 (patch) | |
| tree | dee893916166ac1c8b479b74e7f341429945260e /src/camera/Branch.c | |
| parent | a5ea701acc282ade4ccb9b08a8613a8d66ca82a5 (diff) | |
| parent | 9e7cd144725a270e0460b21747619f447ca87684 (diff) | |
Merge tag 'upstream/0.26.1'
Upstream version 0.26.1
Diffstat (limited to 'src/camera/Branch.c')
| -rw-r--r-- | src/camera/Branch.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/camera/Branch.c b/src/camera/Branch.c index 74b5c60..e41b06f 100644 --- a/src/camera/Branch.c +++ b/src/camera/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. @@ -912,7 +912,7 @@ static void camera_branch_instance_init (CameraBranch * self) { #line 7 "/home/jens/Source/shotwell/src/camera/Branch.vala" self->priv = CAMERA_BRANCH_GET_PRIVATE (self); #line 10 "/home/jens/Source/shotwell/src/camera/Branch.vala" - _tmp0_ = gee_hash_map_new (TYPE_DISCOVERED_CAMERA, (GBoxedCopyFunc) discovered_camera_ref, discovered_camera_unref, CAMERA_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_DISCOVERED_CAMERA, (GBoxedCopyFunc) discovered_camera_ref, (GDestroyNotify) discovered_camera_unref, CAMERA_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 10 "/home/jens/Source/shotwell/src/camera/Branch.vala" self->priv->camera_map = _tmp0_; #line 919 "Branch.c" @@ -1175,11 +1175,11 @@ static void camera_sidebar_entry_class_init (CameraSidebarEntryClass * klass) { #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala" g_type_class_add_private (klass, sizeof (CameraSidebarEntryPrivate)); #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = camera_sidebar_entry_real_get_sidebar_name; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) camera_sidebar_entry_real_get_sidebar_name; #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = camera_sidebar_entry_real_get_sidebar_icon; + ((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) camera_sidebar_entry_real_get_sidebar_icon; #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala" - ((SidebarSimplePageEntryClass *) klass)->create_page = camera_sidebar_entry_real_create_page; + ((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) camera_sidebar_entry_real_create_page; #line 89 "/home/jens/Source/shotwell/src/camera/Branch.vala" G_OBJECT_CLASS (klass)->finalize = camera_sidebar_entry_finalize; #line 1186 "Branch.c" |