1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
|
From: Qball Cow <qball@gmpclient.org>
Date: Wed, 14 Sep 2011 18:12:28 +0200
Subject: Fix MetaData object vala binding. (fix vala 13.3 build)
---
src/vala/gmpc-test-plugin.vala | 6 +++---
src/vapi/gmpc.vapi | 11 +++++++----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/vala/gmpc-test-plugin.vala b/src/vala/gmpc-test-plugin.vala
index bad3ddc..732be5b 100644
--- a/src/vala/gmpc-test-plugin.vala
+++ b/src/vala/gmpc-test-plugin.vala
@@ -276,7 +276,7 @@ public class Gmpc.MetaData.EditWindow : Gtk.Window {
}
}else{
MetaData.Item *item = MetaData.Item.copy(md);
- var h = Gmpc.AsyncDownload.download_vala(uri,(void *)item,image_downloaded);
+ unowned Gmpc.AsyncDownload.Handle h = Gmpc.AsyncDownload.download_vala(uri,(void *)item,image_downloaded);
if(h!=null)
{
h.set_user_data(md.plugin_name);
@@ -406,7 +406,7 @@ public class Gmpc.MetaData.EditWindow : Gtk.Window {
metawatcher.data_changed(this.song, this.query_type, Gmpc.MetaData.Result.UNAVAILABLE, met_false);
metawatcher.data_changed(this.song, this.query_type, Gmpc.MetaData.Result.AVAILABLE, met);
}else{
- var h = Gmpc.AsyncDownload.download(path, store_image);
+ unowned Gmpc.AsyncDownload.Handle h = Gmpc.AsyncDownload.download(path, store_image);
if(h!=null)
this.downloads.append(h);
}
@@ -721,7 +721,7 @@ public class Gmpc.MetaData.EditWindow : Gtk.Window {
}
this.downloads.first();
while(this.downloads != null){
- Gmpc.AsyncDownload.Handle handle = this.downloads.data;
+ unowned Gmpc.AsyncDownload.Handle handle = this.downloads.data;
handle.cancel();
this.downloads.first();
diff --git a/src/vapi/gmpc.vapi b/src/vapi/gmpc.vapi
index 0b41fcc..46ab281 100644
--- a/src/vapi/gmpc.vapi
+++ b/src/vapi/gmpc.vapi
@@ -31,7 +31,7 @@ namespace Gmpc {
}
-
+ [CCode (cheader_filename="metadata.h")]
namespace MetaData {
[CCode (cname="MetaDataContentType", cprefix = "META_DATA_CONTENT_", cheader_filename = "libmpd/libmpd.h,metadata.h")]
@@ -44,10 +44,13 @@ namespace Gmpc {
STRV,
TEXT_LIST
}
- [CCode (cname="MetaData", cheader_filename="metadata.h")]
+
[Compact]
- [Immutable]
- [CCode (free_function="meta_data_free")]
+ [CCode (
+ cname="MetaData",
+ free_function="meta_data_free",
+ has_type_id = false
+ )]
public class Item {
[CCode (cname="meta_data_new")]
public Item ();
|