From 7bb3148850a70ff1d826792fab611dc7e5c17aad Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 4 May 2012 16:47:49 +0100
Subject: Compile all examples with TP_SEAL_ENABLE

The only changes needed were in extended-client.c.
---
 examples/client/Makefile.am                | 1 +
 examples/client/dbus-tubes/Makefile.am     | 4 ++++
 examples/client/extended-client.c          | 3 +--
 examples/client/stream-tubes/Makefile.am   | 4 ++++
 examples/cm/call/Makefile.am               | 1 +
 examples/cm/channelspecific/Makefile.am    | 1 +
 examples/cm/contactlist/Makefile.am        | 1 +
 examples/cm/echo-message-parts/Makefile.am | 1 +
 examples/cm/extended/Makefile.am           | 1 +
 examples/cm/no-protocols/Makefile.am       | 1 +
 examples/extensions/Makefile.am            | 4 ++++
 11 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'examples')

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) \
-- 
cgit v1.2.1