Updated the formatting for the interface

3 files changed, 117 insertions, 119 deletions

diff --git a/src/dbus-shared.h b/src/dbus-shared.h
index f45a82b..313ccf1 100644
--- a/src/dbus-shared.h
+++ b/src/dbus-shared.h
@@ -19,10 +19,9 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#define SERVICE_NAME    "com.example.indicator.example"
+#define SERVICE_IFACE   "com.example.indicator.example.service"
+#define SERVICE_OBJ     "/com/example/indicator/example/service"
+#define SERVICE_VERSION 1
 
-#define  SERVICE_NAME     "com.example.indicator.example"
-#define  SERVICE_IFACE    "com.example.indicator.example.service"
-#define  SERVICE_OBJ      "/com/example/indicator/example/service"
-#define  SERVICE_VERSION  1
-
-#define  MENU_OBJ      "/com/example/indicator/example/menu"
+#define MENU_OBJ        "/com/example/indicator/example/menu"
diff --git a/src/example-interface.c b/src/example-interface.c
index 2b5fe1b..3f99538 100644
--- a/src/example-interface.c
+++ b/src/example-interface.c
@@ -30,154 +30,153 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "dbus-shared.h"
 
 /**
-	ExampleInterfacePrivate:
-	@dbus_registration: The handle for this object being registered
-		on dbus.
+ExampleInterfacePrivate:
+@dbus_registration: The handle for this object being registered
+on dbus.
 
-	Structure to define the memory for the private area
-	of the example interface instance.
+Structure to define the memory for the private area
+of the example interface instance.
 */
 struct _ExampleInterfacePrivate {
-	GDBusConnection * bus;
-	GCancellable * bus_cancel;
-	guint dbus_registration;
+  GDBusConnection *bus;
+  GCancellable *bus_cancel;
+  guint dbus_registration;
 };
 
 #define EXAMPLE_INTERFACE_GET_PRIVATE(o) (EXAMPLE_INTERFACE(o)->priv)
 
 /* GDBus Stuff */
-static GDBusNodeInfo *      node_info = NULL;
-static GDBusInterfaceInfo * interface_info = NULL;
+static GDBusNodeInfo *node_info = NULL;
+static GDBusInterfaceInfo *interface_info = NULL;
 
-static void example_interface_class_init (ExampleInterfaceClass *klass);
-static void example_interface_init       (ExampleInterface *self);
-static void example_interface_dispose    (GObject *object);
-static void example_interface_finalize   (GObject *object);
-static void bus_get_cb (GObject * object, GAsyncResult * res, gpointer user_data);
+static void example_interface_class_init(ExampleInterfaceClass *klass);
+static void example_interface_init(ExampleInterface *self);
+static void example_interface_dispose(GObject *object);
+static void example_interface_finalize(GObject *object);
+static void bus_get_cb(GObject *object, GAsyncResult *res, gpointer user_data);
 
 G_DEFINE_TYPE (ExampleInterface, example_interface, G_TYPE_OBJECT);
 
 static void
-example_interface_class_init (ExampleInterfaceClass *klass)
+example_interface_class_init(ExampleInterfaceClass *klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	g_type_class_add_private (klass, sizeof (ExampleInterfacePrivate));
+  g_type_class_add_private(klass, sizeof(ExampleInterfacePrivate));
 
-	object_class->dispose = example_interface_dispose;
-	object_class->finalize = example_interface_finalize;
+  object_class->dispose = example_interface_dispose;
+  object_class->finalize = example_interface_finalize;
 
-	/* Setting up the DBus interfaces */
-	if (node_info == NULL) {
-		GError * error = NULL;
+  /* Setting up the DBus interfaces */
+  if(node_info == NULL) {
+    GError * error = NULL;
 
-		node_info = g_dbus_node_info_new_for_xml(_example_service, &error);
-		if (error != NULL) {
-			g_error("Unable to parse Example Service Interface description: %s", error->message);
-			g_error_free(error);
-		}
-	}
+    node_info = g_dbus_node_info_new_for_xml(_example_service, &error);
+    if(error != NULL) {
+      g_error("Unable to parse Example Service Interface description: %s", error->message);
+      g_error_free(error);
+    }
+  }
 
-	if (interface_info == NULL) {
-		interface_info = g_dbus_node_info_lookup_interface(node_info, SERVICE_IFACE);
+  if (interface_info == NULL) {
+    interface_info = g_dbus_node_info_lookup_interface(node_info, SERVICE_IFACE);
 
-		if (interface_info == NULL) {
-			g_error("Unable to find interface '" SERVICE_IFACE "'");
-		}
-	}
+    if (interface_info == NULL) {
+      g_error("Unable to find interface '" SERVICE_IFACE "'");
+    }
+  }
 
-	return;
+  return;
 }
 
 static void
-example_interface_init (ExampleInterface *self)
+example_interface_init(ExampleInterface *self)
 {
-	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, EXAMPLE_INTERFACE_TYPE, ExampleInterfacePrivate);
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, EXAMPLE_INTERFACE_TYPE, ExampleInterfacePrivate);
 
-	self->priv->bus = NULL;
-	self->priv->bus_cancel = NULL;
-	self->priv->dbus_registration = 0;
+  self->priv->bus = NULL;
+  self->priv->bus_cancel = NULL;
+  self->priv->dbus_registration = 0;
 
