summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-05-04 16:47:49 +0100
committerXavier Claessens <xavier.claessens@collabora.co.uk>2012-06-04 13:43:10 +0200
commit7bb3148850a70ff1d826792fab611dc7e5c17aad (patch)
tree93e46a4451f8ff64c53eee7025d34c9e3a0e4106 /examples
parent0952f8d1ab6ec5735fb74243a3adfffbf2b81cd0 (diff)
downloadtelepathy-glib-7bb3148850a70ff1d826792fab611dc7e5c17aad.tar.gz
Compile all examples with TP_SEAL_ENABLE
The only changes needed were in extended-client.c.
Diffstat (limited to 'examples')
-rw-r--r--examples/client/Makefile.am1
-rw-r--r--examples/client/dbus-tubes/Makefile.am4
-rw-r--r--examples/client/extended-client.c3
-rw-r--r--examples/client/stream-tubes/Makefile.am4
-rw-r--r--examples/cm/call/Makefile.am1
-rw-r--r--examples/cm/channelspecific/Makefile.am1
-rw-r--r--examples/cm/contactlist/Makefile.am1
-rw-r--r--examples/cm/echo-message-parts/Makefile.am1
-rw-r--r--examples/cm/extended/Makefile.am1
-rw-r--r--examples/cm/no-protocols/Makefile.am1
-rw-r--r--examples/extensions/Makefile.am4
11 files changed, 20 insertions, 2 deletions
diff --git a/examples/client/Makefile.am b/examples/client/Makefile.am
index bd1c80bfe..c367924a1 100644
--- a/examples/client/Makefile.am
+++ b/examples/client/Makefile.am
@@ -57,6 +57,7 @@ LDADD = \
AM_CPPFLAGS = \
-I${top_srcdir} -I${top_builddir} \
+ -DTP_SEAL_ENABLE \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
$(NULL)
diff --git a/examples/client/dbus-tubes/Makefile.am b/examples/client/dbus-tubes/Makefile.am
index 90411ff32..11c5ddf5b 100644
--- a/examples/client/dbus-tubes/Makefile.am
+++ b/examples/client/dbus-tubes/Makefile.am
@@ -13,6 +13,10 @@ LDADD = \
@DBUS_LIBS@ \
@GLIB_LIBS@
+AM_CPPFLAGS = \
+ -DTP_SEAL_ENABLE \
+ $(NULL)
+
AM_CFLAGS = \
$(ERROR_CFLAGS) \
@DBUS_CFLAGS@ \
diff --git a/examples/client/extended-client.c b/examples/client/extended-client.c
index 9231c0bf4..3ebf40141 100644
--- a/examples/client/extended-client.c
+++ b/examples/client/extended-client.c
@@ -207,13 +207,12 @@ cm_requested_connection (TpConnectionManager *manager,
{
GError *e = NULL;
TpConnection *conn;
- TpProxy *proxy = (TpProxy *) manager;
if (die_if (error, "RequestConnection()"))
return;
/* FIXME: there should be convenience API for this */
- conn = tp_connection_new (proxy->dbus_daemon,
+ conn = tp_connection_new (tp_proxy_get_dbus_daemon (manager),
bus_name, object_path, &e);
if (conn == NULL)
diff --git a/examples/client/stream-tubes/Makefile.am b/examples/client/stream-tubes/Makefile.am
index fb2259d6b..12abfcfc6 100644
--- a/examples/client/stream-tubes/Makefile.am
+++ b/examples/client/stream-tubes/Makefile.am
@@ -13,6 +13,10 @@ LDADD = \
@DBUS_LIBS@ \
@GLIB_LIBS@
+AM_CPPFLAGS = \
+ -DTP_SEAL_ENABLE \
+ $(NULL)
+
AM_CFLAGS = \
$(ERROR_CFLAGS) \
@DBUS_CFLAGS@ \
diff --git a/examples/cm/call/Makefile.am b/examples/cm/call/Makefile.am
index 3b7ad1fac..566ced038 100644
--- a/examples/cm/call/Makefile.am
+++ b/examples/cm/call/Makefile.am
@@ -63,6 +63,7 @@ LDADD = \
# AM_CPPFLAGS.
AM_CPPFLAGS = \
-I${top_srcdir} -I${top_builddir} \
+ -DTP_SEAL_ENABLE \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
$(NULL)
diff --git a/examples/cm/channelspecific/Makefile.am b/examples/cm/channelspecific/Makefile.am
index d0c5a6a8a..dc4304fe8 100644
--- a/examples/cm/channelspecific/Makefile.am
+++ b/examples/cm/channelspecific/Makefile.am
@@ -60,6 +60,7 @@ LDADD = \
# AM_CPPFLAGS.
AM_CPPFLAGS = \
-I${top_srcdir} -I${top_builddir} \
+ -DTP_SEAL_ENABLE \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
$(NULL)
diff --git a/examples/cm/contactlist/Makefile.am b/examples/cm/contactlist/Makefile.am
index b4933fcf9..7787bc7ea 100644
--- a/examples/cm/contactlist/Makefile.am
+++ b/examples/cm/contactlist/Makefile.am
@@ -56,6 +56,7 @@ LDADD = \
# AM_CPPFLAGS.
AM_CPPFLAGS = \
-I${top_srcdir} -I${top_builddir} \
+ -DTP_SEAL_ENABLE \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
$(NULL)
diff --git a/examples/cm/echo-message-parts/Makefile.am b/examples/cm/echo-message-parts/Makefile.am
index 609a18514..ae9bb3d79 100644
--- a/examples/cm/echo-message-parts/Makefile.am
+++ b/examples/cm/echo-message-parts/Makefile.am
@@ -56,6 +56,7 @@ LDADD = \
# AM_CPPFLAGS.
AM_CPPFLAGS = \
-I${top_srcdir} -I${top_builddir} \
+ -DTP_SEAL_ENABLE \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
$(NULL)
diff --git a/examples/cm/extended/Makefile.am b/examples/cm/extended/Makefile.am
index 437e5614a..376081c7b 100644
--- a/examples/cm/extended/Makefile.am
+++ b/examples/cm/extended/Makefile.am
@@ -45,6 +45,7 @@ LDADD = \
# AM_CPPFLAGS.
AM_CPPFLAGS = \
-I${top_srcdir} -I${top_builddir} \
+ -DTP_SEAL_ENABLE \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
$(NULL)
diff --git a/examples/cm/no-protocols/Makefile.am b/examples/cm/no-protocols/Makefile.am
index f12c374db..b9e1e0d92 100644
--- a/examples/cm/no-protocols/Makefile.am
+++ b/examples/cm/no-protocols/Makefile.am
@@ -40,6 +40,7 @@ LDADD = \
# AM_CPPFLAGS.
AM_CPPFLAGS = \
-I${top_srcdir} -I${top_builddir} \
+ -DTP_SEAL_ENABLE \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
$(NULL)
diff --git a/examples/extensions/Makefile.am b/examples/extensions/Makefile.am
index ab778d1b9..ca44bcfc2 100644
--- a/examples/extensions/Makefile.am
+++ b/examples/extensions/Makefile.am
@@ -9,6 +9,10 @@
tools_dir = $(top_srcdir)/tools
+AM_CPPFLAGS = \
+ -DTP_SEAL_ENABLE \
+ $(NULL)
+
AM_CFLAGS = \
$(ERROR_CFLAGS) \
$(DBUS_CFLAGS) \