[libdmapsharing] Update some Vala-related files
- From: W. Michael Petullo <wmpetullo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libdmapsharing] Update some Vala-related files
- Date: Mon, 1 Jun 2015 01:02:41 +0000 (UTC)
commit 644c4ff28ccc0b4c5767cc443bf6ca7d46f463ea
Author: W. Michael Petullo <mike flyn org>
Date: Sun May 31 21:02:34 2015 -0400
Update some Vala-related files
Signed-off-by: W. Michael Petullo <mike flyn org>
tests/dacplisten.c | 28 +++++++------
tests/dmapcopy.c | 27 +++++++------
tests/dmapserve.c | 9 +++-
tests/dpapview.c | 83 +++++++++++++++++++++------------------
tests/vala-dmap-container-db.c | 58 +++++++++++++--------------
tests/vala-dmap-db.c | 58 +++++++++++++--------------
tests/vala-dpap-record.c | 18 ++++----
vala/libdmapsharing-3.0.vapi | 8 ++++
8 files changed, 154 insertions(+), 135 deletions(-)
---
diff --git a/tests/dacplisten.c b/tests/dacplisten.c
index 6903376..ac7c401 100644
--- a/tests/dacplisten.c
+++ b/tests/dacplisten.c
@@ -1,4 +1,4 @@
-/* dacplisten.c generated by valac 0.22.1, the Vala compiler
+/* dacplisten.c generated by valac 0.27.2, the Vala compiler
* generated from dacplisten.vala, do not modify */
/* FILE: dacplisten.vala -- Listen to DACP remotes
@@ -132,10 +132,10 @@ GType vala_dmap_db_get_type (void) G_GNUC_CONST;
ValaDMAPContainerDb* vala_dmap_container_db_new (void);
ValaDMAPContainerDb* vala_dmap_container_db_construct (GType object_type);
GType vala_dmap_container_db_get_type (void) G_GNUC_CONST;
-static void __lambda2_ (DACPListener* self, const gchar* service_name, const gchar* display_name);
-static void ___lambda2__dacp_share_remote_found (DACPShare* _sender, const gchar* service_name, const gchar*
remote_name, gpointer self);
-static void __lambda3_ (DACPListener* self, const gchar* guid);
-static void ___lambda3__dacp_share_add_guid (DACPShare* _sender, const gchar* guid, gpointer self);
+static void __lambda4_ (DACPListener* self, const gchar* service_name, const gchar* display_name);
+static void ___lambda4__dacp_share_remote_found (DACPShare* _sender, const gchar* service_name, const gchar*
remote_name, gpointer self);
+static void __lambda5_ (DACPListener* self, const gchar* guid);
+static void ___lambda5__dacp_share_add_guid (DACPShare* _sender, const gchar* guid, gpointer self);
static void dacp_listener_finalize (GObject* obj);
gint _vala_main (gchar** args, int args_length1);
@@ -273,7 +273,7 @@ GType vala_dacp_player_get_type (void) {
}
-static void __lambda2_ (DACPListener* self, const gchar* service_name, const gchar* display_name) {
+static void __lambda4_ (DACPListener* self, const gchar* service_name, const gchar* display_name) {
FILE* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
const gchar* _tmp2_ = NULL;
@@ -286,12 +286,12 @@ static void __lambda2_ (DACPListener* self, const gchar* service_name, const gch
}
-static void ___lambda2__dacp_share_remote_found (DACPShare* _sender, const gchar* service_name, const gchar*
remote_name, gpointer self) {
- __lambda2_ (self, service_name, remote_name);
+static void ___lambda4__dacp_share_remote_found (DACPShare* _sender, const gchar* service_name, const gchar*
remote_name, gpointer self) {
+ __lambda4_ ((DACPListener*) self, service_name, remote_name);
}
-static void __lambda3_ (DACPListener* self, const gchar* guid) {
+static void __lambda5_ (DACPListener* self, const gchar* guid) {
FILE* _tmp0_ = NULL;
g_return_if_fail (guid != NULL);
_tmp0_ = stdout;
@@ -299,8 +299,8 @@ static void __lambda3_ (DACPListener* self, const gchar* guid) {
}
-static void ___lambda3__dacp_share_add_guid (DACPShare* _sender, const gchar* guid, gpointer self) {
- __lambda3_ (self, guid);
+static void ___lambda5__dacp_share_add_guid (DACPShare* _sender, const gchar* guid, gpointer self) {
+ __lambda5_ ((DACPListener*) self, guid);
}
@@ -333,9 +333,9 @@ DACPListener* dacp_listener_construct (GType object_type) {
_g_object_unref0 (self->priv->share);
self->priv->share = _tmp6_;
_tmp7_ = self->priv->share;
- g_signal_connect_object (_tmp7_, "remote-found", (GCallback) ___lambda2__dacp_share_remote_found,
self, 0);
+ g_signal_connect_object (_tmp7_, "remote-found", (GCallback) ___lambda4__dacp_share_remote_found,
self, 0);
_tmp8_ = self->priv->share;
- g_signal_connect_object (_tmp8_, "add-guid", (GCallback) ___lambda3__dacp_share_add_guid, self, 0);
+ g_signal_connect_object (_tmp8_, "add-guid", (GCallback) ___lambda5__dacp_share_add_guid, self, 0);
_tmp9_ = self->priv->share;
dacp_share_start_lookup (_tmp9_);
return self;
@@ -401,7 +401,9 @@ gint _vala_main (gchar** args, int args_length1) {
int main (int argc, char ** argv) {
+#if !GLIB_CHECK_VERSION (2,35,0)
g_type_init ();
+#endif
return _vala_main (argv, argc);
}
diff --git a/tests/dmapcopy.c b/tests/dmapcopy.c
index e914870..58baa1d 100644
--- a/tests/dmapcopy.c
+++ b/tests/dmapcopy.c
@@ -1,4 +1,4 @@
-/* dmapcopy.c generated by valac 0.22.1, the Vala compiler
+/* dmapcopy.c generated by valac 0.27.2, the Vala compiler
* generated from dmapcopy.vala, do not modify */
/* FILE: dmapcopy.vala -- Copy files from a DMAP server
@@ -116,10 +116,10 @@ enum {
DPAP_COPY_DUMMY_PROPERTY
};
static gboolean dpap_copy_connected_cb (DPAPCopy* self, DMAPConnection* connection, gboolean _result_, const
gchar* reason);
-static void __lambda2_ (DPAPCopy* self, gconstpointer k, gconstpointer v);
+static void __lambda4_ (DPAPCopy* self, gconstpointer k, gconstpointer v);
GType vala_dpap_record_get_type (void) G_GNUC_CONST;
const gchar* vala_dpap_record_get_location (ValaDPAPRecord* self);
-static void ___lambda2__gh_func (gconstpointer key, gconstpointer value, gpointer self);
+static void ___lambda4__gh_func (gconstpointer key, gconstpointer value, gpointer self);
static void dpap_copy_service_added_cb (DPAPCopy* self, DMAPMdnsBrowserService* service);
static gboolean _dpap_copy_connected_cb_dmap_connection_callback (DMAPConnection* connection, gboolean
_result_, const gchar* reason, gpointer self);
DPAPCopy* dpap_copy_new (GError** error);
@@ -136,7 +136,7 @@ gint _vala_main (gchar** args, int args_length1);
static void _debug_null_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message,
gpointer self);
-static void __lambda2_ (DPAPCopy* self, gconstpointer k, gconstpointer v) {
+static void __lambda4_ (DPAPCopy* self, gconstpointer k, gconstpointer v) {
FILE* _tmp0_ = NULL;
gconstpointer _tmp1_ = NULL;
const gchar* _tmp2_ = NULL;
@@ -149,8 +149,8 @@ static void __lambda2_ (DPAPCopy* self, gconstpointer k, gconstpointer v) {
}
-static void ___lambda2__gh_func (gconstpointer key, gconstpointer value, gpointer self) {
- __lambda2_ (self, key, value);
+static void ___lambda4__gh_func (gconstpointer key, gconstpointer value, gpointer self) {
+ __lambda4_ ((DPAPCopy*) self, key, value);
}
@@ -165,7 +165,7 @@ static gboolean dpap_copy_connected_cb (DPAPCopy* self, DMAPConnection* connecti
_tmp1_ = dmap_db_count ((DMAPDb*) _tmp0_);
g_debug ("dmapcopy.vala:30: %lld entries\n", _tmp1_);
_tmp2_ = self->priv->db;
- dmap_db_foreach ((DMAPDb*) _tmp2_, ___lambda2__gh_func, self);
+ dmap_db_foreach ((DMAPDb*) _tmp2_, ___lambda4__gh_func, self);
result = TRUE;
return result;
}
@@ -173,7 +173,7 @@ static gboolean dpap_copy_connected_cb (DPAPCopy* self, DMAPConnection* connecti
static gboolean _dpap_copy_connected_cb_dmap_connection_callback (DMAPConnection* connection, gboolean
_result_, const gchar* reason, gpointer self) {
gboolean result;
- result = dpap_copy_connected_cb (self, connection, _result_, reason);
+ result = dpap_copy_connected_cb ((DPAPCopy*) self, connection, _result_, reason);
return result;
}
@@ -207,7 +207,7 @@ static void dpap_copy_service_added_cb (DPAPCopy* self, DMAPMdnsBrowserService*
static void _dpap_copy_service_added_cb_dmap_mdns_browser_service_added (DMAPMdnsBrowser* _sender, void*
service, gpointer self) {
- dpap_copy_service_added_cb (self, service);
+ dpap_copy_service_added_cb ((DPAPCopy*) self, service);
}
@@ -233,7 +233,7 @@ DPAPCopy* dpap_copy_construct (GType object_type, GError** error) {
g_signal_connect (_tmp3_, "service-added", (GCallback)
_dpap_copy_service_added_cb_dmap_mdns_browser_service_added, self);
_tmp4_ = self->priv->browser;
dmap_mdns_browser_start (_tmp4_, &_inner_error_);
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
g_propagate_error (error, _inner_error_);
_dpap_copy_unref0 (self);
return NULL;
@@ -359,7 +359,7 @@ void value_take_dpap_copy (GValue* value, gpointer v_object) {
static void dpap_copy_class_init (DPAPCopyClass * klass) {
dpap_copy_parent_class = g_type_class_peek_parent (klass);
- DPAP_COPY_CLASS (klass)->finalize = dpap_copy_finalize;
+ ((DPAPCopyClass *) klass)->finalize = dpap_copy_finalize;
g_type_class_add_private (klass, sizeof (DPAPCopyPrivate));
}
@@ -373,6 +373,7 @@ static void dpap_copy_instance_init (DPAPCopy * self) {
static void dpap_copy_finalize (DPAPCopy* obj) {
DPAPCopy * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DPAP_COPY, DPAPCopy);
+ g_signal_handlers_destroy (self);
_g_object_unref0 (self->priv->browser);
_g_object_unref0 (self->priv->connection);
_g_object_unref0 (self->priv->db);
@@ -443,7 +444,7 @@ gint _vala_main (gchar** args, int args_length1) {
g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, _debug_null_glog_func, NULL);
_tmp1_ = dpap_copy_new (&_inner_error_);
dmapcopy = _tmp1_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
_g_main_loop_unref0 (loop);
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
g_clear_error (&_inner_error_);
@@ -458,7 +459,9 @@ gint _vala_main (gchar** args, int args_length1) {
int main (int argc, char ** argv) {
+#if !GLIB_CHECK_VERSION (2,35,0)
g_type_init ();
+#endif
return _vala_main (argv, argc);
}
diff --git a/tests/dmapserve.c b/tests/dmapserve.c
index 8adea7d..e8891e5 100644
--- a/tests/dmapserve.c
+++ b/tests/dmapserve.c
@@ -1,4 +1,4 @@
-/* dmapserve.c generated by valac 0.22.1, the Vala compiler
+/* dmapserve.c generated by valac 0.27.2, the Vala compiler
* generated from dmapserve.vala, do not modify */
/* FILE: dmapserve.vala -- Serve media using DMAP
@@ -280,7 +280,7 @@ void value_take_dpap_serve (GValue* value, gpointer v_object) {
static void dpap_serve_class_init (DPAPServeClass * klass) {
dpap_serve_parent_class = g_type_class_peek_parent (klass);
- DPAP_SERVE_CLASS (klass)->finalize = dpap_serve_finalize;
+ ((DPAPServeClass *) klass)->finalize = dpap_serve_finalize;
g_type_class_add_private (klass, sizeof (DPAPServePrivate));
}
@@ -294,6 +294,7 @@ static void dpap_serve_instance_init (DPAPServe * self) {
static void dpap_serve_finalize (DPAPServe* obj) {
DPAPServe * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DPAP_SERVE, DPAPServe);
+ g_signal_handlers_destroy (self);
_g_object_unref0 (self->priv->record);
_g_object_unref0 (self->priv->db);
_g_object_unref0 (self->priv->container_db);
@@ -364,7 +365,7 @@ gint _vala_main (gchar** args, int args_length1) {
g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, _debug_printf_glog_func, NULL);
_tmp1_ = dpap_serve_new (&_inner_error_);
dmapcopy = _tmp1_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
_g_main_loop_unref0 (loop);
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
g_clear_error (&_inner_error_);
@@ -379,7 +380,9 @@ gint _vala_main (gchar** args, int args_length1) {
int main (int argc, char ** argv) {
+#if !GLIB_CHECK_VERSION (2,35,0)
g_type_init ();
+#endif
return _vala_main (argv, argc);
}
diff --git a/tests/dpapview.c b/tests/dpapview.c
index b2c1486..09a8f73 100644
--- a/tests/dpapview.c
+++ b/tests/dpapview.c
@@ -1,4 +1,4 @@
-/* dpapview.c generated by valac 0.22.1, the Vala compiler
+/* dpapview.c generated by valac 0.27.2, the Vala compiler
* generated from dpapview.vala, do not modify */
/* FILE: dpapviewer.vala -- View DPAP data
@@ -122,11 +122,11 @@ enum {
DPAP_VIEWER_DUMMY_PROPERTY
};
static gboolean dpap_viewer_connected_cb (DPAPViewer* self, DMAPConnection* connection, gboolean _result_,
const gchar* reason);
-static void __lambda2_ (DPAPViewer* self, gconstpointer k, gconstpointer v);
+static void __lambda4_ (DPAPViewer* self, gconstpointer k, gconstpointer v);
GType vala_dpap_record_get_type (void) G_GNUC_CONST;
GByteArray* vala_dpap_record_get_thumbnail (ValaDPAPRecord* self);
const gchar* vala_dpap_record_get_filename (ValaDPAPRecord* self);
-static void ___lambda2__gh_func (gconstpointer key, gconstpointer value, gpointer self);
+static void ___lambda4__gh_func (gconstpointer key, gconstpointer value, gpointer self);
static void dpap_viewer_service_added_cb (DPAPViewer* self, DMAPMdnsBrowserService* service);
static gboolean _dpap_viewer_connected_cb_dmap_connection_callback (DMAPConnection* connection, gboolean
_result_, const gchar* reason, gpointer self);
DPAPViewer* dpap_viewer_new (GtkBuilder* builder, GError** error);
@@ -140,20 +140,20 @@ static void dpap_viewer_finalize (DPAPViewer* obj);
gint _vala_main (gchar** args, int args_length1);
-static void __lambda2_ (DPAPViewer* self, gconstpointer k, gconstpointer v) {
+static void __lambda4_ (DPAPViewer* self, gconstpointer k, gconstpointer v) {
GdkPixbuf* pixbuf = NULL;
gconstpointer _tmp0_ = NULL;
GByteArray* _tmp1_ = NULL;
GByteArray* _tmp2_ = NULL;
GtkTreeIter iter = {0};
- GtkListStore* _tmp15_ = NULL;
- GtkTreeIter _tmp16_ = {0};
- GtkListStore* _tmp17_ = NULL;
- GtkTreeIter _tmp18_ = {0};
- GdkPixbuf* _tmp19_ = NULL;
- gconstpointer _tmp20_ = NULL;
- const gchar* _tmp21_ = NULL;
+ GtkListStore* _tmp16_ = NULL;
+ GtkTreeIter _tmp17_ = {0};
+ GtkListStore* _tmp18_ = NULL;
+ GtkTreeIter _tmp19_ = {0};
+ GdkPixbuf* _tmp20_ = NULL;
+ gconstpointer _tmp21_ = NULL;
const gchar* _tmp22_ = NULL;
+ const gchar* _tmp23_ = NULL;
GError * _inner_error_ = NULL;
pixbuf = NULL;
_tmp0_ = v;
@@ -174,12 +174,13 @@ static void __lambda2_ (DPAPViewer* self, gconstpointer k, gconstpointer v) {
GdkPixbuf* _tmp11_ = NULL;
const gchar* _tmp12_ = NULL;
GdkPixbuf* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
+ GdkPixbuf* _tmp14_ = NULL;
+ const gchar* _tmp15_ = NULL;
_tmp4_ = g_file_open_tmp ("dpapview.XXXXXX", &_tmp3_, &_inner_error_);
_g_free0 (path);
path = _tmp3_;
fd = _tmp4_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
_g_free0 (path);
_g_object_unref0 (pixbuf);
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -193,7 +194,7 @@ static void __lambda2_ (DPAPViewer* self, gconstpointer k, gconstpointer v) {
_tmp9_ = _tmp8_->data;
_tmp9__length1 = (gint) _tmp8_->len;
g_file_set_contents (_tmp5_, (const char*) _tmp9_, (size_t) _tmp9__length1, &_inner_error_);
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
_g_free0 (path);
_g_object_unref0 (pixbuf);
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -205,35 +206,38 @@ static void __lambda2_ (DPAPViewer* self, gconstpointer k, gconstpointer v) {
_tmp12_ = path;
_tmp13_ = gdk_pixbuf_new_from_file (_tmp12_, &_inner_error_);
_tmp11_ = _tmp13_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
_g_free0 (path);
_g_object_unref0 (pixbuf);
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
g_clear_error (&_inner_error_);
return;
}
+ _tmp14_ = _tmp11_;
+ _tmp11_ = NULL;
_g_object_unref0 (pixbuf);
- pixbuf = _tmp11_;
- _tmp14_ = path;
- g_unlink (_tmp14_);
+ pixbuf = _tmp14_;
+ _tmp15_ = path;
+ g_unlink (_tmp15_);
+ _g_object_unref0 (_tmp11_);
_g_free0 (path);
}
- _tmp15_ = self->priv->liststore;
- gtk_list_store_append (_tmp15_, &_tmp16_);
- iter = _tmp16_;
- _tmp17_ = self->priv->liststore;
- _tmp18_ = iter;
- _tmp19_ = pixbuf;
- _tmp20_ = v;
- _tmp21_ = vala_dpap_record_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_VALA_DPAP_RECORD,
ValaDPAPRecord));
- _tmp22_ = _tmp21_;
- gtk_list_store_set (_tmp17_, &_tmp18_, 0, _tmp19_, 1, _tmp22_, -1);
+ _tmp16_ = self->priv->liststore;
+ gtk_list_store_append (_tmp16_, &_tmp17_);
+ iter = _tmp17_;
+ _tmp18_ = self->priv->liststore;
+ _tmp19_ = iter;
+ _tmp20_ = pixbuf;
+ _tmp21_ = v;
+ _tmp22_ = vala_dpap_record_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_VALA_DPAP_RECORD,
ValaDPAPRecord));
+ _tmp23_ = _tmp22_;
+ gtk_list_store_set (_tmp18_, &_tmp19_, 0, _tmp20_, 1, _tmp23_, -1);
_g_object_unref0 (pixbuf);
}
-static void ___lambda2__gh_func (gconstpointer key, gconstpointer value, gpointer self) {
- __lambda2_ (self, key, value);
+static void ___lambda4__gh_func (gconstpointer key, gconstpointer value, gpointer self) {
+ __lambda4_ ((DPAPViewer*) self, key, value);
}
@@ -248,7 +252,7 @@ static gboolean dpap_viewer_connected_cb (DPAPViewer* self, DMAPConnection* conn
_tmp1_ = dmap_db_count ((DMAPDb*) _tmp0_);
g_debug ("dpapview.vala:31: %lld entries\n", _tmp1_);
_tmp2_ = self->priv->db;
- dmap_db_foreach ((DMAPDb*) _tmp2_, ___lambda2__gh_func, self);
+ dmap_db_foreach ((DMAPDb*) _tmp2_, ___lambda4__gh_func, self);
result = TRUE;
return result;
}
@@ -256,7 +260,7 @@ static gboolean dpap_viewer_connected_cb (DPAPViewer* self, DMAPConnection* conn
static gboolean _dpap_viewer_connected_cb_dmap_connection_callback (DMAPConnection* connection, gboolean
_result_, const gchar* reason, gpointer self) {
gboolean result;
- result = dpap_viewer_connected_cb (self, connection, _result_, reason);
+ result = dpap_viewer_connected_cb ((DPAPViewer*) self, connection, _result_, reason);
return result;
}
@@ -295,7 +299,7 @@ static gpointer _g_object_ref0 (gpointer self) {
static void _dpap_viewer_service_added_cb_dmap_mdns_browser_service_added (DMAPMdnsBrowser* _sender, void*
service, gpointer self) {
- dpap_viewer_service_added_cb (self, service);
+ dpap_viewer_service_added_cb ((DPAPViewer*) self, service);
}
@@ -352,7 +356,7 @@ DPAPViewer* dpap_viewer_construct (GType object_type, GtkBuilder* builder, GErro
g_signal_connect (_tmp13_, "service-added", (GCallback)
_dpap_viewer_service_added_cb_dmap_mdns_browser_service_added, self);
_tmp14_ = self->priv->browser;
dmap_mdns_browser_start (_tmp14_, &_inner_error_);
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
g_propagate_error (error, _inner_error_);
_g_object_unref0 (iconview);
_g_object_unref0 (widget);
@@ -482,7 +486,7 @@ void value_take_dpap_viewer (GValue* value, gpointer v_object) {
static void dpap_viewer_class_init (DPAPViewerClass * klass) {
dpap_viewer_parent_class = g_type_class_peek_parent (klass);
- DPAP_VIEWER_CLASS (klass)->finalize = dpap_viewer_finalize;
+ ((DPAPViewerClass *) klass)->finalize = dpap_viewer_finalize;
g_type_class_add_private (klass, sizeof (DPAPViewerPrivate));
}
@@ -496,6 +500,7 @@ static void dpap_viewer_instance_init (DPAPViewer * self) {
static void dpap_viewer_finalize (DPAPViewer* obj) {
DPAPViewer * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DPAP_VIEWER, DPAPViewer);
+ g_signal_handlers_destroy (self);
_g_object_unref0 (self->priv->browser);
_g_object_unref0 (self->priv->connection);
_g_object_unref0 (self->priv->liststore);
@@ -551,14 +556,14 @@ gint _vala_main (gchar** args, int args_length1) {
builder = _tmp0_;
_tmp1_ = builder;
gtk_builder_add_from_file (_tmp1_, "tests/dpapview.ui", &_inner_error_);
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
_g_object_unref0 (builder);
goto __catch0_g_error;
}
_tmp2_ = builder;
_tmp3_ = dpap_viewer_new (_tmp2_, &_inner_error_);
dpapviewer = _tmp3_;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
_g_object_unref0 (builder);
goto __catch0_g_error;
}
@@ -584,7 +589,7 @@ gint _vala_main (gchar** args, int args_length1) {
return result;
}
__finally0:
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
g_clear_error (&_inner_error_);
return 0;
@@ -595,7 +600,9 @@ gint _vala_main (gchar** args, int args_length1) {
int main (int argc, char ** argv) {
+#if !GLIB_CHECK_VERSION (2,35,0)
g_type_init ();
+#endif
return _vala_main (argv, argc);
}
diff --git a/tests/vala-dmap-container-db.c b/tests/vala-dmap-container-db.c
index c98e8bc..b9bd776 100644
--- a/tests/vala-dmap-container-db.c
+++ b/tests/vala-dmap-container-db.c
@@ -1,4 +1,4 @@
-/* vala-dmap-container-db.c generated by valac 0.22.1, the Vala compiler
+/* vala-dmap-container-db.c generated by valac 0.27.2, the Vala compiler
* generated from vala-dmap-container-db.vala, do not modify */
/* FILE: vala-dmap-db.vala -- A DMAPContainerDb implementation in Vala
@@ -96,40 +96,38 @@ static void vala_dmap_container_db_real_foreach (DMAPContainerDb* base, GHFunc f
i = 0;
_tmp0_ = TRUE;
while (TRUE) {
- gboolean _tmp1_ = FALSE;
- gint _tmp3_ = 0;
- GeeArrayList* _tmp4_ = NULL;
+ gint _tmp2_ = 0;
+ GeeArrayList* _tmp3_ = NULL;
+ gint _tmp4_ = 0;
gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- GHFunc _tmp7_ = NULL;
- void* _tmp7__target = NULL;
- gint _tmp8_ = 0;
- void* _tmp9_ = NULL;
- GeeArrayList* _tmp10_ = NULL;
- gint _tmp11_ = 0;
- gpointer _tmp12_ = NULL;
- _tmp1_ = _tmp0_;
- if (!_tmp1_) {
- gint _tmp2_ = 0;
- _tmp2_ = i;
- i = _tmp2_ + 1;
+ GHFunc _tmp6_ = NULL;
+ void* _tmp6__target = NULL;
+ gint _tmp7_ = 0;
+ void* _tmp8_ = NULL;
+ GeeArrayList* _tmp9_ = NULL;
+ gint _tmp10_ = 0;
+ gpointer _tmp11_ = NULL;
+ if (!_tmp0_) {
+ gint _tmp1_ = 0;
+ _tmp1_ = i;
+ i = _tmp1_ + 1;
}
_tmp0_ = FALSE;
- _tmp3_ = i;
- _tmp4_ = self->priv->db;
- _tmp5_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp4_);
- _tmp6_ = _tmp5_;
- if (!(_tmp3_ < _tmp6_)) {
+ _tmp2_ = i;
+ _tmp3_ = self->priv->db;
+ _tmp4_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp3_);
+ _tmp5_ = _tmp4_;
+ if (!(_tmp2_ < _tmp5_)) {
break;
}
- _tmp7_ = func;
- _tmp7__target = func_target;
- _tmp8_ = i;
- _tmp9_ = GINT_TO_POINTER (_tmp8_);
- _tmp10_ = self->priv->db;
- _tmp11_ = i;
- _tmp12_ = gee_abstract_list_get ((GeeAbstractList*) _tmp10_, _tmp11_);
- _tmp7_ (_tmp9_, (DMAPRecord*) _tmp12_, _tmp7__target);
+ _tmp6_ = func;
+ _tmp6__target = func_target;
+ _tmp7_ = i;
+ _tmp8_ = GINT_TO_POINTER (_tmp7_);
+ _tmp9_ = self->priv->db;
+ _tmp10_ = i;
+ _tmp11_ = gee_abstract_list_get ((GeeAbstractList*) _tmp9_, _tmp10_);
+ _tmp6_ (_tmp8_, (DMAPRecord*) _tmp11_, _tmp6__target);
}
}
}
diff --git a/tests/vala-dmap-db.c b/tests/vala-dmap-db.c
index 208eb09..03923a0 100644
--- a/tests/vala-dmap-db.c
+++ b/tests/vala-dmap-db.c
@@ -1,4 +1,4 @@
-/* vala-dmap-db.c generated by valac 0.22.1, the Vala compiler
+/* vala-dmap-db.c generated by valac 0.27.2, the Vala compiler
* generated from vala-dmap-db.vala, do not modify */
/* FILE: vala-dmap-db.vala -- A DMAPDb implementation in Vala
@@ -142,40 +142,38 @@ static void vala_dmap_db_real_foreach (DMAPDb* base, GHFunc func, void* func_tar
i = 0;
_tmp0_ = TRUE;
while (TRUE) {
- gboolean _tmp1_ = FALSE;
- gint _tmp3_ = 0;
- GeeArrayList* _tmp4_ = NULL;
+ gint _tmp2_ = 0;
+ GeeArrayList* _tmp3_ = NULL;
+ gint _tmp4_ = 0;
gint _tmp5_ = 0;
- gint _tmp6_ = 0;
- GHFunc _tmp7_ = NULL;
- void* _tmp7__target = NULL;
- gint _tmp8_ = 0;
- void* _tmp9_ = NULL;
- GeeArrayList* _tmp10_ = NULL;
- gint _tmp11_ = 0;
- gpointer _tmp12_ = NULL;
- _tmp1_ = _tmp0_;
- if (!_tmp1_) {
- gint _tmp2_ = 0;
- _tmp2_ = i;
- i = _tmp2_ + 1;
+ GHFunc _tmp6_ = NULL;
+ void* _tmp6__target = NULL;
+ gint _tmp7_ = 0;
+ void* _tmp8_ = NULL;
+ GeeArrayList* _tmp9_ = NULL;
+ gint _tmp10_ = 0;
+ gpointer _tmp11_ = NULL;
+ if (!_tmp0_) {
+ gint _tmp1_ = 0;
+ _tmp1_ = i;
+ i = _tmp1_ + 1;
}
_tmp0_ = FALSE;
- _tmp3_ = i;
- _tmp4_ = self->priv->db;
- _tmp5_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp4_);
- _tmp6_ = _tmp5_;
- if (!(_tmp3_ < _tmp6_)) {
+ _tmp2_ = i;
+ _tmp3_ = self->priv->db;
+ _tmp4_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp3_);
+ _tmp5_ = _tmp4_;
+ if (!(_tmp2_ < _tmp5_)) {
break;
}
- _tmp7_ = func;
- _tmp7__target = func_target;
- _tmp8_ = i;
- _tmp9_ = GINT_TO_POINTER (_tmp8_ + 1);
- _tmp10_ = self->priv->db;
- _tmp11_ = i;
- _tmp12_ = gee_abstract_list_get ((GeeAbstractList*) _tmp10_, _tmp11_);
- _tmp7_ (_tmp9_, (DMAPRecord*) _tmp12_, _tmp7__target);
+ _tmp6_ = func;
+ _tmp6__target = func_target;
+ _tmp7_ = i;
+ _tmp8_ = GINT_TO_POINTER (_tmp7_ + 1);
+ _tmp9_ = self->priv->db;
+ _tmp10_ = i;
+ _tmp11_ = gee_abstract_list_get ((GeeAbstractList*) _tmp9_, _tmp10_);
+ _tmp6_ (_tmp8_, (DMAPRecord*) _tmp11_, _tmp6__target);
}
}
}
diff --git a/tests/vala-dpap-record.c b/tests/vala-dpap-record.c
index 668707e..004e33d 100644
--- a/tests/vala-dpap-record.c
+++ b/tests/vala-dpap-record.c
@@ -1,4 +1,4 @@
-/* vala-dpap-record.c generated by valac 0.22.1, the Vala compiler
+/* vala-dpap-record.c generated by valac 0.27.2, the Vala compiler
* generated from vala-dpap-record.vala, do not modify */
/* FILE: vala-dpap-record.vala -- A DPAPRecord implementation in Vala
@@ -43,7 +43,7 @@ typedef struct _ValaDPAPRecord ValaDPAPRecord;
typedef struct _ValaDPAPRecordClass ValaDPAPRecordClass;
typedef struct _ValaDPAPRecordPrivate ValaDPAPRecordPrivate;
#define _g_free0(var) (var = (g_free (var), NULL))
-#define _g_byte_array_free0(var) ((var == NULL) ? NULL : (var = (g_byte_array_free (var, TRUE), NULL)))
+#define _g_byte_array_unref0(var) ((var == NULL) ? NULL : (var = (g_byte_array_unref (var), NULL)))
#define TYPE_VALA_DPAP_RECORD_FACTORY (vala_dpap_record_factory_get_type ())
#define VALA_DPAP_RECORD_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VALA_DPAP_RECORD_FACTORY,
ValaDPAPRecordFactory))
@@ -242,7 +242,7 @@ ValaDPAPRecord* vala_dpap_record_construct (GType object_type) {
data = _tmp14_;
data_length1 = _tmp15_;
_data_size_ = data_length1;
- if (_inner_error_ != NULL) {
+ if (G_UNLIKELY (_inner_error_ != NULL)) {
data = (g_free (data), NULL);
_g_free0 (path);
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__,
_inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -250,7 +250,7 @@ ValaDPAPRecord* vala_dpap_record_construct (GType object_type) {
return NULL;
}
_tmp16_ = g_byte_array_new ();
- _g_byte_array_free0 (self->priv->_thumbnail);
+ _g_byte_array_unref0 (self->priv->_thumbnail);
self->priv->_thumbnail = _tmp16_;
_tmp17_ = self->priv->_thumbnail;
g_byte_array_append (_tmp17_, data, data_length1);
@@ -371,7 +371,7 @@ void vala_dpap_record_set_thumbnail (ValaDPAPRecord* self, GByteArray* value) {
gint _tmp3__length1 = 0;
g_return_if_fail (self != NULL);
_tmp0_ = g_byte_array_new ();
- _g_byte_array_free0 (self->priv->_thumbnail);
+ _g_byte_array_unref0 (self->priv->_thumbnail);
self->priv->_thumbnail = _tmp0_;
_tmp1_ = self->priv->_thumbnail;
_tmp2_ = value;
@@ -509,7 +509,7 @@ static void vala_dpap_record_class_init (ValaDPAPRecordClass * klass) {
g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_FILENAME,
g_param_spec_string ("filename", "filename", "filename", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_ASPECT_RATIO,
g_param_spec_string ("aspect-ratio", "aspect-ratio", "aspect-ratio", NULL, G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_FORMAT, g_param_spec_string
("format", "format", "format", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB |
G_PARAM_READABLE | G_PARAM_WRITABLE));
- g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_THUMBNAIL,
g_param_spec_pointer ("thumbnail", "thumbnail", "thumbnail", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+ g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_THUMBNAIL,
g_param_spec_boxed ("thumbnail", "thumbnail", "thumbnail", G_TYPE_BYTE_ARRAY, G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_COMMENTS,
g_param_spec_string ("comments", "comments", "comments", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK |
G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_LARGE_FILESIZE,
g_param_spec_int ("large-filesize", "large-filesize", "large-filesize", G_MININT, G_MAXINT, 0,
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
g_object_class_install_property (G_OBJECT_CLASS (klass), VALA_DPAP_RECORD_PIXEL_HEIGHT,
g_param_spec_int ("pixel-height", "pixel-height", "pixel-height", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME
| G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
@@ -545,7 +545,7 @@ static void vala_dpap_record_finalize (GObject* obj) {
_g_free0 (self->priv->_aspect_ratio);
_g_free0 (self->priv->_format);
_g_free0 (self->priv->_comments);
- _g_byte_array_free0 (self->priv->_thumbnail);
+ _g_byte_array_unref0 (self->priv->_thumbnail);
G_OBJECT_CLASS (vala_dpap_record_parent_class)->finalize (obj);
}
@@ -583,7 +583,7 @@ static void _vala_vala_dpap_record_get_property (GObject * object, guint propert
g_value_set_string (value, vala_dpap_record_get_format (self));
break;
case VALA_DPAP_RECORD_THUMBNAIL:
- g_value_set_pointer (value, vala_dpap_record_get_thumbnail (self));
+ g_value_set_boxed (value, vala_dpap_record_get_thumbnail (self));
break;
case VALA_DPAP_RECORD_COMMENTS:
g_value_set_string (value, vala_dpap_record_get_comments (self));
@@ -627,7 +627,7 @@ static void _vala_vala_dpap_record_set_property (GObject * object, guint propert
vala_dpap_record_set_format (self, g_value_get_string (value));
break;
case VALA_DPAP_RECORD_THUMBNAIL:
- vala_dpap_record_set_thumbnail (self, g_value_get_pointer (value));
+ vala_dpap_record_set_thumbnail (self, g_value_get_boxed (value));
break;
case VALA_DPAP_RECORD_COMMENTS:
vala_dpap_record_set_comments (self, g_value_get_string (value));
diff --git a/vala/libdmapsharing-3.0.vapi b/vala/libdmapsharing-3.0.vapi
index 131ba55..3701505 100644
--- a/vala/libdmapsharing-3.0.vapi
+++ b/vala/libdmapsharing-3.0.vapi
@@ -166,6 +166,8 @@ namespace DAAP {
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
[Compact]
public class DMAPMetaDataMap {
+ public uint md;
+ public weak string tag;
}
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
[Compact]
@@ -796,6 +798,8 @@ namespace DACP {
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
[Compact]
public class DMAPMetaDataMap {
+ public uint md;
+ public weak string tag;
}
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
[Compact]
@@ -1430,6 +1434,8 @@ namespace DMAP {
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
[Compact]
public class MetaDataMap {
+ public uint md;
+ public weak string tag;
}
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
[Compact]
@@ -2019,6 +2025,8 @@ namespace DPAP {
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
[Compact]
public class DMAPMetaDataMap {
+ public uint md;
+ public weak string tag;
}
[CCode (cheader_filename = "libdmapsharing/dmap.h")]
[Compact]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
