GNOME.org
 

[rygel-gst-0-10-plugins] Some cleanup.

commit 71bbe8ae02b2b4feead02a77241b90a9e75b1ba1
Author: Krzesimir Nowak <krnowak openismus com>
Date:   Sun Jan 13 22:15:18 2013 +0100

    Some cleanup.

 src/media-export/rygel-media-export-collate.c      |   10 +-
 src/media-export/rygel-media-export-collate.h      |    6 +-
 .../rygel-media-export-database-cursor.c           |    7 +-
 .../rygel-media-export-database-cursor.h           |   12 +-
 .../rygel-media-export-sqlite-wrapper.c            |  336 ++++++++++----------
 .../rygel-media-export-sqlite-wrapper.h            |   14 +-
 6 files changed, 204 insertions(+), 181 deletions(-)
---
diff --git a/src/media-export/rygel-media-export-collate.c b/src/media-export/rygel-media-export-collate.c
index 1cfaf48..bedf940 100644
--- a/src/media-export/rygel-media-export-collate.c
+++ b/src/media-export/rygel-media-export-collate.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 Jens Georg <mail jensge org>.
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012, 2013 Intel Corporation.
  *
  * Author: Jens Georg <mail jensge org>
  *
@@ -25,14 +25,18 @@
 
 #ifdef HAVE_UNISTRING
 #include <unistr.h>
-gint rygel_media_export_utf8_collate_str (const char *a, const char *b)
+gint
+rygel_media_export_utf8_collate_str (const char *a,
+                                     const char *b)
 {
     return u8_strcoll (a, b);
 }
 
 #else
 
-gint rygel_media_export_utf8_collate_str (const char *a, const char *b)
+gint
+rygel_media_export_utf8_collate_str (const char *a,
+                                     const char *b)
 {
     return g_utf8_collate (a, b);
 }
diff --git a/src/media-export/rygel-media-export-collate.h b/src/media-export/rygel-media-export-collate.h
index 66de26c..27b3c4e 100644
--- a/src/media-export/rygel-media-export-collate.h
+++ b/src/media-export/rygel-media-export-collate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012, 2013 Intel Corporation.
  *
  * This file is part of Rygel.
  *
@@ -25,6 +25,8 @@
 
 G_BEGIN_DECLS
 
-gint rygel_media_export_utf8_collate_str (const char *a, const char *b);
+gint
+rygel_media_export_utf8_collate_str (const char *a,
+                                     const char *b);
 
 #endif /* __RYGEL_GST_0_10_PLUGINS_MEDIA_EXPORT_COLLATE_H__ */
