summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac1
-rw-r--r--data/Makefile.am45
-rw-r--r--data/TelepathyLogger.client12
-rw-r--r--data/org.freedesktop.Telepathy.Client.TelepathyLogger.service.in (renamed from src/org.freedesktop.Telepathy.Client.TelepathyLogger.service.in)0
-rw-r--r--data/org.freedesktop.Telepathy.TelepathyLoggerService.service.in (renamed from src/org.freedesktop.Telepathy.TelepathyLoggerService.service.in)0
-rw-r--r--data/telepathy-logger.schemas (renamed from telepathy-logger/telepathy-logger.schemas)0
-rw-r--r--src/Makefile.am30
-rwxr-xr-xsrc/compile.sh24
-rw-r--r--src/org.freedesktop.Telepathy.Client.TelepathyLogger.client3
-rw-r--r--telepathy-logger/Makefile.am7
-rw-r--r--telepathy-logger/conf.h10
12 files changed, 76 insertions, 58 deletions
diff --git a/Makefile.am b/Makefile.am
index b81d15b..600d6ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = tools src
+SUBDIRS = tools telepathy-logger data src
ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 4c64c25..dfcaba3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,6 +164,7 @@ SHAVE_INIT(.)
AC_OUTPUT([
Makefile
+ data/Makefile
src/Makefile
telepathy-logger/Makefile
telepathy-logger/libtelepathy-logger.pc
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..d6c39ac
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,45 @@
+schemasdir = $(GCONF_SCHEMA_FILE_DIR)
+schemas_in_files =
+schemas_DATA = \
+ $(schemas_in_files:.schemas.in=.schemas) \
+ telepathy-logger.schemas
+@INTLTOOL_SCHEMAS_RULE@
+
+servicefiledir = $(datadir)/dbus-1/services
+servicefile_in_files = \
+ org.freedesktop.Telepathy.Client.TelepathyLogger.service.in \
+ org.freedesktop.Telepathy.TelepathyLoggerService.service.in
+servicefile_DATA = $(servicefile_in_files:.service.in=.service)
+%.service: %.service.in
+ $(QUIET_GEN)sed -e "s|%bindir%|$(bindir)|" $< > $@
+
+clientfiledir = $(datarootdir)/telepathy/clients
+clientfile_DATA = TelepathyLogger.client
+
+if GCONF_SCHEMAS_INSTALL
+install-data-local:
+ if test -z "$(DESTDIR)" ; then \
+ for p in $(schemas_DATA) ; do \
+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p ; \
+ done \
+ fi
+else
+install-data-local:
+endif
+
+#install-data-local:
+# GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) \
+# --makefile-install-rule $(srcdir)/$(schema_DATA)
+
+
+
+EXTRA_DIST = \
+ $(schemas_in_files) \
+ $(schemas_DATA) \
+ $(clientfile_DATA) \
+ $(servicefile_in_files)
+
+DISTCLEANFILES = \
+ $(desktop_DATA) \
+ $(schemas_DATA) \
+ $(servicefile_DATA)
diff --git a/data/TelepathyLogger.client b/data/TelepathyLogger.client
new file mode 100644
index 0000000..e22a4f2
--- /dev/null
+++ b/data/TelepathyLogger.client
@@ -0,0 +1,12 @@
+[org.freedesktop.Telepathy.Client.TelepathyLogger]
+Interfaces=org.freedesktop.Telepathy.Client.Observer;
+
+[org.freedesktop.Telepathy.Client.Observer.ObserverChannelFilter 0]
+org.freedesktop.Telepathy.Channel.Type s=org.freedesktop.Telepathy.Channel.Type.Text
+org.freedesktop.Telepathy.Channel.TargetHandleType u=1
+org.freedesktop.Telepathy.Channel.Requested b=true
+
+[org.freedesktop.Telepathy.Client.Observer.ObserverChannelFilter 1]
+org.freedesktop.Telepathy.Channel.Type s=org.freedesktop.Telepathy.Channel.Type.Text
+org.freedesktop.Telepathy.Channel.TargetHandleType u=2
+org.freedesktop.Telepathy.Channel.Requested b=true
diff --git a/src/org.freedesktop.Telepathy.Client.TelepathyLogger.service.in b/data/org.freedesktop.Telepathy.Client.TelepathyLogger.service.in
index 5b95f92..5b95f92 100644
--- a/src/org.freedesktop.Telepathy.Client.TelepathyLogger.service.in
+++ b/data/org.freedesktop.Telepathy.Client.TelepathyLogger.service.in
diff --git a/src/org.freedesktop.Telepathy.TelepathyLoggerService.service.in b/data/org.freedesktop.Telepathy.TelepathyLoggerService.service.in
index 8831103..8831103 100644
--- a/src/org.freedesktop.Telepathy.TelepathyLoggerService.service.in
+++ b/data/org.freedesktop.Telepathy.TelepathyLoggerService.service.in
diff --git a/telepathy-logger/telepathy-logger.schemas b/data/telepathy-logger.schemas
index 5b7fdb2..5b7fdb2 100644
--- a/telepathy-logger/telepathy-logger.schemas
+++ b/data/telepathy-logger.schemas
diff --git a/src/Makefile.am b/src/Makefile.am
index a0c53bc..384fc8e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,14 +10,13 @@ AM_CPPFLAGS = \
$(DISABLE_DEPRECATED) \
$(WARN_CFLAGS)
-
LDADD = \
$(top_builddir)/telepathy-logger/libtelepathy-logger.la \
$(LIBTPL_LIBS)
# TODO removeme: kludge to let the compilation work, or it doesn't know how to buld the lib
-$(top_builddir)/telepathy-logger/libtelepathy-logger.la:
- $(MAKE) -C $(top_builddir)/libtelepathy-logger libtelepathy-logger.la
+#$(top_builddir)/telepathy-logger/libtelepathy-logger.la:
+# $(MAKE) -C $(top_builddir)/libtelepathy-logger libtelepathy-logger.la
BUILT_SOURCES = \
dbus-service-server.h \
@@ -31,13 +30,10 @@ bin_PROGRAMS = \
telepathy_logger_dbus_SOURCES = \
dbus-service.c \
telepathy-logger-dbus.c
-#telepathy_logger_dbus_LDADD = $(LDADD) $(TPL_LIBS)
test_api_SOURCES = test_api.c
-#test_api_LDADD = $(LDADD) $(LIBTPL_LIBS)
telepathy_logger_SOURCES = telepathy-logger.c
-#telepathy_logger_LDADD = $(LDADD) $(TPL_LIBS)
nodist_telepathy_logger_SOURCES = $(BUILT_SOURCES)
@@ -61,14 +57,14 @@ dbus-service-client.h: dbus-service.xml
CLEANFILES = $(BUILT_SOURCES)
# Dbus service file
-servicedir = $(DBUS_SERVICES_DIR)
-service_in_files = \
- org.freedesktop.Telepathy.TelepathyLoggerService.service.in \
- org.freedesktop.Telepathy.Client.TelepathyLogger.service.in
-service_DATA = \
- $(service_in_files:.service.in=.service) \
- org.freedesktop.Telepathy.Client.TelepathyLogger.client
-
-# Rule to make the service file with bindir expanded
-%.service: %.service.in
- sed -e "s|%bindir%|$(bindir)|" $< > $@
+#servicedir = $(DBUS_SERVICES_DIR)
+#service_in_files = \
+# org.freedesktop.Telepathy.TelepathyLoggerService.service.in \
+# org.freedesktop.Telepathy.Client.TelepathyLogger.service.in
+#service_DATA = \
+# $(service_in_files:.service.in=.service) \
+# org.freedesktop.Telepathy.Client.TelepathyLogger.client
+#
+## Rule to make the service file with bindir expanded
+#%.service: %.service.in
+# sed -e "s|%bindir%|$(bindir)|" $< > $@
diff --git a/src/compile.sh b/src/compile.sh
deleted file mode 100755
index 34eb9a6..0000000
--- a/src/compile.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-PACKAGE_NAME="TpLogger"
-CC=${CC:-gcc}
-CCOPTS="-D_POSIX_SOURCE -DPACKAGE_NAME=\"${PACKAGE_NAME}\" --std=c99 -g -I../include -Wall -Werror" # -pedantic"
-PKGS="telepathy-glib libxml-2.0"
-MODULES="observer.c headless-logger-init.c
- channel.c channel-text.c
- contact.c
- utils.c
- time.c
- log-manager.c
- log-store.c
- log-store-empathy.c
- log-entry-text.c
- test.c"
-EXECUTABLE="telepathy-logger"
-
-
-${CC} ${CCOPTS} $(pkg-config --libs --cflags ${PKGS}) ${MODULES} \
- -o ${EXECUTABLE}
-RET=$?
-
-exit $RET
diff --git a/src/org.freedesktop.Telepathy.Client.TelepathyLogger.client b/src/org.freedesktop.Telepathy.Client.TelepathyLogger.client
deleted file mode 100644
index e34b892..0000000
--- a/src/org.freedesktop.Telepathy.Client.TelepathyLogger.client
+++ /dev/null
@@ -1,3 +0,0 @@
-[DBus Service]
-Name=org.freedesktop.Telepathy.TelepathyLoggerService
-Exec=/usr/local/bin/telepathy-logger-dbus
diff --git a/telepathy-logger/Makefile.am b/telepathy-logger/Makefile.am
index f1fd25e..28c43e9 100644
--- a/telepathy-logger/Makefile.am
+++ b/telepathy-logger/Makefile.am
@@ -44,13 +44,6 @@ libtelepathy_logger_la_SOURCES = \
observer.c \
utils.c
-schemadir = @GCONF_SCHEMA_FILE_DIR@
-schema_DATA = telepathy-logger.schemas
-
-install-data-local:
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) \
- --makefile-install-rule $(srcdir)/$(schema_DATA)
-
check_c_sources = \
$(libtelepathy_logger_la_SOURCES) \
include $(top_srcdir)/tools/check-coding-style.mk
diff --git a/telepathy-logger/conf.h b/telepathy-logger/conf.h
index 4dc0798..a707605 100644
--- a/telepathy-logger/conf.h
+++ b/telepathy-logger/conf.h
@@ -55,16 +55,14 @@ GConfClient *tpl_conf_get_gconf_client(TplConf *self);
gboolean tpl_conf_is_globally_enabled (TplConf * self, GError **error);
-void tpl_conf_set_accounts_ignorelist (TplConf *self, GSList *newlist, GError
- **error);
-
-void tpl_conf_togle_globally_enable (TplConf *self, gboolean enable, GError **error);
+gboolean tpl_conf_is_account_ignored (TplConf *self, const gchar *account_path, GError **error);
GSList *tpl_conf_get_accounts_ignorelist (TplConf * self, GError **error);
-gboolean tpl_conf_is_account_ignored (TplConf *self, const gchar *account_path, GError **error);
-
+void tpl_conf_togle_globally_enable (TplConf *self, gboolean enable, GError **error);
+void tpl_conf_set_accounts_ignorelist (TplConf *self, GSList *newlist, GError
+ **error);
G_END_DECLS
#endif // __TPL_CONF_H__
View Lorry Controller Status