From de3e2fc0c8a77708b4921c4d3b3c83efee01cc28 Mon Sep 17 00:00:00 2001 From: Michal Ratajsky Date: Fri, 20 Jun 2014 16:14:59 +0200 Subject: Port applet to libmatemixer --- mate-volume-control/src/gvc-stream-status-icon.h | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'mate-volume-control/src/gvc-stream-status-icon.h') diff --git a/mate-volume-control/src/gvc-stream-status-icon.h b/mate-volume-control/src/gvc-stream-status-icon.h index 8c984a0..cd32f64 100644 --- a/mate-volume-control/src/gvc-stream-status-icon.h +++ b/mate-volume-control/src/gvc-stream-status-icon.h @@ -21,34 +21,37 @@ #ifndef __GVC_STREAM_STATUS_ICON_H #define __GVC_STREAM_STATUS_ICON_H +#include #include -#include "gvc-mixer-stream.h" +#include G_BEGIN_DECLS #define GVC_TYPE_STREAM_STATUS_ICON (gvc_stream_status_icon_get_type ()) #define GVC_STREAM_STATUS_ICON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GVC_TYPE_STREAM_STATUS_ICON, GvcStreamStatusIcon)) -#define GVC_STREAM_STATUS_ICON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GVC_TYPE_STREAM_STATUS_ICON, GvcStreamStatusIconClass)) +#define GVC_STREAM_STATUS_ICON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GVC_TYPE_STREAM_STATUS_ICON, GvcStreamStatusIconClass)) #define GVC_IS_STREAM_STATUS_ICON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GVC_TYPE_STREAM_STATUS_ICON)) #define GVC_IS_STREAM_STATUS_ICON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GVC_TYPE_STREAM_STATUS_ICON)) #define GVC_STREAM_STATUS_ICON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GVC_TYPE_STREAM_STATUS_ICON, GvcStreamStatusIconClass)) -typedef struct GvcStreamStatusIconPrivate GvcStreamStatusIconPrivate; +typedef struct _GvcStreamStatusIcon GvcStreamStatusIcon; +typedef struct _GvcStreamStatusIconClass GvcStreamStatusIconClass; +typedef struct _GvcStreamStatusIconPrivate GvcStreamStatusIconPrivate; -typedef struct +struct _GvcStreamStatusIcon { GtkStatusIcon parent; GvcStreamStatusIconPrivate *priv; -} GvcStreamStatusIcon; +}; -typedef struct +struct _GvcStreamStatusIconClass { GtkStatusIconClass parent_class; -} GvcStreamStatusIconClass; +}; -GType gvc_stream_status_icon_get_type (void); +GType gvc_stream_status_icon_get_type (void) G_GNUC_CONST; -GvcStreamStatusIcon * gvc_stream_status_icon_new (GvcMixerStream *stream, +GvcStreamStatusIcon * gvc_stream_status_icon_new (MateMixerStream *stream, const char **icon_names); void gvc_stream_status_icon_set_icon_names (GvcStreamStatusIcon *icon, @@ -56,7 +59,7 @@ void gvc_stream_status_icon_set_icon_names (GvcStreamStatu void gvc_stream_status_icon_set_display_name (GvcStreamStatusIcon *icon, const char *display_name); void gvc_stream_status_icon_set_mixer_stream (GvcStreamStatusIcon *icon, - GvcMixerStream *stream); + MateMixerStream *stream); G_END_DECLS -- cgit v1.2.1