diff --git a/src/media-export/rygel-media-export-database-cursor.c b/src/media-export/rygel-media-export-database-cursor.c
index 9393cfb..40657a5 100644
--- a/src/media-export/rygel-media-export-database-cursor.c
+++ b/src/media-export/rygel-media-export-database-cursor.c
@@ -1,9 +1,6 @@
-/* rygel-media-export-database-cursor.c generated by valac 0.18.1, the Vala compiler
- * generated from rygel-media-export-database-cursor.vala, do not modify */
-
 /*
  * Copyright (C) 2011 Jens Georg <mail jensge org>.
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012, 2013 Intel Corporation.
  *
  * Author: Jens Georg <mail jensge org>
  *
@@ -129,7 +126,7 @@ RygelMediaExportDatabaseCursor* rygel_media_export_database_cursor_construct (GT
 	g_return_val_if_fail (db != NULL, NULL);
 	g_return_val_if_fail (sql != NULL, NULL);
 	_tmp0_ = db;
-	self = (RygelMediaExportDatabaseCursor*) rygel_media_export_sqlite_wrapper_construct_wrap (object_type, _tmp0_);
+	self = (RygelMediaExportDatabaseCursor*) g_object_new (object_type, "db", _tmp0_, NULL);
 	_tmp1_ = db;
 	_tmp2_ = sql;
 	_tmp4_ = sqlite3_prepare_v2 (_tmp1_, _tmp2_, -1, &_tmp3_, NULL);
diff --git a/src/media-export/rygel-media-export-database-cursor.h b/src/media-export/rygel-media-export-database-cursor.h
index 171fa2c..b4f6ba9 100644
--- a/src/media-export/rygel-media-export-database-cursor.h
+++ b/src/media-export/rygel-media-export-database-cursor.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2009,2010 Jens Georg <mail jensge org>.
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012, 2013 Intel Corporation.
  *
  * This file is part of Rygel.
  *
@@ -47,9 +47,15 @@ struct _RygelMediaExportDatabaseCursorClass {
   RygelMediaExportSqliteWrapperClass parent_class;
 };
 
-GType rygel_media_export_database_cursor_get_type (void) G_GNUC_CONST;
+GType
+rygel_media_export_database_cursor_get_type (void) G_GNUC_CONST;
 
-RygelMediaExportDatabaseCursor* rygel_media_export_database_cursor_new (sqlite3* db, const gchar* sql, GValue* arguments, int arguments_length1, GError** error);
+RygelMediaExportDatabaseCursor*
+rygel_media_export_database_cursor_new (sqlite3      *db,
+                                        const gchar  *sql,
+                                        GValue       *arguments,
+                                        int           arguments_length,
+                                        GError      **error);
 
 G_END_DECLS
 
diff --git a/src/media-export/rygel-media-export-sqlite-wrapper.c b/src/media-export/rygel-media-export-sqlite-wrapper.c
index c87844d..09fb02f 100644
--- a/src/media-export/rygel-media-export-sqlite-wrapper.c
+++ b/src/media-export/rygel-media-export-sqlite-wrapper.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2011 Jens Georg <mail jensge org>.
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012, 2013 Intel Corporation.
  *
  * Author: Jens Georg <mail jensge org>
  *
@@ -26,21 +26,27 @@
 #include "rygel-media-export-database.h"
 #include <sqlite3.h>
 
-
-
-G_DEFINE_TYPE (RygelMediaExportSqliteWrapper, rygel_media_export_sqlite_wrapper, G_TYPE_OBJECT)
+G_DEFINE_TYPE (RygelMediaExportSqliteWrapper,
+               rygel_media_export_sqlite_wrapper,
+               G_TYPE_OBJECT)
 
 struct _RygelMediaExportSqliteWrapperPrivate {
-	sqlite3* database;
-	sqlite3* reference;
+  sqlite3 *database;
+  sqlite3 *reference;
 };
 
 
-#define RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), RYGEL_MEDIA_EXPORT_TYPE_SQLITE_WRAPPER, RygelMediaExportSqliteWrapperPrivate))
+#define RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER_GET_PRIVATE(o) \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
+                                RYGEL_MEDIA_EXPORT_TYPE_SQLITE_WRAPPER, \
+                                RygelMediaExportSqliteWrapperPrivate))
+
 enum  {
-	RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER_DUMMY_PROPERTY,
-	RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER_DB
+  RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER_DUMMY_PROPERTY,
+  RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER_DB,
+  RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER_OWN_DB
 };
+
 RygelMediaExportSqliteWrapper* rygel_media_export_sqlite_wrapper_new_wrap (sqlite3* db);
 RygelMediaExportSqliteWrapper* rygel_media_export_sqlite_wrapper_construct_wrap (GType object_type, sqlite3* db);
 GQuark rygel_media_export_database_error_quark (void);
@@ -54,177 +60,187 @@ static void _vala_rygel_media_export_sqlite_wrapper_get_property (GObject * obje
 
 
 /**
-     * Wrap an existing SQLite Database object.
-     *
-     * The SqliteWrapper doesn't take ownership of the passed db
-     */
-RygelMediaExportSqliteWrapper* rygel_media_export_sqlite_wrapper_construct_wrap (GType object_type, sqlite3* db) {
-	RygelMediaExportSqliteWrapper * self = NULL;
-	sqlite3* _tmp0_;
-	g_return_val_if_fail (db != NULL, NULL);
-	self = (RygelMediaExportSqliteWrapper*) g_object_new (object_type, NULL);
-	_tmp0_ = db;
-	self->priv->reference = _tmp0_;
-	return self;
-}
-
-
-RygelMediaExportSqliteWrapper* rygel_media_export_sqlite_wrapper_new_wrap (sqlite3* db) {
-	return rygel_media_export_sqlite_wrapper_construct_wrap (RYGEL_MEDIA_EXPORT_TYPE_SQLITE_WRAPPER, db);
+ * Wrap an existing SQLite Database object.
+ *
+ * The SqliteWrapper doesn't take ownership of the passed db
+ */
+RygelMediaExportSqliteWrapper *
+rygel_media_export_sqlite_wrapper_new_wrap (sqlite3 *db) {
+  return RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER (g_object_new (RYGEL_MEDIA_EXPORT_TYPE_SQLITE_WRAPPER,
+                                                          "db", db,
+                                                          NULL));
 }
 
-
 /**
-     * Create or open a new SQLite database in path.
-     *
-     * @note: Path may also be ":memory:" for temporary databases
-     */
-RygelMediaExportSqliteWrapper* rygel_media_export_sqlite_wrapper_construct (GType object_type, const gchar* path, GError** error) {
-	RygelMediaExportSqliteWrapper * self = NULL;
-	const gchar* _tmp0_;
-	sqlite3* _tmp1_ = NULL;
-	sqlite3* _tmp2_;
-	GError * _inner_error_ = NULL;
-	g_return_val_if_fail (path != NULL, NULL);
-	self = (RygelMediaExportSqliteWrapper*) g_object_new (object_type, NULL);
-	_tmp0_ = path;
-	sqlite3_open (_tmp0_, &_tmp1_);
-	sqlite3_close (self->priv->database);
-	self->priv->database = _tmp1_;
-	_tmp2_ = self->priv->database;
-	self->priv->reference = _tmp2_;
-	rygel_media_export_sqlite_wrapper_throw_if_db_has_error (self, &_inner_error_);
-	if (_inner_error_ != NULL) {
-		if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
-			g_propagate_error (error, _inner_error_);
-			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);
-			g_clear_error (&_inner_error_);
-			return NULL;
-		}
-	}
-	return self;
-}
-
-
-RygelMediaExportSqliteWrapper* rygel_media_export_sqlite_wrapper_new (const gchar* path, GError** error) {
-	return rygel_media_export_sqlite_wrapper_construct (RYGEL_MEDIA_EXPORT_TYPE_SQLITE_WRAPPER, path, error);
+ * Create or open a new SQLite database in path.
+ *
+ * @note: Path may also be ":memory:" for temporary databases
+ */
+RygelMediaExportSqliteWrapper *
+rygel_media_export_sqlite_wrapper_new (const gchar  *path,
+                                       GError      **error) {
+  RygelMediaExportSqliteWrapper *self;
+  sqlite3 *db;
+  GError *inner_error;
+
+  g_return_val_if_fail (path != NULL, NULL);
+
+  db = NULL;
+  sqlite3_open (path, &db);
+  self = RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER (g_object_new (RYGEL_MEDIA_EXPORT_TYPE_SQLITE_WRAPPER,
+                                                          "db", db,
+                                                          "db-own", db,
+                                                          NULL));
+  inner_error = NULL;
+  rygel_media_export_sqlite_wrapper_throw_if_db_has_error (self, &inner_error);
+  if (inner_error != NULL) {
+    g_propagate_error (error, inner_error);
+    g_object_unref (self);
+    self = NULL;
+  }
+  return self;
 }
 
-
 /**
-     * Convert a SQLite return code to a DatabaseError
-     */
-void rygel_media_export_sqlite_wrapper_throw_if_code_is_error (RygelMediaExportSqliteWrapper* self, gint sqlite_error, GError** error) {
-	gint _tmp0_;
-	GError * _inner_error_ = NULL;
-	g_return_if_fail (self != NULL);
-	_tmp0_ = sqlite_error;
-	switch (_tmp0_) {
-		case SQLITE_OK:
-		case SQLITE_DONE:
-		case SQLITE_ROW:
-		{
-			return;
-		}
-		default:
-		{
-			gint _tmp1_;
-			sqlite3* _tmp2_;
-			const gchar* _tmp3_ = NULL;
-			GError* _tmp4_;
-			_tmp1_ = sqlite_error;
-			_tmp2_ = self->priv->reference;
-			_tmp3_ = sqlite3_errmsg (_tmp2_);
-			_tmp4_ = g_error_new (RYGEL_MEDIA_EXPORT_DATABASE_ERROR, RYGEL_MEDIA_EXPORT_DATABASE_ERROR_SQLITE_ERROR, "SQLite error %d: %s", _tmp1_, _tmp3_);
-			_inner_error_ = _tmp4_;
-			if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
-				g_propagate_error (error, _inner_error_);
-				return;
-			} 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);
-				g_clear_error (&_inner_error_);
-				return;
-			}
-		}
-	}
+ * Convert a SQLite return code to a DatabaseError
+ */
+void
+rygel_media_export_sqlite_wrapper_throw_if_code_is_error (RygelMediaExportSqliteWrapper  *self,
+                                                          gint                            sqlite_error,
+                                                          GError                        **error) {
+  GError *inner_error = NULL;
+
+  g_return_if_fail (RYGEL_IS_MEDIA_EXPORT_SQLITE_WRAPPER (self));
+
+  switch (sqlite_error) {
+  case SQLITE_OK:
+  case SQLITE_DONE:
+  case SQLITE_ROW:
+    {
+      return;
+    }
+  default:
+    {
+      g_set_error (error,
+                   RYGEL_MEDIA_EXPORT_DATABASE_ERROR,
+                   RYGEL_MEDIA_EXPORT_DATABASE_ERROR_SQLITE_ERROR,
+                   "SQLite error %d: %s",
+                   sqlite_error,
+                   sqlite3_errmsg (self->priv->reference));
+    }
+  }
 }
 
