?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
archrelease: copy trunk to extra-x86_64
[arch-packages.git] / ekiga / trunk / ekiga-4.0.1-boost-signals2.patch
blob9d4582fa3cb964201e14f7f3165a892253d7484b
1 From caecbf81d7c5c9464882d9b730b44497e83f06b9 Mon Sep 17 00:00:00 2001
2 From: Julien Puydt <jpuydt@free.fr>
3 Date: Sat, 14 Sep 2013 16:59:46 +0200
4 Subject: [PATCH 1/2] Made the autotools files use BOOST signals2
5
6 ---
7 configure.ac | 15 ++++++++-------
8 lib/Makefile.am | 16 +++++++---------
9 plugins/avahi/Makefile.am | 7 +++----
10 plugins/evolution/Makefile.am | 7 +++----
11 plugins/gstreamer/Makefile.am | 7 +++----
12 plugins/kab/Makefile.am | 7 +++----
13 plugins/kde/Makefile.am | 7 +++----
14 plugins/ldap/Makefile.am | 8 ++++----
15 plugins/libnotify/Makefile.am | 7 +++----
16 plugins/loudmouth/Makefile.am | 7 +++----
17 plugins/resource-list/Makefile.am | 9 ++++-----
18 plugins/xcap/Makefile.am | 7 +++----
19 src/Makefile.am | 10 +++++-----
20 13 files changed, 52 insertions(+), 62 deletions(-)
21
22 diff --git a/configure.ac b/configure.ac
23 index 45b7ea454..e0de8fc4c 100644
24 --- a/configure.ac
25 +++ b/configure.ac
26 @@ -173,15 +173,16 @@ AC_SUBST(GLIB_LIBS)
27 dnl ###############################
28 dnl Mandatory BOOST support
29 dnl ###############################
30 -AX_BOOST_BASE([1.34])
31 -AX_BOOST_SIGNALS
32 +AX_BOOST_BASE([1.53])
33
34 -if test "x${ax_cv_boost_signals}" == "xno"; then
35 - AC_MSG_ERROR([You need the boost signals library to compile Ekiga])
36 -fi
37 +CPPFLAGS_save="$CPPFLAGS"
38 +CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
39 +AC_CHECK_HEADER(boost/signals2.hpp,, found_signals2=no)
40 +CPPFLAGS="$CPPFLAGS_save"
41
42 -BOOST_LIBS="${BOOST_SIGNALS_LIB}"
43 -AC_SUBST(BOOST_LIBS)
44 +if test "x$found_signals2" = "xno"; then
45 + AC_MSG_ERROR([Could not find BOOST signals2 headers])
46 +fi
47
48
49 dnl ###############################
50 diff --git a/lib/Makefile.am b/lib/Makefile.am
51 index 43324c92c..21e538b43 100644
52 --- a/lib/Makefile.am
53 +++ b/lib/Makefile.am
54 @@ -2,7 +2,7 @@ stacklib_LTLIBRARIES = libekiga.la
55 stacklib_dir = $(stacklibdir)
56
57 libekiga_la_SOURCES =
58 -libekiga_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS) $(GTK_LIBS)
59 +libekiga_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(GLIB_LIBS) $(XML_LIBS) $(GTK_LIBS)
60
61 if !WIN32
62 libekiga_la_LDFLAGS += -lX11
63 @@ -10,7 +10,9 @@ endif
64
65 CLEANFILES =
66
67 -INCLUDES = \
68 +AM_CPPFLAGS = \
69 + $(BOOST_CPPFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS) $(GTK_CFLAGS) \
70 + $(DBUS_CFLAGS) $(PTLIB_CFLAGS) $(OPAL_CFLAGS) \
71 -DSYSCONFDIR=\""$(sysconfdir)"\" \
72 -DEKIGA_PLUGIN_DIR=\"$(PLUGIN_DIR)\" \
73 -I$(top_srcdir) \
74 @@ -50,11 +52,7 @@ INCLUDES = \
75 AM_CFLAGS = \
76 $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GCONF_CFLAGS) $(DBUS_CFLAGS)
77
78 -AM_CPPFLAGS = \
79 - $(BOOST_CPPFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS) $(GTK_CFLAGS) \
80 - $(DBUS_CFLAGS) $(PTLIB_CFLAGS) $(OPAL_CFLAGS)
81 -AM_LIBS = \
82 - $(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS) $(GTK_LIBS)
83 +AM_LIBS = $(GLIB_LIBS) $(XML_LIBS) $(GTK_LIBS)
84
85 engine_dir = $(top_srcdir)/lib/engine
86 components_dir = $(top_srcdir)/lib/engine/components
87 @@ -99,7 +97,7 @@ endif
88 ##
89 if !WIN32
90
91 -INCLUDES += -I$(top_srcdir)/lib/pixops
92 +AM_CPPFLAGS += -I$(top_srcdir)/lib/pixops
93 EXTRA_DIST += $(top_srcdir)/lib/pixops/README
94
95 libekiga_la_SOURCES += \
96 @@ -669,7 +667,7 @@ libekiga_la_SOURCES += \
97
98 if !WIN32
99
100 -INCLUDES += \
101 +AM_CPPFLAGS += \
102 -I$(top_srcdir)/lib/engine/components/x-videooutput
103
104 libekiga_la_SOURCES += \
105 diff --git a/plugins/avahi/Makefile.am b/plugins/avahi/Makefile.am
106 index fc8f49c98..404d78c55 100644
107 --- a/plugins/avahi/Makefile.am
108 +++ b/plugins/avahi/Makefile.am
109 @@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgmavahi.la
110
111 avahi_dir = $(top_srcdir)/plugins/avahi
112
113 -AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(AVAHI_CFLAGS)
114 -
115 -INCLUDES = \
116 +AM_CXXFLAGS = \
117 + $(BOOST_CPPFLAGS) $(AVAHI_CFLAGS) \
118 -I$(top_srcdir)/lib/engine/framework \
119 -I$(top_srcdir)/lib/engine/account \
120 -I$(top_srcdir)/lib/engine/presence \
121 @@ -22,4 +21,4 @@ libgmavahi_la_SOURCES = \
122 libgmavahi_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
123 libgmavahi_la_LIBADD = \
124 $(top_builddir)/lib/libekiga.la \
125 - $(BOOST_LDFLAGS) $(BOOST_LIBS) $(AVAHI_LIBS)
126 + $(BOOST_LDFLAGS) $(AVAHI_LIBS)
127 diff --git a/plugins/evolution/Makefile.am b/plugins/evolution/Makefile.am
128 index 08a50099d..368b2301f 100644
129 --- a/plugins/evolution/Makefile.am
130 +++ b/plugins/evolution/Makefile.am
131 @@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgmevolution.la
132
133 evolution_dir = $(top_srcdir)/plugins/evolution
134
135 -AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(EDS_CFLAGS) $(GLIB_CFLAGS)
136 -
137 -INCLUDES = \
138 +AM_CXXFLAGS = \
139 + $(BOOST_CPPFLAGS) $(EDS_CFLAGS) $(GLIB_CFLAGS) \
140 -I$(top_srcdir)/lib/engine/framework \
141 -I$(top_srcdir)/lib/engine/addressbook
142
143 @@ -21,4 +20,4 @@ libgmevolution_la_SOURCES = \
144 libgmevolution_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
145 libgmevolution_la_LIBADD = \
146 $(top_builddir)/lib/libekiga.la \
147 - $(BOOST_LDFLAGS) $(BOOST_LIBS) $(EDS_LIBS) $(GLIB_LIBS)
148 + $(BOOST_LDFLAGS) $(EDS_LIBS) $(GLIB_LIBS)
149 diff --git a/plugins/gstreamer/Makefile.am b/plugins/gstreamer/Makefile.am
150 index 2a8396b2f..cd7f6738a 100644
151 --- a/plugins/gstreamer/Makefile.am
152 +++ b/plugins/gstreamer/Makefile.am
153 @@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgmgstreamer.la
154
155 gstreamer_dir = $(top_srcdir)/plugins/gstreamer/
156
157 -AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(GSTREAMER_CFLAGS) $(PTLIB_CFLAGS)
158 -
159 -INCLUDES = \
160 +AM_CXXFLAGS = \
161 + $(BOOST_CPPFLAGS) $(GSTREAMER_CFLAGS) $(PTLIB_CFLAGS) \
162 -I$(top_srcdir)/lib/gmconf \
163 -I$(top_srcdir)/lib/engine/framework \
164 -I$(top_srcdir)/lib/engine/notification \
165 @@ -28,4 +27,4 @@ libgmgstreamer_la_SOURCES = \
166
167 libgmgstreamer_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
168 libgmgstreamer_la_LIBADD = \
169 - $(BOOST_LDFLAGS) $(BOOST_LIBS) $(GSTREAMER_LIBS) $(PTLIB_LIBS)
170 + $(BOOST_LDFLAGS) $(GSTREAMER_LIBS) $(PTLIB_LIBS)
171 diff --git a/plugins/kab/Makefile.am b/plugins/kab/Makefile.am
172 index 99530c4b8..4275411a4 100644
173 --- a/plugins/kab/Makefile.am
174 +++ b/plugins/kab/Makefile.am
175 @@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgmkab.la
176
177 kab_dir = $(top_srcdir)/plugins/kab
178
179 -AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(KAB_CFLAGS)
180 -
181 -INCLUDES = \
182 +AM_CPPFLAGS = \
183 + $(BOOST_CPPFLAGS) $(KAB_CFLAGS) \
184 -I$(top_srcdir)/lib/engine/framework \
185 -I$(top_srcdir)/lib/engine/addressbook
186
187 @@ -20,4 +19,4 @@ libgmkab_la_SOURCES = \
188
189 libgmkab_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
190 libgmkab_la_LIBADD = \
191 - $(KAB_LIBS)
192 \ No newline at end of file
193 + $(KAB_LIBS)
194 diff --git a/plugins/kde/Makefile.am b/plugins/kde/Makefile.am
195 index 3d815773f..e0bee3dbd 100644
196 --- a/plugins/kde/Makefile.am
197 +++ b/plugins/kde/Makefile.am
198 @@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgmkde.la
199
200 kde_dir = $(top_srcdir)/plugins/kde
201
202 -AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(KDE_CFLAGS)
203 -
204 -INCLUDES = \
205 +AM_CXXFLAGS = \
206 + $(BOOST_CPPFLAGS) $(KDE_CFLAGS) \
207 -I$(top_srcdir)/lib/engine/framework
208
209 libgmkde_la_SOURCES = \
210 @@ -13,4 +12,4 @@ libgmkde_la_SOURCES = \
211
212 libgmkde_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
213 libgmkde_la_LIBADD = \
214 - $(BOOST_LDFLAGS) $(BOOST_LIBS) $(KDE_LIBS)
215 \ No newline at end of file
216 + $(BOOST_LDFLAGS) $(KDE_LIBS)
217 diff --git a/plugins/ldap/Makefile.am b/plugins/ldap/Makefile.am
218 index b27719bcc..eb8d9525a 100644
219 --- a/plugins/ldap/Makefile.am
220 +++ b/plugins/ldap/Makefile.am
221 @@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgmldap.la
222
223 ldap_dir = $(top_srcdir)/plugins/ldap
224
225 -AM_CPPFLAGS = $(LDAP_CFLAGS) $(BOOST_CPPFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS)
226 -
227 -INCLUDES = \
228 +AM_CPPFLAGS = \
229 + $(LDAP_CFLAGS) $(BOOST_CPPFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS) \
230 -I$(top_srcdir)/lib/gmconf \
231 -I$(top_srcdir)/lib/engine/framework \
232 -I$(top_srcdir)/lib/engine/addressbook
233 @@ -20,6 +19,7 @@ libgmldap_la_SOURCES = \
234 $(ldap_dir)/ldap-main.cpp
235
236 libgmldap_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
237 +
238 libgmldap_la_LIBADD = \
239 $(top_builddir)/lib/libekiga.la \
240 - $(LDAP_LIBS) $(BOOST_LDFLAGS) $(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS)
241 + $(LDAP_LIBS) $(BOOST_LDFLAGS) $(GLIB_LIBS) $(XML_LIBS)
242 diff --git a/plugins/libnotify/Makefile.am b/plugins/libnotify/Makefile.am
243 index 5ebdb0658..eb9b6e8dc 100644
244 --- a/plugins/libnotify/Makefile.am
245 +++ b/plugins/libnotify/Makefile.am
246 @@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgmlibnotify.la
247
248 libnotify_dir = $(top_srcdir)/plugins/libnotify
249
250 -AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(NOTIFY_CFLAGS)
251 -
252 -INCLUDES = \
253 +AM_CXXFLAGS = \
254 + $(BOOST_CPPFLAGS) $(NOTIFY_CFLAGS) \
255 -I$(top_srcdir)/lib/engine/framework \
256 -I$(top_srcdir)/lib/engine/notification \
257 -I$(top_srcdir)/lib/engine/protocol
258 @@ -15,4 +14,4 @@ libgmlibnotify_la_SOURCES = \
259 libgmlibnotify_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
260 libgmlibnotify_la_LIBADD = \
261 $(top_builddir)/lib/libekiga.la \
262 - $(BOOST_LDFLAGS) $(BOOST_LIBS) $(NOTIFY_LIBS)
263 + $(BOOST_LDFLAGS) $(NOTIFY_LIBS)
264 diff --git a/plugins/loudmouth/Makefile.am b/plugins/loudmouth/Makefile.am
265 index 1dde55781..82e672d95 100644
266 --- a/plugins/loudmouth/Makefile.am
267 +++ b/plugins/loudmouth/Makefile.am
268 @@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgmloudmouth.la
269
270 loudmouth_dir = $(top_srcdir)/plugins/loudmouth
271
272 -AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(XML_CFLAGS) $(LOUDMOUTH_CFLAGS)
273 -
274 -INCLUDES = \
275 +AM_CXXFLAGS = \
276 + $(BOOST_CPPFLAGS) $(XML_CFLAGS) $(LOUDMOUTH_CFLAGS) \
277 -I$(top_srcdir)/lib/gmconf \
278 -I$(top_srcdir)/lib/engine/framework \
279 -I$(top_srcdir)/lib/engine/account \
280 @@ -36,4 +35,4 @@ libgmloudmouth_la_SOURCES = \
281 libgmloudmouth_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
282 libgmloudmouth_la_LIBADD = \
283 $(top_builddir)/lib/libekiga.la \
284 - $(BOOST_LDFLAGS) $(BOOST_LIBS) $(XML_LIBS) $(LOUDMOUTH_LIBS)
285 + $(BOOST_LDFLAGS) $(XML_LIBS) $(LOUDMOUTH_LIBS)
286 diff --git a/plugins/resource-list/Makefile.am b/plugins/resource-list/Makefile.am
287 index 263c7610c..d561ecf80 100644
288 --- a/plugins/resource-list/Makefile.am
289 +++ b/plugins/resource-list/Makefile.am
290 @@ -2,12 +2,11 @@ plugin_LTLIBRARIES = libgmresource_list.la
291
292 resource_list_dir = $(top_srcdir)/plugins/resource-list
293
294 -AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS)
295 -
296 -INCLUDES = \
297 +AM_CXXFLAGS = \
298 + $(BOOST_CPPFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS) \
299 -I$(top_srcdir)/lib/gmconf \
300 -I$(top_srcdir)/lib/engine/framework \
301 - -I$(top_srcdir)/lib/engine/presence \
302 + -I$(top_srcdir)/lib/engine/presence \
303 -I$(top_srcdir)/lib/engine/account \
304 -I$(top_srcdir)/plugins/xcap
305
306 @@ -33,4 +32,4 @@ libgmresource_list_la_LDFLAGS = \
307 libgmresource_list_la_LIBADD = \
308 $(top_builddir)/lib/libekiga.la \
309 $(top_builddir)/plugins/xcap/libgmxcap.la \
310 - $(BOOST_LDFLAGS) $(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS)
311 + $(BOOST_LDFLAGS) $(GLIB_LIBS) $(XML_LIBS)
312 diff --git a/plugins/xcap/Makefile.am b/plugins/xcap/Makefile.am
313 index 612c69e35..a870455b6 100644
314 --- a/plugins/xcap/Makefile.am
315 +++ b/plugins/xcap/Makefile.am
316 @@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgmxcap.la
317
318 xcap_dir = $(top_srcdir)/plugins/xcap
319
320 -AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SOUP_CFLAGS)
321 -
322 -INCLUDES = \
323 +AM_CXXFLAGS = \
324 + $(BOOST_CPPFLAGS) $(SOUP_CFLAGS) \
325 -I$(top_srcdir)/lib/engine/framework
326
327 libgmxcap_la_SOURCES = \
328 @@ -18,4 +17,4 @@ libgmxcap_la_SOURCES = \
329 libgmxcap_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
330 libgmxcap_la_LIBADD = \
331 $(top_builddir)/lib/libekiga.la \
332 - $(BOOST_LDFLAGS) $(BOOST_LIBS) $(SOUP_LIBS)
333 + $(BOOST_LDFLAGS) $(SOUP_LIBS)
334 diff --git a/src/Makefile.am b/src/Makefile.am
335 index 985c74959..38478361f 100644
336 --- a/src/Makefile.am
337 +++ b/src/Makefile.am
338 @@ -1,4 +1,4 @@
339 -INCLUDES = \
340 +AM_CPPFLAGS = \
341 -I$(top_srcdir)/lib \
342 -I$(top_srcdir)/lib/gmconf \
343 -I$(top_srcdir)/lib/gui \
344 @@ -30,14 +30,14 @@ BUILT_SOURCES = src/revision.h
345
346 # XVideo/X
347 if !WIN32
348 -INCLUDES += \
349 +AM_CPPFLAGS += \
350 -I$(top_srcdir)/lib/engine/videooutput/common \
351 -I$(top_srcdir)/lib/engine/videooutput/x
352 endif
353
354 # DirectX
355 if HAVE_DX
356 -INCLUDES += \
357 +AM_CPPFLAGS += \
358 -I$(top_srcdir)/lib/engine/videooutput/common \
359 -I$(top_srcdir)/lib/engine/videooutput/dx
360 endif
361 @@ -83,7 +83,7 @@ ekiga_SOURCES += \
362 dbus-helper/dbus.cpp
363
364 # find gmmarshallers.h
365 -INCLUDES += \
366 +AM_CPPFLAGS += \
367 -I$(top_builddir)/lib
368
369 nodist_ekiga_SOURCES += \
370 @@ -142,7 +142,7 @@ src/revision.h:
371 fi
372
373 AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(BOOST_CPPFLAGS) $(XML_CFLAGS)
374 -AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(DBUS_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(BOOST_LDFLAGS) $(BOOST_LIBS) $(XML_LIBS)
375 +AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(DBUS_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(BOOST_LDFLAGS) $(XML_LIBS)
376
377 ekiga_LDADD = \
378 $(top_builddir)/lib/libekiga.la $(AM_LIBS)
379 --
380 2.20.1
381
382
383 From b6124e3c6b175f3a294a4ce23018b1f4bc0a7447 Mon Sep 17 00:00:00 2001
384 From: Julien Puydt <jpuydt@free.fr>
385 Date: Sat, 14 Sep 2013 17:49:31 +0200
386 Subject: [PATCH 2/2] Made the sources use signals2
387
388 ---
389 lib/engine/account/account-core.h | 12 +++----
390 lib/engine/account/bank-impl.h | 2 +-
391 lib/engine/account/bank.h | 6 ++--
392 lib/engine/addressbook/book.h | 6 ++--
393 lib/engine/addressbook/contact-core.cpp | 2 +-
394 lib/engine/addressbook/contact-core.h | 16 ++++-----
395 lib/engine/addressbook/source.h | 12 +++----
396 lib/engine/audioinput/audioinput-core.h | 12 +++----
397 lib/engine/audioinput/audioinput-manager.h | 8 ++---
398 lib/engine/audiooutput/audiooutput-core.h | 12 +++----
399 lib/engine/audiooutput/audiooutput-manager.h | 8 ++---
400 lib/engine/chat/chat-core.h | 4 +--
401 lib/engine/chat/chat.h | 8 ++---
402 lib/engine/chat/dialect-impl.h | 30 ++++++++--------
403 lib/engine/chat/dialect.h | 4 +--
404 .../components/call-history/history-book.h | 4 +--
405 .../components/call-history/history-contact.h | 2 +-
406 .../components/local-roster/local-cluster.h | 2 +-
407 .../local-roster/local-presentity.h | 2 +-
408 lib/engine/components/opal/opal-account.h | 2 +-
409 lib/engine/components/opal/opal-call.h | 2 +-
410 .../components/opal/opal-gmconf-bridge.cpp | 2 +-
411 .../framework/chain-of-responsibility.h | 7 ++--
412 lib/engine/framework/form-request-simple.h | 2 +-
413 lib/engine/framework/gmconf-bridge.h | 4 +--
414 lib/engine/framework/live-object.h | 4 +--
415 lib/engine/framework/menu-builder.h | 2 +-
416 lib/engine/framework/personal-details.h | 4 +--
417 lib/engine/framework/reflister.h | 20 +++++------
418 lib/engine/framework/runtime.h | 2 +-
419 lib/engine/framework/services.h | 4 +--
420 lib/engine/gui/gtk-core/codecsbox.cpp | 2 ++
421 .../gui/gtk-frontend/accounts-window.cpp | 6 ++--
422 .../gui/gtk-frontend/addressbook-window.cpp | 6 ++--
423 lib/engine/gui/gtk-frontend/book-view-gtk.cpp | 4 +--
424 .../gtk-frontend/call-history-view-gtk.cpp | 6 ++--
425 lib/engine/gui/gtk-frontend/call-window.cpp | 4 +--
426 lib/engine/gui/gtk-frontend/chat-area.cpp | 2 +-
427 lib/engine/gui/gtk-frontend/chat-window.cpp | 4 +--
428 lib/engine/gui/gtk-frontend/heap-view.cpp | 6 ++--
429 .../gui/gtk-frontend/preferences-window.cpp | 4 +--
430 .../gui/gtk-frontend/presentity-view.cpp | 4 +--
431 .../gui/gtk-frontend/roster-view-gtk.cpp | 6 ++--
432 lib/engine/gui/gtk-frontend/statusicon.cpp | 6 ++--
433 lib/engine/gui/gtk-frontend/statusicon.h | 2 +-
434 lib/engine/hal/hal-core.h | 20 +++++------
435 lib/engine/hal/hal-manager.h | 16 ++++-----
436 lib/engine/notification/notification-core.h | 4 +--
437 lib/engine/presence/cluster.h | 12 +++----
438 lib/engine/presence/heap.h | 6 ++--
439 lib/engine/presence/presence-core.cpp | 2 +-
440 lib/engine/presence/presence-core.h | 24 ++++++-------
441 lib/engine/presence/uri-presentity.h | 2 +-
442 lib/engine/protocol/call-core.cpp | 6 ++--
443 lib/engine/protocol/call-core.h | 34 +++++++++----------
444 lib/engine/protocol/call-manager.h | 6 ++--
445 lib/engine/protocol/call.h | 28 +++++++--------
446 lib/engine/videoinput/videoinput-core.h | 14 ++++----
447 lib/engine/videoinput/videoinput-manager.h | 8 ++---
448 lib/engine/videooutput/videooutput-core.h | 14 ++++----
449 lib/engine/videooutput/videooutput-manager.h | 12 +++----
450 plugins/avahi/avahi-cluster.h | 2 +-
451 plugins/avahi/avahi-heap.h | 2 +-
452 plugins/ldap/ldap-book.h | 2 +-
453 plugins/libnotify/libnotify-main.cpp | 8 ++---
454 plugins/loudmouth/loudmouth-account.h | 2 +-
455 plugins/loudmouth/loudmouth-heap-roster.h | 2 +-
456 plugins/loudmouth/loudmouth-helpers.h | 2 +-
457 plugins/loudmouth/loudmouth-presentity.h | 2 +-
458 plugins/resource-list/rl-heap.cpp | 12 +++----
459 plugins/resource-list/rl-heap.h | 4 +--
460 plugins/resource-list/rl-list.cpp | 24 ++++++-------
461 plugins/resource-list/rl-list.h | 6 ++--
462 plugins/resource-list/rl-presentity.h | 2 +-
463 src/gui/assistant.cpp | 4 +--
464 src/gui/main_window.cpp | 4 +--
465 src/gui/statusmenu.cpp | 4 +--
466 77 files changed, 280 insertions(+), 279 deletions(-)
467
468 diff --git a/lib/engine/account/account-core.h b/lib/engine/account/account-core.h
469 index 90bede6aa..2fdcf78a3 100644
470 --- a/lib/engine/account/account-core.h
471 +++ b/lib/engine/account/account-core.h
472 @@ -106,26 +106,26 @@ namespace Ekiga
473
474 /** This signal is emitted when a bank has been added to the core
475 */
476 - boost::signal1<void, BankPtr> bank_added;
477 + boost::signals2::signal<void(BankPtr)> bank_added;
478
479 /** This signal is emitted when a bank has been removed from the core
480 */
481 - boost::signal1<void, BankPtr> bank_removed;
482 + boost::signals2::signal<void(BankPtr)> bank_removed;
483
484 /** This signal is emitted when a account has been added to one of
485 * the banks
486 */
487 - boost::signal2<void, BankPtr, AccountPtr> account_added;
488 + boost::signals2::signal<void(BankPtr, AccountPtr)> account_added;
489
490 /** This signal is emitted when a account has been removed from one of
491 * the banks
492 */
493 - boost::signal2<void, BankPtr, AccountPtr> account_removed;
494 + boost::signals2::signal<void(BankPtr, AccountPtr)> account_removed;
495
496 /** This signal is emitted when a account has been updated in one of
497 * the banks
498 */
499 - boost::signal2<void, BankPtr, AccountPtr> account_updated;
500 + boost::signals2::signal<void(BankPtr, AccountPtr)> account_updated;
501
502 private:
503
504 @@ -147,7 +147,7 @@ namespace Ekiga
505 /** This signal is emitted when the AccountCore Service has been
506 * updated.
507 */
508 - boost::signal0<void> updated;
509 + boost::signals2::signal<void(void)> updated;
510
511
512 /** This chain allows the AccountCore to present forms to the user
513 diff --git a/lib/engine/account/bank-impl.h b/lib/engine/account/bank-impl.h
514 index b0a8775d3..52c917a1a 100644
515 --- a/lib/engine/account/bank-impl.h
516 +++ b/lib/engine/account/bank-impl.h
517 @@ -74,7 +74,7 @@ namespace Ekiga
518 template<class AccountType = Account>
519 class BankImpl:
520 public Bank,
521 - public boost::signals::trackable,
522 + public boost::signals2::trackable,
523 protected RefLister<AccountType>
524 {
525
526 diff --git a/lib/engine/account/bank.h b/lib/engine/account/bank.h
527 index de5549355..a8250237a 100644
528 --- a/lib/engine/account/bank.h
529 +++ b/lib/engine/account/bank.h
530 @@ -74,15 +74,15 @@ namespace Ekiga
531
532 /** This signal is emitted when a account has been added.
533 */
534 - boost::signal1<void, AccountPtr> account_added;
535 + boost::signals2::signal<void(AccountPtr)> account_added;
536
537 /** This signal is emitted when a account has been removed.
538 */
539 - boost::signal1<void, AccountPtr> account_removed;
540 + boost::signals2::signal<void(AccountPtr)> account_removed;
541
542 /** This signal is emitted when a account has been updated.
543 */
544 - boost::signal1<void, AccountPtr> account_updated;
545 + boost::signals2::signal<void(AccountPtr)> account_updated;
546
547 /** This chain allows the BankImpl to present forms to the user
548 */
549 diff --git a/lib/engine/addressbook/book.h b/lib/engine/addressbook/book.h
550 index 3712e2cc1..a0dc89313 100644
551 --- a/lib/engine/addressbook/book.h
552 +++ b/lib/engine/addressbook/book.h
553 @@ -92,17 +92,17 @@ namespace Ekiga {
554
555 /** This signal is emitted when a Contact has been added to the Book.
556 */
557 - boost::signal1<void, ContactPtr > contact_added;
558 + boost::signals2::signal<void(ContactPtr)> contact_added;
559
560
561 /** This signal is emitted when a Contact has been removed from the Book.
562 */
563 - boost::signal1<void, ContactPtr > contact_removed;
564 + boost::signals2::signal<void(ContactPtr)> contact_removed;
565
566
567 /** This signal is emitted when a Contact has been updated in the Book.
568 */
569 - boost::signal1<void, ContactPtr > contact_updated;
570 + boost::signals2::signal<void(ContactPtr)> contact_updated;
571 };
572
573 typedef boost::shared_ptr<Book> BookPtr;
574 diff --git a/lib/engine/addressbook/contact-core.cpp b/lib/engine/addressbook/contact-core.cpp
575 index 00eb282d9..dd181d6ba 100644
576 --- a/lib/engine/addressbook/contact-core.cpp
577 +++ b/lib/engine/addressbook/contact-core.cpp
578 @@ -50,7 +50,7 @@ on_search ()
579
580 Ekiga::ContactCore::~ContactCore ()
581 {
582 - for (std::list<boost::signals::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
583 + for (std::list<boost::signals2::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
584 iter->disconnect ();
585 }
586
587 diff --git a/lib/engine/addressbook/contact-core.h b/lib/engine/addressbook/contact-core.h
588 index 4eab10766..d8786a5f1 100644
589 --- a/lib/engine/addressbook/contact-core.h
590 +++ b/lib/engine/addressbook/contact-core.h
591 @@ -118,37 +118,37 @@ namespace Ekiga
592 /** This signal is emitted when a Ekiga::Source has been
593 * added to the ContactCore Service.
594 */
595 - boost::signal1<void, SourcePtr > source_added;
596 + boost::signals2::signal<void(SourcePtr)> source_added;
597
598 /** This signal is emitted when a book has been added to one of
599 * the sources
600 */
601 - boost::signal2<void, SourcePtr, BookPtr > book_added;
602 + boost::signals2::signal<void(SourcePtr, BookPtr )> book_added;
603
604 /** This signal is emitted when a book has been removed from one of
605 * the sources
606 */
607 - boost::signal2<void, SourcePtr, BookPtr > book_removed;
608 + boost::signals2::signal<void(SourcePtr, BookPtr )> book_removed;
609
610 /** This signal is emitted when a book has been updated in one of
611 * the sources
612 */
613 - boost::signal2<void, SourcePtr, BookPtr > book_updated;
614 + boost::signals2::signal<void(SourcePtr, BookPtr )> book_updated;
615
616 /** This signal is emitted when a contact has been added to one of
617 * the book of one of the sources
618 */
619 - boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_added;
620 + boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_added;
621
622 /** This signal is emitted when a contact has been removed from one of
623 * the book of one of the sources
624 */
625 - boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_removed;
626 + boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_removed;
627
628 /** This signal is emitted when a contact has been updated in one of
629 * the book of one of the sources
630 */
631 - boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_updated;
632 + boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_updated;
633
634 private:
635
636 @@ -174,7 +174,7 @@ namespace Ekiga
637 std::list<boost::shared_ptr<ContactDecorator> > contact_decorators;
638
639 /*** Misc stuff ***/
640 - std::list<boost::signals::connection> conns;
641 + std::list<boost::signals2::connection> conns;
642 };
643
644 /**
645 diff --git a/lib/engine/addressbook/source.h b/lib/engine/addressbook/source.h
646 index 35accd672..e26aa099a 100644
647 --- a/lib/engine/addressbook/source.h
648 +++ b/lib/engine/addressbook/source.h
649 @@ -63,32 +63,32 @@ namespace Ekiga {
650
651 /** This signal is emitted when a Book has been added to the Source.
652 */
653 - boost::signal1<void, BookPtr > book_added;
654 + boost::signals2::signal<void(BookPtr)> book_added;
655
656
657 /** This signal is emitted when a Book has been updated in the Source.
658 */
659 - boost::signal1<void, BookPtr > book_updated;
660 + boost::signals2::signal<void(BookPtr)> book_updated;
661
662
663 /** This signal is emitted when a Book has been removed in the Source.
664 */
665 - boost::signal1<void, BookPtr > book_removed;
666 + boost::signals2::signal<void(BookPtr)> book_removed;
667
668 /** This signal is emitted when a Contact has been added to a book in
669 * this source.
670 */
671 - boost::signal2<void, BookPtr, ContactPtr > contact_added;
672 + boost::signals2::signal<void(BookPtr, ContactPtr )> contact_added;
673
674 /** This signal is emitted when a Contact has been removed from a book in
675 * this source.
676 */
677 - boost::signal2<void, BookPtr, ContactPtr > contact_removed;
678 + boost::signals2::signal<void(BookPtr, ContactPtr )> contact_removed;
679
680 /** This signal is emitted when a Contact has been updated in a book in
681 * this source
682 */
683 - boost::signal2<void, BookPtr, ContactPtr > contact_updated;
684 + boost::signals2::signal<void(BookPtr, ContactPtr )> contact_updated;
685 };
686
687 typedef boost::shared_ptr<Source> SourcePtr;
688 diff --git a/lib/engine/audioinput/audioinput-core.h b/lib/engine/audioinput/audioinput-core.h
689 index 70737a694..97cfc5d57 100644
690 --- a/lib/engine/audioinput/audioinput-core.h
691 +++ b/lib/engine/audioinput/audioinput-core.h
692 @@ -136,7 +136,7 @@ namespace Ekiga
693 /** This signal is emitted when a Ekiga::AudioInputManager has been
694 * added to the AudioInputCore Service.
695 */
696 - boost::signal1<void, AudioInputManager &> manager_added;
697 + boost::signals2::signal<void(AudioInputManager &)> manager_added;
698
699
700 /*** AudioInput Device Management ***/
701 @@ -254,23 +254,23 @@ namespace Ekiga
702
703 /** See audioinput-manager.h for the API
704 */
705 - boost::signal3<void, AudioInputManager &, AudioInputDevice &, AudioInputSettings&> device_opened;
706 - boost::signal2<void, AudioInputManager &, AudioInputDevice &> device_closed;
707 - boost::signal3<void, AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes> device_error;
708 + boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &, AudioInputSettings&)> device_opened;
709 + boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &)> device_closed;
710 + boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes)> device_error;
711
712 /** This signal is emitted when an audio device input has been added to the system.
713 * This signal will be emitted if add_device was called with a device name and
714 * a manager claimed support for this device.
715 * @param device the audio input device that was added.
716 */
717 - boost::signal2<void, AudioInputDevice, bool> device_added;
718 + boost::signals2::signal<void(AudioInputDevice, bool)> device_added;
719
720 /** This signal is emitted when an audio input device has been removed from the system.
721 * This signal will be emitted if remove_device was called with a device name and
722 * a manager claimed support for this device.
723 * @param device the audio input device that was removed.
724 */
725 - boost::signal2<void, AudioInputDevice, bool> device_removed;
726 + boost::signals2::signal<void(AudioInputDevice, bool)> device_removed;
727
728 private:
729 void on_set_device (const AudioInputDevice & device);
730 diff --git a/lib/engine/audioinput/audioinput-manager.h b/lib/engine/audioinput/audioinput-manager.h
731 index 0ae9296dd..28e9f794b 100644
732 --- a/lib/engine/audioinput/audioinput-manager.h
733 +++ b/lib/engine/audioinput/audioinput-manager.h
734 @@ -39,7 +39,7 @@
735 #define __AUDIOINPUT_MANAGER_H__
736
737 #include <vector>
738 -#include <boost/signals.hpp>
739 +#include <boost/signals2.hpp>
740 #include <boost/bind.hpp>
741
742 #include "audioinput-info.h"
743 @@ -148,18 +148,18 @@ namespace Ekiga
744 * @param device the audio input device that was opened.
745 * @param config the current audio input device configuration (current volume, etc.).
746 */
747 - boost::signal2<void, AudioInputDevice, AudioInputSettings> device_opened;
748 + boost::signals2::signal<void(AudioInputDevice, AudioInputSettings)> device_opened;
749
750 /** This signal is emitted when an audio input device is closed.
751 * @param device the audio input device that was closed.
752 */
753 - boost::signal1<void, AudioInputDevice> device_closed;
754 + boost::signals2::signal<void(AudioInputDevice)> device_closed;
755
756 /** This signal is emitted when an error occurs when opening a audio input device.
757 * @param device the audio input device that caused the error.
758 * @param error_code the audio input device error code.
759 */
760 - boost::signal2<void, AudioInputDevice, AudioInputErrorCodes> device_error;
761 + boost::signals2::signal<void(AudioInputDevice, AudioInputErrorCodes)> device_error;
762
763
764 protected:
765 diff --git a/lib/engine/audiooutput/audiooutput-core.h b/lib/engine/audiooutput/audiooutput-core.h
766 index 627e4142e..a1db8e680 100644
767 --- a/lib/engine/audiooutput/audiooutput-core.h
768 +++ b/lib/engine/audiooutput/audiooutput-core.h
769 @@ -128,7 +128,7 @@ namespace Ekiga
770 /** This signal is emitted when a Ekiga::AudioOutputManager has been
771 * added to the AudioOutputCore Service.
772 */
773 - boost::signal1<void, AudioOutputManager &> manager_added;
774 + boost::signals2::signal<void(AudioOutputManager &)> manager_added;
775
776
777 /** Get a list of all devices supported by all managers registered to the core.
778 @@ -299,23 +299,23 @@ namespace Ekiga
779
780 /** See audiooutput-manager.h for the API
781 */
782 - boost::signal4<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputSettings&> device_opened;
783 - boost::signal3<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&> device_closed;
784 - boost::signal4<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputErrorCodes> device_error;
785 + boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputSettings&)> device_opened;
786 + boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&)> device_closed;
787 + boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputErrorCodes)> device_error;
788
789 /** This signal is emitted when an audio output device has been added to the system.
790 * This signal will be emitted if add_device was called with a device name and
791 * a manager claimed support for this device.
792 * @param device the audio output device that was added.
793 */
794 - boost::signal2<void, AudioOutputDevice, bool> device_added;
795 + boost::signals2::signal<void(AudioOutputDevice, bool)> device_added;
796
797 /** This signal is emitted when an audio output device has been removed from the system.
798 * This signal will be emitted if remove_device was called with a device name and
799 * a manager claimed support for this device.
800 * @param device the audio output device that was removed.
801 */
802 - boost::signal2<void, AudioOutputDevice, bool> device_removed;
803 + boost::signals2::signal<void(AudioOutputDevice, bool)> device_removed;
804
805 private:
806 void on_set_device (const AudioOutputDevice & device);
807 diff --git a/lib/engine/audiooutput/audiooutput-manager.h b/lib/engine/audiooutput/audiooutput-manager.h
808 index e613e0021..78cc20c79 100644
809 --- a/lib/engine/audiooutput/audiooutput-manager.h
810 +++ b/lib/engine/audiooutput/audiooutput-manager.h
811 @@ -39,7 +39,7 @@
812 #define __AUDIOOUTPUT_MANAGER_H__
813
814 #include <vector>
815 -#include <boost/signals.hpp>
816 +#include <boost/signals2.hpp>
817 #include <boost/bind.hpp>
818
819 #include "audiooutput-info.h"
820 @@ -152,20 +152,20 @@ namespace Ekiga
821 * @param device the audio output device that was opened.
822 * @param config the current audio output device configuration (current volume, etc.).
823 */
824 - boost::signal3<void, AudioOutputPS, AudioOutputDevice, AudioOutputSettings> device_opened;
825 + boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice, AudioOutputSettings)> device_opened;
826
827 /** This signal is emitted when an audio output device is closed.
828 * @param prim whether the primary or secondary audio output device was closed.
829 * @param device the audio output device that was closed.
830 */
831 - boost::signal2<void, AudioOutputPS, AudioOutputDevice> device_closed;
832 + boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice)> device_closed;
833
834 /** This signal is emitted when an error occurs when opening an audio output device.
835 * @param prim whether the primary or secondary audio output device caused the error.
836 * @param device the audio output device that caused the error.
837 * @param error_code the audio output device error code.
838 */
839 - boost::signal3<void, AudioOutputPS, AudioOutputDevice, AudioOutputErrorCodes> device_error;
840 + boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice, AudioOutputErrorCodes)> device_error;
841
842 protected:
843 typedef struct ManagerState {
844 diff --git a/lib/engine/chat/chat-core.h b/lib/engine/chat/chat-core.h
845 index 9a7d7e17f..444663cf7 100644
846 --- a/lib/engine/chat/chat-core.h
847 +++ b/lib/engine/chat/chat-core.h
848 @@ -100,7 +100,7 @@ namespace Ekiga
849 /** This signal is emitted when an Ekiga::Dialect has been added to
850 * the ChatCore service.
851 */
852 - boost::signal1<void, DialectPtr > dialect_added;
853 + boost::signals2::signal<void(DialectPtr)> dialect_added;
854
855 private:
856
857 @@ -116,7 +116,7 @@ namespace Ekiga
858
859 /** This signal is emitted when the ChatCore service has been updated.
860 */
861 - boost::signal0<void> updated;
862 + boost::signals2::signal<void(void)> updated;
863
864 /** This chain allows the ChatCore to present forms to the user
865 */
866 diff --git a/lib/engine/chat/chat.h b/lib/engine/chat/chat.h
867 index 08f568f83..bcaf85cf4 100644
868 --- a/lib/engine/chat/chat.h
869 +++ b/lib/engine/chat/chat.h
870 @@ -37,7 +37,7 @@
871 #define __CHAT_H__
872
873 #include <string>
874 -#include <boost/signals.hpp>
875 +#include <boost/signals2.hpp>
876 #include <boost/bind.hpp>
877
878 #include <boost/smart_ptr.hpp>
879 @@ -113,15 +113,15 @@ namespace Ekiga
880
881 /** This signal is emitted when the Chat has been updated.
882 */
883 - boost::signal0<void> updated;
884 + boost::signals2::signal<void(void)> updated;
885
886 /** This signal is emitted when the user requested to see this Chat
887 */
888 - boost::signal0<void> user_requested;
889 + boost::signals2::signal<void(void)> user_requested;
890
891 /** This signal is emitted when the Chat has been removed.
892 */
893 - boost::signal0<void> removed;
894 + boost::signals2::signal<void(void)> removed;
895
896 /** Feed possible actions on this Chat to the given MenuBuilder
897 * @param A MenuBuilder object to populate.
898 diff --git a/lib/engine/chat/dialect-impl.h b/lib/engine/chat/dialect-impl.h
899 index f14b48acd..7c3208e37 100644
900 --- a/lib/engine/chat/dialect-impl.h
901 +++ b/lib/engine/chat/dialect-impl.h
902 @@ -47,7 +47,7 @@ namespace Ekiga
903 typename MultipleChatType = MultipleChat>
904 class DialectImpl:
905 public Dialect,
906 - public boost::signals::trackable
907 + public boost::signals2::trackable
908 {
909 public:
910
911 @@ -75,10 +75,10 @@ namespace Ekiga
912
913 /* More STL-like ways to access the chats within this Ekiga::DialectImpl
914 */
915 - typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > > simple_iterator;
916 - typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > > simple_const_iterator;
917 - typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > > multiple_iterator;
918 - typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > > multiple_const_iterator;
919 + typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > > simple_iterator;
920 + typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > > simple_const_iterator;
921 + typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > > multiple_iterator;
922 + typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > > multiple_const_iterator;
923
924 simple_iterator simple_begin ();
925 simple_iterator simple_end ();
926 @@ -116,8 +116,8 @@ namespace Ekiga
927
928 private:
929
930 - std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > simple_chats;
931 - std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > multiple_chats;
932 + std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > simple_chats;
933 + std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > multiple_chats;
934
935 void on_simple_chat_removed (boost::shared_ptr<SimpleChatType> chat);
936
937 @@ -133,22 +133,22 @@ Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::DialectImpl ()
938 template<typename SimpleChatType, typename MultipleChatType>
939 Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::~DialectImpl ()
940 {
941 - for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals::connection> >::iterator iter = simple_chats.begin ();
942 + for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals2::connection> >::iterator iter = simple_chats.begin ();
943 iter != simple_chats.end ();
944 iter++) {
945
946 - for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin ();
947 + for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin ();
948 conn_iter != iter->second.end ();
949 ++conn_iter) {
950
951 conn_iter->disconnect ();
952 }
953 }
954 - for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals::connection> >::iterator iter = multiple_chats.begin ();
955 + for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals2::connection> >::iterator iter = multiple_chats.begin ();
956 iter != multiple_chats.end ();
957 iter++) {
958
959 - for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin ();
960 + for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin ();
961 conn_iter != iter->second.end ();
962 ++conn_iter) {
963
964 @@ -163,7 +163,7 @@ Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::visit_simple_chats (boost:
965 {
966 bool go_on = true;
967
968 - for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals::connection> >::const_iterator iter = simple_chats.begin ();
969 + for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals2::connection> >::const_iterator iter = simple_chats.begin ();
970 go_on && iter != simple_chats.end ();
971 iter++) {
972
973 @@ -177,7 +177,7 @@ Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::visit_multiple_chats (boos
974 {
975 bool go_on = true;
976
977 - for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals::connection> >::const_iterator iter = multiple_chats.begin ();
978 + for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals2::connection> >::const_iterator iter = multiple_chats.begin ();
979 go_on && iter != multiple_chats.end ();
980 iter++) {
981
982 @@ -275,7 +275,7 @@ template<typename SimpleChatType, typename MultipleChatType>
983 void
984 Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_simple_chat_removed (boost::shared_ptr<SimpleChatType> chat)
985 {
986 - for (typename std::list<boost::signals::connection>::iterator iter = simple_chats[chat].begin ();
987 + for (typename std::list<boost::signals2::connection>::iterator iter = simple_chats[chat].begin ();
988 iter != simple_chats[chat].end ();
989 ++iter) {
990
991 @@ -288,7 +288,7 @@ template<typename SimpleChatType, typename MultipleChatType>
992 void
993 Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_multiple_chat_removed (boost::shared_ptr<MultipleChatType> chat)
994 {
995 - for (typename std::list<boost::signals::connection>::iterator iter = multiple_chats[chat].begin ();
996 + for (typename std::list<boost::signals2::connection>::iterator iter = multiple_chats[chat].begin ();
997 iter != multiple_chats[chat].end ();
998 ++iter) {
999
1000 diff --git a/lib/engine/chat/dialect.h b/lib/engine/chat/dialect.h
1001 index c6d8986bb..0af7832c7 100644
1002 --- a/lib/engine/chat/dialect.h
1003 +++ b/lib/engine/chat/dialect.h
1004 @@ -72,12 +72,12 @@ namespace Ekiga
1005 /** This signal is emitted when an Ekiga::SimpleChat has been added to
1006 * the dialect.
1007 */
1008 - boost::signal1<void, SimpleChatPtr> simple_chat_added;
1009 + boost::signals2::signal<void(SimpleChatPtr)> simple_chat_added;
1010
1011 /** This signal is emitted when an Ekiga::MultipleChat has been added to
1012 * the dialect.
1013 */
1014 - boost::signal1<void, MultipleChatPtr> multiple_chat_added;
1015 + boost::signals2::signal<void(MultipleChatPtr)> multiple_chat_added;
1016
1017 /** This chain allows the Dialect to present forms to the user.
1018 */
1019 diff --git a/lib/engine/components/call-history/history-book.h b/lib/engine/components/call-history/history-book.h
1020 index 91b7e33d7..2097c16e3 100644
1021 --- a/lib/engine/components/call-history/history-book.h
1022 +++ b/lib/engine/components/call-history/history-book.h
1023 @@ -53,7 +53,7 @@ namespace History
1024
1025 class Book:
1026 public Ekiga::Book,
1027 - public boost::signals::trackable
1028 + public boost::signals2::trackable
1029 {
1030 public:
1031
1032 @@ -86,7 +86,7 @@ namespace History
1033
1034 void clear ();
1035
1036 - boost::signal0<void> cleared;
1037 + boost::signals2::signal<void(void)> cleared;
1038
1039 private:
1040
1041 diff --git a/lib/engine/components/call-history/history-contact.h b/lib/engine/components/call-history/history-contact.h
1042 index d109f6bc4..c727660ea 100644
1043 --- a/lib/engine/components/call-history/history-contact.h
1044 +++ b/lib/engine/components/call-history/history-contact.h
1045 @@ -61,7 +61,7 @@ namespace History
1046
1047 class Contact:
1048 public Ekiga::Contact,
1049 - public boost::signals::trackable
1050 + public boost::signals2::trackable
1051 {
1052 public:
1053
1054 diff --git a/lib/engine/components/local-roster/local-cluster.h b/lib/engine/components/local-roster/local-cluster.h
1055 index dc8fa4621..bdf1fc0e3 100644
1056 --- a/lib/engine/components/local-roster/local-cluster.h
1057 +++ b/lib/engine/components/local-roster/local-cluster.h
1058 @@ -51,7 +51,7 @@ namespace Local
1059 class Cluster :
1060 public Ekiga::ClusterImpl<Heap>,
1061 public Ekiga::Trigger,
1062 - public boost::signals::trackable
1063 + public boost::signals2::trackable
1064 {
1065 public:
1066
1067 diff --git a/lib/engine/components/local-roster/local-presentity.h b/lib/engine/components/local-roster/local-presentity.h
1068 index 9b315b3df..05f4898c4 100644
1069 --- a/lib/engine/components/local-roster/local-presentity.h
1070 +++ b/lib/engine/components/local-roster/local-presentity.h
1071 @@ -162,7 +162,7 @@ namespace Local
1072 * This signal makes the Local::Heap know that the XML tree changed
1073 * and hence should be saved
1074 */
1075 - boost::signal0<void> trigger_saving;
1076 + boost::signals2::signal<void(void)> trigger_saving;
1077
1078
1079 private:
1080 diff --git a/lib/engine/components/opal/opal-account.h b/lib/engine/components/opal/opal-account.h
1081 index ba908ca18..d55dc7bb1 100644
1082 --- a/lib/engine/components/opal/opal-account.h
1083 +++ b/lib/engine/components/opal/opal-account.h
1084 @@ -153,7 +153,7 @@ public:
1085
1086 const std::string as_string () const;
1087
1088 - boost::signal0<void> trigger_saving;
1089 + boost::signals2::signal<void(void)> trigger_saving;
1090
1091 /*
1092 * This is because an opal account is an Ekiga::PresencePublisher
1093 diff --git a/lib/engine/components/opal/opal-call.h b/lib/engine/components/opal/opal-call.h
1094 index 0e2a2a3c6..ac53afa9a 100644
1095 --- a/lib/engine/components/opal/opal-call.h
1096 +++ b/lib/engine/components/opal/opal-call.h
1097 @@ -55,7 +55,7 @@ namespace Opal {
1098 class Call
1099 : public OpalCall,
1100 public Ekiga::Call,
1101 - public boost::signals::trackable
1102 + public boost::signals2::trackable
1103 {
1104
1105 public:
1106 diff --git a/lib/engine/components/opal/opal-gmconf-bridge.cpp b/lib/engine/components/opal/opal-gmconf-bridge.cpp
1107 index ce8804471..eb2a4093a 100644
1108 --- a/lib/engine/components/opal/opal-gmconf-bridge.cpp
1109 +++ b/lib/engine/components/opal/opal-gmconf-bridge.cpp
1110 @@ -35,7 +35,7 @@
1111 */
1112
1113 #include <iostream>
1114 -#include <boost/signals.hpp>
1115 +#include <boost/signals2.hpp>
1116 #include <boost/bind.hpp>
1117
1118 #include "config.h"
1119 diff --git a/lib/engine/framework/chain-of-responsibility.h b/lib/engine/framework/chain-of-responsibility.h
1120 index 399992bb0..46c95fe59 100644
1121 --- a/lib/engine/framework/chain-of-responsibility.h
1122 +++ b/lib/engine/framework/chain-of-responsibility.h
1123 @@ -36,7 +36,7 @@
1124 #ifndef __CHAIN_OF_RESPONSIBILITY_H__
1125 #define __CHAIN_OF_RESPONSIBILITY_H__
1126
1127 -#include <boost/signals.hpp>
1128 +#include <boost/signals2.hpp>
1129 #include <boost/bind.hpp>
1130
1131 /* This code uses boost signals to implement the "chain of responsibility"
1132 @@ -117,9 +117,8 @@ namespace Ekiga
1133
1134 template<typename T_request>
1135 struct ChainOfResponsibility:
1136 - public boost::signal1<bool,
1137 - T_request,
1138 - responsibility_accumulator>
1139 + public boost::signals2::signal<bool(T_request),
1140 + responsibility_accumulator>
1141 {
1142 };
1143 };
1144 diff --git a/lib/engine/framework/form-request-simple.h b/lib/engine/framework/form-request-simple.h
1145 index 85211ab36..74b84ae30 100644
1146 --- a/lib/engine/framework/form-request-simple.h
1147 +++ b/lib/engine/framework/form-request-simple.h
1148 @@ -36,7 +36,7 @@
1149 #ifndef __FORM_REQUEST_SIMPLE_H__
1150 #define __FORM_REQUEST_SIMPLE_H__
1151
1152 -#include <boost/signals.hpp>
1153 +#include <boost/signals2.hpp>
1154 #include <boost/bind.hpp>
1155
1156 #include "form-builder.h"
1157 diff --git a/lib/engine/framework/gmconf-bridge.h b/lib/engine/framework/gmconf-bridge.h
1158 index 8c9ee68c9..94f50a134 100644
1159 --- a/lib/engine/framework/gmconf-bridge.h
1160 +++ b/lib/engine/framework/gmconf-bridge.h
1161 @@ -38,7 +38,7 @@
1162 #define __GMCONF_BRIDGE_H__
1163
1164 #include <vector>
1165 -#include <boost/signals.hpp>
1166 +#include <boost/signals2.hpp>
1167 #include <boost/bind.hpp>
1168
1169 #include "gmconf.h"
1170 @@ -94,7 +94,7 @@ namespace Ekiga
1171 * @param key is the GmConf key whose value changed
1172 * @param entry is the new GmConf entry
1173 */
1174 - boost::signal2<void, std::string /*key*/, GmConfEntry * /*entry*/> property_changed;
1175 + boost::signals2::signal<void(std::string /*key*/, GmConfEntry * /*entry*/)> property_changed;
1176
1177 protected :
1178 Ekiga::Service & service;
1179 diff --git a/lib/engine/framework/live-object.h b/lib/engine/framework/live-object.h
1180 index c672ad3bd..dfd33a8dd 100644
1181 --- a/lib/engine/framework/live-object.h
1182 +++ b/lib/engine/framework/live-object.h
1183 @@ -62,12 +62,12 @@ namespace Ekiga
1184
1185 /** This signal is emitted when the object has been updated.
1186 */
1187 - boost::signal0<void> updated;
1188 + boost::signals2::signal<void(void)> updated;
1189
1190
1191 /** This signal is emitted when the object has been removed.
1192 */
1193 - boost::signal0<void> removed;
1194 + boost::signals2::signal<void(void)> removed;
1195
1196 /** This chain allows the object to present forms to the user
1197 */
1198 diff --git a/lib/engine/framework/menu-builder.h b/lib/engine/framework/menu-builder.h
1199 index c67d71211..2d2717dfd 100644
1200 --- a/lib/engine/framework/menu-builder.h
1201 +++ b/lib/engine/framework/menu-builder.h
1202 @@ -37,7 +37,7 @@
1203 #define __MENU_BUILDER_H__
1204
1205 #include <string>
1206 -#include <boost/signals.hpp>
1207 +#include <boost/signals2.hpp>
1208 #include <boost/bind.hpp>
1209
1210
1211 diff --git a/lib/engine/framework/personal-details.h b/lib/engine/framework/personal-details.h
1212 index 04ddf97b1..d620ea9ac 100644
1213 --- a/lib/engine/framework/personal-details.h
1214 +++ b/lib/engine/framework/personal-details.h
1215 @@ -37,7 +37,7 @@
1216 #define __PERSONAL_DETAILS_H__
1217
1218 #include <string>
1219 -#include <boost/signals.hpp>
1220 +#include <boost/signals2.hpp>
1221 #include <boost/bind.hpp>
1222
1223 #include "services.h"
1224 @@ -66,7 +66,7 @@ namespace Ekiga
1225 virtual void set_presence_info (const std::string presence,
1226 const std::string status) = 0;
1227
1228 - boost::signal0<void> updated;
1229 + boost::signals2::signal<void(void)> updated;
1230 };
1231 };
1232
1233 diff --git a/lib/engine/framework/reflister.h b/lib/engine/framework/reflister.h
1234 index 3c23c2184..a8bc920ec 100644
1235 --- a/lib/engine/framework/reflister.h
1236 +++ b/lib/engine/framework/reflister.h
1237 @@ -37,7 +37,7 @@
1238 #ifndef __REFLISTER_H__
1239 #define __REFLISTER_H__
1240
1241 -#include <boost/signals.hpp>
1242 +#include <boost/signals2.hpp>
1243 #include <boost/bind.hpp>
1244 #include <list>
1245
1246 @@ -55,7 +55,7 @@ namespace Ekiga
1247 {
1248 protected:
1249
1250 - typedef std::map<boost::shared_ptr<ObjectType>,std::list<boost::signals::connection> > container_type;
1251 + typedef std::map<boost::shared_ptr<ObjectType>,std::list<boost::signals2::connection> > container_type;
1252 typedef Ekiga::map_key_iterator<container_type> iterator;
1253 typedef Ekiga::map_key_const_iterator<container_type> const_iterator;
1254
1255 @@ -66,7 +66,7 @@ namespace Ekiga
1256 void add_object (boost::shared_ptr<ObjectType> obj);
1257
1258 void add_connection (boost::shared_ptr<ObjectType> obj,
1259 - boost::signals::connection connection);
1260 + boost::signals2::connection connection);
1261
1262 void remove_object (boost::shared_ptr<ObjectType> obj);
1263
1264 @@ -78,9 +78,9 @@ namespace Ekiga
1265 const_iterator begin () const;
1266 const_iterator end () const;
1267
1268 - boost::signal1<void, boost::shared_ptr<ObjectType> > object_added;
1269 - boost::signal1<void, boost::shared_ptr<ObjectType> > object_removed;
1270 - boost::signal1<void, boost::shared_ptr<ObjectType> > object_updated;
1271 + boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_added;
1272 + boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_removed;
1273 + boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_updated;
1274
1275 private:
1276 container_type objects;
1277 @@ -95,7 +95,7 @@ Ekiga::RefLister<ObjectType>::~RefLister ()
1278 iter != objects.end ();
1279 ++iter) {
1280
1281 - for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin ();
1282 + for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin ();
1283 conn_iter != iter->second.end ();
1284 ++conn_iter) {
1285
1286 @@ -130,7 +130,7 @@ Ekiga::RefLister<ObjectType>::add_object (boost::shared_ptr<ObjectType> obj)
1287 template<typename ObjectType>
1288 void
1289 Ekiga::RefLister<ObjectType>::add_connection (boost::shared_ptr<ObjectType> obj,
1290 - boost::signals::connection connection)
1291 + boost::signals2::connection connection)
1292 {
1293 objects[obj].push_back (connection);
1294 }
1295 @@ -139,8 +139,8 @@ template<typename ObjectType>
1296 void
1297 Ekiga::RefLister<ObjectType>::remove_object (boost::shared_ptr<ObjectType> obj)
1298 {
1299 - std::list<boost::signals::connection> connections = objects[obj];
1300 - for (std::list<boost::signals::connection>::iterator iter = connections.begin ();
1301 + std::list<boost::signals2::connection> connections = objects[obj];
1302 + for (std::list<boost::signals2::connection>::iterator iter = connections.begin ();
1303 iter != connections.end ();
1304 ++iter)
1305 iter->disconnect ();
1306 diff --git a/lib/engine/framework/runtime.h b/lib/engine/framework/runtime.h
1307 index 1bb29a87d..8fa2657bb 100644
1308 --- a/lib/engine/framework/runtime.h
1309 +++ b/lib/engine/framework/runtime.h
1310 @@ -34,7 +34,7 @@
1311 *
1312 */
1313
1314 -#include <boost/signals.hpp>
1315 +#include <boost/signals2.hpp>
1316 #include <boost/bind.hpp>
1317
1318 #ifndef __RUNTIME_H__
1319 diff --git a/lib/engine/framework/services.h b/lib/engine/framework/services.h
1320 index 1c92d9008..cfa6e2599 100644
1321 --- a/lib/engine/framework/services.h
1322 +++ b/lib/engine/framework/services.h
1323 @@ -45,7 +45,7 @@
1324
1325 #include <list>
1326 #include <string>
1327 -#include <boost/signals.hpp>
1328 +#include <boost/signals2.hpp>
1329 #include <boost/bind.hpp>
1330
1331 namespace Ekiga
1332 @@ -101,7 +101,7 @@ namespace Ekiga
1333
1334 void dump (std::ostream &stream) const;
1335
1336 - boost::signal1<void, ServicePtr> service_added;
1337 + boost::signals2::signal<void(ServicePtr)> service_added;
1338
1339 private:
1340
1341 diff --git a/lib/engine/gui/gtk-core/codecsbox.cpp b/lib/engine/gui/gtk-core/codecsbox.cpp
1342 index 160aad659..25d315c08 100644
1343 --- a/lib/engine/gui/gtk-core/codecsbox.cpp
1344 +++ b/lib/engine/gui/gtk-core/codecsbox.cpp
1345 @@ -38,6 +38,8 @@
1346 #include "config.h"
1347 #include "codecsbox.h"
1348
1349 +#include <sstream>
1350 +
1351 #include "gmconf.h"
1352 #include "codec-description.h"
1353
1354 diff --git a/lib/engine/gui/gtk-frontend/accounts-window.cpp b/lib/engine/gui/gtk-frontend/accounts-window.cpp
1355 index d9506a4cb..ad310ece5 100644
1356 --- a/lib/engine/gui/gtk-frontend/accounts-window.cpp
1357 +++ b/lib/engine/gui/gtk-frontend/accounts-window.cpp
1358 @@ -62,7 +62,7 @@ struct _AccountsWindowPrivate
1359 GtkAccelGroup *accel;
1360
1361 Ekiga::ServiceCore &core;
1362 - std::vector<boost::signals::connection> connections;
1363 + std::vector<boost::signals2::connection> connections;
1364
1365 std::string presence;
1366
1367 @@ -502,7 +502,7 @@ accounts_window_finalize (GObject *obj)
1368 {
1369 AccountsWindow *self = ACCOUNTS_WINDOW (obj);
1370
1371 - for (std::vector<boost::signals::connection>::iterator iter
1372 + for (std::vector<boost::signals2::connection>::iterator iter
1373 = self->priv->connections.begin ();
1374 iter != self->priv->connections.end ();
1375 iter++)
1376 @@ -535,7 +535,7 @@ accounts_window_new (Ekiga::ServiceCore &core)
1377 {
1378 AccountsWindow *self = NULL;
1379
1380 - boost::signals::connection conn;
1381 + boost::signals2::connection conn;
1382
1383 GtkWidget *vbox = NULL;
1384 GtkWidget *menu_bar = NULL;
1385 diff --git a/lib/engine/gui/gtk-frontend/addressbook-window.cpp b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
1386 index 722fa835c..b91d000fe 100644
1387 --- a/lib/engine/gui/gtk-frontend/addressbook-window.cpp
1388 +++ b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
1389 @@ -52,7 +52,7 @@ struct _AddressBookWindowPrivate
1390 _AddressBookWindowPrivate (Ekiga::ContactCore & _core):core (_core) { }
1391
1392 Ekiga::ContactCore & core;
1393 - std::vector<boost::signals::connection> connections;
1394 + std::vector<boost::signals2::connection> connections;
1395 GtkWidget *tree_view;
1396 GtkWidget *notebook;
1397 GtkTreeSelection *selection;
1398 @@ -579,7 +579,7 @@ addressbook_window_finalize (GObject *obj)
1399 {
1400 AddressBookWindow *self = ADDRESSBOOK_WINDOW (obj);
1401
1402 - for (std::vector<boost::signals::connection>::iterator iter
1403 + for (std::vector<boost::signals2::connection>::iterator iter
1404 = self->priv->connections.begin ();
1405 iter != self->priv->connections.end ();
1406 iter++)
1407 @@ -613,7 +613,7 @@ addressbook_window_new (Ekiga::ContactCore &core)
1408 {
1409 AddressBookWindow *self = NULL;
1410
1411 - boost::signals::connection conn;
1412 + boost::signals2::connection conn;
1413
1414 GtkWidget *menu_bar = NULL;
1415 GtkWidget *frame = NULL;
1416 diff --git a/lib/engine/gui/gtk-frontend/book-view-gtk.cpp b/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
1417 index bf7ad791d..de540c9c5 100644
1418 --- a/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
1419 +++ b/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
1420 @@ -62,7 +62,7 @@ struct _BookViewGtkPrivate
1421 GtkWidget *scrolled_window;
1422
1423 Ekiga::BookPtr book;
1424 - std::list<boost::signals::connection> connections;
1425 + std::list<boost::signals2::connection> connections;
1426 };
1427
1428
1429 @@ -447,7 +447,7 @@ book_view_gtk_dispose (GObject *obj)
1430
1431 view = BOOK_VIEW_GTK (obj);
1432
1433 - for (std::list<boost::signals::connection>::iterator iter
1434 + for (std::list<boost::signals2::connection>::iterator iter
1435 = view->priv->connections.begin ();
1436 iter != view->priv->connections.end ();
1437 ++iter)
1438 diff --git a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
1439 index 1857e3968..882f166fa 100644
1440 --- a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
1441 +++ b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
1442 @@ -56,7 +56,7 @@ struct _CallHistoryViewGtkPrivate
1443 boost::shared_ptr<History::Book> book;
1444 GtkListStore* store;
1445 GtkTreeView* tree;
1446 - std::vector<boost::signals::connection> connections;
1447 + std::vector<boost::signals2::connection> connections;
1448 };
1449
1450 /* this is what we put in the view */
1451 @@ -229,7 +229,7 @@ call_history_view_gtk_dispose (GObject* obj)
1452
1453 view = CALL_HISTORY_VIEW_GTK (obj);
1454
1455 - for (std::vector<boost::signals::connection>::iterator iter
1456 + for (std::vector<boost::signals2::connection>::iterator iter
1457 = view->priv->connections.begin ();
1458 iter != view->priv->connections.end ();
1459 iter++)
1460 @@ -314,7 +314,7 @@ call_history_view_gtk_new (boost::shared_ptr<History::Book> book)
1461 GtkCellRenderer *renderer = NULL;
1462 GtkTreeSelection *selection = NULL;
1463
1464 - boost::signals::connection conn;
1465 + boost::signals2::connection conn;
1466
1467 g_return_val_if_fail (book, (GtkWidget*)NULL);
1468
1469 diff --git a/lib/engine/gui/gtk-frontend/call-window.cpp b/lib/engine/gui/gtk-frontend/call-window.cpp
1470 index 68fad6f47..ad6b360e5 100644
1471 --- a/lib/engine/gui/gtk-frontend/call-window.cpp
1472 +++ b/lib/engine/gui/gtk-frontend/call-window.cpp
1473 @@ -181,7 +181,7 @@ struct _EkigaCallWindowPrivate
1474
1475 GtkWidget *transfer_call_popup;
1476
1477 - std::vector<boost::signals::connection> connections;
1478 + std::vector<boost::signals2::connection> connections;
1479 };
1480
1481 /* properties */
1482 @@ -2207,7 +2207,7 @@ ekiga_call_window_transfer_dialog_run (EkigaCallWindow *cw,
1483 static void
1484 ekiga_call_window_connect_engine_signals (EkigaCallWindow *cw)
1485 {
1486 - boost::signals::connection conn;
1487 + boost::signals2::connection conn;
1488
1489 g_return_if_fail (EKIGA_IS_CALL_WINDOW (cw));
1490
1491 diff --git a/lib/engine/gui/gtk-frontend/chat-area.cpp b/lib/engine/gui/gtk-frontend/chat-area.cpp
1492 index 9811378c4..766b04a4a 100644
1493 --- a/lib/engine/gui/gtk-frontend/chat-area.cpp
1494 +++ b/lib/engine/gui/gtk-frontend/chat-area.cpp
1495 @@ -58,7 +58,7 @@ class ChatAreaHelper;
1496 struct _ChatAreaPrivate
1497 {
1498 Ekiga::Chat* chat;
1499 - boost::signals::connection connection;
1500 + boost::signals2::connection connection;
1501 boost::shared_ptr<ChatAreaHelper> helper;
1502 GmTextBufferEnhancer* enhancer;
1503 GtkWidget* smiley_menu;
1504 diff --git a/lib/engine/gui/gtk-frontend/chat-window.cpp b/lib/engine/gui/gtk-frontend/chat-window.cpp
1505 index 6471aa527..fa42ec82b 100644
1506 --- a/lib/engine/gui/gtk-frontend/chat-window.cpp
1507 +++ b/lib/engine/gui/gtk-frontend/chat-window.cpp
1508 @@ -54,7 +54,7 @@ struct _ChatWindowPrivate
1509 {}
1510
1511 Ekiga::ServiceCore& core;
1512 - std::list<boost::signals::connection> connections;
1513 + std::list<boost::signals2::connection> connections;
1514
1515 GtkWidget* notebook;
1516 };
1517 @@ -405,7 +405,7 @@ chat_window_finalize (GObject* obj)
1518
1519 self = CHAT_WINDOW (obj);
1520
1521 - for (std::list<boost::signals::connection>::iterator iter
1522 + for (std::list<boost::signals2::connection>::iterator iter
1523 = self->priv->connections.begin ();
1524 iter != self->priv->connections.end ();
1525 ++iter)
1526 diff --git a/lib/engine/gui/gtk-frontend/heap-view.cpp b/lib/engine/gui/gtk-frontend/heap-view.cpp
1527 index 89450480b..cfea71639 100644
1528 --- a/lib/engine/gui/gtk-frontend/heap-view.cpp
1529 +++ b/lib/engine/gui/gtk-frontend/heap-view.cpp
1530 @@ -47,7 +47,7 @@
1531 struct _HeapViewPrivate
1532 {
1533 Ekiga::HeapPtr heap;
1534 - std::vector<boost::signals::connection> connections;
1535 + std::vector<boost::signals2::connection> connections;
1536
1537 GtkTreeStore* store;
1538 GtkTreeView* view;
1539 @@ -454,7 +454,7 @@ heap_view_set_heap (HeapView* self,
1540 {
1541 if (self->priv->heap) {
1542
1543 - for (std::vector<boost::signals::connection>::iterator iter
1544 + for (std::vector<boost::signals2::connection>::iterator iter
1545 = self->priv->connections.begin ();
1546 iter != self->priv->connections.end ();
1547 iter++)
1548 @@ -465,7 +465,7 @@ heap_view_set_heap (HeapView* self,
1549
1550 if (heap) {
1551
1552 - boost::signals::connection conn;
1553 + boost::signals2::connection conn;
1554
1555 conn = heap->removed.connect (boost::bind (&on_heap_removed, self));
1556 self->priv->connections.push_back (conn);
1557 diff --git a/lib/engine/gui/gtk-frontend/preferences-window.cpp b/lib/engine/gui/gtk-frontend/preferences-window.cpp
1558 index 447e104e3..a972b6ccd 100644
1559 --- a/lib/engine/gui/gtk-frontend/preferences-window.cpp
1560 +++ b/lib/engine/gui/gtk-frontend/preferences-window.cpp
1561 @@ -88,7 +88,7 @@ typedef struct _GmPreferencesWindow
1562 GtkWidget *iface;
1563 GtkWidget *fsbutton;
1564 Ekiga::ServiceCore *core;
1565 - std::vector<boost::signals::connection> connections;
1566 + std::vector<boost::signals2::connection> connections;
1567 } GmPreferencesWindow;
1568
1569 #define GM_PREFERENCES_WINDOW(x) (GmPreferencesWindow *) (x)
1570 @@ -1357,7 +1357,7 @@ preferences_window_new (Ekiga::ServiceCore & core)
1571
1572 gm_window_hide_on_delete (window);
1573
1574 - boost::signals::connection conn;
1575 + boost::signals2::connection conn;
1576 boost::shared_ptr<Ekiga::VideoInputCore> videoinput_core = core.get<Ekiga::VideoInputCore> ("videoinput-core");
1577 boost::shared_ptr<Ekiga::AudioInputCore> audioinput_core = core.get<Ekiga::AudioInputCore> ("audioinput-core");
1578 boost::shared_ptr<Ekiga::AudioOutputCore> audiooutput_core = core.get<Ekiga::AudioOutputCore> ("audiooutput-core");
1579 diff --git a/lib/engine/gui/gtk-frontend/presentity-view.cpp b/lib/engine/gui/gtk-frontend/presentity-view.cpp
1580 index d05ff8ab7..8a6a0f33c 100644
1581 --- a/lib/engine/gui/gtk-frontend/presentity-view.cpp
1582 +++ b/lib/engine/gui/gtk-frontend/presentity-view.cpp
1583 @@ -40,8 +40,8 @@
1584 struct _PresentityViewPrivate
1585 {
1586 Ekiga::Presentity* presentity;
1587 - boost::signals::connection updated_conn;
1588 - boost::signals::connection removed_conn;
1589 + boost::signals2::connection updated_conn;
1590 + boost::signals2::connection removed_conn;
1591
1592 /* we contain those, so no need to unref them */
1593 GtkWidget* presence_image;
1594 diff --git a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
1595 index 883fcd697..b0305c4a3 100644
1596 --- a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
1597 +++ b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
1598 @@ -60,7 +60,7 @@ struct _RosterViewGtkPrivate
1599 {
1600 boost::shared_ptr<Ekiga::PresenceCore> core;
1601
1602 - std::vector<boost::signals::connection> connections;
1603 + std::vector<boost::signals2::connection> connections;
1604 GtkTreeStore *store;
1605 GtkTreeView *tree_view;
1606 GSList *folded_groups;
1607 @@ -1382,7 +1382,7 @@ roster_view_gtk_set_core (RosterViewGtk* self,
1608 {
1609 if (self->priv->core) {
1610
1611 - for (std::vector<boost::signals::connection>::iterator iter
1612 + for (std::vector<boost::signals2::connection>::iterator iter
1613 = self->priv->connections.begin ();
1614 iter != self->priv->connections.end ();
1615 iter++)
1616 @@ -1393,7 +1393,7 @@ roster_view_gtk_set_core (RosterViewGtk* self,
1617
1618 if (core) {
1619
1620 - boost::signals::connection conn;
1621 + boost::signals2::connection conn;
1622
1623 conn = core->cluster_added.connect (boost::bind (&on_cluster_added, self, _1));
1624 self->priv->connections.push_back (conn);
1625 diff --git a/lib/engine/gui/gtk-frontend/statusicon.cpp b/lib/engine/gui/gtk-frontend/statusicon.cpp
1626 index 55c59072d..cd7311b70 100644
1627 --- a/lib/engine/gui/gtk-frontend/statusicon.cpp
1628 +++ b/lib/engine/gui/gtk-frontend/statusicon.cpp
1629 @@ -68,7 +68,7 @@ struct _StatusIconPrivate
1630 GtkWidget *popup_menu;
1631 gboolean has_message;
1632
1633 - std::vector<boost::signals::connection> connections;
1634 + std::vector<boost::signals2::connection> connections;
1635
1636 int blink_id;
1637 std::string status;
1638 @@ -174,7 +174,7 @@ statusicon_finalize (GObject *obj)
1639 if (self->priv->blink_image)
1640 g_free (self->priv->blink_image);
1641
1642 - for (std::vector<boost::signals::connection>::iterator iter = self->priv->connections.begin () ;
1643 + for (std::vector<boost::signals2::connection>::iterator iter = self->priv->connections.begin () ;
1644 iter != self->priv->connections.end ();
1645 iter++)
1646 iter->disconnect ();
1647 @@ -548,7 +548,7 @@ status_icon_new (Ekiga::ServiceCore & core)
1648 if (!statusicon_should_run ())
1649 return self;
1650
1651 - boost::signals::connection conn;
1652 + boost::signals2::connection conn;
1653
1654 self = STATUSICON (g_object_new (STATUSICON_TYPE, NULL));
1655 self->priv = new StatusIconPrivate (core);
1656 diff --git a/lib/engine/gui/gtk-frontend/statusicon.h b/lib/engine/gui/gtk-frontend/statusicon.h
1657 index 19f81e1d2..ac78bab10 100644
1658 --- a/lib/engine/gui/gtk-frontend/statusicon.h
1659 +++ b/lib/engine/gui/gtk-frontend/statusicon.h
1660 @@ -42,7 +42,7 @@
1661
1662 #include <gtk/gtk.h>
1663
1664 -#include <boost/signals.hpp>
1665 +#include <boost/signals2.hpp>
1666 #include <boost/bind.hpp>
1667
1668 G_BEGIN_DECLS
1669 diff --git a/lib/engine/hal/hal-core.h b/lib/engine/hal/hal-core.h
1670 index 3a66314ec..0b0cce804 100644
1671 --- a/lib/engine/hal/hal-core.h
1672 +++ b/lib/engine/hal/hal-core.h
1673 @@ -40,7 +40,7 @@
1674
1675 #include "services.h"
1676
1677 -#include <boost/signals.hpp>
1678 +#include <boost/signals2.hpp>
1679 #include <boost/bind.hpp>
1680
1681 #include <set>
1682 @@ -114,24 +114,24 @@ namespace Ekiga
1683 /** This signal is emitted when an Ekiga::HalManager has been
1684 * added to the HalCore Service.
1685 */
1686 - boost::signal1<void, HalManager &> manager_added;
1687 + boost::signals2::signal<void(HalManager &)> manager_added;
1688
1689
1690 /*** API to act on HAL events ***/
1691
1692 /** See hal-manager.h for the API
1693 */
1694 - boost::signal4<void, const std::string &, const std::string &, unsigned, HalManager*> videoinput_device_added;
1695 - boost::signal4<void, const std::string &, const std::string &, unsigned, HalManager*> videoinput_device_removed;
1696 + boost::signals2::signal<void(const std::string &, const std::string &, unsigned, HalManager*)> videoinput_device_added;
1697 + boost::signals2::signal<void(const std::string &, const std::string &, unsigned, HalManager*)> videoinput_device_removed;
1698
1699 - boost::signal3<void, const std::string &, const std::string &, HalManager*> audioinput_device_added;
1700 - boost::signal3<void, const std::string &, const std::string &, HalManager*> audioinput_device_removed;
1701 + boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audioinput_device_added;
1702 + boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audioinput_device_removed;
1703
1704 - boost::signal3<void, const std::string &, const std::string &, HalManager*> audiooutput_device_added;
1705 - boost::signal3<void, const std::string &, const std::string &, HalManager*> audiooutput_device_removed;
1706 + boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audiooutput_device_added;
1707 + boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audiooutput_device_removed;
1708
1709 - boost::signal3<void, const std::string &, const std::string &, HalManager*> network_interface_up;
1710 - boost::signal3<void, const std::string &, const std::string &, HalManager*> network_interface_down;
1711 + boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> network_interface_up;
1712 + boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> network_interface_down;
1713
1714 private:
1715
1716 diff --git a/lib/engine/hal/hal-manager.h b/lib/engine/hal/hal-manager.h
1717 index e0b2e75bc..7638214c6 100644
1718 --- a/lib/engine/hal/hal-manager.h
1719 +++ b/lib/engine/hal/hal-manager.h
1720 @@ -75,50 +75,50 @@ namespace Ekiga
1721 * @param device the device name.
1722 * @param capabilities source-dependent device capabilites (e.g. V4L1 or V4L2 for video4linux).
1723 */
1724 - boost::signal3<void, std::string, std::string, unsigned> videoinput_device_added;
1725 + boost::signals2::signal<void(std::string, std::string, unsigned)> videoinput_device_added;
1726
1727 /** This signal is emitted when a video input device is removed from the system.
1728 * @param source the video input framework (e.g. video4linux, etc.).
1729 * @param device the device name.
1730 * @param capabilities source-dependent device capabilites (e.g. V4L1 or V4L2 for video4linux).
1731 */
1732 - boost::signal3<void, std::string, std::string, unsigned> videoinput_device_removed;
1733 + boost::signals2::signal<void(std::string, std::string, unsigned)> videoinput_device_removed;
1734
1735 /** This signal is emitted when an audio input device is added to the system.
1736 * @param source the audio input framework (e.g. alsa, oss, etc.).
1737 * @param device the device name.
1738 */
1739 - boost::signal2<void, std::string, std::string> audioinput_device_added;
1740 + boost::signals2::signal<void(std::string, std::string)> audioinput_device_added;
1741
1742 /** This signal is emitted when an audio input device is removed from the system.
1743 * @param source the audio input framework (e.g. alsa, oss, etc.).
1744 * @param device the device name.
1745 */
1746 - boost::signal2<void, std::string, std::string> audioinput_device_removed;
1747 + boost::signals2::signal<void(std::string, std::string)> audioinput_device_removed;
1748
1749 /** This signal is emitted when an audio output device is added to the system.
1750 * @param source the audio output framework (e.g. alsa, oss, etc.).
1751 * @param device the device name.
1752 */
1753 - boost::signal2<void, std::string, std::string> audiooutput_device_added;
1754 + boost::signals2::signal<void(std::string, std::string)> audiooutput_device_added;
1755
1756 /** This signal is emitted when an audio output device is removed from the system.
1757 * @param source the audio output framework (e.g. alsa, oss, etc.).
1758 * @param device the device name.
1759 */
1760 - boost::signal2<void, std::string, std::string> audiooutput_device_removed;
1761 + boost::signals2::signal<void(std::string, std::string)> audiooutput_device_removed;
1762
1763 /** This signal is emitted when a network device comes up.
1764 * @param interface_name the interface name (e.g. eth0, etc.).
1765 * @param ip4_address the IPv4 address (e.g. "192.168.0.1").
1766 */
1767 - boost::signal2<void, std::string, std::string> network_interface_up;
1768 + boost::signals2::signal<void(std::string, std::string)> network_interface_up;
1769
1770 /** This signal is emitted when a network device goes down.
1771 * @param interface_name the interface name (e.g. eth0, etc.).
1772 * @param ip4_address the IPv4 address (e.g. "192.168.0.1").
1773 */
1774 - boost::signal2<void, std::string, std::string> network_interface_down;
1775 + boost::signals2::signal<void(std::string, std::string)> network_interface_down;
1776 };
1777
1778 /**
1779 diff --git a/lib/engine/notification/notification-core.h b/lib/engine/notification/notification-core.h
1780 index caa8e00b0..323e0de68 100644
1781 --- a/lib/engine/notification/notification-core.h
1782 +++ b/lib/engine/notification/notification-core.h
1783 @@ -77,7 +77,7 @@ namespace Ekiga
1784 void action_trigger ()
1785 { if (action_callback) action_callback (); }
1786
1787 - boost::signal0<void> removed;
1788 + boost::signals2::signal<void(void)> removed;
1789
1790 private:
1791
1792 @@ -109,7 +109,7 @@ namespace Ekiga
1793 void push_notification (boost::shared_ptr<Notification> notification)
1794 { notification_added (notification); }
1795
1796 - boost::signal1<void, boost::shared_ptr<Notification> > notification_added;
1797 + boost::signals2::signal<void(boost::shared_ptr<Notification>)> notification_added;
1798 };
1799 };
1800
1801 diff --git a/lib/engine/presence/cluster.h b/lib/engine/presence/cluster.h
1802 index df4441052..1677162b5 100644
1803 --- a/lib/engine/presence/cluster.h
1804 +++ b/lib/engine/presence/cluster.h
1805 @@ -66,16 +66,16 @@ namespace Ekiga
1806 * from the Cluster.
1807 * @param The Heap in question.
1808 */
1809 - boost::signal1<void, HeapPtr > heap_added;
1810 - boost::signal1<void, HeapPtr > heap_removed;
1811 + boost::signals2::signal<void(HeapPtr)> heap_added;
1812 + boost::signals2::signal<void(HeapPtr)> heap_removed;
1813
1814 /** Those signals are forwarded from the given Heap
1815 * @param The Heap in question.
1816 */
1817 - boost::signal1<void, HeapPtr > heap_updated;
1818 - boost::signal2<void, HeapPtr , PresentityPtr > presentity_added;
1819 - boost::signal2<void, HeapPtr , PresentityPtr > presentity_updated;
1820 - boost::signal2<void, HeapPtr , PresentityPtr > presentity_removed;
1821 + boost::signals2::signal<void(HeapPtr)> heap_updated;
1822 + boost::signals2::signal<void(HeapPtr , PresentityPtr )> presentity_added;
1823 + boost::signals2::signal<void(HeapPtr , PresentityPtr )> presentity_updated;
1824 + boost::signals2::signal<void(HeapPtr , PresentityPtr )> presentity_removed;
1825 };
1826
1827 typedef boost::shared_ptr<Cluster> ClusterPtr;
1828 diff --git a/lib/engine/presence/heap.h b/lib/engine/presence/heap.h
1829 index 859168a43..753f16c3a 100644
1830 --- a/lib/engine/presence/heap.h
1831 +++ b/lib/engine/presence/heap.h
1832 @@ -83,15 +83,15 @@ namespace Ekiga
1833
1834 /** This signal is emitted when a Presentity has been added to the Heap.
1835 */
1836 - boost::signal1<void, PresentityPtr > presentity_added;
1837 + boost::signals2::signal<void(PresentityPtr)> presentity_added;
1838
1839 /** This signal is emitted when a Presentity has been updated in the Heap.
1840 */
1841 - boost::signal1<void, PresentityPtr > presentity_updated;
1842 + boost::signals2::signal<void(PresentityPtr)> presentity_updated;
1843
1844 /** This signal is emitted when a Presentity has been removed from the Heap.
1845 */
1846 - boost::signal1<void, PresentityPtr > presentity_removed;
1847 + boost::signals2::signal<void(PresentityPtr)> presentity_removed;
1848 };
1849
1850 typedef boost::shared_ptr<Heap> HeapPtr;
1851 diff --git a/lib/engine/presence/presence-core.cpp b/lib/engine/presence/presence-core.cpp
1852 index 93de3475a..05214796f 100644
1853 --- a/lib/engine/presence/presence-core.cpp
1854 +++ b/lib/engine/presence/presence-core.cpp
1855 @@ -49,7 +49,7 @@ Ekiga::PresenceCore::PresenceCore (Ekiga::ServiceCore& core)
1856
1857 Ekiga::PresenceCore::~PresenceCore ()
1858 {
1859 - for (std::list<boost::signals::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
1860 + for (std::list<boost::signals2::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
1861 iter->disconnect ();
1862 }
1863
1864 diff --git a/lib/engine/presence/presence-core.h b/lib/engine/presence/presence-core.h
1865 index 22606428a..55709dd8c 100644
1866 --- a/lib/engine/presence/presence-core.h
1867 +++ b/lib/engine/presence/presence-core.h
1868 @@ -97,8 +97,8 @@ namespace Ekiga
1869 * presence information about an uri it was required to handle.
1870 * The information is given as a pair of strings (uri, data).
1871 */
1872 - boost::signal2<void, std::string, std::string> presence_received;
1873 - boost::signal2<void, std::string, std::string> status_received;
1874 + boost::signals2::signal<void(std::string, std::string)> presence_received;
1875 + boost::signals2::signal<void(std::string, std::string)> status_received;
1876 };
1877
1878 class PresencePublisher
1879 @@ -180,22 +180,22 @@ namespace Ekiga
1880 /** This signal is emitted when an Ekiga::Cluster has been added
1881 * to the PresenceCore Service.
1882 */
1883 - boost::signal1<void, ClusterPtr > cluster_added;
1884 + boost::signals2::signal<void(ClusterPtr)> cluster_added;
1885
1886 /** Those signals are forwarding the heap_added, heap_updated
1887 * and heap_removed from the given Cluster.
1888 *
1889 */
1890 - boost::signal2<void, ClusterPtr , HeapPtr > heap_added;
1891 - boost::signal2<void, ClusterPtr , HeapPtr > heap_updated;
1892 - boost::signal2<void, ClusterPtr , HeapPtr > heap_removed;
1893 + boost::signals2::signal<void(ClusterPtr , HeapPtr )> heap_added;
1894 + boost::signals2::signal<void(ClusterPtr , HeapPtr )> heap_updated;
1895 + boost::signals2::signal<void(ClusterPtr , HeapPtr )> heap_removed;
1896
1897 /** Those signals are forwarding the presentity_added, presentity_updated
1898 * and presentity_removed from the given Heap of the given Cluster.
1899 */
1900 - boost::signal3<void, ClusterPtr , HeapPtr , PresentityPtr > presentity_added;
1901 - boost::signal3<void, ClusterPtr , HeapPtr , PresentityPtr > presentity_updated;
1902 - boost::signal3<void, ClusterPtr , HeapPtr , PresentityPtr > presentity_removed;
1903 + boost::signals2::signal<void(ClusterPtr , HeapPtr , PresentityPtr )> presentity_added;
1904 + boost::signals2::signal<void(ClusterPtr , HeapPtr , PresentityPtr )> presentity_updated;
1905 + boost::signals2::signal<void(ClusterPtr , HeapPtr , PresentityPtr )> presentity_removed;
1906
1907 private:
1908
1909 @@ -256,8 +256,8 @@ namespace Ekiga
1910 /** Those signals are emitted whenever information has been received
1911 * about an uri ; the information is a pair of strings (uri, information).
1912 */
1913 - boost::signal2<void, std::string, std::string> presence_received;
1914 - boost::signal2<void, std::string, std::string> status_received;
1915 + boost::signals2::signal<void(std::string, std::string)> presence_received;
1916 + boost::signals2::signal<void(std::string, std::string)> status_received;
1917
1918 private:
1919
1920 @@ -321,7 +321,7 @@ namespace Ekiga
1921
1922 private:
1923
1924 - std::list<boost::signals::connection> conns;
1925 + std::list<boost::signals2::connection> conns;
1926 };
1927
1928 /**
1929 diff --git a/lib/engine/presence/uri-presentity.h b/lib/engine/presence/uri-presentity.h
1930 index 6300a7062..213ec410f 100644
1931 --- a/lib/engine/presence/uri-presentity.h
1932 +++ b/lib/engine/presence/uri-presentity.h
1933 @@ -60,7 +60,7 @@ namespace Ekiga
1934 */
1935 class URIPresentity:
1936 public Ekiga::Presentity,
1937 - public boost::signals::trackable
1938 + public boost::signals2::trackable
1939 {
1940 public:
1941
1942 diff --git a/lib/engine/protocol/call-core.cpp b/lib/engine/protocol/call-core.cpp
1943 index dd6fbbb4b..b96d888a0 100644
1944 --- a/lib/engine/protocol/call-core.cpp
1945 +++ b/lib/engine/protocol/call-core.cpp
1946 @@ -48,7 +48,7 @@ using namespace Ekiga;
1947
1948 CallCore::~CallCore ()
1949 {
1950 - for (std::list<boost::signals::connection>::iterator iter = manager_connections.begin ();
1951 + for (std::list<boost::signals2::connection>::iterator iter = manager_connections.begin ();
1952 iter != manager_connections.end ();
1953 ++iter)
1954 iter->disconnect ();
1955 @@ -103,7 +103,7 @@ bool CallCore::dial (const std::string uri)
1956
1957 void CallCore::add_call (boost::shared_ptr<Call> call, boost::shared_ptr<CallManager> manager)
1958 {
1959 - std::list<boost::signals::connection> conns;
1960 + std::list<boost::signals2::connection> conns;
1961
1962 conns.push_back (call->ringing.connect (boost::bind (&CallCore::on_ringing_call, this, call, manager)));
1963 conns.push_back (call->setup.connect (boost::bind (&CallCore::on_setup_call, this, call, manager)));
1964 @@ -124,7 +124,7 @@ void CallCore::add_call (boost::shared_ptr<Call> call, boost::shared_ptr<CallMan
1965
1966 void CallCore::remove_call (boost::shared_ptr<Call> call)
1967 {
1968 - for (std::list<boost::signals::connection>::iterator iter2 = call_connections [call->get_id ()].begin ();
1969 + for (std::list<boost::signals2::connection>::iterator iter2 = call_connections [call->get_id ()].begin ();
1970 iter2 != call_connections [call->get_id ()].end ();
1971 ++iter2)
1972 iter2->disconnect ();
1973 diff --git a/lib/engine/protocol/call-core.h b/lib/engine/protocol/call-core.h
1974 index bbd7f6bcc..24270c18b 100644
1975 --- a/lib/engine/protocol/call-core.h
1976 +++ b/lib/engine/protocol/call-core.h
1977 @@ -45,7 +45,7 @@
1978 #include "call-protocol-manager.h"
1979 #include <boost/smart_ptr.hpp>
1980
1981 -#include <boost/signals.hpp>
1982 +#include <boost/signals2.hpp>
1983 #include <boost/bind.hpp>
1984 #include <set>
1985 #include <map>
1986 @@ -126,7 +126,7 @@ namespace Ekiga
1987 /** This signal is emitted when a Ekiga::CallManager has been
1988 * added to the CallCore Service.
1989 */
1990 - boost::signal1<void, boost::shared_ptr<CallManager> > manager_added;
1991 + boost::signals2::signal<void(boost::shared_ptr<CallManager>)> manager_added;
1992
1993
1994 /*** Call Management ***/
1995 @@ -141,21 +141,21 @@ namespace Ekiga
1996
1997 /** See call.h for the API
1998 */
1999 - boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > ringing_call;
2000 - boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > setup_call;
2001 - boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > missed_call;
2002 - boost::signal3<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string> cleared_call;
2003 - boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > established_call;
2004 - boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > held_call;
2005 - boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > retrieved_call;
2006 - boost::signal5<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType, bool> stream_opened;
2007 - boost::signal5<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType, bool> stream_closed;
2008 - boost::signal4<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType> stream_paused;
2009 - boost::signal4<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType> stream_resumed;
2010 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> ringing_call;
2011 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> setup_call;
2012 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> missed_call;
2013 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string)> cleared_call;
2014 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> established_call;
2015 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> held_call;
2016 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> retrieved_call;
2017 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType, bool)> stream_opened;
2018 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType, bool)> stream_closed;
2019 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType)> stream_paused;
2020 + boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType)> stream_resumed;
2021
2022 /*** Misc ***/
2023 - boost::signal1<void, boost::shared_ptr<CallManager> > manager_ready;
2024 - boost::signal0<void> ready;
2025 + boost::signals2::signal<void(boost::shared_ptr<CallManager>)> manager_ready;
2026 + boost::signals2::signal<void(void)> ready;
2027
2028 /** This chain allows the CallCore to report errors to the user
2029 */
2030 @@ -186,8 +186,8 @@ namespace Ekiga
2031
2032
2033 std::set<boost::shared_ptr<CallManager> > managers;
2034 - std::list<boost::signals::connection> manager_connections;
2035 - std::map<std::string, std::list<boost::signals::connection> > call_connections;
2036 + std::list<boost::signals2::connection> manager_connections;
2037 + std::map<std::string, std::list<boost::signals2::connection> > call_connections;
2038 unsigned nr_ready;
2039 };
2040
2041 diff --git a/lib/engine/protocol/call-manager.h b/lib/engine/protocol/call-manager.h
2042 index ec10091b2..2a0df32c6 100644
2043 --- a/lib/engine/protocol/call-manager.h
2044 +++ b/lib/engine/protocol/call-manager.h
2045 @@ -40,7 +40,7 @@
2046 #define __CALL_MANAGER_H__
2047
2048 #include <set>
2049 -#include <boost/signals.hpp>
2050 +#include <boost/signals2.hpp>
2051 #include <boost/bind.hpp>
2052
2053 #include <boost/smart_ptr.hpp>
2054 @@ -99,7 +99,7 @@ namespace Ekiga
2055 /** This signal is emitted when a Ekiga::CallProtocolManager has been
2056 * added to the CallManager.
2057 */
2058 - boost::signal1<void, boost::shared_ptr<CallProtocolManager> > manager_added;
2059 + boost::signals2::signal<void(boost::shared_ptr<CallProtocolManager>)> manager_added;
2060
2061
2062 /*
2063 @@ -213,7 +213,7 @@ namespace Ekiga
2064 /*
2065 * MISC
2066 */
2067 - boost::signal0<void> ready;
2068 + boost::signals2::signal<void(void)> ready;
2069
2070 private:
2071 std::set<boost::shared_ptr<CallProtocolManager> > managers;
2072 diff --git a/lib/engine/protocol/call.h b/lib/engine/protocol/call.h
2073 index f0eaa8189..8d21996e1 100644
2074 --- a/lib/engine/protocol/call.h
2075 +++ b/lib/engine/protocol/call.h
2076 @@ -38,7 +38,7 @@
2077 #ifndef __CALL_H__
2078 #define __CALL_H__
2079
2080 -#include <boost/signals.hpp>
2081 +#include <boost/signals2.hpp>
2082 #include <boost/bind.hpp>
2083 #include <string>
2084
2085 @@ -198,69 +198,69 @@ namespace Ekiga
2086
2087 /* Signal emitted when the call is established
2088 */
2089 - boost::signal0<void> established;
2090 + boost::signals2::signal<void(void)> established;
2091
2092 /* Signal emitted when an established call is cleared
2093 * @param: a string describing why the call was cleared
2094 */
2095 - boost::signal1<void, std::string> cleared;
2096 + boost::signals2::signal<void(std::string)> cleared;
2097
2098 /* Signal emitted when the call is missed, ie cleared
2099 * without having been established
2100 */
2101 - boost::signal0<void> missed;
2102 + boost::signals2::signal<void(void)> missed;
2103
2104 /* Signal emitted when the call is forwarded
2105 */
2106 - boost::signal0<void> forwarded;
2107 + boost::signals2::signal<void(void)> forwarded;
2108
2109 /* Signal emitted when the call is held
2110 */
2111 - boost::signal0<void> held;
2112 + boost::signals2::signal<void(void)> held;
2113
2114 /* Signal emitted when the call is retrieved
2115 */
2116 - boost::signal0<void> retrieved;
2117 + boost::signals2::signal<void(void)> retrieved;
2118
2119 /* Signal emitted when the call is being setup
2120 */
2121 - boost::signal0<void> setup;
2122 + boost::signals2::signal<void(void)> setup;
2123
2124 /* Signal emitted when the remote party is ringing
2125 */
2126 - boost::signal0<void> ringing;
2127 + boost::signals2::signal<void(void)> ringing;
2128
2129 /* Signal emitted when a stream is opened
2130 * @param the stream name
2131 * @param the stream type
2132 * @param transmission or reception
2133 */
2134 - boost::signal3<void, std::string, StreamType, bool> stream_opened;
2135 + boost::signals2::signal<void(std::string, StreamType, bool)> stream_opened;
2136
2137 /* Signal emitted when a stream is closed
2138 * @param the stream name
2139 * @param the stream type
2140 * @param transmission or reception
2141 */
2142 - boost::signal3<void, std::string, StreamType, bool> stream_closed;
2143 + boost::signals2::signal<void(std::string, StreamType, bool)> stream_closed;
2144
2145 /* Signal emitted when a transmitted stream is paused
2146 * @param the stream name
2147 * @param the stream type
2148 * @param transmission or reception
2149 */
2150 - boost::signal2<void, std::string, StreamType> stream_paused;
2151 + boost::signals2::signal<void(std::string, StreamType)> stream_paused;
2152
2153 /* Signal emitted when a transmitted stream is resumed
2154 * @param the stream name
2155 * @param the stream type
2156 * @param transmission or reception
2157 */
2158 - boost::signal2<void, std::string, StreamType> stream_resumed;
2159 + boost::signals2::signal<void(std::string, StreamType)> stream_resumed;
2160
2161 /** This signal is emitted when the Call is removed.
2162 */
2163 - boost::signal0<void> removed;
2164 + boost::signals2::signal<void(void)> removed;
2165
2166 };
2167
2168 diff --git a/lib/engine/videoinput/videoinput-core.h b/lib/engine/videoinput/videoinput-core.h
2169 index 3f87f89a8..869569375 100644
2170 --- a/lib/engine/videoinput/videoinput-core.h
2171 +++ b/lib/engine/videoinput/videoinput-core.h
2172 @@ -45,7 +45,7 @@
2173 #include "videoinput-manager.h"
2174 #include "videoinput-gmconf-bridge.h"
2175
2176 -#include <boost/signals.hpp>
2177 +#include <boost/signals2.hpp>
2178 #include <boost/bind.hpp>
2179 #include <glib.h>
2180 #include <set>
2181 @@ -146,7 +146,7 @@ namespace Ekiga
2182 /** This signal is emitted when a Ekiga::VideoInputManager has been
2183 * added to the VideoInputCore Service.
2184 */
2185 - boost::signal1<void, VideoInputManager &> manager_added;
2186 + boost::signals2::signal<void(VideoInputManager &)> manager_added;
2187
2188
2189 /*** VideoInput Device Management ***/
2190 @@ -277,23 +277,23 @@ namespace Ekiga
2191
2192 /** See videoinput-manager.h for the API
2193 */
2194 - boost::signal3<void, VideoInputManager &, VideoInputDevice &, VideoInputSettings&> device_opened;
2195 - boost::signal2<void, VideoInputManager &, VideoInputDevice &> device_closed;
2196 - boost::signal3<void, VideoInputManager &, VideoInputDevice &, VideoInputErrorCodes> device_error;
2197 + boost::signals2::signal<void(VideoInputManager &, VideoInputDevice &, VideoInputSettings&)> device_opened;
2198 + boost::signals2::signal<void(VideoInputManager &, VideoInputDevice &)> device_closed;
2199 + boost::signals2::signal<void(VideoInputManager &, VideoInputDevice &, VideoInputErrorCodes)> device_error;
2200
2201 /** This signal is emitted when a video input has been added to the system.
2202 * This signal will be emitted if add_device was called with a device name and
2203 * a manager claimed support for this device.
2204 * @param device the video input device that was added.
2205 */
2206 - boost::signal2<void, VideoInputDevice, bool> device_added;
2207 + boost::signals2::signal<void(VideoInputDevice, bool)> device_added;
2208
2209 /** This signal is emitted when a video input has been removed from the system.
2210 * This signal will be emitted if remove_device was called with a device name and
2211 * a manager claimed support for this device.
2212 * @param device the video input device that was removed.
2213 */
2214 - boost::signal2<void, VideoInputDevice, bool> device_removed;
2215 + boost::signals2::signal<void(VideoInputDevice, bool)> device_removed;
2216
2217 private:
2218 void on_set_device (const VideoInputDevice & device);
2219 diff --git a/lib/engine/videoinput/videoinput-manager.h b/lib/engine/videoinput/videoinput-manager.h
2220 index 7235c541b..3b09c41d0 100644
2221 --- a/lib/engine/videoinput/videoinput-manager.h
2222 +++ b/lib/engine/videoinput/videoinput-manager.h
2223 @@ -39,7 +39,7 @@
2224 #define __VIDEOINPUT_MANAGER_H__
2225
2226 #include <vector>
2227 -#include <boost/signals.hpp>
2228 +#include <boost/signals2.hpp>
2229 #include <boost/bind.hpp>
2230
2231 #include "videoinput-info.h"
2232 @@ -159,18 +159,18 @@ namespace Ekiga
2233 * @param device the video input device that was opened.
2234 * @param config the current video input device configuration (current brightness, colour, etc.).
2235 */
2236 - boost::signal2<void, VideoInputDevice, VideoInputSettings> device_opened;
2237 + boost::signals2::signal<void(VideoInputDevice, VideoInputSettings)> device_opened;
2238
2239 /** This signal is emitted when a video input device is closed.
2240 * @param device the video input device that was closed.
2241 */
2242 - boost::signal1<void, VideoInputDevice> device_closed;
2243 + boost::signals2::signal<void(VideoInputDevice)> device_closed;
2244
2245 /** This signal is emitted when an error occurs when opening a video input device.
2246 * @param device the video input device that caused the error.
2247 * @param error_code the video input device error code.
2248 */
2249 - boost::signal2<void, VideoInputDevice, VideoInputErrorCodes> device_error;
2250 + boost::signals2::signal<void(VideoInputDevice, VideoInputErrorCodes)> device_error;
2251
2252 protected:
2253 typedef struct ManagerState {
2254 diff --git a/lib/engine/videooutput/videooutput-core.h b/lib/engine/videooutput/videooutput-core.h
2255 index b8968dada..e3e5936f4 100644
2256 --- a/lib/engine/videooutput/videooutput-core.h
2257 +++ b/lib/engine/videooutput/videooutput-core.h
2258 @@ -42,7 +42,7 @@
2259 #include "videooutput-gmconf-bridge.h"
2260 #include "videooutput-manager.h"
2261
2262 -#include <boost/signals.hpp>
2263 +#include <boost/signals2.hpp>
2264 #include <boost/bind.hpp>
2265 #include <set>
2266 #include <map>
2267 @@ -116,7 +116,7 @@ namespace Ekiga
2268 /** This signal is emitted when a Ekiga::VideoOutputManager has been
2269 * added to the VideoOutputCore Service.
2270 */
2271 - boost::signal1<void, VideoOutputManager &> manager_added;
2272 + boost::signals2::signal<void(VideoOutputManager &)> manager_added;
2273
2274
2275 /*** Videooutput Management ***/
2276 @@ -165,11 +165,11 @@ namespace Ekiga
2277
2278 /** See videooutput-manager.h for the API
2279 */
2280 - boost::signal6<void, VideoOutputManager &, VideoOutputAccel, VideoOutputMode, unsigned, bool, bool> device_opened;
2281 - boost::signal1<void, VideoOutputManager &> device_closed;
2282 - boost::signal2<void, VideoOutputManager &, VideoOutputErrorCodes> device_error;
2283 - boost::signal2<void, VideoOutputManager &, VideoOutputFSToggle> fullscreen_mode_changed;
2284 - boost::signal3<void, VideoOutputManager &, unsigned, unsigned> size_changed;
2285 + boost::signals2::signal<void(VideoOutputManager &, VideoOutputAccel, VideoOutputMode, unsigned, bool, bool)> device_opened;
2286 + boost::signals2::signal<void(VideoOutputManager &)> device_closed;
2287 + boost::signals2::signal<void(VideoOutputManager &, VideoOutputErrorCodes)> device_error;
2288 + boost::signals2::signal<void(VideoOutputManager &, VideoOutputFSToggle)> fullscreen_mode_changed;
2289 + boost::signals2::signal<void(VideoOutputManager &, unsigned, unsigned)> size_changed;
2290
2291
2292 private:
2293 diff --git a/lib/engine/videooutput/videooutput-manager.h b/lib/engine/videooutput/videooutput-manager.h
2294 index 0a1f337a1..58b361a01 100644
2295 --- a/lib/engine/videooutput/videooutput-manager.h
2296 +++ b/lib/engine/videooutput/videooutput-manager.h
2297 @@ -38,7 +38,7 @@
2298 #ifndef __VIDEOOUTPUT_MANAGER_H__
2299 #define __VIDEOOUTPUT_MANAGER_H__
2300
2301 -#include <boost/signals.hpp>
2302 +#include <boost/signals2.hpp>
2303 #include <boost/bind.hpp>
2304
2305 #include "videooutput-info.h"
2306 @@ -108,16 +108,16 @@ namespace Ekiga
2307 * @param both_streams if a frame from both local and remote stream has been received.
2308 * @param ext_stream if a frame from an extended video stream has been received.
2309 */
2310 - boost::signal5<void, VideoOutputAccel, VideoOutputMode, unsigned, bool, bool> device_opened;
2311 + boost::signals2::signal<void(VideoOutputAccel, VideoOutputMode, unsigned, bool, bool)> device_opened;
2312
2313 /** This signal is emitted when a video output device is closed.
2314 */
2315 - boost::signal0<void> device_closed;
2316 + boost::signals2::signal<void(void)> device_closed;
2317
2318 /** This signal is emitted when an error occurs when opening a video output device.
2319 * @param error_code the video output device error code.
2320 */
2321 - boost::signal1<void, VideoOutputErrorCodes> device_error;
2322 + boost::signals2::signal<void(VideoOutputErrorCodes)> device_error;
2323
2324 /** This signal is emitted when a manager switches autonomously into or out of fullscreen mode.
2325 * Some managers like DX and XV allow the user to switch between FS
2326 @@ -127,7 +127,7 @@ namespace Ekiga
2327 * or when it is being zoomed in or out.
2328 * @param toggle VO_FS_ON or VO_FS_OFF depending on whether FS was activated or deactivated.
2329 */
2330 - boost::signal1<void, VideoOutputFSToggle> fullscreen_mode_changed;
2331 + boost::signals2::signal<void(VideoOutputFSToggle)> fullscreen_mode_changed;
2332
2333 /** This signal is emitted the video output size has changed.
2334 * This signal is called whenever the size of the widget carrying the video signal
2335 @@ -136,7 +136,7 @@ namespace Ekiga
2336 * @param width the new width of the widget.
2337 * @param height the new height of the widget.
2338 */
2339 - boost::signal2<void, unsigned, unsigned> size_changed;
2340 + boost::signals2::signal<void(unsigned, unsigned)> size_changed;
2341
2342 protected:
2343 virtual void get_display_info (DisplayInfo &) { };
2344 diff --git a/plugins/avahi/avahi-cluster.h b/plugins/avahi/avahi-cluster.h
2345 index 602e8d061..1821553ea 100644
2346 --- a/plugins/avahi/avahi-cluster.h
2347 +++ b/plugins/avahi/avahi-cluster.h
2348 @@ -53,7 +53,7 @@ namespace Avahi
2349 class Cluster:
2350 public Ekiga::Service,
2351 public Ekiga::ClusterImpl<Heap>,
2352 - public boost::signals::trackable
2353 + public boost::signals2::trackable
2354 {
2355 public:
2356
2357 diff --git a/plugins/avahi/avahi-heap.h b/plugins/avahi/avahi-heap.h
2358 index dea994638..07dff41b9 100644
2359 --- a/plugins/avahi/avahi-heap.h
2360 +++ b/plugins/avahi/avahi-heap.h
2361 @@ -60,7 +60,7 @@ namespace Avahi
2362 class Heap:
2363 public Ekiga::PresenceFetcher,
2364 public Ekiga::HeapImpl<Ekiga::URIPresentity>,
2365 - public boost::signals::trackable
2366 + public boost::signals2::trackable
2367 {
2368 public:
2369
2370 diff --git a/plugins/ldap/ldap-book.h b/plugins/ldap/ldap-book.h
2371 index f02ba3b7f..bcf051989 100644
2372 --- a/plugins/ldap/ldap-book.h
2373 +++ b/plugins/ldap/ldap-book.h
2374 @@ -124,7 +124,7 @@ namespace OPENLDAP
2375
2376 xmlNodePtr get_node ();
2377
2378 - boost::signal0<void> trigger_saving;
2379 + boost::signals2::signal<void(void)> trigger_saving;
2380
2381 bool is_ekiga_net_book () const;
2382
2383 diff --git a/plugins/libnotify/libnotify-main.cpp b/plugins/libnotify/libnotify-main.cpp
2384 index 502e53bdf..bb40c578f 100644
2385 --- a/plugins/libnotify/libnotify-main.cpp
2386 +++ b/plugins/libnotify/libnotify-main.cpp
2387 @@ -51,7 +51,7 @@
2388
2389 class LibNotify:
2390 public Ekiga::Service,
2391 - public boost::signals::trackable
2392 + public boost::signals2::trackable
2393 {
2394 public:
2395
2396 @@ -77,7 +77,7 @@ private:
2397 boost::shared_ptr<Ekiga::Call> call);
2398 void on_call_notification_closed (gpointer self);
2399
2400 - typedef std::map<boost::shared_ptr<Ekiga::Notification>, std::pair<boost::signals::connection, boost::shared_ptr<NotifyNotification> > > container_type;
2401 + typedef std::map<boost::shared_ptr<Ekiga::Notification>, std::pair<boost::signals2::connection, boost::shared_ptr<NotifyNotification> > > container_type;
2402 container_type live;
2403 };
2404
2405 @@ -234,10 +234,10 @@ LibNotify::on_notification_added (boost::shared_ptr<Ekiga::Notification> notific
2406 notify_action_cb, notification.get (), NULL);
2407
2408 g_signal_connect (notif, "closed", G_CALLBACK (on_notif_closed), notification.get ());
2409 - boost::signals::connection conn = notification->removed.connect (boost::bind (&LibNotify::on_notification_removed,
2410 + boost::signals2::connection conn = notification->removed.connect (boost::bind (&LibNotify::on_notification_removed,
2411 this, notification));
2412
2413 - live[notification] = std::pair<boost::signals::connection, boost::shared_ptr<NotifyNotification> > (conn, boost::shared_ptr<NotifyNotification> (notif, g_object_unref));
2414 + live[notification] = std::pair<boost::signals2::connection, boost::shared_ptr<NotifyNotification> > (conn, boost::shared_ptr<NotifyNotification> (notif, g_object_unref));
2415
2416 notify_notification_show (notif, NULL);
2417 }
2418 diff --git a/plugins/loudmouth/loudmouth-account.h b/plugins/loudmouth/loudmouth-account.h
2419 index c7a86b274..0e7e595fc 100644
2420 --- a/plugins/loudmouth/loudmouth-account.h
2421 +++ b/plugins/loudmouth/loudmouth-account.h
2422 @@ -70,7 +70,7 @@ namespace LM
2423
2424 xmlNodePtr get_node () const;
2425
2426 - boost::signal0<void> trigger_saving;
2427 + boost::signals2::signal<void(void)> trigger_saving;
2428
2429 const std::string get_name () const;
2430
2431 diff --git a/plugins/loudmouth/loudmouth-heap-roster.h b/plugins/loudmouth/loudmouth-heap-roster.h
2432 index f2ad46b20..1fee4f5d0 100644
2433 --- a/plugins/loudmouth/loudmouth-heap-roster.h
2434 +++ b/plugins/loudmouth/loudmouth-heap-roster.h
2435 @@ -46,7 +46,7 @@ namespace LM
2436 class HeapRoster:
2437 public Ekiga::HeapImpl<Presentity>,
2438 public LM::Handler,
2439 - public boost::signals::trackable
2440 + public boost::signals2::trackable
2441 {
2442 public:
2443
2444 diff --git a/plugins/loudmouth/loudmouth-helpers.h b/plugins/loudmouth/loudmouth-helpers.h
2445 index dff9cda4b..486056117 100644
2446 --- a/plugins/loudmouth/loudmouth-helpers.h
2447 +++ b/plugins/loudmouth/loudmouth-helpers.h
2448 @@ -37,7 +37,7 @@
2449 #define __LOUDMOUTH_HELPERS_H__
2450
2451 #include <boost/smart_ptr.hpp>
2452 -#include <boost/signals.hpp>
2453 +#include <boost/signals2.hpp>
2454
2455 #include <loudmouth/loudmouth.h>
2456
2457 diff --git a/plugins/loudmouth/loudmouth-presentity.h b/plugins/loudmouth/loudmouth-presentity.h
2458 index d8d522275..63f9d476f 100644
2459 --- a/plugins/loudmouth/loudmouth-presentity.h
2460 +++ b/plugins/loudmouth/loudmouth-presentity.h
2461 @@ -78,7 +78,7 @@ namespace LM
2462
2463 bool has_chat;
2464
2465 - boost::signal0<void> chat_requested;
2466 + boost::signals2::signal<void(void)> chat_requested;
2467
2468 private:
2469 LmConnection* connection;
2470 diff --git a/plugins/resource-list/rl-heap.cpp b/plugins/resource-list/rl-heap.cpp
2471 index beeac6b0c..1d38776bc 100644
2472 --- a/plugins/resource-list/rl-heap.cpp
2473 +++ b/plugins/resource-list/rl-heap.cpp
2474 @@ -185,7 +185,7 @@ RL::Heap::visit_presentities (boost::function1<bool, Ekiga::PresentityPtr > visi
2475 {
2476 bool go_on = true;
2477
2478 - for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
2479 + for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator
2480 iter = presentities.begin ();
2481 go_on && iter != presentities.end ();
2482 ++iter)
2483 @@ -254,7 +254,7 @@ RL::Heap::refresh ()
2484 while ( !presentities.empty ()) {
2485
2486 presentities.begin()->first->removed ();
2487 - for (std::list<boost::signals::connection>::const_iterator iter2
2488 + for (std::list<boost::signals2::connection>::const_iterator iter2
2489 = presentities.begin()->second.begin ();
2490 iter2 != presentities.begin()->second.end ();
2491 ++iter2)
2492 @@ -366,7 +366,7 @@ RL::Heap::parse_list (xmlNodePtr list)
2493 && xmlStrEqual (BAD_CAST ("entry"), child->name)) {
2494
2495 PresentityPtr presentity(new Presentity (services, path, doc, child, writable));
2496 - std::list<boost::signals::connection> conns;
2497 + std::list<boost::signals2::connection> conns;
2498 conns.push_back (presentity->updated.connect (boost::bind (boost::ref (presentity_updated), presentity)));
2499 conns.push_back (presentity->removed.connect (boost::bind(boost::ref (presentity_removed),presentity)));
2500 conns.push_back (presentity->trigger_reload.connect (boost::bind (&RL::Heap::refresh, this)));
2501 @@ -381,7 +381,7 @@ void
2502 RL::Heap::push_presence (const std::string uri_,
2503 const std::string presence)
2504 {
2505 - for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
2506 + for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator
2507 iter = presentities.begin ();
2508 iter != presentities.end ();
2509 ++iter) {
2510 @@ -395,7 +395,7 @@ void
2511 RL::Heap::push_status (const std::string uri_,
2512 const std::string status)
2513 {
2514 - for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
2515 + for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator
2516 iter = presentities.begin ();
2517 iter != presentities.end ();
2518 ++iter) {
2519 @@ -514,7 +514,7 @@ RL::Heap::new_entry ()
2520 "contact on a remote server"));
2521
2522 std::set<std::string> all_groups;
2523 - for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
2524 + for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator
2525 iter = presentities.begin ();
2526 iter != presentities.end ();
2527 ++iter) {
2528 diff --git a/plugins/resource-list/rl-heap.h b/plugins/resource-list/rl-heap.h
2529 index 67f38bd27..de3b41d04 100644
2530 --- a/plugins/resource-list/rl-heap.h
2531 +++ b/plugins/resource-list/rl-heap.h
2532 @@ -90,7 +90,7 @@ namespace RL {
2533 void push_status (const std::string uri,
2534 const std::string status);
2535
2536 - boost::signal0<void> trigger_saving;
2537 + boost::signals2::signal<void(void)> trigger_saving;
2538
2539 private:
2540
2541 @@ -106,7 +106,7 @@ namespace RL {
2542 boost::shared_ptr<xmlDoc> doc;
2543 xmlNodePtr list_node;
2544
2545 - std::map<PresentityPtr, std::list<boost::signals::connection> > presentities;
2546 + std::map<PresentityPtr, std::list<boost::signals2::connection> > presentities;
2547
2548 void refresh ();
2549
2550 diff --git a/plugins/resource-list/rl-list.cpp b/plugins/resource-list/rl-list.cpp
2551 index 1049a46b8..45fc9acdf 100644
2552 --- a/plugins/resource-list/rl-list.cpp
2553 +++ b/plugins/resource-list/rl-list.cpp
2554 @@ -94,9 +94,9 @@ public: // no need to make anything private
2555
2556 void publish () const;
2557
2558 - boost::signal1<void, boost::shared_ptr<Entry> > entry_added;
2559 - boost::signal1<void, boost::shared_ptr<Entry> > entry_updated;
2560 - boost::signal1<void, boost::shared_ptr<Entry> > entry_removed;
2561 + boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_added;
2562 + boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_updated;
2563 + boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_removed;
2564
2565
2566 /* data for its children */
2567 @@ -104,7 +104,7 @@ public: // no need to make anything private
2568
2569 std::list<ChildType> ordering;
2570 std::list<boost::shared_ptr<List> > lists;
2571 - std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > > entries;
2572 + std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > > entries;
2573 };
2574
2575
2576 @@ -235,12 +235,12 @@ RL::ListImpl::flush ()
2577 (*iter)->flush ();
2578 lists.clear ();
2579
2580 - for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::iterator iter = entries.begin ();
2581 + for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::iterator iter = entries.begin ();
2582 iter != entries.end ();
2583 ++iter) {
2584
2585 iter->first->removed ();
2586 - for (std::list<boost::signals::connection>::iterator conn_iter
2587 + for (std::list<boost::signals2::connection>::iterator conn_iter
2588 = iter->second.begin ();
2589 conn_iter != iter->second.end ();
2590 ++conn_iter)
2591 @@ -342,10 +342,10 @@ RL::ListImpl::parse ()
2592 entry_pos,
2593 display_name,
2594 doc, child));
2595 - std::list<boost::signals::connection> conns;
2596 + std::list<boost::signals2::connection> conns;
2597 conns.push_back (entry->updated.connect (boost::bind (boost::ref (entry_updated), entry)));
2598 conns.push_back (entry->removed.connect (boost::bind (boost::ref (entry_removed), entry)));
2599 - entries.push_back (std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > (entry, conns));
2600 + entries.push_back (std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > (entry, conns));
2601 ordering.push_back (ENTRY);
2602 entry_pos++;
2603 entry_added (entry);
2604 @@ -363,7 +363,7 @@ RL::ListImpl::push_presence (const std::string uri_,
2605 ++iter)
2606 (*iter)->push_presence (uri_, presence);
2607
2608 - for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
2609 + for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin ();
2610 iter != entries.end ();
2611 ++iter) {
2612
2613 @@ -381,7 +381,7 @@ RL::ListImpl::push_status (const std::string uri_,
2614 ++iter)
2615 (*iter)->push_status (uri_, status);
2616
2617 - for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
2618 + for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin ();
2619 iter != entries.end ();
2620 ++iter) {
2621
2622 @@ -400,7 +400,7 @@ RL::ListImpl::visit_presentities (boost::function1<bool, Ekiga::Presentity&> vis
2623 ++iter)
2624 go_on = (*iter)->visit_presentities (visitor);
2625
2626 - for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
2627 + for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin ();
2628 go_on && iter != entries.end ();
2629 ++iter) {
2630
2631 @@ -418,7 +418,7 @@ RL::ListImpl::publish () const
2632 ++iter)
2633 (*iter)->publish ();
2634
2635 - for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
2636 + for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin ();
2637 iter != entries.end ();
2638 ++iter) {
2639
2640 diff --git a/plugins/resource-list/rl-list.h b/plugins/resource-list/rl-list.h
2641 index 77a64d45f..ca5c02bcc 100644
2642 --- a/plugins/resource-list/rl-list.h
2643 +++ b/plugins/resource-list/rl-list.h
2644 @@ -74,9 +74,9 @@ namespace RL
2645
2646 void publish () const;
2647
2648 - boost::signal1<void, boost::shared_ptr<Entry> > entry_added;
2649 - boost::signal1<void, boost::shared_ptr<Entry> > entry_updated;
2650 - boost::signal1<void, boost::shared_ptr<Entry> > entry_removed;
2651 + boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_added;
2652 + boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_updated;
2653 + boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_removed;
2654
2655 /* this method orders the list to get rid of all its children */
2656 void flush ();
2657 diff --git a/plugins/resource-list/rl-presentity.h b/plugins/resource-list/rl-presentity.h
2658 index fbd998a79..53bfd1030 100644
2659 --- a/plugins/resource-list/rl-presentity.h
2660 +++ b/plugins/resource-list/rl-presentity.h
2661 @@ -79,7 +79,7 @@ namespace RL
2662
2663 bool populate_menu (Ekiga::MenuBuilder &);
2664
2665 - boost::signal0<void> trigger_reload;
2666 + boost::signals2::signal<void(void)> trigger_reload;
2667
2668 private:
2669
2670 diff --git a/src/gui/assistant.cpp b/src/gui/assistant.cpp
2671 index 778b02151..74e17cd1f 100644
2672 --- a/src/gui/assistant.cpp
2673 +++ b/src/gui/assistant.cpp
2674 @@ -95,7 +95,7 @@ struct _EkigaAssistantPrivate
2675 gint last_active_page;
2676
2677 GtkListStore *summary_model;
2678 - std::vector<boost::signals::connection> connections;
2679 + std::vector<boost::signals2::connection> connections;
2680 };
2681
2682 /* presenting the network connection type to the user */
2683 @@ -1679,7 +1679,7 @@ ekiga_assistant_new (Ekiga::ServiceCore& service_core)
2684 g_signal_connect (assistant, "key-press-event",
2685 G_CALLBACK (ekiga_assistant_key_press_cb), NULL);
2686
2687 - boost::signals::connection conn;
2688 + boost::signals2::connection conn;
2689 assistant->priv->videoinput_core = service_core.get<Ekiga::VideoInputCore> ("videoinput-core");
2690 assistant->priv->audioinput_core = service_core.get<Ekiga::AudioInputCore> ("audioinput-core");
2691 assistant->priv->audiooutput_core = service_core.get<Ekiga::AudioOutputCore> ("audiooutput-core");
2692 diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
2693 index 318ed5a22..0aec09ec2 100644
2694 --- a/src/gui/main_window.cpp
2695 +++ b/src/gui/main_window.cpp
2696 @@ -129,7 +129,7 @@ struct _EkigaMainWindowPrivate
2697 unsigned calling_state;
2698
2699 gulong roster_selection_connection_id;
2700 - std::vector<boost::signals::connection> connections;
2701 + std::vector<boost::signals2::connection> connections;
2702 };
2703
2704 /* properties */
2705 @@ -1706,7 +1706,7 @@ ekiga_main_window_class_init (EkigaMainWindowClass *klass)
2706 static void
2707 ekiga_main_window_connect_engine_signals (EkigaMainWindow *mw)
2708 {
2709 - boost::signals::connection conn;
2710 + boost::signals2::connection conn;
2711
2712 g_return_if_fail (EKIGA_IS_MAIN_WINDOW (mw));
2713
2714 diff --git a/src/gui/statusmenu.cpp b/src/gui/statusmenu.cpp
2715 index 791089294..e937f77ca 100644
2716 --- a/src/gui/statusmenu.cpp
2717 +++ b/src/gui/statusmenu.cpp
2718 @@ -51,7 +51,7 @@
2719 struct _StatusMenuPrivate
2720 {
2721 boost::shared_ptr<Ekiga::PersonalDetails> personal_details;
2722 - std::vector<boost::signals::connection> connections;
2723 + std::vector<boost::signals2::connection> connections;
2724
2725 GtkListStore *list_store; // List store storing the menu
2726 GtkWindow *parent; // Parent window
2727 @@ -796,7 +796,7 @@ status_menu_new (Ekiga::ServiceCore & core)
2728 {
2729 StatusMenu *self = NULL;
2730
2731 - boost::signals::connection conn;
2732 + boost::signals2::connection conn;
2733 GtkCellRenderer *renderer = NULL;
2734 GSList *custom_status_array [NUM_STATUS_TYPES];
2735
2736 --
2737 2.20.1
2738
archlinux package build