-	self->priv->bus_cancel = g_cancellable_new();
-	g_bus_get(G_BUS_TYPE_SESSION,
-	          self->priv->bus_cancel,
-	          bus_get_cb,
-	          self);
+  self->priv->bus_cancel = g_cancellable_new();
+  g_bus_get(G_BUS_TYPE_SESSION,
+            self->priv->bus_cancel,
+            bus_get_cb,
+            self);
 
-	return;
+  return;
 }
 
 static void
-bus_get_cb (GObject * object, GAsyncResult * res, gpointer user_data)
+bus_get_cb(GObject *object, GAsyncResult *res, gpointer user_data)
 {
-	GError * error = NULL;
-	GDBusConnection * connection = g_bus_get_finish(res, &error);
-
-	if (error != NULL) {
-		g_error("OMG! Unable to get a connection to DBus: %s", error->message);
-		g_error_free(error);
-		return;
-	}
-
-	ExampleInterfacePrivate * priv = EXAMPLE_INTERFACE_GET_PRIVATE(user_data);
-
-	g_warn_if_fail(priv->bus == NULL);
-	priv->bus = connection;
-
-	if (priv->bus_cancel != NULL) {
-		g_object_unref(priv->bus_cancel);
-		priv->bus_cancel = NULL;
-	}
-
-	/* Now register our object on our new connection */
-	priv->dbus_registration = g_dbus_connection_register_object(priv->bus,
-	                                                            SERVICE_OBJ,
-	                                                            interface_info,
-	                                                            NULL,
-	                                                            user_data,
-	                                                            NULL,
-	                                                            &error);
-
-	if (error != NULL) {
-		g_error("Unable to register the object to DBus: %s", error->message);
-		g_error_free(error);
-		return;
-	}
-
-	return;	
+  GError *error = NULL;
+  GDBusConnection *connection = g_bus_get_finish(res, &error);
+
+  if(error != NULL) {
+    g_error("OMG! Unable to get a connection to DBus: %s", error->message);
+    g_error_free(error);
+    return;
+  }
+
+  ExampleInterfacePrivate *priv = EXAMPLE_INTERFACE_GET_PRIVATE(user_data);
+
+  g_warn_if_fail(priv->bus == NULL);
+  priv->bus = connection;
+
+  if(priv->bus_cancel != NULL) {
+    g_object_unref(priv->bus_cancel);
+    priv->bus_cancel = NULL;
+  }
+
+  /* Now register our object on our new connection */
+  priv->dbus_registration = g_dbus_connection_register_object(priv->bus,
+    SERVICE_OBJ,
+    interface_info,
+    NULL,
+    user_data,
+    NULL,
+    &error);
+
+  if(error != NULL) {
+    g_error("Unable to register the object to DBus: %s", error->message);
+    g_error_free(error);
+    return;
+  }
+
+  return;	
 }
 
 static void
-example_interface_dispose (GObject *object)
+example_interface_dispose(GObject *object)
 {
-	ExampleInterfacePrivate * priv = EXAMPLE_INTERFACE_GET_PRIVATE(object);
-
-	if (priv->dbus_registration != 0) {
-		g_dbus_connection_unregister_object(priv->bus, priv->dbus_registration);
-		/* Don't care if it fails, there's nothing we can do */
-		priv->dbus_registration = 0;
-	}
-
-	if (priv->bus != NULL) {
-		g_object_unref(priv->bus);
-		priv->bus = NULL;
-	}
-
-	if (priv->bus_cancel != NULL) {
-		g_cancellable_cancel(priv->bus_cancel);
-		g_object_unref(priv->bus_cancel);
-		priv->bus_cancel = NULL;
-	}
-
-	G_OBJECT_CLASS (example_interface_parent_class)->dispose (object);
-	return;
+  ExampleInterfacePrivate * priv = EXAMPLE_INTERFACE_GET_PRIVATE(object);
+
+  if(priv->dbus_registration != 0) {
+    g_dbus_connection_unregister_object(priv->bus, priv->dbus_registration);
+    /* Don't care if it fails, there's nothing we can do */
+    priv->dbus_registration = 0;
+  }
+
+  if(priv->bus != NULL) {
+    g_object_unref(priv->bus);
+    priv->bus = NULL;
+  }
+
+  if(priv->bus_cancel != NULL) {
+    g_cancellable_cancel(priv->bus_cancel);
+    g_object_unref(priv->bus_cancel);
+    priv->bus_cancel = NULL;
+  }
+
+  G_OBJECT_CLASS (example_interface_parent_class)->dispose (object);
+  return;
 }
 
 static void
-example_interface_finalize (GObject *object)
+example_interface_finalize(GObject *object)
 {
-
-	G_OBJECT_CLASS (example_interface_parent_class)->finalize (object);
-	return;
+  G_OBJECT_CLASS (example_interface_parent_class)->finalize (object);
+  return;
 }
 
diff --git a/src/example-interface.h b/src/example-interface.h
index c3de461..fc6860c 100644
--- a/src/example-interface.h
+++ b/src/example-interface.h
@@ -39,15 +39,15 @@ typedef struct _ExampleInterfacePrivate ExampleInterfacePrivate;
 typedef struct _ExampleInterfaceClass   ExampleInterfaceClass;
 
 struct _ExampleInterfaceClass {
-	GObjectClass parent_class;
+  GObjectClass parent_class;
 };
 
 struct _ExampleInterface {
-	GObject parent;
-	ExampleInterfacePrivate * priv;
+  GObject parent;
+  ExampleInterfacePrivate *priv;
 };
 
-GType              example_interface_get_type       (void);
+GType example_interface_get_type(void);
 
 G_END_DECLS