diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.co.uk> | 2011-03-24 20:26:52 -0400 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.co.uk> | 2011-03-25 14:03:04 -0400 |
| commit | f1f8673bea54f69765c48aa71b217865562c0095 (patch) | |
| tree | 750e7684ed57fa2565477d5f2aa9453bf68147ea /data | |
| parent | fef67aaec653f183c797597dd081bfc1e00cee6e (diff) | |
| download | telepathy-logger-f1f8673bea54f69765c48aa71b217865562c0095.tar.gz | |
Make Call support conditional to --enable-call
Diffstat (limited to 'data')
| -rw-r--r-- | data/Logger.Call.client.in (renamed from data/Logger.client) | 13 | ||||
| -rw-r--r-- | data/Logger.Observer.client.in | 3 | ||||
| -rw-r--r-- | data/Logger.Recover.client.in | 2 | ||||
| -rw-r--r-- | data/Logger.Text.client.in | 8 | ||||
| -rw-r--r-- | data/Makefile.am | 22 |
5 files changed, 33 insertions, 15 deletions
diff --git a/data/Logger.client b/data/Logger.Call.client.in index e76023d..c943eec 100644 --- a/data/Logger.client +++ b/data/Logger.Call.client.in @@ -1,14 +1,3 @@ -[org.freedesktop.Telepathy.Client] -Interfaces=org.freedesktop.Telepathy.Client.Observer - -[org.freedesktop.Telepathy.Client.Observer.ObserverChannelFilter 0] -org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text -org.freedesktop.Telepathy.Channel.TargetHandleType u=1 - -[org.freedesktop.Telepathy.Client.Observer.ObserverChannelFilter 1] -org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text -org.freedesktop.Telepathy.Channel.TargetHandleType u=2 - [org.freedesktop.Telepathy.Client.Observer.ObserverChannelFilter 2] org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.StreamedMedia org.freedesktop.Telepathy.Channel.TargetHandleType u=1 @@ -21,5 +10,3 @@ org.freedesktop.Telepathy.Channel.TargetHandleType u=1 org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Call.DRAFT org.freedesktop.Telepathy.Channel.TargetHandleType u=2 -[org.freedesktop.Telepathy.Client.Observer] -Recover=true diff --git a/data/Logger.Observer.client.in b/data/Logger.Observer.client.in new file mode 100644 index 0000000..e3cff68 --- /dev/null +++ b/data/Logger.Observer.client.in @@ -0,0 +1,3 @@ +[org.freedesktop.Telepathy.Client] +Interfaces=org.freedesktop.Telepathy.Client.Observer + diff --git a/data/Logger.Recover.client.in b/data/Logger.Recover.client.in new file mode 100644 index 0000000..bd1766f --- /dev/null +++ b/data/Logger.Recover.client.in @@ -0,0 +1,2 @@ +[org.freedesktop.Telepathy.Client.Observer] +Recover=true diff --git a/data/Logger.Text.client.in b/data/Logger.Text.client.in new file mode 100644 index 0000000..562b040 --- /dev/null +++ b/data/Logger.Text.client.in @@ -0,0 +1,8 @@ +[org.freedesktop.Telepathy.Client.Observer.ObserverChannelFilter 0] +org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text +org.freedesktop.Telepathy.Channel.TargetHandleType u=1 + +[org.freedesktop.Telepathy.Client.Observer.ObserverChannelFilter 1] +org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text +org.freedesktop.Telepathy.Channel.TargetHandleType u=2 + diff --git a/data/Makefile.am b/data/Makefile.am index 179e08f..69953bf 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -14,13 +14,31 @@ servicefile_DATA = $(servicefile_in_files:.service.in=.service) $(AM_V_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@ clientfiledir = $(datarootdir)/telepathy/clients + +clientfile_parts = $(top_srcdir)/data/Logger.Observer.client.in \ + $(top_srcdir)/data/Logger.Text.client.in \ + $(top_srcdir)/data/Logger.Call.client.in \ + $(top_srcdir)/data/Logger.Recover.client.in + clientfile_DATA = Logger.client EXTRA_DIST = \ $(gsettings_files) \ $(clientfile_DATA) \ - $(servicefile_in_files) + $(servicefile_in_files) \ + $(client_file_parts) CLEANFILES = \ $(gsettings_SCHEMAS) \ - $(servicefile_DATA) + $(servicefile_DATA) \ + $(clientfile_DATA) + +# Generates Logger.client file +Logger.client: $(clientfile_parts) + cp $(top_srcdir)/data/Logger.Observer.client.in $(clientfile_DATA) + cat $(top_srcdir)/data/Logger.Text.client.in >> $(clientfile_DATA) +if ENABLE_CALL + cat $(top_srcdir)/data/Logger.Call.client.in >> $(clientfile_DATA) +endif + cat $(top_srcdir)/data/Logger.Recover.client.in >> $(clientfile_DATA) + |