aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-02-01 11:41:53 -0800
committerTed Gould <ted@gould.cx>2010-02-01 11:41:53 -0800
commitd6090e476c3a1041d0c6216d0127429e3a7842e3 (patch)
tree6813f9b7117a5cf6fb9fc88c15e858940f9f99ae /src
parentae7bfd4df40c251638f35d301f5d684857b0d47e (diff)
parentc73f5af91cace98d07161252b1a78bb3203e67a8 (diff)
downloadlibayatana-appindicator-d6090e476c3a1041d0c6216d0127429e3a7842e3.tar.gz
libayatana-appindicator-d6090e476c3a1041d0c6216d0127429e3a7842e3.tar.bz2
libayatana-appindicator-d6090e476c3a1041d0c6216d0127429e3a7842e3.zip
Fixing the name of the enum strings to match the StatusNotifier spec.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am16
-rw-r--r--src/application-service-appstore.c6
-rw-r--r--src/libappindicator/app-indicator-enum-types.gen.c.in (renamed from src/libappindicator/app-indicator-enum-types.c.in)0
3 files changed, 17 insertions, 5 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