GNOME.org
 

[rygel-gst-0-10-plugins] RygelMediaExportRecursiveFileMonitor: Slight cleanup

commit 1149e2e18ae4622202c2c242f7ec62c2864a4be8
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Jan 31 11:39:40 2013 +0100

    RygelMediaExportRecursiveFileMonitor: Slight cleanup

 .../rygel-media-export-recursive-file-monitor.c    |  297 ++++++++++----------
 1 files changed, 147 insertions(+), 150 deletions(-)
---
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 e026df1..830c5ef 100644
--- a/src/media-export/rygel-media-export-recursive-file-monitor.c
+++ b/src/media-export/rygel-media-export-recursive-file-monitor.c
@@ -1,8 +1,6 @@
-/* rygel-media-export-recursive-file-monitor.c generated by valac 0.18.1, the Vala compiler
- * generated from rygel-media-export-recursive-file-monitor.vala, do not modify */
-
 /*
  * Copyright (C) 2009 Jens Georg <mail jensge org>.
+ * Copyright (C) 2013 Intel Corporation.
  *
  * This file is part of Rygel.
  *
@@ -23,6 +21,7 @@
 
 
 #include "rygel-media-export-recursive-file-monitor.h"
+#include "rygel-media-export-plugin.h"
 #include <glib/gi18n-lib.h>
 
 G_DEFINE_TYPE (RygelMediaExportRecursiveFileMonitor, rygel_media_export_recursive_file_monitor, G_TYPE_OBJECT)
@@ -31,143 +30,141 @@ typedef struct _RygelMediaExportRecursiveFileMonitorAddData RygelMediaExportRecu
 
 
 struct _RygelMediaExportRecursiveFileMonitorPrivate {
-	GCancellable* cancellable;
-	GeeHashMap* monitors;
+	GCancellable *cancellable;
+	GeeHashMap *monitors;
 	gboolean monitor_changes;
 };
 
 struct _RygelMediaExportRecursiveFileMonitorAddData {
 	int _state_;
-	GObject* _source_object_;
-	GAsyncResult* _res_;
-	GSimpleAsyncResult* _async_result;
-	RygelMediaExportRecursiveFileMonitor* self;
-	GFile* file;
+	GObject *_source_object_;
+	GAsyncResult *_res_;
+	GSimpleAsyncResult *_async_result;
+	RygelMediaExportRecursiveFileMonitor *self;
+	GFile *file;
 	gboolean _tmp0_;
 	gboolean _tmp1_;
-	GeeHashMap* _tmp2_;
-	GFile* _tmp3_;
+	GeeHashMap *_tmp2_;
+	GFile *_tmp3_;
 	gboolean _tmp4_;
 	gboolean _tmp5_;
-	GFile* _tmp6_;
-	GFileInfo* _tmp7_;
-	GFileInfo* info;
-	GFileInfo* _tmp8_;
+	GFile *_tmp6_;
+	GFileInfo *_tmp7_;
+	GFileInfo *info;
+	GFileInfo *_tmp8_;
 	GFileType _tmp9_;
-	GFile* _tmp10_;
-	GCancellable* _tmp11_;
-	GFileMonitor* _tmp12_;
-	GFileMonitor* file_monitor;
-	GeeHashMap* _tmp13_;
-	GFile* _tmp14_;
-	GFileMonitor* _tmp15_;
-	GFileMonitor* _tmp16_;
-	GError* err;
-	const gchar* _tmp17_;
-	GFile* _tmp18_;
-	gchar* _tmp19_;
-	gchar* _tmp20_;
-	GError * _inner_error_;
+	GFile *_tmp10_;
+	GCancellable *_tmp11_;
+	GFileMonitor *_tmp12_;
+	GFileMonitor *file_monitor;
+	GeeHashMap *_tmp13_;
+	GFile *_tmp14_;
+	GFileMonitor *_tmp15_;
+	GFileMonitor *_tmp16_;
+	GError *err;
+	const gchar *_tmp17_;
+	GFile *_tmp18_;
+	gchar *_tmp19_;
+	gchar *_tmp20_;
+	GError  *_inner_error_;
 };
 
 
 #define RYGEL_MEDIA_EXPORT_RECURSIVE_FILE_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), RYGEL_MEDIA_EXPORT_TYPE_RECURSIVE_FILE_MONITOR, RygelMediaExportRecursiveFileMonitorPrivate))
 
-static void _rygel_media_export_recursive_file_monitor_cancel_g_cancellable_cancelled (GCancellable* _sender, gpointer self);
-static void _rygel_media_export_recursive_file_monitor_on_monitor_changed_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self);
+static void _rygel_media_export_recursive_file_monitor_cancel_g_cancellable_cancelled (GCancellable *_sender, gpointer self);
+static void _rygel_media_export_recursive_file_monitor_on_monitor_changed_g_file_monitor_changed (GFileMonitor *_sender, GFile *file, GFile *other_file, GFileMonitorEvent event_type, gpointer self);
 static void rygel_media_export_recursive_file_monitor_add_data_free (gpointer _data);
-static gboolean rygel_media_export_recursive_file_monitor_add_co (RygelMediaExportRecursiveFileMonitorAddData* _data_);
-static void rygel_media_export_recursive_file_monitor_add_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_);
-static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_ENUM (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void rygel_media_export_recursive_file_monitor_finalize (GObject* obj);
+static gboolean rygel_media_export_recursive_file_monitor_add_co (RygelMediaExportRecursiveFileMonitorAddData *_data_);
+static void rygel_media_export_recursive_file_monitor_add_ready (GObject *source_object, GAsyncResult *_res_, gpointer _user_data_);
+static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_ENUM (GClosure  *closure, GValue  *return_value, guint n_param_values, const GValue  *param_values, gpointer invocation_hint, gpointer marshal_data);
+static void rygel_media_export_recursive_file_monitor_finalize (GObject *obj);
 
 
-static void _rygel_media_export_recursive_file_monitor_cancel_g_cancellable_cancelled (GCancellable* _sender G_GNUC_UNUSED, gpointer self) {
+static void _rygel_media_export_recursive_file_monitor_cancel_g_cancellable_cancelled (GCancellable *_sender G_GNUC_UNUSED, gpointer self) {
 	rygel_media_export_recursive_file_monitor_cancel (self);
 }
 
-static
-RygelMediaExportRecursiveFileMonitor* rygel_media_export_recursive_file_monitor_construct (GType object_type, GCancellable* cancellable) {
-	RygelMediaExportRecursiveFileMonitor * self = NULL;
-	gboolean _tmp3_;
-	GCancellable* _tmp5_;
-	GCancellable* _tmp6_;
-	GeeHashMap* _tmp7_;
-	GCancellable* _tmp8_;
-	GError * _inner_error_ = NULL;
-	self = (RygelMediaExportRecursiveFileMonitor*) g_object_new (object_type, NULL);
-	self->priv->monitor_changes = TRUE;
-	{
-		RygelMetaConfig* _tmp0_ = NULL;
-		RygelMetaConfig* config;
-		gboolean _tmp1_ = FALSE;
-		gboolean _tmp2_;
-		_tmp0_ = rygel_meta_config_get_default ();
-		config = _tmp0_;
-		_tmp1_ = rygel_configuration_get_bool ((RygelConfiguration*) config, "MediaExport", "monitor-changes", &_inner_error_);
-		_tmp2_ = _tmp1_;
-		if (_inner_error_ != NULL) {
-			g_object_unref (config);
-			goto __catch44_g_error;
-		}
-		self->priv->monitor_changes = _tmp2_;
-		g_object_unref (config);
-	}
-	goto __finally44;
-	__catch44_g_error:
-	{
-		GError* _error_ = NULL;
-		_error_ = _inner_error_;
-		_inner_error_ = NULL;
-		self->priv->monitor_changes = TRUE;
-		g_error_free (_error_);
-	}
-	__finally44:
-	if (_inner_error_ != NULL) {
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-		g_clear_error (&_inner_error_);
-		return NULL;
-	}
-	_tmp3_ = self->priv->monitor_changes;
-	if (!_tmp3_) {
-		const gchar* _tmp4_ = NULL;
-		_tmp4_ = _ ("Will not monitor file changes");
-		g_message ("rygel-media-export-recursive-file-monitor.vala:40: %s", _tmp4_);
-	}
-	_tmp5_ = 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_unref (self->priv->monitors);
-	self->priv->monitors = _tmp7_;
-	_tmp8_ = cancellable;
-	if (_tmp8_ != NULL) {
-		GCancellable* _tmp9_;
-		_tmp9_ = cancellable;
-		g_signal_connect_object (_tmp9_, "cancelled", (GCallback) _rygel_media_export_recursive_file_monitor_cancel_g_cancellable_cancelled, self, 0);
+static void rygel_media_export_recursive_file_monitor_on_config_changed (RygelConfiguration* config, const gchar* section, const gchar* key, gpointer user_data) {
+  RygelMediaExportRecursiveFileMonitor* self = RYGEL_MEDIA_EXPORT_RECURSIVE_FILE_MONITOR (self);
+
+	g_return_if_fail (self);
+	g_return_if_fail (config);
+	g_return_if_fail (section);
+	g_return_if_fail (key);
+  
+	if ((g_strcmp0 (section, RYGEL_MEDIA_EXPORT_PLUGIN_NAME) != 0) ||
+	  (g_strcmp0 (key, "monitor-changes") != 0)) {
+		return;
 	}
+
+  self->priv->monitor_changes = rygel_configuration_get_bool (config,
+    RYGEL_MEDIA_EXPORT_PLUGIN_NAME,
+    "monitor-changes", NULL);
+}
+
+
+static
+RygelMediaExportRecursiveFileMonitor *rygel_media_export_recursive_file_monitor_construct (GType object_type, GCancellable *cancellable) {
+	RygelMediaExportRecursiveFileMonitor *self;
+	RygelMetaConfig *config;
+	
+	self = RYGEL_MEDIA_EXPORT_RECURSIVE_FILE_MONITOR (g_object_new (object_type, NULL));
+  self->priv->monitor_changes = TRUE;
+  
+  config = rygel_meta_config_get_default ();
+  
+  g_signal_connect_object (RYGEL_CONFIGURATION (config), "setting-changed",
+    (GCallback)rygel_media_export_recursive_file_monitor_on_config_changed,
+    self, 0);
+	rygel_media_export_recursive_file_monitor_on_config_changed (RYGEL_CONFIGURATION (config),
+	  RYGEL_MEDIA_EXPORT_PLUGIN_NAME, "monitor-changes", self);
+
+  if(!rygel_configuration_get_bool (RYGEL_CONFIGURATION (config),
+    "MediaExport", "monitor-changes", NULL)) {
+		g_message ("rygel-media-export-recursive-file-monitor.c: %s",
+		  _("Will not monitor file changes"));
+  }
+  
+  self->priv->monitors = 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);
+    
+  if (cancellable) {
+    self->priv->cancellable = cancellable;
+    g_object_ref (self->priv->cancellable);
+    
+    g_signal_connect_object (self->priv->cancellable, "cancelled",
+      (GCallback) _rygel_media_export_recursive_file_monitor_cancel_g_cancellable_cancelled,
+      self, 0);
+  }
+
 	return self;
 }
 
 
-RygelMediaExportRecursiveFileMonitor* rygel_media_export_recursive_file_monitor_new (GCancellable* cancellable) {
+RygelMediaExportRecursiveFileMonitor *rygel_media_export_recursive_file_monitor_new (GCancellable *cancellable) {
 	return rygel_media_export_recursive_file_monitor_construct (RYGEL_MEDIA_EXPORT_TYPE_RECURSIVE_FILE_MONITOR, cancellable);
 }
 
 
-static void _rygel_media_export_recursive_file_monitor_on_monitor_changed_g_file_monitor_changed (GFileMonitor* _sender G_GNUC_UNUSED, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self) {
+static void _rygel_media_export_recursive_file_monitor_on_monitor_changed_g_file_monitor_changed (GFileMonitor *_sender G_GNUC_UNUSED, GFile *file, GFile *other_file, GFileMonitorEvent event_type, gpointer self) {
 	rygel_media_export_recursive_file_monitor_on_monitor_changed (self, file, other_file, event_type);
 }
 
 
-void rygel_media_export_recursive_file_monitor_on_monitor_changed (RygelMediaExportRecursiveFileMonitor* self, GFile* file, GFile* other_file, GFileMonitorEvent event_type) {
-	GFile* _tmp0_;
-	GFile* _tmp1_;
+void rygel_media_export_recursive_file_monitor_on_monitor_changed (RygelMediaExportRecursiveFileMonitor *self, GFile *file, GFile *other_file, GFileMonitorEvent event_type) {
+	GFile *_tmp0_;
+	GFile *_tmp1_;
 	GFileMonitorEvent _tmp2_;
 	GFileMonitorEvent _tmp3_;
-	g_return_if_fail (self != NULL);
-	g_return_if_fail (file != NULL);
+	g_return_if_fail (self);
+	g_return_if_fail (file);
 	_tmp0_ = file;
 	_tmp1_ = other_file;
 	_tmp2_ = event_type;
@@ -176,31 +173,31 @@ void rygel_media_export_recursive_file_monitor_on_monitor_changed (RygelMediaExp
 	switch (_tmp3_) {
 		case G_FILE_MONITOR_EVENT_CREATED:
 		{
-			GFile* _tmp4_;
+			GFile *_tmp4_;
 			_tmp4_ = file;
 			rygel_media_export_recursive_file_monitor_add (self, _tmp4_, NULL, NULL);
 			break;
 		}
 		case G_FILE_MONITOR_EVENT_DELETED:
 		{
-			GeeHashMap* _tmp5_;
-			GFile* _tmp6_;
+			GeeHashMap *_tmp5_;
+			GFile *_tmp6_;
 			gpointer _tmp7_ = NULL;
-			GFileMonitor* file_monitor;
-			GFileMonitor* _tmp8_;
+			GFileMonitor *file_monitor;
+			GFileMonitor *_tmp8_;
 			_tmp5_ = self->priv->monitors;
 			_tmp6_ = file;
 			_tmp7_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp5_, _tmp6_);
 			file_monitor = (GFileMonitor*) _tmp7_;
 			_tmp8_ = file_monitor;
-			if (_tmp8_ != NULL) {
-				GFile* _tmp9_;
-				gchar* _tmp10_ = NULL;
-				gchar* _tmp11_;
-				GeeHashMap* _tmp12_;
-				GFile* _tmp13_;
-				GFileMonitor* _tmp14_;
-				GFileMonitor* _tmp15_;
+			if (_tmp8_) {
+				GFile *_tmp9_;
+				gchar *_tmp10_ = NULL;
+				gchar *_tmp11_;
+				GeeHashMap *_tmp12_;
+				GFile *_tmp13_;
+				GFileMonitor *_tmp14_;
+				GFileMonitor *_tmp15_;
 				guint _tmp16_ = 0U;
 				_tmp9_ = file;
 				_tmp10_ = g_file_get_uri (_tmp9_);
@@ -229,7 +226,7 @@ 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_;
+	RygelMediaExportRecursiveFileMonitorAddData *_data_;
 	_data_ = _data;
 	g_object_unref (_data_->file);
 	g_object_unref (_data_->self);
@@ -237,11 +234,11 @@ static void rygel_media_export_recursive_file_monitor_add_data_free (gpointer _d
 }
 
 
-void rygel_media_export_recursive_file_monitor_add (RygelMediaExportRecursiveFileMonitor* self, GFile* file, GAsyncReadyCallback _callback_, gpointer _user_data_) {
-	RygelMediaExportRecursiveFileMonitorAddData* _data_;
-	RygelMediaExportRecursiveFileMonitor* _tmp0_;
-	GFile* _tmp1_;
-	GFile* _tmp2_;
+void rygel_media_export_recursive_file_monitor_add (RygelMediaExportRecursiveFileMonitor *self, GFile *file, GAsyncReadyCallback _callback_, gpointer _user_data_) {
+	RygelMediaExportRecursiveFileMonitorAddData *_data_;
+	RygelMediaExportRecursiveFileMonitor *_tmp0_;
+	GFile *_tmp1_;
+	GFile *_tmp2_;
 	_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);
@@ -255,12 +252,12 @@ void rygel_media_export_recursive_file_monitor_add (RygelMediaExportRecursiveFil
 }
 
 
-void rygel_media_export_recursive_file_monitor_add_finish (RygelMediaExportRecursiveFileMonitor* self G_GNUC_UNUSED, GAsyncResult* _res_ G_GNUC_UNUSED) {
+void rygel_media_export_recursive_file_monitor_add_finish (RygelMediaExportRecursiveFileMonitor *self G_GNUC_UNUSED, GAsyncResult *_res_ G_GNUC_UNUSED) {
 }
 
 
-static void rygel_media_export_recursive_file_monitor_add_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) {
-	RygelMediaExportRecursiveFileMonitorAddData* _data_;
+static void rygel_media_export_recursive_file_monitor_add_ready (GObject *source_object, GAsyncResult *_res_, gpointer _user_data_) {
+	RygelMediaExportRecursiveFileMonitorAddData *_data_;
 	_data_ = _user_data_;
 	_data_->_source_object_ = source_object;
 	_data_->_res_ = _res_;
@@ -268,7 +265,7 @@ static void rygel_media_export_recursive_file_monitor_add_ready (GObject* source
 }
 
 
-static gboolean rygel_media_export_recursive_file_monitor_add_co (RygelMediaExportRecursiveFileMonitorAddData* _data_) {
+static gboolean rygel_media_export_recursive_file_monitor_add_co (RygelMediaExportRecursiveFileMonitorAddData *_data_) {
 	switch (_data_->_state_) {
 		case 0:
 		goto _state_0;
@@ -307,7 +304,7 @@ static gboolean rygel_media_export_recursive_file_monitor_add_co (RygelMediaExpo
 		_data_->_tmp7_ = NULL;
 		_data_->_tmp7_ = g_file_query_info_finish (_data_->_tmp6_, _data_->_res_, &_data_->_inner_error_);
 		_data_->info = _data_->_tmp7_;
-		if (_data_->_inner_error_ != NULL) {
+		if (_data_->_inner_error_) {
 			goto __catch45_g_error;
 		}
 		_data_->_tmp8_ = _data_->info;
@@ -319,7 +316,7 @@ static gboolean rygel_media_export_recursive_file_monitor_add_co (RygelMediaExpo
 			_data_->_tmp12_ = NULL;
 			_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) {
+			if (_data_->_inner_error_) {
 				g_object_unref (_data_->info);
 				goto __catch45_g_error;
 			}
@@ -349,7 +346,7 @@ static gboolean rygel_media_export_recursive_file_monitor_add_co (RygelMediaExpo
 		g_error_free (_data_->err);
 	}
 	__finally45:
-	if (_data_->_inner_error_ != NULL) {
+	if (_data_->_inner_error_) {
 		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;
@@ -364,17 +361,17 @@ static gboolean rygel_media_export_recursive_file_monitor_add_co (RygelMediaExpo
 }
 
 
-void rygel_media_export_recursive_file_monitor_cancel (RygelMediaExportRecursiveFileMonitor* self) {
-	GeeHashMap* _tmp11_;
-	g_return_if_fail (self != NULL);
+void rygel_media_export_recursive_file_monitor_cancel (RygelMediaExportRecursiveFileMonitor *self) {
+	GeeHashMap *_tmp11_;
+	g_return_if_fail (self);
 	{
-		GeeHashMap* _tmp0_;
-		GeeCollection* _tmp1_;
-		GeeCollection* _tmp2_;
-		GeeCollection* _tmp3_;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_;
-		GeeIterator* _monitor_it;
+		GeeHashMap *_tmp0_;
+		GeeCollection *_tmp1_;
+		GeeCollection *_tmp2_;
+		GeeCollection *_tmp3_;
+		GeeIterator *_tmp4_ = NULL;
+		GeeIterator *_tmp5_;
+		GeeIterator *_monitor_it;
 		_tmp0_ = self->priv->monitors;
 		_tmp1_ = gee_abstract_map_get_values ((GeeAbstractMap*) _tmp0_);
 		_tmp2_ = _tmp1_;
@@ -384,12 +381,12 @@ void rygel_media_export_recursive_file_monitor_cancel (RygelMediaExportRecursive
 		g_object_unref (_tmp3_);
 		_monitor_it = _tmp5_;
 		while (TRUE) {
-			GeeIterator* _tmp6_;
+			GeeIterator *_tmp6_;
 			gboolean _tmp7_ = FALSE;
-			GeeIterator* _tmp8_;
+			GeeIterator *_tmp8_;
 			gpointer _tmp9_ = NULL;
-			GFileMonitor* monitor;
-			GFileMonitor* _tmp10_;
+			GFileMonitor *monitor;
+			GFileMonitor *_tmp10_;
 			_tmp6_ = _monitor_it;
 			_tmp7_ = gee_iterator_next (_tmp6_);
 			if (!_tmp7_) {
@@ -409,10 +406,10 @@ void rygel_media_export_recursive_file_monitor_cancel (RygelMediaExportRecursive
 }
 
 
-static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_ENUM (GClosure * closure, GValue * return_value G_GNUC_UNUSED, guint n_param_values, const GValue * param_values, gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) {
+static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_ENUM (GClosure  *closure, GValue  *return_value G_GNUC_UNUSED, guint n_param_values, const GValue  *param_values, gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) {
 	typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT_ENUM) (gpointer data1, gpointer arg_1, gpointer arg_2, gint arg_3, gpointer data2);
 	register GMarshalFunc_VOID__OBJECT_OBJECT_ENUM callback;
-	register GCClosure * cc;
+	register GCClosure  *cc;
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
@@ -429,20 +426,20 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_ENUM (GClosure * closure
 }
 
 
-static void rygel_media_export_recursive_file_monitor_class_init (RygelMediaExportRecursiveFileMonitorClass * klass) {
+static void rygel_media_export_recursive_file_monitor_class_init (RygelMediaExportRecursiveFileMonitorClass  *klass) {
 	g_type_class_add_private (klass, sizeof (RygelMediaExportRecursiveFileMonitorPrivate));
 	G_OBJECT_CLASS (klass)->finalize = rygel_media_export_recursive_file_monitor_finalize;
 	g_signal_new ("changed", RYGEL_MEDIA_EXPORT_TYPE_RECURSIVE_FILE_MONITOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_ENUM, G_TYPE_NONE, 3, G_TYPE_FILE, G_TYPE_FILE, g_file_monitor_event_get_type ());
 }
 
 
-static void rygel_media_export_recursive_file_monitor_init (RygelMediaExportRecursiveFileMonitor * self) {
+static void rygel_media_export_recursive_file_monitor_init (RygelMediaExportRecursiveFileMonitor  *self) {
 	self->priv = RYGEL_MEDIA_EXPORT_RECURSIVE_FILE_MONITOR_GET_PRIVATE (self);
 }
 
 
-static void rygel_media_export_recursive_file_monitor_finalize (GObject* obj) {
-	RygelMediaExportRecursiveFileMonitor * self;
+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_unref (self->priv->cancellable);
 	g_object_unref (self->priv->monitors);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]