-
 /**
-     * Check if the last operation on the database was an error
-     */
-void rygel_media_export_sqlite_wrapper_throw_if_db_has_error (RygelMediaExportSqliteWrapper* self, GError** error) {
-	sqlite3* _tmp0_;
-	gint _tmp1_ = 0;
-	GError * _inner_error_ = NULL;
-	g_return_if_fail (self != NULL);
-	_tmp0_ = self->priv->reference;
-	_tmp1_ = sqlite3_errcode (_tmp0_);
-	rygel_media_export_sqlite_wrapper_throw_if_code_is_error (self, _tmp1_, &_inner_error_);
-	if (_inner_error_ != NULL) {
-		if (_inner_error_->domain == RYGEL_MEDIA_EXPORT_DATABASE_ERROR) {
-			g_propagate_error (error, _inner_error_);
-			return;
-		} 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);
-			g_clear_error (&_inner_error_);
-			return;
-		}
-	}
+ * Check if the last operation on the database was an error
+ */
+void
+rygel_media_export_sqlite_wrapper_throw_if_db_has_error (RygelMediaExportSqliteWrapper  *self,
+                                                         GError                        **error) {
+  g_return_if_fail (RYGEL_IS_MEDIA_EXPORT_SQLITE_WRAPPER (self));
+
+  rygel_media_export_sqlite_wrapper_throw_if_code_is_error (self,
+                                                            sqlite3_errcode (self->priv->reference),
+                                                            error);
 }
 
