summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2011-11-23 10:22:52 +0100
committerXavier Claessens <xavier.claessens@collabora.co.uk>2012-01-10 09:52:44 +0100
commit0ebb5abeb8b6a5a27ac41620cb2ac7d274bfadef (patch)
tree75f2ed66e6d698503dc96621013fb076e64656ee /examples
parentf2d82e052eb2ba059e9a8ed08d5156f26f5d2dd7 (diff)
downloadtelepathy-glib-0ebb5abeb8b6a5a27ac41620cb2ac7d274bfadef.tar.gz
Call CM example is not future anymore
Diffstat (limited to 'examples')
-rw-r--r--examples/Makefile.am2
-rw-r--r--examples/cm/Makefile.am1
-rw-r--r--examples/cm/call/Makefile.am (renamed from examples/future/call-cm/Makefile.am)0
-rw-r--r--examples/cm/call/call-channel.c (renamed from examples/future/call-cm/call-channel.c)0
-rw-r--r--examples/cm/call/call-channel.h (renamed from examples/future/call-cm/call-channel.h)0
-rw-r--r--examples/cm/call/call-content.c (renamed from examples/future/call-cm/call-content.c)0
-rw-r--r--examples/cm/call/call-content.h (renamed from examples/future/call-cm/call-content.h)0
-rw-r--r--examples/cm/call/call-manager.c (renamed from examples/future/call-cm/call-manager.c)0
-rw-r--r--examples/cm/call/call-manager.h (renamed from examples/future/call-cm/call-manager.h)0
-rw-r--r--examples/cm/call/call-stream.c (renamed from examples/future/call-cm/call-stream.c)0
-rw-r--r--examples/cm/call/call-stream.h (renamed from examples/future/call-cm/call-stream.h)0
-rw-r--r--examples/cm/call/cm.c (renamed from examples/future/call-cm/cm.c)0
-rw-r--r--examples/cm/call/cm.h (renamed from examples/future/call-cm/cm.h)0
-rw-r--r--examples/cm/call/conn.c (renamed from examples/future/call-cm/conn.c)0
-rw-r--r--examples/cm/call/conn.h (renamed from examples/future/call-cm/conn.h)0
-rw-r--r--examples/cm/call/example_call.manager (renamed from examples/future/call-cm/example_call.manager)0
-rw-r--r--examples/cm/call/main.c (renamed from examples/future/call-cm/main.c)0
-rw-r--r--examples/cm/call/protocol.c (renamed from examples/future/call-cm/protocol.c)0
-rw-r--r--examples/cm/call/protocol.h (renamed from examples/future/call-cm/protocol.h)0
-rw-r--r--examples/future/Makefile.am1
20 files changed, 2 insertions, 2 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am
index fde86c064..e8fe94091 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,4 +1,4 @@
# extensions has to be compiled first, because other examples need it.
-SUBDIRS = extensions client cm future
+SUBDIRS = extensions client cm
EXTRA_DIST = README
diff --git a/examples/cm/Makefile.am b/examples/cm/Makefile.am
index afd38b2e3..bb2b6f143 100644
--- a/examples/cm/Makefile.am
+++ b/examples/cm/Makefile.am
@@ -1,4 +1,5 @@
SUBDIRS = \
+ call \
channelspecific \
contactlist \
echo-message-parts \
diff --git a/examples/future/call-cm/Makefile.am b/examples/cm/call/Makefile.am
index 3b7ad1fac..3b7ad1fac 100644
--- a/examples/future/call-cm/Makefile.am
+++ b/examples/cm/call/Makefile.am
diff --git a/examples/future/call-cm/call-channel.c b/examples/cm/call/call-channel.c
index 8962140f3..8962140f3 100644
--- a/examples/future/call-cm/call-channel.c
+++ b/examples/cm/call/call-channel.c
diff --git a/examples/future/call-cm/call-channel.h b/examples/cm/call/call-channel.h
index 0bf55f57f..0bf55f57f 100644
--- a/examples/future/call-cm/call-channel.h
+++ b/examples/cm/call/call-channel.h
diff --git a/examples/future/call-cm/call-content.c b/examples/cm/call/call-content.c
index 601104c22..601104c22 100644
--- a/examples/future/call-cm/call-content.c
+++ b/examples/cm/call/call-content.c
diff --git a/examples/future/call-cm/call-content.h b/examples/cm/call/call-content.h
index 0a380af35..0a380af35 100644
--- a/examples/future/call-cm/call-content.h
+++ b/examples/cm/call/call-content.h
diff --git a/examples/future/call-cm/call-manager.c b/examples/cm/call/call-manager.c
index 69c982744..69c982744 100644
--- a/examples/future/call-cm/call-manager.c
+++ b/examples/cm/call/call-manager.c
diff --git a/examples/future/call-cm/call-manager.h b/examples/cm/call/call-manager.h
index 96f5aee39..96f5aee39 100644
--- a/examples/future/call-cm/call-manager.h
+++ b/examples/cm/call/call-manager.h
diff --git a/examples/future/call-cm/call-stream.c b/examples/cm/call/call-stream.c
index 9eb2e3526..9eb2e3526 100644
--- a/examples/future/call-cm/call-stream.c
+++ b/examples/cm/call/call-stream.c
diff --git a/examples/future/call-cm/call-stream.h b/examples/cm/call/call-stream.h
index 0d705da2f..0d705da2f 100644
--- a/examples/future/call-cm/call-stream.h
+++ b/examples/cm/call/call-stream.h
diff --git a/examples/future/call-cm/cm.c b/examples/cm/call/cm.c
index 7ba8771e6..7ba8771e6 100644
--- a/examples/future/call-cm/cm.c
+++ b/examples/cm/call/cm.c
diff --git a/examples/future/call-cm/cm.h b/examples/cm/call/cm.h
index 275abb229..275abb229 100644
--- a/examples/future/call-cm/cm.h
+++ b/examples/cm/call/cm.h
diff --git a/examples/future/call-cm/conn.c b/examples/cm/call/conn.c
index e5dbc64f9..e5dbc64f9 100644
--- a/examples/future/call-cm/conn.c
+++ b/examples/cm/call/conn.c
diff --git a/examples/future/call-cm/conn.h b/examples/cm/call/conn.h
index 1ad22ae3a..1ad22ae3a 100644
--- a/examples/future/call-cm/conn.h
+++ b/examples/cm/call/conn.h
diff --git a/examples/future/call-cm/example_call.manager b/examples/cm/call/example_call.manager
index b83bd93d5..b83bd93d5 100644
--- a/examples/future/call-cm/example_call.manager
+++ b/examples/cm/call/example_call.manager
diff --git a/examples/future/call-cm/main.c b/examples/cm/call/main.c
index 77526b3c0..77526b3c0 100644
--- a/examples/future/call-cm/main.c
+++ b/examples/cm/call/main.c
diff --git a/examples/future/call-cm/protocol.c b/examples/cm/call/protocol.c
index 3fe68879e..3fe68879e 100644
--- a/examples/future/call-cm/protocol.c
+++ b/examples/cm/call/protocol.c
diff --git a/examples/future/call-cm/protocol.h b/examples/cm/call/protocol.h
index 68d2acd7c..68d2acd7c 100644
--- a/examples/future/call-cm/protocol.h
+++ b/examples/cm/call/protocol.h
diff --git a/examples/future/Makefile.am b/examples/future/Makefile.am
deleted file mode 100644
index c7ae472ce..000000000
--- a/examples/future/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = call-cm