Fixing the name of the enum strings to match the StatusNotifier spec.

5 files changed, 20 insertions, 8 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 38e6dd9..efae713 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,9 +63,21 @@ pkgconfig_DATA = libappindicator/appindicator-0.1.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
 glib_enum_h = libappindicator/app-indicator-enum-types.h
-glib_enum_c = libappindicator/app-indicator-enum-types.c
+glib_enum_c = libappindicator/app-indicator-enum-types.gen.c
 glib_enum_headers = $(libappindicator_headers)
 
+libappindicator/app-indicator-enum-types.c: libappindicator/app-indicator-enum-types.gen.c
+	sed -e "s|\"passive\"|\"Passive\"|" \
+	    -e "s|\"active\"|\"Active\"|" \
+	    -e "s|\"attention\"|\"NeedsAttention\"|" \
+	    -e "s|\"application-status\"|\"ApplicationStatus\"|" \
+	    -e "s|\"communications\"|\"Communications\"|" \
+	    -e "s|\"system-services\"|\"SystemServices\"|" \
+	    -e "s|\"hardware\"|\"Hardware\"|" \
+	    -e "s|\"other\"|\"Other\"|" \
+	       $< > $@
+DISTCLEANFILES += libappindicator/app-indicator-enum-types.c
+
 lib_LTLIBRARIES = \
 	libappindicator.la
 
@@ -80,7 +92,7 @@ libappindicatorinclude_HEADERS = \
 
 libappindicator_la_SOURCES = \
 	$(libappindicator_headers) \
-	$(glib_enum_c) \
+	libappindicator/app-indicator-enum-types.c \
 	notification-watcher-client.h \
 	notification-item-server.h \
 	libappindicator/app-indicator.c
diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c
index 5b0cc15..70fab18 100644
--- a/src/application-service-appstore.c
+++ b/src/application-service-appstore.c
@@ -55,9 +55,9 @@ struct _ApplicationServiceAppstorePrivate {
 	AppLruFile * lrufile;
 };
 
-#define APP_STATUS_PASSIVE_STR    "passive"
-#define APP_STATUS_ACTIVE_STR     "active"
-#define APP_STATUS_ATTENTION_STR  "attention"
+#define APP_STATUS_PASSIVE_STR    "Passive"
+#define APP_STATUS_ACTIVE_STR     "Active"
+#define APP_STATUS_ATTENTION_STR  "NeedsAttention"
 
 typedef enum _ApplicationStatus ApplicationStatus;
 enum _ApplicationStatus {
diff --git a/src/libappindicator/app-indicator-enum-types.c.in b/src/libappindicator/app-indicator-enum-types.gen.c.in
index 449f3fc..449f3fc 100644
--- a/src/libappindicator/app-indicator-enum-types.c.in
+++ b/src/libappindicator/app-indicator-enum-types.gen.c.in
diff --git a/tests/test-defines.h b/tests/test-defines.h
index 3b75c87..2baf728 100644
--- a/tests/test-defines.h
+++ b/tests/test-defines.h
@@ -23,8 +23,8 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define  TEST_ICON_NAME            "my-icon-name"
 #define  TEST_ATTENTION_ICON_NAME  "my-attention-icon-name"
 #define  TEST_STATE                APP_INDICATOR_STATUS_ACTIVE
-#define  TEST_STATE_S              "active"
+#define  TEST_STATE_S              "Active"
 #define  TEST_CATEGORY             APP_INDICATOR_CATEGORY_APPLICATION_STATUS
-#define  TEST_CATEGORY_S           "application-status"
+#define  TEST_CATEGORY_S           "ApplicationStatus"
 #define  TEST_OBJECT               "/an/object/path/to/use"
 
diff --git a/tests/test-libappindicator-fallback-item.c b/tests/test-libappindicator-fallback-item.c
index 291bc7c..2c6e044 100644
--- a/tests/test-libappindicator-fallback-item.c
+++ b/tests/test-libappindicator-fallback-item.c
@@ -108,7 +108,7 @@ main (int argc, char ** argv)
 
 	TestLibappindicatorFallbackItem * item = g_object_new(TEST_LIBAPPINDICATOR_FALLBACK_ITEM_TYPE,
 		"id", "test-id",
-		"category", "other",
+		"category", "Other",
 		"icon-name", "bob",
 		NULL);