+sqlite3 *
+rygel_media_export_sqlite_wrapper_get_db (RygelMediaExportSqliteWrapper *self) {
+  g_return_val_if_fail (RYGEL_IS_MEDIA_EXPORT_SQLITE_WRAPPER (self), NULL);
 
-sqlite3* rygel_media_export_sqlite_wrapper_get_db (RygelMediaExportSqliteWrapper* self) {
-	sqlite3* result;
-	sqlite3* _tmp0_;
-	g_return_val_if_fail (self != NULL, NULL);
-	_tmp0_ = self->priv->reference;
-	result = _tmp0_;
-	return result;
+  return self->priv->reference;
 }
 
+static void
+rygel_media_export_sqlite_wrapper_finalize (GObject *object) {
+  RygelMediaExportSqliteWrapper *self = RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER (object);
 
-static void rygel_media_export_sqlite_wrapper_class_init (RygelMediaExportSqliteWrapperClass * klass) {
-	rygel_media_export_sqlite_wrapper_parent_class = g_type_class_peek_parent (klass);
-	g_type_class_add_private (klass, sizeof (RygelMediaExportSqliteWrapperPrivate));
-	G_OBJECT_CLASS (klass)->get_property = _vala_rygel_media_export_sqlite_wrapper_get_property;
-	G_OBJECT_CLASS (klass)->finalize = rygel_media_export_sqlite_wrapper_finalize;
-	/**
-	     * Property to access the wrapped database
-	     */
-	g_object_class_install_property (G_OBJECT_CLASS (klass), RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER_DB, g_param_spec_pointer ("db", "db", "db", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-}
-
+  sqlite3_close (self->priv->database);
 
-static void rygel_media_export_sqlite_wrapper_init (RygelMediaExportSqliteWrapper * self) {
-	self->priv = RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER_GET_PRIVATE (self);
-	self->priv->database = NULL;
-	self->priv->reference = NULL;
+  G_OBJECT_CLASS (rygel_media_export_sqlite_wrapper_parent_class)->finalize (object);
 }
 
-
-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_close (self->priv->database);
-	G_OBJECT_CLASS (rygel_media_export_sqlite_wrapper_parent_class)->finalize (obj);
+static void
+rygel_media_export_sqlite_wrapper_get_property (GObject    *object,
+                                                guint       property_id,
+                                                GValue     *value,
+                                                GParamSpec *pspec) {
+  RygelMediaExportSqliteWrapper *self = RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER (object);
+  RygelMediaExportSqliteWrapperPrivate *priv = self->priv;
+
+  switch (property_id) {
+  case RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER_DB:
+    g_value_set_pointer (value, self->priv->reference);
+    break;
+
+  default:
+    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+    break;
+  }
 }
 
-static void _vala_rygel_media_export_sqlite_wrapper_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
-	RygelMediaExportSqliteWrapper * self;
-	self = G_TYPE_CHECK_INSTANCE_CAST (object, RYGEL_MEDIA_EXPORT_TYPE_SQLITE_WRAPPER, RygelMediaExportSqliteWrapper);
-	switch (property_id) {
-		case RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER_DB:
-		g_value_set_pointer (value, rygel_media_export_sqlite_wrapper_get_db (self));
-		break;
-		default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-		break;
-	}
+static void
+rygel_media_export_sqlite_wrapper_set_property (GObject      *object,
+                                                guint         property_id,
+                                                const GValue *value,
+                                                GParamSpec   *pspec) {
+  RygelMediaExportSqliteWrapper *self = RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER (object);
+  RygelMediaExportSqliteWrapperPrivate *priv = self->priv;
+
+  switch (property_id) {
+  case RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER_DB:
+    g_value_set_pointer (value, self->priv->reference);
+    break;
+
+  case RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER_ONW_DB:
+    g_value_set_pointer (value, self->priv->database);
+    break;
+
+  default:
+    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+    break;
+  }
 }
 
+static void
+rygel_media_export_sqlite_wrapper_class_init (RygelMediaExportSqliteWrapperClass *wrapper_class) {
+  GObjectClass *object_class = G_OBJECT_CLASS (wrapper_class);
+
+  object_class->get_property = _vala_rygel_media_export_sqlite_wrapper_get_property;
+  object_class->set_property = _vala_rygel_media_export_sqlite_wrapper_set_property;
+  object_class->finalize = rygel_media_export_sqlite_wrapper_finalize;
+  /**
+   * Property to access the wrapped database
+   */
+  g_object_class_install_property (object_class,
+                                   RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER_DB,
+                                   g_param_spec_pointer ("db",
+                                                         "db",
+                                                         "db",
+                                                         G_PARAM_STATIC_NAME |
+                                                         G_PARAM_STATIC_NICK |
+                                                         G_PARAM_STATIC_BLURB |
+                                                         G_PARAM_READABLE |
+                                                         G_PARAM_WRITABLE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class,
+                                   RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER_DB,
+                                   g_param_spec_pointer ("own-db",
+                                                         "own-db",
+                                                         "own-db",
+                                                         G_PARAM_STATIC_NAME |
+                                                         G_PARAM_STATIC_NICK |
+                                                         G_PARAM_STATIC_BLURB |
+                                                         G_PARAM_WRITABLE |
+                                                         G_PARAM_CONSTRUCT_ONLY));
+
+  g_type_class_add_private (klass, sizeof (RygelMediaExportSqliteWrapperPrivate));
+}
 
-
+static void
+rygel_media_export_sqlite_wrapper_init (RygelMediaExportSqliteWrapper *self) {
+  self->priv = RYGEL_MEDIA_EXPORT_SQLITE_WRAPPER_GET_PRIVATE (self);
+  self->priv->database = NULL;
+  self->priv->reference = NULL;
+}
diff --git a/src/media-export/rygel-media-export-sqlite-wrapper.h b/src/media-export/rygel-media-export-sqlite-wrapper.h
index fba6aa0..198a495 100644
--- a/src/media-export/rygel-media-export-sqlite-wrapper.h
+++ b/src/media-export/rygel-media-export-sqlite-wrapper.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2009,2010 Jens Georg <mail jensge org>.
- * Copyright (C) 2012 Intel Corporation.
+ * Copyright (C) 2012, 2013 Intel Corporation.
  *
  * This file is part of Rygel.
  *
@@ -24,11 +24,6 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-#include <rygel-core.h>
-#include <rygel-server.h>
-#include <gee.h>
 
 G_BEGIN_DECLS
 
@@ -52,9 +47,12 @@ struct _RygelMediaExportSqliteWrapperClass {
   GObjectClass parent_class;
 };
 
-GType rygel_media_export_sqlite_wrapper_get_type (void) G_GNUC_CONST;
+GType
+rygel_media_export_sqlite_wrapper_get_type (void) G_GNUC_CONST;
 
-RygelMediaExportSqliteWrapper* rygel_media_export_sqlite_wrapper_new (const gchar* path, GError** error);
+RygelMediaExportSqliteWrapper *
+rygel_media_export_sqlite_wrapper_new (const gchar  *path,
+				       GError      **error);
 
 G_END_DECLS
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]