aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzrignore2
-rw-r--r--data/indicator-messages.service.in2
-rw-r--r--src/Makefile.am18
3 files changed, 19 insertions, 3 deletions
diff --git a/.bzrignore b/.bzrignore
index 24932b4..f48929a 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -23,3 +23,5 @@ src/messages-service-client.h
src/messages-service-server.h
po/indicator-messages.pot
src/libmessaging_la-app-gtk-menu-item.lo
+src/gen-messages-service.xml.c
+src/gen-messages-service.xml.h
diff --git a/data/indicator-messages.service.in b/data/indicator-messages.service.in
index 573a2d6..12e41e6 100644
--- a/data/indicator-messages.service.in
+++ b/data/indicator-messages.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=org.ayatana.indicator.messages
+Name=com.canonical.indicator.messages
Exec=@libexecdir@/indicator-messages-service
diff --git a/src/Makefile.am b/src/Makefile.am
index dd09b8a..8597d77 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,7 +12,14 @@ libmessaging_la_SOURCES = \
gen-messages-service.xml.h \
gen-messages-service.xml.c \
dbus-data.h
-libmessaging_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror
+libmessaging_la_CFLAGS = \
+ $(APPLET_CFLAGS) \
+ -Wall \
+ -Wl,-Bsymbolic-functions \
+ -Wl,-z,defs \
+ -Wl,--as-needed \
+ -Werror \
+ -DG_LOG_DOMAIN=\"Indicator-Messages\"
libmessaging_la_LIBADD = $(APPLET_LIBS)
libmessaging_la_LDFLAGS = -module -avoid-version
@@ -38,7 +45,14 @@ indicator_messages_service_SOURCES = \
seen-db.h \
dirs.h \
dbus-data.h
-indicator_messages_service_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror
+indicator_messages_service_CFLAGS = \
+ $(APPLET_CFLAGS) \
+ -Wall \
+ -Wl,-Bsymbolic-functions \
+ -Wl,-z,defs \
+ -Wl,--as-needed \
+ -Werror \
+ -DG_LOG_DOMAIN=\"Indicator-Messages\"
indicator_messages_service_LDADD = $(APPLET_LIBS)
gen-%.xml.h: %.xml