[tracker/libtracker-bus: 43/44] libtracker-bus: Cleaned up -shared C API

[Jürg Billeter <juergbi src gnome org>]

commit f9f35d3a79692fdbc4f289bf4f799280c28f576e
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Aug 13 14:37:59 2010 +0100

    libtracker-bus: Cleaned up -shared C API

 src/libtracker-bus/tracker-bus-shared.c |   11 ++++-------
 src/libtracker-bus/tracker-bus-shared.h |   11 +++++++----
 2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/libtracker-bus/tracker-bus-shared.c b/src/libtracker-bus/tracker-bus-shared.c
index b855230..267801b 100644
--- a/src/libtracker-bus/tracker-bus-shared.c
+++ b/src/libtracker-bus/tracker-bus-shared.c
@@ -21,11 +21,6 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <unistd.h>
-
 #include <glib-object.h>
 
 #include <libtracker-common/tracker-common.h>
@@ -33,13 +28,15 @@
 
 #include "tracker-bus-shared.h"
 
-GVariant*
+GVariant *
 tracker_bus_message_to_variant (DBusMessage *message)
 {
 	GVariantBuilder builder;
 	DBusMessageIter iter, subiter, subsubiter;
 
-	/*aaa{ss}*/
+	g_return_val_if_fail (message != NULL, NULL);
+
+	/* Expecting aaa{ss} */
 
 	g_variant_builder_init (&builder, G_VARIANT_TYPE ("aaa{ss}")); /* a */
 
diff --git a/src/libtracker-bus/tracker-bus-shared.h b/src/libtracker-bus/tracker-bus-shared.h
index 85b2dff..6ca2dc3 100644
--- a/src/libtracker-bus/tracker-bus-shared.h
+++ b/src/libtracker-bus/tracker-bus-shared.h
@@ -1,7 +1,5 @@
 /*
- * Copyright (C) 2006, Jamie McCracken <jamiemcc gnome org>
- * Copyright (C) 2008-2010, Nokia <ivan frade nokia com>
- * Copyright (C) 2010, Codeminded BVBA <philip codeminded be>
+ * Copyright (C) 2010, Nokia <ivan frade nokia com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,8 +17,13 @@
  * Boston, MA  02110-1301, USA.
  */
 
+#ifndef __TRACKER_BUS_SHARED_H__
+#define __TRACKER_BUS_SHARED_H__
+
 G_BEGIN_DECLS
 
-GVariant* tracker_bus_message_to_variant (DBusMessage *message);
+GVariant *tracker_bus_message_to_variant (DBusMessage *message);
 
 G_END_DECLS
+
+#endif /* __TRACKER_BUS_SHARED_H__ */