aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.am78
-rw-r--r--src/application-service-appstore.c (renamed from src/custom-service-appstore.c)0
-rw-r--r--src/application-service-appstore.h (renamed from src/custom-service-appstore.h)0
-rw-r--r--src/application-service-marshal.list (renamed from src/custom-service-marshal.list)0
-rw-r--r--src/application-service-watcher.c (renamed from src/custom-service-watcher.c)0
-rw-r--r--src/application-service-watcher.h (renamed from src/custom-service-watcher.h)0
-rw-r--r--src/application-service.c (renamed from src/custom-service.c)0
-rw-r--r--src/application-service.xml (renamed from src/custom-service.xml)0
-rw-r--r--src/indicator-application.c (renamed from src/indicator-custom.c)0
-rw-r--r--src/libapplicationindicator/application-indicator-enum-types.c.in (renamed from src/libcustomindicator/custom-indicator-enum-types.c.in)0
-rw-r--r--src/libapplicationindicator/application-indicator-enum-types.h.in (renamed from src/libcustomindicator/custom-indicator-enum-types.h.in)0
-rw-r--r--src/libapplicationindicator/application-indicator.c (renamed from src/libcustomindicator/custom-indicator.c)0
-rw-r--r--src/libapplicationindicator/application-indicator.h (renamed from src/libcustomindicator/custom-indicator.h)0
13 files changed, 39 insertions, 39 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 102804e..ddcbdfd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,86 +10,86 @@ include $(top_srcdir)/Makefile.am.marshal
# Indicator
##################################
-customlibdir = $(INDICATORDIR)
-customlib_LTLIBRARIES = libcustom.la
-libcustom_la_SOURCES = \
- custom-service-marshal.c \
+applicationlibdir = $(INDICATORDIR)
+applicationlib_LTLIBRARIES = libapplication.la
+libapplication_la_SOURCES = \
+ application-service-marshal.c \
dbus-shared.h \
- indicator-custom.c
-libcustom_la_CFLAGS = $(INDICATOR_CFLAGS) \
+ indicator-application.c
+libapplication_la_CFLAGS = $(INDICATOR_CFLAGS) \
-Wall \
-Wl,-Bsymbolic-functions \
-Wl,-z,defs \
-Wl,--as-needed \
-Werror
-libcustom_la_LIBADD = $(INDICATOR_LIBS)
-libcustom_la_LDFLAGS = -module -avoid-version
+libapplication_la_LIBADD = $(INDICATOR_LIBS)
+libapplication_la_LDFLAGS = -module -avoid-version
##################################
# Service
##################################
-libexec_PROGRAMS = indicator-custom-service
-
-indicator_custom_service_SOURCES = \
- custom-service.c \
- custom-service-appstore.h \
- custom-service-appstore.c \
- custom-service-marshal.h \
- custom-service-marshal.c \
- custom-service-server.h \
- custom-service-watcher.h \
- custom-service-watcher.c \
+libexec_PROGRAMS = indicator-application-service
+
+indicator_application_service_SOURCES = \
+ application-service.c \
+ application-service-appstore.h \
+ application-service-appstore.c \
+ application-service-marshal.h \
+ application-service-marshal.c \
+ application-service-server.h \
+ application-service-watcher.h \
+ application-service-watcher.c \
dbus-properties-client.h \
dbus-shared.h \
notification-item-client.h \
notification-watcher-server.h
-indicator_custom_service_CFLAGS = \
+indicator_application_service_CFLAGS = \
$(INDICATOR_CFLAGS) \
-Wall -Werror
-indicator_custom_service_LDADD = \
+indicator_application_service_LDADD = \
$(INDICATOR_LIBS)
-glib_marshal_list = custom-service-marshal.list
-glib_marshal_prefix = _custom_service_marshal
+glib_marshal_list = application-service-marshal.list
+glib_marshal_prefix = _application_service_marshal
##################################
# Library
##################################
-glib_enum_h = libcustomindicator/custom-indicator-enum-types.h
-glib_enum_c = libcustomindicator/custom-indicator-enum-types.c
-glib_enum_headers = $(libcustomindicator_headers)
+glib_enum_h = libapplicationindicator/application-indicator-enum-types.h
+glib_enum_c = libapplicationindicator/application-indicator-enum-types.c
+glib_enum_headers = $(libapplicationindicator_headers)
lib_LTLIBRARIES = \
- libcustomindicator.la
+ libapplicationindicator.la
-libcustomindicatorincludedir=$(includedir)/libcustomindicator-0.1/libcustomindicator
+libapplicationindicatorincludedir=$(includedir)/libapplicationindicator-0.1/libapplicationindicator
-libcustomindicator_headers = \
- $(srcdir)/libcustomindicator/custom-indicator.h
+libapplicationindicator_headers = \
+ $(srcdir)/libapplicationindicator/application-indicator.h
-libcustomindicatorinclude_HEADERS = \
- $(libcustomindicator_headers) \
+libapplicationindicatorinclude_HEADERS = \
+ $(libapplicationindicator_headers) \
$(glib_enum_h)
-libcustomindicator_la_SOURCES = \
- $(libcustomindicator_headers) \
+libapplicationindicator_la_SOURCES = \
+ $(libapplicationindicator_headers) \
$(glib_enum_c) \
notification-watcher-client.h \
notification-item-server.h \
- libcustomindicator/custom-indicator.c
+ libapplicationindicator/application-indicator.c
-libcustomindicator_la_LDFLAGS = \
+libapplicationindicator_la_LDFLAGS = \
-version-info 0:0:0 \
-no-undefined \
-export-symbols-regex "^[^_d].*"
-libcustomindicator_la_CFLAGS = \
+libapplicationindicator_la_CFLAGS = \
$(INDICATOR_CFLAGS) \
-Wall -Werror
-libcustomindicator_la_LIBADD = \
+libapplicationindicator_la_LIBADD = \
$(INDICATOR_LIBS)
##################################
@@ -97,7 +97,7 @@ libcustomindicator_la_LIBADD = \
##################################
DBUS_SPECS = \
- custom-service.xml \
+ application-service.xml \
dbus-properties.xml \
notification-item.xml \
notification-watcher.xml
diff --git a/src/custom-service-appstore.c b/src/application-service-appstore.c
index bdf8ffb..bdf8ffb 100644
--- a/src/custom-service-appstore.c
+++ b/src/application-service-appstore.c
diff --git a/src/custom-service-appstore.h b/src/application-service-appstore.h
index 7263617..7263617 100644
--- a/src/custom-service-appstore.h
+++ b/src/application-service-appstore.h
diff --git a/src/custom-service-marshal.list b/src/application-service-marshal.list
index 4056f53..4056f53 100644
--- a/src/custom-service-marshal.list
+++ b/src/application-service-marshal.list
diff --git a/src/custom-service-watcher.c b/src/application-service-watcher.c
index 7cc15ee..7cc15ee 100644
--- a/src/custom-service-watcher.c
+++ b/src/application-service-watcher.c
diff --git a/src/custom-service-watcher.h b/src/application-service-watcher.h
index 1a037be..1a037be 100644
--- a/src/custom-service-watcher.h
+++ b/src/application-service-watcher.h
diff --git a/src/custom-service.c b/src/application-service.c
index 5bd9b96..5bd9b96 100644
--- a/src/custom-service.c
+++ b/src/application-service.c
diff --git a/src/custom-service.xml b/src/application-service.xml
index ec96297..ec96297 100644
--- a/src/custom-service.xml
+++ b/src/application-service.xml
diff --git a/src/indicator-custom.c b/src/indicator-application.c
index da89c30..da89c30 100644
--- a/src/indicator-custom.c
+++ b/src/indicator-application.c
diff --git a/src/libcustomindicator/custom-indicator-enum-types.c.in b/src/libapplicationindicator/application-indicator-enum-types.c.in
index 51512f6..51512f6 100644
--- a/src/libcustomindicator/custom-indicator-enum-types.c.in
+++ b/src/libapplicationindicator/application-indicator-enum-types.c.in
diff --git a/src/libcustomindicator/custom-indicator-enum-types.h.in b/src/libapplicationindicator/application-indicator-enum-types.h.in
index e037be7..e037be7 100644
--- a/src/libcustomindicator/custom-indicator-enum-types.h.in
+++ b/src/libapplicationindicator/application-indicator-enum-types.h.in
diff --git a/src/libcustomindicator/custom-indicator.c b/src/libapplicationindicator/application-indicator.c
index 8d6633a..8d6633a 100644
--- a/src/libcustomindicator/custom-indicator.c
+++ b/src/libapplicationindicator/application-indicator.c
diff --git a/src/libcustomindicator/custom-indicator.h b/src/libapplicationindicator/application-indicator.h
index 2e9045c..2e9045c 100644
--- a/src/libcustomindicator/custom-indicator.h
+++ b/src/libapplicationindicator/application-indicator.h