[rygel-gst-0-10-plugins] cleanup
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel-gst-0-10-plugins] cleanup
- Date: Fri, 11 Jan 2013 09:41:16 +0000 (UTC)
commit 398851e7603ffdedd1ceed756ba532f95bb89fac
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Jan 11 10:41:10 2013 +0100
cleanup
.../rygel-media-export-database-cursor.c | 23 +-
src/media-export/rygel-media-export-database.c | 89 ++---
src/media-export/rygel-media-export-db-container.c | 100 ++---
src/media-export/rygel-media-export-dbus-service.c | 29 +-
.../rygel-media-export-dummy-container.c | 44 +--
src/media-export/rygel-media-export-harvester.c | 184 ++++-----
.../rygel-media-export-harvesting-task.c | 218 +++++------
src/media-export/rygel-media-export-item-factory.c | 116 +++---
src/media-export/rygel-media-export-jpeg-writer.c | 25 +-
.../rygel-media-export-leaf-query-container.c | 31 +-
.../rygel-media-export-media-cache-upgrader.c | 208 +++++-----
src/media-export/rygel-media-export-media-cache.c | 413 ++++++++++----------
.../rygel-media-export-metadata-extractor.c | 52 +--
src/media-export/rygel-media-export-music-item.c | 16 +-
.../rygel-media-export-node-query-container.c | 70 ++--
.../rygel-media-export-null-container.c | 38 +-
.../rygel-media-export-object-factory.c | 10 +-
src/media-export/rygel-media-export-photo-item.c | 16 +-
src/media-export/rygel-media-export-plugin.c | 48 +--
.../rygel-media-export-query-container-factory.c | 109 +++---
.../rygel-media-export-query-container.c | 72 ++--
.../rygel-media-export-recursive-file-monitor.c | 54 ++--
.../rygel-media-export-root-container.c | 408 ++++++++++----------
src/media-export/rygel-media-export-sql-operator.c | 28 +-
.../rygel-media-export-sqlite-wrapper.c | 11 +-
src/media-export/rygel-media-export-video-item.c | 16 +-
.../rygel-media-export-writable-db-container.c | 54 ++--
27 files changed, 1117 insertions(+), 1365 deletions(-)
---
diff --git a/src/media-export/rygel-media-export-database-cursor.c b/src/media-export/rygel-media-export-database-cursor.c
index 9e73b7c..9393cfb 100644
--- a/src/media-export/rygel-media-export-database-cursor.c
+++ b/src/media-export/rygel-media-export-database-cursor.c
@@ -32,9 +32,6 @@
G_DEFINE_TYPE (RygelMediaExportDatabaseCursor, rygel_media_export_database_cursor, RYGEL_MEDIA_EXPORT_TYPE_SQLITE_WRAPPER)
-#define _sqlite3_finalize0(var) ((var == NULL) ? NULL : (var = (sqlite3_finalize (var), NULL)))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-
#define RYGEL_MEDIA_EXPORT_DATABASE_CURSOR_TYPE_ITERATOR (rygel_media_export_database_cursor_iterator_get_type ())
#define RYGEL_MEDIA_EXPORT_DATABASE_CURSOR_ITERATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RYGEL_MEDIA_EXPORT_DATABASE_CURSOR_TYPE_ITERATOR, RygelMediaExportDatabaseCursorIterator))
#define RYGEL_MEDIA_EXPORT_DATABASE_CURSOR_ITERATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), RYGEL_MEDIA_EXPORT_DATABASE_CURSOR_TYPE_ITERATOR, RygelMediaExportDatabaseCursorIteratorClass))
@@ -136,13 +133,13 @@ RygelMediaExportDatabaseCursor* rygel_media_export_database_cursor_construct (GT
_tmp1_ = db;
_tmp2_ = sql;
_tmp4_ = sqlite3_prepare_v2 (_tmp1_, _tmp2_, -1, &_tmp3_, NULL);
- _sqlite3_finalize0 (self->priv->statement);
+ sqlite3_finalize (self->priv->statement);
self->priv->statement = _tmp3_;
rygel_media_export_sqlite_wrapper_throw_if_code_is_error ((RygelMediaExportSqliteWrapper*) self, _tmp4_, &_inner_error_);
if (_inner_error_ != NULL) {
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (self);
+ g_object_unref (self);
return NULL;
} else {
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);
@@ -283,7 +280,7 @@ RygelMediaExportDatabaseCursor* rygel_media_export_database_cursor_construct (GT
if (_inner_error_ != NULL) {
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (self);
+ g_object_unref (self);
return NULL;
} else {
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);
@@ -386,12 +383,6 @@ RygelMediaExportDatabaseCursorIterator* rygel_media_export_database_cursor_itera
return result;
}
-
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
-
RygelMediaExportDatabaseCursorIterator* rygel_media_export_database_cursor_iterator_construct (GType object_type, RygelMediaExportDatabaseCursor* cursor) {
RygelMediaExportDatabaseCursorIterator* self = NULL;
RygelMediaExportDatabaseCursor* _tmp0_;
@@ -399,8 +390,8 @@ RygelMediaExportDatabaseCursorIterator* rygel_media_export_database_cursor_itera
g_return_val_if_fail (cursor != NULL, NULL);
self = (RygelMediaExportDatabaseCursorIterator*) g_type_create_instance (object_type);
_tmp0_ = cursor;
- _tmp1_ = _g_object_ref0 (_tmp0_);
- _g_object_unref0 (self->cursor);
+ _tmp1_ = g_object_ref (_tmp0_);
+ g_object_unref (self->cursor);
self->cursor = _tmp1_;
return self;
}
@@ -572,7 +563,7 @@ static void rygel_media_export_database_cursor_iterator_init (RygelMediaExportDa
static void rygel_media_export_database_cursor_iterator_finalize (RygelMediaExportDatabaseCursorIterator* obj) {
RygelMediaExportDatabaseCursorIterator * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_MEDIA_EXPORT_DATABASE_CURSOR_TYPE_ITERATOR, RygelMediaExportDatabaseCursorIterator);
- _g_object_unref0 (self->cursor);
+ g_object_unref (self->cursor);
}
@@ -625,7 +616,7 @@ static void rygel_media_export_database_cursor_init (RygelMediaExportDatabaseCur
static void rygel_media_export_database_cursor_finalize (GObject* obj) {
RygelMediaExportDatabaseCursor * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_MEDIA_EXPORT_TYPE_DATABASE_CURSOR, RygelMediaExportDatabaseCursor);
- _sqlite3_finalize0 (self->priv->statement);
+ sqlite3_finalize (self->priv->statement);
G_OBJECT_CLASS (rygel_media_export_database_cursor_parent_class)->finalize (obj);
}
diff --git a/src/media-export/rygel-media-export-database.c b/src/media-export/rygel-media-export-database.c
index 6a64dbb..37f1903 100644
--- a/src/media-export/rygel-media-export-database.c
+++ b/src/media-export/rygel-media-export-database.c
@@ -22,6 +22,7 @@
*/
#include "rygel-media-export-database.h"
+#include "rygel-media-export-database-cursor.h"
#include <sqlite3.h>
/**
@@ -33,25 +34,7 @@
G_DEFINE_TYPE (RygelMediaExportDatabase, rygel_media_export_database, RYGEL_MEDIA_EXPORT_TYPE_SQLITE_WRAPPER)
-
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-
-#define RYGEL_MEDIA_EXPORT_TYPE_DATABASE_CURSOR (rygel_media_export_database_cursor_get_type ())
-#define RYGEL_MEDIA_EXPORT_DATABASE_CURSOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RYGEL_MEDIA_EXPORT_TYPE_DATABASE_CURSOR, RygelMediaExportDatabaseCursor))
-#define RYGEL_MEDIA_EXPORT_DATABASE_CURSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), RYGEL_MEDIA_EXPORT_TYPE_DATABASE_CURSOR, RygelMediaExportDatabaseCursorClass))
-#define RYGEL_MEDIA_EXPORT_IS_DATABASE_CURSOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), RYGEL_MEDIA_EXPORT_TYPE_DATABASE_CURSOR))
-#define RYGEL_MEDIA_EXPORT_IS_DATABASE_CURSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), RYGEL_MEDIA_EXPORT_TYPE_DATABASE_CURSOR))
-#define RYGEL_MEDIA_EXPORT_DATABASE_CURSOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), RYGEL_MEDIA_EXPORT_TYPE_DATABASE_CURSOR, RygelMediaExportDatabaseCursorClass))
-
-typedef struct _RygelMediaExportDatabaseCursor RygelMediaExportDatabaseCursor;
-typedef struct _RygelMediaExportDatabaseCursorClass RygelMediaExportDatabaseCursorClass;
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-
-
GQuark rygel_media_export_database_error_quark (void);
-gint rygel_media_export_utf8_collate_str (const gchar* a, const gchar* b);
-GType rygel_media_export_sqlite_wrapper_get_type (void) G_GNUC_CONST;
static void rygel_media_export_database_utf8_contains (sqlite3_context* context, sqlite3_value** args, int args_length1);
static gint rygel_media_export_database_utf8_collate (gint alen, void* a, gint blen, void* b);
@@ -139,7 +122,7 @@ static void rygel_media_export_database_utf8_contains (sqlite3_context* context,
_tmp15_ = context;
sqlite3_result_int (_tmp15_, 0);
}
- _g_free0 (pattern);
+ g_free (pattern);
}
@@ -187,8 +170,8 @@ static gint rygel_media_export_database_utf8_collate (gint alen, void* a, gint b
str_b = _tmp7_;
_tmp8_ = rygel_media_export_utf8_collate_str (str_a, str_b);
result = _tmp8_;
- _g_free0 (str_b);
- _g_free0 (str_a);
+ g_free (str_b);
+ g_free (str_a);
return result;
}
@@ -243,20 +226,20 @@ RygelMediaExportDatabase* rygel_media_export_database_construct (GType object_ty
_tmp6_ = _tmp5_;
_tmp7_ = g_build_filename (_tmp3_, _tmp6_, NULL);
_tmp8_ = _tmp7_;
- _g_free0 (_tmp6_);
+ g_free (_tmp6_);
db_file = _tmp8_;
_tmp9_ = db_file;
self = (RygelMediaExportDatabase*) rygel_media_export_sqlite_wrapper_construct (object_type, _tmp9_, &_inner_error_);
if (_inner_error_ != NULL) {
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
g_propagate_error (error, _inner_error_);
- _g_free0 (db_file);
- _g_free0 (dirname);
- _g_object_unref0 (self);
+ g_free (db_file);
+ g_free (dirname);
+ g_object_unref (self);
return NULL;
} else {
- _g_free0 (db_file);
- _g_free0 (dirname);
+ g_free (db_file);
+ g_free (dirname);
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 NULL;
@@ -268,13 +251,13 @@ RygelMediaExportDatabase* rygel_media_export_database_construct (GType object_ty
if (_inner_error_ != NULL) {
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
g_propagate_error (error, _inner_error_);
- _g_free0 (db_file);
- _g_free0 (dirname);
- _g_object_unref0 (self);
+ g_free (db_file);
+ g_free (dirname);
+ g_object_unref (self);
return NULL;
} else {
- _g_free0 (db_file);
- _g_free0 (dirname);
+ g_free (db_file);
+ g_free (dirname);
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 NULL;
@@ -284,13 +267,13 @@ RygelMediaExportDatabase* rygel_media_export_database_construct (GType object_ty
if (_inner_error_ != NULL) {
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
g_propagate_error (error, _inner_error_);
- _g_free0 (db_file);
- _g_free0 (dirname);
- _g_object_unref0 (self);
+ g_free (db_file);
+ g_free (dirname);
+ g_object_unref (self);
return NULL;
} else {
- _g_free0 (db_file);
- _g_free0 (dirname);
+ g_free (db_file);
+ g_free (dirname);
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 NULL;
@@ -300,13 +283,13 @@ RygelMediaExportDatabase* rygel_media_export_database_construct (GType object_ty
if (_inner_error_ != NULL) {
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
g_propagate_error (error, _inner_error_);
- _g_free0 (db_file);
- _g_free0 (dirname);
- _g_object_unref0 (self);
+ g_free (db_file);
+ g_free (dirname);
+ g_object_unref (self);
return NULL;
} else {
- _g_free0 (db_file);
- _g_free0 (dirname);
+ g_free (db_file);
+ g_free (dirname);
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 NULL;
@@ -318,8 +301,8 @@ RygelMediaExportDatabase* rygel_media_export_database_construct (GType object_ty
_tmp13_ = rygel_media_export_sqlite_wrapper_get_db ((RygelMediaExportSqliteWrapper*) self);
_tmp14_ = _tmp13_;
sqlite3_create_collation (_tmp14_, "CASEFOLD", SQLITE_UTF8, NULL, (int (*)(void *, int, const void *, int, const void *)) _rygel_media_export_database_utf8_collate_sqlite_compare_callback);
- _g_free0 (db_file);
- _g_free0 (dirname);
+ g_free (db_file);
+ g_free (dirname);
return self;
}
@@ -405,7 +388,7 @@ static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback cal
gchar* _tmp5_;
_tmp4_ = sqlite_errmsg;
_tmp5_ = g_strdup (_tmp4_);
- _g_free0 (_vala_errmsg);
+ g_free (_vala_errmsg);
_vala_errmsg = _tmp5_;
}
_tmp6_ = sqlite_errmsg;
@@ -414,7 +397,7 @@ static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback cal
if (errmsg) {
*errmsg = _vala_errmsg;
} else {
- _g_free0 (_vala_errmsg);
+ g_free (_vala_errmsg);
}
return result;
}
@@ -484,17 +467,17 @@ void rygel_media_export_database_exec (RygelMediaExportDatabase* self, const gch
if (_inner_error_ != NULL) {
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
return;
} else {
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
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;
}
}
}
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
}
@@ -542,10 +525,10 @@ gint rygel_media_export_database_query_value (RygelMediaExportDatabase* self, co
if (_inner_error_ != NULL) {
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
return 0;
} else {
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
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;
@@ -554,7 +537,7 @@ gint rygel_media_export_database_query_value (RygelMediaExportDatabase* self, co
_tmp5_ = statement;
_tmp6_ = sqlite3_column_int (_tmp5_, 0);
result = _tmp6_;
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
return result;
}
@@ -657,7 +640,7 @@ void rygel_media_export_database_rollback (RygelMediaExportDatabase* self) {
_tmp1_ = _error_;
_tmp2_ = _tmp1_->message;
g_critical (_tmp0_, _tmp2_);
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally2:
if (_inner_error_ != NULL) {
diff --git a/src/media-export/rygel-media-export-db-container.c b/src/media-export/rygel-media-export-db-container.c
index 4c7da12..bcf9964 100644
--- a/src/media-export/rygel-media-export-db-container.c
+++ b/src/media-export/rygel-media-export-db-container.c
@@ -29,11 +29,7 @@ static void rygel_media_export_db_container_rygel_searchable_container_interface
G_DEFINE_TYPE_WITH_CODE (RygelMediaExportDBContainer, rygel_media_export_db_container, RYGEL_TYPE_MEDIA_CONTAINER,
G_IMPLEMENT_INTERFACE (RYGEL_TYPE_DATA_SOURCE, rygel_media_export_db_container_rygel_searchable_container_interface_init))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define _g_free0(var) (var = (g_free (var), NULL))
typedef struct _RygelMediaExportDbContainerGetChildrenData RygelMediaExportDbContainerGetChildrenData;
-#define _rygel_search_expression_unref0(var) ((var == NULL) ? NULL : (var = (rygel_search_expression_unref (var), NULL)))
typedef struct _RygelMediaExportDbContainerSearchData RygelMediaExportDbContainerSearchData;
typedef struct _RygelMediaExportDbContainerFindObjectData RygelMediaExportDbContainerFindObjectData;
@@ -153,12 +149,6 @@ static void rygel_media_export_db_container_finalize (GObject* obj);
static void _vala_rygel_media_export_db_container_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
static void _vala_rygel_media_export_db_container_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
-
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
-
static void __lambda2_ (RygelMediaExportDBContainer* self) {
rygel_media_export_db_container_count_children (self);
}
@@ -184,13 +174,13 @@ RygelMediaExportDBContainer* rygel_media_export_db_container_construct (GType ob
_tmp1_ = title;
self = (RygelMediaExportDBContainer*) rygel_media_container_construct (object_type, _tmp0_, NULL, _tmp1_, 0);
_tmp2_ = media_db;
- _tmp3_ = _g_object_ref0 (_tmp2_);
- _g_object_unref0 (self->media_db);
+ _tmp3_ = g_object_ref (_tmp2_);
+ g_object_unref (self->media_db);
self->media_db = _tmp3_;
_tmp4_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
_tmp5_ = _tmp4_;
rygel_searchable_container_set_search_classes ((RygelSearchableContainer*) self, _tmp5_);
- _g_object_unref0 (_tmp5_);
+ g_object_unref (_tmp5_);
g_signal_connect_object ((RygelMediaContainer*) self, "container-updated", (GCallback) ___lambda2__rygel_media_container_container_updated, self, 0);
rygel_media_export_db_container_count_children (self);
return self;
@@ -239,7 +229,7 @@ static void rygel_media_export_db_container_count_children (RygelMediaExportDBCo
g_debug ("rygel-media-export-db-container.vala:43: Could not get child count fro" \
"m database: %s", _tmp6_);
((RygelMediaContainer*) self)->child_count = 0;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally3:
if (_inner_error_ != NULL) {
@@ -253,10 +243,10 @@ static void rygel_media_export_db_container_count_children (RygelMediaExportDBCo
static void rygel_media_export_db_container_real_get_children_data_free (gpointer _data) {
RygelMediaExportDbContainerGetChildrenData* _data_;
_data_ = _data;
- _g_free0 (_data_->sort_criteria);
- _g_object_unref0 (_data_->cancellable);
- _g_object_unref0 (_data_->result);
- _g_object_unref0 (_data_->self);
+ g_free (_data_->sort_criteria);
+ g_object_unref (_data_->cancellable);
+ g_object_unref (_data_->result);
+ g_object_unref (_data_->self);
g_slice_free (RygelMediaExportDbContainerGetChildrenData, _data_);
}
@@ -275,7 +265,7 @@ static void rygel_media_export_db_container_real_get_children (RygelMediaContain
_data_ = g_slice_new0 (RygelMediaExportDbContainerGetChildrenData);
_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, rygel_media_export_db_container_real_get_children);
g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, rygel_media_export_db_container_real_get_children_data_free);
- _tmp0_ = _g_object_ref0 (self);
+ _tmp0_ = g_object_ref (self);
_data_->self = _tmp0_;
_tmp1_ = offset;
_data_->offset = _tmp1_;
@@ -283,11 +273,11 @@ static void rygel_media_export_db_container_real_get_children (RygelMediaContain
_data_->max_count = _tmp2_;
_tmp3_ = sort_criteria;
_tmp4_ = g_strdup (_tmp3_);
- _g_free0 (_data_->sort_criteria);
+ g_free (_data_->sort_criteria);
_data_->sort_criteria = _tmp4_;
_tmp5_ = cancellable;
- _tmp6_ = _g_object_ref0 (_tmp5_);
- _g_object_unref0 (_data_->cancellable);
+ _tmp6_ = g_object_ref (_tmp5_);
+ g_object_unref (_data_->cancellable);
_data_->cancellable = _tmp6_;
rygel_media_export_db_container_real_get_children_co (_data_);
}
@@ -353,11 +343,11 @@ static gboolean rygel_media_export_db_container_real_get_children_co (RygelMedia
static void rygel_media_export_db_container_real_search_data_free (gpointer _data) {
RygelMediaExportDbContainerSearchData* _data_;
_data_ = _data;
- _rygel_search_expression_unref0 (_data_->expression);
- _g_free0 (_data_->sort_criteria);
- _g_object_unref0 (_data_->cancellable);
- _g_object_unref0 (_data_->result);
- _g_object_unref0 (_data_->self);
+ rygel_search_expression_unref (_data_->expression);
+ g_free (_data_->sort_criteria);
+ g_object_unref (_data_->cancellable);
+ g_object_unref (_data_->result);
+ g_object_unref (_data_->self);
g_slice_free (RygelMediaExportDbContainerSearchData, _data_);
}
@@ -381,11 +371,11 @@ static void rygel_media_export_db_container_real_search (RygelMediaExportDBConta
_data_ = g_slice_new0 (RygelMediaExportDbContainerSearchData);
_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, rygel_media_export_db_container_real_search);
g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, rygel_media_export_db_container_real_search_data_free);
- _tmp0_ = _g_object_ref0 (self);
+ _tmp0_ = g_object_ref (self);
_data_->self = _tmp0_;
_tmp1_ = expression;
_tmp2_ = _rygel_search_expression_ref0 (_tmp1_);
- _rygel_search_expression_unref0 (_data_->expression);
+ rygel_search_expression_unref (_data_->expression);
_data_->expression = _tmp2_;
_tmp3_ = offset;
_data_->offset = _tmp3_;
@@ -393,11 +383,11 @@ static void rygel_media_export_db_container_real_search (RygelMediaExportDBConta
_data_->max_count = _tmp4_;
_tmp5_ = sort_criteria;
_tmp6_ = g_strdup (_tmp5_);
- _g_free0 (_data_->sort_criteria);
+ g_free (_data_->sort_criteria);
_data_->sort_criteria = _tmp6_;
_tmp7_ = cancellable;
- _tmp8_ = _g_object_ref0 (_tmp7_);
- _g_object_unref0 (_data_->cancellable);
+ _tmp8_ = g_object_ref (_tmp7_);
+ g_object_unref (_data_->cancellable);
_data_->cancellable = _tmp8_;
rygel_media_export_db_container_real_search_co (_data_);
}
@@ -427,12 +417,6 @@ static void rygel_media_export_db_container_search_ready (GObject* source_object
rygel_media_export_db_container_real_search_co (_data_);
}
-
-static gpointer _g_error_copy0 (gpointer self) {
- return self ? g_error_copy (self) : NULL;
-}
-
-
static gboolean rygel_media_export_db_container_real_search_co (RygelMediaExportDbContainerSearchData* _data_) {
switch (_data_->_state_) {
case 0:
@@ -463,7 +447,7 @@ static gboolean rygel_media_export_db_container_real_search_co (RygelMediaExport
}
goto __finally4;
}
- _g_object_unref0 (_data_->children);
+ g_object_unref (_data_->children);
_data_->children = _data_->_tmp9_;
}
goto __finally4;
@@ -488,25 +472,25 @@ static gboolean rygel_media_export_db_container_real_search_co (RygelMediaExport
_data_->total_matches = _data_->_tmp16_;
_data_->_tmp18_ = _data_->_tmp17_;
if (_data_->_inner_error_ != NULL) {
- _g_error_free0 (_data_->_error_);
+ g_error_free (_data_->_error_);
goto __finally4;
}
- _g_object_unref0 (_data_->children);
+ g_object_unref (_data_->children);
_data_->children = _data_->_tmp18_;
} else {
_data_->_tmp19_ = _data_->_error_;
- _data_->_tmp20_ = _g_error_copy0 (_data_->_tmp19_);
+ _data_->_tmp20_ = g_error_copy (_data_->_tmp19_);
_data_->_inner_error_ = _data_->_tmp20_;
- _g_error_free0 (_data_->_error_);
+ g_error_free (_data_->_error_);
goto __finally4;
}
- _g_error_free0 (_data_->_error_);
+ g_error_free (_data_->_error_);
}
__finally4:
if (_data_->_inner_error_ != NULL) {
g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
g_error_free (_data_->_inner_error_);
- _g_object_unref0 (_data_->children);
+ g_object_unref (_data_->children);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -523,7 +507,7 @@ static gboolean rygel_media_export_db_container_real_search_co (RygelMediaExport
}
g_object_unref (_data_->_async_result);
return FALSE;
- _g_object_unref0 (_data_->children);
+ g_object_unref (_data_->children);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -547,10 +531,10 @@ RygelMediaObjects* rygel_media_export_db_container_search_finish (RygelMediaExpo
static void rygel_media_export_db_container_real_find_object_data_free (gpointer _data) {
RygelMediaExportDbContainerFindObjectData* _data_;
_data_ = _data;
- _g_free0 (_data_->id);
- _g_object_unref0 (_data_->cancellable);
- _g_object_unref0 (_data_->result);
- _g_object_unref0 (_data_->self);
+ g_free (_data_->id);
+ g_object_unref (_data_->cancellable);
+ g_object_unref (_data_->result);
+ g_object_unref (_data_->self);
g_slice_free (RygelMediaExportDbContainerFindObjectData, _data_);
}
@@ -567,15 +551,15 @@ static void rygel_media_export_db_container_real_find_object (RygelMediaContaine
_data_ = g_slice_new0 (RygelMediaExportDbContainerFindObjectData);
_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, rygel_media_export_db_container_real_find_object);
g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, rygel_media_export_db_container_real_find_object_data_free);
- _tmp0_ = _g_object_ref0 (self);
+ _tmp0_ = g_object_ref (self);
_data_->self = _tmp0_;
_tmp1_ = id;
_tmp2_ = g_strdup (_tmp1_);
- _g_free0 (_data_->id);
+ g_free (_data_->id);
_data_->id = _tmp2_;
_tmp3_ = cancellable;
- _tmp4_ = _g_object_ref0 (_tmp3_);
- _g_object_unref0 (_data_->cancellable);
+ _tmp4_ = g_object_ref (_tmp3_);
+ g_object_unref (_data_->cancellable);
_data_->cancellable = _tmp4_;
rygel_media_export_db_container_real_find_object_co (_data_);
}
@@ -653,8 +637,8 @@ static void rygel_media_export_db_container_real_set_search_classes (RygelSearch
GeeArrayList* _tmp1_;
self = (RygelMediaExportDBContainer*) base;
_tmp0_ = value;
- _tmp1_ = _g_object_ref0 (_tmp0_);
- _g_object_unref0 (self->priv->_search_classes);
+ _tmp1_ = g_object_ref (_tmp0_);
+ g_object_unref (self->priv->_search_classes);
self->priv->_search_classes = _tmp1_;
g_object_notify ((GObject *) self, "search-classes");
}
@@ -693,8 +677,8 @@ static void rygel_media_export_db_container_init (RygelMediaExportDBContainer *
static void rygel_media_export_db_container_finalize (GObject* obj) {
RygelMediaExportDBContainer * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_MEDIA_EXPORT_TYPE_DB_CONTAINER, RygelMediaExportDBContainer);
- _g_object_unref0 (self->media_db);
- _g_object_unref0 (self->priv->_search_classes);
+ g_object_unref (self->media_db);
+ g_object_unref (self->priv->_search_classes);
G_OBJECT_CLASS (rygel_media_export_db_container_parent_class)->finalize (obj);
}
diff --git a/src/media-export/rygel-media-export-dbus-service.c b/src/media-export/rygel-media-export-dbus-service.c
index bbd29a6..1dd73bd 100644
--- a/src/media-export/rygel-media-export-dbus-service.c
+++ b/src/media-export/rygel-media-export-dbus-service.c
@@ -26,11 +26,6 @@
G_DEFINE_TYPE (RygelMediaExportDBusService, rygel_media_export_dbus_service, G_TYPE_OBJECT)
-
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define _g_free0(var) (var = (g_free (var), NULL))
-
struct _RygelMediaExportDBusServicePrivate {
RygelMediaExportRootContainer* root_container;
};
@@ -80,10 +75,6 @@ static const GDBusPropertyInfo * const _rygel_media_export_dbus_service_dbus_pro
static const GDBusInterfaceInfo _rygel_media_export_dbus_service_dbus_interface_info = {-1, "org.gnome.Rygel.MediaExport1", (GDBusMethodInfo **) (&_rygel_media_export_dbus_service_dbus_method_info), (GDBusSignalInfo **) (&_rygel_media_export_dbus_service_dbus_signal_info), (GDBusPropertyInfo **) (&_rygel_media_export_dbus_service_dbus_property_info)};
static const GDBusInterfaceVTable _rygel_media_export_dbus_service_dbus_interface_vtable = {rygel_media_export_dbus_service_dbus_interface_method_call, rygel_media_export_dbus_service_dbus_interface_get_property, rygel_media_export_dbus_service_dbus_interface_set_property};
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
RygelMediaExportDBusService* rygel_media_export_dbus_service_construct (GType object_type, RygelMediaExportRootContainer* root_container, GError** error) {
RygelMediaExportDBusService * self = NULL;
@@ -93,8 +84,8 @@ RygelMediaExportDBusService* rygel_media_export_dbus_service_construct (GType ob
g_return_val_if_fail (root_container != NULL, NULL);
self = (RygelMediaExportDBusService*) g_object_new (object_type, NULL);
_tmp0_ = root_container;
- _tmp1_ = _g_object_ref0 (_tmp0_);
- _g_object_unref0 (self->priv->root_container);
+ _tmp1_ = g_object_ref (_tmp0_);
+ g_object_unref (self->priv->root_container);
self->priv->root_container = _tmp1_;
{
GDBusConnection* _tmp2_ = NULL;
@@ -118,17 +109,17 @@ RygelMediaExportDBusService* rygel_media_export_dbus_service_construct (GType ob
_tmp5_ = connection;
rygel_media_export_dbus_service_register_object (self, _tmp5_, RYGEL_MEDIA_EXPORT_DBUS_SERVICE_RYGEL_MEDIA_EXPORT_PATH, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (connection);
+ g_object_unref (connection);
if (_inner_error_->domain == G_IO_ERROR) {
goto __catch43_g_io_error;
}
- _g_object_unref0 (connection);
+ g_object_unref (connection);
g_critical ("file %s: line %d: unexpected 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 NULL;
}
}
- _g_object_unref0 (connection);
+ g_object_unref (connection);
}
goto __finally43;
__catch43_g_io_error:
@@ -143,12 +134,12 @@ RygelMediaExportDBusService* rygel_media_export_dbus_service_construct (GType ob
_tmp7_ = err;
_tmp8_ = _tmp7_->message;
g_warning (_tmp6_, _tmp8_);
- _g_error_free0 (err);
+ g_error_free (err);
}
__finally43:
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (self);
+ g_object_unref (self);
return NULL;
}
return self;
@@ -217,7 +208,7 @@ static void rygel_media_export_dbus_service_init (RygelMediaExportDBusService *
static void rygel_media_export_dbus_service_finalize (GObject* obj) {
RygelMediaExportDBusService * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_MEDIA_EXPORT_TYPE_DBUS_SERVICE, RygelMediaExportDBusService);
- _g_object_unref0 (self->priv->root_container);
+ g_object_unref (self->priv->root_container);
G_OBJECT_CLASS (rygel_media_export_dbus_service_parent_class)->finalize (obj);
}
@@ -239,7 +230,7 @@ static void _dbus_rygel_media_export_dbus_service_AddUri (RygelMediaExportDBusSe
g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
_reply = g_variant_builder_end (&_reply_builder);
g_dbus_message_set_body (_reply_message, _reply);
- _g_free0 (uri);
+ g_free (uri);
g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
g_object_unref (invocation);
g_object_unref (_reply_message);
@@ -263,7 +254,7 @@ static void _dbus_rygel_media_export_dbus_service_RemoveUri (RygelMediaExportDBu
g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
_reply = g_variant_builder_end (&_reply_builder);
g_dbus_message_set_body (_reply_message, _reply);
- _g_free0 (uri);
+ g_free (uri);
g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
g_object_unref (invocation);
g_object_unref (_reply_message);
diff --git a/src/media-export/rygel-media-export-dummy-container.c b/src/media-export/rygel-media-export-dummy-container.c
index ef79cde..fdf4cae 100644
--- a/src/media-export/rygel-media-export-dummy-container.c
+++ b/src/media-export/rygel-media-export-dummy-container.c
@@ -26,27 +26,9 @@
G_DEFINE_TYPE (RygelMediaExportDummyContainer, rygel_media_export_dummy_container, RYGEL_MEDIA_EXPORT_TYPE_NULL_CONTAINER)
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _g_free0(var) (var = (g_free (var), NULL))
-
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-
-
RygelMediaExportDummyContainer* rygel_media_export_dummy_container_construct (GType object_type, GFile* file, RygelMediaContainer* parent);
-gchar* rygel_media_export_media_cache_get_id (GFile* file);
-GType rygel_media_export_media_cache_get_type (void) G_GNUC_CONST;
-RygelMediaExportMediaCache* rygel_media_export_media_cache_get_default (GError** error);
-GQuark rygel_media_export_database_error_quark (void);
-GeeArrayList* rygel_media_export_media_cache_get_child_ids (RygelMediaExportMediaCache* self, const gchar* container_id, GError** error);
void rygel_media_export_dummy_container_seen (RygelMediaExportDummyContainer* self, GFile* file);
-static void rygel_media_export_dummy_container_finalize (GObject* obj);
-
-
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
RygelMediaExportDummyContainer* rygel_media_export_dummy_container_construct (GType object_type, GFile* file, RygelMediaContainer* parent) {
RygelMediaExportDummyContainer * self = NULL;
@@ -71,24 +53,24 @@ RygelMediaExportDummyContainer* rygel_media_export_dummy_container_construct (GT
_tmp1_ = rygel_media_export_media_cache_get_id (_tmp0_);
_tmp2_ = _tmp1_;
rygel_media_object_set_id ((RygelMediaObject*) self, _tmp2_);
- _g_free0 (_tmp2_);
+ g_free (_tmp2_);
_tmp3_ = file;
_tmp4_ = g_file_get_basename (_tmp3_);
_tmp5_ = _tmp4_;
rygel_media_object_set_title ((RygelMediaObject*) self, _tmp5_);
- _g_free0 (_tmp5_);
+ g_free (_tmp5_);
_tmp6_ = parent;
rygel_media_object_set_parent_ref ((RygelMediaObject*) self, _tmp6_);
_tmp7_ = file;
- _tmp8_ = _g_object_ref0 (_tmp7_);
- _g_object_unref0 (self->file);
+ _tmp8_ = g_object_ref (_tmp7_);
+ g_object_unref (self->file);
self->file = _tmp8_;
_tmp9_ = ((RygelMediaObject*) self)->uris;
_tmp10_ = file;
_tmp11_ = g_file_get_uri (_tmp10_);
_tmp12_ = _tmp11_;
gee_abstract_collection_add ((GeeAbstractCollection*) _tmp9_, _tmp12_);
- _g_free0 (_tmp12_);
+ g_free (_tmp12_);
{
RygelMediaExportMediaCache* _tmp13_ = NULL;
RygelMediaExportMediaCache* _tmp14_;
@@ -111,12 +93,12 @@ RygelMediaExportDummyContainer* rygel_media_export_dummy_container_construct (GT
_tmp17_ = _tmp16_;
_tmp18_ = rygel_media_export_media_cache_get_child_ids (_tmp15_, _tmp17_, &_inner_error_);
_tmp19_ = _tmp18_;
- _g_object_unref0 (_tmp15_);
+ g_object_unref (_tmp15_);
_tmp20_ = _tmp19_;
if (_inner_error_ != NULL) {
goto __catch25_g_error;
}
- _g_object_unref0 (self->children);
+ g_object_unref (self->children);
self->children = (GeeList*) _tmp20_;
_tmp21_ = self->children;
_tmp22_ = gee_collection_get_size ((GeeCollection*) _tmp21_);
@@ -131,10 +113,10 @@ RygelMediaExportDummyContainer* rygel_media_export_dummy_container_construct (GT
_error_ = _inner_error_;
_inner_error_ = NULL;
_tmp24_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
- _g_object_unref0 (self->children);
+ g_object_unref (self->children);
self->children = (GeeList*) _tmp24_;
((RygelMediaContainer*) self)->child_count = 0;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally25:
if (_inner_error_ != NULL) {
@@ -163,9 +145,11 @@ void rygel_media_export_dummy_container_seen (RygelMediaExportDummyContainer* se
_tmp2_ = rygel_media_export_media_cache_get_id (_tmp1_);
_tmp3_ = _tmp2_;
gee_collection_remove ((GeeCollection*) _tmp0_, _tmp3_);
- _g_free0 (_tmp3_);
+ g_free (_tmp3_);
}
+//TODO: Remove this?
+static void rygel_media_export_dummy_container_finalize (GObject* obj);
static void rygel_media_export_dummy_container_class_init (RygelMediaExportDummyContainerClass * klass) {
rygel_media_export_dummy_container_parent_class = g_type_class_peek_parent (klass);
@@ -180,8 +164,8 @@ static void rygel_media_export_dummy_container_init (RygelMediaExportDummyContai
static void rygel_media_export_dummy_container_finalize (GObject* obj) {
RygelMediaExportDummyContainer * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_MEDIA_EXPORT_TYPE_DUMMY_CONTAINER, RygelMediaExportDummyContainer);
- _g_object_unref0 (self->file);
- _g_object_unref0 (self->children);
+ g_object_unref (self->file);
+ g_object_unref (self->children);
G_OBJECT_CLASS (rygel_media_export_dummy_container_parent_class)->finalize (obj);
}
diff --git a/src/media-export/rygel-media-export-harvester.c b/src/media-export/rygel-media-export-harvester.c
index 75b89b4..60c8b1e 100644
--- a/src/media-export/rygel-media-export-harvester.c
+++ b/src/media-export/rygel-media-export-harvester.c
@@ -53,10 +53,6 @@ typedef struct _RygelMediaExportMetadataExtractorClass RygelMediaExportMetadataE
typedef struct _RygelMediaExportRecursiveFileMonitor RygelMediaExportRecursiveFileMonitor;
typedef struct _RygelMediaExportRecursiveFileMonitorClass RygelMediaExportRecursiveFileMonitorClass;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-typedef struct _RygelMediaExportHarvestingTaskPrivate RygelMediaExportHarvestingTaskPrivate;
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
typedef struct _Block3Data Block3Data;
@@ -123,14 +119,6 @@ static void _vala_rygel_media_export_harvester_get_property (GObject * object, g
static void _vala_rygel_media_export_harvester_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
-/**
- * Create a new instance of the meta-data extraction manager.
- */
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
-
static void _rygel_media_export_harvester_on_file_changed_rygel_media_export_recursive_file_monitor_changed (RygelMediaExportRecursiveFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self) {
rygel_media_export_harvester_on_file_changed (self, file, other_file, event_type);
}
@@ -152,13 +140,13 @@ RygelMediaExportHarvester* rygel_media_export_harvester_construct (GType object_
g_return_val_if_fail (locations != NULL, NULL);
self = (RygelMediaExportHarvester*) g_object_new (object_type, NULL);
_tmp0_ = cancellable;
- _tmp1_ = _g_object_ref0 (_tmp0_);
- _g_object_unref0 (self->priv->cancellable);
+ _tmp1_ = g_object_ref (_tmp0_);
+ g_object_unref (self->priv->cancellable);
self->priv->cancellable = _tmp1_;
_tmp2_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, (GeeEqualDataFunc) g_file_equal, NULL, NULL);
_tmp3_ = _tmp2_;
rygel_media_export_harvester_set_locations (self, _tmp3_);
- _g_object_unref0 (_tmp3_);
+ g_object_unref (_tmp3_);
{
GeeArrayList* _tmp4_;
GeeArrayList* _tmp5_;
@@ -169,7 +157,7 @@ RygelMediaExportHarvester* rygel_media_export_harvester_construct (GType object_
gint _file_size;
gint _file_index;
_tmp4_ = locations;
- _tmp5_ = _g_object_ref0 (_tmp4_);
+ _tmp5_ = g_object_ref (_tmp4_);
_file_list = _tmp5_;
_tmp6_ = _file_list;
_tmp7_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp6_);
@@ -206,24 +194,24 @@ RygelMediaExportHarvester* rygel_media_export_harvester_construct (GType object_
_tmp18_ = file;
gee_abstract_collection_add ((GeeAbstractCollection*) _tmp17_, _tmp18_);
}
- _g_object_unref0 (file);
+ g_object_unref (file);
}
- _g_object_unref0 (_file_list);
+ g_object_unref (_file_list);
}
_tmp19_ = rygel_media_export_metadata_extractor_new ();
- _g_object_unref0 (self->priv->extractor);
+ g_object_unref (self->priv->extractor);
self->priv->extractor = _tmp19_;
_tmp20_ = cancellable;
_tmp21_ = rygel_media_export_recursive_file_monitor_new (_tmp20_);
- _g_object_unref0 (self->priv->monitor);
+ g_object_unref (self->priv->monitor);
self->priv->monitor = _tmp21_;
_tmp22_ = self->priv->monitor;
g_signal_connect_object (_tmp22_, "changed", (GCallback) _rygel_media_export_harvester_on_file_changed_rygel_media_export_recursive_file_monitor_changed, self, 0);
_tmp23_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, RYGEL_MEDIA_EXPORT_TYPE_HARVESTING_TASK, (GBoxedCopyFunc) g_object_ref, g_object_unref, (GeeHashDataFunc) g_file_hash, NULL, NULL, (GeeEqualDataFunc) g_file_equal, NULL, NULL, NULL, NULL, NULL);
- _g_object_unref0 (self->priv->tasks);
+ g_object_unref (self->priv->tasks);
self->priv->tasks = _tmp23_;
_tmp24_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_UINT, NULL, NULL, (GeeHashDataFunc) g_file_hash, NULL, NULL, (GeeEqualDataFunc) g_file_equal, NULL, NULL, NULL, NULL, NULL);
- _g_object_unref0 (self->priv->extraction_grace_timers);
+ g_object_unref (self->priv->extraction_grace_timers);
self->priv->extraction_grace_timers = _tmp24_;
return self;
}
@@ -290,7 +278,7 @@ void rygel_media_export_harvester_schedule (RygelMediaExportHarvester* self, GFi
_tmp10_ = flag;
_tmp11_ = rygel_media_export_harvesting_task_new (_tmp6_, _tmp7_, _tmp8_, _tmp9_, _tmp10_);
_tmp12_ = _tmp11_;
- _g_object_unref0 (_tmp6_);
+ g_object_unref (_tmp6_);
task = _tmp12_;
_tmp13_ = task;
_tmp14_ = self->priv->cancellable;
@@ -303,7 +291,7 @@ void rygel_media_export_harvester_schedule (RygelMediaExportHarvester* self, GFi
gee_abstract_map_set ((GeeAbstractMap*) _tmp16_, _tmp17_, _tmp18_);
_tmp19_ = task;
rygel_state_machine_run ((RygelStateMachine*) _tmp19_, NULL, NULL);
- _g_object_unref0 (task);
+ g_object_unref (task);
}
@@ -343,7 +331,7 @@ void rygel_media_export_harvester_cancel (RygelMediaExportHarvester* self, GFile
gee_abstract_map_unset ((GeeAbstractMap*) _tmp8_, _tmp9_, NULL);
_tmp10_ = task;
rygel_media_export_harvesting_task_cancel (_tmp10_);
- _g_object_unref0 (task);
+ g_object_unref (task);
}
}
@@ -374,18 +362,18 @@ static void rygel_media_export_harvester_on_file_harvested (RygelMediaExportHarv
g_return_if_fail (self != NULL);
g_return_if_fail (state_machine != NULL);
_tmp0_ = state_machine;
- _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, RYGEL_MEDIA_EXPORT_TYPE_HARVESTING_TASK) ? ((RygelMediaExportHarvestingTask*) _tmp0_) : NULL);
+ _tmp1_ = g_object_ref (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, RYGEL_MEDIA_EXPORT_TYPE_HARVESTING_TASK) ? ((RygelMediaExportHarvestingTask*) _tmp0_) : NULL);
task = _tmp1_;
_tmp2_ = task;
_tmp3_ = _tmp2_->origin;
- _tmp4_ = _g_object_ref0 (_tmp3_);
+ _tmp4_ = g_object_ref (_tmp3_);
file = _tmp4_;
_tmp5_ = _ ("'%s' harvested");
_tmp6_ = file;
_tmp7_ = g_file_get_uri (_tmp6_);
_tmp8_ = _tmp7_;
g_message (_tmp5_, _tmp8_);
- _g_free0 (_tmp8_);
+ g_free (_tmp8_);
_tmp9_ = self->priv->tasks;
_tmp10_ = file;
gee_abstract_map_unset ((GeeAbstractMap*) _tmp9_, _tmp10_, NULL);
@@ -395,8 +383,8 @@ static void rygel_media_export_harvester_on_file_harvested (RygelMediaExportHarv
if (_tmp13_) {
g_signal_emit_by_name (self, "done");
}
- _g_object_unref0 (file);
- _g_object_unref0 (task);
+ g_object_unref (file);
+ g_object_unref (task);
}
@@ -441,7 +429,7 @@ static void rygel_media_export_harvester_on_file_changed (RygelMediaExportHarves
GError* _error_ = NULL;
_error_ = _inner_error_;
_inner_error_ = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally46:
if (_inner_error_ != NULL) {
@@ -464,7 +452,7 @@ static void rygel_media_export_harvester_on_file_added (RygelMediaExportHarveste
_tmp2_ = _tmp1_;
g_debug ("rygel-media-export-harvester.vala:147: Filesystem events settled for %" \
"s, scheduling extractionâ", _tmp2_);
- _g_free0 (_tmp2_);
+ g_free (_tmp2_);
{
RygelMediaExportMediaCache* _tmp3_ = NULL;
RygelMediaExportMediaCache* cache;
@@ -492,7 +480,7 @@ static void rygel_media_export_harvester_on_file_added (RygelMediaExportHarveste
_tmp6_ = g_file_query_info (_tmp4_, G_FILE_ATTRIBUTE_STANDARD_TYPE "," G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, _tmp5_, &_inner_error_);
info = _tmp6_;
if (_inner_error_ != NULL) {
- _g_object_unref0 (cache);
+ g_object_unref (cache);
goto __catch47_g_error;
}
_tmp11_ = info;
@@ -554,7 +542,7 @@ static void rygel_media_export_harvester_on_file_added (RygelMediaExportHarveste
RygelMediaContainer* _tmp51_;
parent_container = NULL;
_tmp28_ = file;
- _tmp29_ = _g_object_ref0 (_tmp28_);
+ _tmp29_ = g_object_ref (_tmp28_);
current = _tmp29_;
{
gboolean _tmp30_;
@@ -588,38 +576,38 @@ static void rygel_media_export_harvester_on_file_added (RygelMediaExportHarveste
parent = _tmp34_;
_tmp35_ = parent;
_tmp36_ = rygel_media_export_media_cache_get_id (_tmp35_);
- _g_free0 (id);
+ g_free (id);
id = _tmp36_;
_tmp37_ = cache;
_tmp38_ = id;
_tmp39_ = rygel_media_export_media_cache_get_object (_tmp37_, _tmp38_, &_inner_error_);
_tmp40_ = _tmp39_;
if (_inner_error_ != NULL) {
- _g_object_unref0 (parent);
- _g_object_unref0 (current);
- _g_object_unref0 (parent_container);
+ g_object_unref (parent);
+ g_object_unref (current);
+ g_object_unref (parent_container);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch48_rygel_media_export_database_error;
}
- _g_object_unref0 (parent);
- _g_object_unref0 (current);
- _g_object_unref0 (parent_container);
- _g_free0 (id);
- _g_object_unref0 (info);
- _g_object_unref0 (cache);
+ g_object_unref (parent);
+ g_object_unref (current);
+ g_object_unref (parent_container);
+ g_free (id);
+ g_object_unref (info);
+ g_object_unref (cache);
g_critical ("file %s: line %d: unexpected 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;
}
- _g_object_unref0 (parent_container);
+ g_object_unref (parent_container);
parent_container = G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, RYGEL_TYPE_MEDIA_CONTAINER) ? ((RygelMediaContainer*) _tmp40_) : NULL;
_tmp41_ = parent_container;
if (_tmp41_ == NULL) {
GFile* _tmp42_;
GFile* _tmp43_;
_tmp42_ = parent;
- _tmp43_ = _g_object_ref0 (_tmp42_);
- _g_object_unref0 (current);
+ _tmp43_ = g_object_ref (_tmp42_);
+ g_object_unref (current);
current = _tmp43_;
}
_tmp44_ = self->priv->_locations;
@@ -633,35 +621,35 @@ static void rygel_media_export_harvester_on_file_added (RygelMediaExportHarveste
_tmp48_ = rygel_media_export_media_cache_get_object (_tmp47_, RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_ID, &_inner_error_);
_tmp49_ = _tmp48_;
if (_inner_error_ != NULL) {
- _g_object_unref0 (parent);
- _g_object_unref0 (current);
- _g_object_unref0 (parent_container);
+ g_object_unref (parent);
+ g_object_unref (current);
+ g_object_unref (parent_container);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch48_rygel_media_export_database_error;
}
- _g_object_unref0 (parent);
- _g_object_unref0 (current);
- _g_object_unref0 (parent_container);
- _g_free0 (id);
- _g_object_unref0 (info);
- _g_object_unref0 (cache);
+ g_object_unref (parent);
+ g_object_unref (current);
+ g_object_unref (parent_container);
+ g_free (id);
+ g_object_unref (info);
+ g_object_unref (cache);
g_critical ("file %s: line %d: unexpected 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;
}
- _g_object_unref0 (parent_container);
+ g_object_unref (parent_container);
parent_container = G_TYPE_CHECK_INSTANCE_TYPE (_tmp49_, RYGEL_TYPE_MEDIA_CONTAINER) ? ((RygelMediaContainer*) _tmp49_) : NULL;
- _g_object_unref0 (parent);
+ g_object_unref (parent);
break;
}
- _g_object_unref0 (parent);
+ g_object_unref (parent);
}
}
_tmp50_ = current;
_tmp51_ = parent_container;
rygel_media_export_harvester_schedule (self, _tmp50_, _tmp51_, NULL);
- _g_object_unref0 (current);
- _g_object_unref0 (parent_container);
+ g_object_unref (current);
+ g_object_unref (parent_container);
}
goto __finally48;
__catch48_rygel_media_export_database_error:
@@ -678,16 +666,16 @@ static void rygel_media_export_harvester_on_file_added (RygelMediaExportHarveste
_tmp54_ = _error_;
_tmp55_ = _tmp54_->message;
g_warning (_tmp52_, _tmp53_, _tmp55_);
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally48:
if (_inner_error_ != NULL) {
- _g_free0 (id);
- _g_object_unref0 (info);
- _g_object_unref0 (cache);
+ g_free (id);
+ g_object_unref (info);
+ g_object_unref (cache);
goto __catch47_g_error;
}
- _g_free0 (id);
+ g_free (id);
} else {
GFile* _tmp56_;
gchar* _tmp57_ = NULL;
@@ -697,10 +685,10 @@ static void rygel_media_export_harvester_on_file_added (RygelMediaExportHarveste
_tmp58_ = _tmp57_;
g_debug ("rygel-media-export-harvester.vala:191: %s is not eligible for extracti" \
"on", _tmp58_);
- _g_free0 (_tmp58_);
+ g_free (_tmp58_);
}
- _g_object_unref0 (info);
- _g_object_unref0 (cache);
+ g_object_unref (info);
+ g_object_unref (cache);
}
goto __finally47;
__catch47_g_error:
@@ -715,7 +703,7 @@ static void rygel_media_export_harvester_on_file_added (RygelMediaExportHarveste
_tmp60_ = _error_;
_tmp61_ = _tmp60_->message;
g_warning (_tmp59_, _tmp61_);
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally47:
if (_inner_error_ != NULL) {
@@ -778,10 +766,10 @@ static void rygel_media_export_harvester_on_file_removed (RygelMediaExportHarves
_tmp13_ = rygel_media_export_media_cache_get_object (cache, _tmp12_, &_inner_error_);
object = _tmp13_;
if (_inner_error_ != NULL) {
- _g_free0 (id);
+ g_free (id);
goto __catch49_g_error;
}
- _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (NULL, RYGEL_TYPE_MEDIA_CONTAINER) ? ((RygelMediaContainer*) NULL) : NULL);
+ _tmp14_ = g_object_ref (G_TYPE_CHECK_INSTANCE_TYPE (NULL, RYGEL_TYPE_MEDIA_CONTAINER) ? ((RygelMediaContainer*) NULL) : NULL);
parent = _tmp14_;
while (TRUE) {
RygelMediaObject* _tmp15_;
@@ -802,15 +790,15 @@ static void rygel_media_export_harvester_on_file_removed (RygelMediaExportHarves
}
_tmp16_ = object;
_tmp17_ = _tmp16_->parent;
- _tmp18_ = _g_object_ref0 (_tmp17_);
- _g_object_unref0 (parent);
+ _tmp18_ = g_object_ref (_tmp17_);
+ g_object_unref (parent);
parent = _tmp18_;
_tmp19_ = object;
rygel_media_export_media_cache_remove_object (cache, _tmp19_, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (parent);
- _g_object_unref0 (object);
- _g_free0 (id);
+ g_object_unref (parent);
+ g_object_unref (object);
+ g_free (id);
goto __catch49_g_error;
}
_tmp20_ = parent;
@@ -826,8 +814,8 @@ static void rygel_media_export_harvester_on_file_removed (RygelMediaExportHarves
break;
}
_tmp25_ = parent;
- _tmp26_ = _g_object_ref0 ((RygelMediaObject*) _tmp25_);
- _g_object_unref0 (object);
+ _tmp26_ = g_object_ref ((RygelMediaObject*) _tmp25_);
+ g_object_unref (object);
object = _tmp26_;
}
_tmp27_ = parent;
@@ -836,9 +824,9 @@ static void rygel_media_export_harvester_on_file_removed (RygelMediaExportHarves
_tmp28_ = parent;
rygel_media_container_updated (_tmp28_, NULL, RYGEL_OBJECT_EVENT_TYPE_MODIFIED, FALSE);
}
- _g_object_unref0 (parent);
- _g_object_unref0 (object);
- _g_free0 (id);
+ g_object_unref (parent);
+ g_object_unref (object);
+ g_free (id);
}
goto __finally49;
__catch49_g_error:
@@ -853,15 +841,15 @@ static void rygel_media_export_harvester_on_file_removed (RygelMediaExportHarves
_tmp30_ = _error_;
_tmp31_ = _tmp30_->message;
g_warning (_tmp29_, _tmp31_);
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally49:
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (cache);
+ g_object_unref (cache);
return;
}
- _g_object_unref0 (cache);
+ g_object_unref (cache);
}
@@ -877,8 +865,8 @@ static void block3_data_unref (void * _userdata_) {
if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) {
RygelMediaExportHarvester * self;
self = _data3_->self;
- _g_object_unref0 (_data3_->file);
- _g_object_unref0 (self);
+ g_object_unref (_data3_->file);
+ g_object_unref (self);
g_slice_free (Block3Data, _data3_);
}
}
@@ -926,8 +914,8 @@ static void rygel_media_export_harvester_on_changes_done (RygelMediaExportHarves
_data3_->_ref_count_ = 1;
_data3_->self = g_object_ref (self);
_tmp0_ = file;
- _tmp1_ = _g_object_ref0 (_tmp0_);
- _g_object_unref0 (_data3_->file);
+ _tmp1_ = g_object_ref (_tmp0_);
+ g_object_unref (_data3_->file);
_data3_->file = _tmp1_;
_tmp2_ = self->priv->extraction_grace_timers;
_tmp3_ = _data3_->file;
@@ -949,7 +937,7 @@ static void rygel_media_export_harvester_on_changes_done (RygelMediaExportHarves
_tmp10_ = _tmp9_;
g_debug ("rygel-media-export-harvester.vala:242: Starting grace timer for harves" \
"ting %sâ", _tmp10_);
- _g_free0 (_tmp10_);
+ g_free (_tmp10_);
}
callback = ___lambda3__gsource_func;
callback_target = block3_data_ref (_data3_);
@@ -987,8 +975,8 @@ static void rygel_media_export_harvester_set_locations (RygelMediaExportHarveste
GeeArrayList* _tmp1_;
g_return_if_fail (self != NULL);
_tmp0_ = value;
- _tmp1_ = _g_object_ref0 (_tmp0_);
- _g_object_unref0 (self->priv->_locations);
+ _tmp1_ = g_object_ref (_tmp0_);
+ g_object_unref (self->priv->_locations);
self->priv->_locations = _tmp1_;
g_object_notify ((GObject *) self, "locations");
}
@@ -1013,12 +1001,12 @@ static void rygel_media_export_harvester_init (RygelMediaExportHarvester * self)
static void rygel_media_export_harvester_finalize (GObject* obj) {
RygelMediaExportHarvester * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_MEDIA_EXPORT_TYPE_HARVESTER, RygelMediaExportHarvester);
- _g_object_unref0 (self->priv->tasks);
- _g_object_unref0 (self->priv->extraction_grace_timers);
- _g_object_unref0 (self->priv->extractor);
- _g_object_unref0 (self->priv->monitor);
- _g_object_unref0 (self->priv->cancellable);
- _g_object_unref0 (self->priv->_locations);
+ g_object_unref (self->priv->tasks);
+ g_object_unref (self->priv->extraction_grace_timers);
+ g_object_unref (self->priv->extractor);
+ g_object_unref (self->priv->monitor);
+ g_object_unref (self->priv->cancellable);
+ g_object_unref (self->priv->_locations);
G_OBJECT_CLASS (rygel_media_export_harvester_parent_class)->finalize (obj);
}
diff --git a/src/media-export/rygel-media-export-harvesting-task.c b/src/media-export/rygel-media-export-harvesting-task.c
index 24bf67d..67baacd 100644
--- a/src/media-export/rygel-media-export-harvesting-task.c
+++ b/src/media-export/rygel-media-export-harvesting-task.c
@@ -52,14 +52,11 @@ typedef struct _RygelMediaExportMetadataExtractorClass RygelMediaExportMetadataE
typedef struct _RygelMediaExportRecursiveFileMonitor RygelMediaExportRecursiveFileMonitor;
typedef struct _RygelMediaExportRecursiveFileMonitorClass RygelMediaExportRecursiveFileMonitorClass;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define __g_queue_free__g_object_unref0_0(var) ((var == NULL) ? NULL : (var = (_g_queue_free__g_object_unref0_ (var), NULL)))
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+#define __g_queue_free_g_object_unref_0(var) ((var == NULL) ? NULL : (var = (_g_queue_free_g_object_unref_ (var), NULL)))
typedef struct _RygelMediaExportHarvestingTaskRunData RygelMediaExportHarvestingTaskRunData;
-#define __g_list_free__g_object_unref0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__g_object_unref0_ (var), NULL)))
+#define __g_list_free_g_object_unref_0(var) ((var == NULL) ? NULL : (var = (_g_list_free_g_object_unref_ (var), NULL)))
typedef struct _RygelMediaExportHarvestingTaskEnumerateDirectoryData RygelMediaExportHarvestingTaskEnumerateDirectoryData;
struct _RygelMediaExportHarvestingTaskPrivate {
@@ -150,8 +147,8 @@ enum {
RYGEL_MEDIA_EXPORT_HARVESTING_TASK_DUMMY_PROPERTY,
RYGEL_MEDIA_EXPORT_HARVESTING_TASK_CANCELLABLE
};
-static void _g_object_unref0_ (gpointer var);
-static void _g_queue_free__g_object_unref0_ (GQueue* self);
+static void g_object_unref_ (gpointer var);
+static void _g_queue_free_g_object_unref_ (GQueue* self);
#define RYGEL_MEDIA_EXPORT_HARVESTING_TASK_BATCH_SIZE 256
#define RYGEL_MEDIA_EXPORT_HARVESTING_TASK_HARVESTER_ATTRIBUTES G_FILE_ATTRIBUTE_STANDARD_NAME "," G_FILE_ATTRIBUTE_STANDARD_TYPE "," G_FILE_ATTRIBUTE_TIME_MODIFIED "," G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE "," G_FILE_ATTRIBUTE_STANDARD_SIZE
RygelMediaExportHarvestingTask* rygel_media_export_harvesting_task_new (RygelMediaExportMetadataExtractor* extractor, RygelMediaExportRecursiveFileMonitor* monitor, GFile* file, RygelMediaContainer* parent, const gchar* flag);
@@ -184,7 +181,7 @@ static void rygel_media_export_harvesting_task_enumerate_directory (RygelMediaEx
static void rygel_media_export_harvesting_task_enumerate_directory_finish (RygelMediaExportHarvestingTask* self, GAsyncResult* _res_);
static gboolean rygel_media_export_harvesting_task_enumerate_directory_co (RygelMediaExportHarvestingTaskEnumerateDirectoryData* _data_);
static void rygel_media_export_harvesting_task_enumerate_directory_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_);
-static void _g_list_free__g_object_unref0_ (GList* self);
+static void _g_list_free_g_object_unref_ (GList* self);
static void rygel_media_export_harvesting_task_cleanup_database (RygelMediaExportHarvestingTask* self);
static void rygel_media_export_harvesting_task_do_update (RygelMediaExportHarvestingTask* self);
void rygel_media_export_media_cache_remove_by_id (RygelMediaExportMediaCache* self, const gchar* id, GError** error);
@@ -199,22 +196,17 @@ static void _vala_rygel_media_export_harvesting_task_get_property (GObject * obj
static void _vala_rygel_media_export_harvesting_task_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
-static void _g_object_unref0_ (gpointer var) {
+static void g_object_unref_ (gpointer var) {
(var == NULL) ? NULL : (var = (g_object_unref (var), NULL));
}
-static void _g_queue_free__g_object_unref0_ (GQueue* self) {
- g_queue_foreach (self, (GFunc) _g_object_unref0_, NULL);
+static void _g_queue_free_g_object_unref_ (GQueue* self) {
+ g_queue_foreach (self, (GFunc) g_object_unref_, NULL);
g_queue_free (self);
}
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
-
static void _rygel_media_export_harvesting_task_on_extracted_cb_rygel_media_export_metadata_extractor_extraction_done (RygelMediaExportMetadataExtractor* _sender, GFile* file, GUPnPDLNAInformation* dlna, GFileInfo* file_info, gpointer self) {
rygel_media_export_harvesting_task_on_extracted_cb (self, file, dlna, file_info);
}
@@ -248,16 +240,16 @@ RygelMediaExportHarvestingTask* rygel_media_export_harvesting_task_construct (GT
g_return_val_if_fail (parent != NULL, NULL);
self = (RygelMediaExportHarvestingTask*) g_object_new (object_type, NULL);
_tmp0_ = extractor;
- _tmp1_ = _g_object_ref0 (_tmp0_);
- _g_object_unref0 (self->priv->extractor);
+ _tmp1_ = g_object_ref (_tmp0_);
+ g_object_unref (self->priv->extractor);
self->priv->extractor = _tmp1_;
_tmp2_ = file;
- _tmp3_ = _g_object_ref0 (_tmp2_);
- _g_object_unref0 (self->origin);
+ _tmp3_ = g_object_ref (_tmp2_);
+ g_object_unref (self->origin);
self->origin = _tmp3_;
_tmp4_ = parent;
- _tmp5_ = _g_object_ref0 (_tmp4_);
- _g_object_unref0 (self->priv->parent);
+ _tmp5_ = g_object_ref (_tmp4_);
+ g_object_unref (self->priv->parent);
self->priv->parent = _tmp5_;
{
RygelMediaExportMediaCache* _tmp6_ = NULL;
@@ -267,7 +259,7 @@ RygelMediaExportHarvestingTask* rygel_media_export_harvesting_task_construct (GT
if (_inner_error_ != NULL) {
goto __catch50_g_error;
}
- _g_object_unref0 (self->priv->cache);
+ g_object_unref (self->priv->cache);
self->priv->cache = _tmp7_;
}
goto __finally50;
@@ -277,7 +269,7 @@ RygelMediaExportHarvestingTask* rygel_media_export_harvesting_task_construct (GT
_error_ = _inner_error_;
_inner_error_ = NULL;
g_assert_not_reached ();
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally50:
if (_inner_error_ != NULL) {
@@ -290,18 +282,18 @@ RygelMediaExportHarvestingTask* rygel_media_export_harvesting_task_construct (GT
_tmp9_ = self->priv->extractor;
g_signal_connect_object (_tmp9_, "error", (GCallback) _rygel_media_export_harvesting_task_on_extractor_error_cb_rygel_media_export_metadata_extractor_error, self, 0);
_tmp10_ = gee_linked_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
- _g_object_unref0 (self->priv->files);
+ g_object_unref (self->priv->files);
self->priv->files = (GeeQueue*) _tmp10_;
_tmp11_ = g_queue_new ();
- __g_queue_free__g_object_unref0_0 (self->priv->containers);
+ __g_queue_free_g_object_unref_0 (self->priv->containers);
self->priv->containers = _tmp11_;
_tmp12_ = monitor;
- _tmp13_ = _g_object_ref0 (_tmp12_);
- _g_object_unref0 (self->priv->monitor);
+ _tmp13_ = g_object_ref (_tmp12_);
+ g_object_unref (self->priv->monitor);
self->priv->monitor = _tmp13_;
_tmp14_ = flag;
_tmp15_ = g_strdup (_tmp14_);
- _g_free0 (self->priv->flag);
+ g_free (self->priv->flag);
self->priv->flag = _tmp15_;
return self;
}
@@ -321,7 +313,7 @@ void rygel_media_export_harvesting_task_cancel (RygelMediaExportHarvestingTask*
_tmp0_ = g_cancellable_new ();
_tmp1_ = _tmp0_;
rygel_state_machine_set_cancellable ((RygelStateMachine*) self, _tmp1_);
- _g_object_unref0 (_tmp1_);
+ g_object_unref (_tmp1_);
_tmp2_ = rygel_state_machine_get_cancellable ((RygelStateMachine*) self);
_tmp3_ = _tmp2_;
g_cancellable_cancel (_tmp3_);
@@ -331,7 +323,7 @@ void rygel_media_export_harvesting_task_cancel (RygelMediaExportHarvestingTask*
static void rygel_media_export_harvesting_task_real_run_data_free (gpointer _data) {
RygelMediaExportHarvestingTaskRunData* _data_;
_data_ = _data;
- _g_object_unref0 (_data_->self);
+ g_object_unref (_data_->self);
g_slice_free (RygelMediaExportHarvestingTaskRunData, _data_);
}
@@ -344,7 +336,7 @@ static void rygel_media_export_harvesting_task_real_run (RygelStateMachine* base
_data_ = g_slice_new0 (RygelMediaExportHarvestingTaskRunData);
_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, rygel_media_export_harvesting_task_real_run);
g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, rygel_media_export_harvesting_task_real_run_data_free);
- _tmp0_ = _g_object_ref0 (self);
+ _tmp0_ = g_object_ref (self);
_data_->self = _tmp0_;
rygel_media_export_harvesting_task_real_run_co (_data_);
}
@@ -414,14 +406,14 @@ static gboolean rygel_media_export_harvesting_task_real_run_co (RygelMediaExport
if (_data_->_tmp7_ != G_FILE_TYPE_DIRECTORY) {
_data_->_tmp8_ = _data_->self->priv->containers;
_data_->_tmp9_ = _data_->self->priv->parent;
- _data_->_tmp10_ = _g_object_ref0 (_data_->_tmp9_);
+ _data_->_tmp10_ = g_object_ref (_data_->_tmp9_);
g_queue_push_tail (_data_->_tmp8_, _data_->_tmp10_);
}
rygel_media_export_harvesting_task_on_idle (_data_->self);
} else {
g_signal_emit_by_name ((RygelStateMachine*) _data_->self, "completed");
}
- _g_object_unref0 (_data_->info);
+ g_object_unref (_data_->info);
}
goto __finally51;
__catch51_g_error:
@@ -439,7 +431,7 @@ static gboolean rygel_media_export_harvesting_task_real_run_co (RygelMediaExport
_data_->_tmp16_ = _data_->_error_;
_data_->_tmp17_ = _data_->_tmp16_->message;
g_warning (_data_->_tmp12_, _data_->_tmp15_, _data_->_tmp17_);
- _g_free0 (_data_->_tmp15_);
+ g_free (_data_->_tmp15_);
} else {
_data_->_tmp18_ = _data_->self->origin;
_data_->_tmp19_ = NULL;
@@ -447,10 +439,10 @@ static gboolean rygel_media_export_harvesting_task_real_run_co (RygelMediaExport
_data_->_tmp20_ = _data_->_tmp19_;
g_debug ("rygel-media-export-harvesting-task.vala:116: Harvesting of uri %s was " \
"cancelled", _data_->_tmp20_);
- _g_free0 (_data_->_tmp20_);
+ g_free (_data_->_tmp20_);
}
g_signal_emit_by_name ((RygelStateMachine*) _data_->self, "completed");
- _g_error_free0 (_data_->_error_);
+ g_error_free (_data_->_error_);
}
__finally51:
if (_data_->_inner_error_ != NULL) {
@@ -561,7 +553,7 @@ static gboolean rygel_media_export_harvesting_task_push_if_changed_or_unknown (R
_tmp20_ = _error_;
_tmp21_ = _tmp20_->message;
g_warning (_tmp19_, _tmp21_);
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally52:
if (_inner_error_ != NULL) {
@@ -626,7 +618,7 @@ static gboolean rygel_media_export_harvesting_task_process_file (RygelMediaExpor
container = _tmp9_;
_tmp10_ = self->priv->containers;
_tmp11_ = container;
- _tmp12_ = _g_object_ref0 ((RygelMediaContainer*) _tmp11_);
+ _tmp12_ = g_object_ref ((RygelMediaContainer*) _tmp11_);
g_queue_push_tail (_tmp10_, _tmp12_);
{
RygelMediaExportMediaCache* _tmp13_;
@@ -652,19 +644,19 @@ static gboolean rygel_media_export_harvesting_task_process_file (RygelMediaExpor
_tmp17_ = _tmp16_->message;
g_warning (_tmp15_, _tmp17_);
result = FALSE;
- _g_error_free0 (err);
- _g_object_unref0 (container);
+ g_error_free (err);
+ g_object_unref (container);
return result;
}
__finally53:
if (_inner_error_ != NULL) {
- _g_object_unref0 (container);
+ g_object_unref (container);
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 FALSE;
}
result = TRUE;
- _g_object_unref0 (container);
+ g_object_unref (container);
return result;
} else {
gboolean _tmp18_ = FALSE;
@@ -759,7 +751,7 @@ static gboolean rygel_media_export_harvesting_task_process_children (RygelMediaE
}
_tmp6_ = self->priv->containers;
_tmp7_ = g_queue_peek_head (_tmp6_);
- _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE ((RygelMediaContainer*) _tmp7_, RYGEL_MEDIA_EXPORT_TYPE_DUMMY_CONTAINER) ? ((RygelMediaExportDummyContainer*) ((RygelMediaContainer*) _tmp7_)) : NULL);
+ _tmp8_ = g_object_ref (G_TYPE_CHECK_INSTANCE_TYPE ((RygelMediaContainer*) _tmp7_, RYGEL_MEDIA_EXPORT_TYPE_DUMMY_CONTAINER) ? ((RygelMediaExportDummyContainer*) ((RygelMediaContainer*) _tmp7_)) : NULL);
container = _tmp8_;
_tmp9_ = list;
{
@@ -769,7 +761,7 @@ static gboolean rygel_media_export_harvesting_task_process_children (RygelMediaE
for (info_it = info_collection; info_it != NULL; info_it = info_it->next) {
GFileInfo* _tmp10_;
GFileInfo* info = NULL;
- _tmp10_ = _g_object_ref0 ((GFileInfo*) info_it->data);
+ _tmp10_ = g_object_ref ((GFileInfo*) info_it->data);
info = _tmp10_;
{
RygelMediaExportDummyContainer* _tmp11_;
@@ -796,13 +788,13 @@ static gboolean rygel_media_export_harvesting_task_process_children (RygelMediaE
_tmp19_ = info;
_tmp20_ = container;
rygel_media_export_harvesting_task_process_file (self, _tmp18_, _tmp19_, (RygelMediaContainer*) _tmp20_);
- _g_object_unref0 (file);
- _g_object_unref0 (info);
+ g_object_unref (file);
+ g_object_unref (info);
}
}
}
result = TRUE;
- _g_object_unref0 (container);
+ g_object_unref (container);
return result;
}
@@ -810,7 +802,7 @@ static gboolean rygel_media_export_harvesting_task_process_children (RygelMediaE
static void rygel_media_export_harvesting_task_enumerate_directory_data_free (gpointer _data) {
RygelMediaExportHarvestingTaskEnumerateDirectoryData* _data_;
_data_ = _data;
- _g_object_unref0 (_data_->self);
+ g_object_unref (_data_->self);
g_slice_free (RygelMediaExportHarvestingTaskEnumerateDirectoryData, _data_);
}
@@ -821,7 +813,7 @@ static void rygel_media_export_harvesting_task_enumerate_directory (RygelMediaEx
_data_ = g_slice_new0 (RygelMediaExportHarvestingTaskEnumerateDirectoryData);
_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, rygel_media_export_harvesting_task_enumerate_directory);
g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, rygel_media_export_harvesting_task_enumerate_directory_data_free);
- _tmp0_ = _g_object_ref0 (self);
+ _tmp0_ = g_object_ref (self);
_data_->self = _tmp0_;
rygel_media_export_harvesting_task_enumerate_directory_co (_data_);
}
@@ -842,8 +834,8 @@ static void rygel_media_export_harvesting_task_enumerate_directory_ready (GObjec
}
-static void _g_list_free__g_object_unref0_ (GList* self) {
- g_list_foreach (self, (GFunc) _g_object_unref0_, NULL);
+static void _g_list_free_g_object_unref_ (GList* self) {
+ g_list_foreach (self, (GFunc) g_object_unref_, NULL);
g_list_free (self);
}
@@ -866,7 +858,7 @@ static gboolean rygel_media_export_harvesting_task_enumerate_directory_co (Rygel
_data_->_tmp1_ = NULL;
_data_->_tmp1_ = g_queue_peek_head (_data_->_tmp0_);
_data_->_tmp2_ = (G_TYPE_CHECK_INSTANCE_TYPE ((RygelMediaContainer*) _data_->_tmp1_, RYGEL_MEDIA_EXPORT_TYPE_DUMMY_CONTAINER) ? ((RygelMediaExportDummyContainer*) ((RygelMediaContainer*) _data_->_tmp1_)) : NULL)->file;
- _data_->_tmp3_ = _g_object_ref0 (_data_->_tmp2_);
+ _data_->_tmp3_ = g_object_ref (_data_->_tmp2_);
_data_->directory = _data_->_tmp3_;
{
_data_->_tmp4_ = _data_->directory;
@@ -907,11 +899,11 @@ static gboolean rygel_media_export_harvesting_task_enumerate_directory_co (Rygel
_data_->_tmp15_ = g_file_enumerator_next_files_finish (_data_->_tmp12_, _data_->_res_, &_data_->_inner_error_);
_data_->_tmp16_ = _data_->_tmp15_;
if (_data_->_inner_error_ != NULL) {
- __g_list_free__g_object_unref0_0 (_data_->list);
- _g_object_unref0 (_data_->enumerator);
+ __g_list_free_g_object_unref_0 (_data_->list);
+ g_object_unref (_data_->enumerator);
goto __catch54_g_error;
}
- __g_list_free__g_object_unref0_0 (_data_->list);
+ __g_list_free_g_object_unref_0 (_data_->list);
_data_->list = _data_->_tmp16_;
}
}
@@ -924,12 +916,12 @@ static gboolean rygel_media_export_harvesting_task_enumerate_directory_co (Rygel
_state_3:
g_file_enumerator_close_finish (_data_->_tmp17_, _data_->_res_, &_data_->_inner_error_);
if (_data_->_inner_error_ != NULL) {
- __g_list_free__g_object_unref0_0 (_data_->list);
- _g_object_unref0 (_data_->enumerator);
+ __g_list_free_g_object_unref_0 (_data_->list);
+ g_object_unref (_data_->enumerator);
goto __catch54_g_error;
}
- __g_list_free__g_object_unref0_0 (_data_->list);
- _g_object_unref0 (_data_->enumerator);
+ __g_list_free_g_object_unref_0 (_data_->list);
+ g_object_unref (_data_->enumerator);
}
goto __finally54;
__catch54_g_error:
@@ -941,18 +933,18 @@ static gboolean rygel_media_export_harvesting_task_enumerate_directory_co (Rygel
_data_->_tmp21_ = _data_->err;
_data_->_tmp22_ = _data_->_tmp21_->message;
g_warning (_data_->_tmp20_, _data_->_tmp22_);
- _g_error_free0 (_data_->err);
+ g_error_free (_data_->err);
}
__finally54:
if (_data_->_inner_error_ != NULL) {
- _g_object_unref0 (_data_->directory);
+ g_object_unref (_data_->directory);
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code);
g_clear_error (&_data_->_inner_error_);
return FALSE;
}
rygel_media_export_harvesting_task_cleanup_database (_data_->self);
rygel_media_export_harvesting_task_do_update (_data_->self);
- _g_object_unref0 (_data_->directory);
+ g_object_unref (_data_->directory);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -972,7 +964,7 @@ static void rygel_media_export_harvesting_task_cleanup_database (RygelMediaExpor
g_return_if_fail (self != NULL);
_tmp0_ = self->priv->containers;
_tmp1_ = g_queue_peek_head (_tmp0_);
- _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE ((RygelMediaContainer*) _tmp1_, RYGEL_MEDIA_EXPORT_TYPE_DUMMY_CONTAINER) ? ((RygelMediaExportDummyContainer*) ((RygelMediaContainer*) _tmp1_)) : NULL);
+ _tmp2_ = g_object_ref (G_TYPE_CHECK_INSTANCE_TYPE ((RygelMediaContainer*) _tmp1_, RYGEL_MEDIA_EXPORT_TYPE_DUMMY_CONTAINER) ? ((RygelMediaExportDummyContainer*) ((RygelMediaContainer*) _tmp1_)) : NULL);
container = _tmp2_;
{
{
@@ -987,7 +979,7 @@ static void rygel_media_export_harvesting_task_cleanup_database (RygelMediaExpor
gint _child_index;
_tmp3_ = container;
_tmp4_ = _tmp3_->children;
- _tmp5_ = _g_object_ref0 (_tmp4_);
+ _tmp5_ = g_object_ref (_tmp4_);
_child_list = _tmp5_;
_tmp6_ = _child_list;
_tmp7_ = gee_collection_get_size ((GeeCollection*) _tmp6_);
@@ -1019,21 +1011,21 @@ static void rygel_media_export_harvesting_task_cleanup_database (RygelMediaExpor
_tmp16_ = child;
rygel_media_export_media_cache_remove_by_id (_tmp15_, _tmp16_, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_free0 (child);
- _g_object_unref0 (_child_list);
+ g_free (child);
+ g_object_unref (_child_list);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch55_rygel_media_export_database_error;
}
- _g_free0 (child);
- _g_object_unref0 (_child_list);
- _g_object_unref0 (container);
+ g_free (child);
+ g_object_unref (_child_list);
+ g_object_unref (container);
g_critical ("file %s: line %d: unexpected 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;
}
- _g_free0 (child);
+ g_free (child);
}
- _g_object_unref0 (_child_list);
+ g_object_unref (_child_list);
}
}
goto __finally55;
@@ -1055,16 +1047,16 @@ static void rygel_media_export_harvesting_task_cleanup_database (RygelMediaExpor
_tmp21_ = _error_;
_tmp22_ = _tmp21_->message;
g_warning (_tmp17_, _tmp20_, _tmp22_);
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally55:
if (_inner_error_ != NULL) {
- _g_object_unref0 (container);
+ g_object_unref (container);
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;
}
- _g_object_unref0 (container);
+ g_object_unref (container);
}
@@ -1106,14 +1098,14 @@ static gboolean rygel_media_export_harvesting_task_on_idle (RygelMediaExportHarv
_tmp10_ = _tmp9_;
g_debug ("rygel-media-export-harvesting-task.vala:263: Scheduling file %s for me" \
"ta-data extractionâ", _tmp10_);
- _g_free0 (_tmp10_);
- _g_object_unref0 (_tmp8_);
+ g_free (_tmp10_);
+ g_object_unref (_tmp8_);
_tmp11_ = self->priv->extractor;
_tmp12_ = self->priv->files;
_tmp13_ = gee_queue_peek (_tmp12_);
_tmp14_ = (GFile*) _tmp13_;
rygel_media_export_metadata_extractor_extract (_tmp11_, _tmp14_);
- _g_object_unref0 (_tmp14_);
+ g_object_unref (_tmp14_);
} else {
GQueue* _tmp15_;
guint _tmp16_ = 0U;
@@ -1145,7 +1137,7 @@ static gboolean rygel_media_export_harvesting_task_on_idle (RygelMediaExportHarv
GError* _error_ = NULL;
_error_ = _inner_error_;
_inner_error_ = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally56:
if (_inner_error_ != NULL) {
@@ -1206,7 +1198,7 @@ static void rygel_media_export_harvesting_task_on_extracted_cb (RygelMediaExport
}
_tmp9_ = _tmp5_;
if (_tmp9_) {
- _g_object_unref0 (entry);
+ g_object_unref (entry);
return;
}
_tmp10_ = dlna;
@@ -1221,7 +1213,7 @@ static void rygel_media_export_harvesting_task_on_extracted_cb (RygelMediaExport
_tmp13_ = file;
_tmp14_ = file_info;
_tmp15_ = rygel_media_export_item_factory_create_simple ((RygelMediaContainer*) _tmp12_, _tmp13_, _tmp14_);
- _g_object_unref0 (item);
+ g_object_unref (item);
item = _tmp15_;
} else {
GQueue* _tmp16_;
@@ -1236,7 +1228,7 @@ static void rygel_media_export_harvesting_task_on_extracted_cb (RygelMediaExport
_tmp19_ = dlna;
_tmp20_ = file_info;
_tmp21_ = rygel_media_export_item_factory_create_from_info ((RygelMediaContainer*) _tmp17_, _tmp18_, _tmp19_, _tmp20_);
- _g_object_unref0 (item);
+ g_object_unref (item);
item = _tmp21_;
}
_tmp22_ = item;
@@ -1264,12 +1256,12 @@ static void rygel_media_export_harvesting_task_on_extracted_cb (RygelMediaExport
GError* _error_ = NULL;
_error_ = _inner_error_;
_inner_error_ = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally57:
if (_inner_error_ != NULL) {
- _g_object_unref0 (item);
- _g_object_unref0 (entry);
+ g_object_unref (item);
+ g_object_unref (entry);
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;
@@ -1278,10 +1270,10 @@ static void rygel_media_export_harvesting_task_on_extracted_cb (RygelMediaExport
_tmp28_ = self->priv->files;
_tmp29_ = gee_queue_poll (_tmp28_);
_tmp30_ = (GFile*) _tmp29_;
- _g_object_unref0 (_tmp30_);
+ g_object_unref (_tmp30_);
rygel_media_export_harvesting_task_do_update (self);
- _g_object_unref0 (item);
- _g_object_unref0 (entry);
+ g_object_unref (item);
+ g_object_unref (entry);
}
@@ -1317,7 +1309,7 @@ static void rygel_media_export_harvesting_task_on_extractor_error_cb (RygelMedia
}
_tmp6_ = _tmp2_;
if (_tmp6_) {
- _g_object_unref0 (entry);
+ g_object_unref (entry);
return;
}
_tmp7_ = file;
@@ -1327,13 +1319,13 @@ static void rygel_media_export_harvesting_task_on_extractor_error_cb (RygelMedia
_tmp11_ = _tmp10_->message;
g_debug ("rygel-media-export-harvesting-task.vala:335: Skipping %s; extraction c" \
"ompletely failed: %s", _tmp9_, _tmp11_);
- _g_free0 (_tmp9_);
+ g_free (_tmp9_);
_tmp12_ = self->priv->files;
_tmp13_ = gee_queue_poll (_tmp12_);
_tmp14_ = (GFile*) _tmp13_;
- _g_object_unref0 (_tmp14_);
+ g_object_unref (_tmp14_);
rygel_media_export_harvesting_task_do_update (self);
- _g_object_unref0 (entry);
+ g_object_unref (entry);
}
@@ -1373,7 +1365,7 @@ static void rygel_media_export_harvesting_task_do_update (RygelMediaExportHarves
RygelMediaContainer* _tmp28_;
_tmp7_ = self->priv->containers;
_tmp8_ = g_queue_peek_head (_tmp7_);
- _tmp9_ = _g_object_ref0 ((RygelMediaContainer*) _tmp8_);
+ _tmp9_ = g_object_ref ((RygelMediaContainer*) _tmp8_);
container = _tmp9_;
{
RygelMediaExportMediaCache* _tmp10_ = NULL;
@@ -1396,7 +1388,7 @@ static void rygel_media_export_harvesting_task_do_update (RygelMediaExportHarves
_tmp15_ = rygel_media_export_media_cache_get_child_count (_tmp11_, _tmp14_, &_inner_error_);
_tmp16_ = _tmp15_;
if (_inner_error_ != NULL) {
- _g_object_unref0 (cache);
+ g_object_unref (cache);
goto __catch58_g_error;
}
if (_tmp16_ > 0) {
@@ -1408,12 +1400,12 @@ static void rygel_media_export_harvesting_task_do_update (RygelMediaExportHarves
RygelMediaContainer* _tmp21_;
_tmp17_ = self->priv->containers;
_tmp18_ = g_queue_peek_head (_tmp17_);
- _tmp19_ = _g_object_ref0 ((RygelMediaContainer*) _tmp18_);
+ _tmp19_ = g_object_ref ((RygelMediaContainer*) _tmp18_);
head = _tmp19_;
_tmp20_ = head;
_tmp21_ = head;
rygel_media_container_updated (_tmp20_, (RygelMediaObject*) _tmp21_, RYGEL_OBJECT_EVENT_TYPE_MODIFIED, FALSE);
- _g_object_unref0 (head);
+ g_object_unref (head);
} else {
RygelMediaExportMediaCache* _tmp22_;
RygelMediaContainer* _tmp23_;
@@ -1425,11 +1417,11 @@ static void rygel_media_export_harvesting_task_do_update (RygelMediaExportHarves
_tmp25_ = _tmp24_;
rygel_media_export_media_cache_remove_by_id (_tmp22_, _tmp25_, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (cache);
+ g_object_unref (cache);
goto __catch58_g_error;
}
}
- _g_object_unref0 (cache);
+ g_object_unref (cache);
}
goto __finally58;
__catch58_g_error:
@@ -1437,11 +1429,11 @@ static void rygel_media_export_harvesting_task_do_update (RygelMediaExportHarves
GError* _error_ = NULL;
_error_ = _inner_error_;
_inner_error_ = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally58:
if (_inner_error_ != NULL) {
- _g_object_unref0 (container);
+ g_object_unref (container);
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;
@@ -1449,8 +1441,8 @@ static void rygel_media_export_harvesting_task_do_update (RygelMediaExportHarves
_tmp26_ = self->priv->containers;
_tmp27_ = g_queue_pop_head (_tmp26_);
_tmp28_ = (RygelMediaContainer*) _tmp27_;
- _g_object_unref0 (_tmp28_);
- _g_object_unref0 (container);
+ g_object_unref (_tmp28_);
+ g_object_unref (container);
}
rygel_media_export_harvesting_task_on_idle (self);
}
@@ -1473,8 +1465,8 @@ static void rygel_media_export_harvesting_task_real_set_cancellable (RygelStateM
GCancellable* _tmp1_;
self = (RygelMediaExportHarvestingTask*) base;
_tmp0_ = value;
- _tmp1_ = _g_object_ref0 (_tmp0_);
- _g_object_unref0 (self->priv->_cancellable);
+ _tmp1_ = g_object_ref (_tmp0_);
+ g_object_unref (self->priv->_cancellable);
self->priv->_cancellable = _tmp1_;
g_object_notify ((GObject *) self, "cancellable");
}
@@ -1507,15 +1499,15 @@ static void rygel_media_export_harvesting_task_init (RygelMediaExportHarvestingT
static void rygel_media_export_harvesting_task_finalize (GObject* obj) {
RygelMediaExportHarvestingTask * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_MEDIA_EXPORT_TYPE_HARVESTING_TASK, RygelMediaExportHarvestingTask);
- _g_object_unref0 (self->origin);
- _g_object_unref0 (self->priv->extractor);
- _g_object_unref0 (self->priv->cache);
- __g_queue_free__g_object_unref0_0 (self->priv->containers);
- _g_object_unref0 (self->priv->files);
- _g_object_unref0 (self->priv->monitor);
- _g_free0 (self->priv->flag);
- _g_object_unref0 (self->priv->parent);
- _g_object_unref0 (self->priv->_cancellable);
+ g_object_unref (self->origin);
+ g_object_unref (self->priv->extractor);
+ g_object_unref (self->priv->cache);
+ __g_queue_free_g_object_unref_0 (self->priv->containers);
+ g_object_unref (self->priv->files);
+ g_object_unref (self->priv->monitor);
+ g_free (self->priv->flag);
+ g_object_unref (self->priv->parent);
+ g_object_unref (self->priv->_cancellable);
G_OBJECT_CLASS (rygel_media_export_harvesting_task_parent_class)->finalize (obj);
}
diff --git a/src/media-export/rygel-media-export-item-factory.c b/src/media-export/rygel-media-export-item-factory.c
index 5a15af3..3bac2bb 100644
--- a/src/media-export/rygel-media-export-item-factory.c
+++ b/src/media-export/rygel-media-export-item-factory.c
@@ -45,7 +45,6 @@
#include <gst/tag/tag.h>
#include <gst/tag/xmpwriter.h>
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
#define _gst_structure_free0(var) ((var == NULL) ? NULL : (var = (gst_structure_free (var), NULL)))
typedef struct _RygelMediaExportMusicItemPrivate RygelMediaExportMusicItemPrivate;
@@ -61,8 +60,6 @@ RygelMediaExportMusicItem* rygel_media_export_music_item_new (const gchar* id, R
RygelMediaExportMusicItem* rygel_media_export_music_item_construct (GType object_type, const gchar* id, RygelMediaContainer* parent, const gchar* title, const gchar* upnp_class);
GType rygel_media_export_music_item_get_type (void) G_GNUC_CONST;
RygelMediaItem* rygel_media_export_item_factory_create_from_info (RygelMediaContainer* parent, GFile* file, GUPnPDLNAInformation* dlna_info, GFileInfo* file_info);
-static void _gst_mini_object_unref0_ (gpointer var);
-static void _g_list_free__gst_mini_object_unref0_ (GList* self);
RygelMediaItem* rygel_media_export_item_factory_fill_photo_item (RygelMediaExportPhotoItem* item, GFile* file, GUPnPDLNAInformation* dlna_info, GstDiscovererVideoInfo* video_info, GFileInfo* file_info);
RygelMediaItem* rygel_media_export_item_factory_fill_video_item (RygelMediaExportVideoItem* item, GFile* file, GUPnPDLNAInformation* dlna_info, GstDiscovererVideoInfo* video_info, GstDiscovererAudioInfo* audio_info, GFileInfo* file_info);
RygelMediaItem* rygel_media_export_item_factory_fill_music_item (RygelMediaExportMusicItem* item, GFile* file, GUPnPDLNAInformation* dlna_info, GstDiscovererAudioInfo* audio_info, GFileInfo* file_info);
@@ -125,9 +122,9 @@ RygelMediaItem* rygel_media_export_item_factory_create_simple (RygelMediaContain
_tmp11_ = parent;
_tmp12_ = title;
_tmp13_ = rygel_media_export_video_item_new (_tmp10_, _tmp11_, _tmp12_, RYGEL_VIDEO_ITEM_UPNP_CLASS);
- _g_object_unref0 (item);
+ g_object_unref (item);
item = (RygelMediaItem*) _tmp13_;
- _g_free0 (_tmp10_);
+ g_free (_tmp10_);
} else {
const gchar* _tmp14_;
gboolean _tmp15_ = FALSE;
@@ -146,9 +143,9 @@ RygelMediaItem* rygel_media_export_item_factory_create_simple (RygelMediaContain
_tmp19_ = parent;
_tmp20_ = title;
_tmp21_ = rygel_media_export_photo_item_new (_tmp18_, _tmp19_, _tmp20_, RYGEL_PHOTO_ITEM_UPNP_CLASS);
- _g_object_unref0 (item);
+ g_object_unref (item);
item = (RygelMediaItem*) _tmp21_;
- _g_free0 (_tmp18_);
+ g_free (_tmp18_);
} else {
GFile* _tmp22_;
gchar* _tmp23_ = NULL;
@@ -162,9 +159,9 @@ RygelMediaItem* rygel_media_export_item_factory_create_simple (RygelMediaContain
_tmp25_ = parent;
_tmp26_ = title;
_tmp27_ = rygel_media_export_music_item_new (_tmp24_, _tmp25_, _tmp26_, RYGEL_MUSIC_ITEM_UPNP_CLASS);
- _g_object_unref0 (item);
+ g_object_unref (item);
item = (RygelMediaItem*) _tmp27_;
- _g_free0 (_tmp24_);
+ g_free (_tmp24_);
}
}
_tmp28_ = item;
@@ -183,21 +180,15 @@ RygelMediaItem* rygel_media_export_item_factory_create_simple (RygelMediaContain
_tmp38_ = g_file_get_uri (_tmp37_);
_tmp39_ = _tmp38_;
rygel_media_item_add_uri (_tmp36_, _tmp39_);
- _g_free0 (_tmp39_);
+ g_free (_tmp39_);
result = item;
- _g_free0 (mime);
- _g_free0 (title);
+ g_free (mime);
+ g_free (title);
return result;
}
-
-static void _gst_mini_object_unref0_ (gpointer var) {
- (var == NULL) ? NULL : (var = (gst_mini_object_unref (var), NULL));
-}
-
-
static void _g_list_free__gst_mini_object_unref0_ (GList* self) {
- g_list_foreach (self, (GFunc) _gst_mini_object_unref0_, NULL);
+ g_list_foreach (self, (GFunc) gst_mini_object_unref, NULL);
g_list_free (self);
}
@@ -265,12 +256,12 @@ RygelMediaItem* rygel_media_export_item_factory_create_from_info (RygelMediaCont
_tmp15_ = g_file_get_uri (_tmp14_);
_tmp16_ = _tmp15_;
g_debug ("%s had neither audio nor video/picture " "streams. Ignoring.", _tmp16_);
- _g_free0 (_tmp16_);
+ g_free (_tmp16_);
result = NULL;
__g_list_free__gst_mini_object_unref0_0 (video_streams);
__g_list_free__gst_mini_object_unref0_0 (audio_streams);
- _g_free0 (id);
- _g_object_unref0 (item);
+ g_free (id);
+ g_object_unref (item);
return result;
}
_tmp18_ = audio_streams;
@@ -300,7 +291,7 @@ RygelMediaItem* rygel_media_export_item_factory_create_from_info (RygelMediaCont
_tmp23_ = id;
_tmp24_ = parent;
_tmp25_ = rygel_media_export_photo_item_new (_tmp23_, _tmp24_, "", RYGEL_PHOTO_ITEM_UPNP_CLASS);
- _g_object_unref0 (item);
+ g_object_unref (item);
item = (RygelMediaItem*) _tmp25_;
_tmp26_ = item;
_tmp27_ = file;
@@ -312,8 +303,8 @@ RygelMediaItem* rygel_media_export_item_factory_create_from_info (RygelMediaCont
result = _tmp32_;
__g_list_free__gst_mini_object_unref0_0 (video_streams);
__g_list_free__gst_mini_object_unref0_0 (audio_streams);
- _g_free0 (id);
- _g_object_unref0 (item);
+ g_free (id);
+ g_object_unref (item);
return result;
} else {
GList* _tmp33_;
@@ -336,7 +327,7 @@ RygelMediaItem* rygel_media_export_item_factory_create_from_info (RygelMediaCont
_tmp34_ = id;
_tmp35_ = parent;
_tmp36_ = rygel_media_export_video_item_new (_tmp34_, _tmp35_, "", RYGEL_VIDEO_ITEM_UPNP_CLASS);
- _g_object_unref0 (item);
+ g_object_unref (item);
item = (RygelMediaItem*) _tmp36_;
_tmp37_ = _gst_mini_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (NULL, GST_TYPE_DISCOVERER_AUDIO_INFO) ? ((GstDiscovererAudioInfo*) NULL) : NULL);
audio_info = _tmp37_;
@@ -348,7 +339,7 @@ RygelMediaItem* rygel_media_export_item_factory_create_from_info (RygelMediaCont
_tmp39_ = audio_streams;
_tmp40_ = _tmp39_->data;
_tmp41_ = _gst_mini_object_ref0 ((GstDiscovererAudioInfo*) _tmp40_);
- _gst_mini_object_unref0 (audio_info);
+ gst_mini_object_unref (audio_info);
audio_info = _tmp41_;
}
_tmp42_ = item;
@@ -360,11 +351,11 @@ RygelMediaItem* rygel_media_export_item_factory_create_from_info (RygelMediaCont
_tmp48_ = file_info;
_tmp49_ = rygel_media_export_item_factory_fill_video_item (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, RYGEL_MEDIA_EXPORT_TYPE_VIDEO_ITEM) ? ((RygelMediaExportVideoItem*) _tmp42_) : NULL, _tmp43_, _tmp44_, (GstDiscovererVideoInfo*) _tmp46_, _tmp47_, _tmp48_);
result = _tmp49_;
- _gst_mini_object_unref0 (audio_info);
+ gst_mini_object_unref (audio_info);
__g_list_free__gst_mini_object_unref0_0 (video_streams);
__g_list_free__gst_mini_object_unref0_0 (audio_streams);
- _g_free0 (id);
- _g_object_unref0 (item);
+ g_free (id);
+ g_object_unref (item);
return result;
} else {
GList* _tmp50_;
@@ -383,7 +374,7 @@ RygelMediaItem* rygel_media_export_item_factory_create_from_info (RygelMediaCont
_tmp51_ = id;
_tmp52_ = parent;
_tmp53_ = rygel_media_export_music_item_new (_tmp51_, _tmp52_, "", RYGEL_MUSIC_ITEM_UPNP_CLASS);
- _g_object_unref0 (item);
+ g_object_unref (item);
item = (RygelMediaItem*) _tmp53_;
_tmp54_ = item;
_tmp55_ = file;
@@ -395,23 +386,23 @@ RygelMediaItem* rygel_media_export_item_factory_create_from_info (RygelMediaCont
result = _tmp60_;
__g_list_free__gst_mini_object_unref0_0 (video_streams);
__g_list_free__gst_mini_object_unref0_0 (audio_streams);
- _g_free0 (id);
- _g_object_unref0 (item);
+ g_free (id);
+ g_object_unref (item);
return result;
} else {
result = NULL;
__g_list_free__gst_mini_object_unref0_0 (video_streams);
__g_list_free__gst_mini_object_unref0_0 (audio_streams);
- _g_free0 (id);
- _g_object_unref0 (item);
+ g_free (id);
+ g_object_unref (item);
return result;
}
}
}
__g_list_free__gst_mini_object_unref0_0 (video_streams);
__g_list_free__gst_mini_object_unref0_0 (audio_streams);
- _g_free0 (id);
- _g_object_unref0 (item);
+ g_free (id);
+ g_object_unref (item);
}
@@ -483,11 +474,6 @@ void rygel_media_export_item_factory_fill_audio_item (RygelAudioItem* item, GUPn
}
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
-
RygelMediaItem* rygel_media_export_item_factory_fill_video_item (RygelMediaExportVideoItem* item, GFile* file, GUPnPDLNAInformation* dlna_info, GstDiscovererVideoInfo* video_info, GstDiscovererAudioInfo* audio_info, GFileInfo* file_info) {
RygelMediaItem* result = NULL;
RygelMediaExportVideoItem* _tmp0_;
@@ -549,7 +535,7 @@ RygelMediaItem* rygel_media_export_item_factory_fill_video_item (RygelMediaExpor
_tmp19_ = _tmp15_;
rygel_visual_item_set_color_depth ((RygelVisualItem*) _tmp18_, _tmp19_);
_tmp20_ = item;
- _tmp21_ = _g_object_ref0 ((RygelMediaItem*) _tmp20_);
+ _tmp21_ = g_object_ref ((RygelMediaItem*) _tmp20_);
result = _tmp21_;
return result;
}
@@ -609,7 +595,7 @@ RygelMediaItem* rygel_media_export_item_factory_fill_photo_item (RygelMediaExpor
_tmp16_ = _tmp12_;
rygel_visual_item_set_color_depth ((RygelVisualItem*) _tmp15_, _tmp16_);
_tmp17_ = item;
- _tmp18_ = _g_object_ref0 ((RygelMediaItem*) _tmp17_);
+ _tmp18_ = g_object_ref ((RygelMediaItem*) _tmp17_);
result = _tmp18_;
return result;
}
@@ -752,7 +738,7 @@ RygelMediaItem* rygel_media_export_item_factory_fill_music_item (RygelMediaExpor
_tmp27_ = buffer;
_tmp28_ = thumb;
rygel_media_export_jpeg_writer_write (_tmp26_, _tmp27_, _tmp28_);
- _g_object_unref0 (writer);
+ g_object_unref (writer);
}
goto __finally59;
__catch59_g_error:
@@ -760,19 +746,19 @@ RygelMediaItem* rygel_media_export_item_factory_fill_music_item (RygelMediaExpor
GError* _error_ = NULL;
_error_ = _inner_error_;
_inner_error_ = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally59:
if (_inner_error_ != NULL) {
- _g_object_unref0 (thumb);
- _g_object_unref0 (store);
+ g_object_unref (thumb);
+ g_object_unref (store);
_gst_structure_free0 (structure);
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 NULL;
}
- _g_object_unref0 (thumb);
- _g_object_unref0 (store);
+ g_object_unref (thumb);
+ g_object_unref (store);
break;
}
default:
@@ -788,7 +774,7 @@ RygelMediaItem* rygel_media_export_item_factory_fill_music_item (RygelMediaExpor
_tmp31_ = _tmp30_;
_tmp32_ = gst_discoverer_info_get_tags (_tmp31_);
gst_tag_list_get_string (_tmp32_, GST_TAG_ARTIST, &_tmp33_);
- _g_free0 (artist);
+ g_free (artist);
artist = _tmp33_;
_tmp34_ = item;
_tmp35_ = artist;
@@ -798,7 +784,7 @@ RygelMediaItem* rygel_media_export_item_factory_fill_music_item (RygelMediaExpor
_tmp38_ = _tmp37_;
_tmp39_ = gst_discoverer_info_get_tags (_tmp38_);
gst_tag_list_get_string (_tmp39_, GST_TAG_ALBUM, &_tmp40_);
- _g_free0 (album);
+ g_free (album);
album = _tmp40_;
_tmp41_ = item;
_tmp42_ = album;
@@ -808,7 +794,7 @@ RygelMediaItem* rygel_media_export_item_factory_fill_music_item (RygelMediaExpor
_tmp45_ = _tmp44_;
_tmp46_ = gst_discoverer_info_get_tags (_tmp45_);
gst_tag_list_get_string (_tmp46_, GST_TAG_GENRE, &_tmp47_);
- _g_free0 (genre);
+ g_free (genre);
genre = _tmp47_;
_tmp48_ = item;
_tmp49_ = genre;
@@ -831,12 +817,12 @@ RygelMediaItem* rygel_media_export_item_factory_fill_music_item (RygelMediaExpor
_tmp62_ = item;
_tmp63_ = tmp;
rygel_music_item_set_track_number ((RygelMusicItem*) _tmp62_, (gint) _tmp63_);
- _g_free0 (genre);
- _g_free0 (album);
- _g_free0 (artist);
+ g_free (genre);
+ g_free (album);
+ g_free (artist);
}
_tmp64_ = item;
- _tmp65_ = _g_object_ref0 ((RygelMediaItem*) _tmp64_);
+ _tmp65_ = g_object_ref ((RygelMediaItem*) _tmp64_);
result = _tmp65_;
return result;
}
@@ -897,7 +883,7 @@ void rygel_media_export_item_factory_fill_media_item (RygelMediaItem* item, GFil
_tmp7_ = _tmp6_;
_tmp8_ = gst_discoverer_info_get_tags (_tmp7_);
_tmp10_ = gst_tag_list_get_string (_tmp8_, GST_TAG_TITLE, &_tmp9_);
- _g_free0 (title);
+ g_free (title);
title = _tmp9_;
_tmp0_ = !_tmp10_;
}
@@ -909,7 +895,7 @@ void rygel_media_export_item_factory_fill_media_item (RygelMediaItem* item, GFil
_tmp12_ = file_info;
_tmp13_ = g_file_info_get_display_name (_tmp12_);
_tmp14_ = g_strdup (_tmp13_);
- _g_free0 (title);
+ g_free (title);
title = _tmp14_;
}
_tmp15_ = item;
@@ -932,7 +918,7 @@ void rygel_media_export_item_factory_fill_media_item (RygelMediaItem* item, GFil
_tmp23_ = _tmp22_;
_tmp24_ = gst_discoverer_info_get_tags (_tmp23_);
_tmp26_ = gst_tag_list_get_date (_tmp24_, GST_TAG_DATE, &_tmp25_);
- _g_free0 (date);
+ g_free (date);
date = _tmp25_;
if (_tmp26_) {
gchar* _tmp27_ = NULL;
@@ -959,7 +945,7 @@ void rygel_media_export_item_factory_fill_media_item (RygelMediaItem* item, GFil
rygel_media_item_set_date (_tmp30_, (const gchar*) _tmp31_);
datestr = (g_free (datestr), NULL);
}
- _g_free0 (date);
+ g_free (date);
}
_tmp32_ = file_info;
_tmp33_ = g_file_info_get_attribute_uint64 (_tmp32_, G_FILE_ATTRIBUTE_TIME_MODIFIED);
@@ -982,7 +968,7 @@ void rygel_media_export_item_factory_fill_media_item (RygelMediaItem* item, GFil
_tmp40_ = g_time_val_to_iso8601 (&tv);
_tmp41_ = _tmp40_;
rygel_media_item_set_date (_tmp39_, _tmp41_);
- _g_free0 (_tmp41_);
+ g_free (_tmp41_);
}
_tmp42_ = item;
_tmp43_ = file_info;
@@ -1025,15 +1011,15 @@ void rygel_media_export_item_factory_fill_media_item (RygelMediaItem* item, GFil
_tmp61_ = g_content_type_get_mime_type (_tmp60_);
_tmp62_ = _tmp61_;
rygel_media_item_set_mime_type (_tmp58_, _tmp62_);
- _g_free0 (_tmp62_);
+ g_free (_tmp62_);
}
_tmp63_ = item;
_tmp64_ = file;
_tmp65_ = g_file_get_uri (_tmp64_);
_tmp66_ = _tmp65_;
rygel_media_item_add_uri (_tmp63_, _tmp66_);
- _g_free0 (_tmp66_);
- _g_free0 (title);
+ g_free (_tmp66_);
+ g_free (title);
}
diff --git a/src/media-export/rygel-media-export-jpeg-writer.c b/src/media-export/rygel-media-export-jpeg-writer.c
index 64f9584..fe33fd9 100644
--- a/src/media-export/rygel-media-export-jpeg-writer.c
+++ b/src/media-export/rygel-media-export-jpeg-writer.c
@@ -35,11 +35,6 @@
G_DEFINE_TYPE (RygelMediaExportJPEGWriter, rygel_media_export_jpeg_writer, G_TYPE_OBJECT)
-
-#define _gst_object_unref0(var) ((var == NULL) ? NULL : (var = (gst_object_unref (var), NULL)))
-#define _g_main_loop_unref0(var) ((var == NULL) ? NULL : (var = (g_main_loop_unref (var), NULL)))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-
struct _RygelMediaExportJPEGWriterPrivate {
GstBin* bin;
GstAppSrc* appsrc;
@@ -107,18 +102,18 @@ RygelMediaExportJPEGWriter* rygel_media_export_jpeg_writer_construct (GType obje
_tmp1_ = _tmp0_;
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (self);
+ g_object_unref (self);
return NULL;
}
- _gst_object_unref0 (self->priv->bin);
+ gst_object_unref (self->priv->bin);
self->priv->bin = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, GST_TYPE_BIN) ? ((GstBin*) _tmp1_) : NULL;
_tmp2_ = self->priv->bin;
_tmp3_ = gst_bin_get_by_name (_tmp2_, "src");
- _gst_object_unref0 (self->priv->appsrc);
+ gst_object_unref (self->priv->appsrc);
self->priv->appsrc = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, GST_TYPE_APP_SRC) ? ((GstAppSrc*) _tmp3_) : NULL;
_tmp4_ = self->priv->bin;
_tmp5_ = gst_bin_get_by_name (_tmp4_, "sink");
- _gst_object_unref0 (self->priv->sink);
+ gst_object_unref (self->priv->sink);
self->priv->sink = _tmp5_;
_tmp6_ = self->priv->bin;
_tmp7_ = gst_element_get_bus ((GstElement*) _tmp6_);
@@ -130,9 +125,9 @@ RygelMediaExportJPEGWriter* rygel_media_export_jpeg_writer_construct (GType obje
_tmp10_ = bus;
g_signal_connect_object (_tmp10_, "message::error", (GCallback) ___lambda5__gst_bus_message, self, 0);
_tmp11_ = g_main_loop_new (NULL, FALSE);
- _g_main_loop_unref0 (self->priv->loop);
+ g_main_loop_unref (self->priv->loop);
self->priv->loop = _tmp11_;
- _gst_object_unref0 (bus);
+ gst_object_unref (bus);
return self;
}
@@ -206,10 +201,10 @@ static void rygel_media_export_jpeg_writer_init (RygelMediaExportJPEGWriter * se
static void rygel_media_export_jpeg_writer_finalize (GObject* obj) {
RygelMediaExportJPEGWriter * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_MEDIA_EXPORT_TYPE_JPEG_WRITER, RygelMediaExportJPEGWriter);
- _gst_object_unref0 (self->priv->bin);
- _gst_object_unref0 (self->priv->appsrc);
- _g_main_loop_unref0 (self->priv->loop);
- _gst_object_unref0 (self->priv->sink);
+ gst_object_unref (self->priv->bin);
+ gst_object_unref (self->priv->appsrc);
+ g_main_loop_unref (self->priv->loop);
+ gst_object_unref (self->priv->sink);
G_OBJECT_CLASS (rygel_media_export_jpeg_writer_parent_class)->finalize (obj);
}
diff --git a/src/media-export/rygel-media-export-leaf-query-container.c b/src/media-export/rygel-media-export-leaf-query-container.c
index 467e51e..67d6f43 100644
--- a/src/media-export/rygel-media-export-leaf-query-container.c
+++ b/src/media-export/rygel-media-export-leaf-query-container.c
@@ -72,8 +72,6 @@ typedef struct _RygelMediaExportQueryContainerPrivate RygelMediaExportQueryConta
typedef struct _RygelMediaExportLeafQueryContainer RygelMediaExportLeafQueryContainer;
typedef struct _RygelMediaExportLeafQueryContainerClass RygelMediaExportLeafQueryContainerClass;
typedef struct _RygelMediaExportLeafQueryContainerPrivate RygelMediaExportLeafQueryContainerPrivate;
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
typedef struct _RygelMediaExportLeafQueryContainerGetChildrenData RygelMediaExportLeafQueryContainerGetChildrenData;
struct _RygelMediaExportDBContainer {
@@ -195,19 +193,14 @@ RygelMediaExportLeafQueryContainer* rygel_media_export_leaf_query_container_new
static void rygel_media_export_leaf_query_container_real_get_children_data_free (gpointer _data) {
RygelMediaExportLeafQueryContainerGetChildrenData* _data_;
_data_ = _data;
- _g_free0 (_data_->sort_criteria);
- _g_object_unref0 (_data_->cancellable);
- _g_object_unref0 (_data_->result);
- _g_object_unref0 (_data_->self);
+ g_free (_data_->sort_criteria);
+ g_object_unref (_data_->cancellable);
+ g_object_unref (_data_->result);
+ g_object_unref (_data_->self);
g_slice_free (RygelMediaExportLeafQueryContainerGetChildrenData, _data_);
}
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
-
static void rygel_media_export_leaf_query_container_real_get_children (RygelMediaContainer* base, guint offset, guint max_count, const gchar* sort_criteria, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_) {
RygelMediaExportLeafQueryContainer * self;
RygelMediaExportLeafQueryContainerGetChildrenData* _data_;
@@ -222,7 +215,7 @@ static void rygel_media_export_leaf_query_container_real_get_children (RygelMedi
_data_ = g_slice_new0 (RygelMediaExportLeafQueryContainerGetChildrenData);
_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, rygel_media_export_leaf_query_container_real_get_children);
g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, rygel_media_export_leaf_query_container_real_get_children_data_free);
- _tmp0_ = _g_object_ref0 (self);
+ _tmp0_ = g_object_ref (self);
_data_->self = _tmp0_;
_tmp1_ = offset;
_data_->offset = _tmp1_;
@@ -230,11 +223,11 @@ static void rygel_media_export_leaf_query_container_real_get_children (RygelMedi
_data_->max_count = _tmp2_;
_tmp3_ = sort_criteria;
_tmp4_ = g_strdup (_tmp3_);
- _g_free0 (_data_->sort_criteria);
+ g_free (_data_->sort_criteria);
_data_->sort_criteria = _tmp4_;
_tmp5_ = cancellable;
- _tmp6_ = _g_object_ref0 (_tmp5_);
- _g_object_unref0 (_data_->cancellable);
+ _tmp6_ = g_object_ref (_tmp5_);
+ g_object_unref (_data_->cancellable);
_data_->cancellable = _tmp6_;
rygel_media_export_leaf_query_container_real_get_children_co (_data_);
}
@@ -297,7 +290,7 @@ static gboolean rygel_media_export_leaf_query_container_real_get_children_co (Ry
return FALSE;
}
{
- _data_->_tmp6_ = _g_object_ref0 (_data_->children);
+ _data_->_tmp6_ = g_object_ref (_data_->children);
_data_->_child_list = _data_->_tmp6_;
_data_->_tmp7_ = _data_->_child_list;
_data_->_tmp8_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_tmp7_);
@@ -319,9 +312,9 @@ static gboolean rygel_media_export_leaf_query_container_real_get_children_co (Ry
_data_->child = (RygelMediaObject*) _data_->_tmp15_;
_data_->_tmp16_ = _data_->child;
_data_->_tmp16_->parent = (RygelMediaContainer*) _data_->self;
- _g_object_unref0 (_data_->child);
+ g_object_unref (_data_->child);
}
- _g_object_unref0 (_data_->_child_list);
+ g_object_unref (_data_->_child_list);
}
_data_->result = _data_->children;
if (_data_->_state_ == 0) {
@@ -331,7 +324,7 @@ static gboolean rygel_media_export_leaf_query_container_real_get_children_co (Ry
}
g_object_unref (_data_->_async_result);
return FALSE;
- _g_object_unref0 (_data_->children);
+ g_object_unref (_data_->children);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
diff --git a/src/media-export/rygel-media-export-media-cache-upgrader.c b/src/media-export/rygel-media-export-media-cache-upgrader.c
index 55591e8..52a9675 100644
--- a/src/media-export/rygel-media-export-media-cache-upgrader.c
+++ b/src/media-export/rygel-media-export-media-cache-upgrader.c
@@ -44,10 +44,6 @@ typedef struct _RygelMediaExportSQLFactory RygelMediaExportSQLFactory;
typedef struct _RygelMediaExportSQLFactoryClass RygelMediaExportSQLFactoryClass;
#define RYGEL_MEDIA_EXPORT_TYPE_SQL_STRING (rygel_media_export_sql_string_get_type ())
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-
#define RYGEL_MEDIA_EXPORT_DATABASE_CURSOR_TYPE_ITERATOR (rygel_media_export_database_cursor_iterator_get_type ())
#define RYGEL_MEDIA_EXPORT_DATABASE_CURSOR_ITERATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RYGEL_MEDIA_EXPORT_DATABASE_CURSOR_TYPE_ITERATOR, RygelMediaExportDatabaseCursorIterator))
@@ -276,8 +272,8 @@ void rygel_media_export_media_cache_upgrader_fix_schema (RygelMediaExportMediaCa
_tmp13_ = g_strconcat ("Failed to force reindex to fix database: ", _tmp12_, NULL);
_tmp14_ = _tmp13_;
g_warning ("rygel-media-export-media-cache-upgrader.vala:67: %s", _tmp14_);
- _g_free0 (_tmp14_);
- _g_error_free0 (_error_);
+ g_free (_tmp14_);
+ g_error_free (_error_);
}
__finally12:
if (_inner_error_ != NULL) {
@@ -321,8 +317,8 @@ void rygel_media_export_media_cache_upgrader_ensure_indices (RygelMediaExportMed
_tmp6_ = g_strconcat ("Failed to create indices: ", _tmp5_, NULL);
_tmp7_ = _tmp6_;
g_warning ("rygel-media-export-media-cache-upgrader.vala:78: %s", _tmp7_);
- _g_free0 (_tmp7_);
- _g_error_free0 (_error_);
+ g_free (_tmp7_);
+ g_error_free (_error_);
}
__finally13:
if (_inner_error_ != NULL) {
@@ -568,7 +564,7 @@ static void rygel_media_export_media_cache_upgrader_update_v3_v4 (RygelMediaExpo
g_warning ("rygel-media-export-media-cache-upgrader.vala:149: Database upgrade fai" \
"led: %s", _tmp16_);
self->priv->database = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally14:
if (_inner_error_ != NULL) {
@@ -630,7 +626,7 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch15_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -641,7 +637,7 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch15_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -654,7 +650,7 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch15_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -665,7 +661,7 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch15_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -676,7 +672,7 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch15_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -687,7 +683,7 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch15_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -700,7 +696,7 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch15_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -711,7 +707,7 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch15_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -722,7 +718,7 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch15_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -774,7 +770,7 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
goto __catch15_rygel_media_export_database_error;
}
args = (_vala_GValue_array_free (args, args_length1), NULL);
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -805,15 +801,15 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
statement = _tmp30_;
if (_inner_error_ != NULL) {
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
args = (_vala_GValue_array_free (args, args_length1), NULL);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch15_rygel_media_export_database_error;
}
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
args = (_vala_GValue_array_free (args, args_length1), NULL);
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -830,19 +826,19 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
_tmp35__length1 = args_length1;
rygel_media_export_database_exec (_tmp34_, "INSERT INTO Object SELECT * FROM _OBJECT " "WHERE parent = ?", _tmp35_, _tmp35__length1, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
args = (_vala_GValue_array_free (args, args_length1), NULL);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch15_rygel_media_export_database_error;
}
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
args = (_vala_GValue_array_free (args, args_length1), NULL);
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
}
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
args = (_vala_GValue_array_free (args, args_length1), NULL);
}
_tmp36_ = self->priv->database;
@@ -851,7 +847,7 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch15_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -862,7 +858,7 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch15_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -875,7 +871,7 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch15_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -888,7 +884,7 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch15_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -899,7 +895,7 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch15_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -910,7 +906,7 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch15_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -921,7 +917,7 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch15_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -945,16 +941,16 @@ static void rygel_media_export_media_cache_upgrader_update_v4_v5 (RygelMediaExpo
g_warning ("rygel-media-export-media-cache-upgrader.vala:197: Database upgrade fai" \
"led: %s", _tmp50_);
self->priv->database = NULL;
- _g_error_free0 (err);
+ g_error_free (err);
}
__finally15:
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
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;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
}
@@ -1092,7 +1088,7 @@ static void rygel_media_export_media_cache_upgrader_update_v5_v6 (RygelMediaExpo
g_warning ("rygel-media-export-media-cache-upgrader.vala:218: Database upgrade fai" \
"led: %s", _tmp13_);
self->priv->database = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally16:
if (_inner_error_ != NULL) {
@@ -1191,7 +1187,7 @@ static void rygel_media_export_media_cache_upgrader_update_v6_v7 (RygelMediaExpo
g_warning ("rygel-media-export-media-cache-upgrader.vala:234: Database upgrade fai" \
"led: %s", _tmp8_);
self->priv->database = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally17:
if (_inner_error_ != NULL) {
@@ -1301,7 +1297,7 @@ static void rygel_media_export_media_cache_upgrader_update_v7_v8 (RygelMediaExpo
g_warning ("rygel-media-export-media-cache-upgrader.vala:251: Database upgrade fai" \
"led: %s", _tmp9_);
self->priv->database = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally18:
if (_inner_error_ != NULL) {
@@ -1462,7 +1458,7 @@ static void rygel_media_export_media_cache_upgrader_update_v8_v9 (RygelMediaExpo
g_warning ("rygel-media-export-media-cache-upgrader.vala:274: Database upgrade fai" \
"led: %s", _tmp17_);
self->priv->database = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally19:
if (_inner_error_ != NULL) {
@@ -1526,11 +1522,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp1_ = self->priv->database;
rygel_media_export_database_begin (_tmp1_, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1538,11 +1534,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp2_ = self->priv->database;
rygel_media_export_database_exec (_tmp2_, "DELETE FROM Object WHERE upnp_id LIKE '" RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX "%'", NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1550,11 +1546,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp3_ = self->priv->database;
rygel_media_export_database_exec (_tmp3_, "DROP TRIGGER trgr_update_closure", NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1562,11 +1558,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp4_ = self->priv->database;
rygel_media_export_database_exec (_tmp4_, "DROP TRIGGER trgr_delete_closure", NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1574,11 +1570,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp5_ = self->priv->database;
rygel_media_export_database_exec (_tmp5_, "DROP INDEX idx_parent", NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1586,11 +1582,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp6_ = self->priv->database;
rygel_media_export_database_exec (_tmp6_, "DROP INDEX idx_meta_data_fk", NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1598,11 +1594,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp7_ = self->priv->database;
rygel_media_export_database_exec (_tmp7_, "DROP INDEX IF EXISTS idx_closure", NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1610,11 +1606,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp8_ = self->priv->database;
rygel_media_export_database_exec (_tmp8_, "DROP TABLE Closure", NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1622,11 +1618,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp9_ = self->priv->database;
rygel_media_export_database_exec (_tmp9_, "DROP TRIGGER trgr_delete_metadata", NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1638,14 +1634,14 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp14_ = g_strconcat (_tmp13_, "', 0)", NULL);
_tmp15_ = _tmp14_;
rygel_media_export_database_exec (_tmp10_, _tmp15_, NULL, 0, &_inner_error_);
- _g_free0 (_tmp15_);
- _g_free0 (_tmp13_);
+ g_free (_tmp15_);
+ g_free (_tmp13_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1653,11 +1649,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp16_ = self->priv->database;
rygel_media_export_database_exec (_tmp16_, "UPDATE Object SET parent = '" RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_ID "' WHERE parent = '0' AND upnp_id " "NOT LIKE 'virtual-%' AND upnp_id " "<> '" RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_ID "'", NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1665,11 +1661,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp17_ = self->priv->database;
rygel_media_export_database_exec (_tmp17_, "ALTER TABLE Object RENAME TO _Object", NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1677,11 +1673,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp18_ = self->priv->database;
rygel_media_export_database_exec (_tmp18_, "CREATE TABLE Object AS SELECT * FROM _Object", NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1689,11 +1685,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp19_ = self->priv->database;
rygel_media_export_database_exec (_tmp19_, "DELETE FROM Object", NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1703,11 +1699,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp22_ = rygel_media_export_sql_factory_make (_tmp21_, RYGEL_MEDIA_EXPORT_SQL_STRING_TABLE_CLOSURE);
rygel_media_export_database_exec (_tmp20_, _tmp22_, NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1717,11 +1713,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp25_ = rygel_media_export_sql_factory_make (_tmp24_, RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_CLOSURE);
rygel_media_export_database_exec (_tmp23_, _tmp25_, NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1729,11 +1725,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp26_ = self->priv->database;
rygel_media_export_database_exec (_tmp26_, "INSERT INTO Closure (ancestor, descendant, " "depth) VALUES ('0','0',0)", NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1781,12 +1777,12 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
cursor = _tmp37_;
if (_inner_error_ != NULL) {
args = (_vala_GValue_array_free (args, args_length1), NULL);
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
args = (_vala_GValue_array_free (args, args_length1), NULL);
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1817,16 +1813,16 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
statement = _tmp43_;
if (_inner_error_ != NULL) {
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
args = (_vala_GValue_array_free (args, args_length1), NULL);
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
args = (_vala_GValue_array_free (args, args_length1), NULL);
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1843,30 +1839,30 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp48__length1 = args_length1;
rygel_media_export_database_exec (_tmp47_, "INSERT INTO Object SELECT * FROM _Object " "WHERE parent = ?", _tmp48_, _tmp48__length1, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
args = (_vala_GValue_array_free (args, args_length1), NULL);
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
args = (_vala_GValue_array_free (args, args_length1), NULL);
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
}
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
args = (_vala_GValue_array_free (args, args_length1), NULL);
}
_tmp49_ = self->priv->database;
rygel_media_export_database_exec (_tmp49_, "DROP TABLE Object", NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1874,11 +1870,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp50_ = self->priv->database;
rygel_media_export_database_exec (_tmp50_, "ALTER TABLE _Object RENAME TO Object", NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1888,11 +1884,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp53_ = rygel_media_export_sql_factory_make (_tmp52_, RYGEL_MEDIA_EXPORT_SQL_STRING_INDEX_COMMON);
rygel_media_export_database_exec (_tmp51_, _tmp53_, NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1902,11 +1898,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp56_ = rygel_media_export_sql_factory_make (_tmp55_, RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_COMMON);
rygel_media_export_database_exec (_tmp54_, _tmp56_, NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1916,11 +1912,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp59_ = rygel_media_export_sql_factory_make (_tmp58_, RYGEL_MEDIA_EXPORT_SQL_STRING_TRIGGER_CLOSURE);
rygel_media_export_database_exec (_tmp57_, _tmp59_, NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1928,11 +1924,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp60_ = self->priv->database;
rygel_media_export_database_exec (_tmp60_, "UPDATE schema_info SET version = '10'", NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1940,11 +1936,11 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp61_ = self->priv->database;
rygel_media_export_database_commit (_tmp61_, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
@@ -1952,18 +1948,18 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
_tmp62_ = self->priv->database;
rygel_media_export_database_exec (_tmp62_, "VACUUM", NULL, 0, &_inner_error_);
if (_inner_error_ != NULL) {
- _g_object_unref0 (queue);
+ g_object_unref (queue);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch20_rygel_media_export_database_error;
}
- _g_object_unref0 (queue);
+ g_object_unref (queue);
g_critical ("file %s: line %d: unexpected 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;
}
_tmp63_ = self->priv->database;
rygel_media_export_database_analyze (_tmp63_);
- _g_object_unref0 (queue);
+ g_object_unref (queue);
}
goto __finally20;
__catch20_rygel_media_export_database_error:
@@ -1981,7 +1977,7 @@ static void rygel_media_export_media_cache_upgrader_update_v9_v10 (RygelMediaExp
g_warning ("rygel-media-export-media-cache-upgrader.vala:343: Database upgrade fai" \
"led: %s", _tmp66_);
self->priv->database = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally20:
if (_inner_error_ != NULL) {
@@ -2082,7 +2078,7 @@ static void rygel_media_export_media_cache_upgrader_update_v10_v11 (RygelMediaEx
g_warning ("rygel-media-export-media-cache-upgrader.vala:364: Database upgrade fai" \
"led: %s", _tmp9_);
self->priv->database = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally21:
if (_inner_error_ != NULL) {
diff --git a/src/media-export/rygel-media-export-media-cache.c b/src/media-export/rygel-media-export-media-cache.c
index 37289a6..04fb8cf 100644
--- a/src/media-export/rygel-media-export-media-cache.c
+++ b/src/media-export/rygel-media-export-media-cache.c
@@ -58,11 +58,8 @@ typedef struct _RygelMediaExportObjectFactoryClass RygelMediaExportObjectFactory
typedef struct _RygelMediaExportSQLFactory RygelMediaExportSQLFactory;
typedef struct _RygelMediaExportSQLFactoryClass RygelMediaExportSQLFactoryClass;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _g_free0(var) (var = (g_free (var), NULL))
#define RYGEL_MEDIA_EXPORT_TYPE_SQL_STRING (rygel_media_export_sql_string_get_type ())
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
#define RYGEL_MEDIA_EXPORT_TYPE_DATABASE_CURSOR (rygel_media_export_database_cursor_get_type ())
#define RYGEL_MEDIA_EXPORT_DATABASE_CURSOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RYGEL_MEDIA_EXPORT_TYPE_DATABASE_CURSOR, RygelMediaExportDatabaseCursor))
@@ -109,7 +106,6 @@ typedef struct _RygelNullContainerClass RygelNullContainerClass;
typedef struct _RygelMediaExportMediaCacheUpgrader RygelMediaExportMediaCacheUpgrader;
typedef struct _RygelMediaExportMediaCacheUpgraderClass RygelMediaExportMediaCacheUpgraderClass;
-#define _rygel_media_export_media_cache_upgrader_unref0(var) ((var == NULL) ? NULL : (var = (rygel_media_export_media_cache_upgrader_unref (var), NULL)))
#define RYGEL_MEDIA_EXPORT_TYPE_MUSIC_ITEM (rygel_media_export_music_item_get_type ())
#define RYGEL_MEDIA_EXPORT_MUSIC_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RYGEL_MEDIA_EXPORT_TYPE_MUSIC_ITEM, RygelMediaExportMusicItem))
@@ -416,21 +412,21 @@ static RygelMediaExportMediaCache* rygel_media_export_media_cache_construct (GTy
GError * _inner_error_ = NULL;
self = (RygelMediaExportMediaCache*) g_object_new (object_type, NULL);
_tmp0_ = rygel_media_export_sql_factory_new ();
- _g_object_unref0 (self->priv->sql);
+ g_object_unref (self->priv->sql);
self->priv->sql = _tmp0_;
rygel_media_export_media_cache_open_db (self, "media-export", &_inner_error_);
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (self);
+ g_object_unref (self);
return NULL;
}
_tmp1_ = rygel_media_export_object_factory_new ();
- _g_object_unref0 (self->priv->factory);
+ g_object_unref (self->priv->factory);
self->priv->factory = _tmp1_;
rygel_media_export_media_cache_get_exists_cache (self, &_inner_error_);
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (self);
+ g_object_unref (self);
return NULL;
}
return self;
@@ -456,17 +452,12 @@ gchar* rygel_media_export_media_cache_get_id (GFile* file) {
_tmp2_ = _tmp1_;
_tmp3_ = g_compute_checksum_for_string (G_CHECKSUM_MD5, _tmp2_, (gsize) (-1));
_tmp4_ = _tmp3_;
- _g_free0 (_tmp2_);
+ g_free (_tmp2_);
result = _tmp4_;
return result;
}
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
-
RygelMediaExportMediaCache* rygel_media_export_media_cache_get_default (GError** error) {
RygelMediaExportMediaCache* result = NULL;
RygelMediaExportMediaCache* _tmp0_;
@@ -483,11 +474,11 @@ RygelMediaExportMediaCache* rygel_media_export_media_cache_get_default (GError**
g_propagate_error (error, _inner_error_);
return NULL;
}
- _g_object_unref0 (rygel_media_export_media_cache_instance);
+ g_object_unref (rygel_media_export_media_cache_instance);
rygel_media_export_media_cache_instance = _tmp2_;
}
_tmp3_ = rygel_media_export_media_cache_instance;
- _tmp4_ = _g_object_ref0 (_tmp3_);
+ _tmp4_ = g_object_ref (_tmp3_);
result = _tmp4_;
return result;
}
@@ -568,12 +559,6 @@ void rygel_media_export_media_cache_remove_object (RygelMediaExportMediaCache* s
}
}
-
-static gpointer _g_error_copy0 (gpointer self) {
- return self ? g_error_copy (self) : NULL;
-}
-
-
void rygel_media_export_media_cache_save_container (RygelMediaExportMediaCache* self, RygelMediaContainer* container, GError** error) {
GError * _inner_error_ = NULL;
g_return_if_fail (self != NULL);
@@ -623,9 +608,9 @@ void rygel_media_export_media_cache_save_container (RygelMediaExportMediaCache*
_tmp3_ = self->priv->db;
rygel_media_export_database_rollback (_tmp3_);
_tmp4_ = _error_;
- _tmp5_ = _g_error_copy0 (_tmp4_);
+ _tmp5_ = g_error_copy (_tmp4_);
_inner_error_ = _tmp5_;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
goto __finally5;
}
__finally5:
@@ -707,9 +692,9 @@ void rygel_media_export_media_cache_save_item (RygelMediaExportMediaCache* self,
_tmp10_ = self->priv->db;
rygel_media_export_database_rollback (_tmp10_);
_tmp11_ = _error_;
- _tmp12_ = _g_error_copy0 (_tmp11_);
+ _tmp12_ = g_error_copy (_tmp11_);
_inner_error_ = _tmp12_;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
goto __finally6;
}
__finally6:
@@ -752,11 +737,11 @@ RygelMediaObject* rygel_media_export_media_cache_get_object (RygelMediaExportMed
if (_inner_error_ != NULL) {
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (parent);
+ g_object_unref (parent);
values = (_vala_GValue_array_free (values, values_length1), NULL);
return NULL;
} else {
- _g_object_unref0 (parent);
+ g_object_unref (parent);
values = (_vala_GValue_array_free (values, values_length1), 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_);
@@ -799,14 +784,14 @@ RygelMediaObject* rygel_media_export_media_cache_get_object (RygelMediaExportMed
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
g_propagate_error (error, _inner_error_);
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
- _g_object_unref0 (cursor);
- _g_object_unref0 (parent);
+ g_object_unref (cursor);
+ g_object_unref (parent);
values = (_vala_GValue_array_free (values, values_length1), NULL);
return NULL;
} else {
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
- _g_object_unref0 (cursor);
- _g_object_unref0 (parent);
+ g_object_unref (cursor);
+ g_object_unref (parent);
values = (_vala_GValue_array_free (values, values_length1), 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_);
@@ -814,7 +799,7 @@ RygelMediaObject* rygel_media_export_media_cache_get_object (RygelMediaExportMed
}
}
_tmp11_ = parent;
- _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, RYGEL_TYPE_MEDIA_CONTAINER) ? ((RygelMediaContainer*) _tmp11_) : NULL);
+ _tmp12_ = g_object_ref (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, RYGEL_TYPE_MEDIA_CONTAINER) ? ((RygelMediaContainer*) _tmp11_) : NULL);
parent_container = _tmp12_;
_tmp13_ = parent_container;
_tmp14_ = statement;
@@ -824,16 +809,16 @@ RygelMediaObject* rygel_media_export_media_cache_get_object (RygelMediaExportMed
_tmp17_ = parent_container;
rygel_media_object_set_parent_ref (_tmp16_, _tmp17_);
_tmp18_ = object;
- _tmp19_ = _g_object_ref0 (_tmp18_);
- _g_object_unref0 (parent);
+ _tmp19_ = g_object_ref (_tmp18_);
+ g_object_unref (parent);
parent = _tmp19_;
- _g_object_unref0 (object);
- _g_object_unref0 (parent_container);
+ g_object_unref (object);
+ g_object_unref (parent_container);
}
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
}
result = parent;
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
values = (_vala_GValue_array_free (values, values_length1), NULL);
return result;
}
@@ -882,19 +867,19 @@ RygelMediaContainer* rygel_media_export_media_cache_get_container (RygelMediaExp
_inner_error_ = _tmp7_;
if ((_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) || (_inner_error_->domain == RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR)) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (object);
+ g_object_unref (object);
return NULL;
} else {
- _g_object_unref0 (object);
+ g_object_unref (object);
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 NULL;
}
}
_tmp8_ = object;
- _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, RYGEL_TYPE_MEDIA_CONTAINER) ? ((RygelMediaContainer*) _tmp8_) : NULL);
+ _tmp9_ = g_object_ref (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, RYGEL_TYPE_MEDIA_CONTAINER) ? ((RygelMediaContainer*) _tmp8_) : NULL);
result = _tmp9_;
- _g_object_unref0 (object);
+ g_object_unref (object);
return result;
}
@@ -1013,7 +998,7 @@ gboolean rygel_media_export_media_cache_exists (RygelMediaExportMediaCache* self
result = TRUE;
_rygel_media_export_exists_cache_entry_free0 (entry);
values = (_vala_GValue_array_free (values, values_length1), NULL);
- _g_free0 (uri);
+ g_free (uri);
if (timestamp) {
*timestamp = _vala_timestamp;
}
@@ -1030,11 +1015,11 @@ gboolean rygel_media_export_media_cache_exists (RygelMediaExportMediaCache* self
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
g_propagate_error (error, _inner_error_);
values = (_vala_GValue_array_free (values, values_length1), NULL);
- _g_free0 (uri);
+ g_free (uri);
return FALSE;
} else {
values = (_vala_GValue_array_free (values, values_length1), NULL);
- _g_free0 (uri);
+ g_free (uri);
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 FALSE;
@@ -1046,14 +1031,14 @@ gboolean rygel_media_export_media_cache_exists (RygelMediaExportMediaCache* self
if (_inner_error_ != NULL) {
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
values = (_vala_GValue_array_free (values, values_length1), NULL);
- _g_free0 (uri);
+ g_free (uri);
return FALSE;
} else {
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
values = (_vala_GValue_array_free (values, values_length1), NULL);
- _g_free0 (uri);
+ g_free (uri);
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 FALSE;
@@ -1068,9 +1053,9 @@ gboolean rygel_media_export_media_cache_exists (RygelMediaExportMediaCache* self
_tmp25_ = statement;
_tmp26_ = sqlite3_column_int (_tmp25_, 0);
result = _tmp26_ == 1;
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
values = (_vala_GValue_array_free (values, values_length1), NULL);
- _g_free0 (uri);
+ g_free (uri);
if (timestamp) {
*timestamp = _vala_timestamp;
}
@@ -1154,14 +1139,14 @@ RygelMediaObjects* rygel_media_export_media_cache_get_children (RygelMediaExport
_tmp20__length1 = values_length1;
_tmp21_ = rygel_media_export_database_exec_cursor (_tmp15_, _tmp19_, _tmp20_, _tmp20__length1, &_inner_error_);
_tmp22_ = _tmp21_;
- _g_free0 (_tmp19_);
+ g_free (_tmp19_);
cursor = _tmp22_;
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_free0 (sort_order);
- _g_free0 (sql);
+ g_free (sort_order);
+ g_free (sql);
values = (_vala_GValue_array_free (values, values_length1), NULL);
- _g_object_unref0 (children);
+ g_object_unref (children);
return NULL;
}
{
@@ -1197,11 +1182,11 @@ RygelMediaObjects* rygel_media_export_media_cache_get_children (RygelMediaExport
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
- _g_object_unref0 (cursor);
- _g_free0 (sort_order);
- _g_free0 (sql);
+ g_object_unref (cursor);
+ g_free (sort_order);
+ g_free (sql);
values = (_vala_GValue_array_free (values, values_length1), NULL);
- _g_object_unref0 (children);
+ g_object_unref (children);
return NULL;
}
_tmp29_ = children;
@@ -1210,20 +1195,20 @@ RygelMediaObjects* rygel_media_export_media_cache_get_children (RygelMediaExport
_tmp32_ = rygel_media_export_media_cache_get_object_from_statement (self, _tmp30_, _tmp31_);
_tmp33_ = _tmp32_;
gee_abstract_collection_add ((GeeAbstractCollection*) _tmp29_, _tmp33_);
- _g_object_unref0 (_tmp33_);
+ g_object_unref (_tmp33_);
_tmp34_ = children;
_tmp35_ = gee_list_last ((GeeList*) _tmp34_);
_tmp36_ = (RygelMediaObject*) _tmp35_;
_tmp37_ = container;
rygel_media_object_set_parent_ref (_tmp36_, _tmp37_);
- _g_object_unref0 (_tmp36_);
+ g_object_unref (_tmp36_);
}
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
}
result = children;
- _g_object_unref0 (cursor);
- _g_free0 (sort_order);
- _g_free0 (sql);
+ g_object_unref (cursor);
+ g_free (sort_order);
+ g_free (sql);
values = (_vala_GValue_array_free (values, values_length1), NULL);
return result;
}
@@ -1279,7 +1264,7 @@ RygelMediaObjects* rygel_media_export_media_cache_get_objects_by_search_expressi
_tmp6_ = rygel_search_expression_to_string (_tmp5_);
_tmp7_ = _tmp6_;
g_debug ("rygel-media-export-media-cache.vala:218: Original search: %s", _tmp7_);
- _g_free0 (_tmp7_);
+ g_free (_tmp7_);
_tmp8_ = filter;
g_debug ("rygel-media-export-media-cache.vala:219: Parsed search expression: %s", _tmp8_);
}
@@ -1293,7 +1278,7 @@ RygelMediaObjects* rygel_media_export_media_cache_get_objects_by_search_expressi
_tmp15_ = _tmp14_;
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_free0 (filter);
+ g_free (filter);
_g_value_array_free0 (args);
return NULL;
}
@@ -1308,12 +1293,12 @@ RygelMediaObjects* rygel_media_export_media_cache_get_objects_by_search_expressi
_tmp23_ = _tmp22_;
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_free0 (filter);
+ g_free (filter);
_g_value_array_free0 (args);
return NULL;
}
result = _tmp23_;
- _g_free0 (filter);
+ g_free (filter);
_g_value_array_free0 (args);
if (total_matches) {
*total_matches = _vala_total_matches;
@@ -1375,7 +1360,7 @@ glong rygel_media_export_media_cache_get_object_count_by_search_expression (Ryge
_tmp6_ = rygel_search_expression_to_string (_tmp5_);
_tmp7_ = _tmp6_;
g_debug ("rygel-media-export-media-cache.vala:243: Original search: %s", _tmp7_);
- _g_free0 (_tmp7_);
+ g_free (_tmp7_);
_tmp8_ = filter;
g_debug ("rygel-media-export-media-cache.vala:244: Parsed search expression: %s", _tmp8_);
}
@@ -1427,20 +1412,20 @@ glong rygel_media_export_media_cache_get_object_count_by_search_expression (Ryge
_tmp22_ = arg;
_tmp23_ = g_value_get_string (_tmp22_);
_tmp24_ = g_strdup (_tmp23_);
- _g_free0 (_tmp19_);
+ g_free (_tmp19_);
_tmp19_ = _tmp24_;
} else {
GValue* _tmp25_;
gchar* _tmp26_ = NULL;
_tmp25_ = arg;
_tmp26_ = g_strdup_value_contents (_tmp25_);
- _g_free0 (_tmp19_);
+ g_free (_tmp19_);
_tmp19_ = _tmp26_;
}
_tmp27_ = i;
_tmp28_ = _tmp19_;
g_debug ("rygel-media-export-media-cache.vala:249: Arg %d: %s", _tmp27_, _tmp28_);
- _g_free0 (_tmp19_);
+ g_free (_tmp19_);
__vala_GValue_free0 (arg);
}
}
@@ -1452,12 +1437,12 @@ glong rygel_media_export_media_cache_get_object_count_by_search_expression (Ryge
_tmp33_ = _tmp32_;
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_free0 (filter);
+ g_free (filter);
_g_value_array_free0 (args);
return 0L;
}
result = _tmp33_;
- _g_free0 (filter);
+ g_free (filter);
_g_value_array_free0 (args);
return result;
}
@@ -1526,7 +1511,7 @@ glong rygel_media_export_media_cache_get_object_count_by_filter (RygelMediaExpor
_tmp16__length1 = (gint) _tmp15_->n_values;
_tmp17_ = rygel_media_export_database_query_value (_tmp11_, _tmp14_, _tmp16_, _tmp16__length1, &_inner_error_);
_tmp18_ = _tmp17_;
- _g_free0 (_tmp14_);
+ g_free (_tmp14_);
_tmp19_ = _tmp18_;
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
@@ -1644,20 +1629,20 @@ RygelMediaObjects* rygel_media_export_media_cache_get_objects_by_filter (RygelMe
_tmp24_ = arg;
_tmp25_ = g_value_get_string (_tmp24_);
_tmp26_ = g_strdup (_tmp25_);
- _g_free0 (_tmp21_);
+ g_free (_tmp21_);
_tmp21_ = _tmp26_;
} else {
GValue* _tmp27_;
gchar* _tmp28_ = NULL;
_tmp27_ = arg;
_tmp28_ = g_strdup_value_contents (_tmp27_);
- _g_free0 (_tmp21_);
+ g_free (_tmp21_);
_tmp21_ = _tmp28_;
}
_tmp29_ = i;
_tmp30_ = _tmp21_;
g_debug ("rygel-media-export-media-cache.vala:299: Arg %d: %s", _tmp29_, _tmp30_);
- _g_free0 (_tmp21_);
+ g_free (_tmp21_);
__vala_GValue_free0 (arg);
}
}
@@ -1690,14 +1675,14 @@ RygelMediaObjects* rygel_media_export_media_cache_get_objects_by_filter (RygelMe
_tmp45__length1 = (gint) _tmp44_->n_values;
_tmp46_ = rygel_media_export_database_exec_cursor (_tmp38_, _tmp43_, _tmp45_, _tmp45__length1, &_inner_error_);
_tmp47_ = _tmp46_;
- _g_free0 (_tmp43_);
+ g_free (_tmp43_);
cursor = _tmp47_;
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_free0 (sort_order);
- _g_object_unref0 (parent);
+ g_free (sort_order);
+ g_object_unref (parent);
G_IS_VALUE (&v) ? (g_value_unset (&v), NULL) : NULL;
- _g_object_unref0 (children);
+ g_object_unref (children);
return NULL;
}
{
@@ -1731,11 +1716,11 @@ RygelMediaObjects* rygel_media_export_media_cache_get_objects_by_filter (RygelMe
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
- _g_object_unref0 (cursor);
- _g_free0 (sort_order);
- _g_object_unref0 (parent);
+ g_object_unref (cursor);
+ g_free (sort_order);
+ g_object_unref (parent);
G_IS_VALUE (&v) ? (g_value_unset (&v), NULL) : NULL;
- _g_object_unref0 (children);
+ g_object_unref (children);
return NULL;
}
_tmp54_ = statement;
@@ -1761,7 +1746,7 @@ RygelMediaObjects* rygel_media_export_media_cache_get_objects_by_filter (RygelMe
RygelMediaContainer* _tmp64_;
const gchar* _tmp65_;
_tmp63_ = rygel_null_container_new ();
- _g_object_unref0 (parent);
+ g_object_unref (parent);
parent = (RygelMediaContainer*) _tmp63_;
_tmp64_ = parent;
_tmp65_ = parent_id;
@@ -1784,13 +1769,13 @@ RygelMediaObjects* rygel_media_export_media_cache_get_objects_by_filter (RygelMe
_tmp70_ = rygel_media_export_media_cache_get_object_from_statement (self, _tmp68_, _tmp69_);
_tmp71_ = _tmp70_;
gee_abstract_collection_add ((GeeAbstractCollection*) _tmp67_, _tmp71_);
- _g_object_unref0 (_tmp71_);
+ g_object_unref (_tmp71_);
_tmp72_ = children;
_tmp73_ = gee_list_last ((GeeList*) _tmp72_);
_tmp74_ = (RygelMediaObject*) _tmp73_;
_tmp75_ = parent;
rygel_media_object_set_parent_ref (_tmp74_, _tmp75_);
- _g_object_unref0 (_tmp74_);
+ g_object_unref (_tmp74_);
} else {
sqlite3_stmt* _tmp76_;
const gchar* _tmp77_ = NULL;
@@ -1804,9 +1789,9 @@ RygelMediaObjects* rygel_media_export_media_cache_get_objects_by_filter (RygelMe
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
}
result = children;
- _g_object_unref0 (cursor);
- _g_free0 (sort_order);
- _g_object_unref0 (parent);
+ g_object_unref (cursor);
+ g_free (sort_order);
+ g_object_unref (parent);
G_IS_VALUE (&v) ? (g_value_unset (&v), NULL) : NULL;
return result;
}
@@ -1851,7 +1836,7 @@ void rygel_media_export_media_cache_debug_statistics (RygelMediaExportMediaCache
statement = _tmp6_;
if (_inner_error_ != NULL) {
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
goto __catch7_g_error;
}
_tmp7_ = statement;
@@ -1862,7 +1847,7 @@ void rygel_media_export_media_cache_debug_statistics (RygelMediaExportMediaCache
}
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
}
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
}
goto __finally7;
__catch7_g_error:
@@ -1870,7 +1855,7 @@ void rygel_media_export_media_cache_debug_statistics (RygelMediaExportMediaCache
GError* _error_ = NULL;
_error_ = _inner_error_;
_inner_error_ = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally7:
if (_inner_error_ != NULL) {
@@ -1916,11 +1901,11 @@ GeeArrayList* rygel_media_export_media_cache_get_child_ids (RygelMediaExportMedi
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
g_propagate_error (error, _inner_error_);
values = (_vala_GValue_array_free (values, values_length1), NULL);
- _g_object_unref0 (children);
+ g_object_unref (children);
return NULL;
} else {
values = (_vala_GValue_array_free (values, values_length1), NULL);
- _g_object_unref0 (children);
+ g_object_unref (children);
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 NULL;
@@ -1954,15 +1939,15 @@ GeeArrayList* rygel_media_export_media_cache_get_child_ids (RygelMediaExportMedi
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
g_propagate_error (error, _inner_error_);
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
values = (_vala_GValue_array_free (values, values_length1), NULL);
- _g_object_unref0 (children);
+ g_object_unref (children);
return NULL;
} else {
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
values = (_vala_GValue_array_free (values, values_length1), NULL);
- _g_object_unref0 (children);
+ g_object_unref (children);
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 NULL;
@@ -1976,7 +1961,7 @@ GeeArrayList* rygel_media_export_media_cache_get_child_ids (RygelMediaExportMedi
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
}
result = children;
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
values = (_vala_GValue_array_free (values, values_length1), NULL);
return result;
}
@@ -2046,11 +2031,11 @@ GeeList* rygel_media_export_media_cache_get_meta_data_column_by_filter (RygelMed
_tmp18__length1 = (gint) _tmp17_->n_values;
_tmp19_ = rygel_media_export_database_exec_cursor (_tmp11_, _tmp16_, _tmp18_, _tmp18__length1, &_inner_error_);
_tmp20_ = _tmp19_;
- _g_free0 (_tmp16_);
+ g_free (_tmp16_);
cursor = _tmp20_;
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (data);
+ g_object_unref (data);
G_IS_VALUE (&v) ? (g_value_unset (&v), NULL) : NULL;
return NULL;
}
@@ -2081,8 +2066,8 @@ GeeList* rygel_media_export_media_cache_get_meta_data_column_by_filter (RygelMed
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
- _g_object_unref0 (cursor);
- _g_object_unref0 (data);
+ g_object_unref (cursor);
+ g_object_unref (data);
G_IS_VALUE (&v) ? (g_value_unset (&v), NULL) : NULL;
return NULL;
}
@@ -2094,7 +2079,7 @@ GeeList* rygel_media_export_media_cache_get_meta_data_column_by_filter (RygelMed
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
}
result = (GeeList*) data;
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
G_IS_VALUE (&v) ? (g_value_unset (&v), NULL) : NULL;
return result;
}
@@ -2143,7 +2128,7 @@ GeeList* rygel_media_export_media_cache_get_object_attribute_by_search_expressio
column = _tmp6_;
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_free0 (filter);
+ g_free (filter);
_g_value_array_free0 (args);
return NULL;
}
@@ -2159,14 +2144,14 @@ GeeList* rygel_media_export_media_cache_get_object_attribute_by_search_expressio
_tmp15_ = _tmp14_;
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_free0 (column);
- _g_free0 (filter);
+ g_free (column);
+ g_free (filter);
_g_value_array_free0 (args);
return NULL;
}
result = _tmp15_;
- _g_free0 (column);
- _g_free0 (filter);
+ g_free (column);
+ g_free (filter);
_g_value_array_free0 (args);
return result;
}
@@ -2248,7 +2233,7 @@ GeeList* rygel_media_export_media_cache_get_flagged_uris (RygelMediaExportMediaC
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
args = (_vala_GValue_array_free (args, args_length1), NULL);
- _g_object_unref0 (uris);
+ g_object_unref (uris);
return NULL;
}
{
@@ -2278,9 +2263,9 @@ GeeList* rygel_media_export_media_cache_get_flagged_uris (RygelMediaExportMediaC
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
args = (_vala_GValue_array_free (args, args_length1), NULL);
- _g_object_unref0 (uris);
+ g_object_unref (uris);
return NULL;
}
_tmp13_ = uris;
@@ -2291,7 +2276,7 @@ GeeList* rygel_media_export_media_cache_get_flagged_uris (RygelMediaExportMediaC
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
}
result = (GeeList*) uris;
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
args = (_vala_GValue_array_free (args, args_length1), NULL);
return result;
}
@@ -2304,7 +2289,7 @@ static void rygel_media_export_media_cache_get_exists_cache (RygelMediaExportMed
GError * _inner_error_ = NULL;
g_return_if_fail (self != NULL);
_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, RYGEL_MEDIA_EXPORT_TYPE_EXISTS_CACHE_ENTRY, (GBoxedCopyFunc) rygel_media_export_exists_cache_entry_dup, rygel_media_export_exists_cache_entry_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
- _g_object_unref0 (self->priv->exists_cache);
+ g_object_unref (self->priv->exists_cache);
self->priv->exists_cache = _tmp0_;
_tmp1_ = rygel_media_export_media_cache_exec_cursor (self, RYGEL_MEDIA_EXPORT_SQL_STRING_EXISTS_CACHE, NULL, 0, &_inner_error_);
cursor = _tmp1_;
@@ -2352,11 +2337,11 @@ static void rygel_media_export_media_cache_get_exists_cache (RygelMediaExportMed
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
g_propagate_error (error, _inner_error_);
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
return;
} else {
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
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;
@@ -2377,7 +2362,7 @@ static void rygel_media_export_media_cache_get_exists_cache (RygelMediaExportMed
}
_rygel_media_export_database_cursor_iterator_unref0 (_statement_it);
}
- _g_object_unref0 (cursor);
+ g_object_unref (cursor);
}
@@ -2415,7 +2400,7 @@ static void rygel_media_export_media_cache_open_db (RygelMediaExportMediaCache*
g_propagate_error (error, _inner_error_);
return;
}
- _g_object_unref0 (self->priv->db);
+ g_object_unref (self->priv->db);
self->priv->db = _tmp2_;
old_version = -1;
_tmp3_ = atoi (RYGEL_MEDIA_EXPORT_SQL_FACTORY_SCHEMA_VERSION);
@@ -2439,7 +2424,7 @@ static void rygel_media_export_media_cache_open_db (RygelMediaExportMediaCache*
old_version = _tmp8_;
_tmp10_ = _tmp9_;
if (_inner_error_ != NULL) {
- _rygel_media_export_media_cache_upgrader_unref0 (upgrader);
+ rygel_media_export_media_cache_upgrader_unref (upgrader);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch8_rygel_media_export_database_error;
}
@@ -2461,7 +2446,7 @@ static void rygel_media_export_media_cache_open_db (RygelMediaExportMediaCache*
_tmp15_ = upgrader;
rygel_media_export_media_cache_upgrader_fix_schema (_tmp15_, &_inner_error_);
if (_inner_error_ != NULL) {
- _rygel_media_export_media_cache_upgrader_unref0 (upgrader);
+ rygel_media_export_media_cache_upgrader_unref (upgrader);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch8_rygel_media_export_database_error;
}
@@ -2474,11 +2459,11 @@ static void rygel_media_export_media_cache_open_db (RygelMediaExportMediaCache*
_tmp16_ = old_version;
_tmp17_ = current_version;
g_warning ("The version \"%d\" of the detected database" " is newer than our supported version \"%d\"", _tmp16_, _tmp17_);
- _g_object_unref0 (self->priv->db);
+ g_object_unref (self->priv->db);
self->priv->db = NULL;
_tmp18_ = g_error_new_literal (RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR, RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR_GENERAL_ERROR, "Database format" " not supported");
_inner_error_ = _tmp18_;
- _rygel_media_export_media_cache_upgrader_unref0 (upgrader);
+ rygel_media_export_media_cache_upgrader_unref (upgrader);
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch8_rygel_media_export_database_error;
}
@@ -2487,7 +2472,7 @@ static void rygel_media_export_media_cache_open_db (RygelMediaExportMediaCache*
}
_tmp19_ = upgrader;
rygel_media_export_media_cache_upgrader_ensure_indices (_tmp19_);
- _rygel_media_export_media_cache_upgrader_unref0 (upgrader);
+ rygel_media_export_media_cache_upgrader_unref (upgrader);
}
goto __finally8;
__catch8_rygel_media_export_database_error:
@@ -2508,7 +2493,7 @@ static void rygel_media_export_media_cache_open_db (RygelMediaExportMediaCache*
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch9_rygel_media_export_database_error;
}
- _g_error_free0 (_error_);
+ g_error_free (_error_);
g_critical ("file %s: line %d: unexpected 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;
@@ -2520,17 +2505,17 @@ static void rygel_media_export_media_cache_open_db (RygelMediaExportMediaCache*
"schema version %s", RYGEL_MEDIA_EXPORT_SQL_FACTORY_SCHEMA_VERSION);
_tmp23_ = rygel_media_export_media_cache_create_schema (self);
if (!_tmp23_) {
- _g_object_unref0 (self->priv->db);
+ g_object_unref (self->priv->db);
self->priv->db = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
return;
}
} else {
g_warning ("rygel-media-export-media-cache.vala:485: Incompatible schema... cannot" \
" proceed");
- _g_object_unref0 (self->priv->db);
+ g_object_unref (self->priv->db);
self->priv->db = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
return;
}
}
@@ -2546,19 +2531,19 @@ static void rygel_media_export_media_cache_open_db (RygelMediaExportMediaCache*
_tmp24_ = _error_;
_tmp25_ = _tmp24_->message;
g_warning ("rygel-media-export-media-cache.vala:491: Something weird going on: %s", _tmp25_);
- _g_object_unref0 (self->priv->db);
+ g_object_unref (self->priv->db);
self->priv->db = NULL;
_tmp26_ = g_error_new_literal (RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR, RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR_GENERAL_ERROR, "Invalid database");
_inner_error_ = _tmp26_;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
goto __finally9;
}
__finally9:
if (_inner_error_ != NULL) {
- _g_error_free0 (_error_);
+ g_error_free (_error_);
goto __finally8;
}
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally8:
if (_inner_error_ != NULL) {
@@ -2738,7 +2723,7 @@ static void rygel_media_export_media_cache_save_metadata (RygelMediaExportMediaC
GValue _tmp70_;
RygelMediaItem* _tmp71_;
_tmp39_ = item;
- _tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp39_, RYGEL_TYPE_AUDIO_ITEM) ? ((RygelAudioItem*) _tmp39_) : NULL);
+ _tmp40_ = g_object_ref (G_TYPE_CHECK_INSTANCE_TYPE (_tmp39_, RYGEL_TYPE_AUDIO_ITEM) ? ((RygelAudioItem*) _tmp39_) : NULL);
audio_item = _tmp40_;
_tmp41_ = values;
_tmp41__length1 = values_length1;
@@ -2830,7 +2815,7 @@ static void rygel_media_export_media_cache_save_metadata (RygelMediaExportMediaC
GValue _tmp101_ = {0};
GValue _tmp102_;
_tmp72_ = item;
- _tmp73_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp72_, RYGEL_MEDIA_EXPORT_TYPE_MUSIC_ITEM) ? ((RygelMediaExportMusicItem*) _tmp72_) : NULL);
+ _tmp73_ = g_object_ref (G_TYPE_CHECK_INSTANCE_TYPE (_tmp72_, RYGEL_MEDIA_EXPORT_TYPE_MUSIC_ITEM) ? ((RygelMediaExportMusicItem*) _tmp72_) : NULL);
music_item = _tmp73_;
_tmp74_ = values;
_tmp74__length1 = values_length1;
@@ -2881,9 +2866,9 @@ static void rygel_media_export_media_cache_save_metadata (RygelMediaExportMediaC
G_IS_VALUE (&_tmp98_[18]) ? (g_value_unset (&_tmp98_[18]), NULL) : NULL;
_tmp98_[18] = _tmp101_;
_tmp102_ = _tmp98_[18];
- _g_object_unref0 (music_item);
+ g_object_unref (music_item);
}
- _g_object_unref0 (audio_item);
+ g_object_unref (audio_item);
}
_tmp103_ = item;
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp103_, RYGEL_TYPE_VISUAL_ITEM)) {
@@ -2913,7 +2898,7 @@ static void rygel_media_export_media_cache_save_metadata (RygelMediaExportMediaC
GValue _tmp123_;
RygelMediaItem* _tmp124_;
_tmp104_ = item;
- _tmp105_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp104_, RYGEL_TYPE_VISUAL_ITEM) ? ((RygelVisualItem*) _tmp104_) : NULL);
+ _tmp105_ = g_object_ref (G_TYPE_CHECK_INSTANCE_TYPE (_tmp104_, RYGEL_TYPE_VISUAL_ITEM) ? ((RygelVisualItem*) _tmp104_) : NULL);
visual_item = _tmp105_;
_tmp106_ = values;
_tmp106__length1 = values_length1;
@@ -2958,7 +2943,7 @@ static void rygel_media_export_media_cache_save_metadata (RygelMediaExportMediaC
GValue _tmp131_ = {0};
GValue _tmp132_;
_tmp125_ = item;
- _tmp126_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp125_, RYGEL_MEDIA_EXPORT_TYPE_VIDEO_ITEM) ? ((RygelMediaExportVideoItem*) _tmp125_) : NULL);
+ _tmp126_ = g_object_ref (G_TYPE_CHECK_INSTANCE_TYPE (_tmp125_, RYGEL_MEDIA_EXPORT_TYPE_VIDEO_ITEM) ? ((RygelMediaExportVideoItem*) _tmp125_) : NULL);
video_item = _tmp126_;
_tmp127_ = values;
_tmp127__length1 = values_length1;
@@ -2970,9 +2955,9 @@ static void rygel_media_export_media_cache_save_metadata (RygelMediaExportMediaC
G_IS_VALUE (&_tmp127_[5]) ? (g_value_unset (&_tmp127_[5]), NULL) : NULL;
_tmp127_[5] = _tmp131_;
_tmp132_ = _tmp127_[5];
- _g_object_unref0 (video_item);
+ g_object_unref (video_item);
}
- _g_object_unref0 (visual_item);
+ g_object_unref (visual_item);
}
_tmp133_ = self->priv->db;
_tmp134_ = self->priv->sql;
@@ -3060,7 +3045,7 @@ static void rygel_media_export_media_cache_create_object (RygelMediaExportMediaC
_tmp12_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp11_);
_tmp13_ = _tmp12_;
if (_tmp13_ == 0) {
- _g_free0 (_tmp9_);
+ g_free (_tmp9_);
_tmp9_ = NULL;
} else {
RygelMediaObject* _tmp14_;
@@ -3069,7 +3054,7 @@ static void rygel_media_export_media_cache_create_object (RygelMediaExportMediaC
_tmp14_ = item;
_tmp15_ = _tmp14_->uris;
_tmp16_ = gee_abstract_list_get ((GeeAbstractList*) _tmp15_, 0);
- _g_free0 (_tmp9_);
+ g_free (_tmp9_);
_tmp9_ = (gchar*) _tmp16_;
}
_tmp17_ = item;
@@ -3117,12 +3102,12 @@ static void rygel_media_export_media_cache_create_object (RygelMediaExportMediaC
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
values = (_vala_GValue_array_free (values, values_length1), NULL);
- _g_free0 (_tmp9_);
+ g_free (_tmp9_);
G_IS_VALUE (&parent) ? (g_value_unset (&parent), NULL) : NULL;
return;
}
values = (_vala_GValue_array_free (values, values_length1), NULL);
- _g_free0 (_tmp9_);
+ g_free (_tmp9_);
G_IS_VALUE (&parent) ? (g_value_unset (&parent), NULL) : NULL;
}
@@ -3222,7 +3207,7 @@ static gboolean rygel_media_export_media_cache_create_schema (RygelMediaExportMe
g_warning ("rygel-media-export-media-cache.vala:597: Failed to create schema: %s", _tmp19_);
_tmp20_ = self->priv->db;
rygel_media_export_database_rollback (_tmp20_);
- _g_error_free0 (err);
+ g_error_free (err);
}
__finally10:
if (_inner_error_ != NULL) {
@@ -3281,10 +3266,10 @@ static RygelMediaObject* rygel_media_export_media_cache_get_object_from_statemen
_tmp10_ = title;
_tmp11_ = uri;
_tmp12_ = rygel_media_export_object_factory_get_container (_tmp8_, self, _tmp9_, _tmp10_, (guint) 0, _tmp11_);
- _g_object_unref0 (object);
+ g_object_unref (object);
object = (RygelMediaObject*) _tmp12_;
_tmp13_ = object;
- _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, RYGEL_TYPE_MEDIA_CONTAINER) ? ((RygelMediaContainer*) _tmp13_) : NULL);
+ _tmp14_ = g_object_ref (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, RYGEL_TYPE_MEDIA_CONTAINER) ? ((RygelMediaContainer*) _tmp13_) : NULL);
container = _tmp14_;
_tmp15_ = uri;
if (_tmp15_ != NULL) {
@@ -3296,7 +3281,7 @@ static RygelMediaObject* rygel_media_export_media_cache_get_object_from_statemen
_tmp18_ = uri;
gee_abstract_collection_add ((GeeAbstractCollection*) _tmp17_, _tmp18_);
}
- _g_object_unref0 (container);
+ g_object_unref (container);
break;
}
case 1:
@@ -3322,7 +3307,7 @@ static RygelMediaObject* rygel_media_export_media_cache_get_object_from_statemen
_tmp24_ = title;
_tmp25_ = upnp_class;
_tmp26_ = rygel_media_export_object_factory_get_item (_tmp21_, self, _tmp22_, _tmp23_, _tmp24_, _tmp25_);
- _g_object_unref0 (object);
+ g_object_unref (object);
object = (RygelMediaObject*) _tmp26_;
_tmp27_ = statement;
_tmp28_ = object;
@@ -3439,7 +3424,7 @@ static void rygel_media_export_media_cache_fill_item (RygelMediaExportMediaCache
gint _tmp29_ = 0;
RygelMediaItem* _tmp30_;
_tmp13_ = item;
- _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, RYGEL_TYPE_AUDIO_ITEM) ? ((RygelAudioItem*) _tmp13_) : NULL);
+ _tmp14_ = g_object_ref (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, RYGEL_TYPE_AUDIO_ITEM) ? ((RygelAudioItem*) _tmp13_) : NULL);
audio_item = _tmp14_;
_tmp15_ = audio_item;
_tmp16_ = statement;
@@ -3480,7 +3465,7 @@ static void rygel_media_export_media_cache_fill_item (RygelMediaExportMediaCache
gint _tmp44_ = 0;
RygelMediaExportMusicItem* _tmp45_;
_tmp31_ = item;
- _tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, RYGEL_MEDIA_EXPORT_TYPE_MUSIC_ITEM) ? ((RygelMediaExportMusicItem*) _tmp31_) : NULL);
+ _tmp32_ = g_object_ref (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, RYGEL_MEDIA_EXPORT_TYPE_MUSIC_ITEM) ? ((RygelMediaExportMusicItem*) _tmp31_) : NULL);
music_item = _tmp32_;
_tmp33_ = music_item;
_tmp34_ = statement;
@@ -3500,9 +3485,9 @@ static void rygel_media_export_media_cache_fill_item (RygelMediaExportMediaCache
rygel_music_item_set_track_number ((RygelMusicItem*) _tmp42_, _tmp44_);
_tmp45_ = music_item;
rygel_music_item_lookup_album_art ((RygelMusicItem*) _tmp45_);
- _g_object_unref0 (music_item);
+ g_object_unref (music_item);
}
- _g_object_unref0 (audio_item);
+ g_object_unref (audio_item);
}
_tmp46_ = item;
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp46_, RYGEL_TYPE_VISUAL_ITEM)) {
@@ -3520,7 +3505,7 @@ static void rygel_media_export_media_cache_fill_item (RygelMediaExportMediaCache
gint _tmp57_ = 0;
RygelMediaItem* _tmp58_;
_tmp47_ = item;
- _tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp47_, RYGEL_TYPE_VISUAL_ITEM) ? ((RygelVisualItem*) _tmp47_) : NULL);
+ _tmp48_ = g_object_ref (G_TYPE_CHECK_INSTANCE_TYPE (_tmp47_, RYGEL_TYPE_VISUAL_ITEM) ? ((RygelVisualItem*) _tmp47_) : NULL);
visual_item = _tmp48_;
_tmp49_ = visual_item;
_tmp50_ = statement;
@@ -3543,15 +3528,15 @@ static void rygel_media_export_media_cache_fill_item (RygelMediaExportMediaCache
sqlite3_stmt* _tmp62_;
const gchar* _tmp63_ = NULL;
_tmp59_ = item;
- _tmp60_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp59_, RYGEL_MEDIA_EXPORT_TYPE_VIDEO_ITEM) ? ((RygelMediaExportVideoItem*) _tmp59_) : NULL);
+ _tmp60_ = g_object_ref (G_TYPE_CHECK_INSTANCE_TYPE (_tmp59_, RYGEL_MEDIA_EXPORT_TYPE_VIDEO_ITEM) ? ((RygelMediaExportVideoItem*) _tmp59_) : NULL);
video_item = _tmp60_;
_tmp61_ = video_item;
_tmp62_ = statement;
_tmp63_ = sqlite3_column_text (_tmp62_, (gint) RYGEL_MEDIA_EXPORT_DETAIL_COLUMN_AUTHOR);
rygel_video_item_set_author ((RygelVideoItem*) _tmp61_, _tmp63_);
- _g_object_unref0 (video_item);
+ g_object_unref (video_item);
}
- _g_object_unref0 (visual_item);
+ g_object_unref (visual_item);
}
}
@@ -3589,7 +3574,7 @@ static gchar* rygel_media_export_media_cache_translate_search_expression (RygelM
_tmp6_ = filter;
_tmp7_ = g_strdup_printf (" %s %s", _tmp5_, _tmp6_);
result = _tmp7_;
- _g_free0 (filter);
+ g_free (filter);
return result;
}
@@ -3682,7 +3667,7 @@ static gchar* rygel_media_export_media_cache_logical_expression_to_sql (RygelMed
right_sql_string = _tmp7_;
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_free0 (left_sql_string);
+ g_free (left_sql_string);
return NULL;
}
_tmp8_ = g_strdup ("OR");
@@ -3692,7 +3677,7 @@ static gchar* rygel_media_export_media_cache_logical_expression_to_sql (RygelMed
if (((RygelLogicalOperator) ((gintptr) _tmp10_)) == RYGEL_LOGICAL_OPERATOR_AND) {
gchar* _tmp11_;
_tmp11_ = g_strdup ("AND");
- _g_free0 (operator_sql_string);
+ g_free (operator_sql_string);
operator_sql_string = _tmp11_;
}
_tmp12_ = left_sql_string;
@@ -3700,9 +3685,9 @@ static gchar* rygel_media_export_media_cache_logical_expression_to_sql (RygelMed
_tmp14_ = right_sql_string;
_tmp15_ = g_strdup_printf ("(%s %s %s)", _tmp12_, _tmp13_, _tmp14_);
result = _tmp15_;
- _g_free0 (operator_sql_string);
- _g_free0 (right_sql_string);
- _g_free0 (left_sql_string);
+ g_free (operator_sql_string);
+ g_free (right_sql_string);
+ g_free (left_sql_string);
return result;
}
@@ -3745,7 +3730,7 @@ static gchar* rygel_media_export_media_cache_map_operand_to_column (RygelMediaEx
{
gchar* _tmp4_;
_tmp4_ = g_strdup ("o.uri");
- _g_free0 (column);
+ g_free (column);
column = _tmp4_;
break;
}
@@ -3756,7 +3741,7 @@ static gchar* rygel_media_export_media_cache_map_operand_to_column (RygelMediaEx
{
gchar* _tmp5_;
_tmp5_ = g_strdup ("m.duration");
- _g_free0 (column);
+ g_free (column);
column = _tmp5_;
break;
}
@@ -3767,7 +3752,7 @@ static gchar* rygel_media_export_media_cache_map_operand_to_column (RygelMediaEx
{
gchar* _tmp6_;
_tmp6_ = g_strdup ("NULL");
- _g_free0 (column);
+ g_free (column);
column = _tmp6_;
break;
}
@@ -3778,7 +3763,7 @@ static gchar* rygel_media_export_media_cache_map_operand_to_column (RygelMediaEx
{
gchar* _tmp7_;
_tmp7_ = g_strdup ("o.upnp_id");
- _g_free0 (column);
+ g_free (column);
column = _tmp7_;
break;
}
@@ -3789,7 +3774,7 @@ static gchar* rygel_media_export_media_cache_map_operand_to_column (RygelMediaEx
{
gchar* _tmp8_;
_tmp8_ = g_strdup ("o.parent");
- _g_free0 (column);
+ g_free (column);
column = _tmp8_;
break;
}
@@ -3800,7 +3785,7 @@ static gchar* rygel_media_export_media_cache_map_operand_to_column (RygelMediaEx
{
gchar* _tmp9_;
_tmp9_ = g_strdup ("m.class");
- _g_free0 (column);
+ g_free (column);
column = _tmp9_;
break;
}
@@ -3811,7 +3796,7 @@ static gchar* rygel_media_export_media_cache_map_operand_to_column (RygelMediaEx
{
gchar* _tmp10_;
_tmp10_ = g_strdup ("o.title");
- _g_free0 (column);
+ g_free (column);
column = _tmp10_;
use_collation = TRUE;
break;
@@ -3823,7 +3808,7 @@ static gchar* rygel_media_export_media_cache_map_operand_to_column (RygelMediaEx
{
gchar* _tmp11_;
_tmp11_ = g_strdup ("m.author");
- _g_free0 (column);
+ g_free (column);
column = _tmp11_;
use_collation = TRUE;
break;
@@ -3835,7 +3820,7 @@ static gchar* rygel_media_export_media_cache_map_operand_to_column (RygelMediaEx
{
gchar* _tmp12_;
_tmp12_ = g_strdup ("strftime(\"%Y\", m.date)");
- _g_free0 (column);
+ g_free (column);
column = _tmp12_;
break;
}
@@ -3846,7 +3831,7 @@ static gchar* rygel_media_export_media_cache_map_operand_to_column (RygelMediaEx
{
gchar* _tmp13_;
_tmp13_ = g_strdup ("m.album");
- _g_free0 (column);
+ g_free (column);
column = _tmp13_;
use_collation = TRUE;
break;
@@ -3858,7 +3843,7 @@ static gchar* rygel_media_export_media_cache_map_operand_to_column (RygelMediaEx
{
gchar* _tmp14_;
_tmp14_ = g_strdup ("m.genre");
- _g_free0 (column);
+ g_free (column);
column = _tmp14_;
use_collation = TRUE;
break;
@@ -3870,7 +3855,7 @@ static gchar* rygel_media_export_media_cache_map_operand_to_column (RygelMediaEx
{
gchar* _tmp15_;
_tmp15_ = g_strdup ("m.track");
- _g_free0 (column);
+ g_free (column);
column = _tmp15_;
break;
}
@@ -3881,7 +3866,7 @@ static gchar* rygel_media_export_media_cache_map_operand_to_column (RygelMediaEx
{
gchar* _tmp16_;
_tmp16_ = g_strdup ("m.disc");
- _g_free0 (column);
+ g_free (column);
column = _tmp16_;
break;
}
@@ -3902,8 +3887,8 @@ static gchar* rygel_media_export_media_cache_map_operand_to_column (RygelMediaEx
_tmp20_ = g_error_new_literal (RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR, RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR_UNSUPPORTED_SEARCH, _tmp19_);
_inner_error_ = _tmp20_;
g_propagate_error (error, _inner_error_);
- _g_free0 (message);
- _g_free0 (column);
+ g_free (message);
+ g_free (column);
return NULL;
}
}
@@ -3912,19 +3897,19 @@ static gchar* rygel_media_export_media_cache_map_operand_to_column (RygelMediaEx
if (_tmp21_) {
gchar* _tmp22_;
_tmp22_ = g_strdup ("COLLATE CASEFOLD");
- _g_free0 (_vala_collate);
+ g_free (_vala_collate);
_vala_collate = _tmp22_;
} else {
gchar* _tmp23_;
_tmp23_ = g_strdup ("");
- _g_free0 (_vala_collate);
+ g_free (_vala_collate);
_vala_collate = _tmp23_;
}
result = column;
if (collate) {
*collate = _vala_collate;
} else {
- _g_free0 (_vala_collate);
+ g_free (_vala_collate);
}
return result;
}
@@ -3953,12 +3938,12 @@ static gchar* rygel_media_export_media_cache_relational_expression_to_sql (Rygel
_tmp0_ = exp;
_tmp1_ = ((RygelSearchExpression*) _tmp0_)->operand1;
_tmp3_ = rygel_media_export_media_cache_map_operand_to_column (self, (const gchar*) _tmp1_, &_tmp2_, &_inner_error_);
- _g_free0 (collate);
+ g_free (collate);
collate = _tmp2_;
column = _tmp3_;
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_free0 (collate);
+ g_free (collate);
__vala_GValue_free0 (v);
return NULL;
}
@@ -3979,12 +3964,12 @@ static gchar* rygel_media_export_media_cache_relational_expression_to_sql (Rygel
if (g_strcmp0 ((const gchar*) _tmp7_, "true") == 0) {
gchar* _tmp8_;
_tmp8_ = g_strdup ("%s IS NOT NULL AND %s != ''");
- _g_free0 (sql_function);
+ g_free (sql_function);
sql_function = _tmp8_;
} else {
gchar* _tmp9_;
_tmp9_ = g_strdup ("%s IS NULL OR %s = ''");
- _g_free0 (sql_function);
+ g_free (sql_function);
sql_function = _tmp9_;
}
_tmp10_ = sql_function;
@@ -3992,10 +3977,10 @@ static gchar* rygel_media_export_media_cache_relational_expression_to_sql (Rygel
_tmp12_ = column;
_tmp13_ = g_strdup_printf (_tmp10_, _tmp11_, _tmp12_);
result = _tmp13_;
- _g_free0 (sql_function);
- _g_object_unref0 (operator);
- _g_free0 (column);
- _g_free0 (collate);
+ g_free (sql_function);
+ g_object_unref (operator);
+ g_free (column);
+ g_free (collate);
__vala_GValue_free0 (v);
return result;
}
@@ -4026,7 +4011,7 @@ static gchar* rygel_media_export_media_cache_relational_expression_to_sql (Rygel
_tmp19_ = column;
_tmp20_ = collate;
_tmp21_ = rygel_media_export_sql_operator_new_from_search_criteria_op ((GUPnPSearchCriteriaOp) ((gintptr) _tmp18_), _tmp19_, _tmp20_);
- _g_object_unref0 (operator);
+ g_object_unref (operator);
operator = _tmp21_;
break;
}
@@ -4039,7 +4024,7 @@ static gchar* rygel_media_export_media_cache_relational_expression_to_sql (Rygel
GValue* _tmp26_ = NULL;
_tmp22_ = column;
_tmp23_ = rygel_media_export_sql_function_new ("contains", _tmp22_);
- _g_object_unref0 (operator);
+ g_object_unref (operator);
operator = (RygelMediaExportSqlOperator*) _tmp23_;
_tmp24_ = exp;
_tmp25_ = ((RygelSearchExpression*) _tmp24_)->operand2;
@@ -4059,7 +4044,7 @@ static gchar* rygel_media_export_media_cache_relational_expression_to_sql (Rygel
GValue* _tmp31_ = NULL;
_tmp27_ = column;
_tmp28_ = rygel_media_export_sql_function_new ("NOT contains", _tmp27_);
- _g_object_unref0 (operator);
+ g_object_unref (operator);
operator = (RygelMediaExportSqlOperator*) _tmp28_;
_tmp29_ = exp;
_tmp30_ = ((RygelSearchExpression*) _tmp29_)->operand2;
@@ -4080,7 +4065,7 @@ static gchar* rygel_media_export_media_cache_relational_expression_to_sql (Rygel
GValue* _tmp37_ = NULL;
_tmp32_ = column;
_tmp33_ = rygel_media_export_sql_operator_new ("LIKE", _tmp32_, "");
- _g_object_unref0 (operator);
+ g_object_unref (operator);
operator = _tmp33_;
_tmp34_ = exp;
_tmp35_ = ((RygelSearchExpression*) _tmp34_)->operand2;
@@ -4100,9 +4085,9 @@ static gchar* rygel_media_export_media_cache_relational_expression_to_sql (Rygel
_tmp39_ = ((RygelSearchExpression*) _tmp38_)->op;
g_warning ("rygel-media-export-media-cache.vala:851: Unsupported op %d", (gint) ((GUPnPSearchCriteriaOp) ((gintptr) _tmp39_)));
result = NULL;
- _g_object_unref0 (operator);
- _g_free0 (column);
- _g_free0 (collate);
+ g_object_unref (operator);
+ g_free (column);
+ g_free (collate);
__vala_GValue_free0 (v);
return result;
}
@@ -4120,9 +4105,9 @@ static gchar* rygel_media_export_media_cache_relational_expression_to_sql (Rygel
_tmp44_ = operator;
_tmp45_ = rygel_media_export_sql_operator_to_string (_tmp44_);
result = _tmp45_;
- _g_object_unref0 (operator);
- _g_free0 (column);
- _g_free0 (collate);
+ g_object_unref (operator);
+ g_free (column);
+ g_free (collate);
__vala_GValue_free0 (v);
return result;
}
@@ -4355,10 +4340,10 @@ static gchar* rygel_media_export_media_cache_translate_sort_criteria (RygelMedia
_tmp10_ = string_slice (_tmp6_, (glong) 1, (glong) _tmp9_);
_tmp11_ = _tmp10_;
_tmp13_ = rygel_media_export_media_cache_map_operand_to_column (self, _tmp11_, &_tmp12_, &_inner_error_);
- _g_free0 (collate);
+ g_free (collate);
collate = _tmp12_;
_tmp14_ = _tmp13_;
- _g_free0 (_tmp11_);
+ g_free (_tmp11_);
column = _tmp14_;
if (_inner_error_ != NULL) {
goto __catch11_g_error;
@@ -4384,7 +4369,7 @@ static gchar* rygel_media_export_media_cache_translate_sort_criteria (RygelMedia
_tmp24_ = collate;
_tmp25_ = _tmp19_;
g_string_append_printf (_tmp22_, "%s %s %s ", _tmp23_, _tmp24_, _tmp25_);
- _g_free0 (column);
+ g_free (column);
}
goto __finally11;
__catch11_g_error:
@@ -4395,19 +4380,19 @@ static gchar* rygel_media_export_media_cache_translate_sort_criteria (RygelMedia
_inner_error_ = NULL;
_tmp26_ = field;
g_warning ("rygel-media-export-media-cache.vala:890: Skipping nsupported field: %s", _tmp26_);
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally11:
if (_inner_error_ != NULL) {
- _g_free0 (field);
+ g_free (field);
fields = (_vala_array_free (fields, fields_length1, (GDestroyNotify) g_free), NULL);
_g_string_free0 (builder);
- _g_free0 (collate);
+ g_free (collate);
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 NULL;
}
- _g_free0 (field);
+ g_free (field);
}
}
}
@@ -4417,7 +4402,7 @@ static gchar* rygel_media_export_media_cache_translate_sort_criteria (RygelMedia
result = _tmp29_;
fields = (_vala_array_free (fields, fields_length1, (GDestroyNotify) g_free), NULL);
_g_string_free0 (builder);
- _g_free0 (collate);
+ g_free (collate);
return result;
}
@@ -4437,10 +4422,10 @@ static void rygel_media_export_media_cache_init (RygelMediaExportMediaCache * se
static void rygel_media_export_media_cache_finalize (GObject* obj) {
RygelMediaExportMediaCache * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_MEDIA_EXPORT_TYPE_MEDIA_CACHE, RygelMediaExportMediaCache);
- _g_object_unref0 (self->priv->db);
- _g_object_unref0 (self->priv->factory);
- _g_object_unref0 (self->priv->sql);
- _g_object_unref0 (self->priv->exists_cache);
+ g_object_unref (self->priv->db);
+ g_object_unref (self->priv->factory);
+ g_object_unref (self->priv->sql);
+ g_object_unref (self->priv->exists_cache);
G_OBJECT_CLASS (rygel_media_export_media_cache_parent_class)->finalize (obj);
}
diff --git a/src/media-export/rygel-media-export-metadata-extractor.c b/src/media-export/rygel-media-export-metadata-extractor.c
index cf54ab8..dc40f66 100644
--- a/src/media-export/rygel-media-export-metadata-extractor.c
+++ b/src/media-export/rygel-media-export-metadata-extractor.c
@@ -33,10 +33,6 @@
G_DEFINE_TYPE (RygelMediaExportMetadataExtractor, rygel_media_export_metadata_extractor, G_TYPE_OBJECT)
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define _g_free0(var) (var = (g_free (var), NULL))
-
struct _RygelMediaExportMetadataExtractorPrivate {
GUPnPDLNADiscoverer* discoverer;
GeeHashMap* file_hash;
@@ -66,7 +62,7 @@ RygelMediaExportMetadataExtractor* rygel_media_export_metadata_extractor_constru
GError * _inner_error_ = NULL;
self = (RygelMediaExportMetadataExtractor*) g_object_new (object_type, NULL);
_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
- _g_object_unref0 (self->priv->file_hash);
+ g_object_unref (self->priv->file_hash);
self->priv->file_hash = _tmp0_;
_tmp1_ = rygel_meta_config_get_default ();
config = _tmp1_;
@@ -87,11 +83,11 @@ RygelMediaExportMetadataExtractor* rygel_media_export_metadata_extractor_constru
_error_ = _inner_error_;
_inner_error_ = NULL;
self->priv->extract_metadata = TRUE;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally22:
if (_inner_error_ != NULL) {
- _g_object_unref0 (config);
+ g_object_unref (config);
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 NULL;
@@ -99,7 +95,7 @@ RygelMediaExportMetadataExtractor* rygel_media_export_metadata_extractor_constru
_tmp4_ = self->priv->extract_metadata;
if (_tmp4_) {
}
- _g_object_unref0 (config);
+ g_object_unref (config);
return self;
}
@@ -145,7 +141,7 @@ void rygel_media_export_metadata_extractor_extract (RygelMediaExportMetadataExtr
gst_timeout = (GstClockTime) (_tmp6_ * GST_SECOND);
_tmp7_ = gst_timeout;
_tmp8_ = gupnp_dlna_discoverer_new (_tmp7_, TRUE, TRUE);
- _g_object_unref0 (self->priv->discoverer);
+ g_object_unref (self->priv->discoverer);
self->priv->discoverer = _tmp8_;
_tmp9_ = self->priv->discoverer;
g_signal_connect_object (_tmp9_, "done", (GCallback) _rygel_media_export_metadata_extractor_on_done_gupnp_dlna_discoverer_done, self, 0);
@@ -154,7 +150,7 @@ void rygel_media_export_metadata_extractor_extract (RygelMediaExportMetadataExtr
_tmp11_ = self->priv->discoverer;
_tmp12_ = uri;
gupnp_dlna_discoverer_discover_uri (_tmp11_, _tmp12_);
- _g_free0 (uri);
+ g_free (uri);
} else {
GFile* _tmp13_;
_tmp13_ = file;
@@ -190,7 +186,7 @@ static void rygel_media_export_metadata_extractor_on_done (RygelMediaExportMetad
_tmp0_ = self->priv->discoverer;
g_signal_parse_name ("done", GUPNP_TYPE_DLNA_DISCOVERER, &_tmp1_, NULL, FALSE);
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _rygel_media_export_metadata_extractor_on_done_gupnp_dlna_discoverer_done, self);
- _g_object_unref0 (self->priv->discoverer);
+ g_object_unref (self->priv->discoverer);
self->priv->discoverer = NULL;
_tmp2_ = self->priv->file_hash;
_tmp3_ = dlna;
@@ -211,7 +207,7 @@ static void rygel_media_export_metadata_extractor_on_done (RygelMediaExportMetad
_tmp12_ = gst_discoverer_info_get_uri (_tmp11_);
g_warning ("rygel-media-export-metadata-extractor.vala:96: File %s already handled" \
", ignoring event", _tmp12_);
- _g_object_unref0 (file);
+ g_object_unref (file);
return;
}
_tmp13_ = self->priv->file_hash;
@@ -233,7 +229,7 @@ static void rygel_media_export_metadata_extractor_on_done (RygelMediaExportMetad
_tmp24_ = _tmp23_;
g_debug ("rygel-media-export-metadata-extractor.vala:105: Extraction timed out o" \
"n %s", _tmp24_);
- _g_free0 (_tmp24_);
+ g_free (_tmp24_);
dlna = NULL;
} else {
GUPnPDLNAInformation* _tmp25_;
@@ -250,22 +246,16 @@ static void rygel_media_export_metadata_extractor_on_done (RygelMediaExportMetad
_tmp29_ = file;
_tmp30_ = err;
g_signal_emit_by_name (self, "error", _tmp29_, _tmp30_);
- _g_object_unref0 (file);
+ g_object_unref (file);
return;
}
}
_tmp31_ = file;
_tmp32_ = dlna;
rygel_media_export_metadata_extractor_extract_basic_information (self, _tmp31_, _tmp32_);
- _g_object_unref0 (file);
+ g_object_unref (file);
}
-
-static gpointer _g_error_copy0 (gpointer self) {
- return self ? g_error_copy (self) : NULL;
-}
-
-
static void rygel_media_export_metadata_extractor_extract_basic_information (RygelMediaExportMetadataExtractor* self, GFile* file, GUPnPDLNAInformation* dlna) {
GError * _inner_error_ = NULL;
g_return_if_fail (self != NULL);
@@ -284,7 +274,7 @@ static void rygel_media_export_metadata_extractor_extract_basic_information (Ryg
if (_inner_error_ != NULL) {
goto __catch24_g_error;
}
- _g_object_unref0 (file_info);
+ g_object_unref (file_info);
file_info = _tmp2_;
}
goto __finally24;
@@ -306,25 +296,25 @@ static void rygel_media_export_metadata_extractor_extract_basic_information (Ryg
_tmp5_ = g_file_get_uri (_tmp4_);
_tmp6_ = _tmp5_;
g_warning (_tmp3_, _tmp6_);
- _g_free0 (_tmp6_);
+ g_free (_tmp6_);
_tmp7_ = file;
_tmp8_ = _error_;
g_signal_emit_by_name (self, "error", _tmp7_, _tmp8_);
_tmp9_ = _error_;
- _tmp10_ = _g_error_copy0 (_tmp9_);
+ _tmp10_ = g_error_copy (_tmp9_);
_inner_error_ = _tmp10_;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
goto __finally24;
}
__finally24:
if (_inner_error_ != NULL) {
- _g_object_unref0 (file_info);
+ g_object_unref (file_info);
goto __catch23_g_error;
}
_tmp11_ = file;
_tmp12_ = dlna;
g_signal_emit_by_name (self, "extraction-done", _tmp11_, _tmp12_, file_info);
- _g_object_unref0 (file_info);
+ g_object_unref (file_info);
}
goto __finally23;
__catch23_g_error:
@@ -346,11 +336,11 @@ static void rygel_media_export_metadata_extractor_extract_basic_information (Ryg
_tmp17_ = _tmp16_->message;
g_debug ("rygel-media-export-metadata-extractor.vala:147: Failed to extract basi" \
"c metadata from %s: %s", _tmp15_, _tmp17_);
- _g_free0 (_tmp15_);
+ g_free (_tmp15_);
_tmp18_ = file;
_tmp19_ = _error_;
g_signal_emit_by_name (self, "error", _tmp18_, _tmp19_);
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally23:
if (_inner_error_ != NULL) {
@@ -422,8 +412,8 @@ static void rygel_media_export_metadata_extractor_init (RygelMediaExportMetadata
static void rygel_media_export_metadata_extractor_finalize (GObject* obj) {
RygelMediaExportMetadataExtractor * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_MEDIA_EXPORT_TYPE_METADATA_EXTRACTOR, RygelMediaExportMetadataExtractor);
- _g_object_unref0 (self->priv->discoverer);
- _g_object_unref0 (self->priv->file_hash);
+ g_object_unref (self->priv->discoverer);
+ g_object_unref (self->priv->file_hash);
G_OBJECT_CLASS (rygel_media_export_metadata_extractor_parent_class)->finalize (obj);
}
diff --git a/src/media-export/rygel-media-export-music-item.c b/src/media-export/rygel-media-export-music-item.c
index 0c3497f..a68922c 100644
--- a/src/media-export/rygel-media-export-music-item.c
+++ b/src/media-export/rygel-media-export-music-item.c
@@ -29,8 +29,6 @@ static void rygel_media_export_music_item_rygel_updatable_object_interface_init
G_DEFINE_TYPE_WITH_CODE (RygelMediaExportMusicItem, rygel_media_export_music_item, RYGEL_TYPE_MUSIC_ITEM,
G_IMPLEMENT_INTERFACE (RYGEL_TYPE_UPDATABLE_OBJECT, rygel_media_export_music_item_rygel_updatable_object_interface_init))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-
typedef struct _RygelMediaExportMusicItemCommitData RygelMediaExportMusicItemCommitData;
struct _RygelMediaExportMusicItemCommitData {
@@ -85,16 +83,10 @@ RygelMediaExportMusicItem* rygel_media_export_music_item_new (const gchar* id, R
static void rygel_media_export_music_item_real_commit_data_free (gpointer _data) {
RygelMediaExportMusicItemCommitData* _data_;
_data_ = _data;
- _g_object_unref0 (_data_->self);
+ g_object_unref (_data_->self);
g_slice_free (RygelMediaExportMusicItemCommitData, _data_);
}
-
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
-
static void rygel_media_export_music_item_real_commit (RygelUpdatableObject* base, GAsyncReadyCallback _callback_, gpointer _user_data_) {
RygelMediaExportMusicItem * self;
RygelMediaExportMusicItemCommitData* _data_;
@@ -103,7 +95,7 @@ static void rygel_media_export_music_item_real_commit (RygelUpdatableObject* bas
_data_ = g_slice_new0 (RygelMediaExportMusicItemCommitData);
_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, rygel_media_export_music_item_real_commit);
g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, rygel_media_export_music_item_real_commit_data_free);
- _tmp0_ = _g_object_ref0 (self);
+ _tmp0_ = g_object_ref (self);
_data_->self = _tmp0_;
rygel_media_export_music_item_real_commit_co (_data_);
}
@@ -145,7 +137,7 @@ static gboolean rygel_media_export_music_item_real_commit_co (RygelMediaExportMu
if (_data_->_inner_error_ != NULL) {
g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
g_error_free (_data_->_inner_error_);
- _g_object_unref0 (_data_->cache);
+ g_object_unref (_data_->cache);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -154,7 +146,7 @@ static gboolean rygel_media_export_music_item_real_commit_co (RygelMediaExportMu
g_object_unref (_data_->_async_result);
return FALSE;
}
- _g_object_unref0 (_data_->cache);
+ g_object_unref (_data_->cache);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
diff --git a/src/media-export/rygel-media-export-node-query-container.c b/src/media-export/rygel-media-export-node-query-container.c
index af75216..8a9442b 100644
--- a/src/media-export/rygel-media-export-node-query-container.c
+++ b/src/media-export/rygel-media-export-node-query-container.c
@@ -72,10 +72,6 @@ typedef struct _RygelMediaExportQueryContainerPrivate RygelMediaExportQueryConta
typedef struct _RygelMediaExportNodeQueryContainer RygelMediaExportNodeQueryContainer;
typedef struct _RygelMediaExportNodeQueryContainerClass RygelMediaExportNodeQueryContainerClass;
typedef struct _RygelMediaExportNodeQueryContainerPrivate RygelMediaExportNodeQueryContainerPrivate;
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
#define RYGEL_MEDIA_EXPORT_TYPE_QUERY_CONTAINER_FACTORY (rygel_media_export_query_container_factory_get_type ())
#define RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RYGEL_MEDIA_EXPORT_TYPE_QUERY_CONTAINER_FACTORY, RygelMediaExportQueryContainerFactory))
@@ -228,11 +224,11 @@ RygelMediaExportNodeQueryContainer* rygel_media_export_node_query_container_cons
self = (RygelMediaExportNodeQueryContainer*) rygel_media_export_query_container_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_);
_tmp4_ = template;
_tmp5_ = g_strdup (_tmp4_);
- _g_free0 (self->priv->template);
+ g_free (self->priv->template);
self->priv->template = _tmp5_;
_tmp6_ = attribute;
_tmp7_ = g_strdup (_tmp6_);
- _g_free0 (self->priv->attribute);
+ g_free (self->priv->attribute);
self->priv->attribute = _tmp7_;
{
gint _tmp8_ = 0;
@@ -250,7 +246,7 @@ RygelMediaExportNodeQueryContainer* rygel_media_export_node_query_container_cons
GError* _error_ = NULL;
_error_ = _inner_error_;
_inner_error_ = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally41:
if (_inner_error_ != NULL) {
@@ -270,19 +266,13 @@ RygelMediaExportNodeQueryContainer* rygel_media_export_node_query_container_new
static void rygel_media_export_node_query_container_real_get_children_data_free (gpointer _data) {
RygelMediaExportNodeQueryContainerGetChildrenData* _data_;
_data_ = _data;
- _g_free0 (_data_->sort_criteria);
- _g_object_unref0 (_data_->cancellable);
- _g_object_unref0 (_data_->result);
- _g_object_unref0 (_data_->self);
+ g_free (_data_->sort_criteria);
+ g_object_unref (_data_->cancellable);
+ g_object_unref (_data_->result);
+ g_object_unref (_data_->self);
g_slice_free (RygelMediaExportNodeQueryContainerGetChildrenData, _data_);
}
-
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
-
static void rygel_media_export_node_query_container_real_get_children (RygelMediaContainer* base, guint offset, guint max_count, const gchar* sort_criteria, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_) {
RygelMediaExportNodeQueryContainer * self;
RygelMediaExportNodeQueryContainerGetChildrenData* _data_;
@@ -297,7 +287,7 @@ static void rygel_media_export_node_query_container_real_get_children (RygelMedi
_data_ = g_slice_new0 (RygelMediaExportNodeQueryContainerGetChildrenData);
_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, rygel_media_export_node_query_container_real_get_children);
g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, rygel_media_export_node_query_container_real_get_children_data_free);
- _tmp0_ = _g_object_ref0 (self);
+ _tmp0_ = g_object_ref (self);
_data_->self = _tmp0_;
_tmp1_ = offset;
_data_->offset = _tmp1_;
@@ -305,11 +295,11 @@ static void rygel_media_export_node_query_container_real_get_children (RygelMedi
_data_->max_count = _tmp2_;
_tmp3_ = sort_criteria;
_tmp4_ = g_strdup (_tmp3_);
- _g_free0 (_data_->sort_criteria);
+ g_free (_data_->sort_criteria);
_data_->sort_criteria = _tmp4_;
_tmp5_ = cancellable;
- _tmp6_ = _g_object_ref0 (_tmp5_);
- _g_object_unref0 (_data_->cancellable);
+ _tmp6_ = g_object_ref (_tmp5_);
+ g_object_unref (_data_->cancellable);
_data_->cancellable = _tmp6_;
rygel_media_export_node_query_container_real_get_children_co (_data_);
}
@@ -350,7 +340,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_tmp2_ = _tmp1_;
_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
_tmp4_ = _tmp3_;
- _g_free0 (_tmp2_);
+ g_free (_tmp2_);
regex = _tmp4_;
if (_inner_error_ != NULL) {
if (_inner_error_->domain == G_REGEX_ERROR) {
@@ -365,17 +355,17 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_tmp7_ = g_regex_replace_literal (_tmp5_, self, (gssize) (-1), 0, _tmp6_, 0, &_inner_error_);
_tmp8_ = _tmp7_;
if (_inner_error_ != NULL) {
- _g_regex_unref0 (regex);
+ g_regex_unref (regex);
if (_inner_error_->domain == G_REGEX_ERROR) {
goto __catch42_g_regex_error;
}
- _g_regex_unref0 (regex);
+ g_regex_unref (regex);
g_critical ("file %s: line %d: unexpected 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 NULL;
}
result = _tmp8_;
- _g_regex_unref0 (regex);
+ g_regex_unref (regex);
return result;
}
goto __finally42;
@@ -385,7 +375,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
e = _inner_error_;
_inner_error_ = NULL;
g_assert_not_reached ();
- _g_error_free0 (e);
+ g_error_free (e);
}
__finally42:
if (_inner_error_ != NULL) {
@@ -417,7 +407,7 @@ static gboolean rygel_media_export_node_query_container_real_get_children_co (Ry
if (_data_->_inner_error_ != NULL) {
g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
g_error_free (_data_->_inner_error_);
- _g_object_unref0 (_data_->children);
+ g_object_unref (_data_->children);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -427,7 +417,7 @@ static gboolean rygel_media_export_node_query_container_real_get_children_co (Ry
return FALSE;
}
{
- _data_->_tmp7_ = _g_object_ref0 (_data_->data);
+ _data_->_tmp7_ = g_object_ref (_data_->data);
_data_->_meta_data_list = _data_->_tmp7_;
_data_->_tmp8_ = _data_->_meta_data_list;
_data_->_tmp9_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp8_);
@@ -455,7 +445,7 @@ static gboolean rygel_media_export_node_query_container_real_get_children_co (Ry
_data_->_tmp20_ = _data_->new_id;
_data_->_tmp21_ = NULL;
_data_->_tmp21_ = string_replace (_data_->_tmp19_, "%s", _data_->_tmp20_);
- _g_free0 (_data_->new_id);
+ g_free (_data_->new_id);
_data_->new_id = _data_->_tmp21_;
_data_->_tmp22_ = NULL;
_data_->_tmp22_ = rygel_media_export_query_container_factory_get_default ();
@@ -471,15 +461,15 @@ static gboolean rygel_media_export_node_query_container_real_get_children_co (Ry
((RygelMediaObject*) _data_->_tmp28_)->parent = (RygelMediaContainer*) _data_->self;
_data_->_tmp29_ = _data_->container;
gee_abstract_collection_add ((GeeAbstractCollection*) _data_->children, (RygelMediaObject*) _data_->_tmp29_);
- _g_object_unref0 (_data_->container);
- _g_object_unref0 (_data_->factory);
- _g_free0 (_data_->new_id);
- _g_free0 (_data_->meta_data);
+ g_object_unref (_data_->container);
+ g_object_unref (_data_->factory);
+ g_free (_data_->new_id);
+ g_free (_data_->meta_data);
}
- _g_object_unref0 (_data_->_meta_data_list);
+ g_object_unref (_data_->_meta_data_list);
}
_data_->result = _data_->children;
- _g_object_unref0 (_data_->data);
+ g_object_unref (_data_->data);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -487,8 +477,8 @@ static gboolean rygel_media_export_node_query_container_real_get_children_co (Ry
}
g_object_unref (_data_->_async_result);
return FALSE;
- _g_object_unref0 (_data_->data);
- _g_object_unref0 (_data_->children);
+ g_object_unref (_data_->data);
+ g_object_unref (_data_->children);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -541,7 +531,7 @@ static gint rygel_media_export_node_query_container_real_count_children (RygelMe
_tmp9_ = gee_collection_get_size ((GeeCollection*) _tmp8_);
_tmp10_ = _tmp9_;
result = _tmp10_;
- _g_object_unref0 (data);
+ g_object_unref (data);
return result;
}
@@ -564,8 +554,8 @@ static void rygel_media_export_node_query_container_init (RygelMediaExportNodeQu
static void rygel_media_export_node_query_container_finalize (GObject* obj) {
RygelMediaExportNodeQueryContainer * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_MEDIA_EXPORT_TYPE_NODE_QUERY_CONTAINER, RygelMediaExportNodeQueryContainer);
- _g_free0 (self->priv->template);
- _g_free0 (self->priv->attribute);
+ g_free (self->priv->template);
+ g_free (self->priv->attribute);
G_OBJECT_CLASS (rygel_media_export_node_query_container_parent_class)->finalize (obj);
}
diff --git a/src/media-export/rygel-media-export-null-container.c b/src/media-export/rygel-media-export-null-container.c
index 6167c84..982cbde 100644
--- a/src/media-export/rygel-media-export-null-container.c
+++ b/src/media-export/rygel-media-export-null-container.c
@@ -85,19 +85,13 @@ RygelMediaExportNullContainer* rygel_media_export_null_container_new (void) {
static void rygel_media_export_null_container_real_get_children_data_free (gpointer _data) {
RygelMediaExportNullContainerGetChildrenData* _data_;
_data_ = _data;
- _g_free0 (_data_->sort_criteria);
- _g_object_unref0 (_data_->cancellable);
- _g_object_unref0 (_data_->result);
- _g_object_unref0 (_data_->self);
+ g_free (_data_->sort_criteria);
+ g_object_unref (_data_->cancellable);
+ g_object_unref (_data_->result);
+ g_object_unref (_data_->self);
g_slice_free (RygelMediaExportNullContainerGetChildrenData, _data_);
}
-
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
-
static void rygel_media_export_null_container_real_get_children (RygelMediaContainer* base, guint offset, guint max_count, const gchar* sort_criteria, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_) {
RygelMediaExportNullContainer * self;
RygelMediaExportNullContainerGetChildrenData* _data_;
@@ -112,7 +106,7 @@ static void rygel_media_export_null_container_real_get_children (RygelMediaConta
_data_ = g_slice_new0 (RygelMediaExportNullContainerGetChildrenData);
_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, rygel_media_export_null_container_real_get_children);
g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, rygel_media_export_null_container_real_get_children_data_free);
- _tmp0_ = _g_object_ref0 (self);
+ _tmp0_ = g_object_ref (self);
_data_->self = _tmp0_;
_tmp1_ = offset;
_data_->offset = _tmp1_;
@@ -120,11 +114,11 @@ static void rygel_media_export_null_container_real_get_children (RygelMediaConta
_data_->max_count = _tmp2_;
_tmp3_ = sort_criteria;
_tmp4_ = g_strdup (_tmp3_);
- _g_free0 (_data_->sort_criteria);
+ g_free (_data_->sort_criteria);
_data_->sort_criteria = _tmp4_;
_tmp5_ = cancellable;
- _tmp6_ = _g_object_ref0 (_tmp5_);
- _g_object_unref0 (_data_->cancellable);
+ _tmp6_ = g_object_ref (_tmp5_);
+ g_object_unref (_data_->cancellable);
_data_->cancellable = _tmp6_;
rygel_media_export_null_container_real_get_children_co (_data_);
}
@@ -173,10 +167,10 @@ static gboolean rygel_media_export_null_container_real_get_children_co (RygelMed
static void rygel_media_export_null_container_real_find_object_data_free (gpointer _data) {
RygelMediaExportNullContainerFindObjectData* _data_;
_data_ = _data;
- _g_free0 (_data_->id);
- _g_object_unref0 (_data_->cancellable);
- _g_object_unref0 (_data_->result);
- _g_object_unref0 (_data_->self);
+ g_free (_data_->id);
+ g_object_unref (_data_->cancellable);
+ g_object_unref (_data_->result);
+ g_object_unref (_data_->self);
g_slice_free (RygelMediaExportNullContainerFindObjectData, _data_);
}
@@ -193,15 +187,15 @@ static void rygel_media_export_null_container_real_find_object (RygelMediaContai
_data_ = g_slice_new0 (RygelMediaExportNullContainerFindObjectData);
_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, rygel_media_export_null_container_real_find_object);
g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, rygel_media_export_null_container_real_find_object_data_free);
- _tmp0_ = _g_object_ref0 (self);
+ _tmp0_ = g_object_ref (self);
_data_->self = _tmp0_;
_tmp1_ = id;
_tmp2_ = g_strdup (_tmp1_);
- _g_free0 (_data_->id);
+ g_free (_data_->id);
_data_->id = _tmp2_;
_tmp3_ = cancellable;
- _tmp4_ = _g_object_ref0 (_tmp3_);
- _g_object_unref0 (_data_->cancellable);
+ _tmp4_ = g_object_ref (_tmp3_);
+ g_object_unref (_data_->cancellable);
_data_->cancellable = _tmp4_;
rygel_media_export_null_container_real_find_object_co (_data_);
}
diff --git a/src/media-export/rygel-media-export-object-factory.c b/src/media-export/rygel-media-export-object-factory.c
index b87f5da..349427f 100644
--- a/src/media-export/rygel-media-export-object-factory.c
+++ b/src/media-export/rygel-media-export-object-factory.c
@@ -60,7 +60,6 @@ typedef struct _RygelMediaExportMediaCacheClass RygelMediaExportMediaCacheClass;
typedef struct _RygelMediaExportDBContainer RygelMediaExportDBContainer;
typedef struct _RygelMediaExportDBContainerClass RygelMediaExportDBContainerClass;
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
#define RYGEL_MEDIA_EXPORT_TYPE_ROOT_CONTAINER (rygel_media_export_root_container_get_type ())
#define RYGEL_MEDIA_EXPORT_ROOT_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RYGEL_MEDIA_EXPORT_TYPE_ROOT_CONTAINER, RygelMediaExportRootContainer))
@@ -71,7 +70,6 @@ typedef struct _RygelMediaExportDBContainerClass RygelMediaExportDBContainerClas
typedef struct _RygelMediaExportRootContainer RygelMediaExportRootContainer;
typedef struct _RygelMediaExportRootContainerClass RygelMediaExportRootContainerClass;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define RYGEL_MEDIA_EXPORT_TYPE_QUERY_CONTAINER_FACTORY (rygel_media_export_query_container_factory_get_type ())
#define RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RYGEL_MEDIA_EXPORT_TYPE_QUERY_CONTAINER_FACTORY, RygelMediaExportQueryContainerFactory))
@@ -225,7 +223,7 @@ static RygelMediaExportDBContainer* rygel_media_export_object_factory_real_get_c
_error_ = _inner_error_;
_inner_error_ = NULL;
g_assert_not_reached ();
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally60:
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 +248,7 @@ static RygelMediaExportDBContainer* rygel_media_export_object_factory_real_get_c
_tmp6_ = root_container;
_tmp7_ = rygel_media_export_root_container_get_filesystem_container (_tmp6_);
result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, RYGEL_MEDIA_EXPORT_TYPE_DB_CONTAINER) ? ((RygelMediaExportDBContainer*) _tmp7_) : NULL;
- _g_object_unref0 (root_container);
+ g_object_unref (root_container);
return result;
}
goto __finally61;
@@ -260,7 +258,7 @@ static RygelMediaExportDBContainer* rygel_media_export_object_factory_real_get_c
_error_ = _inner_error_;
_inner_error_ = NULL;
g_assert_not_reached ();
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally61:
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);
@@ -286,7 +284,7 @@ static RygelMediaExportDBContainer* rygel_media_export_object_factory_real_get_c
_tmp14_ = title;
_tmp15_ = rygel_media_export_query_container_factory_create_from_id (_tmp11_, _tmp12_, _tmp13_, _tmp14_);
result = (RygelMediaExportDBContainer*) _tmp15_;
- _g_object_unref0 (factory);
+ g_object_unref (factory);
return result;
}
_tmp16_ = uri;
diff --git a/src/media-export/rygel-media-export-photo-item.c b/src/media-export/rygel-media-export-photo-item.c
index 8e86f1c..e2f0e5c 100644
--- a/src/media-export/rygel-media-export-photo-item.c
+++ b/src/media-export/rygel-media-export-photo-item.c
@@ -29,8 +29,6 @@ static void rygel_media_export_photo_item_rygel_updatable_object_interface_init
G_DEFINE_TYPE_WITH_CODE (RygelMediaExportPhotoItem, rygel_media_export_photo_item, RYGEL_TYPE_PHOTO_ITEM,
G_IMPLEMENT_INTERFACE (RYGEL_TYPE_UPDATABLE_OBJECT, rygel_media_export_photo_item_rygel_updatable_object_interface_init))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-
typedef struct _RygelMediaExportPhotoItemCommitData RygelMediaExportPhotoItemCommitData;
struct _RygelMediaExportPhotoItemCommitData {
@@ -83,16 +81,10 @@ RygelMediaExportPhotoItem* rygel_media_export_photo_item_new (const gchar* id, R
static void rygel_media_export_photo_item_real_commit_data_free (gpointer _data) {
RygelMediaExportPhotoItemCommitData* _data_;
_data_ = _data;
- _g_object_unref0 (_data_->self);
+ g_object_unref (_data_->self);
g_slice_free (RygelMediaExportPhotoItemCommitData, _data_);
}
-
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
-
static void rygel_media_export_photo_item_real_commit (RygelUpdatableObject* base, GAsyncReadyCallback _callback_, gpointer _user_data_) {
RygelMediaExportPhotoItem * self;
RygelMediaExportPhotoItemCommitData* _data_;
@@ -101,7 +93,7 @@ static void rygel_media_export_photo_item_real_commit (RygelUpdatableObject* bas
_data_ = g_slice_new0 (RygelMediaExportPhotoItemCommitData);
_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, rygel_media_export_photo_item_real_commit);
g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, rygel_media_export_photo_item_real_commit_data_free);
- _tmp0_ = _g_object_ref0 (self);
+ _tmp0_ = g_object_ref (self);
_data_->self = _tmp0_;
rygel_media_export_photo_item_real_commit_co (_data_);
}
@@ -143,7 +135,7 @@ static gboolean rygel_media_export_photo_item_real_commit_co (RygelMediaExportPh
if (_data_->_inner_error_ != NULL) {
g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
g_error_free (_data_->_inner_error_);
- _g_object_unref0 (_data_->cache);
+ g_object_unref (_data_->cache);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -152,7 +144,7 @@ static gboolean rygel_media_export_photo_item_real_commit_co (RygelMediaExportPh
g_object_unref (_data_->_async_result);
return FALSE;
}
- _g_object_unref0 (_data_->cache);
+ g_object_unref (_data_->cache);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
diff --git a/src/media-export/rygel-media-export-plugin.c b/src/media-export/rygel-media-export-plugin.c
index a0203e7..c00f591 100644
--- a/src/media-export/rygel-media-export-plugin.c
+++ b/src/media-export/rygel-media-export-plugin.c
@@ -61,10 +61,6 @@ static void _____lambda8__g_object_notify (GObject* _sender, GParamSpec* pspec,
* Simple plugin which exposes the media contents of a directory via UPnP.
*
*/
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
static Block1Data* block1_data_ref (Block1Data* _data1_) {
g_atomic_int_inc (&_data1_->_ref_count_);
@@ -76,8 +72,8 @@ static void block1_data_unref (void * _userdata_) {
Block1Data* _data1_;
_data1_ = (Block1Data*) _userdata_;
if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
- _g_object_unref0 (_data1_->plugin);
- _g_object_unref0 (_data1_->loader);
+ g_object_unref (_data1_->plugin);
+ g_object_unref (_data1_->loader);
g_slice_free (Block1Data, _data1_);
}
}
@@ -113,7 +109,7 @@ static gboolean __lambda7_ (Block1Data* _data1_) {
_tmp2_ = _tmp1_;
_tmp3_ = gee_iterable_iterator ((GeeIterable*) _tmp2_);
_tmp4_ = _tmp3_;
- _g_object_unref0 (_tmp2_);
+ g_object_unref (_tmp2_);
_loaded_plugin_it = _tmp4_;
while (TRUE) {
GeeIterator* _tmp5_;
@@ -134,9 +130,9 @@ static gboolean __lambda7_ (Block1Data* _data1_) {
_tmp9_ = loaded_plugin;
_tmp10_ = _data1_->plugin;
on_plugin_available (_tmp9_, (RygelPlugin*) _tmp10_);
- _g_object_unref0 (loaded_plugin);
+ g_object_unref (loaded_plugin);
}
- _g_object_unref0 (_loaded_plugin_it);
+ g_object_unref (_loaded_plugin_it);
}
_tmp11_ = _data1_->loader;
g_signal_connect_data (_tmp11_, "plugin-available", (GCallback) ___lambda9__rygel_plugin_loader_plugin_available, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
@@ -165,8 +161,8 @@ void module_init (RygelPluginLoader* loader) {
_data1_ = g_slice_new0 (Block1Data);
_data1_->_ref_count_ = 1;
_tmp0_ = loader;
- _tmp1_ = _g_object_ref0 (_tmp0_);
- _g_object_unref0 (_data1_->loader);
+ _tmp1_ = g_object_ref (_tmp0_);
+ g_object_unref (_data1_->loader);
_data1_->loader = _tmp1_;
_tmp2_ = _data1_->loader;
_tmp3_ = rygel_plugin_loader_plugin_disabled (_tmp2_, RYGEL_MEDIA_EXPORT_PLUGIN_NAME);
@@ -185,7 +181,7 @@ void module_init (RygelPluginLoader* loader) {
if (_inner_error_ != NULL) {
goto __catch0_g_error;
}
- _g_object_unref0 (_data1_->plugin);
+ g_object_unref (_data1_->plugin);
_data1_->plugin = _tmp5_;
}
goto __finally0;
@@ -200,7 +196,7 @@ void module_init (RygelPluginLoader* loader) {
_tmp7_ = _tmp6_->message;
g_warning ("rygel-media-export-plugin.vala:43: Failed to initialize plugin '%s': %" \
"s. Ignoring..", RYGEL_MEDIA_EXPORT_PLUGIN_NAME, _tmp7_);
- _g_error_free0 (_error_);
+ g_error_free (_error_);
block1_data_unref (_data1_);
_data1_ = NULL;
return;
@@ -232,8 +228,8 @@ static void block2_data_unref (void * _userdata_) {
Block2Data* _data2_;
_data2_ = (Block2Data*) _userdata_;
if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) {
- _g_object_unref0 (_data2_->plugin);
- _g_object_unref0 (_data2_->our_plugin);
+ g_object_unref (_data2_->plugin);
+ g_object_unref (_data2_->our_plugin);
g_slice_free (Block2Data, _data2_);
}
}
@@ -280,12 +276,12 @@ void on_plugin_available (RygelPlugin* plugin, RygelPlugin* our_plugin) {
_data2_ = g_slice_new0 (Block2Data);
_data2_->_ref_count_ = 1;
_tmp0_ = plugin;
- _tmp1_ = _g_object_ref0 (_tmp0_);
- _g_object_unref0 (_data2_->plugin);
+ _tmp1_ = g_object_ref (_tmp0_);
+ g_object_unref (_data2_->plugin);
_data2_->plugin = _tmp1_;
_tmp2_ = our_plugin;
- _tmp3_ = _g_object_ref0 (_tmp2_);
- _g_object_unref0 (_data2_->our_plugin);
+ _tmp3_ = g_object_ref (_tmp2_);
+ g_object_unref (_data2_->our_plugin);
_data2_->our_plugin = _tmp3_;
_tmp4_ = _data2_->plugin;
_tmp5_ = rygel_plugin_get_name (_tmp4_);
@@ -375,7 +371,7 @@ void shutdown_media_export (void) {
_tmp2_ = rygel_configuration_get_bool ((RygelConfiguration*) _tmp1_, "MediaExport", "enabled", &_inner_error_);
enabled = _tmp2_;
if (_inner_error_ != NULL) {
- _g_object_unref0 (config);
+ g_object_unref (config);
goto __catch1_g_error;
}
_tmp3_ = enabled;
@@ -387,15 +383,15 @@ void shutdown_media_export (void) {
_tmp4_ = rygel_media_export_root_container_get_instance (&_inner_error_);
_tmp5_ = _tmp4_;
if (_inner_error_ != NULL) {
- _g_object_unref0 (config);
+ g_object_unref (config);
goto __catch1_g_error;
}
root = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, RYGEL_MEDIA_EXPORT_TYPE_ROOT_CONTAINER) ? ((RygelMediaExportRootContainer*) _tmp5_) : NULL;
_tmp6_ = root;
rygel_media_export_root_container_shutdown (_tmp6_);
- _g_object_unref0 (root);
+ g_object_unref (root);
}
- _g_object_unref0 (config);
+ g_object_unref (config);
}
goto __finally1;
__catch1_g_error:
@@ -403,7 +399,7 @@ void shutdown_media_export (void) {
GError* _error_ = NULL;
_error_ = _inner_error_;
_inner_error_ = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally1:
if (_inner_error_ != NULL) {
@@ -424,12 +420,12 @@ RygelMediaExportPlugin* rygel_media_export_plugin_construct (GType object_type,
_tmp1_ = _tmp0_;
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (self);
+ g_object_unref (self);
return NULL;
}
_tmp2_ = _tmp1_;
self = (RygelMediaExportPlugin*) rygel_media_server_plugin_construct (object_type, _tmp2_, RYGEL_MEDIA_EXPORT_PLUGIN_NAME, NULL, RYGEL_PLUGIN_CAPABILITIES_UPLOAD);
- _g_object_unref0 (_tmp2_);
+ g_object_unref (_tmp2_);
return self;
}
diff --git a/src/media-export/rygel-media-export-query-container-factory.c b/src/media-export/rygel-media-export-query-container-factory.c
index 90a3ab4..4100c07 100644
--- a/src/media-export/rygel-media-export-query-container-factory.c
+++ b/src/media-export/rygel-media-export-query-container-factory.c
@@ -40,10 +40,6 @@
typedef struct _RygelMediaExportQueryContainerFactory RygelMediaExportQueryContainerFactory;
typedef struct _RygelMediaExportQueryContainerFactoryClass RygelMediaExportQueryContainerFactoryClass;
typedef struct _RygelMediaExportQueryContainerFactoryPrivate RygelMediaExportQueryContainerFactoryPrivate;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
#define RYGEL_MEDIA_EXPORT_TYPE_MEDIA_CACHE (rygel_media_export_media_cache_get_type ())
#define RYGEL_MEDIA_EXPORT_MEDIA_CACHE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RYGEL_MEDIA_EXPORT_TYPE_MEDIA_CACHE, RygelMediaExportMediaCache))
@@ -94,7 +90,7 @@ typedef struct _RygelMediaExportLeafQueryContainerClass RygelMediaExportLeafQuer
typedef struct _RygelMediaExportNodeQueryContainer RygelMediaExportNodeQueryContainer;
typedef struct _RygelMediaExportNodeQueryContainerClass RygelMediaExportNodeQueryContainerClass;
-#define _rygel_search_expression_unref0(var) ((var == NULL) ? NULL : (var = (rygel_search_expression_unref (var), NULL)))
+#define rygel_search_expression_unref(var) ((var == NULL) ? NULL : (var = (rygel_search_expression_unref (var), NULL)))
struct _RygelMediaExportQueryContainerFactory {
GObject parent_instance;
@@ -145,11 +141,6 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
static gint _vala_array_length (gpointer array);
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
-
RygelMediaExportQueryContainerFactory* rygel_media_export_query_container_factory_get_default (void) {
RygelMediaExportQueryContainerFactory* result = NULL;
RygelMediaExportQueryContainerFactory* _tmp0_;
@@ -161,11 +152,11 @@ RygelMediaExportQueryContainerFactory* rygel_media_export_query_container_factor
if (_tmp1_) {
RygelMediaExportQueryContainerFactory* _tmp2_;
_tmp2_ = rygel_media_export_query_container_factory_new ();
- _g_object_unref0 (rygel_media_export_query_container_factory_instance);
+ g_object_unref (rygel_media_export_query_container_factory_instance);
rygel_media_export_query_container_factory_instance = _tmp2_;
}
_tmp3_ = rygel_media_export_query_container_factory_instance;
- _tmp4_ = _g_object_ref0 (_tmp3_);
+ _tmp4_ = g_object_ref (_tmp3_);
result = _tmp4_;
return result;
}
@@ -176,7 +167,7 @@ static RygelMediaExportQueryContainerFactory* rygel_media_export_query_container
GeeHashMap* _tmp0_;
self = (RygelMediaExportQueryContainerFactory*) g_object_new (object_type, NULL);
_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
- _g_object_unref0 (self->priv->virtual_container_map);
+ g_object_unref (self->priv->virtual_container_map);
self->priv->virtual_container_map = _tmp0_;
return self;
}
@@ -228,9 +219,9 @@ void rygel_media_export_query_container_factory_register_id (RygelMediaExportQue
}
_tmp10_ = md5;
_tmp11_ = g_strconcat (RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX, _tmp10_, NULL);
- _g_free0 (*id);
+ g_free (*id);
*id = _tmp11_;
- _g_free0 (md5);
+ g_free (md5);
}
@@ -264,7 +255,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_tmp2_ = _tmp1_;
_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
_tmp4_ = _tmp3_;
- _g_free0 (_tmp2_);
+ g_free (_tmp2_);
regex = _tmp4_;
if (_inner_error_ != NULL) {
if (_inner_error_->domain == G_REGEX_ERROR) {
@@ -279,17 +270,17 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_tmp7_ = g_regex_replace_literal (_tmp5_, self, (gssize) (-1), 0, _tmp6_, 0, &_inner_error_);
_tmp8_ = _tmp7_;
if (_inner_error_ != NULL) {
- _g_regex_unref0 (regex);
+ g_regex_unref (regex);
if (_inner_error_->domain == G_REGEX_ERROR) {
goto __catch40_g_regex_error;
}
- _g_regex_unref0 (regex);
+ g_regex_unref (regex);
g_critical ("file %s: line %d: unexpected 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 NULL;
}
result = _tmp8_;
- _g_regex_unref0 (regex);
+ g_regex_unref (regex);
return result;
}
goto __finally40;
@@ -299,7 +290,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
e = _inner_error_;
_inner_error_ = NULL;
g_assert_not_reached ();
- _g_error_free0 (e);
+ g_error_free (e);
}
__finally40:
if (_inner_error_ != NULL) {
@@ -325,7 +316,7 @@ gchar* rygel_media_export_query_container_factory_get_virtual_container_definiti
_tmp2_ = self->priv->virtual_container_map;
_tmp3_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp2_, id);
result = (gchar*) _tmp3_;
- _g_free0 (id);
+ g_free (id);
return result;
}
@@ -362,7 +353,7 @@ RygelMediaExportQueryContainer* rygel_media_export_query_container_factory_creat
_tmp2_ = definition;
if (_tmp2_ == NULL) {
result = NULL;
- _g_free0 (definition);
+ g_free (definition);
return result;
}
_tmp3_ = cache;
@@ -370,7 +361,7 @@ RygelMediaExportQueryContainer* rygel_media_export_query_container_factory_creat
_tmp5_ = name;
_tmp6_ = rygel_media_export_query_container_factory_create_from_description (self, _tmp3_, _tmp4_, _tmp5_);
result = _tmp6_;
- _g_free0 (definition);
+ g_free (definition);
return result;
}
@@ -425,11 +416,11 @@ RygelMediaExportQueryContainer* rygel_media_export_query_container_factory_creat
rygel_media_export_query_container_factory_register_id (self, &id);
_tmp4_ = definition;
_tmp8_ = rygel_media_export_query_container_factory_parse_description (self, _tmp4_, &_tmp5_, &_tmp6_, &_tmp7_, &title);
- _g_free0 (pattern);
+ g_free (pattern);
pattern = _tmp5_;
- _g_free0 (attribute);
+ g_free (attribute);
attribute = _tmp6_;
- _g_free0 (upnp_class);
+ g_free (upnp_class);
upnp_class = _tmp7_;
expression = _tmp8_;
_tmp10_ = pattern;
@@ -452,7 +443,7 @@ RygelMediaExportQueryContainer* rygel_media_export_query_container_factory_creat
_tmp15_ = id;
_tmp16_ = title;
_tmp17_ = rygel_media_export_leaf_query_container_new (_tmp13_, _tmp14_, _tmp15_, _tmp16_);
- _g_object_unref0 (container);
+ g_object_unref (container);
container = (RygelMediaExportQueryContainer*) _tmp17_;
} else {
RygelMediaExportMediaCache* _tmp18_;
@@ -469,7 +460,7 @@ RygelMediaExportQueryContainer* rygel_media_export_query_container_factory_creat
_tmp22_ = pattern;
_tmp23_ = attribute;
_tmp24_ = rygel_media_export_node_query_container_new (_tmp18_, _tmp19_, _tmp20_, _tmp21_, _tmp22_, _tmp23_);
- _g_object_unref0 (container);
+ g_object_unref (container);
container = (RygelMediaExportQueryContainer*) _tmp24_;
}
_tmp25_ = upnp_class;
@@ -488,12 +479,12 @@ RygelMediaExportQueryContainer* rygel_media_export_query_container_factory_creat
}
}
result = container;
- _rygel_search_expression_unref0 (expression);
- _g_free0 (id);
- _g_free0 (upnp_class);
- _g_free0 (pattern);
- _g_free0 (attribute);
- _g_free0 (title);
+ rygel_search_expression_unref (expression);
+ g_free (id);
+ g_free (upnp_class);
+ g_free (pattern);
+ g_free (attribute);
+ g_free (title);
return result;
}
@@ -604,11 +595,11 @@ static RygelSearchExpression* rygel_media_export_query_container_factory_parse_d
_args_size_ = args_length1;
_tmp3_ = _rygel_search_expression_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (NULL, RYGEL_TYPE_SEARCH_EXPRESSION) ? ((RygelSearchExpression*) NULL) : NULL);
expression = _tmp3_;
- _g_free0 (_vala_pattern);
+ g_free (_vala_pattern);
_vala_pattern = NULL;
- _g_free0 (_vala_attribute);
+ g_free (_vala_attribute);
_vala_attribute = NULL;
- _g_free0 (_vala_upnp_class);
+ g_free (_vala_upnp_class);
_vala_upnp_class = NULL;
i = 0;
while (TRUE) {
@@ -644,11 +635,11 @@ static RygelSearchExpression* rygel_media_export_query_container_factory_parse_d
_tmp9_ = i;
_tmp10_ = _tmp8_[_tmp9_];
_tmp11_ = string_replace (_tmp10_, RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_PREFIX, "");
- _g_free0 (_vala_attribute);
+ g_free (_vala_attribute);
_vala_attribute = _tmp11_;
_tmp12_ = _vala_attribute;
_tmp13_ = g_uri_unescape_string (_tmp12_, NULL);
- _g_free0 (_vala_attribute);
+ g_free (_vala_attribute);
_vala_attribute = _tmp13_;
_tmp14_ = args;
_tmp14__length1 = args_length1;
@@ -683,7 +674,7 @@ static RygelSearchExpression* rygel_media_export_query_container_factory_parse_d
gchar* _tmp26_ = NULL;
_tmp25_ = _vala_attribute;
_tmp26_ = rygel_media_export_query_container_factory_map_upnp_class (self, _tmp25_);
- _g_free0 (_vala_upnp_class);
+ g_free (_vala_upnp_class);
_vala_upnp_class = _tmp26_;
}
} else {
@@ -704,17 +695,17 @@ static RygelSearchExpression* rygel_media_export_query_container_factory_parse_d
_tmp27__length1 = args_length1;
_tmp28_ = i;
_tmp29_ = g_strdup ("%s");
- _g_free0 (_tmp27_[_tmp28_ + 1]);
+ g_free (_tmp27_[_tmp28_ + 1]);
_tmp27_[_tmp28_ + 1] = _tmp29_;
_tmp30_ = _tmp27_[_tmp28_ + 1];
_tmp31_ = args;
_tmp31__length1 = args_length1;
_tmp32_ = g_strjoinv (",", _tmp31_);
- _g_free0 (_vala_pattern);
+ g_free (_vala_pattern);
_vala_pattern = _tmp32_;
_tmp33_ = previous_attribute;
_tmp34_ = rygel_media_export_query_container_factory_map_upnp_class (self, _tmp33_);
- _g_free0 (_vala_upnp_class);
+ g_free (_vala_upnp_class);
_vala_upnp_class = _tmp34_;
_tmp36_ = *name;
if (g_strcmp0 (_tmp36_, "") == 0) {
@@ -736,32 +727,32 @@ static RygelSearchExpression* rygel_media_export_query_container_factory_parse_d
_tmp40_ = i;
_tmp41_ = _tmp39_[_tmp40_ - 1];
_tmp42_ = g_uri_unescape_string (_tmp41_, NULL);
- _g_free0 (*name);
+ g_free (*name);
*name = _tmp42_;
}
- _g_free0 (previous_attribute);
+ g_free (previous_attribute);
break;
}
_tmp43_ = i;
i = _tmp43_ + 2;
- _g_free0 (previous_attribute);
+ g_free (previous_attribute);
}
result = expression;
args = (_vala_array_free (args, args_length1, (GDestroyNotify) g_free), NULL);
if (pattern) {
*pattern = _vala_pattern;
} else {
- _g_free0 (_vala_pattern);
+ g_free (_vala_pattern);
}
if (attribute) {
*attribute = _vala_attribute;
} else {
- _g_free0 (_vala_attribute);
+ g_free (_vala_attribute);
}
if (upnp_class) {
*upnp_class = _vala_upnp_class;
} else {
- _g_free0 (_vala_upnp_class);
+ g_free (_vala_upnp_class);
}
return result;
}
@@ -801,14 +792,14 @@ static void rygel_media_export_query_container_factory_update_search_expression
_tmp3_ = subexpression;
_tmp4_ = clean_key;
_tmp5_ = g_uri_unescape_string (_tmp4_, NULL);
- _g_free0 (((RygelSearchExpression*) _tmp3_)->operand1);
+ g_free (((RygelSearchExpression*) _tmp3_)->operand1);
((RygelSearchExpression*) _tmp3_)->operand1 = _tmp5_;
_tmp6_ = subexpression;
((RygelSearchExpression*) _tmp6_)->op = (gpointer) ((gintptr) GUPNP_SEARCH_CRITERIA_OP_EQ);
_tmp7_ = subexpression;
_tmp8_ = value;
_tmp9_ = g_uri_unescape_string (_tmp8_, NULL);
- _g_free0 (((RygelSearchExpression*) _tmp7_)->operand2);
+ g_free (((RygelSearchExpression*) _tmp7_)->operand2);
((RygelSearchExpression*) _tmp7_)->operand2 = _tmp9_;
_tmp10_ = *expression;
if (_tmp10_ != NULL) {
@@ -828,30 +819,30 @@ static void rygel_media_export_query_container_factory_update_search_expression
_tmp12_ = conjunction;
_tmp13_ = *expression;
_tmp14_ = _rygel_search_expression_ref0 (_tmp13_);
- _rygel_search_expression_unref0 (((RygelSearchExpression*) _tmp12_)->operand1);
+ rygel_search_expression_unref (((RygelSearchExpression*) _tmp12_)->operand1);
((RygelSearchExpression*) _tmp12_)->operand1 = _tmp14_;
_tmp15_ = conjunction;
_tmp16_ = subexpression;
_tmp17_ = _rygel_search_expression_ref0 ((RygelSearchExpression*) _tmp16_);
- _rygel_search_expression_unref0 (((RygelSearchExpression*) _tmp15_)->operand2);
+ rygel_search_expression_unref (((RygelSearchExpression*) _tmp15_)->operand2);
((RygelSearchExpression*) _tmp15_)->operand2 = _tmp17_;
_tmp18_ = conjunction;
((RygelSearchExpression*) _tmp18_)->op = (gpointer) ((gintptr) RYGEL_LOGICAL_OPERATOR_AND);
_tmp19_ = conjunction;
_tmp20_ = _rygel_search_expression_ref0 ((RygelSearchExpression*) _tmp19_);
- _rygel_search_expression_unref0 (*expression);
+ rygel_search_expression_unref (*expression);
*expression = _tmp20_;
- _rygel_search_expression_unref0 (conjunction);
+ rygel_search_expression_unref (conjunction);
} else {
RygelRelationalExpression* _tmp21_;
RygelSearchExpression* _tmp22_;
_tmp21_ = subexpression;
_tmp22_ = _rygel_search_expression_ref0 ((RygelSearchExpression*) _tmp21_);
- _rygel_search_expression_unref0 (*expression);
+ rygel_search_expression_unref (*expression);
*expression = _tmp22_;
}
- _g_free0 (clean_key);
- _rygel_search_expression_unref0 (subexpression);
+ g_free (clean_key);
+ rygel_search_expression_unref (subexpression);
}
@@ -870,7 +861,7 @@ static void rygel_media_export_query_container_factory_init (RygelMediaExportQue
static void rygel_media_export_query_container_factory_finalize (GObject* obj) {
RygelMediaExportQueryContainerFactory * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_MEDIA_EXPORT_TYPE_QUERY_CONTAINER_FACTORY, RygelMediaExportQueryContainerFactory);
- _g_object_unref0 (self->priv->virtual_container_map);
+ g_object_unref (self->priv->virtual_container_map);
G_OBJECT_CLASS (rygel_media_export_query_container_factory_parent_class)->finalize (obj);
}
diff --git a/src/media-export/rygel-media-export-query-container.c b/src/media-export/rygel-media-export-query-container.c
index 191ae53..a488b69 100644
--- a/src/media-export/rygel-media-export-query-container.c
+++ b/src/media-export/rygel-media-export-query-container.c
@@ -23,10 +23,7 @@
G_DEFINE_TYPE (RygelMediaExportQueryContainer, rygel_media_export_query_container, RYGEL_MEDIA_EXPORT_TYPE_DB_CONTAINER)
-#define _rygel_search_expression_unref0(var) ((var == NULL) ? NULL : (var = (rygel_search_expression_unref (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+#define rygel_search_expression_unref(var) ((var == NULL) ? NULL : (var = (rygel_search_expression_unref (var), NULL)))
typedef struct _RygelMediaExportQueryContainerSearchData RygelMediaExportQueryContainerSearchData;
@@ -111,7 +108,7 @@ RygelMediaExportQueryContainer* rygel_media_export_query_container_construct (GT
self = (RygelMediaExportQueryContainer*) rygel_media_export_db_container_construct (object_type, _tmp0_, _tmp1_, _tmp2_);
_tmp3_ = expression;
_tmp4_ = _rygel_search_expression_ref0 (_tmp3_);
- _rygel_search_expression_unref0 (self->expression);
+ rygel_search_expression_unref (self->expression);
self->expression = _tmp4_;
{
gint _tmp5_ = 0;
@@ -130,7 +127,7 @@ RygelMediaExportQueryContainer* rygel_media_export_query_container_construct (GT
_error_ = _inner_error_;
_inner_error_ = NULL;
((RygelMediaContainer*) self)->child_count = 0;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally38:
if (_inner_error_ != NULL) {
@@ -145,20 +142,15 @@ RygelMediaExportQueryContainer* rygel_media_export_query_container_construct (GT
static void rygel_media_export_query_container_real_search_data_free (gpointer _data) {
RygelMediaExportQueryContainerSearchData* _data_;
_data_ = _data;
- _rygel_search_expression_unref0 (_data_->expression);
- _g_free0 (_data_->sort_criteria);
- _g_object_unref0 (_data_->cancellable);
- _g_object_unref0 (_data_->result);
- _g_object_unref0 (_data_->self);
+ rygel_search_expression_unref (_data_->expression);
+ g_free (_data_->sort_criteria);
+ g_object_unref (_data_->cancellable);
+ g_object_unref (_data_->result);
+ g_object_unref (_data_->self);
g_slice_free (RygelMediaExportQueryContainerSearchData, _data_);
}
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
-
static void rygel_media_export_query_container_real_search (RygelMediaExportDBContainer* base, RygelSearchExpression* expression, guint offset, guint max_count, const gchar* sort_criteria, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_) {
RygelMediaExportQueryContainer * self;
RygelMediaExportQueryContainerSearchData* _data_;
@@ -175,11 +167,11 @@ static void rygel_media_export_query_container_real_search (RygelMediaExportDBCo
_data_ = g_slice_new0 (RygelMediaExportQueryContainerSearchData);
_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, rygel_media_export_query_container_real_search);
g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, rygel_media_export_query_container_real_search_data_free);
- _tmp0_ = _g_object_ref0 (self);
+ _tmp0_ = g_object_ref (self);
_data_->self = _tmp0_;
_tmp1_ = expression;
_tmp2_ = _rygel_search_expression_ref0 (_tmp1_);
- _rygel_search_expression_unref0 (_data_->expression);
+ rygel_search_expression_unref (_data_->expression);
_data_->expression = _tmp2_;
_tmp3_ = offset;
_data_->offset = _tmp3_;
@@ -187,11 +179,11 @@ static void rygel_media_export_query_container_real_search (RygelMediaExportDBCo
_data_->max_count = _tmp4_;
_tmp5_ = sort_criteria;
_tmp6_ = g_strdup (_tmp5_);
- _g_free0 (_data_->sort_criteria);
+ g_free (_data_->sort_criteria);
_data_->sort_criteria = _tmp6_;
_tmp7_ = cancellable;
- _tmp8_ = _g_object_ref0 (_tmp7_);
- _g_object_unref0 (_data_->cancellable);
+ _tmp8_ = g_object_ref (_tmp7_);
+ g_object_unref (_data_->cancellable);
_data_->cancellable = _tmp8_;
rygel_media_export_query_container_real_search_co (_data_);
}
@@ -212,12 +204,6 @@ static RygelMediaObjects* rygel_media_export_query_container_real_search_finish
return result;
}
-
-static gpointer _g_error_copy0 (gpointer self) {
- return self ? g_error_copy (self) : NULL;
-}
-
-
static gboolean rygel_media_export_query_container_real_search_co (RygelMediaExportQueryContainerSearchData* _data_) {
switch (_data_->_state_) {
case 0:
@@ -231,7 +217,7 @@ static gboolean rygel_media_export_query_container_real_search_co (RygelMediaExp
if (_data_->_tmp0_ == NULL) {
_data_->_tmp1_ = _data_->self->expression;
_data_->_tmp2_ = _rygel_search_expression_ref0 (_data_->_tmp1_);
- _rygel_search_expression_unref0 (_data_->combined_expression);
+ rygel_search_expression_unref (_data_->combined_expression);
_data_->combined_expression = _data_->_tmp2_;
} else {
_data_->_tmp3_ = rygel_logical_expression_new ();
@@ -239,20 +225,20 @@ static gboolean rygel_media_export_query_container_real_search_co (RygelMediaExp
_data_->_tmp4_ = _data_->local_expression;
_data_->_tmp5_ = _data_->self->expression;
_data_->_tmp6_ = _rygel_search_expression_ref0 (_data_->_tmp5_);
- _rygel_search_expression_unref0 (((RygelSearchExpression*) _data_->_tmp4_)->operand1);
+ rygel_search_expression_unref (((RygelSearchExpression*) _data_->_tmp4_)->operand1);
((RygelSearchExpression*) _data_->_tmp4_)->operand1 = _data_->_tmp6_;
_data_->_tmp7_ = _data_->local_expression;
((RygelSearchExpression*) _data_->_tmp7_)->op = (gpointer) ((gintptr) RYGEL_LOGICAL_OPERATOR_AND);
_data_->_tmp8_ = _data_->local_expression;
_data_->_tmp9_ = _data_->expression;
_data_->_tmp10_ = _rygel_search_expression_ref0 (_data_->_tmp9_);
- _rygel_search_expression_unref0 (((RygelSearchExpression*) _data_->_tmp8_)->operand2);
+ rygel_search_expression_unref (((RygelSearchExpression*) _data_->_tmp8_)->operand2);
((RygelSearchExpression*) _data_->_tmp8_)->operand2 = _data_->_tmp10_;
_data_->_tmp11_ = _data_->local_expression;
_data_->_tmp12_ = _rygel_search_expression_ref0 ((RygelSearchExpression*) _data_->_tmp11_);
- _rygel_search_expression_unref0 (_data_->combined_expression);
+ rygel_search_expression_unref (_data_->combined_expression);
_data_->combined_expression = _data_->_tmp12_;
- _rygel_search_expression_unref0 (_data_->local_expression);
+ rygel_search_expression_unref (_data_->local_expression);
}
{
_data_->_tmp13_ = ((RygelMediaExportDBContainer*) _data_->self)->media_db;
@@ -271,7 +257,7 @@ static gboolean rygel_media_export_query_container_real_search_co (RygelMediaExp
}
goto __finally39;
}
- _g_object_unref0 (_data_->children);
+ g_object_unref (_data_->children);
_data_->children = _data_->_tmp20_;
}
goto __finally39;
@@ -282,24 +268,24 @@ static gboolean rygel_media_export_query_container_real_search_co (RygelMediaExp
_data_->_tmp21_ = _data_->_error_;
if (g_error_matches (_data_->_tmp21_, RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR, RYGEL_MEDIA_EXPORT_MEDIA_CACHE_ERROR_UNSUPPORTED_SEARCH)) {
_data_->_tmp22_ = rygel_media_objects_new ();
- _g_object_unref0 (_data_->children);
+ g_object_unref (_data_->children);
_data_->children = _data_->_tmp22_;
_data_->total_matches = (guint) 0;
} else {
_data_->_tmp23_ = _data_->_error_;
- _data_->_tmp24_ = _g_error_copy0 (_data_->_tmp23_);
+ _data_->_tmp24_ = g_error_copy (_data_->_tmp23_);
_data_->_inner_error_ = _data_->_tmp24_;
- _g_error_free0 (_data_->_error_);
+ g_error_free (_data_->_error_);
goto __finally39;
}
- _g_error_free0 (_data_->_error_);
+ g_error_free (_data_->_error_);
}
__finally39:
if (_data_->_inner_error_ != NULL) {
g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
g_error_free (_data_->_inner_error_);
- _rygel_search_expression_unref0 (_data_->combined_expression);
- _g_object_unref0 (_data_->children);
+ rygel_search_expression_unref (_data_->combined_expression);
+ g_object_unref (_data_->children);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -309,7 +295,7 @@ static gboolean rygel_media_export_query_container_real_search_co (RygelMediaExp
return FALSE;
}
_data_->result = _data_->children;
- _rygel_search_expression_unref0 (_data_->combined_expression);
+ rygel_search_expression_unref (_data_->combined_expression);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -317,8 +303,8 @@ static gboolean rygel_media_export_query_container_real_search_co (RygelMediaExp
}
g_object_unref (_data_->_async_result);
return FALSE;
- _rygel_search_expression_unref0 (_data_->combined_expression);
- _g_object_unref0 (_data_->children);
+ rygel_search_expression_unref (_data_->combined_expression);
+ g_object_unref (_data_->children);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -357,7 +343,7 @@ static void rygel_media_export_query_container_init (RygelMediaExportQueryContai
static void rygel_media_export_query_container_finalize (GObject* obj) {
RygelMediaExportQueryContainer * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_MEDIA_EXPORT_TYPE_QUERY_CONTAINER, RygelMediaExportQueryContainer);
- _rygel_search_expression_unref0 (self->expression);
+ rygel_search_expression_unref (self->expression);
G_OBJECT_CLASS (rygel_media_export_query_container_parent_class)->finalize (obj);
}
diff --git a/src/media-export/rygel-media-export-recursive-file-monitor.c b/src/media-export/rygel-media-export-recursive-file-monitor.c
index fad79cf..0be16c7 100644
--- a/src/media-export/rygel-media-export-recursive-file-monitor.c
+++ b/src/media-export/rygel-media-export-recursive-file-monitor.c
@@ -27,9 +27,6 @@
G_DEFINE_TYPE (RygelMediaExportRecursiveFileMonitor, rygel_media_export_recursive_file_monitor, G_TYPE_OBJECT)
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define _g_free0(var) (var = (g_free (var), NULL))
typedef struct _RygelMediaExportRecursiveFileMonitorAddData RygelMediaExportRecursiveFileMonitorAddData;
@@ -90,11 +87,6 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_ENUM (GClosure * closure
static void rygel_media_export_recursive_file_monitor_finalize (GObject* obj);
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
-
static void _rygel_media_export_recursive_file_monitor_cancel_g_cancellable_cancelled (GCancellable* _sender, gpointer self) {
rygel_media_export_recursive_file_monitor_cancel (self);
}
@@ -120,11 +112,11 @@ RygelMediaExportRecursiveFileMonitor* rygel_media_export_recursive_file_monitor_
_tmp1_ = rygel_configuration_get_bool ((RygelConfiguration*) config, "MediaExport", "monitor-changes", &_inner_error_);
_tmp2_ = _tmp1_;
if (_inner_error_ != NULL) {
- _g_object_unref0 (config);
+ g_object_unref (config);
goto __catch44_g_error;
}
self->priv->monitor_changes = _tmp2_;
- _g_object_unref0 (config);
+ g_object_unref (config);
}
goto __finally44;
__catch44_g_error:
@@ -133,7 +125,7 @@ RygelMediaExportRecursiveFileMonitor* rygel_media_export_recursive_file_monitor_
_error_ = _inner_error_;
_inner_error_ = NULL;
self->priv->monitor_changes = TRUE;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally44:
if (_inner_error_ != NULL) {
@@ -148,11 +140,11 @@ RygelMediaExportRecursiveFileMonitor* rygel_media_export_recursive_file_monitor_
g_message ("rygel-media-export-recursive-file-monitor.vala:40: %s", _tmp4_);
}
_tmp5_ = cancellable;
- _tmp6_ = _g_object_ref0 (_tmp5_);
- _g_object_unref0 (self->priv->cancellable);
+ _tmp6_ = g_object_ref (_tmp5_);
+ g_object_unref (self->priv->cancellable);
self->priv->cancellable = _tmp6_;
_tmp7_ = gee_hash_map_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_monitor_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, (GeeHashDataFunc) g_file_hash, NULL, NULL, (GeeEqualDataFunc) g_file_equal, NULL, NULL, NULL, NULL, NULL);
- _g_object_unref0 (self->priv->monitors);
+ g_object_unref (self->priv->monitors);
self->priv->monitors = _tmp7_;
_tmp8_ = cancellable;
if (_tmp8_ != NULL) {
@@ -220,7 +212,7 @@ void rygel_media_export_recursive_file_monitor_on_monitor_changed (RygelMediaExp
_tmp11_ = _tmp10_;
g_debug ("rygel-media-export-recursive-file-monitor.vala:64: Folder %s gone; rem" \
"oving watch", _tmp11_);
- _g_free0 (_tmp11_);
+ g_free (_tmp11_);
_tmp12_ = self->priv->monitors;
_tmp13_ = file;
gee_abstract_map_unset ((GeeAbstractMap*) _tmp12_, _tmp13_, NULL);
@@ -230,7 +222,7 @@ void rygel_media_export_recursive_file_monitor_on_monitor_changed (RygelMediaExp
g_signal_parse_name ("changed", g_file_monitor_get_type (), &_tmp16_, NULL, FALSE);
g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _rygel_media_export_recursive_file_monitor_on_monitor_changed_g_file_monitor_changed, self);
}
- _g_object_unref0 (file_monitor);
+ g_object_unref (file_monitor);
break;
}
default:
@@ -244,8 +236,8 @@ void rygel_media_export_recursive_file_monitor_on_monitor_changed (RygelMediaExp
static void rygel_media_export_recursive_file_monitor_add_data_free (gpointer _data) {
RygelMediaExportRecursiveFileMonitorAddData* _data_;
_data_ = _data;
- _g_object_unref0 (_data_->file);
- _g_object_unref0 (_data_->self);
+ g_object_unref (_data_->file);
+ g_object_unref (_data_->self);
g_slice_free (RygelMediaExportRecursiveFileMonitorAddData, _data_);
}
@@ -258,11 +250,11 @@ void rygel_media_export_recursive_file_monitor_add (RygelMediaExportRecursiveFil
_data_ = g_slice_new0 (RygelMediaExportRecursiveFileMonitorAddData);
_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, rygel_media_export_recursive_file_monitor_add);
g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, rygel_media_export_recursive_file_monitor_add_data_free);
- _tmp0_ = _g_object_ref0 (self);
+ _tmp0_ = g_object_ref (self);
_data_->self = _tmp0_;
_tmp1_ = file;
- _tmp2_ = _g_object_ref0 (_tmp1_);
- _g_object_unref0 (_data_->file);
+ _tmp2_ = g_object_ref (_tmp1_);
+ g_object_unref (_data_->file);
_data_->file = _tmp2_;
rygel_media_export_recursive_file_monitor_add_co (_data_);
}
@@ -335,7 +327,7 @@ static gboolean rygel_media_export_recursive_file_monitor_add_co (RygelMediaExpo
_data_->_tmp12_ = g_file_monitor_directory (_data_->_tmp10_, G_FILE_MONITOR_NONE, _data_->_tmp11_, &_data_->_inner_error_);
_data_->file_monitor = _data_->_tmp12_;
if (_data_->_inner_error_ != NULL) {
- _g_object_unref0 (_data_->info);
+ g_object_unref (_data_->info);
goto __catch45_g_error;
}
_data_->_tmp13_ = _data_->self->priv->monitors;
@@ -344,9 +336,9 @@ static gboolean rygel_media_export_recursive_file_monitor_add_co (RygelMediaExpo
gee_abstract_map_set ((GeeAbstractMap*) _data_->_tmp13_, _data_->_tmp14_, _data_->_tmp15_);
_data_->_tmp16_ = _data_->file_monitor;
g_signal_connect_object (_data_->_tmp16_, "changed", (GCallback) _rygel_media_export_recursive_file_monitor_on_monitor_changed_g_file_monitor_changed, _data_->self, 0);
- _g_object_unref0 (_data_->file_monitor);
+ g_object_unref (_data_->file_monitor);
}
- _g_object_unref0 (_data_->info);
+ g_object_unref (_data_->info);
}
goto __finally45;
__catch45_g_error:
@@ -360,8 +352,8 @@ static gboolean rygel_media_export_recursive_file_monitor_add_co (RygelMediaExpo
_data_->_tmp19_ = g_file_get_uri (_data_->_tmp18_);
_data_->_tmp20_ = _data_->_tmp19_;
g_warning (_data_->_tmp17_, _data_->_tmp20_);
- _g_free0 (_data_->_tmp20_);
- _g_error_free0 (_data_->err);
+ g_free (_data_->_tmp20_);
+ g_error_free (_data_->err);
}
__finally45:
if (_data_->_inner_error_ != NULL) {
@@ -396,7 +388,7 @@ void rygel_media_export_recursive_file_monitor_cancel (RygelMediaExportRecursive
_tmp3_ = _tmp2_;
_tmp4_ = gee_iterable_iterator ((GeeIterable*) _tmp3_);
_tmp5_ = _tmp4_;
- _g_object_unref0 (_tmp3_);
+ g_object_unref (_tmp3_);
_monitor_it = _tmp5_;
while (TRUE) {
GeeIterator* _tmp6_;
@@ -415,9 +407,9 @@ void rygel_media_export_recursive_file_monitor_cancel (RygelMediaExportRecursive
monitor = (GFileMonitor*) _tmp9_;
_tmp10_ = monitor;
g_file_monitor_cancel (_tmp10_);
- _g_object_unref0 (monitor);
+ g_object_unref (monitor);
}
- _g_object_unref0 (_monitor_it);
+ g_object_unref (_monitor_it);
}
_tmp11_ = self->priv->monitors;
gee_abstract_map_clear ((GeeAbstractMap*) _tmp11_);
@@ -460,8 +452,8 @@ static void rygel_media_export_recursive_file_monitor_init (RygelMediaExportRecu
static void rygel_media_export_recursive_file_monitor_finalize (GObject* obj) {
RygelMediaExportRecursiveFileMonitor * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_MEDIA_EXPORT_TYPE_RECURSIVE_FILE_MONITOR, RygelMediaExportRecursiveFileMonitor);
- _g_object_unref0 (self->priv->cancellable);
- _g_object_unref0 (self->priv->monitors);
+ g_object_unref (self->priv->cancellable);
+ g_object_unref (self->priv->monitors);
G_OBJECT_CLASS (rygel_media_export_recursive_file_monitor_parent_class)->finalize (obj);
}
diff --git a/src/media-export/rygel-media-export-root-container.c b/src/media-export/rygel-media-export-root-container.c
index 6cfaa14..de4c12f 100644
--- a/src/media-export/rygel-media-export-root-container.c
+++ b/src/media-export/rygel-media-export-root-container.c
@@ -29,7 +29,6 @@ G_DEFINE_TYPE (RygelMediaExportRootContainer, rygel_media_export_root_container,
#define RYGEL_MEDIA_EXPORT_TYPE_FOLDER_DEFINITION (rygel_media_export_folder_definition_get_type ())
typedef struct _RygelMediaExportFolderDefinition RygelMediaExportFolderDefinition;
-#define _g_free0(var) (var = (g_free (var), NULL))
#define RYGEL_MEDIA_EXPORT_TYPE_DBUS_SERVICE (rygel_media_export_dbus_service_get_type ())
#define RYGEL_MEDIA_EXPORT_DBUS_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RYGEL_MEDIA_EXPORT_TYPE_DBUS_SERVICE, RygelMediaExportDBusService))
@@ -50,7 +49,6 @@ typedef struct _RygelMediaExportDBusServiceClass RygelMediaExportDBusServiceClas
typedef struct _RygelMediaExportHarvester RygelMediaExportHarvester;
typedef struct _RygelMediaExportHarvesterClass RygelMediaExportHarvesterClass;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define RYGEL_TYPE_NULL_CONTAINER (rygel_null_container_get_type ())
#define RYGEL_NULL_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RYGEL_TYPE_NULL_CONTAINER, RygelNullContainer))
@@ -61,7 +59,6 @@ typedef struct _RygelMediaExportHarvesterClass RygelMediaExportHarvesterClass;
typedef struct _RygelNullContainer RygelNullContainer;
typedef struct _RygelNullContainerClass RygelNullContainerClass;
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
#define RYGEL_MEDIA_EXPORT_TYPE_QUERY_CONTAINER_FACTORY (rygel_media_export_query_container_factory_get_type ())
#define RYGEL_MEDIA_EXPORT_QUERY_CONTAINER_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RYGEL_MEDIA_EXPORT_TYPE_QUERY_CONTAINER_FACTORY, RygelMediaExportQueryContainerFactory))
@@ -83,9 +80,9 @@ typedef struct _RygelMediaExportQueryContainerFactoryClass RygelMediaExportQuery
typedef struct _RygelMediaExportQueryContainer RygelMediaExportQueryContainer;
typedef struct _RygelMediaExportQueryContainerClass RygelMediaExportQueryContainerClass;
typedef struct _RygelMediaExportRootContainerFindObjectData RygelMediaExportRootContainerFindObjectData;
-#define _rygel_search_expression_unref0(var) ((var == NULL) ? NULL : (var = (rygel_search_expression_unref (var), NULL)))
+#define rygel_search_expression_unref(var) ((var == NULL) ? NULL : (var = (rygel_search_expression_unref (var), NULL)))
typedef struct _RygelMediaExportRootContainerSearchData RygelMediaExportRootContainerSearchData;
-#define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
+#define g_regex_unref(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
struct _RygelMediaExportFolderDefinition {
gchar* title;
@@ -295,18 +292,18 @@ void rygel_media_export_folder_definition_copy (const RygelMediaExportFolderDefi
gchar* _tmp3_;
_tmp0_ = (*self).title;
_tmp1_ = g_strdup (_tmp0_);
- _g_free0 ((*dest).title);
+ g_free ((*dest).title);
(*dest).title = _tmp1_;
_tmp2_ = (*self).definition;
_tmp3_ = g_strdup (_tmp2_);
- _g_free0 ((*dest).definition);
+ g_free ((*dest).definition);
(*dest).definition = _tmp3_;
}
void rygel_media_export_folder_definition_destroy (RygelMediaExportFolderDefinition* self) {
- _g_free0 ((*self).title);
- _g_free0 ((*self).definition);
+ g_free ((*self).title);
+ g_free ((*self).definition);
}
@@ -334,17 +331,6 @@ GType rygel_media_export_folder_definition_get_type (void) {
return rygel_media_export_folder_definition_type_id__volatile;
}
-
-static gpointer _g_error_copy0 (gpointer self) {
- return self ? g_error_copy (self) : NULL;
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
-
RygelMediaContainer* rygel_media_export_root_container_get_instance (GError** error) {
RygelMediaContainer* result = NULL;
RygelMediaContainer* _tmp0_;
@@ -361,7 +347,7 @@ RygelMediaContainer* rygel_media_export_root_container_get_instance (GError** er
if (_inner_error_ != NULL) {
goto __catch26_g_error;
}
- _g_object_unref0 (rygel_media_export_root_container_instance);
+ g_object_unref (rygel_media_export_root_container_instance);
rygel_media_export_root_container_instance = (RygelMediaContainer*) _tmp2_;
}
goto __finally26;
@@ -374,13 +360,13 @@ RygelMediaContainer* rygel_media_export_root_container_get_instance (GError** er
_error_ = _inner_error_;
_inner_error_ = NULL;
_tmp3_ = rygel_null_container_new ();
- _g_object_unref0 (rygel_media_export_root_container_instance);
+ g_object_unref (rygel_media_export_root_container_instance);
rygel_media_export_root_container_instance = (RygelMediaContainer*) _tmp3_;
_tmp4_ = _error_;
- _tmp5_ = _g_error_copy0 (_tmp4_);
- _g_error_free0 (rygel_media_export_root_container_creation_error);
+ _tmp5_ = g_error_copy (_tmp4_);
+ g_error_free (rygel_media_export_root_container_creation_error);
rygel_media_export_root_container_creation_error = _tmp5_;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally26:
if (_inner_error_ != NULL) {
@@ -394,14 +380,14 @@ RygelMediaContainer* rygel_media_export_root_container_get_instance (GError** er
GError* _tmp7_;
GError* _tmp8_;
_tmp7_ = rygel_media_export_root_container_creation_error;
- _tmp8_ = _g_error_copy0 (_tmp7_);
+ _tmp8_ = g_error_copy (_tmp7_);
_inner_error_ = _tmp8_;
g_propagate_error (error, _inner_error_);
return NULL;
}
}
_tmp9_ = rygel_media_export_root_container_instance;
- _tmp10_ = _g_object_ref0 (_tmp9_);
+ _tmp10_ = g_object_ref (_tmp9_);
result = _tmp10_;
return result;
}
@@ -413,7 +399,7 @@ RygelMediaContainer* rygel_media_export_root_container_get_filesystem_container
RygelMediaContainer* _tmp1_;
g_return_val_if_fail (self != NULL, NULL);
_tmp0_ = self->priv->filesystem_container;
- _tmp1_ = _g_object_ref0 (_tmp0_);
+ _tmp1_ = g_object_ref (_tmp0_);
result = _tmp1_;
return result;
}
@@ -441,7 +427,7 @@ void rygel_media_export_root_container_add_uri (RygelMediaExportRootContainer* s
_tmp2_ = self->priv->harvester;
_tmp3_ = self->priv->filesystem_container;
rygel_media_export_harvester_schedule (_tmp2_, file, _tmp3_, "DBUS");
- _g_object_unref0 (file);
+ g_object_unref (file);
}
@@ -483,18 +469,18 @@ void rygel_media_export_root_container_remove_uri (RygelMediaExportRootContainer
_tmp6_ = _error_;
_tmp7_ = _tmp6_->message;
g_warning (_tmp5_, _tmp7_);
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally27:
if (_inner_error_ != NULL) {
- _g_free0 (id);
- _g_object_unref0 (file);
+ g_free (id);
+ g_object_unref (file);
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;
}
- _g_free0 (id);
- _g_object_unref0 (file);
+ g_free (id);
+ g_object_unref (file);
}
@@ -526,7 +512,7 @@ gchar** rygel_media_export_root_container_get_dynamic_uris (RygelMediaExportRoot
*result_length1 = _tmp4__length1;
}
result = _tmp4_;
- _g_object_unref0 (uris);
+ g_object_unref (uris);
return result;
}
goto __finally28;
@@ -535,7 +521,7 @@ gchar** rygel_media_export_root_container_get_dynamic_uris (RygelMediaExportRoot
GError* _error_ = NULL;
_error_ = _inner_error_;
_inner_error_ = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally28:
if (_inner_error_ != NULL) {
@@ -557,10 +543,10 @@ gchar** rygel_media_export_root_container_get_dynamic_uris (RygelMediaExportRoot
static void rygel_media_export_root_container_real_find_object_data_free (gpointer _data) {
RygelMediaExportRootContainerFindObjectData* _data_;
_data_ = _data;
- _g_free0 (_data_->id);
- _g_object_unref0 (_data_->cancellable);
- _g_object_unref0 (_data_->result);
- _g_object_unref0 (_data_->self);
+ g_free (_data_->id);
+ g_object_unref (_data_->cancellable);
+ g_object_unref (_data_->result);
+ g_object_unref (_data_->self);
g_slice_free (RygelMediaExportRootContainerFindObjectData, _data_);
}
@@ -577,15 +563,15 @@ static void rygel_media_export_root_container_real_find_object (RygelMediaContai
_data_ = g_slice_new0 (RygelMediaExportRootContainerFindObjectData);
_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, rygel_media_export_root_container_real_find_object);
g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, rygel_media_export_root_container_real_find_object_data_free);
- _tmp0_ = _g_object_ref0 (self);
+ _tmp0_ = g_object_ref (self);
_data_->self = _tmp0_;
_tmp1_ = id;
_tmp2_ = g_strdup (_tmp1_);
- _g_free0 (_data_->id);
+ g_free (_data_->id);
_data_->id = _tmp2_;
_tmp3_ = cancellable;
- _tmp4_ = _g_object_ref0 (_tmp3_);
- _g_object_unref0 (_data_->cancellable);
+ _tmp4_ = g_object_ref (_tmp3_);
+ g_object_unref (_data_->cancellable);
_data_->cancellable = _tmp4_;
rygel_media_export_root_container_real_find_object_co (_data_);
}
@@ -668,8 +654,8 @@ static gboolean rygel_media_export_root_container_real_find_object_co (RygelMedi
((RygelMediaObject*) _data_->_tmp13_)->parent = (RygelMediaContainer*) _data_->self;
}
_data_->result = (RygelMediaObject*) _data_->container;
- _g_object_unref0 (_data_->factory);
- _g_object_unref0 (_data_->object);
+ g_object_unref (_data_->factory);
+ g_object_unref (_data_->object);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -686,7 +672,7 @@ static gboolean rygel_media_export_root_container_real_find_object_co (RygelMedi
}
g_object_unref (_data_->_async_result);
return FALSE;
- _g_object_unref0 (_data_->object);
+ g_object_unref (_data_->object);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -700,11 +686,11 @@ static gboolean rygel_media_export_root_container_real_find_object_co (RygelMedi
static void rygel_media_export_root_container_real_search_data_free (gpointer _data) {
RygelMediaExportRootContainerSearchData* _data_;
_data_ = _data;
- _rygel_search_expression_unref0 (_data_->expression);
- _g_free0 (_data_->sort_criteria);
- _g_object_unref0 (_data_->cancellable);
- _g_object_unref0 (_data_->result);
- _g_object_unref0 (_data_->self);
+ rygel_search_expression_unref (_data_->expression);
+ g_free (_data_->sort_criteria);
+ g_object_unref (_data_->cancellable);
+ g_object_unref (_data_->result);
+ g_object_unref (_data_->self);
g_slice_free (RygelMediaExportRootContainerSearchData, _data_);
}
@@ -730,11 +716,11 @@ static void rygel_media_export_root_container_real_search (RygelMediaExportDBCon
_data_ = g_slice_new0 (RygelMediaExportRootContainerSearchData);
_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, rygel_media_export_root_container_real_search);
g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, rygel_media_export_root_container_real_search_data_free);
- _tmp0_ = _g_object_ref0 (self);
+ _tmp0_ = g_object_ref (self);
_data_->self = _tmp0_;
_tmp1_ = expression;
_tmp2_ = _rygel_search_expression_ref0 (_tmp1_);
- _rygel_search_expression_unref0 (_data_->expression);
+ rygel_search_expression_unref (_data_->expression);
_data_->expression = _tmp2_;
_tmp3_ = offset;
_data_->offset = _tmp3_;
@@ -742,11 +728,11 @@ static void rygel_media_export_root_container_real_search (RygelMediaExportDBCon
_data_->max_count = _tmp4_;
_tmp5_ = sort_criteria;
_tmp6_ = g_strdup (_tmp5_);
- _g_free0 (_data_->sort_criteria);
+ g_free (_data_->sort_criteria);
_data_->sort_criteria = _tmp6_;
_tmp7_ = cancellable;
- _tmp8_ = _g_object_ref0 (_tmp7_);
- _g_object_unref0 (_data_->cancellable);
+ _tmp8_ = g_object_ref (_tmp7_);
+ g_object_unref (_data_->cancellable);
_data_->cancellable = _tmp8_;
rygel_media_export_root_container_real_search_co (_data_);
}
@@ -837,20 +823,20 @@ static gboolean rygel_media_export_root_container_real_search_co (RygelMediaExpo
_data_->_tmp12_ = _data_->relational_expression;
_data_->_tmp13_ = NULL;
_data_->_tmp13_ = rygel_media_export_root_container_search_to_virtual_container (_data_->self, _data_->_tmp12_);
- _g_object_unref0 (_data_->query_container);
+ g_object_unref (_data_->query_container);
_data_->query_container = (RygelMediaContainer*) _data_->_tmp13_;
_data_->_tmp14_ = _data_->relational_expression;
_data_->_tmp15_ = ((RygelSearchExpression*) _data_->_tmp14_)->operand2;
_data_->_tmp16_ = g_strdup ((const gchar*) _data_->_tmp15_);
- _g_free0 (_data_->upnp_class);
+ g_free (_data_->upnp_class);
_data_->upnp_class = _data_->_tmp16_;
- _rygel_search_expression_unref0 (_data_->relational_expression);
+ rygel_search_expression_unref (_data_->relational_expression);
} else {
_data_->_tmp17_ = _data_->expression;
_data_->_tmp18_ = NULL;
_data_->_tmp19_ = FALSE;
_data_->_tmp19_ = rygel_media_export_root_container_is_search_in_virtual_container (_data_->self, _data_->_tmp17_, &_data_->_tmp18_);
- _g_object_unref0 (_data_->query_container);
+ g_object_unref (_data_->query_container);
_data_->query_container = _data_->_tmp18_;
if (_data_->_tmp19_) {
}
@@ -872,9 +858,9 @@ static gboolean rygel_media_export_root_container_real_search_co (RygelMediaExpo
if (_data_->_inner_error_ != NULL) {
g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
g_error_free (_data_->_inner_error_);
- _g_free0 (_data_->upnp_class);
- _g_object_unref0 (_data_->query_container);
- _g_object_unref0 (_data_->list);
+ g_free (_data_->upnp_class);
+ g_object_unref (_data_->query_container);
+ g_object_unref (_data_->list);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -883,7 +869,7 @@ static gboolean rygel_media_export_root_container_real_search_co (RygelMediaExpo
g_object_unref (_data_->_async_result);
return FALSE;
}
- _g_object_unref0 (_data_->list);
+ g_object_unref (_data_->list);
_data_->list = _data_->_tmp27_;
_data_->_tmp28_ = _data_->query_container;
_data_->_tmp29_ = _data_->_tmp28_->child_count;
@@ -892,7 +878,7 @@ static gboolean rygel_media_export_root_container_real_search_co (RygelMediaExpo
if (_data_->_tmp30_ != NULL) {
{
_data_->_tmp31_ = _data_->list;
- _data_->_tmp32_ = _g_object_ref0 (_data_->_tmp31_);
+ _data_->_tmp32_ = g_object_ref (_data_->_tmp31_);
_data_->_object_list = _data_->_tmp32_;
_data_->_tmp33_ = _data_->_object_list;
_data_->_tmp34_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_tmp33_);
@@ -915,14 +901,14 @@ static gboolean rygel_media_export_root_container_real_search_co (RygelMediaExpo
_data_->_tmp42_ = _data_->object;
_data_->_tmp43_ = _data_->upnp_class;
rygel_media_object_set_upnp_class (_data_->_tmp42_, _data_->_tmp43_);
- _g_object_unref0 (_data_->object);
+ g_object_unref (_data_->object);
}
- _g_object_unref0 (_data_->_object_list);
+ g_object_unref (_data_->_object_list);
}
}
_data_->result = _data_->list;
- _g_free0 (_data_->upnp_class);
- _g_object_unref0 (_data_->query_container);
+ g_free (_data_->upnp_class);
+ g_object_unref (_data_->query_container);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -948,9 +934,9 @@ static gboolean rygel_media_export_root_container_real_search_co (RygelMediaExpo
if (_data_->_inner_error_ != NULL) {
g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
g_error_free (_data_->_inner_error_);
- _g_free0 (_data_->upnp_class);
- _g_object_unref0 (_data_->query_container);
- _g_object_unref0 (_data_->list);
+ g_free (_data_->upnp_class);
+ g_object_unref (_data_->query_container);
+ g_object_unref (_data_->list);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -960,9 +946,9 @@ static gboolean rygel_media_export_root_container_real_search_co (RygelMediaExpo
return FALSE;
}
_data_->result = _data_->_tmp51_;
- _g_free0 (_data_->upnp_class);
- _g_object_unref0 (_data_->query_container);
- _g_object_unref0 (_data_->list);
+ g_free (_data_->upnp_class);
+ g_object_unref (_data_->query_container);
+ g_object_unref (_data_->list);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -971,9 +957,9 @@ static gboolean rygel_media_export_root_container_real_search_co (RygelMediaExpo
g_object_unref (_data_->_async_result);
return FALSE;
}
- _g_free0 (_data_->upnp_class);
- _g_object_unref0 (_data_->query_container);
- _g_object_unref0 (_data_->list);
+ g_free (_data_->upnp_class);
+ g_object_unref (_data_->query_container);
+ g_object_unref (_data_->list);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -1006,7 +992,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_tmp2_ = _tmp1_;
_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
_tmp4_ = _tmp3_;
- _g_free0 (_tmp2_);
+ g_free (_tmp2_);
regex = _tmp4_;
if (_inner_error_ != NULL) {
if (_inner_error_->domain == G_REGEX_ERROR) {
@@ -1021,17 +1007,17 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_tmp7_ = g_regex_replace_literal (_tmp5_, self, (gssize) (-1), 0, _tmp6_, 0, &_inner_error_);
_tmp8_ = _tmp7_;
if (_inner_error_ != NULL) {
- _g_regex_unref0 (regex);
+ g_regex_unref (regex);
if (_inner_error_->domain == G_REGEX_ERROR) {
goto __catch31_g_regex_error;
}
- _g_regex_unref0 (regex);
+ g_regex_unref (regex);
g_critical ("file %s: line %d: unexpected 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 NULL;
}
result = _tmp8_;
- _g_regex_unref0 (regex);
+ g_regex_unref (regex);
return result;
}
goto __finally31;
@@ -1041,7 +1027,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
e = _inner_error_;
_inner_error_ = NULL;
g_assert_not_reached ();
- _g_error_free0 (e);
+ g_error_free (e);
}
__finally31:
if (_inner_error_ != NULL) {
@@ -1080,7 +1066,7 @@ static GeeArrayList* rygel_media_export_root_container_get_shared_uris (RygelMed
if (_inner_error_ != NULL) {
goto __catch29_g_error;
}
- _g_object_unref0 (uris);
+ g_object_unref (uris);
uris = _tmp2_;
}
goto __finally29;
@@ -1091,15 +1077,15 @@ static GeeArrayList* rygel_media_export_root_container_get_shared_uris (RygelMed
_error_ = _inner_error_;
_inner_error_ = NULL;
_tmp3_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
- _g_object_unref0 (uris);
+ g_object_unref (uris);
uris = _tmp3_;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally29:
if (_inner_error_ != NULL) {
- _g_object_unref0 (config);
- _g_object_unref0 (actual_uris);
- _g_object_unref0 (uris);
+ g_object_unref (config);
+ g_object_unref (actual_uris);
+ g_object_unref (uris);
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 NULL;
@@ -1119,7 +1105,7 @@ static GeeArrayList* rygel_media_export_root_container_get_shared_uris (RygelMed
_tmp7_ = uris;
_tmp8_ = _tmp6_;
gee_array_list_add_all (_tmp7_, (GeeCollection*) _tmp8_);
- _g_object_unref0 (_tmp8_);
+ g_object_unref (_tmp8_);
}
goto __finally30;
__catch30_g_error:
@@ -1127,19 +1113,19 @@ static GeeArrayList* rygel_media_export_root_container_get_shared_uris (RygelMed
GError* _error_ = NULL;
_error_ = _inner_error_;
_inner_error_ = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally30:
if (_inner_error_ != NULL) {
- _g_object_unref0 (config);
- _g_object_unref0 (actual_uris);
- _g_object_unref0 (uris);
+ g_object_unref (config);
+ g_object_unref (actual_uris);
+ g_object_unref (uris);
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 NULL;
}
_tmp9_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
- _g_object_unref0 (actual_uris);
+ g_object_unref (actual_uris);
actual_uris = _tmp9_;
_tmp10_ = g_get_home_dir ();
_tmp11_ = g_file_new_for_path (_tmp10_);
@@ -1160,7 +1146,7 @@ static GeeArrayList* rygel_media_export_root_container_get_shared_uris (RygelMed
gint _uri_size;
gint _uri_index;
_tmp15_ = uris;
- _tmp16_ = _g_object_ref0 (_tmp15_);
+ _tmp16_ = g_object_ref (_tmp15_);
_uri_list = _tmp16_;
_tmp17_ = _uri_list;
_tmp18_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp17_);
@@ -1226,7 +1212,7 @@ static GeeArrayList* rygel_media_export_root_container_get_shared_uris (RygelMed
_tmp35_ = actual_uri;
_tmp36_ = pictures_dir;
_tmp37_ = string_replace (_tmp35_, "@PICTURES@", _tmp36_);
- _g_free0 (actual_uri);
+ g_free (actual_uri);
actual_uri = _tmp37_;
}
_tmp38_ = videos_dir;
@@ -1238,7 +1224,7 @@ static GeeArrayList* rygel_media_export_root_container_get_shared_uris (RygelMed
_tmp40_ = actual_uri;
_tmp41_ = videos_dir;
_tmp42_ = string_replace (_tmp40_, "@VIDEOS@", _tmp41_);
- _g_free0 (actual_uri);
+ g_free (actual_uri);
actual_uri = _tmp42_;
}
_tmp43_ = music_dir;
@@ -1250,35 +1236,35 @@ static GeeArrayList* rygel_media_export_root_container_get_shared_uris (RygelMed
_tmp45_ = actual_uri;
_tmp46_ = music_dir;
_tmp47_ = string_replace (_tmp45_, "@MUSIC@", _tmp46_);
- _g_free0 (actual_uri);
+ g_free (actual_uri);
actual_uri = _tmp47_;
}
_tmp48_ = actual_uri;
_tmp49_ = g_file_new_for_commandline_arg (_tmp48_);
- _g_object_unref0 (file);
+ g_object_unref (file);
file = _tmp49_;
_tmp50_ = file;
_tmp51_ = home_dir;
if (_tmp50_ == _tmp51_) {
- _g_free0 (actual_uri);
- _g_object_unref0 (file);
- _g_free0 (uri);
+ g_free (actual_uri);
+ g_object_unref (file);
+ g_free (uri);
continue;
}
- _g_free0 (actual_uri);
+ g_free (actual_uri);
}
_tmp52_ = actual_uris;
_tmp53_ = file;
gee_abstract_collection_add ((GeeAbstractCollection*) _tmp52_, _tmp53_);
- _g_object_unref0 (file);
- _g_free0 (uri);
+ g_object_unref (file);
+ g_free (uri);
}
- _g_object_unref0 (_uri_list);
+ g_object_unref (_uri_list);
}
result = actual_uris;
- _g_object_unref0 (home_dir);
- _g_object_unref0 (config);
- _g_object_unref0 (uris);
+ g_object_unref (home_dir);
+ g_object_unref (config);
+ g_object_unref (uris);
return result;
}
@@ -1333,7 +1319,7 @@ static RygelMediaExportQueryContainer* rygel_media_export_root_container_search_
gchar* _tmp13_;
_tmp12_ = id;
_tmp13_ = g_strconcat (_tmp12_, "upnp:album,?", NULL);
- _g_free0 (id);
+ g_free (id);
id = _tmp13_;
break;
}
@@ -1346,7 +1332,7 @@ static RygelMediaExportQueryContainer* rygel_media_export_root_container_search_
gchar* _tmp15_;
_tmp14_ = id;
_tmp15_ = g_strconcat (_tmp14_, "dc:creator,?,upnp:album,?", NULL);
- _g_free0 (id);
+ g_free (id);
id = _tmp15_;
break;
}
@@ -1359,7 +1345,7 @@ static RygelMediaExportQueryContainer* rygel_media_export_root_container_search_
gchar* _tmp17_;
_tmp16_ = id;
_tmp17_ = g_strconcat (_tmp16_, "dc:genre,?", NULL);
- _g_free0 (id);
+ g_free (id);
id = _tmp17_;
break;
}
@@ -1369,7 +1355,7 @@ static RygelMediaExportQueryContainer* rygel_media_export_root_container_search_
default:
{
result = NULL;
- _g_free0 (id);
+ g_free (id);
return result;
}
}
@@ -1381,8 +1367,8 @@ static RygelMediaExportQueryContainer* rygel_media_export_root_container_search_
_tmp21_ = id;
_tmp22_ = rygel_media_export_query_container_factory_create_from_description (_tmp19_, _tmp20_, _tmp21_, "");
result = _tmp22_;
- _g_object_unref0 (factory);
- _g_free0 (id);
+ g_object_unref (factory);
+ g_free (id);
return result;
}
result = NULL;
@@ -1457,17 +1443,17 @@ static gboolean rygel_media_export_root_container_is_search_in_virtual_container
g_return_val_if_fail (self != NULL, FALSE);
g_return_val_if_fail (expression != NULL, FALSE);
virtual_expression = NULL;
- _g_object_unref0 (_vala_container);
+ g_object_unref (_vala_container);
_vala_container = NULL;
_tmp0_ = expression;
if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, RYGEL_TYPE_LOGICAL_EXPRESSION)) {
result = FALSE;
- _g_object_unref0 (query_container);
- _rygel_search_expression_unref0 (virtual_expression);
+ g_object_unref (query_container);
+ rygel_search_expression_unref (virtual_expression);
if (container) {
*container = _vala_container;
} else {
- _g_object_unref0 (_vala_container);
+ g_object_unref (_vala_container);
}
return result;
}
@@ -1498,13 +1484,13 @@ static gboolean rygel_media_export_root_container_is_search_in_virtual_container
_tmp12_ = _tmp3_;
if (!_tmp12_) {
result = FALSE;
- _rygel_search_expression_unref0 (logical_expression);
- _g_object_unref0 (query_container);
- _rygel_search_expression_unref0 (virtual_expression);
+ rygel_search_expression_unref (logical_expression);
+ g_object_unref (query_container);
+ rygel_search_expression_unref (virtual_expression);
if (container) {
*container = _vala_container;
} else {
- _g_object_unref0 (_vala_container);
+ g_object_unref (_vala_container);
}
return result;
}
@@ -1518,7 +1504,7 @@ static gboolean rygel_media_export_root_container_is_search_in_virtual_container
right_expression = _tmp18_;
_tmp19_ = left_expression;
_tmp20_ = rygel_media_export_root_container_search_to_virtual_container (self, _tmp19_);
- _g_object_unref0 (query_container);
+ g_object_unref (query_container);
query_container = _tmp20_;
_tmp21_ = query_container;
if (_tmp21_ == NULL) {
@@ -1527,7 +1513,7 @@ static gboolean rygel_media_export_root_container_is_search_in_virtual_container
RygelMediaExportQueryContainer* _tmp24_;
_tmp22_ = right_expression;
_tmp23_ = rygel_media_export_root_container_search_to_virtual_container (self, _tmp22_);
- _g_object_unref0 (query_container);
+ g_object_unref (query_container);
query_container = _tmp23_;
_tmp24_ = query_container;
if (_tmp24_ != NULL) {
@@ -1535,19 +1521,19 @@ static gboolean rygel_media_export_root_container_is_search_in_virtual_container
RygelRelationalExpression* _tmp26_;
_tmp25_ = left_expression;
_tmp26_ = _rygel_search_expression_ref0 (_tmp25_);
- _rygel_search_expression_unref0 (virtual_expression);
+ rygel_search_expression_unref (virtual_expression);
virtual_expression = _tmp26_;
} else {
result = FALSE;
- _rygel_search_expression_unref0 (right_expression);
- _rygel_search_expression_unref0 (left_expression);
- _rygel_search_expression_unref0 (logical_expression);
- _g_object_unref0 (query_container);
- _rygel_search_expression_unref0 (virtual_expression);
+ rygel_search_expression_unref (right_expression);
+ rygel_search_expression_unref (left_expression);
+ rygel_search_expression_unref (logical_expression);
+ g_object_unref (query_container);
+ rygel_search_expression_unref (virtual_expression);
if (container) {
*container = _vala_container;
} else {
- _g_object_unref0 (_vala_container);
+ g_object_unref (_vala_container);
}
return result;
}
@@ -1556,7 +1542,7 @@ static gboolean rygel_media_export_root_container_is_search_in_virtual_container
RygelRelationalExpression* _tmp28_;
_tmp27_ = right_expression;
_tmp28_ = _rygel_search_expression_ref0 (_tmp27_);
- _rygel_search_expression_unref0 (virtual_expression);
+ rygel_search_expression_unref (virtual_expression);
virtual_expression = _tmp28_;
}
_tmp29_ = rygel_media_export_query_container_factory_get_default ();
@@ -1584,23 +1570,23 @@ static gboolean rygel_media_export_root_container_is_search_in_virtual_container
_tmp46_ = ((RygelMediaExportDBContainer*) self)->media_db;
_tmp47_ = new_id;
_tmp48_ = rygel_media_export_query_container_factory_create_from_description (_tmp45_, _tmp46_, _tmp47_, "");
- _g_object_unref0 (_vala_container);
+ g_object_unref (_vala_container);
_vala_container = (RygelMediaContainer*) _tmp48_;
result = TRUE;
- _g_free0 (new_id);
- _g_free0 (escaped_detail);
- _g_free0 (last_argument);
- _g_free0 (plaintext_id);
- _g_object_unref0 (factory);
- _rygel_search_expression_unref0 (right_expression);
- _rygel_search_expression_unref0 (left_expression);
- _rygel_search_expression_unref0 (logical_expression);
- _g_object_unref0 (query_container);
- _rygel_search_expression_unref0 (virtual_expression);
+ g_free (new_id);
+ g_free (escaped_detail);
+ g_free (last_argument);
+ g_free (plaintext_id);
+ g_object_unref (factory);
+ rygel_search_expression_unref (right_expression);
+ rygel_search_expression_unref (left_expression);
+ rygel_search_expression_unref (logical_expression);
+ g_object_unref (query_container);
+ rygel_search_expression_unref (virtual_expression);
if (container) {
*container = _vala_container;
} else {
- _g_object_unref0 (_vala_container);
+ g_object_unref (_vala_container);
}
return result;
}
@@ -1632,13 +1618,13 @@ static RygelMediaExportRootContainer* rygel_media_export_root_container_construc
db = _tmp0_;
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (self);
+ g_object_unref (self);
return NULL;
}
_tmp1_ = _ ("@REALNAME@'s media");
self = (RygelMediaExportRootContainer*) rygel_media_export_db_container_construct (object_type, db, "0", _tmp1_);
_tmp2_ = g_cancellable_new ();
- _g_object_unref0 (self->priv->cancellable);
+ g_object_unref (self->priv->cancellable);
self->priv->cancellable = _tmp2_;
{
RygelMediaExportDBusService* _tmp3_;
@@ -1648,7 +1634,7 @@ static RygelMediaExportRootContainer* rygel_media_export_root_container_construc
if (_inner_error_ != NULL) {
goto __catch32_g_error;
}
- _g_object_unref0 (self->priv->service);
+ g_object_unref (self->priv->service);
self->priv->service = _tmp4_;
}
goto __finally32;
@@ -1664,13 +1650,13 @@ static RygelMediaExportRootContainer* rygel_media_export_root_container_construc
_tmp6_ = err;
_tmp7_ = _tmp6_->message;
g_warning (_tmp5_, _tmp7_);
- _g_error_free0 (err);
+ g_error_free (err);
}
__finally32:
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (db);
- _g_object_unref0 (self);
+ g_object_unref (db);
+ g_object_unref (self);
return NULL;
}
{
@@ -1687,13 +1673,13 @@ static RygelMediaExportRootContainer* rygel_media_export_root_container_construc
GError* _error_ = NULL;
_error_ = _inner_error_;
_inner_error_ = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally33:
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (db);
- _g_object_unref0 (self);
+ g_object_unref (db);
+ g_object_unref (self);
return NULL;
}
{
@@ -1706,7 +1692,7 @@ static RygelMediaExportRootContainer* rygel_media_export_root_container_construc
_tmp9_ = ((RygelMediaExportDBContainer*) self)->media_db;
_tmp10_ = _ (RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_NAME);
_tmp11_ = rygel_media_export_db_container_new (_tmp9_, RYGEL_MEDIA_EXPORT_ROOT_CONTAINER_FILESYSTEM_FOLDER_ID, _tmp10_);
- _g_object_unref0 (self->priv->filesystem_container);
+ g_object_unref (self->priv->filesystem_container);
self->priv->filesystem_container = (RygelMediaContainer*) _tmp11_;
_tmp12_ = self->priv->filesystem_container;
((RygelMediaObject*) _tmp12_)->parent = (RygelMediaContainer*) self;
@@ -1723,13 +1709,13 @@ static RygelMediaExportRootContainer* rygel_media_export_root_container_construc
GError* _error_ = NULL;
_error_ = _inner_error_;
_inner_error_ = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally34:
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (db);
- _g_object_unref0 (self);
+ g_object_unref (db);
+ g_object_unref (self);
return NULL;
}
{
@@ -1743,13 +1729,13 @@ static RygelMediaExportRootContainer* rygel_media_export_root_container_construc
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch35_rygel_media_export_database_error;
}
- _g_object_unref0 (ids);
- _g_object_unref0 (db);
+ g_object_unref (ids);
+ g_object_unref (db);
g_critical ("file %s: line %d: unexpected 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 NULL;
}
- _g_object_unref0 (ids);
+ g_object_unref (ids);
ids = _tmp17_;
}
goto __finally35;
@@ -1760,25 +1746,25 @@ static RygelMediaExportRootContainer* rygel_media_export_root_container_construc
e = _inner_error_;
_inner_error_ = NULL;
_tmp18_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
- _g_object_unref0 (ids);
+ g_object_unref (ids);
ids = _tmp18_;
- _g_error_free0 (e);
+ g_error_free (e);
}
__finally35:
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (ids);
- _g_object_unref0 (db);
- _g_object_unref0 (self);
+ g_object_unref (ids);
+ g_object_unref (db);
+ g_object_unref (self);
return NULL;
}
_tmp19_ = self->priv->cancellable;
_tmp20_ = rygel_media_export_root_container_get_shared_uris (self);
_tmp21_ = _tmp20_;
_tmp22_ = rygel_media_export_harvester_new (_tmp19_, _tmp21_);
- _g_object_unref0 (self->priv->harvester);
+ g_object_unref (self->priv->harvester);
self->priv->harvester = _tmp22_;
- _g_object_unref0 (_tmp21_);
+ g_object_unref (_tmp21_);
_tmp23_ = self->priv->harvester;
_tmp24_ = g_signal_connect_object (_tmp23_, "done", (GCallback) _rygel_media_export_root_container_on_initial_harvesting_done_rygel_media_export_harvester_done, self, 0);
self->priv->harvester_signal_id = _tmp24_;
@@ -1796,7 +1782,7 @@ static RygelMediaExportRootContainer* rygel_media_export_root_container_construc
_tmp25_ = self->priv->harvester;
_tmp26_ = rygel_media_export_harvester_get_locations (_tmp25_);
_tmp27_ = _tmp26_;
- _tmp28_ = _g_object_ref0 (_tmp27_);
+ _tmp28_ = g_object_ref (_tmp27_);
_file_list = _tmp28_;
_tmp29_ = _file_list;
_tmp30_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp29_);
@@ -1834,14 +1820,14 @@ static RygelMediaExportRootContainer* rygel_media_export_root_container_construc
_tmp40_ = rygel_media_export_media_cache_get_id (_tmp39_);
_tmp41_ = _tmp40_;
gee_abstract_collection_remove ((GeeAbstractCollection*) _tmp38_, _tmp41_);
- _g_free0 (_tmp41_);
+ g_free (_tmp41_);
_tmp42_ = self->priv->harvester;
_tmp43_ = file;
_tmp44_ = self->priv->filesystem_container;
rygel_media_export_harvester_schedule (_tmp42_, _tmp43_, _tmp44_, NULL);
- _g_object_unref0 (file);
+ g_object_unref (file);
}
- _g_object_unref0 (_file_list);
+ g_object_unref (_file_list);
}
{
GeeArrayList* _tmp45_;
@@ -1853,7 +1839,7 @@ static RygelMediaExportRootContainer* rygel_media_export_root_container_construc
gint _id_size;
gint _id_index;
_tmp45_ = ids;
- _tmp46_ = _g_object_ref0 (_tmp45_);
+ _tmp46_ = g_object_ref (_tmp45_);
_id_list = _tmp46_;
_tmp47_ = _id_list;
_tmp48_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp47_);
@@ -1893,10 +1879,10 @@ static RygelMediaExportRootContainer* rygel_media_export_root_container_construc
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
goto __catch36_rygel_media_export_database_error;
}
- _g_free0 (id);
- _g_object_unref0 (_id_list);
- _g_object_unref0 (ids);
- _g_object_unref0 (db);
+ g_free (id);
+ g_object_unref (_id_list);
+ g_object_unref (ids);
+ g_object_unref (db);
g_critical ("file %s: line %d: unexpected 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 NULL;
@@ -1915,25 +1901,25 @@ static RygelMediaExportRootContainer* rygel_media_export_root_container_construc
_tmp60_ = _error_;
_tmp61_ = _tmp60_->message;
g_warning (_tmp59_, _tmp61_);
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally36:
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_free0 (id);
- _g_object_unref0 (_id_list);
- _g_object_unref0 (ids);
- _g_object_unref0 (db);
- _g_object_unref0 (self);
+ g_free (id);
+ g_object_unref (_id_list);
+ g_object_unref (ids);
+ g_object_unref (db);
+ g_object_unref (self);
return NULL;
}
- _g_free0 (id);
+ g_free (id);
}
- _g_object_unref0 (_id_list);
+ g_object_unref (_id_list);
}
rygel_media_container_updated ((RygelMediaContainer*) self, NULL, RYGEL_OBJECT_EVENT_TYPE_MODIFIED, FALSE);
- _g_object_unref0 (ids);
- _g_object_unref0 (db);
+ g_object_unref (ids);
+ g_object_unref (db);
return self;
}
@@ -2002,7 +1988,7 @@ static void rygel_media_export_root_container_add_default_virtual_folders (Rygel
GError* _error_ = NULL;
_error_ = _inner_error_;
_inner_error_ = NULL;
- _g_error_free0 (_error_);
+ g_error_free (_error_);
}
__finally37:
if (_inner_error_ != NULL) {
@@ -2125,7 +2111,7 @@ static void rygel_media_export_root_container_add_folder_definition (RygelMediaE
gchar* _tmp7_ = NULL;
_tmp6_ = id;
_tmp7_ = string_slice (_tmp6_, (glong) 0, (glong) (-1));
- _g_free0 (id);
+ g_free (id);
id = _tmp7_;
}
_tmp8_ = rygel_media_export_query_container_factory_get_default ();
@@ -2153,9 +2139,9 @@ static void rygel_media_export_root_container_add_folder_definition (RygelMediaE
rygel_media_export_media_cache_save_container (_tmp20_, (RygelMediaContainer*) _tmp21_, &_inner_error_);
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (query_container);
- _g_object_unref0 (factory);
- _g_free0 (id);
+ g_object_unref (query_container);
+ g_object_unref (factory);
+ g_free (id);
return;
}
} else {
@@ -2166,15 +2152,15 @@ static void rygel_media_export_root_container_add_folder_definition (RygelMediaE
rygel_media_export_media_cache_remove_by_id (_tmp22_, _tmp23_, &_inner_error_);
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (query_container);
- _g_object_unref0 (factory);
- _g_free0 (id);
+ g_object_unref (query_container);
+ g_object_unref (factory);
+ g_free (id);
return;
}
}
- _g_object_unref0 (query_container);
- _g_object_unref0 (factory);
- _g_free0 (id);
+ g_object_unref (query_container);
+ g_object_unref (factory);
+ g_free (id);
}
@@ -2214,13 +2200,13 @@ static void rygel_media_export_root_container_add_virtual_containers_for_class (
_tmp6_ = g_strconcat ("virtual-parent:", _tmp5_, NULL);
_tmp7_ = _tmp6_;
rygel_media_object_set_id ((RygelMediaObject*) _tmp4_, _tmp7_);
- _g_free0 (_tmp7_);
+ g_free (_tmp7_);
_tmp8_ = ((RygelMediaExportDBContainer*) self)->media_db;
_tmp9_ = container;
rygel_media_export_media_cache_save_container (_tmp8_, (RygelMediaContainer*) _tmp9_, &_inner_error_);
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (container);
+ g_object_unref (container);
return;
}
{
@@ -2243,7 +2229,7 @@ static void rygel_media_export_root_container_add_virtual_containers_for_class (
rygel_media_export_root_container_add_folder_definition (self, (RygelMediaContainer*) _tmp10_, _tmp11_, &_tmp12_, &_inner_error_);
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (container);
+ g_object_unref (container);
return;
}
}
@@ -2279,7 +2265,7 @@ static void rygel_media_export_root_container_add_virtual_containers_for_class (
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
rygel_media_export_folder_definition_destroy (&definition);
- _g_object_unref0 (container);
+ g_object_unref (container);
return;
}
rygel_media_export_folder_definition_destroy (&definition);
@@ -2295,7 +2281,7 @@ static void rygel_media_export_root_container_add_virtual_containers_for_class (
_tmp24_ = _tmp23_;
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (container);
+ g_object_unref (container);
return;
}
if (_tmp24_ == 0) {
@@ -2310,7 +2296,7 @@ static void rygel_media_export_root_container_add_virtual_containers_for_class (
rygel_media_export_media_cache_remove_by_id (_tmp25_, _tmp28_, &_inner_error_);
if (_inner_error_ != NULL) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (container);
+ g_object_unref (container);
return;
}
} else {
@@ -2318,7 +2304,7 @@ static void rygel_media_export_root_container_add_virtual_containers_for_class (
_tmp29_ = container;
rygel_media_container_updated ((RygelMediaContainer*) _tmp29_, NULL, RYGEL_OBJECT_EVENT_TYPE_MODIFIED, FALSE);
}
- _g_object_unref0 (container);
+ g_object_unref (container);
}
@@ -2341,10 +2327,10 @@ static void rygel_media_export_root_container_init (RygelMediaExportRootContaine
static void rygel_media_export_root_container_finalize (GObject* obj) {
RygelMediaExportRootContainer * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_MEDIA_EXPORT_TYPE_ROOT_CONTAINER, RygelMediaExportRootContainer);
- _g_object_unref0 (self->priv->service);
- _g_object_unref0 (self->priv->harvester);
- _g_object_unref0 (self->priv->cancellable);
- _g_object_unref0 (self->priv->filesystem_container);
+ g_object_unref (self->priv->service);
+ g_object_unref (self->priv->harvester);
+ g_object_unref (self->priv->cancellable);
+ g_object_unref (self->priv->filesystem_container);
G_OBJECT_CLASS (rygel_media_export_root_container_parent_class)->finalize (obj);
}
diff --git a/src/media-export/rygel-media-export-sql-operator.c b/src/media-export/rygel-media-export-sql-operator.c
index bd7b157..d5427a7 100644
--- a/src/media-export/rygel-media-export-sql-operator.c
+++ b/src/media-export/rygel-media-export-sql-operator.c
@@ -25,8 +25,6 @@
G_DEFINE_TYPE (RygelMediaExportSqlOperator, rygel_media_export_sql_operator, G_TYPE_OBJECT)
-#define _g_free0(var) (var = (g_free (var), NULL))
-
RygelMediaExportSqlOperator* rygel_media_export_sql_operator_construct (GType object_type, const gchar* name, const gchar* arg, const gchar* collate);
RygelMediaExportSqlOperator* rygel_media_export_sql_operator_construct_from_search_criteria_op (GType object_type, GUPnPSearchCriteriaOp op, const gchar* arg, const gchar* collate);
static gchar* rygel_media_export_sql_operator_real_to_string (RygelMediaExportSqlOperator* self);
@@ -47,15 +45,15 @@ RygelMediaExportSqlOperator* rygel_media_export_sql_operator_construct (GType ob
self = (RygelMediaExportSqlOperator*) g_object_new (object_type, NULL);
_tmp0_ = name;
_tmp1_ = g_strdup (_tmp0_);
- _g_free0 (self->name);
+ g_free (self->name);
self->name = _tmp1_;
_tmp2_ = arg;
_tmp3_ = g_strdup (_tmp2_);
- _g_free0 (self->arg);
+ g_free (self->arg);
self->arg = _tmp3_;
_tmp4_ = collate;
_tmp5_ = g_strdup (_tmp4_);
- _g_free0 (self->collate);
+ g_free (self->collate);
self->collate = _tmp5_;
return self;
}
@@ -82,7 +80,7 @@ RygelMediaExportSqlOperator* rygel_media_export_sql_operator_construct_from_sear
{
gchar* _tmp1_;
_tmp1_ = g_strdup ("=");
- _g_free0 (sql);
+ g_free (sql);
sql = _tmp1_;
break;
}
@@ -90,7 +88,7 @@ RygelMediaExportSqlOperator* rygel_media_export_sql_operator_construct_from_sear
{
gchar* _tmp2_;
_tmp2_ = g_strdup ("!=");
- _g_free0 (sql);
+ g_free (sql);
sql = _tmp2_;
break;
}
@@ -98,7 +96,7 @@ RygelMediaExportSqlOperator* rygel_media_export_sql_operator_construct_from_sear
{
gchar* _tmp3_;
_tmp3_ = g_strdup ("<");
- _g_free0 (sql);
+ g_free (sql);
sql = _tmp3_;
break;
}
@@ -106,7 +104,7 @@ RygelMediaExportSqlOperator* rygel_media_export_sql_operator_construct_from_sear
{
gchar* _tmp4_;
_tmp4_ = g_strdup ("<=");
- _g_free0 (sql);
+ g_free (sql);
sql = _tmp4_;
break;
}
@@ -114,7 +112,7 @@ RygelMediaExportSqlOperator* rygel_media_export_sql_operator_construct_from_sear
{
gchar* _tmp5_;
_tmp5_ = g_strdup (">");
- _g_free0 (sql);
+ g_free (sql);
sql = _tmp5_;
break;
}
@@ -122,7 +120,7 @@ RygelMediaExportSqlOperator* rygel_media_export_sql_operator_construct_from_sear
{
gchar* _tmp6_;
_tmp6_ = g_strdup (">=");
- _g_free0 (sql);
+ g_free (sql);
sql = _tmp6_;
break;
}
@@ -135,7 +133,7 @@ RygelMediaExportSqlOperator* rygel_media_export_sql_operator_construct_from_sear
_tmp8_ = arg;
_tmp9_ = collate;
self = (RygelMediaExportSqlOperator*) rygel_media_export_sql_operator_construct (object_type, _tmp7_, _tmp8_, _tmp9_);
- _g_free0 (sql);
+ g_free (sql);
return self;
}
@@ -180,9 +178,9 @@ static void rygel_media_export_sql_operator_init (RygelMediaExportSqlOperator *
static void rygel_media_export_sql_operator_finalize (GObject* obj) {
RygelMediaExportSqlOperator * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_MEDIA_EXPORT_TYPE_SQL_OPERATOR, RygelMediaExportSqlOperator);
- _g_free0 (self->name);
- _g_free0 (self->arg);
- _g_free0 (self->collate);
+ g_free (self->name);
+ g_free (self->arg);
+ g_free (self->collate);
G_OBJECT_CLASS (rygel_media_export_sql_operator_parent_class)->finalize (obj);
}
diff --git a/src/media-export/rygel-media-export-sqlite-wrapper.c b/src/media-export/rygel-media-export-sqlite-wrapper.c
index aafd865..c87844d 100644
--- a/src/media-export/rygel-media-export-sqlite-wrapper.c
+++ b/src/media-export/rygel-media-export-sqlite-wrapper.c
@@ -30,11 +30,6 @@
G_DEFINE_TYPE (RygelMediaExportSqliteWrapper, rygel_media_export_sqlite_wrapper, G_TYPE_OBJECT)
-
-#define _sqlite3_close0(var) ((var == NULL) ? NULL : (var = (sqlite3_close (var), NULL)))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-
-
struct _RygelMediaExportSqliteWrapperPrivate {
sqlite3* database;
sqlite3* reference;
@@ -94,7 +89,7 @@ RygelMediaExportSqliteWrapper* rygel_media_export_sqlite_wrapper_construct (GTyp
self = (RygelMediaExportSqliteWrapper*) g_object_new (object_type, NULL);
_tmp0_ = path;
sqlite3_open (_tmp0_, &_tmp1_);
- _sqlite3_close0 (self->priv->database);
+ sqlite3_close (self->priv->database);
self->priv->database = _tmp1_;
_tmp2_ = self->priv->database;
self->priv->reference = _tmp2_;
@@ -102,7 +97,7 @@ RygelMediaExportSqliteWrapper* rygel_media_export_sqlite_wrapper_construct (GTyp
if (_inner_error_ != NULL) {
if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
g_propagate_error (error, _inner_error_);
- _g_object_unref0 (self);
+ g_object_unref (self);
return NULL;
} else {
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);
@@ -214,7 +209,7 @@ static void rygel_media_export_sqlite_wrapper_init (RygelMediaExportSqliteWrappe
static void rygel_media_export_sqlite_wrapper_finalize (GObject* obj) {
RygelMediaExportSqliteWrapper * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_MEDIA_EXPORT_TYPE_SQLITE_WRAPPER, RygelMediaExportSqliteWrapper);
- _sqlite3_close0 (self->priv->database);
+ sqlite3_close (self->priv->database);
G_OBJECT_CLASS (rygel_media_export_sqlite_wrapper_parent_class)->finalize (obj);
}
diff --git a/src/media-export/rygel-media-export-video-item.c b/src/media-export/rygel-media-export-video-item.c
index ca2c246..bf20a7f 100644
--- a/src/media-export/rygel-media-export-video-item.c
+++ b/src/media-export/rygel-media-export-video-item.c
@@ -31,8 +31,6 @@ G_DEFINE_TYPE_WITH_CODE (RygelMediaExportVideoItem, rygel_media_export_video_ite
G_IMPLEMENT_INTERFACE (RYGEL_TYPE_TRACKABLE_ITEM, rygel_media_export_video_item_rygel_trackable_item_interface_init)
G_IMPLEMENT_INTERFACE (RYGEL_TYPE_UPDATABLE_OBJECT, rygel_media_export_video_item_rygel_updatable_object_interface_init))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-
typedef struct _RygelMediaExportVideoItemCommitData RygelMediaExportVideoItemCommitData;
struct _RygelMediaExportVideoItemCommitData {
@@ -86,16 +84,10 @@ RygelMediaExportVideoItem* rygel_media_export_video_item_new (const gchar* id, R
static void rygel_media_export_video_item_real_commit_data_free (gpointer _data) {
RygelMediaExportVideoItemCommitData* _data_;
_data_ = _data;
- _g_object_unref0 (_data_->self);
+ g_object_unref (_data_->self);
g_slice_free (RygelMediaExportVideoItemCommitData, _data_);
}
-
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
-
static void rygel_media_export_video_item_real_commit (RygelUpdatableObject* base, GAsyncReadyCallback _callback_, gpointer _user_data_) {
RygelMediaExportVideoItem * self;
RygelMediaExportVideoItemCommitData* _data_;
@@ -104,7 +96,7 @@ static void rygel_media_export_video_item_real_commit (RygelUpdatableObject* bas
_data_ = g_slice_new0 (RygelMediaExportVideoItemCommitData);
_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, rygel_media_export_video_item_real_commit);
g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, rygel_media_export_video_item_real_commit_data_free);
- _tmp0_ = _g_object_ref0 (self);
+ _tmp0_ = g_object_ref (self);
_data_->self = _tmp0_;
rygel_media_export_video_item_real_commit_co (_data_);
}
@@ -146,7 +138,7 @@ static gboolean rygel_media_export_video_item_real_commit_co (RygelMediaExportVi
if (_data_->_inner_error_ != NULL) {
g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
g_error_free (_data_->_inner_error_);
- _g_object_unref0 (_data_->cache);
+ g_object_unref (_data_->cache);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -155,7 +147,7 @@ static gboolean rygel_media_export_video_item_real_commit_co (RygelMediaExportVi
g_object_unref (_data_->_async_result);
return FALSE;
}
- _g_object_unref0 (_data_->cache);
+ g_object_unref (_data_->cache);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
diff --git a/src/media-export/rygel-media-export-writable-db-container.c b/src/media-export/rygel-media-export-writable-db-container.c
index 33a871f..d217319 100644
--- a/src/media-export/rygel-media-export-writable-db-container.c
+++ b/src/media-export/rygel-media-export-writable-db-container.c
@@ -63,8 +63,6 @@ typedef struct _RygelMediaExportMediaCacheClass RygelMediaExportMediaCacheClass;
typedef struct _RygelMediaExportWritableDbContainer RygelMediaExportWritableDbContainer;
typedef struct _RygelMediaExportWritableDbContainerClass RygelMediaExportWritableDbContainerClass;
typedef struct _RygelMediaExportWritableDbContainerPrivate RygelMediaExportWritableDbContainerPrivate;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _g_free0(var) (var = (g_free (var), NULL))
typedef struct _RygelMediaExportWritableDbContainerAddItemData RygelMediaExportWritableDbContainerAddItemData;
typedef struct _RygelMediaExportWritableDbContainerRemoveItemData RygelMediaExportWritableDbContainerRemoveItemData;
@@ -193,7 +191,7 @@ RygelMediaExportWritableDbContainer* rygel_media_export_writable_db_container_co
_tmp3_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
_tmp4_ = _tmp3_;
rygel_writable_container_set_create_classes ((RygelWritableContainer*) self, _tmp4_);
- _g_object_unref0 (_tmp4_);
+ g_object_unref (_tmp4_);
_tmp5_ = rygel_writable_container_get_create_classes ((RygelWritableContainer*) self);
_tmp6_ = _tmp5_;
gee_abstract_collection_add ((GeeAbstractCollection*) _tmp6_, RYGEL_IMAGE_ITEM_UPNP_CLASS);
@@ -221,18 +219,12 @@ RygelMediaExportWritableDbContainer* rygel_media_export_writable_db_container_ne
static void rygel_media_export_writable_db_container_real_add_item_data_free (gpointer _data) {
RygelMediaExportWritableDbContainerAddItemData* _data_;
_data_ = _data;
- _g_object_unref0 (_data_->item);
- _g_object_unref0 (_data_->cancellable);
- _g_object_unref0 (_data_->self);
+ g_object_unref (_data_->item);
+ g_object_unref (_data_->cancellable);
+ g_object_unref (_data_->self);
g_slice_free (RygelMediaExportWritableDbContainerAddItemData, _data_);
}
-
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
-
static void rygel_media_export_writable_db_container_real_add_item (RygelWritableContainer* base, RygelMediaItem* item, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_) {
RygelMediaExportWritableDbContainer * self;
RygelMediaExportWritableDbContainerAddItemData* _data_;
@@ -245,15 +237,15 @@ static void rygel_media_export_writable_db_container_real_add_item (RygelWritabl
_data_ = g_slice_new0 (RygelMediaExportWritableDbContainerAddItemData);
_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, rygel_media_export_writable_db_container_real_add_item);
g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, rygel_media_export_writable_db_container_real_add_item_data_free);
- _tmp0_ = _g_object_ref0 (self);
+ _tmp0_ = g_object_ref (self);
_data_->self = _tmp0_;
_tmp1_ = item;
- _tmp2_ = _g_object_ref0 (_tmp1_);
- _g_object_unref0 (_data_->item);
+ _tmp2_ = g_object_ref (_tmp1_);
+ g_object_unref (_data_->item);
_data_->item = _tmp2_;
_tmp3_ = cancellable;
- _tmp4_ = _g_object_ref0 (_tmp3_);
- _g_object_unref0 (_data_->cancellable);
+ _tmp4_ = g_object_ref (_tmp3_);
+ g_object_unref (_data_->cancellable);
_data_->cancellable = _tmp4_;
rygel_media_export_writable_db_container_real_add_item_co (_data_);
}
@@ -286,7 +278,7 @@ static gboolean rygel_media_export_writable_db_container_real_add_item_co (Rygel
_data_->_tmp5_ = NULL;
_data_->_tmp5_ = g_file_new_for_uri (_data_->_tmp4_);
_data_->_tmp6_ = _data_->_tmp5_;
- _g_free0 (_data_->_tmp4_);
+ g_free (_data_->_tmp4_);
_data_->file = _data_->_tmp6_;
_data_->_tmp7_ = _data_->file;
_data_->_tmp8_ = FALSE;
@@ -302,14 +294,14 @@ static gboolean rygel_media_export_writable_db_container_real_add_item_co (Rygel
_data_->_tmp13_ = rygel_media_export_media_cache_get_id (_data_->_tmp12_);
_data_->_tmp14_ = _data_->_tmp13_;
rygel_media_object_set_id ((RygelMediaObject*) _data_->_tmp11_, _data_->_tmp14_);
- _g_free0 (_data_->_tmp14_);
+ g_free (_data_->_tmp14_);
_data_->_tmp15_ = ((RygelMediaExportDBContainer*) _data_->self)->media_db;
_data_->_tmp16_ = _data_->item;
rygel_media_export_media_cache_save_item (_data_->_tmp15_, _data_->_tmp16_, &_data_->_inner_error_);
if (_data_->_inner_error_ != NULL) {
g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
g_error_free (_data_->_inner_error_);
- _g_object_unref0 (_data_->file);
+ g_object_unref (_data_->file);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -318,7 +310,7 @@ static gboolean rygel_media_export_writable_db_container_real_add_item_co (Rygel
g_object_unref (_data_->_async_result);
return FALSE;
}
- _g_object_unref0 (_data_->file);
+ g_object_unref (_data_->file);
if (_data_->_state_ == 0) {
g_simple_async_result_complete_in_idle (_data_->_async_result);
} else {
@@ -332,9 +324,9 @@ static gboolean rygel_media_export_writable_db_container_real_add_item_co (Rygel
static void rygel_media_export_writable_db_container_real_remove_item_data_free (gpointer _data) {
RygelMediaExportWritableDbContainerRemoveItemData* _data_;
_data_ = _data;
- _g_free0 (_data_->id);
- _g_object_unref0 (_data_->cancellable);
- _g_object_unref0 (_data_->self);
+ g_free (_data_->id);
+ g_object_unref (_data_->cancellable);
+ g_object_unref (_data_->self);
g_slice_free (RygelMediaExportWritableDbContainerRemoveItemData, _data_);
}
@@ -351,15 +343,15 @@ static void rygel_media_export_writable_db_container_real_remove_item (RygelWrit
_data_ = g_slice_new0 (RygelMediaExportWritableDbContainerRemoveItemData);
_data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, rygel_media_export_writable_db_container_real_remove_item);
g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, rygel_media_export_writable_db_container_real_remove_item_data_free);
- _tmp0_ = _g_object_ref0 (self);
+ _tmp0_ = g_object_ref (self);
_data_->self = _tmp0_;
_tmp1_ = id;
_tmp2_ = g_strdup (_tmp1_);
- _g_free0 (_data_->id);
+ g_free (_data_->id);
_data_->id = _tmp2_;
_tmp3_ = cancellable;
- _tmp4_ = _g_object_ref0 (_tmp3_);
- _g_object_unref0 (_data_->cancellable);
+ _tmp4_ = g_object_ref (_tmp3_);
+ g_object_unref (_data_->cancellable);
_data_->cancellable = _tmp4_;
rygel_media_export_writable_db_container_real_remove_item_co (_data_);
}
@@ -423,8 +415,8 @@ static void rygel_media_export_writable_db_container_real_set_create_classes (Ry
GeeArrayList* _tmp1_;
self = (RygelMediaExportWritableDbContainer*) base;
_tmp0_ = value;
- _tmp1_ = _g_object_ref0 (_tmp0_);
- _g_object_unref0 (self->priv->_create_classes);
+ _tmp1_ = g_object_ref (_tmp0_);
+ g_object_unref (self->priv->_create_classes);
self->priv->_create_classes = _tmp1_;
g_object_notify ((GObject *) self, "create-classes");
}
@@ -459,7 +451,7 @@ static void rygel_media_export_writable_db_container_init (RygelMediaExportWrita
static void rygel_media_export_writable_db_container_finalize (GObject* obj) {
RygelMediaExportWritableDbContainer * self;
self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_MEDIA_EXPORT_TYPE_WRITABLE_DB_CONTAINER, RygelMediaExportWritableDbContainer);
- _g_object_unref0 (self->priv->_create_classes);
+ g_object_unref (self->priv->_create_classes);
G_OBJECT_CLASS (rygel_media_export_writable_db_container_parent_class)->finalize (obj);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
