Port applet to libmatemixer

1 files changed, 16 insertions, 11 deletions

diff --git a/mate-volume-control/src/gvc-applet.h b/mate-volume-control/src/gvc-applet.h
index 1cce717..50b3a80 100644
--- a/mate-volume-control/src/gvc-applet.h
+++ b/mate-volume-control/src/gvc-applet.h
@@ -21,34 +21,39 @@
 #ifndef __GVC_APPLET_H
 #define __GVC_APPLET_H
 
+#include <glib.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS
 
+#define GVC_APPLET_DBUS_NAME    "org.mate.VolumeControlApplet"
+
 #define GVC_TYPE_APPLET         (gvc_applet_get_type ())
 #define GVC_APPLET(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GVC_TYPE_APPLET, GvcApplet))
-#define GVC_APPLET_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GVC_TYPE_APPLET, GvcAppletClass))
+#define GVC_APPLET_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), GVC_TYPE_APPLET, GvcAppletClass))
 #define GVC_IS_APPLET(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GVC_TYPE_APPLET))
 #define GVC_IS_APPLET_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GVC_TYPE_APPLET))
 #define GVC_APPLET_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GVC_TYPE_APPLET, GvcAppletClass))
 
-typedef struct GvcAppletPrivate GvcAppletPrivate;
+typedef struct _GvcApplet         GvcApplet;
+typedef struct _GvcAppletClass    GvcAppletClass;
+typedef struct _GvcAppletPrivate  GvcAppletPrivate;
 
-typedef struct
+struct _GvcApplet
 {
-        GObject            parent;
-        GvcAppletPrivate *priv;
-} GvcApplet;
+        GObject                 parent;
+        GvcAppletPrivate       *priv;
+};
 
-typedef struct
+struct _GvcAppletClass
 {
-        GObjectClass   parent_class;
-} GvcAppletClass;
+        GObjectClass            parent_class;
+};
 
-GType               gvc_applet_get_type            (void);
+GType               gvc_applet_get_type            (void) G_GNUC_CONST;
 
 GvcApplet *         gvc_applet_new                 (void);
-void                gvc_applet_start               (GvcApplet     *applet);
+void                gvc_applet_start               (GvcApplet *applet);
 
 G_END_DECLS