From 6be9a89195e0d3bf8408cea661f22cb97b638f24 Mon Sep 17 00:00:00 2001
From: Michal Ratajsky <michal.ratajsky@gmail.com>
Date: Fri, 20 Jun 2014 00:12:40 +0200
Subject: Pulse and API updates, fixes

---
 backends/null/null-backend.c | 16 +++++++++-------
 backends/null/null-backend.h |  6 ++----
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'backends/null')

diff --git a/backends/null/null-backend.c b/backends/null/null-backend.c
index f8c22c8..46c5fbf 100644
--- a/backends/null/null-backend.c
+++ b/backends/null/null-backend.c
@@ -15,11 +15,14 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+// XXX implement properties from MateMixerBackend
+
 #include <glib.h>
 #include <glib-object.h>
 
 #include <libmatemixer/matemixer-backend.h>
 #include <libmatemixer/matemixer-backend-module.h>
+#include <libmatemixer/matemixer-enums.h>
 
 #include "null-backend.h"
 
@@ -28,17 +31,17 @@
 
 static void mate_mixer_backend_interface_init (MateMixerBackendInterface *iface);
 
+static void null_backend_class_init     (NullBackendClass *klass);
+static void null_backend_class_finalize (NullBackendClass *klass);
+static void null_backend_init           (NullBackend      *null);
+
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (NullBackend, null_backend,
                                 G_TYPE_OBJECT, 0,
                                 G_IMPLEMENT_INTERFACE_DYNAMIC (MATE_MIXER_TYPE_BACKEND,
                                                                mate_mixer_backend_interface_init))
 
-static void           null_backend_class_init     (NullBackendClass *klass);
-static void           null_backend_class_finalize (NullBackendClass *klass);
-static void           null_backend_init           (NullBackend      *null);
-
-static gboolean       backend_open                (MateMixerBackend *backend);
-static MateMixerState backend_get_state           (MateMixerBackend *backend);
+static gboolean       backend_open      (MateMixerBackend *backend);
+static MateMixerState backend_get_state (MateMixerBackend *backend);
 
 static MateMixerBackendInfo info;
 
@@ -69,7 +72,6 @@ mate_mixer_backend_interface_init (MateMixerBackendInterface *iface)
 static void
 null_backend_class_init (NullBackendClass *klass)
 {
-    // XXX is it needed to have this function? shouldn't it call parent method if empty?
 }
 
 /* Called in the code generated by G_DEFINE_DYNAMIC_TYPE_EXTENDED() */
diff --git a/backends/null/null-backend.h b/backends/null/null-backend.h
index 2d718e3..ae5f087 100644
--- a/backends/null/null-backend.h
+++ b/backends/null/null-backend.h
@@ -32,7 +32,7 @@
 #define NULL_BACKEND_CLASS(k)                   \
         (G_TYPE_CHECK_CLASS_CAST ((k), NULL_TYPE_BACKEND, NullBackendClass))
 #define NULL_IS_BACKEND_CLASS(k)                \
-        (G_TYPE_CLASS_CHECK_CLASS_TYPE ((k), NULL_TYPE_BACKEND))
+        (G_TYPE_CHECK_CLASS_TYPE ((k), NULL_TYPE_BACKEND))
 #define NULL_BACKEND_GET_CLASS(o)               \
         (G_TYPE_INSTANCE_GET_CLASS ((o), NULL_TYPE_BACKEND, NullBackendClass))
 
@@ -41,14 +41,12 @@ typedef struct _NullBackendClass  NullBackendClass;
 
 struct _NullBackend
 {
-    /*< private >*/
     GObject parent;
 };
 
 struct _NullBackendClass
 {
-    /*< private >*/
-    GObjectClass parent;
+    GObjectClass parent_class;
 };
 
 GType                       null_backend_get_type   (void) G_GNUC_CONST;
-- 
cgit v1.2.1