From ba8af8211f01a5c470ac30275e907bc5a26be910 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Oct 2009 09:27:05 -0500 Subject: Putting in some templated objects. --- libindicator/indicator-service.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 libindicator/indicator-service.h (limited to 'libindicator/indicator-service.h') diff --git a/libindicator/indicator-service.h b/libindicator/indicator-service.h new file mode 100644 index 0000000..0cec28c --- /dev/null +++ b/libindicator/indicator-service.h @@ -0,0 +1,33 @@ +#ifndef __INDICATOR_SERVICE_H__ +#define __INDICATOR_SERVICE_H__ + +#include +#include + +G_BEGIN_DECLS + +#define INDICATOR_SERVICE_TYPE (indicator_service_get_type ()) +#define INDICATOR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_SERVICE_TYPE, IndicatorService)) +#define INDICATOR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_SERVICE_TYPE, IndicatorServiceClass)) +#define IS_INDICATOR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_SERVICE_TYPE)) +#define IS_INDICATOR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_SERVICE_TYPE)) +#define INDICATOR_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_SERVICE_TYPE, IndicatorServiceClass)) + +typedef struct _IndicatorService IndicatorService; +typedef struct _IndicatorServiceClass IndicatorServiceClass; + +struct _IndicatorServiceClass { + GObjectClass parent_class; + +}; + +struct _IndicatorService { + GObject parent; + +}; + +GType indicator_service_get_type (void); + +G_END_DECLS + +#endif -- cgit v1.2.3 From b8db81899bc6903c7c1a21b434caaa862c29ea32 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Oct 2009 09:33:21 -0500 Subject: Making 'INDICATOR' the prefix for the objects. --- libindicator/indicator-object.c | 6 +++--- libindicator/indicator-object.h | 4 ++-- libindicator/indicator-service-manager.h | 4 ++-- libindicator/indicator-service.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'libindicator/indicator-service.h') diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 5921ce5..ed9214c 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -246,7 +246,7 @@ unrefandout: GtkLabel * indicator_object_get_label (IndicatorObject * io) { - g_return_val_if_fail(IS_INDICATOR_OBJECT(io), NULL); + g_return_val_if_fail(INDICATOR_IS_OBJECT(io), NULL); IndicatorObjectPrivate * priv = INDICATOR_OBJECT_GET_PRIVATE(io); return priv->label; } @@ -264,7 +264,7 @@ indicator_object_get_label (IndicatorObject * io) GtkImage * indicator_object_get_icon (IndicatorObject * io) { - g_return_val_if_fail(IS_INDICATOR_OBJECT(io), NULL); + g_return_val_if_fail(INDICATOR_IS_OBJECT(io), NULL); IndicatorObjectPrivate * priv = INDICATOR_OBJECT_GET_PRIVATE(io); return priv->icon; } @@ -282,7 +282,7 @@ indicator_object_get_icon (IndicatorObject * io) GtkMenu * indicator_object_get_menu (IndicatorObject * io) { - g_return_val_if_fail(IS_INDICATOR_OBJECT(io), NULL); + g_return_val_if_fail(INDICATOR_IS_OBJECT(io), NULL); IndicatorObjectPrivate * priv = INDICATOR_OBJECT_GET_PRIVATE(io); return priv->menu; } diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h index cb01b85..ea3f52e 100644 --- a/libindicator/indicator-object.h +++ b/libindicator/indicator-object.h @@ -31,8 +31,8 @@ G_BEGIN_DECLS #define INDICATOR_OBJECT_TYPE (indicator_object_get_type ()) #define INDICATOR_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_OBJECT_TYPE, IndicatorObject)) #define INDICATOR_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_OBJECT_TYPE, IndicatorObjectClass)) -#define IS_INDICATOR_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_OBJECT_TYPE)) -#define IS_INDICATOR_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_OBJECT_TYPE)) +#define INDICATOR_IS_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_OBJECT_TYPE)) +#define INDICATOR_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_OBJECT_TYPE, IndicatorObjectClass)) typedef struct _IndicatorObject IndicatorObject; diff --git a/libindicator/indicator-service-manager.h b/libindicator/indicator-service-manager.h index 61c6e64..f2e4d75 100644 --- a/libindicator/indicator-service-manager.h +++ b/libindicator/indicator-service-manager.h @@ -9,8 +9,8 @@ G_BEGIN_DECLS #define INDICATOR_SERVICE_MANAGER_TYPE (indicator_service_manager_get_type ()) #define INDICATOR_SERVICE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_SERVICE_MANAGER_TYPE, IndicatorServiceManager)) #define INDICATOR_SERVICE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_SERVICE_MANAGER_TYPE, IndicatorServiceManagerClass)) -#define IS_INDICATOR_SERVICE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_SERVICE_MANAGER_TYPE)) -#define IS_INDICATOR_SERVICE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_SERVICE_MANAGER_TYPE)) +#define INDICATOR_IS_SERVICE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_SERVICE_MANAGER_TYPE)) +#define INDICATOR_IS_SERVICE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_SERVICE_MANAGER_TYPE)) #define INDICATOR_SERVICE_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_SERVICE_MANAGER_TYPE, IndicatorServiceManagerClass)) typedef struct _IndicatorServiceManager IndicatorServiceManager; diff --git a/libindicator/indicator-service.h b/libindicator/indicator-service.h index 0cec28c..48f1d81 100644 --- a/libindicator/indicator-service.h +++ b/libindicator/indicator-service.h @@ -9,8 +9,8 @@ G_BEGIN_DECLS #define INDICATOR_SERVICE_TYPE (indicator_service_get_type ()) #define INDICATOR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_SERVICE_TYPE, IndicatorService)) #define INDICATOR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_SERVICE_TYPE, IndicatorServiceClass)) -#define IS_INDICATOR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_SERVICE_TYPE)) -#define IS_INDICATOR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_SERVICE_TYPE)) +#define INDICATOR_IS_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_SERVICE_TYPE)) +#define INDICATOR_IS_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_SERVICE_TYPE)) #define INDICATOR_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_SERVICE_TYPE, IndicatorServiceClass)) typedef struct _IndicatorService IndicatorService; -- cgit v1.2.3 From b60a7f11342b8711e4bea8a51cc558d30ebbb293 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Oct 2009 10:49:12 -0500 Subject: Adding basic interfaces and docs to IndicatorService --- libindicator/indicator-service.h | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'libindicator/indicator-service.h') diff --git a/libindicator/indicator-service.h b/libindicator/indicator-service.h index 48f1d81..63c3f4b 100644 --- a/libindicator/indicator-service.h +++ b/libindicator/indicator-service.h @@ -13,14 +13,39 @@ G_BEGIN_DECLS #define INDICATOR_IS_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_SERVICE_TYPE)) #define INDICATOR_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_SERVICE_TYPE, IndicatorServiceClass)) +#define INDICATOR_SERVICE_SIGNAL_SHUTDOWN "shutdown" + typedef struct _IndicatorService IndicatorService; typedef struct _IndicatorServiceClass IndicatorServiceClass; +/** + IndicatorServiceClass: + @parent_class: #GObjectClass + @shutdown: Slot for IndicatorServiceClass::shutdown + @indicator_service_reserved1: Reserved for future use + @indicator_service_reserved2: Reserved for future use + @indicator_service_reserved3: Reserved for future use + @indicator_service_reserved4: Reserved for future use + +*/ struct _IndicatorServiceClass { GObjectClass parent_class; - + + /* Signals */ + void (*shutdown) (IndicatorService * service, gpointer user_data); + + /* Reserved */ + void (*indicator_service_reserved1) (void); + void (*indicator_service_reserved2) (void); + void (*indicator_service_reserved3) (void); + void (*indicator_service_reserved4) (void); }; +/** + IndicatorService: + @parent: #GObject + +*/ struct _IndicatorService { GObject parent; @@ -28,6 +53,8 @@ struct _IndicatorService { GType indicator_service_get_type (void); +IndicatorService * inidcator_service_new (gchar * name); + G_END_DECLS #endif -- cgit v1.2.3 From ec0809ed60a94f582ad7111a992fa0f60e493016 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Oct 2009 11:33:37 -0500 Subject: Putting a dummy implementation in for _new for linking --- libindicator/indicator-service.c | 8 ++++++++ libindicator/indicator-service.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'libindicator/indicator-service.h') diff --git a/libindicator/indicator-service.c b/libindicator/indicator-service.c index 089c9ad..7a1fa8a 100644 --- a/libindicator/indicator-service.c +++ b/libindicator/indicator-service.c @@ -56,3 +56,11 @@ indicator_service_finalize (GObject *object) G_OBJECT_CLASS (indicator_service_parent_class)->finalize (object); return; } + +IndicatorService * +indicator_service_new (gchar * name) +{ + GObject * obj = g_object_new(INDICATOR_SERVICE_TYPE, NULL); + + return INDICATOR_SERVICE(obj); +} diff --git a/libindicator/indicator-service.h b/libindicator/indicator-service.h index 63c3f4b..b47a91a 100644 --- a/libindicator/indicator-service.h +++ b/libindicator/indicator-service.h @@ -53,7 +53,7 @@ struct _IndicatorService { GType indicator_service_get_type (void); -IndicatorService * inidcator_service_new (gchar * name); +IndicatorService * indicator_service_new (gchar * name); G_END_DECLS -- cgit v1.2.3