From 8dc712f472d18ea7b5c179334652cfbdc33cbe30 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 16 Oct 2009 16:04:18 -0500 Subject: Oops, shouldn't be CLUTTER there. --- src/libcustomindicator/custom-indicator-enum-types.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/libcustomindicator/custom-indicator-enum-types.h.in b/src/libcustomindicator/custom-indicator-enum-types.h.in index 4f636d4..4a6c9bd 100644 --- a/src/libcustomindicator/custom-indicator-enum-types.h.in +++ b/src/libcustomindicator/custom-indicator-enum-types.h.in @@ -28,6 +28,6 @@ G_END_DECLS Return value: A registered type for the enum */ GType @EnumName@_get_type (void) G_GNUC_CONST; -#define CLUTTER_TYPE_@ENUMSHORT@ (@EnumName@_get_type()) +#define CUSTOM_INDICATOR_TYPE_@ENUMSHORT@ (@EnumName@_get_type()) /*** END value-header ***/ -- cgit v1.2.3 From 06111bcb8f073c9e574d523d03ecf27f7a6d22e4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 17 Oct 2009 22:16:44 -0500 Subject: Making the enums camel case. I prefer the other, but it seems best to match GTK style --- src/libcustomindicator/custom-indicator.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/libcustomindicator/custom-indicator.h b/src/libcustomindicator/custom-indicator.h index 200e55f..0ac8808 100644 --- a/src/libcustomindicator/custom-indicator.h +++ b/src/libcustomindicator/custom-indicator.h @@ -14,7 +14,7 @@ G_BEGIN_DECLS #define CUSTOM_INDICATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CUSTOM_INDICATOR_TYPE, CustomIndicatorClass)) /** - custom_indicator_category_t: + CustomIndicatorCategory: @CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS: The indicator is used to display the status of the application. @CUSTOM_INDICATOR_CATEGORY_COMMUNICATIONS: The application is used for communication with other people. @CUSTOM_INDICATOR_CATEGORY_SYSTEM_SERVICES: A system indicator relating to something in the user's system. @@ -30,10 +30,10 @@ typedef enum { /*< prefix=CUSTOM_INDICATOR_CATEGORY >*/ CUSTOM_INDICATOR_CATEGORY_SYSTEM_SERVICES, CUSTOM_INDICATOR_CATEGORY_HARDWARE, CUSTOM_INDICATOR_CATEGORY_OTHER -} custom_indicator_category_t; +} CustomIndicatorCategory; /** - custom_indicator_status_t: + CustomIndicatorStatus: @CUSTOM_INDICATOR_STATUS_OFF: The indicator should not be shown to the user. @CUSTOM_INDICATOR_STATUS_ON: The indicator should be shown in it's default state. @CUSTOM_INDICATOR_STATUS_ATTENTION: The indicator should show it's attention icon. @@ -47,7 +47,7 @@ typedef enum { /*< prefix=CUSTOM_INDICATOR_STATUS >*/ CUSTOM_INDICATOR_STATUS_OFF, CUSTOM_INDICATOR_STATUS_ON, CUSTOM_INDICATOR_STATUS_ATTENTION -} custom_indicator_status_t; +} CustomIndicatorStatus; typedef struct _CustomIndicator CustomIndicator; typedef struct _CustomIndicatorClass CustomIndicatorClass; @@ -67,9 +67,9 @@ GType custom_indicator_get_type (void); void custom_indicator_set_id (CustomIndicator * ci, const gchar * id); void custom_indicator_set_category (CustomIndicator * ci, - custom_indicator_category_t category); + CustomIndicatorCategory category); void custom_indicator_set_status (CustomIndicator * ci, - custom_indicator_status_t status); + CustomIndicatorStatus status); void custom_indicator_set_icon (CustomIndicator * ci, const gchar * icon_name); void custom_indicator_set_attention_icon (CustomIndicator * ci, @@ -79,8 +79,8 @@ void custom_indicator_set_menu (CustomIndic /* Get properties */ const gchar * custom_indicator_get_id (CustomIndicator * ci); -custom_indicator_category_t custom_indicator_get_category (CustomIndicator * ci); -custom_indicator_status_t custom_indicator_get_status (CustomIndicator * ci); +CustomIndicatorCategory custom_indicator_get_category (CustomIndicator * ci); +CustomIndicatorStatus custom_indicator_get_status (CustomIndicator * ci); const gchar * custom_indicator_get_icon (CustomIndicator * ci); const gchar * custom_indicator_get_attention_icon (CustomIndicator * ci); void * custom_indicator_get_menu (CustomIndicator * ci); -- cgit v1.2.3 From 72815e195b42b8c4ed94f09af4b86a0d94393e5e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 17 Oct 2009 22:25:10 -0500 Subject: Getting the name change into the templates properly. --- src/libcustomindicator/custom-indicator-enum-types.c.in | 2 +- src/libcustomindicator/custom-indicator-enum-types.h.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/libcustomindicator/custom-indicator-enum-types.c.in b/src/libcustomindicator/custom-indicator-enum-types.c.in index 3f97040..51512f6 100644 --- a/src/libcustomindicator/custom-indicator-enum-types.c.in +++ b/src/libcustomindicator/custom-indicator-enum-types.c.in @@ -9,7 +9,7 @@ /*** BEGIN value-header ***/ GType -@EnumName@_get_type (void) +@enum_name@_get_type (void) { static GType etype = 0; if (G_UNLIKELY(etype == 0)) { diff --git a/src/libcustomindicator/custom-indicator-enum-types.h.in b/src/libcustomindicator/custom-indicator-enum-types.h.in index 4a6c9bd..e037be7 100644 --- a/src/libcustomindicator/custom-indicator-enum-types.h.in +++ b/src/libcustomindicator/custom-indicator-enum-types.h.in @@ -21,13 +21,13 @@ G_END_DECLS /*** BEGIN value-header ***/ /** - @EnumName@_get_type: + @enum_name@_get_type: Builds a glib type for the @EnumName@ enumeration. Return value: A registered type for the enum */ -GType @EnumName@_get_type (void) G_GNUC_CONST; -#define CUSTOM_INDICATOR_TYPE_@ENUMSHORT@ (@EnumName@_get_type()) +GType @enum_name@_get_type (void) G_GNUC_CONST; +#define CUSTOM_INDICATOR_TYPE_@ENUMSHORT@ (@enum_name@_get_type()) /*** END value-header ***/ -- cgit v1.2.3