Making 'INDICATOR' the prefix for the objects.

4 files changed, 9 insertions, 9 deletions

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;