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-manager.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 libindicator/indicator-service-manager.h (limited to 'libindicator/indicator-service-manager.h') diff --git a/libindicator/indicator-service-manager.h b/libindicator/indicator-service-manager.h new file mode 100644 index 0000000..61c6e64 --- /dev/null +++ b/libindicator/indicator-service-manager.h @@ -0,0 +1,32 @@ +#ifndef __INDICATOR_SERVICE_MANAGER_H__ +#define __INDICATOR_SERVICE_MANAGER_H__ + +#include +#include + +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_SERVICE_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_SERVICE_MANAGER_TYPE, IndicatorServiceManagerClass)) + +typedef struct _IndicatorServiceManager IndicatorServiceManager; +typedef struct _IndicatorServiceManagerClass IndicatorServiceManagerClass; + +struct _IndicatorServiceManagerClass { + GObjectClass parent_class; + +}; + +struct _IndicatorServiceManager { + GObject parent; +}; + +GType indicator_service_manager_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-manager.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 0af9206bc55a78a2e39ba86b07450a15ed399eee Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Oct 2009 09:56:39 -0500 Subject: Defining some API and boot strapping documentation. --- libindicator/indicator-service-manager.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'libindicator/indicator-service-manager.h') diff --git a/libindicator/indicator-service-manager.h b/libindicator/indicator-service-manager.h index f2e4d75..127d56b 100644 --- a/libindicator/indicator-service-manager.h +++ b/libindicator/indicator-service-manager.h @@ -13,20 +13,51 @@ G_BEGIN_DECLS #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)) +#define INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE "connection-change" + typedef struct _IndicatorServiceManager IndicatorServiceManager; typedef struct _IndicatorServiceManagerClass IndicatorServiceManagerClass; +/** + IndicatorServiceManagerClass: + @parent: #GObjectClass + @connection_changed: Slot for #IndicatorServiceManager::connection-changed. + @indicator_service_manager_reserved1: Reserved for future use. + @indicator_service_manager_reserved2: Reserved for future use. + @indicator_service_manager_reserved3: Reserved for future use. + @indicator_service_manager_reserved4: Reserved for future use. + +*/ struct _IndicatorServiceManagerClass { GObjectClass parent_class; + /* Signals */ + void (*connection_change) (IndicatorServiceManager * sm, gboolean connected, gpointer user_data); + + /* Buffer */ + void (*indicator_service_manager_reserved1) (void); + void (*indicator_service_manager_reserved2) (void); + void (*indicator_service_manager_reserved3) (void); + void (*indicator_service_manager_reserved4) (void); }; +/** + IndicatorServiceManager: + @parent: #GObject + +*/ struct _IndicatorServiceManager { GObject parent; + }; GType indicator_service_manager_get_type (void); +IndicatorServiceManager * indicator_service_manager_new (gchar * dbus_name); +gboolean indicator_service_manager_connected (IndicatorServiceManager * sm); +void indicator_service_manager_set_refresh (IndicatorServiceManager * sm, + guint time_in_ms); + G_END_DECLS #endif -- cgit v1.2.3