ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/indicator-messages/log-and-name into lp:indicator-messages.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)

For more details, see:
https://code.launchpad.net/~ted/indicator-messages/log-and-name/+merge/46511

Adding a log domain and fixing the service file.
-- 
https://code.launchpad.net/~ted/indicator-messages/log-and-name/+merge/46511
Your team ayatana-commits is subscribed to branch lp:indicator-messages.

=== modified file '.bzrignore'
--- .bzrignore	2010-03-04 21:14:24 +0000
+++ .bzrignore	2011-01-17 18:06:48 +0000
@@ -23,3 +23,5 @@
 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

=== modified file 'data/indicator-messages.service.in'
--- data/indicator-messages.service.in	2009-09-09 14:52:36 +0000
+++ data/indicator-messages.service.in	2011-01-17 18:06:48 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.ayatana.indicator.messages
+Name=com.canonical.indicator.messages
 Exec=@libexecdir@/indicator-messages-service

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-01-14 18:33:06 +0000
+++ src/Makefile.am	2011-01-17 18:06:48 +0000
@@ -12,7 +12,14 @@
 	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 @@
 	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